diff --git a/.github/ISSUE_TEMPLATE/04_build_failure.yml b/.github/ISSUE_TEMPLATE/04_build_failure.yml index c672361dd56a..2dfa1b779a6d 100644 --- a/.github/ISSUE_TEMPLATE/04_build_failure.yml +++ b/.github/ISSUE_TEMPLATE/04_build_failure.yml @@ -61,12 +61,14 @@ body: You can still open a build failure report, but please say '**No, Hydra cannot reproduce this build failure.**' below. - If there's a Gray Question Mark icon near the package entry, say '**Hydra is currently rebuilding this package.**' - If there's a Red Stop Sign icon near the package entry, then the build job was stopped manually. If this occurs, please coordinate with the [Infrastructure Team](https://matrix.to/#/#infra:nixos.org), and say '**The last build job was manually cancelled.**' + - If Hydra isn't supposed to build the package at all, say '**Hydra doesn’t try to build the package.**' options: - "Please select the Hydra Status." - "Yes, Hydra can reproduce this build failure." - "No, Hydra cannot reproduce this build failure." - "Hydra is currently rebuilding this package." - "The last build job was manually cancelled." + - "Hydra doesn’t try to build the package." default: 0 validations: required: true diff --git a/.github/labeler-no-sync.yml b/.github/labeler-no-sync.yml index a64a5d3cf730..34f87b91e179 100644 --- a/.github/labeler-no-sync.yml +++ b/.github/labeler-no-sync.yml @@ -7,6 +7,39 @@ - any-glob-to-any-file: - .github/workflows/* - ci/**/*.* + - all: + - head-branch: + # r-ryantm's branches have this prefix. + - ^auto-update/ + - changed-files: + - any-glob-to-any-file: + # Browser updates should always be backported. + - pkgs/applications/kde/angelfish.nix + - pkgs/applications/kde/falkon.nix + - pkgs/applications/kde/konqueror.nix + - pkgs/applications/networking/browsers/**/* + - pkgs/by-name/br/brave/**/* + # Added in December 2024, uncomment for 25.05 + # - pkgs/by-name/ca/catalyst-browser/**/* + - pkgs/by-name/ch/chawan/**/* + - pkgs/by-name/di/dillo-plus/**/* + - pkgs/by-name/di/dillo/**/* + - pkgs/by-name/ed/edbrowse/**/* + - pkgs/by-name/ep/epiphany/**/* + - pkgs/by-name/go/google-chrome/**/* + - pkgs/by-name/ly/lynx/**/* + - pkgs/by-name/mi/microsoft-edge/**/* + - pkgs/by-name/mi/midori-unwrapped/**/* + - pkgs/by-name/mu/mullvad-browser/**/* + - pkgs/by-name/op/opera/**/* + - pkgs/by-name/to/tor-browser/**/* + - pkgs/by-name/vi/vimb-unwrapped/**/* + - pkgs/by-name/w3/w3m/**/* + - pkgs/desktops/lomiri/applications/morph-browser/**/* + - pkgs/development/libraries/webkitgtk/**/* + - pkgs/kde/gear/angelfish/**/* + - pkgs/kde/gear/falkon/**/* + - pkgs/kde/gear/konqueror/**/* "6.topic: policy discussion": - any: diff --git a/.github/labeler.yml b/.github/labeler.yml index 0d1a59489084..4c86c6efa30b 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -40,6 +40,16 @@ - pkgs/development/coq-modules/**/* - pkgs/top-level/coq-packages.nix +"6.topic: COSMIC": + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/services/desktop-managers/cosmic.nix + - nixos/modules/services/display-managers/cosmic-greeter.nix + - nixos/tests/cosmic.nix + - pkgs/by-name/co/cosmic-*/**/* + - pkgs/by-name/xd/xdg-desktop-portal-cosmic/* + "6.topic: crystal": - any: - changed-files: diff --git a/.github/workflows/check-maintainers-sorted.yml b/.github/workflows/check-maintainers-sorted.yml index d69813c62c97..dcc4806e9375 100644 --- a/.github/workflows/check-maintainers-sorted.yml +++ b/.github/workflows/check-maintainers-sorted.yml @@ -20,7 +20,7 @@ jobs: lib maintainers - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31 with: extra_nix_config: sandbox = true diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml index 37c32dfcc224..910403e0bb00 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-nix-format.yml @@ -23,7 +23,7 @@ jobs: with: ref: ${{ needs.get-merge-commit.outputs.mergedSha }} - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31 with: extra_nix_config: sandbox = true diff --git a/.github/workflows/check-nixf-tidy.yml b/.github/workflows/check-nixf-tidy.yml index 546ae1351fbc..91a5d4c6c90f 100644 --- a/.github/workflows/check-nixf-tidy.yml +++ b/.github/workflows/check-nixf-tidy.yml @@ -34,7 +34,7 @@ jobs: rev=$(jq -r .rev ci/pinned-nixpkgs.json) echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV" - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31 with: extra_nix_config: sandbox = true nix_path: nixpkgs=${{ env.url }} diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml index 2ba1ec405d71..9c02e26be178 100644 --- a/.github/workflows/check-shell.yml +++ b/.github/workflows/check-shell.yml @@ -27,7 +27,7 @@ jobs: with: ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31 - name: Build shell run: nix-build shell.nix diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml index d2b33755687e..831a58fdd74a 100644 --- a/.github/workflows/codeowners-v2.yml +++ b/.github/workflows/codeowners-v2.yml @@ -45,7 +45,7 @@ jobs: needs: get-merge-commit if: github.repository_owner == 'NixOS' && needs.get-merge-commit.outputs.mergedSha steps: - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31 - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16 with: @@ -92,7 +92,7 @@ jobs: runs-on: ubuntu-24.04 if: github.repository_owner == 'NixOS' steps: - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31 # Important: Because we use pull_request_target, this checks out the base branch of the PR, not the PR head. # This is intentional, because we need to request the review of owners as declared in the base branch. diff --git a/.github/workflows/editorconfig-v2.yml b/.github/workflows/editorconfig-v2.yml index 9046b25032cd..436b7c339e8c 100644 --- a/.github/workflows/editorconfig-v2.yml +++ b/.github/workflows/editorconfig-v2.yml @@ -32,7 +32,7 @@ jobs: with: ref: ${{ needs.get-merge-commit.outputs.mergedSha }} - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31 with: # nixpkgs commit is pinned so that it doesn't break # editorconfig-checker 2.4.0 diff --git a/.github/workflows/eval-lib-tests.yml b/.github/workflows/eval-lib-tests.yml index 47bfa61d4c9c..84d9562c220d 100644 --- a/.github/workflows/eval-lib-tests.yml +++ b/.github/workflows/eval-lib-tests.yml @@ -22,7 +22,7 @@ jobs: with: ref: ${{ needs.get-merge-commit.outputs.mergedSha }} - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31 with: extra_nix_config: sandbox = true diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index cf4b06557756..abed73db63e4 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -43,7 +43,7 @@ jobs: echo "targetSha=$targetSha" >> "$GITHUB_OUTPUT" - name: Install Nix - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31 with: extra_nix_config: sandbox = true @@ -71,7 +71,7 @@ jobs: path: nixpkgs - name: Install Nix - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31 with: extra_nix_config: sandbox = true @@ -111,7 +111,7 @@ jobs: path: nixpkgs - name: Install Nix - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31 with: extra_nix_config: sandbox = true @@ -152,7 +152,7 @@ jobs: path: nixpkgs - name: Install Nix - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31 with: extra_nix_config: sandbox = true @@ -260,7 +260,7 @@ jobs: path: comparison - name: Install Nix - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31 # Important: This workflow job runs with extra permissions, # so we need to make sure to not run untrusted code from PRs diff --git a/.github/workflows/keep-sorted.yml b/.github/workflows/keep-sorted.yml index 2433c7b57264..b23295a23af4 100644 --- a/.github/workflows/keep-sorted.yml +++ b/.github/workflows/keep-sorted.yml @@ -27,7 +27,7 @@ jobs: rev=$(jq -r .rev ci/pinned-nixpkgs.json) echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV" - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31 with: extra_nix_config: sandbox = true nix_path: nixpkgs=${{ env.url }} diff --git a/.github/workflows/manual-nixos-v2.yml b/.github/workflows/manual-nixos-v2.yml index 2369f3b251f3..abe8ac3d2d4f 100644 --- a/.github/workflows/manual-nixos-v2.yml +++ b/.github/workflows/manual-nixos-v2.yml @@ -33,7 +33,7 @@ jobs: with: ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31 with: extra_nix_config: sandbox = true diff --git a/.github/workflows/manual-nixpkgs-v2.yml b/.github/workflows/manual-nixpkgs-v2.yml index 874f6c3ef58e..88356e1d229f 100644 --- a/.github/workflows/manual-nixpkgs-v2.yml +++ b/.github/workflows/manual-nixpkgs-v2.yml @@ -20,7 +20,7 @@ jobs: with: ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31 with: extra_nix_config: sandbox = true diff --git a/.github/workflows/nix-parse-v2.yml b/.github/workflows/nix-parse-v2.yml index 497bba08ae97..f149dc481ca7 100644 --- a/.github/workflows/nix-parse-v2.yml +++ b/.github/workflows/nix-parse-v2.yml @@ -32,7 +32,7 @@ jobs: ref: ${{ needs.get-merge-commit.outputs.mergedSha }} if: ${{ env.CHANGED_FILES && env.CHANGED_FILES != '' }} - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31 with: extra_nix_config: sandbox = true nix_path: nixpkgs=channel:nixpkgs-unstable diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml index dd4a8c2b7ab8..b46f926d8cad 100644 --- a/.github/workflows/nixpkgs-vet.yml +++ b/.github/workflows/nixpkgs-vet.yml @@ -43,7 +43,7 @@ jobs: git worktree add "$target" "$(git rev-parse HEAD^1)" echo "target=$target" >> "$GITHUB_ENV" - - uses: cachix/install-nix-action@d1ca217b388ee87b2507a9a93bf01368bde7cec2 # v31 + - uses: cachix/install-nix-action@754537aaedb35f72ab11a60cc162c49ef3016495 # v31 - name: Fetching the pinned tool # Update the pinned version using ci/nixpkgs-vet/update-pinned-tool.sh diff --git a/ci/OWNERS b/ci/OWNERS index 7f43fd9ccfa3..8ab11c67379d 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -469,3 +469,6 @@ pkgs/development/interpreters/lfe/ @NixOS/beam # OctoDNS pkgs/tools/networking/octodns/ @anthonyroussel + +# Teleport +pkgs/servers/teleport @arianvp @justinas @sigma @tomberek @freezeboy @techknowlogick @JuliusFreudenberger diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 0de89aa81b46..e076984db000 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -382,6 +382,15 @@ pkgs.mkShell { ``` will create a development shell where a `node_modules` directory is created & packages symlinked to the Nix store when activated. +:::{.note} +Commands like `npm install` & `npm add` that writes packages & executables needs to be used with `--package-lock-only`. + +This means `npm` installs dependencies by writing into `package-lock.json` without modifying the `node_modules` folder. Installation happens through reloading the devShell. +This might be best practice since it gives the `nix shell` virtually exclusive ownership over your `node_modules` folder. + +It's recommended to set `package-lock-only = true` in your project-local [`.npmrc`](https://docs.npmjs.com/cli/v11/configuring-npm/npmrc). +::: + ### corepack {#javascript-corepack} This package puts the corepack wrappers for pnpm and yarn in your PATH, and they will honor the `packageManager` setting in the `package.json`. diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index ad743a51488f..ae689d171cd9 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -346,7 +346,7 @@ [Prisma ORM upgrade guide](https://www.prisma.io/docs/orm/more/upgrade-guides/upgrading-versions/upgrading-to-prisma-6) for more information. -- `depdendency-track` no longer bundes the UI inside the jar. This bundling +- `dependency-track` no longer bundes the UI inside the jar. This bundling functionality is deprecated by upstream and causes UI assets not being served after weeks of runtime. diff --git a/lib/meta.nix b/lib/meta.nix index ee234d94489b..ad4f770806dd 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -289,7 +289,8 @@ rec { */ availableOn = platform: pkg: - ((!pkg ? meta.platforms) || any (platformMatch platform) pkg.meta.platforms) + pkg != null + && ((!pkg ? meta.platforms) || any (platformMatch platform) pkg.meta.platforms) && all (elem: !platformMatch platform elem) (pkg.meta.badPlatforms or [ ]); /** diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2a95930545f9..202c1ee6c741 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1789,6 +1789,12 @@ githubId = 19378309; name = "Simon Struck"; }; + aoli-al = { + email = "aoli.al@hotmail.com"; + github = "aoli-al"; + githubId = 5557706; + name = "Ao Li"; + }; aorith = { email = "aomanu+nixpkgs@gmail.com"; github = "aorith"; @@ -3354,6 +3360,12 @@ github = "bmilanov"; githubId = 30090366; }; + bmrips = { + name = "Benedikt M. Rips"; + email = "benedikt.rips@gmail.com"; + github = "bmrips"; + githubId = 20407973; + }; bmwalters = { name = "Bradley Walters"; email = "oss@walters.app"; @@ -16756,6 +16768,13 @@ githubId = 6295090; name = "Mats"; }; + mymindstorm = { + name = "Brendan Early"; + email = "mymindstorm@evermiss.net"; + github = "mymindstorm"; + githubId = 27789806; + keys = [ { fingerprint = "52B9 A09F 788F 4D1F 0C94 9EBE EE39 A9F3 0C9D 72B5"; } ]; + }; mynacol = { github = "Mynacol"; githubId = 26695166; diff --git a/nixos/doc/manual/configuration/luks-file-systems.section.md b/nixos/doc/manual/configuration/luks-file-systems.section.md index b20957b40b89..a1d22f34e920 100644 --- a/nixos/doc/manual/configuration/luks-file-systems.section.md +++ b/nixos/doc/manual/configuration/luks-file-systems.section.md @@ -117,7 +117,7 @@ added to the LUKS volume. ``` Existing key slots are left intact, unless `--wipe-slot=` is specified. It is -recommened to add a recovery key that should be stored in a secure physical +recommended to add a recovery key that should be stored in a secure physical location and can be entered wherever a password would be entered. ```ShellSession diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md index 4b49a1e82090..736662ad7ed9 100644 --- a/nixos/doc/manual/development/settings-options.section.md +++ b/nixos/doc/manual/development/settings-options.section.md @@ -412,7 +412,7 @@ have a predefined type and string generator already declared under `multiline` (default `true`) - : Whether to procude a multiline output. The output may still wrap across + : Whether to produce a multiline output. The output may still wrap across multiple lines if it would otherwise exceed `columnWidth`. `columnWidth` (default `100`) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index b2351390bf97..bcc9261d3681 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -112,7 +112,7 @@ - [PostgREST](https://postgrest.org), a standalone web server that turns your PostgreSQL database directly into a RESTful API. Available as [services.postgrest](options.html#opt-services.postgrest.enable). -- [postgres-websockets](https://github.com/diogob/postgres-websockets), a middleware that adds websockets capabilites on top of PostgreSQL's asynchronous notifications using LISTEN and NOTIFY commands. Available as [services.postgres-websockets](options.html#opt-services.postgres-websockets.enable). +- [postgres-websockets](https://github.com/diogob/postgres-websockets), a middleware that adds websockets capabilities on top of PostgreSQL's asynchronous notifications using LISTEN and NOTIFY commands. Available as [services.postgres-websockets](options.html#opt-services.postgres-websockets.enable). - [µStreamer](https://github.com/pikvm/ustreamer), a lightweight MJPEG-HTTP streamer. Available as [services.ustreamer](options.html#opt-services.ustreamer). @@ -182,7 +182,7 @@ - [nvidia-gpu](https://github.com/utkuozdemir/nvidia_gpu_exporter), a Prometheus exporter that scrapes `nvidia-smi` for GPU metrics. Available as [services.prometheus.exporters.nvidia-gpu](#opt-services.prometheus.exporters.nvidia-gpu.enable). -- [Lavalink](https://github.com/lavalink-devs/Lavalink), a standalone audio sending node based on Lavaplayer and Koe. Availble as [services.lavalink](#opt-services.lavalink.enable). +- [Lavalink](https://github.com/lavalink-devs/Lavalink), a standalone audio sending node based on Lavaplayer and Koe. Available as [services.lavalink](#opt-services.lavalink.enable). - [OpenGamepadUI](https://github.com/ShadowBlip/OpenGamepadUI/), an open source gamepad-native game launcher and overlay for Linux. Available as [programs.opengamepadui](#opt-programs.opengamepadui.enable). @@ -397,7 +397,7 @@ +extraCreateArgs+=("--exclude" "/some/path") ``` -- `programs.xonsh.package` now gets overrided internally with `extraPackages` to support `programs.xonsh.extraPackages`. See `programs.xonsh.extraPackages` for more details. +- `programs.xonsh.package` now gets overridden internally with `extraPackages` to support `programs.xonsh.extraPackages`. See `programs.xonsh.extraPackages` for more details. - `services.nitter.guestAccounts` has been renamed to `services.nitter.sessionsFile`, for consistency with upstream. The file format is unchanged. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3b8eae8a294c..74ebccefa685 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1515,6 +1515,7 @@ ./services/web-apps/collabora-online.nix ./services/web-apps/commafeed.nix ./services/web-apps/convos.nix + ./services/web-apps/cook-cli.nix ./services/web-apps/crabfit.nix ./services/web-apps/davis.nix ./services/web-apps/cryptpad.nix diff --git a/nixos/modules/services/backup/borgbackup.md b/nixos/modules/services/backup/borgbackup.md index 8ae869308bb8..23f0e5c934ed 100644 --- a/nixos/modules/services/backup/borgbackup.md +++ b/nixos/modules/services/backup/borgbackup.md @@ -105,7 +105,7 @@ The following few commands (run as root) let you test your backup. > systemctl restart borgbackup-job-backupToLocalServer > sleep 10 > systemctl restart borgbackup-job-backupToLocalServer -> export BORG_PASSPHRASE=topSecrect +> export BORG_PASSPHRASE=topSecret > borg list --rsh='ssh -i /run/keys/id_ed25519_my_borg_repo' borg@nixos:. nixos-backupToLocalServer-2020-03-30T21:46:17 Mon, 2020-03-30 21:46:19 [84feb97710954931ca384182f5f3cb90665f35cef214760abd7350fb064786ac] nixos-backupToLocalServer-2020-03-30T21:46:30 Mon, 2020-03-30 21:46:32 [e77321694ecd160ca2228611747c6ad1be177d6e0d894538898de7a2621b6e68] diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index db7f9dd29ce0..0cd9acd9a042 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -434,6 +434,7 @@ let }; effectiveUser = container.podman.user or "root"; + inherit (config.users.users.${effectiveUser}) uid; dependOnLingerService = cfg.backend == "podman" && effectiveUser != "root" && config.users.users.${effectiveUser}.linger; in @@ -441,7 +442,7 @@ let wantedBy = [ ] ++ optional (container.autoStart) "multi-user.target"; wants = lib.optional (container.imageFile == null && container.imageStream == null) "network-online.target" - ++ lib.optional dependOnLingerService "linger-users.service"; + ++ lib.optionals dependOnLingerService [ "linger-users.service" ]; after = lib.optionals (cfg.backend == "docker") [ "docker.service" @@ -452,8 +453,15 @@ let "network-online.target" ] ++ dependsOn - ++ lib.optional dependOnLingerService "linger-users.service"; - requires = dependsOn; + ++ lib.optionals dependOnLingerService [ "linger-users.service" ] + ++ lib.optionals (effectiveUser != "root" && container.podman.sdnotify == "healthy") [ + "user@${toString uid}.service" + ]; + requires = + dependsOn + ++ lib.optionals (effectiveUser != "root" && container.podman.sdnotify == "healthy") [ + "user@${toString uid}.service" + ]; environment = lib.mkMerge [ proxy_env (mkIf (cfg.backend == "podman" && container.podman.user != "root") { @@ -523,6 +531,10 @@ let else "${cfg.backend} rm -f ${name} || true"; + unitConfig = mkIf (effectiveUser != "root") { + RequiresMountsFor = "/run/user/${toString uid}/containers"; + }; + serviceConfig = { ### There is no generalized way of supporting `reload` for docker @@ -616,6 +628,15 @@ in assertion = cfg.backend == "docker" -> podman == null; message = "virtualisation.oci-containers.containers.${name}: Cannot set `podman` option if backend is `docker`."; } + { + assertion = + cfg.backend == "podman" && podman.sdnotify == "healthy" && podman.user != "root" + -> config.users.users.${podman.user}.uid != null; + message = '' + Rootless container ${name} (with podman and sdnotify=healthy) + requires that its running user ${podman.user} has a statically specified uid. + ''; + } ]; in concatMap (name: toAssertions name cfg.containers.${name}) (lib.attrNames cfg.containers); diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 3a7fe2d16d61..f6dcd1951a13 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -638,7 +638,7 @@ let clevisTest ? false, clevisFallbackTest ? false, disableFileSystems ? false, - selectNixPackage ? pkgs: pkgs.nixStable, + selectNixPackage ? pkgs: pkgs.nixVersions.stable, }: let isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi); diff --git a/nixos/tests/oci-containers.nix b/nixos/tests/oci-containers.nix index 073f62cf5155..a22bd9c6b431 100644 --- a/nixos/tests/oci-containers.nix +++ b/nixos/tests/oci-containers.nix @@ -80,6 +80,7 @@ let home = "/var/lib/redis"; linger = type == "healthy"; createHome = true; + uid = 2342; subUidRanges = [ { count = 65536; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 51cedb444466..3d348998ffe6 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1609,6 +1609,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + bloat-nvim = buildVimPlugin { + pname = "bloat.nvim"; + version = "2025-04-30"; + src = fetchFromGitHub { + owner = "dundalek"; + repo = "bloat.nvim"; + rev = "f90bef655ac40fecbaae53e10db1cf7894d090b1"; + sha256 = "0ah5c84172wkc75zx5ll2dp9y3r867lik29aw5mm7i3lj530p0ri"; + }; + meta.homepage = "https://github.com/dundalek/bloat.nvim/"; + meta.hydraPlatforms = [ ]; + }; + block-nvim = buildVimPlugin { pname = "block.nvim"; version = "2023-10-10"; @@ -6535,6 +6548,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + kanagawa-paper-nvim = buildVimPlugin { + pname = "kanagawa-paper.nvim"; + version = "2025-04-27"; + src = fetchFromGitHub { + owner = "thesimonho"; + repo = "kanagawa-paper.nvim"; + rev = "4f41353f6a2bf9f25b2466a0f1eb6883d8fd09c1"; + sha256 = "0gan0jqn4azkqln5xsnffpyjqmzqv1wwv02xv2d0yykmlqk9yqc8"; + }; + meta.homepage = "https://github.com/thesimonho/kanagawa-paper.nvim/"; + meta.hydraPlatforms = [ ]; + }; + kdl-vim = buildVimPlugin { pname = "kdl.vim"; version = "2023-02-20"; @@ -11440,6 +11466,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + oil-git-status-nvim = buildVimPlugin { + pname = "oil-git-status.nvim"; + version = "2025-04-03"; + src = fetchFromGitHub { + owner = "refractalize"; + repo = "oil-git-status.nvim"; + rev = "4b5cf53842c17a09420919e655a6a559da3112d7"; + sha256 = "1jzw6lkvi9xxzqy8xz056xlb45byr1arklh87zmyf0nj9plm2nsp"; + }; + meta.homepage = "https://github.com/refractalize/oil-git-status.nvim/"; + meta.hydraPlatforms = [ ]; + }; + ollama-nvim = buildVimPlugin { pname = "ollama.nvim"; version = "2024-06-09"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix index fcce7e0a62b5..d367c812d93d 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix @@ -8,19 +8,19 @@ gitMinimal, }: let - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.cmp"; tag = "v${version}"; - hash = "sha256-Vs34vPQ6BhBcSSlgGpUMOXNzywrwg116xt3MLUwgVVA="; + hash = "sha256-bKe8SSg1HPWE7b4iRQJwiOVCrvvgttuHCOIa4U/38AY="; }; blink-fuzzy-lib = rustPlatform.buildRustPackage { inherit version src; pname = "blink-fuzzy-lib"; useFetchCargoVendor = true; - cargoHash = "sha256-MWElqh7ENJ6CbLOnvz0DsP5YYu+e+y12GSUOfW1IKGU="; + cargoHash = "sha256-IDoDugtNWQovfSstbVMkKHLBXKa06lxRWmywu4zyS3M="; nativeBuildInputs = [ gitMinimal ]; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index a3a822ab1baf..399703cbd6cc 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1457,6 +1457,14 @@ in passthru.python3Dependencies = ps: [ ps.jupytext ]; }; + kanagawa-paper-nvim = super.kanagawa-paper-nvim.overrideAttrs { + nvimSkipModules = [ + # skipping wezterm theme switcher since it relies on a wezterm module + # that does not seem to be available, tried to build setting wezterm-nvim as a dep + "wezterm.theme_switcher" + ]; + }; + kulala-nvim = super.kulala-nvim.overrideAttrs { dependencies = with self; [ nvim-treesitter @@ -2623,6 +2631,10 @@ in ]; }; + oil-git-status-nvim = super.oil-git-status-nvim.overrideAttrs { + dependencies = [ self.oil-nvim ]; + }; + ollama-nvim = super.ollama-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -2744,9 +2756,15 @@ in ]; }; - peek-nvim = super.peek-nvim.overrideAttrs { - runtimeDeps = [ deno ]; - }; + peek-nvim = super.peek-nvim.overrideAttrs (old: { + patches = [ + # Patch peek-nvim to run using nixpkgs deno + # This means end-users have to build peek-nvim the first time they use it... + (replaceVars ./patches/peek-nvim/cmd.patch { + deno = lib.getExe deno; + }) + ]; + }); persisted-nvim = super.persisted-nvim.overrideAttrs { nvimSkipModules = [ diff --git a/pkgs/applications/editors/vim/plugins/patches/peek-nvim/cmd.patch b/pkgs/applications/editors/vim/plugins/patches/peek-nvim/cmd.patch new file mode 100644 index 000000000000..3c80e55e285b --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/patches/peek-nvim/cmd.patch @@ -0,0 +1,37 @@ +diff --git a/app/src/main.ts b/app/src/main.ts +index c82d914..e8542f3 100644 +--- a/app/src/main.ts ++++ b/app/src/main.ts +@@ -73,7 +73,7 @@ async function init(socket: WebSocket) { + const onListen: Deno.ServeOptions['onListen'] = ({ hostname, port }) => { + const serverUrl = `${hostname.replace('0.0.0.0', 'localhost')}:${port}`; + logger.info(`listening on ${serverUrl}`); +- const webview = new Deno.Command('deno', { ++ const webview = new Deno.Command('@deno@', { + cwd: dirname(fromFileUrl(Deno.mainModule)), + args: [ + 'run', +diff --git a/lua/peek/app.lua b/lua/peek/app.lua +index af5148e..5e67563 100644 +--- a/lua/peek/app.lua ++++ b/lua/peek/app.lua +@@ -38,10 +38,17 @@ function module.setup() + end + + cmd = vim.list_extend({ +- 'deno', +- 'task', +- '--quiet', ++ '@deno@', + 'run', ++ '--allow-read', ++ '--allow-write', ++ '--allow-net', ++ '--allow-env', ++ '--allow-run', ++ '--no-check', ++ '--allow-import', ++ '--no-lock', ++ '../../app/src/main.ts', + }, args) + end diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index aac6e5d81bfd..1cb7a70d32c5 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -122,6 +122,7 @@ https://github.com/moyiz/blink-emoji.nvim/,HEAD, https://github.com/MahanRahmati/blink-nerdfont.nvim/,HEAD, https://github.com/mikavilpas/blink-ripgrep.nvim/,HEAD, https://github.com/Saghen/blink.compat/,HEAD, +https://github.com/dundalek/bloat.nvim/,HEAD, https://github.com/HampusHauffman/block.nvim/,HEAD, https://github.com/blueballs-theme/blueballs-neovim/,, https://github.com/uloco/bluloco.nvim/,, @@ -500,6 +501,7 @@ https://github.com/julelang/jule.nvim/,HEAD, https://github.com/julelang/jule.nvim/,HEAD, https://github.com/JuliaEditorSupport/julia-vim/,, https://github.com/GCBallesteros/jupytext.nvim/,HEAD, +https://github.com/thesimonho/kanagawa-paper.nvim/,HEAD, https://github.com/rebelot/kanagawa.nvim/,, https://github.com/imsnif/kdl.vim/,HEAD, https://github.com/anuvyklack/keymap-layer.nvim/,HEAD, @@ -878,6 +880,7 @@ https://github.com/obsidian-nvim/obsidian.nvim/,HEAD, https://github.com/nvimdev/oceanic-material/,, https://github.com/mhartington/oceanic-next/,, https://github.com/pwntester/octo.nvim/,, +https://github.com/refractalize/oil-git-status.nvim/,HEAD, https://github.com/nomnivore/ollama.nvim/,HEAD, https://github.com/yonlu/omni.vim/,, https://github.com/Hoffs/omnisharp-extended-lsp.nvim/,HEAD, diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index 82362ee6d90c..14674d048d71 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -1,7 +1,6 @@ { stdenv, lib, - mkDerivation, fetchFromGitHub, cargo, extra-cmake-modules, @@ -9,21 +8,16 @@ rustPlatform, # common deps - karchive, - qtwebsockets, + libzip, + qt6Packages, # client deps - qtbase, - qtkeychain, - qtmultimedia, - qtsvg, - qttools, + ffmpeg, libsecret, libwebp, # optional client deps giflib, - kdnssd, libvpx, miniupnpc, @@ -45,17 +39,17 @@ assert lib.assertMsg ( ) "You must specify at least one of buildClient, buildServer, or buildExtraTools."; let - clientDeps = [ + clientDeps = with qt6Packages; [ qtbase qtkeychain qtmultimedia qtsvg qttools + ffmpeg libsecret libwebp # optional: giflib # gif animation export support - kdnssd # local server discovery with Zeroconf libvpx # WebM video export miniupnpc # automatic port forwarding ]; @@ -67,7 +61,7 @@ let ] ++ lib.optional withSystemd systemd; in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "drawpile"; version = "2.2.2"; @@ -88,12 +82,18 @@ mkDerivation rec { extra-cmake-modules rustc rustPlatform.cargoSetupHook + ( + if buildClient || buildServerGui then + qt6Packages.wrapQtAppsHook + else + qt6Packages.wrapQtAppsNoGuiHook + ) ]; buildInputs = [ - karchive - qtwebsockets + libzip + qt6Packages.qtwebsockets ] ++ lib.optionals buildClient clientDeps ++ lib.optionals buildServer serverDeps; diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 2837666d49b1..967fdb27e09a 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -36,8 +36,6 @@ lz4, libmpg123, makeWrapper, - pcre, - pcre2, pkg-config, portaudio, rapidjson, @@ -107,8 +105,6 @@ stdenv.mkDerivation (finalAttrs: { libxkbcommon lz4 libmpg123 - pcre - pcre2 portaudio rapidjson sqlite diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index 90253a131ffe..b2d11d046a42 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "helm-secrets"; - version = "4.6.3"; + version = "4.6.4"; src = fetchFromGitHub { owner = "jkroepke"; repo = pname; rev = "v${version}"; - hash = "sha256-5vsUyeQH/kCaHo7aze1xA1NVLXrxpFB19P708ikKTpg="; + hash = "sha256-PvWHxcxNSCI5RX830+b61fiyi0WX8ujEJzjyUOXp+iA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index f537dac6e64e..caa36547429c 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -9,6 +9,7 @@ runtimeShell, kubectl, nixosTests, + nix-update-script, components ? [ "cmd/kubelet" @@ -19,15 +20,15 @@ ], }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "kubernetes"; - version = "1.32.3"; + version = "1.33.0"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; - rev = "v${version}"; - hash = "sha256-kF3Oo+YETnsrFPWBO5b7nH2A2eONIOkE84+u6vOSrpE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-5MlMBsYf8V7BvV6xaeRMVSRaE+TpG8xJkMwVGm/fVdo="; }; vendorHash = null; @@ -95,15 +96,18 @@ buildGoModule rec { runHook postInstall ''; - meta = with lib; { - description = "Production-Grade Container Scheduling and Management"; - license = licenses.asl20; - homepage = "https://kubernetes.io"; - teams = [ teams.kubernetes ]; - platforms = platforms.linux; + passthru = { + updateScript = nix-update-script { }; + tests = nixosTests.kubernetes // { + inherit kubectl; + }; }; - passthru.tests = nixosTests.kubernetes // { - inherit kubectl; + meta = { + description = "Production-Grade Container Scheduling and Management"; + license = lib.licenses.asl20; + homepage = "https://kubernetes.io"; + teams = [ lib.teams.kubernetes ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index b20c1b54dbcf..b87d7d33db22 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -2,6 +2,7 @@ lib, stdenv, buildGoModule, + buildGo123Module, fetchFromGitHub, fetchFromGitLab, callPackage, @@ -96,6 +97,7 @@ let # These are the providers that don't fall in line with the default model special-providers = { + aws = automated-providers.aws.override { mkProviderGoModule = buildGo123Module; }; # github api seems to be broken, doesn't just fail to recognize the license, it's ignored entirely. checkly = automated-providers.checkly.override { spdx = "MIT"; }; gitlab = automated-providers.gitlab.override { diff --git a/pkgs/applications/video/kodi/addons/bluetooth-manager/default.nix b/pkgs/applications/video/kodi/addons/bluetooth-manager/default.nix new file mode 100644 index 000000000000..56aa202a11d0 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/bluetooth-manager/default.nix @@ -0,0 +1,24 @@ +{ + buildKodiAddon, + fetchFromGitHub, + lib, +}: +buildKodiAddon rec { + pname = "bluetooth-manager"; + namespace = "script.bluetooth.man"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "wastis"; + repo = "BluetoothManager"; + tag = "v${version}"; + hash = "sha256-KKaR7rIkflMYU6EDBEcorHQ3t7jsB4Qe6Ikg+eBblkA="; + }; + + meta = with lib; { + description = "Addon that allows to manage bluetooth devices from within a Linux based Kodi"; + platforms = platforms.all; + maintainers = teams.kodi.members; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix index c9fbda2b4e35..a79db9013a5f 100644 --- a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix +++ b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix @@ -4,6 +4,7 @@ cmake, libbfd, SDL2, + libGL, obs-studio, looking-glass-client, }: @@ -21,6 +22,7 @@ stdenv.mkDerivation { obs-studio libbfd SDL2 + libGL ]; env.NIX_CFLAGS_COMPILE = "-mavx"; diff --git a/pkgs/by-name/ad/ada/package.nix b/pkgs/by-name/ad/ada/package.nix index 2b6d226dacf0..9bee2fc45d33 100644 --- a/pkgs/by-name/ad/ada/package.nix +++ b/pkgs/by-name/ad/ada/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ada"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "ada-url"; repo = "ada"; tag = "v${version}"; - hash = "sha256-35vw/hGlOPhpjY43jWTrWxqazaYzhdviXxBe53cKEzg="; + hash = "sha256-tC7Hpf9xCysraTtVC+mYE/DVNrG02lwLAlDiTeaWpY4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ad/adcli/package.nix b/pkgs/by-name/ad/adcli/package.nix index 6ca3445c88a4..1cf15a2d1a87 100644 --- a/pkgs/by-name/ad/adcli/package.nix +++ b/pkgs/by-name/ad/adcli/package.nix @@ -14,7 +14,7 @@ xmlto, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "adcli"; version = "0.9.2"; @@ -22,13 +22,14 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "realmd"; repo = "adcli"; - rev = version; + tag = finalAttrs.version; hash = "sha256-dipNKlIdc1DpXLg/YJjUxZlNoMFy+rt8Y/+AfWFA4dE="; }; nativeBuildInputs = [ autoreconfHook docbook_xsl + libxslt # xsltproc pkg-config util-linux xmlto @@ -37,11 +38,15 @@ stdenv.mkDerivation rec { buildInputs = [ cyrus_sasl libkrb5 - libxslt openldap ]; - configureFlags = [ "--disable-debug" ]; + strictDeps = true; + + configureFlags = [ + "--disable-debug" + "ac_cv_path_KRB5_CONFIG=${lib.getExe' (lib.getDev libkrb5) "krb5-config"}" + ]; postPatch = '' substituteInPlace tools/Makefile.am \ @@ -61,15 +66,15 @@ stdenv.mkDerivation rec { patch_docbook doc/adcli-docs.xml ''; - meta = with lib; { + meta = { homepage = "https://www.freedesktop.org/software/realmd/adcli/adcli.html"; description = "Helper library and tools for Active Directory client operations"; mainProgram = "adcli"; - license = licenses.lgpl21Only; - maintainers = with maintainers; [ + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ SohamG anthonyroussel ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/al/aligator/package.nix b/pkgs/by-name/al/aligator/package.nix index 6b80cc99aac9..7c26ac68aa57 100644 --- a/pkgs/by-name/al/aligator/package.nix +++ b/pkgs/by-name/al/aligator/package.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && pythonSupport) [ # ignore one failing test for now - (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;aligator-test-py-rollout") + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'aligator-test-py-rollout|aligator-test-py-frames'") ]; # Fontconfig error: Cannot load default config file: No such file: (null) diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix index 46d2d7a06198..030ce343ece2 100644 --- a/pkgs/by-name/al/all-the-package-names/package.nix +++ b/pkgs/by-name/al/all-the-package-names/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "all-the-package-names"; - version = "2.0.2137"; + version = "2.0.2146"; src = fetchFromGitHub { owner = "nice-registry"; repo = "all-the-package-names"; tag = "v${version}"; - hash = "sha256-1HabSjZUHjPWkKZc+Xeh11bzb6ycQ1V7GS/XGycFoKc="; + hash = "sha256-mPPlBXhnDYTQPATw1Ulb/bk44Q5Q+hUA9tGcxCj0i3w="; }; - npmDepsHash = "sha256-zSGpKDcmBYod81wCeoSzOqse1zSao4aURngh55wq6CA="; + npmDepsHash = "sha256-yNG6rQRbXRDtmCm2KNZLZ1/ein+QA7/0CjAVIMVp2PI="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix index 8741d9877d48..06568312e16f 100644 --- a/pkgs/by-name/an/anubis/package.nix +++ b/pkgs/by-name/an/anubis/package.nix @@ -12,20 +12,20 @@ }: let pname = "anubis"; - version = "1.16.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "TecharoHQ"; repo = "anubis"; tag = "v${version}"; - hash = "sha256-/7GMf0QGR0rtz05vHN/yYYuzxN25NhqidITdAf6jSXY="; + hash = "sha256-8b2rVVuxhsY0+5IZvzMm7ki3HGbJAnUUoAqpD1PuqZ4="; }; anubisXess = buildNpmPackage { inherit version src; pname = "${pname}-xess"; - npmDepsHash = "sha256-QrW0grgNRZRum2mCec86Za1UV4R5QSRlhjVYFsZDwY8="; + npmDepsHash = "sha256-jiLrqn0jenug2ff/mqhOIfc7f+CsQja5g2K9n+W1kVM="; buildPhase = '' runHook preBuild @@ -44,7 +44,7 @@ in buildGoModule (finalAttrs: { inherit pname version src; - vendorHash = "sha256-D0+SDJIagAPqd71fIHCh29vPMVL0ZZAFg0rmgW2EaGw="; + vendorHash = "sha256-v9GsTUzBYfjh6/ETBbFpN5dqMzMaOz8w39Xz1omaPJE="; nativeBuildInputs = [ esbuild @@ -88,6 +88,7 @@ buildGoModule (finalAttrs: { maintainers = with lib.maintainers; [ knightpp soopyc + ryand56 ]; mainProgram = "anubis"; }; diff --git a/pkgs/by-name/an/anytype-heart/package.nix b/pkgs/by-name/an/anytype-heart/package.nix index 6b2f2472a473..787c9dc93826 100644 --- a/pkgs/by-name/an/anytype-heart/package.nix +++ b/pkgs/by-name/an/anytype-heart/package.nix @@ -11,12 +11,12 @@ let pname = "anytype-heart"; - version = "0.39.11"; + version = "0.40.19"; src = fetchFromGitHub { owner = "anyproto"; repo = "anytype-heart"; tag = "v${version}"; - hash = "sha256-+H63bc4aJPERfclzKh4E3uYEEwNycLfe0BCPSlilqCc="; + hash = "sha256-BUQZmZ7jKWdbBcWtx7rbbeEJbo5FncYHmp/5FVd0vdI="; }; arch = @@ -34,7 +34,7 @@ in buildGoModule { inherit pname version src; - vendorHash = "sha256-fbZ1DiRcD9dnS8e7BMrKPYApqZmQbaH6DsSSO1knDmo="; + vendorHash = "sha256-xsxgeoS1wIi0/LNGmZZyWKWzhkMJUnCEslXcIz+Dw8U="; subPackages = [ "cmd/grpcserver" ]; tags = [ diff --git a/pkgs/by-name/an/anytype/0001-feat-update-Disable-auto-checking-for-updates-and-updating-manually.patch b/pkgs/by-name/an/anytype/0001-feat-update-Disable-auto-checking-for-updates-and-updating-manually.patch new file mode 100644 index 000000000000..7931ec439968 --- /dev/null +++ b/pkgs/by-name/an/anytype/0001-feat-update-Disable-auto-checking-for-updates-and-updating-manually.patch @@ -0,0 +1,37 @@ +From d236396b1da80a7233168e01e8164256e7f69cc1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?David=20Chocholat=C3=BD?= +Date: Fri, 25 Apr 2025 12:29:37 +0200 +Subject: [PATCH] feat(update): Disable auto checking for updates and updating + manually + +--- + electron/js/update.js | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/electron/js/update.js b/electron/js/update.js +index 0e34efa..9386c90 100644 +--- a/electron/js/update.js ++++ b/electron/js/update.js +@@ -29,7 +29,8 @@ class UpdateManager { + autoUpdater.autoInstallOnAppQuit = false; + autoUpdater.channel = channel; + +- this.setTimeout(); ++ // PATCH(update): Never check for updates on a timer timeout. ++ // this.setTimeout(); + + autoUpdater.on('checking-for-update', () => { + Util.log('info', 'Checking for update'); +@@ -93,6 +94,9 @@ class UpdateManager { + }; + + isAllowed () { ++ // PATCH(update): Always disallow update check, even when requested by the user manually or when Anytype starts. ++ return false; ++ + const { config } = ConfigManager; + + if (config.updateDisabled) { +-- +2.49.0 + diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index 8eaa69f542e8..2416d1851377 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -13,27 +13,27 @@ let pname = "anytype"; - version = "0.45.3"; + version = "0.46.4"; src = fetchFromGitHub { owner = "anyproto"; repo = "anytype-ts"; tag = "v${version}"; - hash = "sha256-fwfxmNca75xAAHKeT2nddz+XZexDomzHbw188LXxZqA="; + hash = "sha256-JA8DHOPRLPoc8/GXkHfktVy3sZ5BpSFmgn71Xt15iLE="; }; description = "P2P note-taking tool"; locales = fetchFromGitHub { owner = "anyproto"; repo = "l10n-anytype-ts"; - rev = "687106c4e37297f86fab79f77ef83599b61ab65c"; - hash = "sha256-Y0irD0jzqYobnjtD2M1+hTDRUUYnuygUx9+tE1gUoTw="; + rev = "07eed415b0eec409dcdfedf848936d41f190c7ec"; + hash = "sha256-PgDZkL/tg7/uZhLLenRjkb5NB1hQjUJflaAce2TlDRE="; }; in buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-9BI+rXzTYonlMhcH8uiWyyF18JGv8GL1U9hZ9Z6X3As="; + npmDepsHash = "sha256-4pMYKmQ7+f8BKztLF4Jfe89tuh+DiQNnS3ulL0i6Gw0="; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -50,6 +50,10 @@ buildNpmPackage { "--nodedir=${electron.headers}" ]; + patches = [ + ./0001-feat-update-Disable-auto-checking-for-updates-and-updating-manually.patch + ]; + buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/be/bemoji/package.nix b/pkgs/by-name/be/bemoji/package.nix index a7b4215aceeb..939964c6bc87 100644 --- a/pkgs/by-name/be/bemoji/package.nix +++ b/pkgs/by-name/be/bemoji/package.nix @@ -3,16 +3,15 @@ stdenvNoCC, fetchFromGitHub, }: - -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "bemoji"; - version = "0.4.0"; + version = "0.4.0-unstable-2024-04-28"; src = fetchFromGitHub { owner = "marty-oehme"; repo = "bemoji"; - tag = "v${version}"; - hash = "sha256-HXwho0vRI9ZrUuDMicMH4ZNExY+zJfbrne2LMQmmHww="; + rev = "1b5e9c1284ede59d771bfd43780cc8f6f7446f38"; + hash = "sha256-WD4oFq0NRZ0Dt/YamutM7iWz3fMRxCqwgRn/rcUsTIw="; }; strictDeps = true; @@ -28,6 +27,9 @@ stdenvNoCC.mkDerivation rec { license = licenses.mit; mainProgram = "bemoji"; platforms = platforms.all; - maintainers = with maintainers; [ laurent-f1z1 ]; + maintainers = with maintainers; [ + laurent-f1z1 + MrSom3body + ]; }; } diff --git a/pkgs/by-name/ca/candy-icons/package.nix b/pkgs/by-name/ca/candy-icons/package.nix index 7f1a91366241..06c97dfc84c3 100644 --- a/pkgs/by-name/ca/candy-icons/package.nix +++ b/pkgs/by-name/ca/candy-icons/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "candy-icons"; - version = "0-unstable-2025-04-14"; + version = "0-unstable-2025-04-23"; src = fetchFromGitHub { owner = "EliverLara"; repo = "candy-icons"; - rev = "2ba176007c40957b43d26b7a9be2c9f23a480e98"; - hash = "sha256-6eWxf13ZBknN7IeLICpmDXu4GdxubkGJ9D4/ZEuOvfs="; + rev = "1763fc1f476e6c2ba7ca8df878645815b808ebca"; + hash = "sha256-aXAtVtsJC9MdkhUJWZnOQteaR005+KnPxFrEepfomCk="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix index 12e3586d2fad..02b3ca664fe0 100644 --- a/pkgs/by-name/ca/cargo-tally/package.nix +++ b/pkgs/by-name/ca/cargo-tally/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.62"; + version = "1.0.63"; src = fetchCrate { inherit pname version; - hash = "sha256-EZvwjxIw6ixaSvHod7l9178D7MRTk4MrWHPxy+UCgf4="; + hash = "sha256-SNTqoxguv+HRdTLBL+cxUGNmprlC6VnpZ8xp6tKr+is="; }; useFetchCargoVendor = true; - cargoHash = "sha256-aSOEaHlUeP8D0GDdI6iLnuRHFasTt1nM6EGzYxhIPvo="; + cargoHash = "sha256-gpGBXh1qR5cFZXDSYKDYg8d4/A/K88dYSUb9mNrmGno="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk_11_0.frameworks; diff --git a/pkgs/by-name/cl/clusterctl/package.nix b/pkgs/by-name/cl/clusterctl/package.nix index d38a5f096670..6aa4bbacafe3 100644 --- a/pkgs/by-name/cl/clusterctl/package.nix +++ b/pkgs/by-name/cl/clusterctl/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-04ytG4U8Luc5yh5VAbS1AQpjjapKsWWZSSB3IU5Rf6U="; + hash = "sha256-8clNhU9RxQ63zBaNnvftp4+wUG33bL8KCxbgzJwJdPo="; }; vendorHash = "sha256-iProsOETP9ahyemF2tHUVmoiqjG+ghjZkHb6PAhygb4="; diff --git a/pkgs/by-name/co/codec2/fix-pkg-config.patch b/pkgs/by-name/co/codec2/fix-pkg-config.patch new file mode 100644 index 000000000000..58b9d13e8e3c --- /dev/null +++ b/pkgs/by-name/co/codec2/fix-pkg-config.patch @@ -0,0 +1,13 @@ +diff --git a/codec2.pc.in b/codec2.pc.in +index ecca704..94fca12 100644 +--- a/codec2.pc.in ++++ b/codec2.pc.in +@@ -1,6 +1,5 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ +-includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/codec2 ++libdir=@CMAKE_INSTALL_LIBDIR@ ++includedir=@CMAKE_INSTALL_INCLUDEDIR@/codec2 + + Name: codec2 + Description: A speech codec for 2400 bit/s and below diff --git a/pkgs/by-name/co/codec2/package.nix b/pkgs/by-name/co/codec2/package.nix index 23e4896dbeca..5eef7e5c577b 100644 --- a/pkgs/by-name/co/codec2/package.nix +++ b/pkgs/by-name/co/codec2/package.nix @@ -1,5 +1,6 @@ { lib, + testers, stdenv, buildPackages, fetchFromGitHub, @@ -8,17 +9,28 @@ lpcnetfreedv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "codec2"; version = "1.2.0"; src = fetchFromGitHub { owner = "drowe67"; repo = "codec2"; - rev = "${version}"; + rev = finalAttrs.version; hash = "sha256-69Mp4o3MgV98Fqfai4txv5jQw2WpoPuoWcwHsNAFPQM="; }; + patches = [ + # Fix nix-store path dupliucations + ./fix-pkg-config.patch + ]; + + outputs = [ + "out" + "lib" + "dev" + ]; + nativeBuildInputs = [ cmake buildPackages.stdenv.cc # needs to build a C program to run at build time @@ -40,10 +52,18 @@ stdenv.mkDerivation rec { install -Dm0755 src/{c2enc,c2sim,freedv_rx,freedv_tx,cohpsk_*,fdmdv_*,fsk_*,ldpc_*,ofdm_*} -t $out/bin/ ''; - # Swap keyword order to satisfy SWIG parser - postFixup = '' - sed -r -i 's/(\<_Complex)(\s+)(float|double)/\3\2\1/' $out/include/$pname/freedv_api.h - ''; + postFixup = + # Swap keyword order to satisfy SWIG parser + '' + sed -r -i 's/(\<_Complex)(\s+)(float|double)/\3\2\1/' $dev/include/$pname/freedv_api.h + '' + + + # generated cmake module is not compatible with multiple outputs + '' + substituteInPlace $dev/lib/cmake/codec2/codec2-config.cmake --replace-fail \ + '"''${_IMPORT_PREFIX}/include/codec2' \ + "\"$dev/include/codec2" + ''; cmakeFlags = [ @@ -56,6 +76,8 @@ stdenv.mkDerivation rec { "-DLPCNET=ON" ]; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + meta = with lib; { description = "Speech codec designed for communications quality speech at low data rates"; homepage = "https://www.rowetel.com/codec2.html"; @@ -64,5 +86,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ markuskowa ]; # generate_codebook only built for host platform broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; + pkgConfigModules = [ "codec2" ]; }; -} +}) diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix index 6f9de3711b87..7dbfa6951bd2 100644 --- a/pkgs/by-name/co/comrak/package.nix +++ b/pkgs/by-name/co/comrak/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "comrak"; - version = "0.38.0"; + version = "0.39.0"; src = fetchFromGitHub { owner = "kivikakk"; repo = "comrak"; rev = "v${version}"; - sha256 = "sha256-chgg/6BJlCTOWPQ0jnE4l5O/lk0iA4xSwdWURKMF+f8="; + sha256 = "sha256-hy/kn8hShwzLHvzp3x1eSGipYRSXjOYCMPHEM1xQEr0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-lP0eGjYZ3AOOH8O4N77QRCNt5Vd2FGfP95vdJN467rE="; + cargoHash = "sha256-MFSyxoNzPzIP2Yi3lCyEcsAx4DvNmk2Jr75oD/tX9iE="; meta = with lib; { description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter"; diff --git a/pkgs/by-name/co/cosmic-ext-ctl/package.nix b/pkgs/by-name/co/cosmic-ext-ctl/package.nix index dfc2d23e4987..da6fcab6e26a 100644 --- a/pkgs/by-name/co/cosmic-ext-ctl/package.nix +++ b/pkgs/by-name/co/cosmic-ext-ctl/package.nix @@ -8,17 +8,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-ext-ctl"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "cosmic-ctl"; tag = "v${finalAttrs.version}"; - hash = "sha256-4UbmzBKxJwpyzucPRguQV1078961goiQlhtDjOGz1kA="; + hash = "sha256-URqNhkC1XrXYxr14K6sT3TLso38eWLMA+WplBdj52Vg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-53lpHzHQ6SoZzd+h6O0NvSJHsPgbW0/kqnDrM5D6SWQ="; + cargoHash = "sha256-OL1LqOAyIFFCGIp3ySdvEXJ1ECp9DgC/8mfAPo/E7k4="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/db/dbip-asn-lite/package.nix b/pkgs/by-name/db/dbip-asn-lite/package.nix index 4822f27c90ea..8be3a8f3a1b3 100644 --- a/pkgs/by-name/db/dbip-asn-lite/package.nix +++ b/pkgs/by-name/db/dbip-asn-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-asn-lite"; - version = "2025-04"; + version = "2025-05"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-gAMetVcoeTmXUYELzplAjz2Rk5p4tY4+NnCmmotUN0o="; + hash = "sha256-7o/mGSi66++h9mOPhsv/M/taDHJ7kPfKPh7jb+nC4IQ="; }; dontUnpack = true; diff --git a/pkgs/by-name/db/dbip-city-lite/package.nix b/pkgs/by-name/db/dbip-city-lite/package.nix index 13c3aaf1d50b..7d986448796b 100644 --- a/pkgs/by-name/db/dbip-city-lite/package.nix +++ b/pkgs/by-name/db/dbip-city-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-city-lite"; - version = "2025-04"; + version = "2025-05"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-KVp7dZJlEeLjN925bZq2+RnYgsdC724rkb/PxVxq9vE="; + hash = "sha256-Trqy6BlagHycC432BE1p/fF+hfcVpPhzVJTKIJQaWlY="; }; dontUnpack = true; diff --git a/pkgs/by-name/db/dbip-country-lite/package.nix b/pkgs/by-name/db/dbip-country-lite/package.nix index 4132f81727fe..23fb563eaffa 100644 --- a/pkgs/by-name/db/dbip-country-lite/package.nix +++ b/pkgs/by-name/db/dbip-country-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; - version = "2025-04"; + version = "2025-05"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-Be9Q4VQUb5ql0BLreSu4YBGA+NHJkofjsp46aN7tI1E="; + hash = "sha256-7ZmodKYVMID/5yOMZuEpRkb41/DTrgprJPG7DYnYNak="; }; dontUnpack = true; diff --git a/pkgs/by-name/di/dialect/package.nix b/pkgs/by-name/di/dialect/package.nix index a72f896d87bc..b119fccc63be 100644 --- a/pkgs/by-name/di/dialect/package.nix +++ b/pkgs/by-name/di/dialect/package.nix @@ -68,10 +68,13 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + postFixup = '' + patchShebangs --update --host $out/share/dialect/search_provider + ''; + doCheck = false; - # handle setup hooks better - strictDeps = false; + strictDeps = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/do/domination/package.nix b/pkgs/by-name/do/domination/package.nix index d4d43547ffbf..713a003bbd9f 100644 --- a/pkgs/by-name/do/domination/package.nix +++ b/pkgs/by-name/do/domination/package.nix @@ -30,7 +30,7 @@ let in stdenv.mkDerivation { pname = "domination"; - version = "1.3.3"; + version = "1.3.4"; # The .zip releases do not contain the build.xml file src = fetchsvn { @@ -40,8 +40,8 @@ stdenv.mkDerivation { # https://sourceforge.net/p/domination/code/HEAD/tree/Domination/ChangeLog.txt # Alternatively, look for revs like "changelog update", # "new version x.y.z info on website", or "website update for x.y.z". - rev = "2616"; - hash = "sha256-/h9TstRxMpeoEsIeSN0MRmyRsiBHomguIPch1Zda8s8="; + rev = "2664"; + hash = "sha256-bkaHpqJSc3UvwNT7LwuPUT8xN0g6QypfLSHlLmm8nX8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dv/dvdisaster/gcc14-fix.patch b/pkgs/by-name/dv/dvdisaster/gcc14-fix.patch new file mode 100644 index 000000000000..95c6925eec37 --- /dev/null +++ b/pkgs/by-name/dv/dvdisaster/gcc14-fix.patch @@ -0,0 +1,10 @@ +diff --git a/scripts/bash-based-configure b/scripts/bash-based-configure +--- a/scripts/bash-based-configure ++++ b/scripts/bash-based-configure +@@ -1364,6 +1364,7 @@ EOF + + cat >conftest.c < ++#include + int main(int argc, char *argv[]) + { g_malloc(1024); diff --git a/pkgs/by-name/dv/dvdisaster/package.nix b/pkgs/by-name/dv/dvdisaster/package.nix index c5e2921ce507..d654c0fb377c 100644 --- a/pkgs/by-name/dv/dvdisaster/package.nix +++ b/pkgs/by-name/dv/dvdisaster/package.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { patches = lib.optionals enableSoftening [ ./encryption.patch ./dvdrom.patch + ./gcc14-fix.patch ]; postPatch = '' diff --git a/pkgs/by-name/en/encrypted-dns-server/package.nix b/pkgs/by-name/en/encrypted-dns-server/package.nix index dd8aa1a4c326..57e42e80ce33 100644 --- a/pkgs/by-name/en/encrypted-dns-server/package.nix +++ b/pkgs/by-name/en/encrypted-dns-server/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage rec { pname = "encrypted-dns-server"; - version = "0.9.16"; + version = "0.9.17"; src = fetchFromGitHub { owner = "DNSCrypt"; repo = "encrypted-dns-server"; tag = version; - hash = "sha256-llBMOqmxEcysoBsRg5s1uqCyR6+ilTgBI7BaeSDVoEw="; + hash = "sha256-un7607HQ7s7G2GPTmYVT3wK/ePLNVyV+A2mtKt0YGsw="; }; - cargoHash = "sha256-33XcfiktgDG34aamw8X3y0QkybVENUJxLhx47WZUpFc="; + cargoHash = "sha256-qhY1LgtV0Kmj/at9EG7Y+swN1Oy0/SzRCr7U8xVh8KA="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/en/enter-tex/package.nix b/pkgs/by-name/en/enter-tex/package.nix index f0ee8ce9f387..ba5874c66536 100644 --- a/pkgs/by-name/en/enter-tex/package.nix +++ b/pkgs/by-name/en/enter-tex/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchurl, + fetchFromGitLab, desktop-file-utils, docbook-xsl-nons, gettext, @@ -21,16 +21,20 @@ libgedit-gtksourceview, libgedit-tepl, libgee, - gnome, + gitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "enter-tex"; - version = "3.47.0"; + version = "3.48.0"; - src = fetchurl { - url = "mirror://gnome/sources/enter-tex/${lib.versions.majorMinor finalAttrs.version}/enter-tex-${finalAttrs.version}.tar.xz"; - hash = "sha256-oIyuySdcCruVNWdN9bnBa5KxSWjNIZFtb/wvoMud12o="; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "gedit"; + repo = "enter-tex"; + tag = finalAttrs.version; + hash = "sha256-OnkP4E1kNWuE9k7SQ/ujnxnFgVyAqIhqHAw04ZA0Tno="; }; nativeBuildInputs = [ @@ -60,18 +64,16 @@ stdenv.mkDerivation (finalAttrs: { preBuild = '' # Workaround the use case of C code mixed with Vala code. - # https://gitlab.gnome.org/swilmet/enter-tex/-/blob/3.47.0/docs/more-information.md#install-procedure + # https://gitlab.gnome.org/World/gedit/enter-tex/-/blob/3.48.0/docs/more-information.md#install-procedure ninja src/gtex/Gtex-1.gir ''; doCheck = true; - passthru.updateScript = gnome.updateScript { - packageName = "enter-tex"; - }; + passthru.updateScript = gitUpdater { }; meta = with lib; { - homepage = "https://gitlab.gnome.org/swilmet/enter-tex"; + homepage = "https://gitlab.gnome.org/World/gedit/enter-tex"; description = "LaTeX editor for the GNOME desktop"; maintainers = with maintainers; [ manveru diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 2b61b9e4d3f0..ef41d71f4472 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "eza"; - version = "0.21.2"; + version = "0.21.3"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; tag = "v${finalAttrs.version}"; - hash = "sha256-r8svNiz0hcK0QQ0LvkYKTc9gLOEDLylZss32g6sM/hY="; + hash = "sha256-6SGGeZVQe3uuyEt6TJn5cBqnI/BdDGRiPHugKrgQNhs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-akoRFvlwHUg8KzmxMGkJ//fIrX/+/yu6fHbxBjgwUZc="; + cargoHash = "sha256-QCy9lLOSB+64DPTc/SVSCrD2nfJswGcR2P9AdN6CqZw="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/fi/fileshelter/package.nix b/pkgs/by-name/fi/fileshelter/package.nix index 093348d39de2..5b13c3d073b5 100644 --- a/pkgs/by-name/fi/fileshelter/package.nix +++ b/pkgs/by-name/fi/fileshelter/package.nix @@ -2,50 +2,57 @@ lib, stdenv, fetchFromGitHub, - autoreconfHook, + cmake, libzip, boost, - wt4, + wt, libconfig, pkg-config, + libarchive, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fileshelter"; - version = "4.0.1"; + version = "6.2.0"; src = fetchFromGitHub { owner = "epoupon"; repo = "fileshelter"; - rev = "v${version}"; - sha256 = "07n70wwqj7lqdxs3wya1m8bwg8l6lgmmlfpwyv3r3s4dfzb1b3ka"; + tag = "v${finalAttrs.version}"; + hash = "sha256-21ANNJB7rbGAdlS7ELyGAEIjvK8biFlH27yVHrLKpwY="; }; + postPatch = '' + sed -i '1i #include ' src/fileshelter/ui/ShareCreateFormView.cpp + ''; + enableParallelBuilding = true; nativeBuildInputs = [ - autoreconfHook + cmake pkg-config ]; + buildInputs = [ libzip boost - wt4 + wt libconfig + libarchive ]; NIX_LDFLAGS = "-lpthread"; postInstall = '' - ln -s ${wt4}/share/Wt/resources $out/share/fileshelter/docroot/resources + ln -s ${wt}/share/Wt/resources $out/share/fileshelter/docroot/resources ''; - meta = with lib; { + meta = { homepage = "https://github.com/epoupon/fileshelter"; description = "FileShelter is a 'one-click' file sharing web application"; mainProgram = "fileshelter"; - maintainers = [ maintainers.willibutz ]; - license = licenses.gpl3; + maintainers = [ lib.maintainers.willibutz ]; + license = lib.licenses.gpl3; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/fl/flitter/package.nix b/pkgs/by-name/fl/flitter/package.nix index 05dee0723c00..2296d8f9d0ae 100644 --- a/pkgs/by-name/fl/flitter/package.nix +++ b/pkgs/by-name/fl/flitter/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "flitter"; - version = "1.1.1"; + version = "1.1.3"; src = fetchFromGitHub { owner = "alexozer"; repo = "flitter"; - rev = "v${version}"; - sha256 = "sha256-8e13kSQEjzzf+j4uTrocVioZjJ6lAz+80dLfWwjPb9o="; + tag = version; + hash = "sha256-LG4gCpV4NUOuQMjGIjjX+pc9dL/IG6pzy3J5cDfUE5k="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nhFTXjOXy9QxsASlZHC4jXAJ/Xw65g1l3JczOYvq3dc="; + cargoHash = "sha256-V+GsBEyGNI+13TsIci5GC0VW5BYPCGDAlpaj9DQWjCg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fo/foot/package.nix b/pkgs/by-name/fo/foot/package.nix index 987028a8d096..65a67a135016 100644 --- a/pkgs/by-name/fo/foot/package.nix +++ b/pkgs/by-name/fo/foot/package.nix @@ -27,7 +27,7 @@ }: let - version = "1.22.2"; + version = "1.22.3"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -104,7 +104,7 @@ stdenv.mkDerivation { owner = "dnkl"; repo = "foot"; tag = version; - hash = "sha256-eX9nSAl2pHbJU8g80q3RifDlFh00LSi8GvYU4+rlIsA="; + hash = "sha256:1l5liw4dgv7hxdimyk5qycmkfjgimdrx51rjvdizpcfmdlkvg518"; }; separateDebugInfo = true; diff --git a/pkgs/by-name/fr/frei/package.nix b/pkgs/by-name/fr/frei/package.nix index 4aa13565c2b6..bbbde6301315 100644 --- a/pkgs/by-name/fr/frei/package.nix +++ b/pkgs/by-name/fr/frei/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "frei"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "alexcoder04"; repo = "frei"; rev = "v${version}"; - sha256 = "sha256-C70c/uADy/D2YARRYROkc6Bs/VtYH3SIXUjSF3+qVjY="; + sha256 = "sha256-QVoRiqQt4DJK07YcCPplxigpgIqjDeQVYyDK/KQ7gbo="; }; vendorHash = null; diff --git a/pkgs/by-name/fu/functiontrace-server/package.nix b/pkgs/by-name/fu/functiontrace-server/package.nix index e82b26757d45..22bbfbf05428 100644 --- a/pkgs/by-name/fu/functiontrace-server/package.nix +++ b/pkgs/by-name/fu/functiontrace-server/package.nix @@ -9,15 +9,15 @@ rustPlatform.buildRustPackage rec { pname = "functiontrace-server"; - version = "0.8.3"; + version = "0.8.4"; src = fetchCrate { inherit pname version; - hash = "sha256-xTNNAYhxyL5/Sip+nZJleWOjTYs2MH3QM7pzLYk/6Gs="; + hash = "sha256-i+lXjFXCPT6Skr+r/RKYQm+iJ+WETJ/tAQg5U6qFFi8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-zwarLDKaI4TMCId8+3wVtioOMw2F8Z7Rnl0bKbQVndQ="; + cargoHash = "sha256-61+hEq0cdJZ+DTgN/ZtK6IKuwLCq3oxk0SrzqWewQXs="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation diff --git a/pkgs/by-name/ge/gedit/package.nix b/pkgs/by-name/ge/gedit/package.nix index 0a18a3c39c04..d76cfd91456a 100644 --- a/pkgs/by-name/ge/gedit/package.nix +++ b/pkgs/by-name/ge/gedit/package.nix @@ -3,8 +3,7 @@ lib, meson, mesonEmulatorHook, - fetchurl, - python3, + fetchFromGitLab, pkg-config, gtk3, gtk-mac-integration, @@ -20,7 +19,7 @@ gobject-introspection, docbook-xsl-nons, ninja, - gnome, + gitUpdater, gspell, itstool, desktop-file-utils, @@ -29,16 +28,21 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "48.1"; + version = "48.2"; outputs = [ "out" "devdoc" ]; - src = fetchurl { - url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz"; - hash = "sha256-lx56wmvAo6Pe0np1Y3ckFWh9sOWgkrRUflsQpVhYswo="; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "gedit"; + repo = "gedit"; + tag = version; + fetchSubmodules = true; + hash = "sha256-M8ZyjY4wSogEjhEx9sOKfuGkbiypDmZoU0H4ja+TgaY="; }; patches = [ @@ -55,7 +59,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 vala wrapGAppsHook3 gtk-doc @@ -81,19 +84,10 @@ stdenv.mkDerivation rec { gtk-mac-integration ]; - postPatch = '' - chmod +x build-aux/meson/post_install.py - patchShebangs build-aux/meson/post_install.py - ''; - # Reliably fails to generate gedit-file-browser-enum-types.h in time enableParallelBuilding = false; - passthru = { - updateScript = gnome.updateScript { - packageName = "gedit"; - }; - }; + passthru.updateScript = gitUpdater { }; meta = with lib; { homepage = "https://gitlab.gnome.org/World/gedit/gedit"; diff --git a/pkgs/by-name/gh/ghostunnel/package.nix b/pkgs/by-name/gh/ghostunnel/package.nix index 2a3221b08c9e..4ad5562b358c 100644 --- a/pkgs/by-name/gh/ghostunnel/package.nix +++ b/pkgs/by-name/gh/ghostunnel/package.nix @@ -4,6 +4,8 @@ fetchFromGitHub, lib, nixosTests, + apple-sdk_12, + darwinMinVersionHook, }: buildGoModule rec { @@ -17,16 +19,20 @@ buildGoModule rec { hash = "sha256-NnRm1HEdfK6WI5ntilLSwdR2B5czG5CIcMFzl2TzEds="; }; - vendorHash = null; + vendorHash = "sha256-vP8OtjpYNMm1KkNfD3pmNrHh3HRy1GkzUbfLKWKhHbo="; deleteVendor = true; - # The certstore directory isn't recognized as a subpackage, but is when moved - # into the vendor directory. - postUnpack = '' - mkdir -p $sourceRoot/vendor/ghostunnel - mv $sourceRoot/certstore $sourceRoot/vendor/ghostunnel/ - ''; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_12 + (darwinMinVersionHook "12.0") + ]; + + # These tests don't exist for Linux, and on Darwin they attempt to use the macOS Keychain + # which doesn't work from a nix build. Presumably other platform implementations of the + # certstore would have similar issues, so it probably makes sense to skip them in + # general wherever they are available. + checkFlags = [ "-skip=^Test(ImportDelete|Signer|Certificate)(RSA|ECDSA|EC)$" ]; passthru.tests = { nixos = nixosTests.ghostunnel; @@ -34,12 +40,14 @@ buildGoModule rec { }; meta = with lib; { - broken = stdenv.hostPlatform.isDarwin; description = "TLS proxy with mutual authentication support for securing non-TLS backend applications"; homepage = "https://github.com/ghostunnel/ghostunnel#readme"; changelog = "https://github.com/ghostunnel/ghostunnel/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ roberth ]; + maintainers = with maintainers; [ + roberth + mjm + ]; mainProgram = "ghostunnel"; }; } diff --git a/pkgs/by-name/go/golden-cheetah/package.nix b/pkgs/by-name/go/golden-cheetah/package.nix index dd33b079b74d..f1dde6dc67db 100644 --- a/pkgs/by-name/go/golden-cheetah/package.nix +++ b/pkgs/by-name/go/golden-cheetah/package.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "golden-cheetah"; - version = "3.7-DEV2408"; + version = "3.7"; src = fetchFromGitHub { owner = "GoldenCheetah"; repo = "GoldenCheetah"; tag = "v${finalAttrs.version}"; - hash = "sha256-6JAdnYaKULJsc/zdcTMbCkbOCbiVtnJivEazDKL721c="; + hash = "sha256-INlkFWugIoln7wrmgLZUC/Ye8eV+mlT6BZ0ZdP7CiqE="; }; buildInputs = diff --git a/pkgs/by-name/go/gosmee/package.nix b/pkgs/by-name/go/gosmee/package.nix index c633b867aaea..fd678b51f623 100644 --- a/pkgs/by-name/go/gosmee/package.nix +++ b/pkgs/by-name/go/gosmee/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gosmee"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "chmouel"; repo = "gosmee"; rev = "v${version}"; - hash = "sha256-hE9iZkIkMzCICw9n1XhJ2PO5SvqE0EVhLJQO7tCUw3U="; + hash = "sha256-aQ25V6FKfvXWFjeWkTQLWQfeZGBMlBUe2L9IkDPN+88="; }; vendorHash = null; diff --git a/pkgs/by-name/go/goto/package.nix b/pkgs/by-name/go/goto/package.nix new file mode 100644 index 000000000000..3a36d160a2cc --- /dev/null +++ b/pkgs/by-name/go/goto/package.nix @@ -0,0 +1,62 @@ +{ + fetchFromGitHub, + gawk, + lib, + nix-update-script, + runCommand, + stdenvNoCC, + writableTmpDirAsHomeHook, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "goto"; + version = "2.1.0-unstable-2020-11-15"; + + src = fetchFromGitHub { + owner = "iridakos"; + repo = "goto"; + # no tags + rev = "b7fda54e0817b9cb47e22a78bd00b4571011cf58"; + hash = "sha256-dUxim8LLb+J9cI7HySkmC2DIWbWAKSsH/cTVXmt8zRo="; + }; + + strictDeps = true; + + buildInputs = [ gawk ]; + + postInstall = '' + install -Dm644 goto.sh -t $out/share/ + ''; + + passthru.tests.basic-usage = + runCommand "goto-basic-usage" + { + nativeBuildInputs = [ writableTmpDirAsHomeHook ]; + } + '' + # Mock `complete` since the builder `pkgs.bash` is not interactive. + complete() { return; } + + source ${finalAttrs.finalPackage}/share/goto.sh + + goto --register pwd . + cd / + goto pwd + goto --unregister pwd + goto --list + + touch $out + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { + description = "Alias and navigate to directories with tab completion"; + homepage = "https://github.com/iridakos/goto"; + changelog = "https://github.com/iridakos/goto/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.bmrips ]; + }; +}) diff --git a/pkgs/by-name/gt/gtree/package.nix b/pkgs/by-name/gt/gtree/package.nix index 48b27869537a..d02df3608dd0 100644 --- a/pkgs/by-name/gt/gtree/package.nix +++ b/pkgs/by-name/gt/gtree/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gtree"; - version = "1.11.4"; + version = "1.11.5"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-a2kQVn/3PyGZliPOB/2hFULK+YJBv7JVv0p7cbmfsN0="; + hash = "sha256-AEzquSbDFy5vXyIjRvVxMp6ArDiPqy0XfPiPVPisobw="; }; - vendorHash = "sha256-ARmyA8qYKv8xTmpaN77D/NlBfFJFVTGudpBeQG5apso="; + vendorHash = "sha256-N+w8UreFq/SYjZgFh6QNcC/YsCDze/v2jvD0D19dDUs="; subPackages = [ "cmd/gtree" diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index f4524b85bc11..c88fa4a2ecac 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.31.0"; + version = "0.32.1"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-+XO81A7F3QOGcDm/keqUHbURCQfzAHRiAlQmNzGo1IU="; + hash = "sha256-6W1NFZ5wRL3RxNYbgRH4qCSDNwOc3uQFeFujffusjGo="; }; buildAndTestSubdir = "harper-ls"; useFetchCargoVendor = true; - cargoHash = "sha256-EwWBqVTkBH4p1ljBitXtGkjUlx96Uajxc0z7DDkGawo="; + cargoHash = "sha256-PKqLf7UrtQp8pLIJbFgZ53iW+So6Yq7cpETARsnMFvI="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/hc/hcxdumptool/package.nix b/pkgs/by-name/hc/hcxdumptool/package.nix index 9072ec49a6c7..dda50597c05f 100644 --- a/pkgs/by-name/hc/hcxdumptool/package.nix +++ b/pkgs/by-name/hc/hcxdumptool/package.nix @@ -1,31 +1,35 @@ { - stdenv, lib, + stdenv, fetchFromGitHub, openssl, + libpcap, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hcxdumptool"; - version = "6.3.2"; + version = "6.3.5"; src = fetchFromGitHub { owner = "ZerBea"; repo = "hcxdumptool"; - rev = version; - sha256 = "sha256-InMyDUEH135Y1RYJ3z1+RQxPMi7+QMf670S/S2ZL9vg="; + tag = finalAttrs.version; + hash = "sha256-PA4nbjg4ybWvZZ7wbsh+OR/wEEVm5qu5OfM9EO3HBYs="; }; - buildInputs = [ openssl ]; + buildInputs = [ + openssl + libpcap + ]; installFlags = [ "PREFIX=$(out)" ]; - meta = with lib; { + meta = { homepage = "https://github.com/ZerBea/hcxdumptool"; description = "Small tool to capture packets from wlan devices"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ danielfullmer ]; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ danielfullmer ]; mainProgram = "hcxdumptool"; }; -} +}) diff --git a/pkgs/by-name/hd/hddfancontrol/package.nix b/pkgs/by-name/hd/hddfancontrol/package.nix index 419e2b424438..d42f7ef8d4ba 100644 --- a/pkgs/by-name/hd/hddfancontrol/package.nix +++ b/pkgs/by-name/hd/hddfancontrol/package.nix @@ -11,17 +11,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "hddfancontrol"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "desbma"; repo = "hddfancontrol"; tag = finalAttrs.version; - hash = "sha256-/+bvTpfgAjyG8gkyhueLJCKJo3e2OvabfOYOM9vV+g8="; + hash = "sha256-GdvGFNmarLxtO6BoZ8PktVvAiKIxu4FdZWCJeVtW/fI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-yupjse1snr467otqZgoSANpKoxq2F8NDfo8NvwGNJxk="; + cargoHash = "sha256-1GPct+CabVE8/tMpWsQ3/XRJQkcAmS6UDNuz5c/Oewo="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/hi/high-tide/package.nix b/pkgs/by-name/hi/high-tide/package.nix new file mode 100644 index 000000000000..ff68daa49623 --- /dev/null +++ b/pkgs/by-name/hi/high-tide/package.nix @@ -0,0 +1,70 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + wrapGAppsHook4, + meson, + ninja, + pkg-config, + blueprint-compiler, + desktop-file-utils, + libadwaita, + gst_all_1, + libsecret, +}: + +python3Packages.buildPythonApplication { + pname = "high-tide"; + version = "0-unstable-2025-05-01"; + pyproject = false; + + src = fetchFromGitHub { + owner = "Nokse22"; + repo = "high-tide"; + rev = "6278ff9471b7481cf0291ab2a9f6d06322506dfc"; + hash = "sha256-4pVRVXEwz0ngjS1Vpt/o00lLYsZ6SvTCk4ivyGoQ4lQ="; + }; + + nativeBuildInputs = [ + wrapGAppsHook4 + meson + ninja + pkg-config + blueprint-compiler + desktop-file-utils + ]; + + buildInputs = + [ libadwaita ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gst-plugins-bad + libsecret + ]); + + dependencies = with python3Packages; [ + pygobject3 + tidalapi + requests + mpd2 + ]; + + dontWrapGApps = true; + + makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; + + meta = { + description = "Libadwaita TIDAL client for Linux"; + homepage = "https://github.com/Nokse22/high-tide"; + license = with lib.licenses; [ gpl3Plus ]; + mainProgram = "HighTide"; + maintainers = with lib.maintainers; [ + nyabinary + griffi-gh + ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ht/httptap/package.nix b/pkgs/by-name/ht/httptap/package.nix index 547ac3ce14d9..8d8f15cd4c3e 100644 --- a/pkgs/by-name/ht/httptap/package.nix +++ b/pkgs/by-name/ht/httptap/package.nix @@ -2,37 +2,24 @@ lib, buildGoModule, fetchFromGitHub, - fetchpatch, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "httptap"; - version = "0.0.8"; + version = "0.1.1"; src = fetchFromGitHub { owner = "monasticacademy"; repo = "httptap"; - tag = "v${version}"; - hash = "sha256-1BtV5ao5dAKSINdUdJD/wxTMFXXiP8Vy1A7gQfVIsUQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Cn5u6q0r06SJp4uhF7j5K6yNZv8Q3WNxlDd5Vxmshhw="; }; - patches = [ - # this patch updates go.mod to include missing dependencies - # https://github.com/monasticacademy/httptap/pull/13 - (fetchpatch { - name = "update-go-mod"; - url = "https://github.com/monasticacademy/httptap/commit/3b520725c784d6435be6a51c58ae847bae729962.patch"; - hash = "sha256-0dPq0Ldu1m8YZKctFtoUcbQdmx6sqjA8EVhTeMwNWx8="; - }) - ]; - - vendorHash = "sha256-+TtHw2KdeNHCgnMnkxJJ9shqsrlbeTzYwbPH0dJmCjM="; + vendorHash = "sha256-yTtUt+kfDwN6W4caHCAYFjpYzhaqZUbLe+Nz7JKAXu8="; env.CGO_ENABLED = 0; - subPackages = [ - "." - ]; + subPackages = [ "." ]; ldflags = [ "-s" @@ -46,4 +33,4 @@ buildGoModule rec { maintainers = with lib.maintainers; [ jpetrucciani ]; mainProgram = "httptap"; }; -} +}) diff --git a/pkgs/by-name/hv/hvm/package.nix b/pkgs/by-name/hv/hvm/package.nix index a6a9d39cb309..72038f23c864 100644 --- a/pkgs/by-name/hv/hvm/package.nix +++ b/pkgs/by-name/hv/hvm/package.nix @@ -13,6 +13,11 @@ rustPlatform.buildRustPackage rec { hash = "sha256-AD8mv47m4E6H8BVkxTExyhrR7VEnuB/KxnRl2puPnX4="; }; + # Insert empty line in expected output of rust panic in a test + postPatch = '' + sed -i '6G' tests/snapshots/run__file@empty.hvm.snap + ''; + useFetchCargoVendor = true; cargoHash = "sha256-nLcT+o6xrxPmQqK7FQpCqTlxOOUA1FzqRGQIypcq4fo="; diff --git a/pkgs/by-name/ic/icdiff/package.nix b/pkgs/by-name/ic/icdiff/package.nix index dff381e00e50..d34b976f068e 100644 --- a/pkgs/by-name/ic/icdiff/package.nix +++ b/pkgs/by-name/ic/icdiff/package.nix @@ -1,7 +1,7 @@ { lib, - fetchFromGitHub, python3Packages, + fetchFromGitHub, bash, git, less, @@ -9,33 +9,33 @@ python3Packages.buildPythonApplication rec { pname = "icdiff"; - version = "1.9.5"; + version = "2.0.7"; src = fetchFromGitHub { owner = "jeffkaufman"; repo = "icdiff"; - rev = "release-${version}"; - sha256 = "080v8h09pv8qwplin4kwfm0kmqjwdqjfxbpcdrv16sv4hwfwl5qd"; + tag = "release-${version}"; + hash = "sha256-XOw/xhPGlzi1hAgzQ1EtioUM476A+lQWLlvvaxd9j08="; }; + # error: could not lock config file /homeless-shelter/.gitconfig: No such file or directory + doCheck = false; + nativeCheckInputs = [ bash git less ]; - # error: could not lock config file /homeless-shelter/.gitconfig: No such file or directory - doCheck = false; - checkPhase = '' patchShebangs test.sh ./test.sh ${python3Packages.python.interpreter} ''; - meta = with lib; { + meta = { homepage = "https://www.jefftk.com/icdiff"; description = "Side-by-side highlighted command line diffs"; maintainers = [ ]; - license = licenses.psfl; + license = lib.licenses.psfl; }; } diff --git a/pkgs/by-name/ig/ignite-cli/package.nix b/pkgs/by-name/ig/ignite-cli/package.nix index 4c9123b2c842..e968ec050628 100644 --- a/pkgs/by-name/ig/ignite-cli/package.nix +++ b/pkgs/by-name/ig/ignite-cli/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "ignite-cli"; - version = "28.9.0"; + version = "28.10.0"; src = fetchFromGitHub { repo = "cli"; owner = "ignite"; rev = "v${version}"; - hash = "sha256-NLQ+Zd77JyHuih7hPeM067fcpny1V50GFDLGhtclGms="; + hash = "sha256-oGPiU6vC9T/fadyt97GkZBuPojINXnQPhtguwv7eyJU="; }; vendorHash = "sha256-EaOs3m5AN0EYMO8j3mkKPOQwapi0WRaTIUJKTjDpmCo="; diff --git a/pkgs/by-name/in/intel-media-driver/package.nix b/pkgs/by-name/in/intel-media-driver/package.nix index 41ad93d9135f..dea1d295f683 100644 --- a/pkgs/by-name/in/intel-media-driver/package.nix +++ b/pkgs/by-name/in/intel-media-driver/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "24.4.4"; + version = "25.1.4"; outputs = [ "out" @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - hash = "sha256-vZIWH/YBrUMmXu/JBBeGPOsn7pZUDaU8O6vgoekGhVU="; + hash = "sha256-kRMBOQpGWVrOvQ2RoYZzoYAfB2r7UqesiaTajjw+SLA="; }; patches = [ diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix index d52400feecd1..6a5c0eacbedf 100644 --- a/pkgs/by-name/je/jetbrains-toolbox/package.nix +++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix @@ -6,6 +6,7 @@ fetchurl, makeWrapper, icu, + libappindicator-gtk3, undmg, }: @@ -65,6 +66,7 @@ let install -Dm644 ${src}/jetbrains-toolbox.desktop $out/share/applications/jetbrains-toolbox.desktop install -Dm644 ${src}/.DirIcon $out/share/icons/hicolor/scalable/apps/jetbrains-toolbox.svg wrapProgram $out/bin/jetbrains-toolbox \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libappindicator-gtk3 ]} \ --append-flags "--update-failed" ''; diff --git a/pkgs/by-name/jq/jql/package.nix b/pkgs/by-name/jq/jql/package.nix index 3de35f8e43a2..0dc871b3f14c 100644 --- a/pkgs/by-name/jq/jql/package.nix +++ b/pkgs/by-name/jq/jql/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "8.0.5"; + version = "8.0.6"; src = fetchFromGitHub { owner = "yamafaktory"; repo = "jql"; rev = "jql-v${version}"; - hash = "sha256-0sQEC2kUnuuKp73DJsNBFB0VL0rkBkudmr7ZQpS1v04="; + hash = "sha256-bb3QoODsVZaTw5mcagvcGLn8uwG48nmHPgtlIC2ZdVE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-10eM7tczFoQVYagyP1btsCp4PHm+zRoh2oAEVVxsROA="; + cargoHash = "sha256-7+qlQf44DgjijKlM+HRjyubH3W/PJbortri3ur0ASnk="; meta = with lib; { description = "JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/by-name/ku/kube-bench/package.nix b/pkgs/by-name/ku/kube-bench/package.nix index 60faa6132cfd..16680335753b 100644 --- a/pkgs/by-name/ku/kube-bench/package.nix +++ b/pkgs/by-name/ku/kube-bench/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "kube-bench"; - version = "0.10.5"; + version = "0.10.6"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; tag = "v${version}"; - hash = "sha256-SI7rkJdl54e6b+zZEsj7CIU0wheDRcrAmCLoNWr7O8E="; + hash = "sha256-+4OSqFU9IoVN9lsw6CwVL60OU4e/yCBZfnD8qqNLTtk="; }; vendorHash = "sha256-BB7DHACKELwvquOwmBSXl1kwKw43mNnpp5yY33wwdVo="; diff --git a/pkgs/by-name/li/libgedit-gfls/package.nix b/pkgs/by-name/li/libgedit-gfls/package.nix index e1572fed66a0..4177af865e1d 100644 --- a/pkgs/by-name/li/libgedit-gfls/package.nix +++ b/pkgs/by-name/li/libgedit-gfls/package.nix @@ -11,11 +11,12 @@ mesonEmulatorHook, gtk3, glib, + gitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "libgedit-gfls"; - version = "0.2.1"; + version = "0.3.0"; outputs = [ "out" @@ -28,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: { group = "World"; owner = "gedit"; repo = "libgedit-gfls"; - rev = finalAttrs.version; - hash = "sha256-kMkqEly8RDc5eKqUupQD4tkVIXxL1rt4e/OCAPoutIg="; + tag = finalAttrs.version; + hash = "sha256-X56QPcmNB0Ey+kzSqDnb6/j6/w7IU7MFSAxW8mX8I3w="; }; nativeBuildInputs = @@ -54,6 +55,8 @@ stdenv.mkDerivation (finalAttrs: { glib ]; + passthru.updateScript = gitUpdater { }; + meta = { homepage = "https://gitlab.gnome.org/World/gedit/libgedit-gfls"; description = "Module dedicated to file loading and saving"; diff --git a/pkgs/by-name/li/libgedit-tepl/package.nix b/pkgs/by-name/li/libgedit-tepl/package.nix index 6c48604b3691..0f81c4e9e414 100644 --- a/pkgs/by-name/li/libgedit-tepl/package.nix +++ b/pkgs/by-name/li/libgedit-tepl/package.nix @@ -15,11 +15,12 @@ pkg-config, gtk-doc, docbook-xsl-nons, + gitUpdater, }: stdenv.mkDerivation rec { pname = "libgedit-tepl"; - version = "6.12.0"; + version = "6.13.0"; outputs = [ "out" @@ -32,8 +33,8 @@ stdenv.mkDerivation rec { group = "World"; owner = "gedit"; repo = "libgedit-tepl"; - rev = version; - hash = "sha256-s3b7wj6b2SM0+i0vXUDDhnspgPcsRAsA5kLblh0orJE="; + tag = version; + hash = "sha256-YWONsw5+gq5Uew6xB76pKsGTJmI83zAssO5WX6aP7ZM="; }; strictDeps = true; @@ -62,6 +63,8 @@ stdenv.mkDerivation rec { libgedit-gtksourceview ]; + passthru.updateScript = gitUpdater { }; + meta = with lib; { homepage = "https://gitlab.gnome.org/World/gedit/libgedit-tepl"; description = "Text editor product line"; diff --git a/pkgs/by-name/li/libmsquic/package.nix b/pkgs/by-name/li/libmsquic/package.nix index 8e81434c8b4d..48bce894edfb 100644 --- a/pkgs/by-name/li/libmsquic/package.nix +++ b/pkgs/by-name/li/libmsquic/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmsquic"; - version = "2.4.9"; + version = "2.4.10"; src = fetchFromGitHub { owner = "microsoft"; repo = "msquic"; tag = "v${finalAttrs.version}"; - hash = "sha256-XcqSM4Kt6YuLsbqYcMd+g4pfBjoMMfX9xA85fWQhcck="; + hash = "sha256-lAiBS5DQISeu9ZbBOAxBSlAJ9Xn0kq7HI+eMw4nHt/E="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/li/libxeddsa/package.nix b/pkgs/by-name/li/libxeddsa/package.nix new file mode 100644 index 000000000000..7b33a5a3f02a --- /dev/null +++ b/pkgs/by-name/li/libxeddsa/package.nix @@ -0,0 +1,39 @@ +{ + stdenv, + lib, + fetchFromGitHub, + gitUpdater, + cmake, + libsodium, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libxeddsa"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "Syndace"; + repo = "libxeddsa"; + tag = "v${finalAttrs.version}"; + hash = "sha256-kdy+S51nQstRFGw5mIW3TW+WBNynHLpmFC1t6Mc02K4="; + }; + + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libsodium ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = { + description = "Toolkit around Curve25519 and Ed25519 key pairs"; + homepage = "https://github.com/Syndace/libxeddsa"; + changelog = "https://github.com/Syndace/libxeddsa/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + teams = with lib.teams; [ ngi ]; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/lu/lug-helper/package.nix b/pkgs/by-name/lu/lug-helper/package.nix index 5e0e8dc152b4..047410317329 100644 --- a/pkgs/by-name/lu/lug-helper/package.nix +++ b/pkgs/by-name/lu/lug-helper/package.nix @@ -15,12 +15,12 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { name = "lug-helper"; - version = "3.7"; + version = "3.8"; src = fetchFromGitHub { owner = "starcitizen-lug"; repo = "lug-helper"; tag = "v${finalAttrs.version}"; - hash = "sha256-2z8Le65DQk121jTM3UP25V3Xzq+KUve5XJQmNaQ2IGg="; + hash = "sha256-e0pq3E9Jsx9pBRhN0gFJxZPDUbK/Xe84+5AO2/RlsLo="; }; buildInputs = [ diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix index ecdc61aebd4b..bef256bd5022 100644 --- a/pkgs/by-name/mi/mihomo-party/package.nix +++ b/pkgs/by-name/mi/mihomo-party/package.nix @@ -87,5 +87,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ ]; + knownVulnerabilities = [ "https://github.com/mihomo-party-org/mihomo-party/issues/706" ]; }; } diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix index c5e1089db53a..8d685dee0803 100644 --- a/pkgs/by-name/mu/mullvad-browser/package.nix +++ b/pkgs/by-name/mu/mullvad-browser/package.nix @@ -97,7 +97,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "14.5"; + version = "14.5.1"; sources = { x86_64-linux = fetchurl { @@ -109,7 +109,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-uqwsDXbS8tfG/bgTQKvdiaPzchVhssoQccQStncNWOk="; + hash = "sha256-FQdPdCkdxh+wieC12lT90qaSvu56o4BDgUkaDOm5xSE="; }; }; diff --git a/pkgs/by-name/n2/n2/package.nix b/pkgs/by-name/n2/n2/package.nix index a5ee26abfe02..3e581b5cfcbd 100644 --- a/pkgs/by-name/n2/n2/package.nix +++ b/pkgs/by-name/n2/n2/package.nix @@ -6,24 +6,24 @@ rustPlatform.buildRustPackage { pname = "n2"; - version = "unstable-2023-10-10"; + version = "unstable-2025-03-14"; src = fetchFromGitHub { owner = "evmar"; repo = "n2"; - rev = "90041c1f010d27464e3b18e38440ed9855ea62ef"; - hash = "sha256-svJPcriSrqloJlr7pIp/k84O712l4ZEPlSr58GPANXY="; + rev = "d67d508c389ac2e6961c6f84cd668f05ec7dc7b7"; + hash = "sha256-eWcN/iK/ToufABi4+hIyWetp2I94Vy4INHb4r6fw+TY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-bVvtTsaLnsmfzv2wMFx81a2ef91pj8XGtXhj8X9WFlc="; + cargoHash = "sha256-LTgAaTQXW0XEbe+WS47pqSb+eU7FqjdTSO2++C3J5aM="; - meta = with lib; { + meta = { homepage = "https://github.com/evmar/n2"; description = "Ninja compatible build system"; mainProgram = "n2"; - license = licenses.asl20; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/oc/octoprint/package.nix b/pkgs/by-name/oc/octoprint/package.nix index ab9179da180c..951b69d5c4de 100644 --- a/pkgs/by-name/oc/octoprint/package.nix +++ b/pkgs/by-name/oc/octoprint/package.nix @@ -79,7 +79,7 @@ let owner = "OctoPrint"; repo = "OctoPrint"; rev = version; - hash = "sha256-HvIMssPpRhzG//eyf0SfM5ddTUMr82F4ZS7c9tp88qw="; + hash = "sha256-Zc9t2mZQVvwJsyd0VaS8tMdGm9Ix3/QNl5ogeOTohVU="; }; propagatedBuildInputs = diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 417963f669b8..805880ed1de7 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -125,17 +125,17 @@ in goBuild (finalAttrs: { pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; tag = "v${finalAttrs.version}"; - hash = "sha256-9ZkO+LrS9rOTgOW8chLO3tnbne/+BSxQY+zOsSoE5Zc="; + hash = "sha256-GRqvaD/tAPI9cVlVu+HmRTv5zr7oCHdSlKoFfSLJ4r4="; fetchSubmodules = true; }; - vendorHash = "sha256-4wYgtdCHvz+ENNMiHptu6ulPJAznkWetQcdba3IEB6s="; + vendorHash = "sha256-t7+GLNC6mRcXq9ErxN6gGki5WWWoEcMfzRVjta4fddA="; env = lib.optionalAttrs enableRocm { diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix index 9588f7ee91ea..5a95a91a117b 100644 --- a/pkgs/by-name/op/open-policy-agent/package.nix +++ b/pkgs/by-name/op/open-policy-agent/package.nix @@ -14,13 +14,13 @@ assert buildGoModule (finalAttrs: { pname = "open-policy-agent"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; tag = "v${finalAttrs.version}"; - hash = "sha256-wWxWpJSDOaZLJ7ULdAzPFJ9YNXX3FyQRod2roaLsuis="; + hash = "sha256-oFtF/Uze9X1aaDzQXpZwbRXi11VnTTkkosfSSIeIxcc="; }; vendorHash = null; diff --git a/pkgs/by-name/op/opensearch/package.nix b/pkgs/by-name/op/opensearch/package.nix index 040421bec198..68e6c81d5720 100644 --- a/pkgs/by-name/op/opensearch/package.nix +++ b/pkgs/by-name/op/opensearch/package.nix @@ -12,11 +12,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opensearch"; - version = "2.19.1"; + version = "2.19.2"; src = fetchurl { url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz"; - hash = "sha256-skOqp9jc67h4gfcPcWE5A8Nt2gd/2Q7hHqN3QS1tVp8="; + hash = "sha256-EaOx8vs3y00ln7rUiaCGoD+HhiQY4bhQAzu18VfaTYw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pa/paretosecurity/package.nix b/pkgs/by-name/pa/paretosecurity/package.nix index ae4d21ec133e..c9b63a34b459 100644 --- a/pkgs/by-name/pa/paretosecurity/package.nix +++ b/pkgs/by-name/pa/paretosecurity/package.nix @@ -17,18 +17,23 @@ buildGoModule (finalAttrs: { webkitgtk_4_1 ]; pname = "paretosecurity"; - version = "0.2.12"; + version = "0.2.13"; src = fetchFromGitHub { owner = "ParetoSecurity"; repo = "agent"; rev = finalAttrs.version; - hash = "sha256-skBxDPC+C8JU1CW6g3SA2C4IawaoPzVi8pdl5BCutUY="; + hash = "sha256-G2An1Br/NJcIEKaM/pPEGkJazD9UFypRZ/KLmqkNUTo="; }; vendorHash = "sha256-YnyACP/hJYxi4AWMwr0We4YUTbWwahKAIYN6RnHmzls="; proxyVendor = true; + # Skip building the Windows installer + preBuild = '' + rm -rf cmd/paretosecurity-installer + ''; + ldflags = [ "-s" "-X=github.com/ParetoSecurity/agent/shared.Version=${finalAttrs.version}" diff --git a/pkgs/by-name/ph/pharo/package.nix b/pkgs/by-name/ph/pharo/package.nix index aeca44373b14..b5ed2cb7b5c3 100644 --- a/pkgs/by-name/ph/pharo/package.nix +++ b/pkgs/by-name/ph/pharo/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pharo"; - version = "10.3.1-6cdb1e5"; + version = "10.3.4+3.884643b"; src = fetchzip { # It is necessary to download from there instead of from the repository because that archive # also contains artifacts necessary for the bootstrapping. - url = "https://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/source/PharoVM-${finalAttrs.version}-Linux-x86_64-c-src.zip"; - hash = "sha256-Oskbo0ZMh2Wr8uY9BjA54AhFVDEuzs4AN8cpO02gdfY="; + url = "https://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/source/PharoVM-v${finalAttrs.version}-Linux-x86_64-c-src.zip"; + hash = "sha256-JBN0gPVMIUFzrdLqrCnCvf4cbZMfpluO2/jCxk3U+M8="; }; strictDeps = true; @@ -59,6 +59,12 @@ stdenv.mkDerivation (finalAttrs: { "-Wno-incompatible-pointer-types" ]; + # Fix missing version.info + preBuild = '' + mkdir -p /build/source/build/ + echo "${finalAttrs.version}" > /build/source/build/version.info + ''; + installPhase = '' runHook preInstall diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index 8d8ecd0c4da1..a2bb45fbe751 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -10,16 +10,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpunit"; - version = "12.1.3"; + version = "12.1.4"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; tag = finalAttrs.version; - hash = "sha256-JwEeH3oMiiIa1awLwOrtGfkwN3srhPErkpHaAJ2IFVE="; + hash = "sha256-qFjDbrCqX68ZU+l7ZDADbEyulGk6VY5s92PyfSAum00="; }; - vendorHash = "sha256-3wwv+g9VsNzqgj1m9fea6OhWzbU203I8CPXcJRyWEpg="; + vendorHash = "sha256-JEi6r5jmXBah+aPr12GxRtLCqJOH/t+zzSDmWqkzHIk="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/po/poptracker/package.nix b/pkgs/by-name/po/poptracker/package.nix index f29f75853f93..2f0d884d087f 100644 --- a/pkgs/by-name/po/poptracker/package.nix +++ b/pkgs/by-name/po/poptracker/package.nix @@ -6,6 +6,7 @@ SDL2, SDL2_ttf, SDL2_image, + libX11, openssl, which, libsForQt5, @@ -47,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 SDL2_ttf SDL2_image + libX11 openssl ]; diff --git a/pkgs/by-name/py/pytr/package.nix b/pkgs/by-name/py/pytr/package.nix index 5538b60ed159..d75918a0a005 100644 --- a/pkgs/by-name/py/pytr/package.nix +++ b/pkgs/by-name/py/pytr/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "pytr"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; src = fetchFromGitHub { owner = "pytr-org"; repo = "pytr"; tag = "v${version}"; - hash = "sha256-uWG8q6H6q54v3Iq5LOkr7zi5rds+y13O0ai9R9QySdI="; + hash = "sha256-7554su1bR3m6wcIcmT64O+x/kvVlDMsG/hkTym25B/Q="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ra/rare-regex/package.nix b/pkgs/by-name/ra/rare-regex/package.nix index 153745222480..c9b10eeec338 100644 --- a/pkgs/by-name/ra/rare-regex/package.nix +++ b/pkgs/by-name/ra/rare-regex/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "rare"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "zix99"; repo = "rare"; rev = version; - hash = "sha256-fb4JbfDVZpehDhWlQHoUOOstcPMgEFuRlIZQV6OdvkQ="; + hash = "sha256-hdOG7UGEi4MnFg0wbyDN4gDpQLb9sG3yUrQ/J0fwKkA="; }; vendorHash = "sha256-wUOtxNjL/4MosACCzPTWKWrnMZhxINfN1ppkRsqDh9M="; diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix index c5b323466b81..1d4a50e5548b 100644 --- a/pkgs/by-name/re/remind/package.nix +++ b/pkgs/by-name/re/remind/package.nix @@ -16,14 +16,14 @@ tcl.mkTclDerivation rec { pname = "remind"; - version = "05.03.05"; + version = "05.03.06"; src = fetchFromGitea { domain = "git.skoll.ca"; owner = "Skollsoft-Public"; repo = "Remind"; rev = version; - hash = "sha256-dMnsMV4DRxXWgev9LCb4wwdnx7A++giCsW7c2cMde9Q="; + hash = "sha256-zJmDx9AJntL08uBZEquho2Iud0y7WPZDGef/pSHX2h0="; }; propagatedBuildInputs = lib.optionals withGui [ diff --git a/pkgs/by-name/ru/rutabaga_gfx/package.nix b/pkgs/by-name/ru/rutabaga_gfx/package.nix index 7de2e8bb476b..efaec27ec715 100644 --- a/pkgs/by-name/ru/rutabaga_gfx/package.nix +++ b/pkgs/by-name/ru/rutabaga_gfx/package.nix @@ -93,5 +93,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; maintainers = with maintainers; [ qyliss ]; platforms = platforms.darwin ++ platforms.linux; + # error[E0432]: unresolved import `self::consts` + badPlatforms = [ "loongarch64-linux" ]; }; }) diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix index 3610ca575654..5c7603c4bb28 100644 --- a/pkgs/by-name/sa/satty/package.nix +++ b/pkgs/by-name/sa/satty/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "satty"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "gabm"; repo = "Satty"; rev = "v${version}"; - hash = "sha256-81WX9GAZ0mPai1/4FrqDGDu6k4OVYrKSJSC/FkPkZmE="; + hash = "sha256-Lf/3h6Y6lKWQ8lPJZ6SCm3+w/Dc4m8yUYH7Xv0GAbqo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Yfy0IP2RzIv+PvCGb5cK54FN3rBH3CKdBhaPpASirQ0="; + cargoHash = "sha256-aqFNIxZydyCJX2sRmuVohfyVZdDgYSh7d8UMqog0cm0="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/sh/sherlock/package.nix b/pkgs/by-name/sh/sherlock/package.nix index 436066f9e30a..196a15ad6963 100644 --- a/pkgs/by-name/sh/sherlock/package.nix +++ b/pkgs/by-name/sh/sherlock/package.nix @@ -3,7 +3,6 @@ fetchFromGitHub, makeWrapper, python3, - poetry, }: python3.pkgs.buildPythonApplication rec { @@ -59,7 +58,6 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = with python3.pkgs; [ pytestCheckHook - poetry poetry-core jsonschema openpyxl diff --git a/pkgs/by-name/sk/skyemu/package.nix b/pkgs/by-name/sk/skyemu/package.nix new file mode 100644 index 000000000000..ec3243c86d11 --- /dev/null +++ b/pkgs/by-name/sk/skyemu/package.nix @@ -0,0 +1,94 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + pkg-config, + curl, + openssl, + SDL2, + alsa-lib, + libGL, + libGLU, + libX11, + libXi, + libXcursor, + lua, + makeDesktopItem, + copyDesktopItems, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "skyemu"; + version = "3-unstable-2025-02-23"; + + src = fetchFromGitHub { + owner = "skylersaleh"; + repo = "SkyEmu"; + rev = "f8573db83d15791b0cd94c29ceb46bf683963ff0"; + hash = "sha256-LI4zBKjB48zYYYVZePzefRFrw/zvg17jzh5ZOPHAWok="; + }; + + nativeBuildInputs = [ + cmake + copyDesktopItems + ninja + pkg-config + ]; + + buildInputs = + [ + alsa-lib + curl + libGL + libGLU + openssl + SDL2 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libX11 + libXi + libXcursor + lua + ]; + + cmakeFlags = [ + (lib.cmakeBool "USE_SYSTEM_CURL" true) + (lib.cmakeBool "USE_SYSTEM_OPENSSL" true) + (lib.cmakeBool "USE_SYSTEM_SDL2" true) + (lib.cmakeBool "ENABLE_RETRO_ACHIEVEMENTS" true) + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'set(CMAKE_OSX_ARCHITECTURES' '#set(CMAKE_OSX_ARCHITECTURES' + ''; + + desktopItems = [ + (makeDesktopItem { + name = "skyemu"; + exec = "SkyEmu"; + icon = "skyemu"; + comment = "GameBoy, GameBoy Color, GameBoy Advance, and DS emulator"; + desktopName = "SkyEmu"; + categories = [ + "Game" + "Emulator" + ]; + }) + ]; + + postInstall = '' + install -Dm644 $src/src/resources/icons/icon.png $out/share/pixmaps/skyemu.png + ''; + + meta = { + description = "Low level GameBoy, GameBoy Color, Game Boy Advance, and DS emulator"; + homepage = "https://github.com/skylersaleh/SkyEmu"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ liberodark ]; + mainProgram = "SkyEmu"; + platforms = with lib.platforms; unix ++ windows; + }; +}) diff --git a/pkgs/by-name/su/surreal-engine/package.nix b/pkgs/by-name/su/surreal-engine/package.nix index 71376ed3d3eb..4a6766060d3d 100644 --- a/pkgs/by-name/su/surreal-engine/package.nix +++ b/pkgs/by-name/su/surreal-engine/package.nix @@ -9,6 +9,7 @@ openal, pkg-config, SDL2, + libX11, stdenv, vulkan-loader, wayland, @@ -39,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: { libffi openal SDL2 + libX11 vulkan-loader wayland waylandpp diff --git a/pkgs/by-name/ta/tangerine/package.nix b/pkgs/by-name/ta/tangerine/package.nix index 8616fd77907b..a9e249ac2a60 100644 --- a/pkgs/by-name/ta/tangerine/package.nix +++ b/pkgs/by-name/ta/tangerine/package.nix @@ -6,6 +6,7 @@ cmake, ncurses, SDL2, + libGL, libX11, }: @@ -32,6 +33,7 @@ stdenv.mkDerivation { buildInputs = [ ncurses SDL2 + libGL libX11 ]; diff --git a/pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch b/pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch index 9b974186d55b..50fa59c32807 100644 --- a/pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch +++ b/pkgs/by-name/ta/tantivy-go/add-Cargo.lock.patch @@ -1,12 +1,12 @@ diff --git a/rust/Cargo.lock b/rust/Cargo.lock new file mode 100644 -index 0000000..942397e +index 0000000..7cb3275 --- /dev/null +++ b/rust/Cargo.lock -@@ -0,0 +1,1609 @@ +@@ -0,0 +1,1762 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. -+version = 3 ++version = 4 + +[[package]] +name = "adler32" @@ -23,7 +23,7 @@ index 0000000..942397e + "cfg-if", + "once_cell", + "version_check", -+ "zerocopy", ++ "zerocopy 0.7.35", +] + +[[package]] @@ -82,11 +82,12 @@ index 0000000..942397e + +[[package]] +name = "anstyle-wincon" -+version = "3.0.6" ++version = "3.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" ++checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" +dependencies = [ + "anstyle", ++ "once_cell", + "windows-sys 0.59.0", +] + @@ -98,13 +99,13 @@ index 0000000..942397e + +[[package]] +name = "async-trait" -+version = "0.1.83" ++version = "0.1.88" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" ++checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" +dependencies = [ + "proc-macro2", + "quote", -+ "syn 2.0.93", ++ "syn 2.0.100", +] + +[[package]] @@ -121,9 +122,9 @@ index 0000000..942397e + +[[package]] +name = "bitflags" -+version = "2.6.0" ++version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" ++checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" + +[[package]] +name = "bitpacking" @@ -135,10 +136,29 @@ index 0000000..942397e +] + +[[package]] -+name = "bumpalo" -+version = "3.16.0" ++name = "bon" ++version = "3.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" ++checksum = "94054366e2ff97b455acdd4fdb03913f717febc57b7bbd1741b2c3b87efae030" ++dependencies = [ ++ "bon-macros", ++ "rustversion", ++] ++ ++[[package]] ++name = "bon-macros" ++version = "3.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "542a990e676ce0a0a895ae54b2d94afd012434f2228a85b186c6bc1a7056cdc6" ++dependencies = [ ++ "darling", ++ "ident_case", ++ "prettyplease", ++ "proc-macro2", ++ "quote", ++ "rustversion", ++ "syn 2.0.100", ++] + +[[package]] +name = "byteorder" @@ -148,9 +168,9 @@ index 0000000..942397e + +[[package]] +name = "cbindgen" -+version = "0.27.0" ++version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3fce8dd7fcfcbf3a0a87d8f515194b49d6135acab73e18bd380d1d93bb1a15eb" ++checksum = "eadd868a2ce9ca38de7eeafdcec9c7065ef89b42b32f0839278d55f35c54d1ff" +dependencies = [ + "clap", + "heck", @@ -160,16 +180,16 @@ index 0000000..942397e + "quote", + "serde", + "serde_json", -+ "syn 2.0.93", ++ "syn 2.0.100", + "tempfile", + "toml", +] + +[[package]] +name = "cc" -+version = "1.2.6" ++version = "1.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8d6dbb628b8f8555f86d0323c2eb39e3ec81901f4b83e091db8a6a76d316a333" ++checksum = "8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362" +dependencies = [ + "jobserver", + "libc", @@ -199,18 +219,18 @@ index 0000000..942397e + +[[package]] +name = "clap" -+version = "4.5.23" ++version = "4.5.36" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" ++checksum = "2df961d8c8a0d08aa9945718ccf584145eee3f3aa06cddbeac12933781102e04" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" -+version = "4.5.23" ++version = "4.5.36" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" ++checksum = "132dbda40fb6753878316a489d5a1242a8ef2f0d9e47ba01c951ea8aa7d013a5" +dependencies = [ + "anstream", + "anstyle", @@ -250,9 +270,9 @@ index 0000000..942397e + +[[package]] +name = "crossbeam-channel" -+version = "0.5.14" ++version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" ++checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +dependencies = [ + "crossbeam-utils", +] @@ -289,6 +309,41 @@ index 0000000..942397e +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] ++name = "darling" ++version = "0.20.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" ++dependencies = [ ++ "darling_core", ++ "darling_macro", ++] ++ ++[[package]] ++name = "darling_core" ++version = "0.20.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" ++dependencies = [ ++ "fnv", ++ "ident_case", ++ "proc-macro2", ++ "quote", ++ "strsim", ++ "syn 2.0.100", ++] ++ ++[[package]] ++name = "darling_macro" ++version = "0.20.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" ++dependencies = [ ++ "darling_core", ++ "quote", ++ "syn 2.0.100", ++] ++ ++[[package]] +name = "dary_heap" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -296,9 +351,9 @@ index 0000000..942397e + +[[package]] +name = "deranged" -+version = "0.3.11" ++version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" +dependencies = [ + "powerfmt", + "serde", @@ -306,15 +361,15 @@ index 0000000..942397e + +[[package]] +name = "downcast-rs" -+version = "1.2.1" ++version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" ++checksum = "ea8a8b81cacc08888170eef4d13b775126db426d0b348bee9d18c2c1eaf123cf" + +[[package]] +name = "either" -+version = "1.13.0" ++version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" ++checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + +[[package]] +name = "env_filter" @@ -328,28 +383,28 @@ index 0000000..942397e + +[[package]] +name = "env_logger" -+version = "0.11.6" ++version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0" ++checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" +dependencies = [ + "anstream", + "anstyle", + "env_filter", -+ "humantime", ++ "jiff", + "log", +] + +[[package]] +name = "equivalent" -+version = "1.0.1" ++version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" ++checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" + +[[package]] +name = "errno" -+version = "0.3.10" ++version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" ++checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" +dependencies = [ + "libc", + "windows-sys 0.59.0", @@ -375,9 +430,9 @@ index 0000000..942397e + +[[package]] +name = "foldhash" -+version = "0.1.4" ++version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f" ++checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + +[[package]] +name = "fs4" @@ -385,11 +440,48 @@ index 0000000..942397e +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7e180ac76c23b45e767bd7ae9579bc0bb458618c4bc71835926e098e61d15f8" +dependencies = [ -+ "rustix", ++ "rustix 0.38.44", + "windows-sys 0.52.0", +] + +[[package]] ++name = "futures-core" ++version = "0.3.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" ++ ++[[package]] ++name = "futures-macro" ++version = "0.3.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.100", ++] ++ ++[[package]] ++name = "futures-task" ++version = "0.3.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" ++ ++[[package]] ++name = "futures-util" ++version = "0.3.31" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" ++dependencies = [ ++ "futures-core", ++ "futures-macro", ++ "futures-task", ++ "pin-project-lite", ++ "pin-utils", ++ "slab", ++] ++ ++[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -406,7 +498,19 @@ index 0000000..942397e +dependencies = [ + "cfg-if", + "libc", -+ "wasi", ++ "wasi 0.11.0+wasi-snapshot-preview1", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "r-efi", ++ "wasi 0.14.2+wasi-0.2.4", +] + +[[package]] @@ -437,22 +541,25 @@ index 0000000..942397e +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] -+name = "hermit-abi" -+version = "0.3.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" -+ -+[[package]] +name = "htmlescape" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163" + +[[package]] -+name = "humantime" -+version = "2.1.0" ++name = "hyperloglogplus" ++version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" ++checksum = "621debdf94dcac33e50475fdd76d34d5ea9c0362a834b9db08c3024696c1fbe3" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "ident_case" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "include-flate" @@ -474,32 +581,20 @@ index 0000000..942397e + "libflate", + "proc-macro2", + "quote", -+ "syn 2.0.93", ++ "syn 2.0.100", +] + +[[package]] +name = "indexmap" -+version = "2.7.0" ++version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" ++checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +dependencies = [ + "equivalent", + "hashbrown 0.15.2", +] + +[[package]] -+name = "instant" -+version = "0.1.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -+dependencies = [ -+ "cfg-if", -+ "js-sys", -+ "wasm-bindgen", -+ "web-sys", -+] -+ -+[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -507,18 +602,18 @@ index 0000000..942397e + +[[package]] +name = "itertools" -+version = "0.12.1" ++version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" ++checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" -+version = "1.0.14" ++version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" ++checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "jieba-macros" @@ -531,9 +626,9 @@ index 0000000..942397e + +[[package]] +name = "jieba-rs" -+version = "0.7.1" ++version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9a77d0ae8831f870c4f6ffce310f708b5273ea2e7a88e6af770a10d1b4876311" ++checksum = "6d1bcad6332969e4d48ee568d430e14ee6dea70740c2549d005d87677ebefb0c" +dependencies = [ + "cedarwood", + "fxhash", @@ -545,22 +640,37 @@ index 0000000..942397e +] + +[[package]] -+name = "jobserver" -+version = "0.1.32" ++name = "jiff" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" ++checksum = "e5ad87c89110f55e4cd4dc2893a9790820206729eaf221555f742d540b0724a0" +dependencies = [ -+ "libc", ++ "jiff-static", ++ "log", ++ "portable-atomic", ++ "portable-atomic-util", ++ "serde", +] + +[[package]] -+name = "js-sys" -+version = "0.3.76" ++name = "jiff-static" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" ++checksum = "d076d5b64a7e2fe6f0743f02c43ca4a6725c0f904203bfe276a5b3e793103605" +dependencies = [ -+ "once_cell", -+ "wasm-bindgen", ++ "proc-macro2", ++ "quote", ++ "syn 2.0.100", ++] ++ ++[[package]] ++name = "jobserver" ++version = "0.1.33" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" ++dependencies = [ ++ "getrandom 0.3.2", ++ "libc", +] + +[[package]] @@ -577,9 +687,9 @@ index 0000000..942397e + +[[package]] +name = "libc" -+version = "0.2.169" ++version = "0.2.172" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" ++checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" + +[[package]] +name = "libflate" @@ -613,15 +723,21 @@ index 0000000..942397e + +[[package]] +name = "linux-raw-sys" -+version = "0.4.14" ++version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" ++checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" ++ ++[[package]] ++name = "linux-raw-sys" ++version = "0.9.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" + +[[package]] +name = "log" -+version = "0.4.22" ++version = "0.4.27" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" ++checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" + +[[package]] +name = "logcall" @@ -632,7 +748,7 @@ index 0000000..942397e + "proc-macro-error", + "proc-macro2", + "quote", -+ "syn 2.0.93", ++ "syn 2.0.100", +] + +[[package]] @@ -652,11 +768,10 @@ index 0000000..942397e + +[[package]] +name = "measure_time" -+version = "0.8.3" ++version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dbefd235b0aadd181626f281e1d684e116972988c14c264e42069d5e8a5775cc" ++checksum = "51c55d61e72fc3ab704396c5fa16f4c184db37978ae4e94ca8959693a235fc0e" +dependencies = [ -+ "instant", + "log", +] + @@ -714,50 +829,40 @@ index 0000000..942397e +] + +[[package]] -+name = "num_cpus" -+version = "1.16.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -+dependencies = [ -+ "hermit-abi", -+ "libc", -+] -+ -+[[package]] +name = "once_cell" -+version = "1.20.2" ++version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" ++checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "oneshot" -+version = "0.1.8" ++version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e296cf87e61c9cfc1a61c3c63a0f7f286ed4554e0e22be84e8a38e1d264a2a29" ++checksum = "b4ce411919553d3f9fa53a0880544cda985a112117a0444d5ff1e870a893d6ea" + +[[package]] +name = "ownedbytes" +version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3a059efb063b8f425b948e042e6b9bd85edfe60e913630ed727b23e2dfcc558" ++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e" +dependencies = [ + "stable_deref_trait", +] + +[[package]] +name = "phf" -+version = "0.11.2" ++version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" ++checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" +dependencies = [ ++ "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_codegen" -+version = "0.11.2" ++version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" ++checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" +dependencies = [ + "phf_generator", + "phf_shared", @@ -765,28 +870,68 @@ index 0000000..942397e + +[[package]] +name = "phf_generator" -+version = "0.11.2" ++version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" ++checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] -+name = "phf_shared" -+version = "0.11.2" ++name = "phf_macros" ++version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" ++checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" ++dependencies = [ ++ "phf_generator", ++ "phf_shared", ++ "proc-macro2", ++ "quote", ++ "syn 2.0.100", ++] ++ ++[[package]] ++name = "phf_shared" ++version = "0.11.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" +dependencies = [ + "siphasher", +] + +[[package]] -+name = "pkg-config" -+version = "0.3.31" ++name = "pin-project-lite" ++version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" ++checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" ++ ++[[package]] ++name = "pin-utils" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.32" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" ++ ++[[package]] ++name = "portable-atomic" ++version = "1.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" ++ ++[[package]] ++name = "portable-atomic-util" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" ++dependencies = [ ++ "portable-atomic", ++] + +[[package]] +name = "powerfmt" @@ -796,11 +941,21 @@ index 0000000..942397e + +[[package]] +name = "ppv-lite86" -+version = "0.2.20" ++version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" ++checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ -+ "zerocopy", ++ "zerocopy 0.8.24", ++] ++ ++[[package]] ++name = "prettyplease" ++version = "0.2.32" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6" ++dependencies = [ ++ "proc-macro2", ++ "syn 2.0.100", +] + +[[package]] @@ -829,23 +984,29 @@ index 0000000..942397e + +[[package]] +name = "proc-macro2" -+version = "1.0.92" ++version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" ++checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" -+version = "1.0.38" ++version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" ++checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +dependencies = [ + "proc-macro2", +] + +[[package]] ++name = "r-efi" ++version = "5.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" ++ ++[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -872,7 +1033,7 @@ index 0000000..942397e +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ -+ "getrandom", ++ "getrandom 0.2.15", +] + +[[package]] @@ -943,63 +1104,77 @@ index 0000000..942397e +[[package]] +name = "rust-stemmers" +version = "1.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" -+dependencies = [ -+ "serde", -+ "serde_derive", -+] ++source = "git+https://github.com/silver-ymz/rust-stemmers.git?rev=51696378e352688b7ffd4fface615370ff5e8768#51696378e352688b7ffd4fface615370ff5e8768" + +[[package]] +name = "rustc-hash" -+version = "1.1.0" ++version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" ++checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" + +[[package]] +name = "rustix" -+version = "0.38.42" ++version = "0.38.44" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" ++checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" +dependencies = [ + "bitflags", + "errno", + "libc", -+ "linux-raw-sys", ++ "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", +] + +[[package]] -+name = "ryu" -+version = "1.0.18" ++name = "rustix" ++version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" ++checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf" ++dependencies = [ ++ "bitflags", ++ "errno", ++ "libc", ++ "linux-raw-sys 0.9.4", ++ "windows-sys 0.59.0", ++] ++ ++[[package]] ++name = "rustversion" ++version = "1.0.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" ++ ++[[package]] ++name = "ryu" ++version = "1.0.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" + +[[package]] +name = "serde" -+version = "1.0.217" ++version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" ++checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" -+version = "1.0.217" ++version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" ++checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +dependencies = [ + "proc-macro2", + "quote", -+ "syn 2.0.93", ++ "syn 2.0.100", +] + +[[package]] +name = "serde_json" -+version = "1.0.134" ++version = "1.0.140" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" ++checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +dependencies = [ + "itoa", + "memchr", @@ -1024,24 +1199,33 @@ index 0000000..942397e + +[[package]] +name = "siphasher" -+version = "0.3.11" ++version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" ++checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + +[[package]] +name = "sketches-ddsketch" -+version = "0.2.2" ++version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c" ++checksum = "c1e9a774a6c28142ac54bb25d25562e6bcf957493a184f15ad4eebccb23e410a" +dependencies = [ + "serde", +] + +[[package]] -+name = "smallvec" -+version = "1.13.2" ++name = "slab" ++version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" ++checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "smallvec" ++version = "1.15.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" + +[[package]] +name = "stable_deref_trait" @@ -1067,9 +1251,9 @@ index 0000000..942397e + +[[package]] +name = "syn" -+version = "2.0.93" ++version = "2.0.100" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c786062daee0d6db1132800e623df74274a0a87322d8e183338e01b3d98d058" ++checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +dependencies = [ + "proc-macro2", + "quote", @@ -1078,14 +1262,14 @@ index 0000000..942397e + +[[package]] +name = "tantivy" -+version = "0.22.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f8d0582f186c0a6d55655d24543f15e43607299425c5ad8352c242b914b31856" ++version = "0.23.0" ++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e" +dependencies = [ + "aho-corasick", + "arc-swap", + "base64", + "bitpacking", ++ "bon", + "byteorder", + "census", + "crc32fast", @@ -1095,6 +1279,7 @@ index 0000000..942397e + "fnv", + "fs4", + "htmlescape", ++ "hyperloglogplus", + "itertools", + "levenshtein_automata", + "log", @@ -1102,7 +1287,6 @@ index 0000000..942397e + "lz4_flex", + "measure_time", + "memmap2", -+ "num_cpus", + "once_cell", + "oneshot", + "rayon", @@ -1130,8 +1314,7 @@ index 0000000..942397e +[[package]] +name = "tantivy-bitpacker" +version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "284899c2325d6832203ac6ff5891b297fc5239c3dc754c5bc1977855b23c10df" ++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e" +dependencies = [ + "bitpacking", +] @@ -1139,8 +1322,7 @@ index 0000000..942397e +[[package]] +name = "tantivy-columnar" +version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12722224ffbe346c7fec3275c699e508fd0d4710e629e933d5736ec524a1f44e" ++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e" +dependencies = [ + "downcast-rs", + "fastdivide", @@ -1155,8 +1337,7 @@ index 0000000..942397e +[[package]] +name = "tantivy-common" +version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8019e3cabcfd20a1380b491e13ff42f57bb38bf97c3d5fa5c07e50816e0621f4" ++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e" +dependencies = [ + "async-trait", + "byteorder", @@ -1178,13 +1359,15 @@ index 0000000..942397e + +[[package]] +name = "tantivy-go" -+version = "0.2.0" ++version = "1.0.0" +dependencies = [ + "cbindgen", ++ "crunchy", + "env_logger", + "lazy_static", + "log", + "logcall", ++ "phf", + "serde", + "serde_json", + "tantivy", @@ -1195,8 +1378,7 @@ index 0000000..942397e +[[package]] +name = "tantivy-jieba" +version = "0.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0f2fe65c125f0d76d06f0f2ce9fbb9287b53f0dafb51a6270d984a840e2f16c1" ++source = "git+https://github.com/anyproto/tantivy-jieba.git?rev=ca11d3153b8844cbc43cd243667e03f56f6d1e18#ca11d3153b8844cbc43cd243667e03f56f6d1e18" +dependencies = [ + "jieba-rs", + "lazy_static", @@ -1206,8 +1388,7 @@ index 0000000..942397e +[[package]] +name = "tantivy-query-grammar" +version = "0.22.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "847434d4af57b32e309f4ab1b4f1707a6c566656264caa427ff4285c4d9d0b82" ++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e" +dependencies = [ + "nom", +] @@ -1215,9 +1396,10 @@ index 0000000..942397e +[[package]] +name = "tantivy-sstable" +version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c69578242e8e9fc989119f522ba5b49a38ac20f576fc778035b96cc94f41f98e" ++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e" +dependencies = [ ++ "futures-util", ++ "itertools", + "tantivy-bitpacker", + "tantivy-common", + "tantivy-fst", @@ -1227,8 +1409,7 @@ index 0000000..942397e +[[package]] +name = "tantivy-stacker" +version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c56d6ff5591fc332739b3ce7035b57995a3ce29a93ffd6012660e0949c956ea8" ++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e" +dependencies = [ + "murmurhash32", + "rand_distr", @@ -1238,50 +1419,49 @@ index 0000000..942397e +[[package]] +name = "tantivy-tokenizer-api" +version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2a0dcade25819a89cfe6f17d932c9cedff11989936bf6dd4f336d50392053b04" ++source = "git+https://github.com/anyproto/tantivy.git?rev=693274a5d4be6da9d069dff4d540162165a99b0e#693274a5d4be6da9d069dff4d540162165a99b0e" +dependencies = [ + "serde", +] + +[[package]] +name = "tempfile" -+version = "3.14.0" ++version = "3.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" ++checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf" +dependencies = [ -+ "cfg-if", + "fastrand", ++ "getrandom 0.3.2", + "once_cell", -+ "rustix", ++ "rustix 1.0.5", + "windows-sys 0.59.0", +] + +[[package]] +name = "thiserror" -+version = "1.0.69" ++version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" ++checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" -+version = "1.0.69" ++version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" ++checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +dependencies = [ + "proc-macro2", + "quote", -+ "syn 2.0.93", ++ "syn 2.0.100", +] + +[[package]] +name = "time" -+version = "0.3.37" ++version = "0.3.41" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" ++checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" +dependencies = [ + "deranged", + "itoa", @@ -1294,15 +1474,15 @@ index 0000000..942397e + +[[package]] +name = "time-core" -+version = "0.1.2" ++version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" ++checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" + +[[package]] +name = "time-macros" -+version = "0.2.19" ++version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" ++checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" +dependencies = [ + "num-conv", + "time-core", @@ -1310,9 +1490,9 @@ index 0000000..942397e + +[[package]] +name = "toml" -+version = "0.8.19" ++version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" ++checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148" +dependencies = [ + "serde", + "serde_spanned", @@ -1331,9 +1511,9 @@ index 0000000..942397e + +[[package]] +name = "toml_edit" -+version = "0.22.22" ++version = "0.22.24" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" ++checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" +dependencies = [ + "indexmap", + "serde", @@ -1344,9 +1524,9 @@ index 0000000..942397e + +[[package]] +name = "unicode-ident" -+version = "1.0.14" ++version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" ++checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" + +[[package]] +name = "unicode-segmentation" @@ -1368,11 +1548,11 @@ index 0000000..942397e + +[[package]] +name = "uuid" -+version = "1.11.0" ++version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" ++checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" +dependencies = [ -+ "getrandom", ++ "getrandom 0.3.2", + "serde", +] + @@ -1389,67 +1569,12 @@ index 0000000..942397e +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] -+name = "wasm-bindgen" -+version = "0.2.99" ++name = "wasi" ++version = "0.14.2+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" ++checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ -+ "cfg-if", -+ "once_cell", -+ "wasm-bindgen-macro", -+] -+ -+[[package]] -+name = "wasm-bindgen-backend" -+version = "0.2.99" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" -+dependencies = [ -+ "bumpalo", -+ "log", -+ "proc-macro2", -+ "quote", -+ "syn 2.0.93", -+ "wasm-bindgen-shared", -+] -+ -+[[package]] -+name = "wasm-bindgen-macro" -+version = "0.2.99" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" -+dependencies = [ -+ "quote", -+ "wasm-bindgen-macro-support", -+] -+ -+[[package]] -+name = "wasm-bindgen-macro-support" -+version = "0.2.99" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn 2.0.93", -+ "wasm-bindgen-backend", -+ "wasm-bindgen-shared", -+] -+ -+[[package]] -+name = "wasm-bindgen-shared" -+version = "0.2.99" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" -+ -+[[package]] -+name = "web-sys" -+version = "0.3.76" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" -+dependencies = [ -+ "js-sys", -+ "wasm-bindgen", ++ "wit-bindgen-rt", +] + +[[package]] @@ -1558,21 +1683,38 @@ index 0000000..942397e + +[[package]] +name = "winnow" -+version = "0.6.20" ++version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" ++checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10" +dependencies = [ + "memchr", +] + +[[package]] ++name = "wit-bindgen-rt" ++version = "0.39.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" ++dependencies = [ ++ "bitflags", ++] ++ ++[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ -+ "byteorder", -+ "zerocopy-derive", ++ "zerocopy-derive 0.7.35", ++] ++ ++[[package]] ++name = "zerocopy" ++version = "0.8.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879" ++dependencies = [ ++ "zerocopy-derive 0.8.24", +] + +[[package]] @@ -1583,33 +1725,47 @@ index 0000000..942397e +dependencies = [ + "proc-macro2", + "quote", -+ "syn 2.0.93", ++ "syn 2.0.100", ++] ++ ++[[package]] ++name = "zerocopy-derive" ++version = "0.8.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.100", +] + +[[package]] +name = "zstd" -+version = "0.13.2" ++version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" ++checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" -+version = "7.2.1" ++version = "7.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" ++checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" -+version = "2.0.13+zstd.1.5.6" ++version = "2.0.15+zstd.1.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" ++checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237" +dependencies = [ + "cc", + "pkg-config", +] +-- +2.48.1 + diff --git a/pkgs/by-name/ta/tantivy-go/package.nix b/pkgs/by-name/ta/tantivy-go/package.nix index 53cbb9e75085..0f839fdce3cf 100644 --- a/pkgs/by-name/ta/tantivy-go/package.nix +++ b/pkgs/by-name/ta/tantivy-go/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "tantivy-go"; - version = "0.3.1"; + version = "1.0.1"; src = fetchFromGitHub { owner = "anyproto"; repo = "tantivy-go"; tag = "v${version}"; - hash = "sha256-IlGtyTjOAvmrbgmvy4NelTOgOWopxNta3INq2QcMEqY="; + hash = "sha256-iTGIm5C7SMBZv2OcKCQCyEZS/eeMJQ5nFSpuFJbTEXU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-3+HtZ7SAnvTNXtYlokX/Z9VD1lDw+nh6R/njYOZeGoE="; + cargoHash = "sha256-f8xI4g6MK4NUn0DpxD+miaCzBe8FSSqaL5rpjoqUGfY="; cargoPatches = [ ./add-Cargo.lock.patch diff --git a/pkgs/by-name/te/templ/package.nix b/pkgs/by-name/te/templ/package.nix index ca3d1bd37a0e..11095d3a4ec3 100644 --- a/pkgs/by-name/te/templ/package.nix +++ b/pkgs/by-name/te/templ/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "templ"; - version = "0.3.857"; + version = "0.3.865"; src = fetchFromGitHub { owner = "a-h"; repo = "templ"; rev = "v${version}"; - hash = "sha256-c3x7v5PeMJFADRfImMyEasvlC9WSjqHQxNDg1sgPBfQ="; + hash = "sha256-ngdn5ftTunVUIOwmovYgIlGkyrYjXSJkp+0fJEHXB+s="; }; - vendorHash = "sha256-JVOsjBn1LV8p6HHelfAO1Qcqi/tPg1S3xBffo+0aplE="; + vendorHash = "sha256-q4L+r6S0eMNd5hP9UQCI+GxSJoiMGpjd0UTxA8zb6KU="; subPackages = [ "cmd/templ" ]; diff --git a/pkgs/by-name/tf/tfsec/package.nix b/pkgs/by-name/tf/tfsec/package.nix index a189d3b75b41..a57e58563f83 100644 --- a/pkgs/by-name/tf/tfsec/package.nix +++ b/pkgs/by-name/tf/tfsec/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "tfsec"; - version = "1.28.13"; + version = "1.28.14"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "tfsec"; tag = "v${version}"; - hash = "sha256-4auh0MPLSAkygbVZC2PbEcA21PNmBNkr4fA1m1H9kyU="; + hash = "sha256-8nZU7CjeKfpx1Fl3YtuQepW0LAG9/ng+8bMkoT1xmCQ="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # "-extldflags '-fno-PIC -static'" ]; - vendorHash = "sha256-cGVHDq4exa1dZxEemCWNLA5H201SXwW0madYCWHwtxM="; + vendorHash = "sha256-SuXrZNjr+x4uIA8fIae/9kypH/GDDKaiymD12xJvIFw="; subPackages = [ "cmd/tfsec" diff --git a/pkgs/by-name/ti/tidal-hifi/electron.nix b/pkgs/by-name/ti/tidal-hifi/electron.nix new file mode 100644 index 000000000000..1d617662f512 --- /dev/null +++ b/pkgs/by-name/ti/tidal-hifi/electron.nix @@ -0,0 +1,31 @@ +{ + fetchzip, + lib, +}: +let + /* + see: + https://github.com/Mastermindzh/tidal-hifi/blob/master/build/electron-builder.base.yml + for the expected version + */ + version = "35.1.1"; +in +(fetchzip { + url = "https://github.com/castlabs/electron-releases/releases/download/v${version}+wvcus/electron-v${version}+wvcus-linux-x64.zip"; + hash = "sha256-AkPKeG7MrCBlk41qXZxFPRukUPRcIUanq6fJPx5d3RU="; + stripRoot = false; + +}).overrideAttrs + ( + final: _: { + name = "castlabs-electron-${version}"; + inherit version; + pname = "castlabs-electron"; + passthru.dist = final.finalPackage.outPath; + + meta = { + license = lib.licenses.unfreeRedistributable; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; + } + ) diff --git a/pkgs/by-name/ti/tidal-hifi/package.nix b/pkgs/by-name/ti/tidal-hifi/package.nix index e02d2f847fd7..930780f48c3f 100644 --- a/pkgs/by-name/ti/tidal-hifi/package.nix +++ b/pkgs/by-name/ti/tidal-hifi/package.nix @@ -1,98 +1,109 @@ { lib, + buildNpmPackage, + fetchFromGitHub, + callPackage, + libdbusmenu, + xdg-utils, + makeShellWrapper, + copyDesktopItems, + makeDesktopItem, stdenv, - fetchurl, - autoPatchelfHook, - dpkg, - makeWrapper, wrapGAppsHook3, - alsa-lib, + glib, + gtk3, + gtk4, at-spi2-atk, - at-spi2-core, - atk, + libdrm, + libgbm, + libxkbcommon, + libxshmfence, + libGL, + vulkan-loader, + alsa-lib, cairo, cups, dbus, expat, - ffmpeg, - fontconfig, - freetype, gdk-pixbuf, - glib, - gtk3, - libappindicator-gtk3, - libdbusmenu, - libdrm, - libnotify, - libpulseaudio, - libsecret, - libuuid, - libxkbcommon, - libgbm, nss, + nspr, + libX11, + libxcb, + libXcomposite, + libXdamage, + libXext, + libXfixes, + libXrandr, + libxkbfile, pango, systemd, - xdg-utils, - xorg, - libGL, + pciutils, + libnotify, + pipewire, + libsecret, + libpulseaudio, + speechd-minimal, + + castlabs-electron ? callPackage ./electron.nix { }, }: -stdenv.mkDerivation (finalAttrs: { - pname = "tidal-hifi"; - version = "5.18.2"; +let + version = "5.19.0"; - src = fetchurl { - url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-jo3vnq7ul7e+UsaBswil8EctUxVJMcTxo77YyQ2ncIM="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - dpkg - makeWrapper - wrapGAppsHook3 - ]; - - buildInputs = [ + electronLibPath = lib.makeLibraryPath [ alsa-lib at-spi2-atk - at-spi2-core - atk cairo cups dbus expat - ffmpeg - fontconfig - freetype gdk-pixbuf glib gtk3 - pango - systemd - libgbm + gtk4 nss - libuuid - libdrm + nspr + libX11 + libxcb + libXcomposite + libXdamage + libXext + libXfixes + libXrandr + libxkbfile + pango + pciutils + stdenv.cc.cc + systemd libnotify + pipewire libsecret libpulseaudio + speechd-minimal + libdrm + libgbm libxkbcommon - libappindicator-gtk3 - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libxshmfence - xorg.libXtst + libxshmfence libGL + vulkan-loader + ]; +in +buildNpmPackage { + pname = "tidal-hifi"; + inherit version; + + src = fetchFromGitHub { + owner = "Mastermindzh"; + repo = "tidal-hifi"; + tag = version; + hash = "sha256-/pPmfgKwrtOrEu7YVJTuQF/FIMa+W6uSnFbMFuyURFQ="; + }; + + nativeBuildInputs = [ + makeShellWrapper + wrapGAppsHook3 + copyDesktopItems ]; runtimeDependencies = [ @@ -102,36 +113,101 @@ stdenv.mkDerivation (finalAttrs: { xdg-utils ]; + npmDepsHash = "sha256-TNhD/ZkqJtsidAEIOL/WmJZw09BuFgd4ECnzbieNhVY="; + forceGitDeps = true; + makeCacheWritable = true; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + buildPhase = '' + runHook preBuild + + npm run compile + npm exec electron-builder -- \ + --dir \ + --config build/electron-builder.base.yml \ + -c.electronDist=${castlabs-electron.dist} \ + -c.electronVersion=${castlabs-electron.version} + + runHook postBuild + ''; + + desktopItems = [ + (makeDesktopItem { + name = "TIDAL Hi-Fi"; + desktopName = "tidal-hifi"; + genericName = "TIDAL Hi-Fi"; + comment = "The web version of listen.tidal.com running in electron with hifi support thanks to widevine."; + icon = "tidal-hifi"; + startupNotify = true; + terminal = false; + type = "Application"; + categories = [ + "Network" + "Application" + "AudioVideo" + "Audio" + "Video" + ]; + startupWMClass = "tidal-hifi"; + mimeTypes = [ "x-scheme-handler/tidal" ]; + extraConfig.X-PulseAudio-Properties = "media.role=music"; + }) + ]; + + dontWrapGApps = true; + installPhase = '' runHook preInstall - mkdir -p "$out/bin" - cp -R "opt" "$out" - cp -R "usr/share" "$out/share" - chmod -R g-w "$out" + for i in 16 22 24 32 48 64 128 256 384; do + install -Dm644 "assets/icons/$i"x"$i.png" "$out/share/icons/hicolor/$i"x"$i/apps/tidal-hifi.png" + done + + mv dist/linux-unpacked "$out/share/tidal-hifi" runHook postInstall ''; + # see: pkgs/development/tools/electron/binary/generic.nix postFixup = '' - makeWrapper $out/opt/tidal-hifi/tidal-hifi $out/bin/tidal-hifi \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${electronLibPath}:$out/share/tidal-hifi" \ + $out/share/tidal-hifi/tidal-hifi \ + $out/share/tidal-hifi/chrome_crashpad_handler + + # patch libANGLE + patchelf \ + --set-rpath "${ + lib.makeLibraryPath [ + libGL + pciutils + vulkan-loader + ] + }" \ + $out/share/tidal-hifi/lib*GL* + + # replace bundled vulkan-loader + rm "$out/share/tidal-hifi/libvulkan.so.1" + ln -s -t "$out/share/tidal-hifi" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1" + + makeShellWrapper "$out/share/tidal-hifi/tidal-hifi" "$out/bin/tidal-hifi" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ "''${gappsWrapperArgs[@]}" - substituteInPlace $out/share/applications/tidal-hifi.desktop \ - --replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi" ''; meta = { - changelog = "https://github.com/Mastermindzh/tidal-hifi/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/Mastermindzh/tidal-hifi/releases/tag/${version}"; description = "Web version of Tidal running in electron with hifi support thanks to widevine"; homepage = "https://github.com/Mastermindzh/tidal-hifi"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ + gerg-l qbit spikespaz ]; platforms = lib.platforms.linux; mainProgram = "tidal-hifi"; }; -}) +} diff --git a/pkgs/by-name/tm/tm/missing-string-header.patch b/pkgs/by-name/tm/tm/missing-string-header.patch new file mode 100644 index 000000000000..134102400a6d --- /dev/null +++ b/pkgs/by-name/tm/tm/missing-string-header.patch @@ -0,0 +1,24 @@ +diff --git a/unix_client.c b/unix_client.c +index 920910a..6d608fd 100644 +--- a/unix_client.c ++++ b/unix_client.c +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + + #include "main.h" + #include "handlers.h" +diff --git a/unix_server.c b/unix_server.c +index 5cf93ed..d3c51c9 100644 +--- a/unix_server.c ++++ b/unix_server.c +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/pkgs/by-name/tm/tm/package.nix b/pkgs/by-name/tm/tm/package.nix index 45208fa35399..c181cddd6f81 100644 --- a/pkgs/by-name/tm/tm/package.nix +++ b/pkgs/by-name/tm/tm/package.nix @@ -4,27 +4,32 @@ fetchurl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAtts: { pname = "tm"; version = "0.4.1"; src = fetchurl { - url = "https://vicerveza.homeunix.net/~viric/soft/tm/tm-${version}.tar.gz"; - sha256 = "3b389bc03b6964ad5ffa57a344b891fdbcf7c9b2604adda723a863f83657c4a0"; + url = "https://vicerveza.homeunix.net/~viric/soft/tm/tm-${finalAtts.version}.tar.gz"; + hash = "sha256-OzibwDtpZK1f+lejRLiR/bz3ybJgSt2nI6hj+DZXxKA="; }; makeFlags = [ "PREFIX=$(out)" ]; + patches = [ + # fix using strncpy and strlen without including string.h + ./missing-string-header.patch + ]; + postPatch = '' sed -i 's@/usr/bin/install@install@g ; s/gcc/cc/g' Makefile ''; - meta = with lib; { + meta = { description = "Terminal mixer - multiplexer for the i/o of terminal applications"; homepage = "http://vicerveza.homeunix.net/~viric/soft/tm"; - license = licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = platforms.all; + platforms = lib.platforms.all; mainProgram = "tm"; }; -} +}) diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix index 5a834c1a961b..b2ba58b54f47 100644 --- a/pkgs/by-name/to/tor-browser/package.nix +++ b/pkgs/by-name/to/tor-browser/package.nix @@ -109,7 +109,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "14.5"; + version = "14.5.1"; sources = { x86_64-linux = fetchurl { @@ -119,7 +119,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-wSxmNPPJsLRjDVimc2Rp1rBcIgYp/CtPKuU6+gZfVmw="; + hash = "sha256-XmJsHPnzu7Sk1LeOQG2KN+s8YGeTI/Z7pa+OrkEIaIQ="; }; i686-linux = fetchurl { @@ -129,7 +129,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-upqpWUl5qmDj7Oc/wIGdNlgIJSaTbhxlq4X+zjCPHfA="; + hash = "sha256-68kqhHAwCBAxFnXW1MbMdG//AB3TI/luomVH3v26DkM="; }; }; diff --git a/pkgs/by-name/tr/trunk-recorder/package.nix b/pkgs/by-name/tr/trunk-recorder/package.nix index f7846b0ac194..c79b8c590a5f 100644 --- a/pkgs/by-name/tr/trunk-recorder/package.nix +++ b/pkgs/by-name/tr/trunk-recorder/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation rec { pname = "trunk-recorder"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "robotastic"; repo = "trunk-recorder"; rev = "v${version}"; - hash = "sha256-d2iBCSLR3kr6rnLXO3MeGVdi6+8pqXZqW/yhxAvA1cY="; + hash = "sha256-UTowlW2xKJllYlEvfEVQEyjNmFX3oafKJThIYDx7dkc="; }; cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; @@ -55,6 +55,12 @@ stdenv.mkDerivation rec { ++ lib.optionals hackrfSupport [ hackrf ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ mpir ]; + postPatch = '' + # fix broken symlink + rm -v trunk-recorder/git.h + cp -v git.h trunk-recorder/git.h + ''; + postFixup = '' wrapProgram $out/bin/trunk-recorder --prefix PATH : ${ lib.makeBinPath [ diff --git a/pkgs/by-name/ts/ts_query_ls/package.nix b/pkgs/by-name/ts/ts_query_ls/package.nix index 2e38695c2976..3a1a4c03bd90 100644 --- a/pkgs/by-name/ts/ts_query_ls/package.nix +++ b/pkgs/by-name/ts/ts_query_ls/package.nix @@ -6,7 +6,7 @@ }: let pname = "ts_query_ls"; - version = "1.11.0"; + version = "2.0.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage { owner = "ribru17"; repo = "ts_query_ls"; rev = "v${version}"; - hash = "sha256-RpzQUqCaS6/MrYlVqkWaJPUgEpIBIzToMygn+TDeX88="; + hash = "sha256-RWryYFeJ6DdXG9kSjPbSu3xfiGjaUBNEj2XBIoXbySg="; }; nativeBuildInputs = [ cmake ]; useFetchCargoVendor = true; - cargoHash = "sha256-g0BVLduTWZRxNwDblvl7lm/ZduvEAbkSFYmzADMkKjg="; + cargoHash = "sha256-IlvUpEpdMocJ1d5GVWmuKfVRdOskuzIiqP6uSg/QxZc="; meta = { description = "LSP implementation for Tree-sitter's query files"; diff --git a/pkgs/by-name/tz/tzf-rs/package.nix b/pkgs/by-name/tz/tzf-rs/package.nix new file mode 100644 index 000000000000..65c380b832e5 --- /dev/null +++ b/pkgs/by-name/tz/tzf-rs/package.nix @@ -0,0 +1,31 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "tzf-rs"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "ringsaturn"; + repo = "tzf-rs"; + tag = "v${finalAttrs.version}"; + hash = "sha256-cYi8FsB1aR0h1HxqkdFlLwCLzRwVM9Ak1LtjHezCSe0="; + }; + + cargoHash = "sha256-9bUQpEP+vc3xwWCicHpl+56OYz3huirSOA4yw1iaxaY="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A fast timezone finder for Rust"; + homepage = "https://github.com/ringsaturn/tzf-rs"; + changelog = "https://github.com/ringsaturn/tzf-rs/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pcboy ]; + mainProgram = "tzf"; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ug/ugrep/package.nix b/pkgs/by-name/ug/ugrep/package.nix index 8ca719b609f2..eb81a3531cb5 100644 --- a/pkgs/by-name/ug/ugrep/package.nix +++ b/pkgs/by-name/ug/ugrep/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "7.3.0"; + version = "7.4.2"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-GwBXjHUXp5iTfTsGELkJISPOsP70xzx8XJcarhrQRtM="; + hash = "sha256-ZUjUqSDzcrbYXYqQjRfiNy2bCm2bUUmbBnn9YtpFSzo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/un/unblob/package.nix b/pkgs/by-name/un/unblob/package.nix index fd682ee27366..47a22f5b1761 100644 --- a/pkgs/by-name/un/unblob/package.nix +++ b/pkgs/by-name/un/unblob/package.nix @@ -1,10 +1,14 @@ { lib, + libiconv, python3, fetchFromGitHub, gitUpdater, makeWrapper, + rustPlatform, + stdenvNoCC, e2fsprogs, + erofs-utils, jefferson, lz4, lziprecover, @@ -23,6 +27,7 @@ let # These dependencies are only added to PATH runtimeDeps = [ e2fsprogs + erofs-utils jefferson lziprecover lzop @@ -38,7 +43,7 @@ let in python3.pkgs.buildPythonApplication rec { pname = "unblob"; - version = "25.1.8"; + version = "25.4.14"; pyproject = true; disabled = python3.pkgs.pythonOlder "3.9"; @@ -46,15 +51,22 @@ python3.pkgs.buildPythonApplication rec { owner = "onekey-sec"; repo = "unblob"; tag = version; - hash = "sha256-PGpJPAo9q52gQ3EGusYtDA2e0MG5kFClqCYPB2DvuMs="; + hash = "sha256-kWZGQX8uSKdFW+uauunHcruXhJ5XpBfyDY7gPyWGK90="; forceFetchGit = true; fetchLFS = true; }; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + hash = "sha256-lGsDax7+CUACeYChDqdPsVbKE/hH94CPek6UBVz1eqs="; + }; + strictDeps = true; build-system = with python3.pkgs; [ poetry-core ]; + buildInputs = lib.optionals stdenvNoCC.hostPlatform.isDarwin [ libiconv ]; + dependencies = with python3.pkgs; [ arpy attrs @@ -69,15 +81,17 @@ python3.pkgs.buildPythonApplication rec { pyfatfs pyperscan python-magic + pyzstd rarfile rich structlog treelib - unblob-native ]; - nativeBuildInputs = [ + nativeBuildInputs = with rustPlatform; [ makeWrapper + maturinBuildHook + cargoSetupHook ]; # These are runtime-only CLI dependencies, which are used through @@ -87,7 +101,7 @@ python3.pkgs.buildPythonApplication rec { "ubi-reader" ]; - pythonRelaxDeps = [ "rich" ]; + pythonRelaxDeps = [ "lz4" ]; pythonImportsCheck = [ "unblob" ]; @@ -112,13 +126,6 @@ python3.pkgs.buildPythonApplication rec { disabled = [ # https://github.com/tytso/e2fsprogs/issues/152 "test_all_handlers[filesystem.extfs]" - - # Should be dropped after upgrading to next version - # Needs https://github.com/onekey-sec/unblob/pull/1128/commits/c6af67f0c6f32fa01d7abbf495eb0293e9184438 - # Unfortunately patches touching LFS stored assets cannot be applied - "test_all_handlers[filesystem.ubi.ubi]" - "test_all_handlers[archive.dlink.encrpted_img]" - "test_all_handlers[archive.dlink.shrs]" ]; in [ diff --git a/pkgs/by-name/un/unvanquished/package.nix b/pkgs/by-name/un/unvanquished/package.nix index ef32e161cd3f..0729b5f6b7f9 100644 --- a/pkgs/by-name/un/unvanquished/package.nix +++ b/pkgs/by-name/un/unvanquished/package.nix @@ -20,6 +20,7 @@ libpng, libvorbis, libwebp, + libX11, lua5, makeDesktopItem, ncurses, @@ -171,6 +172,7 @@ stdenv.mkDerivation rec { libvorbis libjpeg libwebp + libX11 libpng ]; diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix index 604c785d6050..57c1c02f4460 100644 --- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix +++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix @@ -9,12 +9,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20250422055726"; + version = "20250430053132"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-mKnZOvFHzUNndbLDY9c9RCxtQQaELrHB4iHMvwucgzE="; + hash = "sha256-Nc8ck9MfHi86052J0fUUePzNqVnD2ONlB5zKULH9y70="; }; vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg="; meta = with lib; { diff --git a/pkgs/by-name/vu/vuetorrent/package.nix b/pkgs/by-name/vu/vuetorrent/package.nix index 53020fc2bb16..46664f0d26c5 100644 --- a/pkgs/by-name/vu/vuetorrent/package.nix +++ b/pkgs/by-name/vu/vuetorrent/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "vuetorrent"; - version = "2.24.1"; + version = "2.24.2"; src = fetchFromGitHub { owner = "VueTorrent"; repo = "VueTorrent"; tag = "v${version}"; - hash = "sha256-FuX1wZVWB6+5G0ePE7Eb4Gkq736UKB/caW5AcCYJtUU="; + hash = "sha256-+BTnFQxg+8vJdfwER6lM7dszRxBiX20K/vYv+nuH/1Y="; }; - npmDepsHash = "sha256-lRTB4Wfkp9UAi0N9iOSJQIJNFBz3RDGTglFofWqIWZ0="; + npmDepsHash = "sha256-4lIxaNqXO5jDmXgPfoxRuSe8p6jV7momSbpl9Nns0VI="; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/wa/wapiti/package.nix b/pkgs/by-name/wa/wapiti/package.nix index ca2abf9ab6fe..c17e22420581 100644 --- a/pkgs/by-name/wa/wapiti/package.nix +++ b/pkgs/by-name/wa/wapiti/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, fetchFromGitHub, python3Packages, fetchpatch, @@ -148,10 +149,15 @@ python3Packages.buildPythonApplication rec { "test_attack_unifi" ]; - disabledTestPaths = [ - # Requires sslyze which is obsolete and was removed - "tests/attack/test_mod_ssl.py" - ]; + disabledTestPaths = + [ + # Requires sslyze which is obsolete and was removed + "tests/attack/test_mod_ssl.py" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # PermissionError: [Errno 13] Permission denied: '/tmp/crawl.db' + "tests/web/test_persister.py" + ]; pythonImportsCheck = [ "wapitiCore" ]; diff --git a/pkgs/by-name/we/weaviate/package.nix b/pkgs/by-name/we/weaviate/package.nix index 587798733f30..2cd11c23e184 100644 --- a/pkgs/by-name/we/weaviate/package.nix +++ b/pkgs/by-name/we/weaviate/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "weaviate"; - version = "1.30.1"; + version = "1.30.2"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-Rxi21DifRnOzUgPO3U74LMQ/27NwvYzcj3INplTT1j4="; + hash = "sha256-/jaBELPSxmGY4atPxpGEZcLN6Xezesez9UBD/uQNkNg="; }; vendorHash = "sha256-jXfVPdORMBOAl3Od3GknGo7Qtfb4H3RqGYdI6Jx1/5I="; diff --git a/pkgs/by-name/wg/wgsl-analyzer/package.nix b/pkgs/by-name/wg/wgsl-analyzer/package.nix index 9829631855d3..60d047ee4d31 100644 --- a/pkgs/by-name/wg/wgsl-analyzer/package.nix +++ b/pkgs/by-name/wg/wgsl-analyzer/package.nix @@ -2,21 +2,22 @@ lib, fetchFromGitHub, rustPlatform, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "wgsl-analyzer"; - version = "0.9.8"; + version = "2025-04-04"; src = fetchFromGitHub { owner = "wgsl-analyzer"; repo = "wgsl-analyzer"; - tag = "v${version}"; - hash = "sha256-UizD6cTRs6M5GaOX3wvacMr5JWwyHrQS6L19fRnw6Xo="; + tag = finalAttrs.version; + hash = "sha256-t+Gpm+p2EaobuzUppkhCsaj3q/v+YjMSlau4GVoLgJo="; }; useFetchCargoVendor = true; - cargoHash = "sha256-W1WQ00SFpYOm4J1C65Jg1Yb3pujdcDQFdrpIgqKRLk4="; + cargoHash = "sha256-QjR0O/GFOsYi0+r3rYBdR9rw/4Qa5pNjWSbn6CsshqU="; checkFlags = [ # Imports failures @@ -26,10 +27,12 @@ rustPlatform.buildRustPackage rec { "--skip=tests::struct_recover_3" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Language server implementation for the WGSL shading language"; homepage = "https://github.com/wgsl-analyzer/wgsl-analyzer"; - changelog = "https://github.com/wgsl-analyzer/wgsl-analyzer/releases/tag/v${version}"; + changelog = "https://github.com/wgsl-analyzer/wgsl-analyzer/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ asl20 mit @@ -37,4 +40,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ genga898 ]; mainProgram = "wgsl-analyzer"; }; -} +}) diff --git a/pkgs/by-name/xh/xh/package.nix b/pkgs/by-name/xh/xh/package.nix index a91cba99b26e..0e00d6618b05 100644 --- a/pkgs/by-name/xh/xh/package.nix +++ b/pkgs/by-name/xh/xh/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - hash = "sha256-5Eq/rJ917zjlTnuxdIWhBNr8LA/ag+fyECYYX5k2S7I="; + hash = "sha256-2c96O5SL6tcPSbxx8NYxG8LDX3ZgyxEMmEeJnKDwb38="; }; useFetchCargoVendor = true; - cargoHash = "sha256-jeEhlpOl4ZiR1kQxCI3e6jacszVogzROpFC2w43BjZ0="; + cargoHash = "sha256-oncf3Hd85LgKn8KSDIBHXLJ3INzfp0X/Ng9OjAltLB4="; buildFeatures = lib.optional withNativeTls "native-tls"; diff --git a/pkgs/by-name/ze/zenmap/package.nix b/pkgs/by-name/ze/zenmap/package.nix new file mode 100644 index 000000000000..71253709da5e --- /dev/null +++ b/pkgs/by-name/ze/zenmap/package.nix @@ -0,0 +1,81 @@ +{ + gobject-introspection, + gtk3, + lib, + nmap, + python3Packages, + wrapGAppsHook3, + xterm, +}: + +python3Packages.buildPythonApplication rec { + pname = "zenmap"; + version = nmap.version; + pyproject = true; + + src = nmap.src; + + prePatch = '' + cd zenmap + ''; + + build-system = with python3Packages; [ + setuptools + ]; + + buildInputs = [ + nmap + gtk3 + xterm + ]; + + nativeBuildInputs = [ + wrapGAppsHook3 + gobject-introspection + ]; + + nativeCheckInputs = [ + nmap + ]; + + dependencies = with python3Packages; [ + pygobject3 + ]; + + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ nmap ]}) + ''; + postInstall = '' + # Icons + install -Dm 644 "zenmapCore/data/pixmaps/zenmap.png" -t "$out/share/pixmaps/" + # Desktop-files for application + install -Dm 644 "install_scripts/unix/zenmap.desktop" -t "$out/share/applications/" + install -Dm 644 "install_scripts/unix/zenmap-root.desktop" -t "$out/share/applications/" + install -Dm 755 "install_scripts/unix/su-to-zenmap.sh" -t "$out/bin/" + substituteInPlace "$out/bin/su-to-zenmap.sh" \ + --replace-fail 'COMMAND="zenmap"' \ + 'COMMAND="'"$out/bin/zenmap"'"' \ + --replace-fail 'xterm' \ + '"${xterm}/bin/xterm"' + ''; + + checkPhase = '' + runHook preCheck + + cd test + ${python3Packages.python.interpreter} run_tests.py 2>&1 | tee /dev/stderr | tail -n1 | grep '^OK$' + + runHook postCheck + ''; + + meta = nmap.meta // { + description = "Offical nmap Security Scanner GUI"; + homepage = "https://nmap.org/zenmap/"; + maintainers = with lib.maintainers; [ + dvaerum + mymindstorm + ]; + }; +} diff --git a/pkgs/by-name/zv/zvbi/package.nix b/pkgs/by-name/zv/zvbi/package.nix index d7dfa3900110..60a80c9269b7 100644 --- a/pkgs/by-name/zv/zvbi/package.nix +++ b/pkgs/by-name/zv/zvbi/package.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-knc9PejugU6K4EQflfz91keZr3ZJqZu2TKFQFFJrxiI="; }; + configureFlags = lib.optionals (!lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform) [ + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; + nativeBuildInputs = [ autoreconfHook validatePkgConfig diff --git a/pkgs/data/fonts/maple-font/default.nix b/pkgs/data/fonts/maple-font/default.nix index de240b613f2c..735c86fb8bd5 100644 --- a/pkgs/data/fonts/maple-font/default.nix +++ b/pkgs/data/fonts/maple-font/default.nix @@ -17,7 +17,7 @@ let }: stdenv.mkDerivation rec { inherit pname; - version = "7.1"; + version = "7.2"; src = fetchurl { url = "https://github.com/subframe7536/Maple-font/releases/download/v${version}/${pname}.zip"; inherit hash; diff --git a/pkgs/data/fonts/maple-font/hashes.json b/pkgs/data/fonts/maple-font/hashes.json index 08c01aaf4e80..64e5245f99ce 100644 --- a/pkgs/data/fonts/maple-font/hashes.json +++ b/pkgs/data/fonts/maple-font/hashes.json @@ -1,46 +1,46 @@ { - "MapleMono-CN-unhinted": "sha256-D4B+KAkybvfVS+HztoYTCF+Qs9lxrh1de2bBPUBdO68=", - "MapleMono-CN": "sha256-63qfevuputeewEXaV5CbjSnOQ6tqXNPwN65BnkTXcf0=", - "MapleMono-NF-CN-unhinted": "sha256-qLqcdCL3uCDW6QDx+W39HcL3r303RNjEuEhiA38YRYU=", - "MapleMono-NF-CN": "sha256-9gxjsh9j7Tlc1Z5naK7PSppbViI6cZtlqk6/5Jhvt5E=", - "MapleMono-NF-unhinted": "sha256-hnELGz8zpQ/n2Pj3SWqduuflmIBhT+8Md6c5QMXhzd4=", - "MapleMono-NF": "sha256-ZzU+PgrazEziTx8ooNkkjqAPwFcM1EPQBRSkkm3C60I=", - "MapleMono-OTF": "sha256-Nxpv748064mp5Lz4lvdCUz9jWY78dVMOSlC1FBDOvws=", - "MapleMono-TTF-AutoHint": "sha256-R1ZNozNRHYtNXar96w3V1qkwbAOWCdMZMmhK7Dtyqs4=", - "MapleMono-TTF": "sha256-7aFMMCxreDD2KnpgIt/gcYAyp+pNEtdfSgT/4aOM/P8=", - "MapleMono-Variable": "sha256-FyaIAYpdDOj6IDLJUU33Yg7VqEK0VN/n92b2I4LrdcA=", - "MapleMono-Woff2": "sha256-lxcBjgmngFZ1UhBej3lE+IqKxvQoDE5rH3++h4CN0ac=", - "MapleMonoNL-CN-unhinted": "sha256-tkEEKNjHN/lveLvYtlP3EvmtKVnQMdaBFDe6c+fjtB8=", - "MapleMonoNL-CN": "sha256-D7Whkd1+qL5OwlAVIepscLqQwusbIWKwtg1C2vfC4yI=", - "MapleMonoNL-NF-CN-unhinted": "sha256-8MtWWxzrrLTdHsAB+vNWBN62TJ59Tr6pfmAsJVdk/KA=", - "MapleMonoNL-NF-CN": "sha256-58UpkirwaSTOgk0m5UoDL+1tAz4FzDD9f+zPUieqUkA=", - "MapleMonoNL-NF-unhinted": "sha256-6ImbXQwoXBQ9FDjB4qLPIwoi8wc+/AWc3P5ALZfkdE4=", - "MapleMonoNL-NF": "sha256-Lk8JBrLxwmonB7w4Je9evGM0wUjpgwIZ3Qj+IU/XZ1o=", - "MapleMonoNL-OTF": "sha256-Lcrde1I3SV6f7RYiyguK0w9wgRCn3Ra703xkB8gtqJ4=", - "MapleMonoNL-TTF-AutoHint": "sha256-++via+eB8KE/RQ6NpCXL3DsBuI/+U0IWMUZPvDQ1zuA=", - "MapleMonoNL-TTF": "sha256-B5z0KEnEis39A1sPj1bOZTfSdtwR4PJPfms84EiMYsQ=", - "MapleMonoNL-Variable": "sha256-zdMMVg+KS/VSP/ICQciSMOXLFZdcyZvJQusXcYJlfbs=", - "MapleMonoNL-Woff2": "sha256-ksaugxwIw56txNfOJtgSeSOffwUxs4JrIUYfDj5t3wY=", - "MapleMonoNormal-CN-unhinted": "sha256-B4v2lJeSerzX3NRbfalAQ2zfNQJtkwfO3fVvrL5yAWg=", - "MapleMonoNormal-CN": "sha256-MBtXNBDzW6WogNCvGMVzzgJ5VPupYOPPI/f8OC+qU0w=", - "MapleMonoNormal-NF-CN-unhinted": "sha256-a/rW5sU02nBMx0SuSfIZPnR37g9WzzBSv9J46kiv4xc=", - "MapleMonoNormal-NF-CN": "sha256-p1mFIMlT4JEmxyGCG24W8SCdi+4d1S9QyHF09g3iDnY=", - "MapleMonoNormal-NF-unhinted": "sha256-1sn7wt1s71t0F4W8fUSbqOie71V4cJisBrpFc77s0jI=", - "MapleMonoNormal-NF": "sha256-zoLY/fj7kxkg0040K0UQxhieicM5eo9WLS+WBAXZr5g=", - "MapleMonoNormal-OTF": "sha256-OdaYoRney4GwdsQvruR+jj889LBwBWU9FtTNJR9pIHo=", - "MapleMonoNormal-TTF-AutoHint": "sha256-bx7FdvgDPpQV8wGpWD+3wzEETSL3HgYnM8UbmoSJSc4=", - "MapleMonoNormal-TTF": "sha256-FULu8LaFW+RcUiO5HVj2e4vhfcphgvmyRT/iQ0/xQc8=", - "MapleMonoNormal-Variable": "sha256-jCkN4QghmVlyuFO1eeL9vS0TNNVFNp9uQ0i226SNTtg=", - "MapleMonoNormal-Woff2": "sha256-EApY/qeoRMOseqqWz52tySSQk+BUZ71iafE03DGfQ/Q=", - "MapleMonoNormalNL-CN-unhinted": "sha256-mkswI0WwTyg+RWKFeb2M/mkfIFc1PIgVy2QYjqQiuiA=", - "MapleMonoNormalNL-CN": "sha256-TrOyQkGibptTtXAT+269XvZsgWv39n1jO5yIn2NaZII=", - "MapleMonoNormalNL-NF-CN-unhinted": "sha256-3ZMVAS/2coyy0cAy5e/r3XHKSTsfGxOn97jVQf7b/WY=", - "MapleMonoNormalNL-NF-CN": "sha256-Zqu+FfuJmtFglwm7kwUZ8tR8xMvd1kacepK1KkCD1WI=", - "MapleMonoNormalNL-NF-unhinted": "sha256-GW4jUZ05BUIxl164Uu4b2gsACP6MyfehrgQ8Ja57/HI=", - "MapleMonoNormalNL-NF": "sha256-+tApldIkG2s+IG7EOp/DqsRqcSXtu6H0SiuoO6H/E6I=", - "MapleMonoNormalNL-OTF": "sha256-lehO8olLXbwD/6TTuJw4z1V2ZQQaIU0yglL06a4foAg=", - "MapleMonoNormalNL-TTF-AutoHint": "sha256-+5OrKlftga0gWyTNZ5W79CqkdvZNfrM991RuWyMSq3k=", - "MapleMonoNormalNL-TTF": "sha256-ZfyCm62dfoLicwxUgvbgYBibvmhtIJTklK1zu7K6ies=", - "MapleMonoNormalNL-Variable": "sha256-oJdnpT3HuyptiD2P4Jm2Kj3ch8Pq/aoW5zfvtjZ1Lac=", - "MapleMonoNormalNL-Woff2": "sha256-ioeqrNud0v3/xgP7wmycxus7CcqsPDb8NMyYCCQih2k=" + "MapleMono-CN-unhinted": "sha256-+OBpkxboDvvjP5Rh8xoFUH76a237nilG0Ko1Me/Ygw4=", + "MapleMono-CN": "sha256-PVmtJLV9tyojaM5CIbQ9M2gOQPhx4Tjvam4vVO1/UqM=", + "MapleMono-NF-CN-unhinted": "sha256-qT77eUeq9Uept1AJuz4KvbJlfqvUtooJSekVoJUphD0=", + "MapleMono-NF-CN": "sha256-w7j1UI8OE4CbNzeY4n0g3WKtVgkJ07uMpRnRCVRIo8M=", + "MapleMono-NF-unhinted": "sha256-g2XHcy1zqZ/M5Fw6JQD2ifWmNijWZzcvQ5LdsAQJQWA=", + "MapleMono-NF": "sha256-E6hYxVShsP+QrgM1w6hjCiiArvQfcIHAEvG7WGOcpds=", + "MapleMono-OTF": "sha256-LnNxiGLtqO2H01O25N36ML9Kwxop9fH+4IvXk1VJFvs=", + "MapleMono-TTF-AutoHint": "sha256-K3oj/ik/9dkpH7sp1EgX12Ts/zsTWFOOulGwE2k+eno=", + "MapleMono-TTF": "sha256-1wQ97Tm2BN+ba2Oxonyeovl5UlLooYrYfkrA85CQZmM=", + "MapleMono-Variable": "sha256-qvph60EzXkkgDN+rvx8qH3IPAH9s/IIl3W8lb6cSN50=", + "MapleMono-Woff2": "sha256-eUHj2NOjsVvwFnh2/chauGEGfBXe5f7xeN2DLm9j5ko=", + "MapleMonoNL-CN-unhinted": "sha256-gqgd25Zkp1g/A5d1NTkawb8pnFv7ITTwdK1JQMzie9w=", + "MapleMonoNL-CN": "sha256-fZTMr9SGtaUJJ7GwILQ0anNMsS6XLDFoYqbF12aD7N0=", + "MapleMonoNL-NF-CN-unhinted": "sha256-r1+8h0Tosdgum02mDXQQtoxwbyVD+WjtAkdPXT74Yd0=", + "MapleMonoNL-NF-CN": "sha256-RubqDmNtgtuzFFTD8p5EV1PIE4zUFtOqsbT84ed+oTc=", + "MapleMonoNL-NF-unhinted": "sha256-QLyTquz5Xfd/DZ9NEWqNmAcOzDyiXV4KzePLhzZKL60=", + "MapleMonoNL-NF": "sha256-zo/voGFI/8wTzeXj+STzOPK8xEV5Tnmpg0LYbeJ3vgI=", + "MapleMonoNL-OTF": "sha256-iK1XlhFlMy8UnjYbntOhvZtL3BlQmGDk5YIAxfaaUKA=", + "MapleMonoNL-TTF-AutoHint": "sha256-KZRI7INinrg3yHrIcfFo/Za36d569z2fXjKsGXBXmV8=", + "MapleMonoNL-TTF": "sha256-4G61jgVY2PcjS4RRB/tDKujZ7rDdG44o5OYSJKQbboE=", + "MapleMonoNL-Variable": "sha256-6lxd8bdREW7loOUznAQUIvjhs7p/LDsD6pJbk4JmNpU=", + "MapleMonoNL-Woff2": "sha256-Ovh6++Bz8Cib9BcHxg5SYm6NHgKHuX9MW6HbmPH/LJw=", + "MapleMonoNormal-CN-unhinted": "sha256-BRRISfA21EQvNUlCGwNiVBkZpDAF+iCV99LsYJsuv9Q=", + "MapleMonoNormal-CN": "sha256-SXG2nlBpyuiFMLUClyl5ZzoPxVF5w33JjCaC5tPG/8s=", + "MapleMonoNormal-NF-CN-unhinted": "sha256-0EZzl2Cddqh2tLsfDd5VNhJweueZJK/KaqO9VUkGLIk=", + "MapleMonoNormal-NF-CN": "sha256-/nQhsf7AyoJ+xkUujY8z5p/xWyPLROIGtpSQgMvmlYc=", + "MapleMonoNormal-NF-unhinted": "sha256-2LlrEYI92GHRICLfYbUl9U+EbdAbCjiZSXD7z5vRC4w=", + "MapleMonoNormal-NF": "sha256-UJAXFD4KVm8lbZzPMaEwrH0divRf7HxixDxurPGkU44=", + "MapleMonoNormal-OTF": "sha256-98NGP7arvw1W2akNWweKK+OfW14VtbF/fy8olRXcAPA=", + "MapleMonoNormal-TTF-AutoHint": "sha256-j9mG3VM4DP82ynw0UFuMDXjcbMnuVKOfJ9HMBFrrvDk=", + "MapleMonoNormal-TTF": "sha256-mEJJ/y5amhMBt+MroSUMuaTqGg3LUeYTiAn/vAMfy5U=", + "MapleMonoNormal-Variable": "sha256-LwW94IJAfdltG2wmJiv6JmB8fNdddb//yHsZvMvlSTo=", + "MapleMonoNormal-Woff2": "sha256-HuHcNeCw/AEsScKGciTK5O5Rz7eCS0hlzfz5ZYcqLyU=", + "MapleMonoNormalNL-CN-unhinted": "sha256-u7QqDoWt+NZgBxFH4D/U+SyiCKEObKPOh89A9fINoUk=", + "MapleMonoNormalNL-CN": "sha256-K30io0S/kqpLD3aBZcTvVKy5IGbzq43uiTzKmxEgpW8=", + "MapleMonoNormalNL-NF-CN-unhinted": "sha256-RYQR301tnCD85t5f5E7wpTXrg6NDw3drJ85Z6z/Xo68=", + "MapleMonoNormalNL-NF-CN": "sha256-UDgWMxBzZajs0p6lBtAW2jbZEvMLb4GpvmdKhKWU+W4=", + "MapleMonoNormalNL-NF-unhinted": "sha256-vf7pXN7N+/HA1gia4mFGJNJOsrBdUf5lNKi/BlLoNN0=", + "MapleMonoNormalNL-NF": "sha256-VqKI6pICNlUZ/5cpgNRRKNgeA3xgUNYEVDjUDb006Ss=", + "MapleMonoNormalNL-OTF": "sha256-uQjt6K5s6+1sIxRnI51PgDxlyRi7xIsiNZbIP3hauNw=", + "MapleMonoNormalNL-TTF-AutoHint": "sha256-0zS5NdpnIeOwcaz8Rv1sCWeUdjWZE8SoF54myIQKAFE=", + "MapleMonoNormalNL-TTF": "sha256-Oqa2CPuXqqemxUR37Z98KOz2EWDXbxLSGZUpsQpMdGA=", + "MapleMonoNormalNL-Variable": "sha256-kWh6n9lFShmnLME0+1M2aKOrc64WrZk6SkQTT2AkEDU=", + "MapleMonoNormalNL-Woff2": "sha256-/Dl6B5Ya6BWHZqzOH7wcuJmTOUtO3jJXiW83+vWJpgM=" } diff --git a/pkgs/development/compilers/chicken/5/deps.toml b/pkgs/development/compilers/chicken/5/deps.toml index 541a8bbbd025..85c22bbfe817 100644 --- a/pkgs/development/compilers/chicken/5/deps.toml +++ b/pkgs/development/compilers/chicken/5/deps.toml @@ -44,9 +44,9 @@ version = "1.2" [address-info] dependencies = ["srfi-1"] license = "bsd" -sha256 = "0vzrbzalqx3bv5nzq9rykfyhnrgnf2hlh55hi67pgync9z06v3jy" +sha256 = "1drshasifvvpzp3bk7gc3pbvawcajhmhp9pg25dynbd0yndvgnby" synopsis = "Network address information access" -version = "1.0.5" +version = "1.0.6" [advice] dependencies = ["srfi-1"] @@ -359,23 +359,23 @@ version = "1.2" [breadline] dependencies = ["apropos", "srfi-18"] license = "gpl-3" -sha256 = "1kkga2n6vw2hxg9sd20f6swnj6hikddyiamsdbqp5m72nlxkq72c" +sha256 = "1rvffygravnaw5sns03qfn28zznvamprfhmzgscjfpck1j4x6ylc" synopsis = "Bindings to readline" -version = "0.12" +version = "1.0.2" [brev-separate] dependencies = ["matchable", "miscmacros", "srfi-1", "srfi-69"] license = "bsd-1-clause" -sha256 = "1wzcqbccngcajzw4js7llys1pnmnvsmkk01v1ji6khy4kyghvspl" +sha256 = "08mczqjyaf5bhm64hnb80r0237mq9w2kj4grn2a8ahzc7870h7jm" synopsis = "Hodge podge of macros and combinators" -version = "1.97" +version = "1.98" [brev] dependencies = ["anaphora", "brev-separate", "clojurian", "combinators", "define-options", "dwim-sort", "fix-me-now", "acetone", "html-parser", "match-generics", "http-client", "matchable", "miscmacros", "scsh-process", "sequences", "srfi-1", "srfi-42", "srfi-69", "strse", "sxml-serializer", "sxml-transforms", "sxpath", "tree", "uri-common"] license = "public-domain" -sha256 = "0gzbhyv228a76cnnisn7cqyhjsrphxn0bavxisg9rd40ndggijka" +sha256 = "0k890r62hp5ivyah3mrwm712xxlkrb7qmzg1825nmw1ij8c2hj1z" synopsis = "A huge pile of batteries and shortcuts" -version = "1.42" +version = "1.43" [byte-blob] dependencies = ["srfi-1"] @@ -546,11 +546,11 @@ synopsis = "A chicken wrapper for cmark with markdown to sxml capabilities" version = "0.1.0" [coin-change] -dependencies = ["srfi-1"] +dependencies = [] license = "unlicense" -sha256 = "09p83afsh2dx4y2cpyi55bf2br03ysdpq9xrqik7fmks3913kxmk" +sha256 = "0pjrf705ri2cxqnvc3648ww71zgn163r4g7a3wf5zwnhsha2fmya" synopsis = "Greedy solver for the coin change problem" -version = "1.0.2" +version = "1.0.4" [color] dependencies = ["fmt", "records", "srfi-13"] @@ -723,9 +723,9 @@ version = "1.2" [define-options] dependencies = ["brev-separate", "getopt-long", "matchable", "quasiwalk", "srfi-1"] license = "lgpl" -sha256 = "1j9lj5kj3j8jhclxnxrrc2wn6qn9j0bhr2y9fydg05an9q7jmrh0" +sha256 = "1cnd1gfbsnbkgj7nlcps74clsslfcbf5addji1b4v63zn3v167va" synopsis = "Conveniently bind to getopt-long options" -version = "1.23" +version = "1.24" [define-record-and-printer] dependencies = ["hahn", "matchable"] @@ -1423,9 +1423,9 @@ version = "0.4" [ipfs] dependencies = ["http-client", "intarweb", "medea", "srfi-1", "srfi-13", "srfi-189", "srfi-197", "uri-common"] license = "unlicense" -sha256 = "1fipsadibalrakzgai8mhxhizsy5a9jdg82x7x4r84gzjr30s327" +sha256 = "0fip6rkpg14xbjg2nk191ib3n4lckn8ynpnvlmb7jwk356b499kz" synopsis = "IPFS HTTP API for Scheme" -version = "0.0.17" +version = "0.0.18" [irc] dependencies = ["matchable", "regex", "srfi-1"] @@ -1626,9 +1626,9 @@ version = "3.4" [lmdb] dependencies = ["srfi-1"] license = "openldap" -sha256 = "1ymy7ji9q7zvy8708f4zzavxkvajmq8l8m1z6v6873qkxgv6jkw8" +sha256 = "0yr55f5sqj5ln8h0wd7ra8qrs5rv0rppqhg2px4azx1jn3mmgdl0" synopsis = "Bindings to LMDB" -version = "1.0.6" +version = "1.0.7" [locale] dependencies = ["srfi-1", "utf8", "check-errors"] @@ -1763,6 +1763,13 @@ sha256 = "11q9599lqs3rb0af6sxj2lvbm06a39igpnpdp1drl8zswdw41kyk" synopsis = "A flonum matrix module for CHICKEN Scheme." version = "0.6rel" +[md2] +dependencies = ["message-digest"] +license = "bsd" +sha256 = "1dcqr5dh4blrd7dphhjgywdxc93f513pyhw5c086kfcs1aiw7dpb" +synopsis = "Message Digest 2 algorithm as defined in RFC1319" +version = "1.3" + [md5] dependencies = ["message-digest-primitive"] license = "public-domain" @@ -2004,9 +2011,9 @@ version = "5.1.0" [number-limits] dependencies = [] license = "bsd" -sha256 = "134958zarw74yrxn97sixmm987b047p7izppc0cxx9rlviq145hd" +sha256 = "1xw11mnvcwqqnjhljbpsn7966w3kqaygr3dcqqv6fkfxgccb811z" synopsis = "Limit constants for numbers" -version = "3.0.8" +version = "3.0.9" [oauth] dependencies = ["srfi-1", "srfi-13", "uri-common", "intarweb", "http-client", "hmac", "sha1", "base64"] @@ -2099,6 +2106,13 @@ sha256 = "1dywjbim23k12fcvdiypq2g5p8wyljgq7zmsvlf8h2anaaq34sm1" synopsis = "" version = "0.3" +[pbkdf2] +dependencies = ["message-digest", "hmac", "sha2", "sha1", "md5", "md2"] +license = "bsd" +sha256 = "031yfdg33ypiyvqcd58paxfrmxy5j0nksjy7c2hgxrmz4q3dsb48" +synopsis = "Password-Based Key Derivation Function as defined in RFC2898" +version = "1.3" + [pdf] dependencies = ["srfi-1", "regex", "format"] license = "bsd" @@ -2550,9 +2564,9 @@ version = "1.8" [scm2wiki] dependencies = ["srfi-1", "srfi-13", "srfi-14", "args", "comparse"] license = "mit" -sha256 = "03mc88pri6c3h5r5z3xz771mdarc0a6iv4x691jlq6chs983x13v" +sha256 = "0q3w1i5ikn1hla4vy8g1374yh5ym9dh0fwm4pip8ffpdlhsbm571" synopsis = "An auto-documentation tool for CHICKEN Scheme." -version = "0.3.3" +version = "0.6.0" [scmfmt] dependencies = [] @@ -3194,9 +3208,9 @@ version = "0.1.7" [srfi-180] dependencies = ["srfi-34", "srfi-35", "srfi-158"] license = "bsd" -sha256 = "1sxyhd4kzhlg0p3a1fzrxkqn7amhd8vb89ql4ykssrknmc9svmvd" +sha256 = "14y763q74hrk9lgb21bdymcjinfd9bvf2q4kqm7vzay7ayghhc3x" synopsis = "A JSON parser and printer that supports JSON bigger than memory." -version = "1.5.2" +version = "1.6.1" [srfi-189] dependencies = ["srfi-1", "typed-records"] @@ -3219,6 +3233,13 @@ sha256 = "18raq9r8nvs6dvb9fq7095bi9sxh655pjs4k7jwj486369jn90di" synopsis = "SRFI 193: Command line" version = "0.1.3" +[srfi-194] +dependencies = ["r7rs", "srfi-133", "srfi-27", "srfi-158"] +license = "mit" +sha256 = "1h5zyiqxh0zflh622fp151i88xglz12kzrvsakdrcljga3k1s6ww" +synopsis = "Random data generators" +version = "1.0.0" + [srfi-196] dependencies = ["srfi-1", "srfi-133", "typed-records", "utf8"] license = "mit" @@ -3282,6 +3303,13 @@ sha256 = "0vrpgqdmwdaphy0szskxyl2x6xhwycgvi6flwi5v6m2zi5cd3j1c" synopsis = "SRFI 227: Optional Arguments" version = "1.1" +[srfi-228] +dependencies = ["r7rs", "srfi-1", "srfi-128", "srfi-151"] +license = "mit" +sha256 = "1psh5ha8r7ryp26pkbv8yvvpy8x6lf5l7607npbjac0k8vr2jwrn" +synopsis = "Composing Comparators" +version = "1.0.0" + [srfi-232] dependencies = ["srfi-1"] license = "mit" @@ -3296,6 +3324,13 @@ sha256 = "0vf6f0f6jm4frpz995kxjzydg3p7vjn58shmv6s2p34hmfsjcm04" synopsis = "Multidimensional arrays" version = "1.3" +[srfi-252] +dependencies = ["r7rs", "srfi-1", "srfi-64", "srfi-158", "srfi-194", "srfi-143", "srfi-144"] +license = "mit" +sha256 = "0r1kxw29yjz941mbgmkgj66w7l8zh09mm69gqnhsl6h1hqb2wkbg" +synopsis = "Property Testing" +version = "1.0.0" + [srfi-253] dependencies = ["r7rs"] license = "mit" @@ -3303,6 +3338,13 @@ sha256 = "1b7lrsv5fhl9s3swz0abfx3y2wqrk07n3fwhymg9cz3908cjqms3" synopsis = "SRFI 253: Data (Type-)Checking" version = "0.1.0" +[srfi-259] +dependencies = ["r7rs", "integer-map"] +license = "mit" +sha256 = "1zlblib4k0gz40yazx2nxacspgkgcngsfk1lb5rv8kd0d3l8ckfk" +synopsis = "Tagged procedures with type safety" +version = "0.10.0" + [srfi-27] dependencies = ["srfi-1", "vector-lib", "timed-resource", "miscmacros", "check-errors"] license = "bsd" @@ -3579,9 +3621,9 @@ version = "1.39" [stty] dependencies = ["foreigners", "srfi-69"] license = "bsd" -sha256 = "195qkj1ckji115ih9ccfsn52hg8cbbwn19vblcggv3g0xmpncdak" +sha256 = "0pdry1874iswsm1bq1q38xv2ijf6hq9pwxisapgifjw0wgcld3i0" synopsis = "stty-style interface to termios" -version = "0.6" +version = "0.7" [sundials] dependencies = ["srfi-1", "srfi-69", "srfi-13", "compile-file"] @@ -3593,9 +3635,9 @@ version = "2.17" [svgpath] dependencies = ["brev-separate", "clojurian", "match-generics", "miscmacros", "srfi-1", "srfi-69", "strse", "sxpath", "tree"] license = "lgpl" -sha256 = "0017w5vc9qpz5gcghhlsw6fzla2vxkvykm9rvriiqm9zywq48wlh" +sha256 = "1sp8v2cvlpjm3kjgaw5g73fszx71drzjcxrfbd38kg30xnd32jn3" synopsis = "Parse, normalize, and write SVG path data" -version = "1.7" +version = "1.15" [svn-client] dependencies = [] @@ -3649,9 +3691,9 @@ version = "1.0" [symbol-utils] dependencies = ["utf8"] license = "bsd" -sha256 = "0sw95b9487i9sr27zxnl3f6f07wrrpzx3g75q32yk2v79q898kd8" +sha256 = "1234p97sagl4bn1rgkrvp7xn22m6qrisnnpabmf51a6zn6ffj286" synopsis = "Symbol Utilities" -version = "2.6.1" +version = "2.6.2" [synch] dependencies = ["srfi-18", "check-errors"] @@ -3726,9 +3768,9 @@ version = "0.0.6" [test-new-egg] dependencies = ["henrietta-cache", "salmonella", "srfi-1"] license = "bsd" -sha256 = "01m7bi646f0ypv5j1zpsw16fk4rzw3lmycxlhkzzb11ghlgl2vqq" +sha256 = "1ghcwf3i598bznkdxx3xprsfwkbqbyvf3l077z9jh2x1jdsvgfas" synopsis = "A tool to test new eggs before they are added to the official CHICKEN repository" -version = "1.0.4" +version = "1.0.5" [test-utils] dependencies = ["test"] @@ -3810,9 +3852,9 @@ version = "2.0" [transducers] dependencies = ["r7rs", "srfi-1", "srfi-128", "srfi-133", "srfi-143", "srfi-146", "srfi-160", "srfi-253"] license = "mit" -sha256 = "1ncbx703w0iwpsh2d302zlw6brajjdjravcp7y4cf3zk6rd3xfrd" +sha256 = "0fyypwr9syd3iwhwayglff2rg6xsc4w3hcaz4k6ldm2y2f16g7yv" synopsis = "Transducers for working with foldable data types." -version = "0.7.0" +version = "0.7.1" [transmission] dependencies = ["http-client", "intarweb", "medea", "r7rs", "srfi-1", "srfi-189", "uri-common"] @@ -4017,6 +4059,13 @@ sha256 = "1fj8swh4s4gwif2dp59ls0vbdi2d5w50b2q2q00yiyvlr7smm4hs" synopsis = "named standard colors as available in X11" version = "1.1" +[xdg-basedir] +dependencies = [] +license = "bsd" +sha256 = "0ck91mxsyyrsdmxx3gi6p0dg1i9y5z9g77kvh6y0x20d0s3ymv0w" +synopsis = "Implementation of the XDG Base Directory Specification" +version = "1.0.0" + [xj] dependencies = ["fmt", "html-parser", "srfi-1", "utf8", "brev-separate"] license = "bsd-3-clause" diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 05878b579703..49182468edd8 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -172,7 +172,10 @@ jdk.overrideAttrs (oldAttrs: rec { ''; homepage = "https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime"; inherit (jdk.meta) license platforms mainProgram; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with maintainers; [ + edwtjo + aoli-al + ]; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/development/compilers/julia/generic.nix b/pkgs/development/compilers/julia/generic.nix index 3b2e1c5c695f..7b2bad8156c4 100644 --- a/pkgs/development/compilers/julia/generic.nix +++ b/pkgs/development/compilers/julia/generic.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - env = lib.optionalAttrs (lib.versionOlder version "1.11") { + env = lib.optionalAttrs (lib.versionOlder version "1.11" || stdenv.hostPlatform.isAarch64) { NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-function-declaration" "-Wno-error=incompatible-pointer-types" diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index b0398fdc39cb..7a85f303fd06 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -49,7 +49,7 @@ let in let - useNativeCompilers = !stdenv.hostPlatform.isMips; + useNativeCompilers = !stdenv.hostPlatform.isMips && !stdenv.hostPlatform.isLoongArch64; inherit (lib) optional optionals diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index bc0ea4ed5b1b..280ce2eb6039 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -240,9 +240,6 @@ package-maintainers: - xmonad-contrib erictapen: - hakyll - evenbrenden: - - unleash-client-haskell - - unleash-client-haskell-core Gabriella439: - annah - bench diff --git a/pkgs/development/haskell-modules/hoogle-local-wrapper.sh b/pkgs/development/haskell-modules/hoogle-local-wrapper.sh index 223d19b70f03..e5b63669ae73 100644 --- a/pkgs/development/haskell-modules/hoogle-local-wrapper.sh +++ b/pkgs/development/haskell-modules/hoogle-local-wrapper.sh @@ -2,4 +2,4 @@ COMMAND=$1 shift -exec @hoogle@/bin/hoogle "$COMMAND" --database @out@/share/doc/hoogle/default.hoo "$@" +exec @hoogle@/bin/hoogle "$COMMAND" --database @database@ "$@" diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index 9237f0fda59f..d20fc0f2978c 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -8,6 +8,7 @@ buildPackages, haskellPackages, writeText, + runCommand, }: # This argument is a function which selects a list of Haskell packages from any @@ -40,8 +41,11 @@ let # we grab the doc outputs (map (lib.getOutput "doc") packages); + # Hoogle database path, relative to `$out`. + databasePath = "share/doc/hoogle/default.hoo"; + in -buildPackages.stdenv.mkDerivation { +buildPackages.stdenv.mkDerivation (finalAttrs: { name = "hoogle-with-packages"; buildInputs = [ ghc @@ -101,8 +105,10 @@ buildPackages.stdenv.mkDerivation { ) } + databasePath="$out/"${lib.escapeShellArg databasePath} + echo building hoogle database - hoogle generate --database $out/share/doc/hoogle/default.hoo --local=$out/share/doc/hoogle + hoogle generate --database "$databasePath" --local=$out/share/doc/hoogle echo building haddock index # adapted from GHC's gen_contents_index @@ -122,13 +128,23 @@ buildPackages.stdenv.mkDerivation { echo finishing up mkdir -p $out/bin substitute ${wrapper} $out/bin/hoogle \ - --subst-var out --subst-var-by shell ${stdenv.shell} \ + --subst-var-by shell ${stdenv.shell} \ + --subst-var-by database "$databasePath" \ --subst-var-by hoogle ${hoogle} chmod +x $out/bin/hoogle ''; passthru = { isHaskellLibrary = false; # for the filter in ./with-packages-wrapper.nix + + # The path to the Hoogle database. + database = "${finalAttrs.finalPackage}/${databasePath}"; + + tests.can-search-database = runCommand "can-search-database" { } '' + # This succeeds even if no results are found, but `Prelude.map` should + # always be available. + ${finalAttrs.finalPackage}/bin/hoogle search Prelude.map > $out + ''; }; meta = { @@ -137,4 +153,4 @@ buildPackages.stdenv.mkDerivation { hydraPlatforms = with lib.platforms; none; maintainers = with lib.maintainers; [ ttuegel ]; }; -} +}) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 020dc12651b0..b1b227d2dcc2 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -47,9 +47,9 @@ selectPackages: let inherit (haskellPackages) llvmPackages ghc; - packages = - selectPackages haskellPackages - ++ lib.optional withHoogle (hoogleWithPackages selectPackages); + hoogleWithPackages' = if withHoogle then hoogleWithPackages selectPackages else null; + + packages = selectPackages haskellPackages ++ [ hoogleWithPackages' ]; isGhcjs = ghc.isGhcjs or false; isHaLVM = ghc.isHaLVM or false; @@ -202,6 +202,8 @@ else passthru = { inherit (ghc) version meta; + hoogle = hoogleWithPackages'; + # Inform users about backwards incompatibilities with <= 21.05 override = _: diff --git a/pkgs/development/libraries/kddockwidgets/default.nix b/pkgs/development/libraries/kddockwidgets/default.nix index d9aa3433644d..1eb58611b83f 100644 --- a/pkgs/development/libraries/kddockwidgets/default.nix +++ b/pkgs/development/libraries/kddockwidgets/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "KDDockWidgets"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "KDAB"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VDLHED/QKxccZ18WEPV7GPdr3v7VaizDa5sZq7ei5+g="; + sha256 = "sha256-B5Fy0ax5ytNB9w8a0HxsVdkQrFubLs/D26LAijrQk3E="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 3b2264486562..95438a3c12c2 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.110"; - hash = "sha256-OA2nBAbGLgTeEo2RfK335UoCfQM0lXpnOtoyFCLb84g="; + version = "3.111"; + hash = "sha256-GFtoSvLF5nAwBIiMa9CeEl5geAOK60gG2tjuQFubgYs="; } diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index ec6715d4b0ae..c580f114b490 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -16,14 +16,15 @@ quarto, extraPythonPackages ? ps: [ ], sysctl, + which, }: stdenv.mkDerivation (final: { pname = "quarto"; - version = "1.6.43"; + version = "1.7.29"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz"; - hash = "sha256-9cwGPduP0BN0fNtMb8lklK5FftJMuuPaqCFRN8vL+cI="; + hash = "sha256-UFXNyovsvRmLTAHQ3P/XYZwL4su9xwmrTQCFy3VXkak="; }; patches = [ @@ -32,6 +33,7 @@ stdenv.mkDerivation (final: { nativeBuildInputs = [ makeWrapper + which ]; dontStrip = true; @@ -81,7 +83,7 @@ stdenv.mkDerivation (final: { quarto-check = runCommand "quarto-check" { - nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ sysctl ]; + nativeBuildInputs = [ which ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sysctl ]; } '' export HOME="$(mktemp -d)" diff --git a/pkgs/development/libraries/quarto/deno2.patch b/pkgs/development/libraries/quarto/deno2.patch index 1ece9ae95450..aedb93af3d80 100644 --- a/pkgs/development/libraries/quarto/deno2.patch +++ b/pkgs/development/libraries/quarto/deno2.patch @@ -1,26 +1,5 @@ diff --git a/bin/quarto.js b/bin/quarto.js -index f854281..0b78f6e 100644 ---- a/bin/quarto.js -+++ b/bin/quarto.js -@@ -28511,7 +28511,7 @@ function jupyterHubServicePrefix() { - return Deno.env.get("JUPYTERHUB_SERVICE_PREFIX"); - } - function isInteractiveTerminal() { -- return Deno.isatty(Deno.stderr.rid); -+ return Deno.stderr.isTerminal(); - } - function isInteractiveSession() { - return isRStudio() || isInteractiveTerminal() || isVSCodeOutputChannel(); -@@ -83562,7 +83562,7 @@ function writeFileToStdout(file) { - }); - const contents = readAllSync(df); - writeAllSync1(Deno.stdout, contents); -- Deno.close(df.rid); -+ df.close(); - } - function clearLine() { - info(ansi.eraseLine.cursorLeft(), { -@@ -96154,6 +96154,7 @@ class ParserBase { +@@ -97360,6 +97360,7 @@ class SAXParser extends ParserBase { _listeners = {}; _controller; @@ -28,7 +7,7 @@ index f854281..0b78f6e 100644 fireListeners(event) { const [name, ...args] = event; const list = this._listeners[name] || []; -@@ -96189,33 +96190,23 @@ class SAXParser extends ParserBase { +@@ -97395,33 +97396,23 @@ write(chunk, controller) { try { this._controller = controller; @@ -68,7 +47,7 @@ index f854281..0b78f6e 100644 } } on(event, listener) { -@@ -96326,8 +96317,7 @@ async function readSitemap(sitemapPath) { +@@ -97532,8 +97523,7 @@ } }); const reader = await Deno.open(sitemapPath); @@ -78,72 +57,3 @@ index f854281..0b78f6e 100644 return urlset; } function writeSitemap(sitemapPath, urlset, draftMode) { -@@ -98407,21 +98397,21 @@ async function generateFeed(feed, feedItems, path) { - feed, - escape: __VIRTUAL_FILE172 - }); -- await Deno.write(feedFile.rid, textEncoder.encode(preamble)); -+ await feedFile.write(textEncoder.encode(preamble)); - for (const feedItem of feedItems){ - const item = renderEjs(resourcePath("projects/website/listing/feed/item.ejs.md"), { - item: feedItem, - escape: __VIRTUAL_FILE172 - }); -- await Deno.write(feedFile.rid, textEncoder.encode(item)); -+ await feedFile.write(textEncoder.encode(item)); - } - const postamble = renderEjs(resourcePath("projects/website/listing/feed/postamble.ejs.md"), { - feed, - escape: __VIRTUAL_FILE172 - }); -- await Deno.write(feedFile.rid, textEncoder.encode(postamble)); -+ await feedFile.write(textEncoder.encode(postamble)); - } finally{ -- Deno.close(feedFile.rid); -+ feedFile.close(); - } - } - function prepareItems(items, options) { -@@ -112277,7 +112267,7 @@ async function renderForPublish(render, providerName, type, title, siteUrl) { - } - function stageDocumentPublish(title, publishFiles) { - const publishDir = globalTempContext().createDir(); -- const stagedFiles = window.structuredClone(publishFiles); -+ const stagedFiles = globalThis.structuredClone(publishFiles); - stagedFiles.baseDir = publishDir; - for (const file of publishFiles.files){ - const src = join2(publishFiles.baseDir, file); -@@ -126377,33 +126367,6 @@ function reportPeformanceMetrics() { - console.log("Performance metrics"); - console.log("Quarto:"); - console.log(JSON.stringify(quartoPerformanceMetrics(), null, 2)); -- console.log(); -- console.log("Deno:"); -- const denoMetrics = JSON.parse(JSON.stringify(Deno.metrics())); -- denoMetrics.ops = Object.fromEntries(Object.entries(denoMetrics.ops).map(([key, opMetrics])=>{ -- for (const key of Object.keys(opMetrics)){ -- if (opMetrics[key] === 0) { -- delete opMetrics[key]; -- } -- } -- return [ -- key, -- opMetrics -- ]; -- }).filter(([_key, opMetrics])=>Object.keys(opMetrics).length > 0).map(([key, opMetrics])=>{ -- if (opMetrics.opsDispatched === opMetrics.opsDispatchedSync && opMetrics.opsDispatched === opMetrics.opsCompleted && opMetrics.opsDispatched === opMetrics.opsCompletedSync || opMetrics.opsDispatched === opMetrics.opsDispatchedAsync && opMetrics.opsDispatched === opMetrics.opsCompleted && opMetrics.opsDispatched === opMetrics.opsCompletedAsync) { -- return [ -- key, -- opMetrics.opsDispatched -- ]; -- } else { -- return [ -- key, -- opMetrics -- ]; -- } -- })); -- console.log(JSON.stringify(denoMetrics, null, 2)); - } - async function mainRunner(runner) { - try { diff --git a/pkgs/development/ocaml-modules/raylib/default.nix b/pkgs/development/ocaml-modules/raylib/default.nix index b733001945dc..e6fbe711e7da 100644 --- a/pkgs/development/ocaml-modules/raylib/default.nix +++ b/pkgs/development/ocaml-modules/raylib/default.nix @@ -1,35 +1,43 @@ { lib, - fetchFromGitHub, + fetchurl, buildDunePackage, dune-configurator, ctypes, integers, patch, - gitUpdater, + libGL, + libX11, + libXcursor, + libXi, + libXinerama, + libXrandr, }: buildDunePackage rec { pname = "raylib"; version = "1.4.0"; - src = fetchFromGitHub { - owner = "tjammer"; - repo = "raylib-ocaml"; - tag = version; - hash = "sha256-Fh79YnmboQF5Kn3VF//JKLaIFKl8QJWVOqRexTzxF0U="; - # enable submodules for vendored raylib sources - fetchSubmodules = true; + src = fetchurl { + url = "https://github.com/tjammer/raylib-ocaml/releases/download/${version}/raylib-${version}.tbz"; + hash = "sha256-/SeKgQOrhsAgMNk6ODAZlopL0mL0lVfCTx1ugmV1P/s="; }; - propagatedBuildInputs = [ + buildInputs = [ dune-configurator - ctypes - integers patch ]; - passthru.updateScript = gitUpdater { }; + propagatedBuildInputs = [ + ctypes + integers + libGL + libX11 + libXcursor + libXi + libXinerama + libXrandr + ]; meta = { description = "OCaml bindings for Raylib (5.0.0)"; diff --git a/pkgs/development/ocaml-modules/raylib/raygui.nix b/pkgs/development/ocaml-modules/raylib/raygui.nix index baa2003683dd..f4971b1b1e37 100644 --- a/pkgs/development/ocaml-modules/raylib/raygui.nix +++ b/pkgs/development/ocaml-modules/raylib/raygui.nix @@ -1,12 +1,17 @@ { buildDunePackage, + fetchurl, raylib, }: -buildDunePackage { +buildDunePackage rec { pname = "raygui"; + version = "1.4.0"; - inherit (raylib) src version; + src = fetchurl { + url = "https://github.com/tjammer/raylib-ocaml/releases/download/${version}/raygui-${version}.tbz"; + hash = "sha256-PQcVTAQKeTPkOOHk5w3O3Tz0n7jLvkIo3Urvrk66eMs="; + }; propagatedBuildInputs = [ raylib diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index f01c623bb230..ae2808a5ad90 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "6.3.1"; + version = "6.4.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; tag = "v${version}"; - hash = "sha256-inyKxDF6q8+h2/tcGHEHztBz0uY512wIPebzu4wKYss="; + hash = "sha256-BW8MN4sbQ+Z7Mi1EyrhmIOzGl1Gd8RS7vuaVMBPCtpE="; }; pythonRelaxDeps = [ @@ -74,7 +74,7 @@ buildPythonPackage rec { meta = with lib; { description = "Vulnerability database and package search for sources such as OSV, NVD, GitHub and npm"; homepage = "https://github.com/appthreat/vulnerability-db"; - changelog = "https://github.com/AppThreat/vulnerability-db/releases/tag/v${version}"; + changelog = "https://github.com/AppThreat/vulnerability-db/releases/tag/${src.tag}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; mainProgram = "vdb"; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 756e4446ab34..447a91f5eb4f 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.38.6"; + version = "1.38.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-NFnRID2lyjQAoWBrXaxTsQwxh3rBG7+VqCuFeE/zJ3E="; + hash = "sha256-/ah+DvDbraEXm2v1Y1Z930XW0BTF1oLStdsQEmPC60Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 1b836ecab166..9af29649c9b1 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.38.6"; + version = "1.38.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-Vu2Hs+CHDSGpaKg0YSm1eOH2tw7pAtALu2sWLCkSIvQ="; + hash = "sha256-xh9jUyF+8PmT2prFkWKuRbeQOEMeo6aEda8vRAOwjpU="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/diffsync/default.nix b/pkgs/development/python-modules/diffsync/default.nix index 4259cc5dee86..8d7cbfd37e6f 100644 --- a/pkgs/development/python-modules/diffsync/default.nix +++ b/pkgs/development/python-modules/diffsync/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "diffsync"; - version = "2.0.1"; + version = "2.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "networktocode"; repo = "diffsync"; tag = "v${version}"; - hash = "sha256-T3kcZcRm28WeXZTXBBCpaMxjgB0KmqvWO4gdILH5hCA="; + hash = "sha256-UZpGWa/UjHXp6jD0fPNWTMl1DZ1AWmILRX/5XRIpLdE="; }; nativeBuildInputs = [ @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utility library for comparing and synchronizing different datasets"; homepage = "https://github.com/networktocode/diffsync"; - changelog = "https://github.com/networktocode/diffsync/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/networktocode/diffsync/blob/${src.tag}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ clerie ]; }; diff --git a/pkgs/development/python-modules/django-admin-datta/default.nix b/pkgs/development/python-modules/django-admin-datta/default.nix index 9c4c289736b1..284de300f2e8 100644 --- a/pkgs/development/python-modules/django-admin-datta/default.nix +++ b/pkgs/development/python-modules/django-admin-datta/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "django-admin-datta"; - version = "1.0.18"; + version = "1.0.19"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9gQHtdmDjeoyCNjp+HG9nNh2xyGTwASHUyg77GvEHGM="; + hash = "sha256-65fUrV4FIbuVvNX93rgOCMjz4CoozMHEEVpzJqtbhKY="; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/fireworks-ai/default.nix b/pkgs/development/python-modules/fireworks-ai/default.nix index cea3bd3ef9b9..acdbd3815c56 100644 --- a/pkgs/development/python-modules/fireworks-ai/default.nix +++ b/pkgs/development/python-modules/fireworks-ai/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "fireworks-ai"; - version = "0.15.12"; + version = "0.15.13"; pyproject = true; # no source available src = fetchPypi { pname = "fireworks_ai"; inherit version; - hash = "sha256-I4ClPZIkTGCP05j42XuXOA2Jnz/3EAkfS1CRe3URnsI="; + hash = "sha256-ZZSF4R1HOYpNmKnL2OPWoUwdSJJ2j2e3+hzW0QH55io="; }; build-system = [ diff --git a/pkgs/development/python-modules/fontbakery/default.nix b/pkgs/development/python-modules/fontbakery/default.nix index c4130ffe2fdb..e2d2ab0c9218 100644 --- a/pkgs/development/python-modules/fontbakery/default.nix +++ b/pkgs/development/python-modules/fontbakery/default.nix @@ -141,8 +141,17 @@ buildPythonPackage rec { "test_check_cjk_vertical_metrics" "test_check_cjk_vertical_metrics_regressions" "test_check_fontbakery_version_live_apis" + "test_command_check_googlefonts" # AssertionError "test_check_shape_languages" + "test_command_config_file" + "test_config_override" + ]; + + disabledTestPaths = [ + # ValueError: Check 'googlefonts/glyphsets/shape_languages' not found + "tests/test_checks_filesize.py" + "tests/test_checks_googlefonts_overrides.py" ]; postInstall = '' diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 6833adc721f6..0c0b5f2d269b 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -1,38 +1,47 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies google-api-core, google-cloud-core, - grpcio, + google-crc32c, grpc-google-iam-v1, - libcst, - mock, proto-plus, protobuf, + + # optional dependencies + libcst, + + # testing + grpcio, + mock, pytestCheckHook, - pythonOlder, - setuptools, }: buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.30.0"; - pyproject = true; + version = "2.30.1"; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "google_cloud_bigtable"; - inherit version; - hash = "sha256-3bnfW9OVhUWf5hfzheSCeAY+w3VIalER0i3QtsGNSDM="; + src = fetchFromGitHub { + owner = "googleapis"; + repo = "python-bigtable"; + tag = "v${version}"; + hash = "sha256-TciCYpnwfIIvOexp4Ing6grZ7ufFonwP2G26UzlNaJ4="; }; + pyproject = true; + build-system = [ setuptools ]; dependencies = [ google-api-core google-cloud-core + google-crc32c grpc-google-iam-v1 proto-plus protobuf @@ -61,11 +70,11 @@ buildPythonPackage rec { "google.cloud.bigtable" ]; - meta = with lib; { + meta = { description = "Google Cloud Bigtable API client library"; homepage = "https://github.com/googleapis/python-bigtable"; changelog = "https://github.com/googleapis/python-bigtable/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = [ ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.sarahec ]; }; } diff --git a/pkgs/development/python-modules/gpu-rir/default.nix b/pkgs/development/python-modules/gpu-rir/default.nix new file mode 100644 index 000000000000..a1d0fda616d2 --- /dev/null +++ b/pkgs/development/python-modules/gpu-rir/default.nix @@ -0,0 +1,83 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + cmake, + setuptools, + + # nativeBuildInputs + autoAddDriverRunpath, + cudaPackages, + + # dependencies + numpy, + scipy, +}: + +buildPythonPackage { + pname = "gpu-rir"; + version = "0-unstable-2025-01-20"; + pyproject = true; + + src = fetchFromGitHub { + owner = "DavidDiazGuerra"; + repo = "gpuRIR"; + rev = "fd8af43a4a113d3c2c05f0085a0119ecb1f1a484"; + hash = "sha256-nYi91iaNb9gswYzXW7aNpD3yYIgMvTen9r02G4d6joo="; + }; + + # Inject cmakeFlags in the cmake call + postPatch = '' + substituteInPlace setup.py \ + --replace-fail \ + "cmake_args = [" \ + "cmake_args = os.environ.get('cmakeFlags', \"\").split() + [" + ''; + + build-system = [ + cmake + setuptools + ]; + dontUseCmakeConfigure = true; + + nativeBuildInputs = [ + autoAddDriverRunpath + cudaPackages.cuda_nvcc + ]; + + # TODO: Investigate why (deprecated) FindCUDA fails to set these variables + cmakeFlags = [ + (lib.cmakeFeature "CUDA_CUFFT_LIBARIES" "${lib.getLib cudaPackages.libcufft}/lib/libcufft.so") + (lib.cmakeFeature "CUDA_curand_LIBRARY" "${lib.getLib cudaPackages.libcurand}/lib/libcurand.so") + ]; + + buildInputs = with cudaPackages; [ + cuda_cccl # + cuda_cudart # cuda_runtime.h + libcufft + libcurand + ]; + + dependencies = [ + numpy + scipy + ]; + + pythonImportsCheck = [ "gpuRIR" ]; + # Fails at import because there is no GPU access in the sandbox: + # Check whether the following modules can be imported: gpuRIR + # GPUassert: CUDA driver version is insufficient for CUDA runtime version /build/source/src/gpuRIR_cuda.cu 1037 + dontUsePythonImportsCheck = true; + + # No tests + doCheck = false; + + meta = { + description = "Python library for Room Impulse Response (RIR) simulation with GPU acceleration"; + homepage = "https://github.com/DavidDiazGuerra/gpuRIR"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/greatfet/default.nix b/pkgs/development/python-modules/greatfet/default.nix index bbe8269f1203..9d55399d9b09 100644 --- a/pkgs/development/python-modules/greatfet/default.nix +++ b/pkgs/development/python-modules/greatfet/default.nix @@ -39,6 +39,8 @@ buildPythonPackage rec { build-system = [ setuptools ]; + pythonRelaxDeps = [ "ipython" ]; + dependencies = [ cmsis-svd future diff --git a/pkgs/development/python-modules/hcs-utils/default.nix b/pkgs/development/python-modules/hcs-utils/default.nix index bd691b42dc73..70b0e4e776e1 100644 --- a/pkgs/development/python-modules/hcs-utils/default.nix +++ b/pkgs/development/python-modules/hcs-utils/default.nix @@ -34,6 +34,7 @@ buildPythonPackage { disabledTests = [ "test_expand" # It depends on FHS + "test_blocking" # flaky, depends on comparing running time w/ magic value ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ihm/default.nix b/pkgs/development/python-modules/ihm/default.nix index 902bdf44b985..7edb25f7a472 100644 --- a/pkgs/development/python-modules/ihm/default.nix +++ b/pkgs/development/python-modules/ihm/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "ihm"; - version = "2.4"; + version = "2.5"; pyproject = true; src = fetchFromGitHub { owner = "ihmwg"; repo = "python-ihm"; tag = version; - hash = "sha256-vlt1YDF8TiWOfql/pasHU1Q7N0EU1wz60yh3+KAVnvM="; + hash = "sha256-U9Ytb2v9gzOu6MMz6HFn+yY5N+qCi692bN602Rt13S8="; }; nativeBuildInputs = [ swig ]; diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix index 2468e2a25ba9..0f62f62fec2f 100644 --- a/pkgs/development/python-modules/mizani/default.nix +++ b/pkgs/development/python-modules/mizani/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "mizani"; - version = "0.13.3"; + version = "0.13.4"; pyproject = true; src = fetchFromGitHub { owner = "has2k1"; repo = "mizani"; tag = "v${version}"; - hash = "sha256-nnkGZwvSEGXyqF6hQHtfXFCQYX8IEl3YTIABxtNAl40="; + hash = "sha256-gZ4rJw+m0XgpfV6nylTqR6Taer6bok5E93WxOyAhXCk="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/oslo-metrics/default.nix b/pkgs/development/python-modules/oslo-metrics/default.nix new file mode 100644 index 000000000000..258838bf591c --- /dev/null +++ b/pkgs/development/python-modules/oslo-metrics/default.nix @@ -0,0 +1,64 @@ +{ + lib, + buildPythonPackage, + fetchFromGitea, + + # build-system + pbr, + + # dependencies + oslo-config, + oslo-log, + oslo-utils, + prometheus-client, + + # tests + oslotest, + stestr, +}: + +buildPythonPackage rec { + pname = "oslo-metrics"; + version = "0.11.0"; + + src = fetchFromGitea { + domain = "opendev.org"; + owner = "openstack"; + repo = "oslo.metrics"; + tag = version; + hash = "sha256-PiMrfVWRV3GQPJ7PnXzhAdTncXcFDPZFd+sMHVr65UU="; + }; + + env.PBR_VERSION = version; + + build-system = [ + pbr + ]; + + dependencies = [ + oslo-config + oslo-log + oslo-utils + prometheus-client + ]; + + nativeCheckInputs = [ + oslotest + stestr + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + + pythonImportsCheck = [ "oslo_metrics" ]; + + meta = with lib; { + description = "OpenStack library for collecting metrics from Oslo libraries"; + homepage = "https://opendev.org/openstack/oslo.metrics"; + license = licenses.asl20; + teams = [ teams.openstack ]; + }; +} diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix index b174efdb298e..74df3646dab8 100644 --- a/pkgs/development/python-modules/oslo-utils/default.nix +++ b/pkgs/development/python-modules/oslo-utils/default.nix @@ -2,31 +2,37 @@ lib, buildPythonPackage, fetchPypi, - ddt, + + # build-system + pbr, + setuptools, + + # dependencies debtcollector, - eventlet, - fixtures, iso8601, - libxcrypt-legacy, netaddr, netifaces, oslo-i18n, - oslotest, packaging, - pbr, psutil, pyparsing, pytz, + tzdata, + + # tests + ddt, + eventlet, + fixtures, + iana-etc, + libredirect, + libxcrypt-legacy, + oslotest, + pyyaml, qemu-utils, replaceVars, - setuptools, stdenv, stestr, testscenarios, - tzdata, - pyyaml, - iana-etc, - libredirect, }: buildPythonPackage rec { @@ -52,12 +58,12 @@ buildPythonPackage rec { rm test-requirements.txt ''; - nativeBuildInputs = [ + build-system = [ pbr setuptools ]; - propagatedBuildInputs = [ + dependencies = [ debtcollector iso8601 netaddr @@ -76,10 +82,10 @@ buildPythonPackage rec { fixtures libredirect.hook oslotest + pyyaml qemu-utils stestr testscenarios - pyyaml ]; # disabled tests: @@ -92,15 +98,16 @@ buildPythonPackage rec { stestr run -e <(echo " oslo_utils.tests.test_netutils.NetworkUtilsTest.test_is_valid_ip oslo_utils.tests.test_netutils.NetworkUtilsTest.test_is_valid_ipv4 + oslo_utils.tests.test_eventletutils.EventletUtilsTest.test_event_set_clear_timeout ") ''; pythonImportsCheck = [ "oslo_utils" ]; - meta = with lib; { + meta = { description = "Oslo Utility library"; homepage = "https://github.com/openstack/oslo.utils"; - license = licenses.asl20; - teams = [ teams.openstack ]; + license = lib.licenses.asl20; + teams = [ lib.teams.openstack ]; }; } diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix index 4751f655974d..58cea24e1438 100644 --- a/pkgs/development/python-modules/parfive/default.nix +++ b/pkgs/development/python-modules/parfive/default.nix @@ -1,39 +1,50 @@ { lib, - aiofiles, - aioftp, - aiohttp, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + + # build-system + setuptools-scm, + + # dependencies + aiofiles, + aiohttp, + + # optional dependencies + aioftp, + + # tests pytest-asyncio, pytest-localserver, pytest-socket, pytestCheckHook, - pythonOlder, - setuptools-scm, tqdm, }: buildPythonPackage rec { pname = "parfive"; version = "2.1.0"; - format = "setuptools"; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-zWy0GSQhMHMM9B1M9vKE6/UPGnHObJUI4EZ+yY8X3I4="; + src = fetchFromGitHub { + owner = "Cadair"; + repo = "parfive"; + tag = "v${version}"; + hash = "sha256-fzyXKw+/aWlnE09CCHqak8MVIk/kcjXkFyV1EKw2cjA="; }; - buildInputs = [ setuptools-scm ]; + pyproject = true; - propagatedBuildInputs = [ - aioftp + build-system = [ setuptools-scm ]; + + dependencies = [ aiohttp tqdm ]; + optional-dependencies = { + ftp = [ aioftp ]; + }; + nativeCheckInputs = [ aiofiles pytest-asyncio @@ -49,13 +60,17 @@ buildPythonPackage rec { "test_ftp_http" ]; + # Tests require local network access + __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "parfive" ]; - meta = with lib; { + meta = { description = "HTTP and FTP parallel file downloader"; mainProgram = "parfive"; homepage = "https://parfive.readthedocs.io/"; - license = licenses.mit; - maintainers = [ ]; + changelog = "https://github.com/Cadair/parfive/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.sarahec ]; }; } diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 1e2ddb96d5bb..8a7139bdfd7a 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "30.0.0"; + version = "31.0.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "plaid_python"; inherit version; - hash = "sha256-qCaXtvLceFg5njbKbqPVHW81HniGswB4HIdWU51/4X4="; + hash = "sha256-cQAmKq3xqDih57MnUB8dSSHHVofj/4xFiY5gQ+EER9M="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index dc7f7af23c05..b04e5c841849 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "posthog"; - version = "3.25.0"; + version = "4.0.1"; pyproject = true; src = fetchFromGitHub { owner = "PostHog"; repo = "posthog-python"; tag = "v${version}"; - hash = "sha256-DETcD6VJseQelGhSYKqXpIxsQxB3/5RY2wWB9pxhI68="; + hash = "sha256-JEoltzbpbHOehdqaKkGJbrcjaOXC7wDQh++S/klsW9o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyeclib/default.nix b/pkgs/development/python-modules/pyeclib/default.nix index ad378218b660..305508d37dc5 100644 --- a/pkgs/development/python-modules/pyeclib/default.nix +++ b/pkgs/development/python-modules/pyeclib/default.nix @@ -50,6 +50,11 @@ buildPythonPackage rec { six ]; + disabledTests = [ + # The memory usage goes *down* on Darwin, which the test confuses for an increase and fails + "test_get_metadata_memory_usage" + ]; + pythonImportsCheck = [ "pyeclib" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pysol-cards/default.nix b/pkgs/development/python-modules/pysol-cards/default.nix index aa468b5af4ce..82cfed5d70bb 100644 --- a/pkgs/development/python-modules/pysol-cards/default.nix +++ b/pkgs/development/python-modules/pysol-cards/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pysol-cards"; - version = "0.18.1"; + version = "0.20.0"; format = "setuptools"; src = fetchPypi { inherit version; pname = "pysol_cards"; - hash = "sha256-EDx8DDGecug24Jm7tH/1S+cp2XXjXBG6dNSsXkKGuOs="; + hash = "sha256-0jlmFojJyvvTA+Hv0PEUjZByHja5lC+mFVOtUgoVa0E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-postgresql/default.nix b/pkgs/development/python-modules/pytest-postgresql/default.nix index c989f2748348..c5abbb07447b 100644 --- a/pkgs/development/python-modules/pytest-postgresql/default.nix +++ b/pkgs/development/python-modules/pytest-postgresql/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, pytestCheckHook, @@ -62,7 +63,9 @@ buildPythonPackage rec { "pytest_postgresql.executor" ]; - __darwinAllowLocalNetworking = true; + # Can't reliably run checkPhase on darwin because of nix bug, see: + # https://github.com/NixOS/nixpkgs/issues/371242 + doCheck = !stdenv.buildPlatform.isDarwin; meta = { homepage = "https://pypi.python.org/pypi/pytest-postgresql"; diff --git a/pkgs/development/python-modules/sbom2dot/default.nix b/pkgs/development/python-modules/sbom2dot/default.nix index e03d3801b0c0..cdb9ee48e7df 100644 --- a/pkgs/development/python-modules/sbom2dot/default.nix +++ b/pkgs/development/python-modules/sbom2dot/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sbom2dot"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; src = fetchFromGitHub { owner = "anthonyharrison"; repo = "sbom2dot"; tag = "v${version}"; - hash = "sha256-xrphhTbIyqe0CqQOpJSyzTWbGYFFOKdyWJTTAlURkoo="; + hash = "sha256-g6IAGZCLRVxF0f6JEcxNaAKWYlTDt0zYSchsz6hDgdg="; }; build-system = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/anthonyharrison/sbom2dot/releases/tag/v${version}"; + changelog = "https://github.com/anthonyharrison/sbom2dot/releases/tag/${src.tag}"; description = "Create a dependency graph of the components within a SBOM"; homepage = "https://github.com/anthonyharrison/sbom2dot"; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/sjcl/default.nix b/pkgs/development/python-modules/sjcl/default.nix index ba519e78e952..e9d8a32b1761 100644 --- a/pkgs/development/python-modules/sjcl/default.nix +++ b/pkgs/development/python-modules/sjcl/default.nix @@ -2,35 +2,34 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pycryptodome, - unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage { pname = "sjcl"; version = "0.2.1"; - - format = "setuptools"; + pyproject = true; # PyPi release is missing tests src = fetchFromGitHub { owner = "berlincode"; - repo = pname; + repo = "sjcl"; # commit from: 2018-08-16, because there aren't any tags on git rev = "e8bdad312fa99c89c74f8651a1240afba8a9f3bd"; - sha256 = "1v8rc55v28v8cl7nxcavj34am005wi63zcvwnbc6pyfbv4ss30ab"; + hash = "sha256-S4GhNdnL+WvYsnyzP0zkBYCqyJBbsW4PZWgjsUthGe0="; }; - propagatedBuildInputs = [ pycryptodome ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ unittestCheckHook ]; + dependencies = [ pycryptodome ]; pythonImportsCheck = [ "sjcl" ]; - meta = with lib; { - description = "Decrypt and encrypt messages compatible to the \"Stanford Javascript Crypto Library (SJCL)\" message format. This is a wrapper around pycrypto"; + meta = { + description = "Decrypt and encrypt messages compatible to the \"Stanford Javascript Crypto Library (SJCL)\" message format"; homepage = "https://github.com/berlincode/sjcl"; - license = licenses.bsd3; - maintainers = with maintainers; [ binsky ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ binsky ]; }; } diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 7e1b3db373d3..8eb126bb4c56 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 = "3.1.1"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "Textualize"; repo = "textual"; tag = "v${version}"; - hash = "sha256-emF6LpjVCgxC+Cf+LhFrawc3rxfMnZtyijmoVg0ZJbQ="; + hash = "sha256-kPu8qjIbsSOgIdBTubjz6gR58Myu2ioWdpzk5LEedU4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/unblob-native/default.nix b/pkgs/development/python-modules/unblob-native/default.nix deleted file mode 100644 index ac1f7035ac31..000000000000 --- a/pkgs/development/python-modules/unblob-native/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - stdenvNoCC, - buildPythonPackage, - fetchFromGitHub, - nix-update-script, - rustPlatform, - libiconv, -}: - -buildPythonPackage rec { - pname = "unblob-native"; - version = "0.1.6"; - pyproject = true; - - src = fetchFromGitHub { - owner = "onekey-sec"; - repo = "unblob-native"; - tag = "v${version}"; - hash = "sha256-11eMU7eplvZS1OS34fhbD8g1dOwOUCc8Xk1dEZI8dyU="; - }; - - cargoDeps = rustPlatform.fetchCargoVendor { - inherit pname version src; - hash = "sha256-NjyxAZH4A46llIjEQO0X+IiwpS74RPY9wLujsDr7OxA="; - }; - - nativeBuildInputs = with rustPlatform; [ - maturinBuildHook - cargoSetupHook - ]; - - buildInputs = lib.optionals stdenvNoCC.hostPlatform.isDarwin [ libiconv ]; - - pythonImportsCheck = [ "unblob_native" ]; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Performance sensitive parts of Unblob"; - homepage = "https://unblob.org"; - license = lib.licenses.mit; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ vlaci ]; - }; -} diff --git a/pkgs/development/python-modules/wagtail-modeladmin/default.nix b/pkgs/development/python-modules/wagtail-modeladmin/default.nix index a7dbd399a7f6..d988e8efde3b 100644 --- a/pkgs/development/python-modules/wagtail-modeladmin/default.nix +++ b/pkgs/development/python-modules/wagtail-modeladmin/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "wagtail-modeladmin"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "wagtail-nest"; repo = "wagtail-modeladmin"; tag = "v${version}"; - hash = "sha256-IG7e7YomMM7K2IlJ1Dr1zo+blDPHnu/JeS5csos8ncc="; + hash = "sha256-P75jrH4fMODZHht+RAOd0/MutxsWtmui5Kxk8F/Ew0Q="; }; # Fail with `AssertionError` @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = { description = "Add any model in your project to the Wagtail admin. Formerly wagtail.contrib.modeladmin"; homepage = "https://github.com/wagtail-nest/wagtail-modeladmin"; - changelog = "https://github.com/wagtail/wagtail-modeladmin/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/wagtail/wagtail-modeladmin/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ sephi ]; }; diff --git a/pkgs/development/python-modules/xeddsa/default.nix b/pkgs/development/python-modules/xeddsa/default.nix new file mode 100644 index 000000000000..fba8c0793e66 --- /dev/null +++ b/pkgs/development/python-modules/xeddsa/default.nix @@ -0,0 +1,55 @@ +{ + buildPythonPackage, + lib, + fetchFromGitHub, + setuptools, + cffi, + libsodium, + libxeddsa, + pytestCheckHook, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "xeddsa"; + version = "1.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Syndace"; + repo = "python-xeddsa"; + tag = "v${version}"; + hash = "sha256-636zsJXD8EtLDXMIkJTON0g3sg0EPrMzcfR7SUrURac="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools<74" "setuptools" + ''; + + passthru.updateScript = nix-update-script { }; + + build-system = [ setuptools ]; + + buildInputs = [ + libsodium + libxeddsa + ]; + + dependencies = [ cffi ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "xeddsa" ]; + + meta = { + description = "Python bindings to libxeddsa"; + homepage = "https://github.com/Syndace/python-xeddsa"; + changelog = "https://github.com/Syndace/python-xeddsa/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + teams = with lib.teams; [ ngi ]; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/ypy-websocket/default.nix b/pkgs/development/python-modules/ypy-websocket/default.nix index c75ca5256a5c..13cf2bbe3d17 100644 --- a/pkgs/development/python-modules/ypy-websocket/default.nix +++ b/pkgs/development/python-modules/ypy-websocket/default.nix @@ -1,12 +1,17 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, + + # build-system hatchling, + + # dependencies aiosqlite, anyio, y-py, + + # testing pytest-asyncio, pytestCheckHook, uvicorn, @@ -16,9 +21,7 @@ buildPythonPackage rec { pname = "ypy-websocket"; version = "0.12.4"; - format = "pyproject"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "y-crdt"; @@ -27,13 +30,11 @@ buildPythonPackage rec { hash = "sha256-48x+MUhev9dErC003XOP3oGKd5uOghlBFgcR8Nm/0xs="; }; + build-system = [ hatchling ]; + pythonRelaxDeps = [ "aiofiles" ]; - nativeBuildInputs = [ - hatchling - ]; - - propagatedBuildInputs = [ + dependencies = [ aiosqlite anyio y-py @@ -41,6 +42,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "ypy_websocket" ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ pytest-asyncio pytestCheckHook @@ -51,6 +54,8 @@ buildPythonPackage rec { disabledTestPaths = [ # requires installing yjs Node.js module "tests/test_ypy_yjs.py" + # Depends on no longer maintained ypy + "tests/test_asgi.py" ]; meta = { diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index b0d8326fc98d..4d8f48f6f1c7 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -39,10 +39,13 @@ stdenv.mkDerivation rec { "${placeholder "out"}/etc/findlib.conf" ]; - buildFlags = [ - "all" - "opt" - ]; + buildFlags = + [ + "all" + ] + ++ lib.optionals ocaml.nativeCompilers [ + "opt" + ]; setupHook = writeText "setupHook.sh" '' addOCamlPath () { diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 02fd32cee2c9..2fa46fb63df1 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -611,7 +611,7 @@ in defconfig = "quartz64-b-rk3566_defconfig"; extraMeta.platforms = [ "aarch64-linux" ]; BL31 = "${armTrustedFirmwareRK3568}/bl31.elf"; - ROCKCHIP_TPL = rkbin.TPL_RK3568; + ROCKCHIP_TPL = rkbin.TPL_RK3566; filesToInstall = [ "idbloader.img" "idbloader-spi.img" diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index ce54d477f6ab..5edbe112a8f1 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,35 +4,35 @@ "hash": "sha256:0zg817b9bbpl80cjmxgmxivi6xr80hng704mdl6m5knrl0v4ay5j" }, "6.1": { - "version": "6.1.135", - "hash": "sha256:1fbyjprj65b1blb033lcy9y4bkh9jb7m06h6qph739wnzzhpmlg9" + "version": "6.1.136", + "hash": "sha256:0wdhgaa578x7jhhq2p2g272gyb12818ifan4c5zan6npp6dhf756" }, "5.15": { - "version": "5.15.180", - "hash": "sha256:0ffdy7zhp25z75n49j4rs8fs79icbmz1yy7k3xgcl2p6pfw6h7zm" + "version": "5.15.181", + "hash": "sha256:0f6sc0wyd1gdx2kvbvp5sx6il780fdmjr4j0bcci1s7skrnl6iik" }, "5.10": { - "version": "5.10.236", - "hash": "sha256:12gv03hbddwm4nl8xxdvdr983nbh2lzrl4jr9p5kmv9rgn7wr9bd" + "version": "5.10.237", + "hash": "sha256:098gvqfaahabqqz64m5fwri57drwiz3006pr805sxw74w0vjgj0z" }, "5.4": { - "version": "5.4.292", - "hash": "sha256:11dy6zvxnripwr4lfg357wdl70kcg5ljs3wxhz2klqpas60gbjqb" + "version": "5.4.293", + "hash": "sha256:0b9p8l6ndm75751f7s03rnxg7yg9c4pj9rb537lhsv6pqx096n1l" }, "6.6": { - "version": "6.6.88", - "hash": "sha256:0l0697dcfdjkl80c7x1nfvw3n6390nnbznlpfbg51sgp7sv8kpqr" + "version": "6.6.89", + "hash": "sha256:005s3vf1fkcv3fady2ax9azyc4lj8p4flhn20h3srr38c39zf6n2" }, "6.12": { - "version": "6.12.25", - "hash": "sha256:141visdf85iw011ncp77csmkahvn598lqvhi493a4g31dw7piby8" + "version": "6.12.26", + "hash": "sha256:1jivbv08j43rn0dn7xmwxb178b305cyxbp82h71r6n22qwif4ba0" }, "6.13": { "version": "6.13.12", "hash": "sha256:0hhj49k3ksjcp0dg5yiahqzryjfdpr9c1a9ph6j9slzmkikbn7v1" }, "6.14": { - "version": "6.14.4", - "hash": "sha256:0fak7y9dr5rxzmi4m545kz7pyk2c91dkj4k7i2jgnl80ga6z4lll" + "version": "6.14.5", + "hash": "sha256:02gl4hdxzijyyk57jsr85grdkxs2yi2gkvqa043kbamy5g2pw818" } } diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 11d96ec6a0fe..119dbb34b6ab 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -5,8 +5,8 @@ linux, scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19746"; - sha256 = "07kzanf61ja2jw6rac8jd0w2bs4i41wqclr59m2h6c8j0dc7w4as"; + rev = "19769"; + sha256 = "0mfn2pa587laj45zlah424g953yjxmlh49x36byjylmzj079a42n"; }, ... }@args: diff --git a/pkgs/os-specific/linux/zfs/2_3.nix b/pkgs/os-specific/linux/zfs/2_3.nix index a3d90d68aff7..992cba2a68b0 100644 --- a/pkgs/os-specific/linux/zfs/2_3.nix +++ b/pkgs/os-specific/linux/zfs/2_3.nix @@ -15,10 +15,10 @@ callPackage ./generic.nix args { # this attribute is the correct one for this package. kernelModuleAttribute = "zfs_2_3"; # check the release notes for compatible kernels - kernelCompatible = kernel: kernel.kernelOlder "6.14"; + kernelCompatible = kernel: kernel.kernelOlder "6.15"; # this package should point to the latest release. - version = "2.3.1"; + version = "2.3.2"; tests = { inherit (nixosTests.zfs) installer series_2_3; @@ -29,5 +29,5 @@ callPackage ./generic.nix args { amarshall ]; - hash = "sha256-3WrxjIMuPiqBcVX4UZHpcMWNqxBE2NS810SRmvi05ZQ="; + hash = "sha256-+DqpIgHCVi0fDOqvKwaGXIiiXw8xEnlv2tgRwgLX9G8="; } diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 5da05d3513ca..b2ebfccc1410 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -14,20 +14,20 @@ callPackage ./generic.nix args { # this attribute is the correct one for this package. kernelModuleAttribute = "zfs_unstable"; # check the release notes for compatible kernels - kernelCompatible = kernel: kernel.kernelOlder "6.14"; + kernelCompatible = kernel: kernel.kernelOlder "6.15"; # 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.3.1"; + version = "2.3.2"; # rev = ""; tests = { inherit (nixosTests.zfs) unstable; }; - hash = "sha256-3WrxjIMuPiqBcVX4UZHpcMWNqxBE2NS810SRmvi05ZQ="; + hash = "sha256-+DqpIgHCVi0fDOqvKwaGXIiiXw8xEnlv2tgRwgLX9G8="; extraLongDescription = '' This is "unstable" ZFS, and will usually be a pre-release version of ZFS. diff --git a/pkgs/servers/monitoring/prometheus/pihole-exporter.nix b/pkgs/servers/monitoring/prometheus/pihole-exporter.nix index 60dea11316c7..1fae0a609ef9 100644 --- a/pkgs/servers/monitoring/prometheus/pihole-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pihole-exporter.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pihole-exporter"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "eko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7gomafTMK8rk+QFw3Vm8KUgNFqiUDILeTwNFa7vdgAw="; + sha256 = "sha256-T96sNzQHPWM30uzLH3ffH7pKFP3z8DV/e57+TlFuG2Q="; }; - vendorHash = "sha256-GB/wVB97aV+CV9Xtv0EofQQR+qOmtwrBFBogU+2S+Po="; + vendorHash = "sha256-/+YHIpaBd9YfmX04CT2ohVpQc6iLFIFLvcIwGtPbc+s="; meta = with lib; { description = "Prometheus exporter for PI-Hole's Raspberry PI ad blocker"; diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 8c1e62c5b927..40427e755991 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.165.0"; + version = "3.167.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.165.0-linux-x64.tar.gz"; - sha256 = "1dwcqw8l7jq66crs11rykj5w4pf209b1n5apgva6cfp9lshsv2pa"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.167.0-linux-x64.tar.gz"; + sha256 = "00lgqdkkqks1ly447hbqr0l5m3dl7r5y2qs84zi591dx1dqrm5ga"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.37.0-linux-amd64.tar.gz"; @@ -25,8 +25,8 @@ sha256 = "17cs43ypq27yc1qc5z3567ijhl4zjpc3z9304l15ys7r5fl27za9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.18.0-linux-amd64.tar.gz"; - sha256 = "0nd1nml0353g43jh2fxdf9kv0725vhgdpd0zcivjb0h6p7mxf4xj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.19.1-linux-amd64.tar.gz"; + sha256 = "1lzb4sd3d2k78wh8mv9zdclp0c7am7sh5bdbcs75a0cqfpb4yzf1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.78.0-linux-amd64.tar.gz"; @@ -45,20 +45,20 @@ sha256 = "08wgs1mr85jk11zj2g1pxr83jzfnsbk085n6bjik9zynbxildhpa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.1.1-linux-amd64.tar.gz"; - sha256 = "0zvjag0khbls1a28l101qpxphbq7q2wj315iwbxrg7l13q93b5ja"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.1.2-linux-amd64.tar.gz"; + sha256 = "1bfy2ksz6zgwr7kkfpn9s16hn674k2b5j23irykbkhjmbpzk4mrx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.4-linux-amd64.tar.gz"; - sha256 = "1093zzn3yv85bxwf60ig1fh1jdl8zqzql2bmkjs9hk1cxh7wfll3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.5-linux-amd64.tar.gz"; + sha256 = "00dqvfk0wiyhxcnx2id19ffi6x6bf0fkbas73axw728g8wc2hr3w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.49.0-linux-amd64.tar.gz"; - sha256 = "19f55hrpvnsarz5fw1w1qqrsg4lw6cwv4xfdp8r8xp28ncmjzvm9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.50.0-linux-amd64.tar.gz"; + sha256 = "1ccjfr1v88hc2x845z7h3bxkgxqn6f134d422qdz9bgqdlyrr2dk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.42.0-linux-amd64.tar.gz"; - sha256 = "0swzpf16y4rq82hc5bxqk5v658dwika2nzy3lf24nc2gsi19xi2r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.43.0-linux-amd64.tar.gz"; + sha256 = "1fpf1qr9rsh37lk9mz761xkkj5glj314hwwij7izwv5fx1v8j3np"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.6.2-linux-amd64.tar.gz"; @@ -73,12 +73,12 @@ sha256 = "176bpdyhmwb2pyi4k1dc25agpm4spfndjhg1yjwfv3qvlgnzsnlq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.27.0-linux-amd64.tar.gz"; - sha256 = "07gjl7jqwpysb43zybyy5a7m2pvjsy92ag8fbhmrmiqpcgfcagav"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.29.0-linux-amd64.tar.gz"; + sha256 = "1d9zhcc38chf26g3dvxfimpxsiqcs9s9gfad2k1qsh3gnqbk0793"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.0-linux-amd64.tar.gz"; - sha256 = "0c75qc3n3a2awjbi2fkxm8x2xvy3wv26v4fcpachfp9zr0gqig7q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.2-linux-amd64.tar.gz"; + sha256 = "0v9hw2m3vz3b9g1mabxmy0j863p51kwj9gkjfrsrabs80glz72ii"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.11.0-linux-amd64.tar.gz"; @@ -105,32 +105,32 @@ sha256 = "0ibaipjpsx3crzxhnngkv0vcgjag5zff4s20ck5mxjrhdhzqbmfg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.9-linux-amd64.tar.gz"; - sha256 = "0v4sfah9qvphg8v7p2nwv9x33jis48y2xf1nnlc5lnidqqpfmdkr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.10-linux-amd64.tar.gz"; + sha256 = "0k6y5ci7ikj4h164syizhxg257nkpg0p265y9ibvri3z6hbqjrw4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.0.3-linux-amd64.tar.gz"; - sha256 = "07jg8jd99s75ias1f97inyqb5mag7ypf2jhnqyhcl49sjiswmqrx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.0.4-linux-amd64.tar.gz"; + sha256 = "062h5fvxhjl2gy4xd09bja9vbz0pkghhnch4lg580fnnx047vscl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.1-linux-amd64.tar.gz"; sha256 = "07s4xmsqjja79pzdh3vj3fq6q3yhnds7xp08x9yzc964c9kzndzs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.1-linux-amd64.tar.gz"; - sha256 = "1j40r5kg1x600l2j4sa9r2ackb6xm8wp2lx32l8a902qq0vvnkzv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.2-linux-amd64.tar.gz"; + sha256 = "0izzpyjizzz4hlv6rnz3l8f4lgyfgxkf67hrxn6ph8zhzs3cgvh4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.3.0-linux-amd64.tar.gz"; sha256 = "1z9d3ng3aqz1gpd3l0akva7lfyq8l94xd4z4jg3r29w3m274xbz4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.116.2-linux-amd64.tar.gz"; - sha256 = "1idjcfl4n9i7idqp384i46yskdhs18vcdnm53vk0lx6a87409mma"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.117.0-linux-amd64.tar.gz"; + sha256 = "0nq415zbivd2lh46a1pa9zw1zd15lvivin6iyv51cg5j3znac9k9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.7-linux-amd64.tar.gz"; - sha256 = "127c5avz2mn7hy7qydh9ni6s9q53xwfi26dl28q3vrra6n231npj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.8-linux-amd64.tar.gz"; + sha256 = "0a52c2s11r9r7jj0ba2nqrxwdzc2xmsn6px0gvs139iqfxdni7qh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.19.0-linux-amd64.tar.gz"; @@ -153,8 +153,8 @@ sha256 = "0lgzj6ziskf71qand9cwmxgj7wr33gjp6m09hyfgy3n05iar0nd2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.8-linux-amd64.tar.gz"; - sha256 = "0bj4lc7g74vlsv4rqqj9ymbpbc3fdxn483wp1m6y838b3kd69hns"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.9-linux-amd64.tar.gz"; + sha256 = "1gza6gr44wwj1d4yqyrg4clsvpgd38y6mdmnj4afy2ad4b6phpq5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.165.0-darwin-x64.tar.gz"; - sha256 = "1qj6z9j74z2bajql6gmxxldwcijpsx6fkzv7lb0dkfvbb9hlcn2h"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.167.0-darwin-x64.tar.gz"; + sha256 = "047js6gjl8rb02wmwmmk5f6qwhcmfn0y2b7w1xcrw9wi3g1ifhch"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.37.0-darwin-amd64.tar.gz"; @@ -183,8 +183,8 @@ sha256 = "0znvh909zlgs20yhh3y4yz0fkz5m2ba06n88zjsn49i44pg0dgak"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.18.0-darwin-amd64.tar.gz"; - sha256 = "0g7r104ink5yp6q1qx1856gldn5zxgn2vmx3xz0d4vs07hcv7n4p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.19.1-darwin-amd64.tar.gz"; + sha256 = "183slnicjqfsk7hjll0c5ijwfw7m9wd5n6ci95k2fsz79ahldgnz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.78.0-darwin-amd64.tar.gz"; @@ -203,20 +203,20 @@ sha256 = "13vpgslpamsgy0m99za5jg8zzcm7c2wgyw1ywxmb1wcmpwgbfamf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.1.1-darwin-amd64.tar.gz"; - sha256 = "1wmg5k1k9k3pc7848s5nzhyxv9q3ivpggm54xvi3fygxvi5f7nv2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.1.2-darwin-amd64.tar.gz"; + sha256 = "11x17hj2v7612iaza5s7q7wdwdrz2l31z2j9bjk3x3g8qh3ma0v2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.4-darwin-amd64.tar.gz"; - sha256 = "1f064fmzyr1d1axl6vdggh1jp6p1akqiy7jbywwzy0rcqipqd2mr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.5-darwin-amd64.tar.gz"; + sha256 = "1s6wdfa3la99xrb4pidsisimgs85v5kak3b9dwq9fg22qnpm5abd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.49.0-darwin-amd64.tar.gz"; - sha256 = "1rvz1mqyrqcig908b797901r9mkyxhp2blc19lwkybxmgbzrwp38"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.50.0-darwin-amd64.tar.gz"; + sha256 = "0w71myfi4j5kwqrdjf7s8674m7zbfzpk2lz10iyhdr404jawb7rg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.42.0-darwin-amd64.tar.gz"; - sha256 = "1n4g1gf6p3476vwhab6d371mvavam0yiaalwbx1v34gdwp01yx09"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.43.0-darwin-amd64.tar.gz"; + sha256 = "0ql0y3kpyqwm1zispjci6d372mzyg91ig2pmgr3509f97zzm1ql6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.6.2-darwin-amd64.tar.gz"; @@ -231,12 +231,12 @@ sha256 = "049y0l7hyng3kqkh5hkxzw6k743dy1zik0xgbyv3iarg8gxi6yb8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.27.0-darwin-amd64.tar.gz"; - sha256 = "1g4h79lrigwkfi1lvdw8bk7xl1ksq0css0ikpjv0k5b24zh0v6x6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.29.0-darwin-amd64.tar.gz"; + sha256 = "1m4zw059k9yd63a8m9wlmvrl8jasdpliidmcdrdcaywb81lz2s2w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.0-darwin-amd64.tar.gz"; - sha256 = "02yi7iwhf07sa84aaysmag91bnp3h1f3fcix7zphr9hr7vn85igk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.2-darwin-amd64.tar.gz"; + sha256 = "00286346z1ws7ffghnz7c9rvjcd66nq6gmmxwlwgqiz6d02z5pv3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.11.0-darwin-amd64.tar.gz"; @@ -263,32 +263,32 @@ sha256 = "12a6gac63wins0ykxqdvjmzw3b3kgfxhzhygrlrwrg9wafwjbi92"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.9-darwin-amd64.tar.gz"; - sha256 = "0dl22mjxiaxzasd58cnb9rrxnqlkx84bhkyd7pk0jys7ra375r44"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.10-darwin-amd64.tar.gz"; + sha256 = "0iy1j33527g9r62q53lcy6h9016nr75cf7pp9kys7agxifbvskp6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.0.3-darwin-amd64.tar.gz"; - sha256 = "14fllfabpb8xliwsl4psdqaffvk86i1yi59aigax1f3zz0y73705"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.0.4-darwin-amd64.tar.gz"; + sha256 = "0bv4ypka9psy63bmcsirji873pvlbm4c921lm6fbdfbfhhasi3j1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.1-darwin-amd64.tar.gz"; sha256 = "17m6qcpkhavgprqbskad5ky3zs9230bpiadmz3y552z4yci4pmdk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.1-darwin-amd64.tar.gz"; - sha256 = "0h8pmyfpvd5f8z7msnxhl5rrling0by0bciz09fi85axhas1b78b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.2-darwin-amd64.tar.gz"; + sha256 = "1yj0ciikakxmnrv9dwplp31dcldb4s7asnhg2603zh8wip8ggya2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.3.0-darwin-amd64.tar.gz"; sha256 = "11pj11zbdcsacxlkasc6n2wwz7qniirhy8kg53ir5s1crwpddf6p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.116.2-darwin-amd64.tar.gz"; - sha256 = "13cp596lav13ng9ivq93ij0ks90m5ia0x2sbff6qs00z9iwy0jbd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.117.0-darwin-amd64.tar.gz"; + sha256 = "0ryhp88z9nbfxcnvwjn7aqi2zqfy89qhfh01clgq1ra9syxq6v9f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.7-darwin-amd64.tar.gz"; - sha256 = "1lxd83pcbd9m1vgwsmy7bgpvv015z6ipn9mr1gvx1qkkdh2xdd6c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.8-darwin-amd64.tar.gz"; + sha256 = "0kify4b5l9532h5lqyys7smri0k20r8z1c0wmiflnpa9y90gb4qn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.19.0-darwin-amd64.tar.gz"; @@ -311,8 +311,8 @@ sha256 = "04kv6izmkfm3zfr01smdr80ia52mhy8mr30d9jhk6w8vazpyq7s0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.8-darwin-amd64.tar.gz"; - sha256 = "1hrkfl5nqazcf7k6aazi4n8p1d2965ffqfl9wgv6cmzpabwbmc01"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.9-darwin-amd64.tar.gz"; + sha256 = "16hl7116bc3h1ssq2c3h8v0d83q71wi0z6w94p94h30b9ficznk6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.165.0-linux-arm64.tar.gz"; - sha256 = "10awr96w493904xppcy783wj7zdqsh8267v2bsw78zhw7v442g8g"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.167.0-linux-arm64.tar.gz"; + sha256 = "0qdmmlxn6jgfdlfb0ff4jkf59b5h6957cq1z5s317igvl9zf1kkw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.37.0-linux-arm64.tar.gz"; @@ -341,8 +341,8 @@ sha256 = "06fx0xkv4k7nahrifkj7m2gpanrxbyclsaxbrclll6pvgyd2jxf6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.18.0-linux-arm64.tar.gz"; - sha256 = "1xhkqcis2innc8hrv2x9a2dapchjakjs8gzs8ipwab9lr89v2gwr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.19.1-linux-arm64.tar.gz"; + sha256 = "1a4b7k755vbqzv6zsnsz4h8g2zgc2p17vfrnhkp1pacwkmbsiqwc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.78.0-linux-arm64.tar.gz"; @@ -361,20 +361,20 @@ sha256 = "0k45j0xrx7ijch3ppk182ij9f5zpk01nvljqwawyvs7ry86nw80z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.1.1-linux-arm64.tar.gz"; - sha256 = "1587jypxhm8vdnijna7rfhvh61bqv5s858hfis12q8l7m2kznmnh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.1.2-linux-arm64.tar.gz"; + sha256 = "1jwfjmddp8wk3nh7w1y4by9m2zqs7plqp5yb7pw4nmgjjxbgidqd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.4-linux-arm64.tar.gz"; - sha256 = "0lybz7g4zv08ycnpfwck1n2lsw98h75paamgdq7ha271yn1k58yx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.5-linux-arm64.tar.gz"; + sha256 = "0y1pq89yrflj3vc3d87vkl4xzsa3pszq1sxiajaanbha6apvyni9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.49.0-linux-arm64.tar.gz"; - sha256 = "1g47zq4mdfnfr1ff2wgga9z77ncb0yxsqgmgl07p8dp406zcxxkj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.50.0-linux-arm64.tar.gz"; + sha256 = "0mazlc88jcbpikvdcph0qk64riq5lfkcypgbsmckwz0ij9y7x15h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.42.0-linux-arm64.tar.gz"; - sha256 = "102jig70rxsfd862w96k8gcy9nwzkz7cr8rhzkd7w59d53525g48"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.43.0-linux-arm64.tar.gz"; + sha256 = "16s3rmhzgyhh2wxmylfdj64xmpv1h9kjq80vpv2z47rsf16sbrvp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.6.2-linux-arm64.tar.gz"; @@ -389,12 +389,12 @@ sha256 = "0zqyfn995lxmfiji9di44wgz0jmc9adf63pmhjzsi5kqfw5irrkw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.27.0-linux-arm64.tar.gz"; - sha256 = "0cbcxm09sy2jzpda7qfnavazkwpwab9a806aa8p4lxid2yqfnvgs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.29.0-linux-arm64.tar.gz"; + sha256 = "0hihgkpwia7p8wqsnfd16gij6qv5radghjpvpgbwsizm051j3m1k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.0-linux-arm64.tar.gz"; - sha256 = "1szmjdrpvayqs5bzmf32gazcsq66q5ys3p3rn54x9302aap13dmy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.2-linux-arm64.tar.gz"; + sha256 = "0ivqs7v2x5132r07i62crfckgifaf7kpqgkxl3wby0gdaac9z378"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.11.0-linux-arm64.tar.gz"; @@ -421,32 +421,32 @@ sha256 = "1y52gazhn6gnr98q2qwny47r6r9nbr2ns9xgavcr7gi5glzlyfyp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.9-linux-arm64.tar.gz"; - sha256 = "0qx0drh92m5k5q3mc104jv0zcg5xyx16fbc9vrgr1m07axr5x5cf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.10-linux-arm64.tar.gz"; + sha256 = "14d75k7l23p0di75svdhrpqwkgd1wc88s535sgp3ry8zknirx3y9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.0.3-linux-arm64.tar.gz"; - sha256 = "0s05pdxscpq5n6i744pcrgvws8fy96mv80k6g2vb3gn25dw247b8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.0.4-linux-arm64.tar.gz"; + sha256 = "1n7yf7bl132891kkcx02sxxx4xdmf2jrxapbrfvgg4anv5217fvm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.1-linux-arm64.tar.gz"; sha256 = "0xhlgdh05i5la27d4440n87kfv4rv9aragqrijw3wyw0fd0zy50s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.1-linux-arm64.tar.gz"; - sha256 = "1kr8df68hg23was5rsr07q7r6fs4dd5ndailj9vmysddvhwg2ypv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.2-linux-arm64.tar.gz"; + sha256 = "1dwmbcg3i02nn1nfg7z4vx4622vpyzk9c1mgrishvv6mvm037fb1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.3.0-linux-arm64.tar.gz"; sha256 = "0kpvd7vvi8h28mlz4lr8p5p4ccpc4k7wmh669g969dxi53n54vmw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.116.2-linux-arm64.tar.gz"; - sha256 = "12p4rbb0mry725c8czfgq5xwg17c4vnwl7gins4p5l8mnaymld1v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.117.0-linux-arm64.tar.gz"; + sha256 = "05d949dvard95h78v3rs10myip6wfskyx4v8lw0pprdhl6g96qp4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.7-linux-arm64.tar.gz"; - sha256 = "0yyjrlccrm2fa9rmbh43i5f95rs0pyw5clriv8wxz3rp80vby0jr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.8-linux-arm64.tar.gz"; + sha256 = "1j4ijb8cg03504pziq0h65ad9q3ra007hv9h93v7204y6dywpy23"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.19.0-linux-arm64.tar.gz"; @@ -469,8 +469,8 @@ sha256 = "14cpn3p15wmy7bwni1yq1ih2s0ilm9hhmshsmd2kxqcrd9drv016"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.8-linux-arm64.tar.gz"; - sha256 = "0pwxqlgsxn0fpq21p4rk7lsb2rlvig2paszwpvyzpfpzksn66mvm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.9-linux-arm64.tar.gz"; + sha256 = "1r8vw8gyzzbsci405balmx582nm3cv0hs197g1wb53f989az555g"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.165.0-darwin-arm64.tar.gz"; - sha256 = "0z1hxpnxwkcl6slsk56dz22jwjvf7my21db0i35yzs2nq3mkf3x0"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.167.0-darwin-arm64.tar.gz"; + sha256 = "10rnly9p30dl8zcc66j9j94aa39yrq899a5ks3iryl4jznr7sg01"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.37.0-darwin-arm64.tar.gz"; @@ -499,8 +499,8 @@ sha256 = "11626k5s62hpqi60f26zhw3129cx74lv07l8adsa5fz0y2bsnkls"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.18.0-darwin-arm64.tar.gz"; - sha256 = "1j8hggv57gw3dcwqzr0l5cyk33c35f1zjma1hd6mxpq5hx2zzi05"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.19.1-darwin-arm64.tar.gz"; + sha256 = "0vlm939ax2acm53hv1194b0669lsh3glmlp4mpaln13k8qy97vcc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.78.0-darwin-arm64.tar.gz"; @@ -519,20 +519,20 @@ sha256 = "1vfhpisa1fyvsmh0crqr859ppmgs09yncsbchs1rlw6hb68sknqh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.1.1-darwin-arm64.tar.gz"; - sha256 = "11z4wkfn4vd3pcjgaxjf1wifss4dkvy3f0cb9fm5kkndyc4vx4wa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.1.2-darwin-arm64.tar.gz"; + sha256 = "1mdxfskxaj1l28nk009r1b40ldjgj5bjjys33ya56q6rdwf2wyp1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.4-darwin-arm64.tar.gz"; - sha256 = "01sqq37yghlk0772j1vd3l124a2fcwkkz3fb8lsilk33gwb7hjgk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.5-darwin-arm64.tar.gz"; + sha256 = "1n7bmr5pg40db0p53dwp12zb4iksf9sqvv5a5q7wj3dxhc1cgx31"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.49.0-darwin-arm64.tar.gz"; - sha256 = "1knrrxv1ihjwklz05fi4cfrwzg6bwr2j5h2j3qw6as2ghn74i1bl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.50.0-darwin-arm64.tar.gz"; + sha256 = "1z6j18n9w9gh7zw2d76ra623miqc0dy4gf3p61x3iqhid2znc5pl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.42.0-darwin-arm64.tar.gz"; - sha256 = "1flph1gp29f44slr8h0kwyc1mg8drv6zkla4ynyg8qpjqzar69y1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.43.0-darwin-arm64.tar.gz"; + sha256 = "177h75jj53x630qfmcjikzpbp1bdbpbfc57yl2lf0ycdmd9s7a5w"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.6.2-darwin-arm64.tar.gz"; @@ -547,12 +547,12 @@ sha256 = "0lcx81s0qa13cnkm1sh640a15z650vsqxi5a59zgzq6b0r151h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.27.0-darwin-arm64.tar.gz"; - sha256 = "1cb8yk182an8cggfinvlwiq0kpvjiqnmdlnwy8461g48pyyd48zi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.29.0-darwin-arm64.tar.gz"; + sha256 = "1akanfv6yl72nck6c132kzclingl2g86nf755zv7ab16nwinldcw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.0-darwin-arm64.tar.gz"; - sha256 = "02lff0ij3gv7bi4qplcnpq8r29836ma1rzi0h3ydk44qm8kvl9l7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.2-darwin-arm64.tar.gz"; + sha256 = "0ns88zd55p3pg8z8xs8jph9bv33s1alii4gnwd7gxc651gy7icrq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.11.0-darwin-arm64.tar.gz"; @@ -579,32 +579,32 @@ sha256 = "1pavzbg6qbpvrc3z57pm1yn2c40i4n81bc5cs57p3zw8hmzmpp80"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.9-darwin-arm64.tar.gz"; - sha256 = "06vpfyxrxx1syzy01qq1ii3d0f734vpyrlvqb93nyprbhckrlsvx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.10-darwin-arm64.tar.gz"; + sha256 = "190mmw7sdw8rln9q5yv04hmn9b70cqd4piyhn8i23qf831irligr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.0.3-darwin-arm64.tar.gz"; - sha256 = "196q5r38hssgdi6zfag6yfm3h2wvlqc57xbhca3kjfbri1cyl9ic"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.0.4-darwin-arm64.tar.gz"; + sha256 = "0zxn3gn5m7kw3wmsflgnr0l3j3c4kf245v5510qjqik77lzknfzq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.15.1-darwin-arm64.tar.gz"; sha256 = "0my26549lzvc4j7c3xmp6z82qj126x8sx9cj1rz8a7alawn1v5b0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.1-darwin-arm64.tar.gz"; - sha256 = "169ibni1kh0npn08zyazg1324qc79vpmy29pkblbhxm46ldzip60"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.2-darwin-arm64.tar.gz"; + sha256 = "0iikysfqf03pm7mrg383nisgh5v01bxjvxyhl2cg8bj8nsjr4s2h"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v1.3.0-darwin-arm64.tar.gz"; sha256 = "0ccsgh89z0zbxxns4zc24l71ylkr536xcdyz4rglkzqhklrhgl89"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.116.2-darwin-arm64.tar.gz"; - sha256 = "0yhbfafsv5p0zl274w8gaxsv1373f9xrzn2kxil8699jb9rwhl05"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.117.0-darwin-arm64.tar.gz"; + sha256 = "1bjjf21ldn0ay8bn9pmzbkg4g2cg7gi8z2kvfp6pg52cqimacm3w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.7-darwin-arm64.tar.gz"; - sha256 = "0gjy6m3r287fg69gr8bglwc9mvhx9dpapp6ndp5v949n20dr79yl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.8-darwin-arm64.tar.gz"; + sha256 = "11nnxpbk9ckxarbq5h8g3llp2b2gdwvh4mxnrgyzpxvid0lj1h08"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.19.0-darwin-arm64.tar.gz"; @@ -627,8 +627,8 @@ sha256 = "11q6gncnxqdj4yp7mldwqhhvnmfcqvmc4v384xszwnl78fmiikrs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.8-darwin-arm64.tar.gz"; - sha256 = "1mmnn6my6v0mj28fqgiymdwfjsmj3rcb1nf7aj92kp3m38a0gcjs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.9-darwin-arm64.tar.gz"; + sha256 = "1ws5c2aki0r01y1m1bw9pnpvipbybhdffgmi82gp8mrbln1njbmw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-arm64.tar.gz"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7bf7f782ac3..a757eec4e994 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13838,7 +13838,7 @@ with pkgs; }; drawio-headless = callPackage ../applications/graphics/drawio/headless.nix { }; - drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { }; + drawpile = callPackage ../applications/graphics/drawpile { }; drawpile-server-headless = libsForQt5.callPackage ../applications/graphics/drawpile { buildClient = false; buildServerGui = false; diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index 6873c2af19d5..daf7ac4a8ca0 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -81,6 +81,8 @@ let arteplussept = callPackage ../applications/video/kodi/addons/arteplussept { }; + bluetooth-manager = callPackage ../applications/video/kodi/addons/bluetooth-manager { }; + controller-topology-project = callPackage ../applications/video/kodi/addons/controller-topology-project { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ba96df2c36e6..4d1a941a6b64 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -772,6 +772,7 @@ mapAliases ({ types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30 ufoLib2 = ufolib2; # added 2024-01-07 ukrainealarm = throw "ukrainealarm has been removed, as it has been replaced as a home-assistant dependency by uasiren."; # added 2024-01-05 + unblob-native = throw "unblob-native has been removed because its functionality is merged into unblob 25.4.14."; # Added 2025-05-02 unittest2 = throw "unittest2 has been removed as it's a backport of unittest that's unmaintained and not needed beyond Python 3.4."; # added 2022-12-01 update_checker = update-checker; # added 2024-01-07 uproot3 = throw "uproot3 has been removed, use uproot instead"; # added 2022-12-13 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index abbdf0421c2f..083dde0537f1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5914,6 +5914,8 @@ self: super: with self; { gptcache = callPackage ../development/python-modules/gptcache { }; + gpu-rir = callPackage ../development/python-modules/gpu-rir { }; + gpuctypes = callPackage ../development/python-modules/gpuctypes { }; gpustat = callPackage ../development/python-modules/gpustat { }; @@ -10598,6 +10600,8 @@ self: super: with self; { oslo-log = callPackage ../development/python-modules/oslo-log { }; + oslo-metrics = callPackage ../development/python-modules/oslo-metrics { }; + oslo-serialization = callPackage ../development/python-modules/oslo-serialization { }; oslo-utils = callPackage ../development/python-modules/oslo-utils { }; @@ -18367,8 +18371,6 @@ self: super: with self; { unasync = callPackage ../development/python-modules/unasync { }; - unblob-native = callPackage ../development/python-modules/unblob-native { }; - uncertainties = callPackage ../development/python-modules/uncertainties { }; uncompyle6 = callPackage ../development/python-modules/uncompyle6 { }; @@ -19110,6 +19112,8 @@ self: super: with self; { xdxf2html = callPackage ../development/python-modules/xdxf2html { }; + xeddsa = toPythonModule (callPackage ../development/python-modules/xeddsa { }); + xen = toPythonModule (pkgs.xen.override { python3Packages = self; }); xformers = callPackage ../development/python-modules/xformers { };