diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 4714b843f203..7778595da407 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -40,6 +40,9 @@ d1c1a0c656ccd8bd3b25d3c4287f2d075faf3cf3
# fix indentation in meteor default.nix
a37a6de881ec4c6708e6b88fd16256bbc7f26bbd
+# pkgs/stdenv/make-derivation: Reindent
+b4cc2a2479a7ab0f6440b2e1319221920ef72699
+
# treewide: automatically md-convert option descriptions
2e751c0772b9d48ff6923569adfa661b030ab6a2
@@ -189,3 +192,14 @@ ce21e97a1f20dee15da85c084f9d1148d84f853b
# percona: apply nixfmt
8d14fa2886fec877690c6d28cfcdba4503dbbcea
+
+# nixos/virtualisation: format image-related files
+# Original formatting commit that was reverted
+04fadac429ca7d6b92025188652376c230205730
+# Revert commit
+4cec81a9959ce612b653860dcca53101a36f328a
+# Final commit that does the formatting
+88b285c01d84de82c0b2b052fd28eaf6709c2d26
+
+# sqlc: format with nixfmt
+2bdec131b2bb2c8563f4556d741d34ccb77409e2
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 1913e321a8c8..e6fc993c7656 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -8,4 +8,4 @@
## Technical details
-Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result.
+
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index d0473b9473fb..dd9e22e9a689 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -33,12 +33,8 @@ If in doubt, check `git blame` for whoever last touched something.
-->
### Metadata
-Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result.
-```console
-[user@system:~]$ nix-shell -p nix-info --run "nix-info -m"
-output here
-```
+
---
diff --git a/.github/ISSUE_TEMPLATE/build_failure.md b/.github/ISSUE_TEMPLATE/build_failure.md
index cd01f2b063c0..5e6c300b56d3 100644
--- a/.github/ISSUE_TEMPLATE/build_failure.md
+++ b/.github/ISSUE_TEMPLATE/build_failure.md
@@ -31,12 +31,7 @@ If in doubt, check `git blame` for whoever last touched something.
### Metadata
-Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result.
-
-```console
-[user@system:~]$ nix-shell -p nix-info --run "nix-info -m"
-output here
-```
+
---
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 485bcce6a8a4..2a22d38cff16 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -217,9 +217,9 @@
- changed-files:
- any-glob-to-any-file:
- doc/languages-frameworks/nim.section.md
- - pkgs/development/compilers/nim/*
- - pkgs/development/nim-packages/**/*
- - pkgs/top-level/nim-packages.nix
+ - pkgs/build-support/build-nim-package.nix
+ - pkgs/by-name/ni/nim*
+ - pkgs/top-level/nim-overrides.nix
"6.topic: nodejs":
- any:
@@ -340,6 +340,15 @@
- pkgs/os-specific/linux/systemd/**/*
- nixos/modules/system/boot/systemd*/**/*
+"6.topic: tcl":
+ - any:
+ - changed-files:
+ - any-glob-to-any-file:
+ - doc/languages-frameworks/tcl.section.md
+ - pkgs/development/interpreters/tcl/*
+ - pkgs/development/tcl-modules/**/*
+ - pkgs/top-level/tcl-packages.nix
+
"6.topic: TeX":
- any:
- changed-files:
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 5ca7977fa902..bbeb72a701ef 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -20,7 +20,7 @@ jobs:
if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name))
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Create backport PRs
diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml
index b3a85c297925..be6050456189 100644
--- a/.github/workflows/basic-eval.yml
+++ b/.github/workflows/basic-eval.yml
@@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
# we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback
steps:
- - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30
- uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15
with:
diff --git a/.github/workflows/check-cherry-picks.yml b/.github/workflows/check-cherry-picks.yml
index ee2832ca9367..cbd5d66c4232 100644
--- a/.github/workflows/check-cherry-picks.yml
+++ b/.github/workflows/check-cherry-picks.yml
@@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
if: github.repository_owner == 'NixOS'
steps:
- - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
filter: blob:none
diff --git a/.github/workflows/check-maintainers-sorted.yaml b/.github/workflows/check-maintainers-sorted.yaml
index b9d811aa0213..7092cf3fee38 100644
--- a/.github/workflows/check-maintainers-sorted.yaml
+++ b/.github/workflows/check-maintainers-sorted.yaml
@@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
if: github.repository_owner == 'NixOS'
steps:
- - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
# pull_request_target checks out the base branch by default
ref: refs/pull/${{ github.event.pull_request.number }}/merge
diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml
index e77138661961..16574d28cc73 100644
--- a/.github/workflows/check-nix-format.yml
+++ b/.github/workflows/check-nix-format.yml
@@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
if: "!contains(github.event.pull_request.title, '[skip treewide]')"
steps:
- - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
# pull_request_target checks out the base branch by default
ref: refs/pull/${{ github.event.pull_request.number }}/merge
diff --git a/.github/workflows/check-nixf-tidy.yml b/.github/workflows/check-nixf-tidy.yml
index 7facdeee7928..de74ae8b5372 100644
--- a/.github/workflows/check-nixf-tidy.yml
+++ b/.github/workflows/check-nixf-tidy.yml
@@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
if: "!contains(github.event.pull_request.title, '[skip treewide]')"
steps:
- - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
# pull_request_target checks out the base branch by default
ref: refs/pull/${{ github.event.pull_request.number }}/merge
diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml
index 0ece4946f6d8..82bc43fb9294 100644
--- a/.github/workflows/check-shell.yml
+++ b/.github/workflows/check-shell.yml
@@ -10,7 +10,7 @@ jobs:
name: shell-check-x86_64-linux
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
# pull_request_target checks out the base branch by default
ref: refs/pull/${{ github.event.pull_request.number }}/merge
@@ -22,7 +22,7 @@ jobs:
name: shell-check-aarch64-darwin
runs-on: macos-latest
steps:
- - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
# pull_request_target checks out the base branch by default
ref: refs/pull/${{ github.event.pull_request.number }}/merge
diff --git a/.github/workflows/codeowners.yml b/.github/workflows/codeowners-v2.yml
similarity index 67%
rename from .github/workflows/codeowners.yml
rename to .github/workflows/codeowners-v2.yml
index 9d781c6ef080..3c64675a8fe1 100644
--- a/.github/workflows/codeowners.yml
+++ b/.github/workflows/codeowners-v2.yml
@@ -1,17 +1,32 @@
-name: Codeowners
+name: Codeowners v2
-# This workflow depends on a GitHub App with the following permissions:
-# - Repository > Administration: read-only
-# - Organization > Members: read-only
-# - Repository > Pull Requests: read-write
-# The App needs to be installed on this repository
-# the OWNER_APP_ID repository variable needs to be set
-# the OWNER_APP_PRIVATE_KEY repository secret needs to be set
+# This workflow depends on two GitHub Apps with the following permissions:
+# - For checking code owners:
+# - Permissions:
+# - Repository > Administration: read-only
+# - Organization > Members: read-only
+# - Install App on this repository, setting these variables:
+# - OWNER_RO_APP_ID (variable)
+# - OWNER_RO_APP_PRIVATE_KEY (secret)
+# - For requesting code owners:
+# - Permissions:
+# - Repository > Administration: read-only
+# - Organization > Members: read-only
+# - Repository > Pull Requests: read-write
+# - Install App on this repository, setting these variables:
+# - OWNER_APP_ID (variable)
+# - OWNER_APP_PRIVATE_KEY (secret)
+#
+# This split is done because checking code owners requires handling untrusted PR input,
+# while requesting code owners requires PR write access, and those shouldn't be mixed.
on:
pull_request_target:
types: [opened, ready_for_review, synchronize, reopened, edited]
+# We don't need any default GitHub token
+permissions: {}
+
env:
OWNERS_FILE: ci/OWNERS
# Don't do anything on draft PRs
@@ -35,7 +50,7 @@ jobs:
# Important: Because we use pull_request_target, this checks out the base branch of the PR, not the PR itself.
# We later build and run code from the base branch with access to secrets,
# so it's important this is not the PRs code.
- - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
path: base
@@ -45,10 +60,10 @@ jobs:
- uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
id: app-token
with:
- app-id: ${{ vars.OWNER_APP_ID }}
- private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
+ app-id: ${{ vars.OWNER_RO_APP_ID }}
+ private-key: ${{ secrets.OWNER_RO_APP_PRIVATE_KEY }}
- - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: refs/pull/${{ github.event.number }}/merge
path: pr
@@ -72,7 +87,7 @@ jobs:
# 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.
- - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
id: app-token
diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig-v2.yml
similarity index 90%
rename from .github/workflows/editorconfig.yml
rename to .github/workflows/editorconfig-v2.yml
index b4ef16a734b7..b14f76637458 100644
--- a/.github/workflows/editorconfig.yml
+++ b/.github/workflows/editorconfig-v2.yml
@@ -1,6 +1,8 @@
-name: "Checking EditorConfig"
+name: "Checking EditorConfig v2"
-permissions: read-all
+permissions:
+ pull-requests: read
+ contents: read
on:
# avoids approving first time contributors
@@ -25,7 +27,7 @@ jobs:
- name: print list of changed files
run: |
cat "$HOME/changed_files"
- - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
# pull_request_target checks out the base branch by default
ref: refs/pull/${{ github.event.pull_request.number }}/merge
diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos-v2.yml
similarity index 87%
rename from .github/workflows/manual-nixos.yml
rename to .github/workflows/manual-nixos-v2.yml
index 2ae4d929c12d..0678568e5271 100644
--- a/.github/workflows/manual-nixos.yml
+++ b/.github/workflows/manual-nixos-v2.yml
@@ -1,6 +1,7 @@
-name: "Build NixOS manual"
+name: "Build NixOS manual v2"
-permissions: read-all
+permissions:
+ contents: read
on:
pull_request_target:
@@ -15,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
if: github.repository_owner == 'NixOS'
steps:
- - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
# pull_request_target checks out the base branch by default
ref: refs/pull/${{ github.event.pull_request.number }}/merge
diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs-v2.yml
similarity index 88%
rename from .github/workflows/manual-nixpkgs.yml
rename to .github/workflows/manual-nixpkgs-v2.yml
index 676a554107d5..0410cfd904b2 100644
--- a/.github/workflows/manual-nixpkgs.yml
+++ b/.github/workflows/manual-nixpkgs-v2.yml
@@ -1,6 +1,7 @@
-name: "Build Nixpkgs manual"
+name: "Build Nixpkgs manual v2"
-permissions: read-all
+permissions:
+ contents: read
on:
pull_request_target:
@@ -17,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
if: github.repository_owner == 'NixOS'
steps:
- - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
# pull_request_target checks out the base branch by default
ref: refs/pull/${{ github.event.pull_request.number }}/merge
diff --git a/.github/workflows/nix-parse.yml b/.github/workflows/nix-parse-v2.yml
similarity index 89%
rename from .github/workflows/nix-parse.yml
rename to .github/workflows/nix-parse-v2.yml
index 352cb81d87ed..be4bad5f2748 100644
--- a/.github/workflows/nix-parse.yml
+++ b/.github/workflows/nix-parse-v2.yml
@@ -1,6 +1,8 @@
-name: "Check whether nix files are parseable"
+name: "Check whether nix files are parseable v2"
-permissions: read-all
+permissions:
+ pull-requests: read
+ contents: read
on:
# avoids approving first time contributors
@@ -25,7 +27,7 @@ jobs:
if [[ -s "$HOME/changed_files" ]]; then
echo "CHANGED_FILES=$HOME/changed_files" > "$GITHUB_ENV"
fi
- - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
# pull_request_target checks out the base branch by default
ref: refs/pull/${{ github.event.pull_request.number }}/merge
diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml
index 2dc325b4c66c..a7eb1b0eedae 100644
--- a/.github/workflows/nixpkgs-vet.yml
+++ b/.github/workflows/nixpkgs-vet.yml
@@ -27,7 +27,7 @@ jobs:
timeout-minutes: 10
steps:
# This checks out the base branch because of pull_request_target
- - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
path: base
sparse-checkout: ci
@@ -42,7 +42,7 @@ jobs:
echo "Skipping the rest..."
fi
rm -rf base
- - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
if: env.mergedSha
with:
# pull_request_target checks out the base branch by default
diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml
index a33074797fe9..919d927cdbb4 100644
--- a/.github/workflows/periodic-merge-24h.yml
+++ b/.github/workflows/periodic-merge-24h.yml
@@ -41,7 +41,7 @@ jobs:
into: staging-24.05
name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
steps:
- - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # 1.4.0
diff --git a/.github/workflows/periodic-merge-6h.yml b/.github/workflows/periodic-merge-6h.yml
index 42b9bdbdd4c8..1f7cfce34a2e 100644
--- a/.github/workflows/periodic-merge-6h.yml
+++ b/.github/workflows/periodic-merge-6h.yml
@@ -39,7 +39,7 @@ jobs:
into: staging
name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
steps:
- - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # 1.4.0
diff --git a/ci/OWNERS b/ci/OWNERS
index 4541925290b9..232e68adeba3 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -11,13 +11,13 @@
# - There is no need for user/team listed here to have write access.
# - No reviews will be requested for PRs that target the wrong base branch.
#
-# Processing of this file is implemented in workflows/codeowners.yml
+# Processing of this file is implemented in workflows/codeowners-v2.yml
# CI
/.github/workflows @NixOS/Security @Mic92 @zowoq
/.github/workflows/check-nix-format.yml @infinisil
/.github/workflows/nixpkgs-vet.yml @infinisil @philiptaron
-/.github/workflows/codeowners.yml @infinisil
+/.github/workflows/codeowners-v2.yml @infinisil
/ci/OWNERS @infinisil
/ci @infinisil @philiptaron @NixOS/Security
@@ -173,10 +173,17 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza
/pkgs/development/r-modules @jbedo
# Rust
-/pkgs/development/compilers/rust @Mic92 @zowoq @winterqt @figsoda
+/pkgs/development/compilers/rust @alyssais @Mic92 @zowoq @winterqt @figsoda
/pkgs/build-support/rust @zowoq @winterqt @figsoda
/doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda
+# Tcl
+/pkgs/development/interpreters/tcl @fgaz
+/pkgs/development/libraries/tk @fgaz
+/pkgs/top-level/tcl-packages.nix @fgaz
+/pkgs/development/tcl-modules @fgaz
+/doc/languages-frameworks/tcl.section.md @fgaz
+
# C compilers
/pkgs/development/compilers/gcc
/pkgs/development/compilers/llvm @alyssais @RossComputerGuy @NixOS/llvm
@@ -332,7 +339,9 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
/pkgs/by-name/ne/nemo-* @mkg20001
# nim
-/pkgs/development/compilers/nim @ehmry
+/doc/languages-frameworks/nim.section.md @ehmry
+/pkgs/build-support/build-nim-package.nix @ehmry
+/pkgs/top-level/nim-overrides.nix @ehmry
# terraform providers
/pkgs/applications/networking/cluster/terraform-providers @zowoq
diff --git a/doc/doc-support/lib-function-docs.nix b/doc/doc-support/lib-function-docs.nix
index 4306fa926278..61671bd39059 100644
--- a/doc/doc-support/lib-function-docs.nix
+++ b/doc/doc-support/lib-function-docs.nix
@@ -74,7 +74,7 @@
}
{
name = "customisation";
- description = "Functions to customise (derivation-related) functions, derivatons, or attribute sets";
+ description = "Functions to customise (derivation-related) functions, derivations, or attribute sets";
}
{
name = "meta";
diff --git a/doc/hooks/just.section.md b/doc/hooks/just.section.md
index 0eb4864ac74b..b01a0d04e4cf 100644
--- a/doc/hooks/just.section.md
+++ b/doc/hooks/just.section.md
@@ -6,7 +6,7 @@ This setup hook attempts to use [the `just` command runner](https://just.systems
## `buildPhase` {#just-hook-buildPhase}
-This phase attempts to invoke `just` with [the default recipe](https://just.systems/man/en/chapter_23.html).
+This phase attempts to invoke `just` with [the default recipe](https://just.systems/man/en/the-default-recipe.html).
[]{#just-hook-dontUseJustBuild} This behavior can be disabled by setting `dontUseJustBuild` to `true`.
diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md
index af52a3d31d05..bb394a243b79 100644
--- a/doc/languages-frameworks/cuda.section.md
+++ b/doc/languages-frameworks/cuda.section.md
@@ -150,7 +150,7 @@ All new projects should use the CUDA redistributables available in [`cudaPackage
In the scenario you are unable to run the resulting binary: this is arguably the most complicated as it could be any combination of the previous reasons. This type of failure typically occurs when a library attempts to load or open a library it depends on that it does not declare in its `DT_NEEDED` section. As a first step, ensure that dependencies are patched with [`autoAddDriverRunpath`](https://search.nixos.org/packages?channel=unstable&type=packages&query=autoAddDriverRunpath). Failing that, try running the application with [`nixGL`](https://github.com/guibou/nixGL) or a similar wrapper tool. If that works, it likely means that the application is attempting to load a library that is not in the `RPATH` or `RUNPATH` of the binary.
-## Running Docker or Podman containers with CUDA support {#running-docker-or-podman-containers-with-cuda-support}
+## Running Docker or Podman containers with CUDA support {#cuda-docker-podman}
It is possible to run Docker or Podman containers with CUDA support. The recommended mechanism to perform this task is to use the [NVIDIA Container Toolkit](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/index.html).
diff --git a/doc/languages-frameworks/index.md b/doc/languages-frameworks/index.md
index c21f73e69a25..a8a13ce5b9e2 100644
--- a/doc/languages-frameworks/index.md
+++ b/doc/languages-frameworks/index.md
@@ -93,6 +93,7 @@ ruby.section.md
rust.section.md
scheme.section.md
swift.section.md
+tcl.section.md
texlive.section.md
titanium.section.md
vim.section.md
diff --git a/doc/languages-frameworks/tcl.section.md b/doc/languages-frameworks/tcl.section.md
new file mode 100644
index 000000000000..71ec9d89eb50
--- /dev/null
+++ b/doc/languages-frameworks/tcl.section.md
@@ -0,0 +1,54 @@
+# Tcl {#sec-language-tcl}
+
+## User guide {#sec-language-tcl-user-guide}
+
+Tcl interpreters are available under the `tcl` and `tcl-X_Y` attributes, where `X_Y` is the Tcl version.
+
+Tcl libraries are available in the `tclPackages` attribute set.
+They are only guaranteed to work with the default Tcl version, but will probably also work with others thanks to the [stubs mechanism](https://wiki.tcl-lang.org/page/Stubs).
+
+## Packaging guide {#sec-language-tcl-packaging}
+
+Tcl packages are typically built with `tclPackages.mkTclDerivation`.
+Tcl dependencies go in `buildInputs`/`nativeBuildInputs`/... like other packages.
+For more complex package definitions, such as packages with mixed languages, use `tcl.tclPackageHook`.
+
+Where possible, make sure to enable stubs for maximum compatibility, usually with the `--enable-stubs` configure flag.
+
+Here is a simple package example to be called with `tclPackages.callPackage`.
+
+```
+{ lib, fetchzip, mkTclDerivation, openssl }:
+
+mkTclDerivation rec {
+ pname = "tcltls";
+ version = "1.7.22";
+
+ src = fetchzip {
+ url = "https://core.tcl-lang.org/tcltls/uv/tcltls-${version}.tar.gz";
+ hash = "sha256-TOouWcQc3MNyJtaAGUGbaQoaCWVe6g3BPERct/V65vk=";
+ };
+
+ buildInputs = [ openssl ];
+
+ configureFlags = [
+ "--with-ssl-dir=${openssl.dev}"
+ "--enable-stubs"
+ ];
+
+ meta = {
+ homepage = "https://core.tcl-lang.org/tcltls/index";
+ description = "OpenSSL / RSA-bsafe Tcl extension";
+ maintainers = [ lib.maintainers.agbrooks ];
+ license = lib.licenses.tcltk;
+ platforms = lib.platforms.unix;
+ };
+}
+```
+
+All Tcl libraries are declared in `pkgs/top-level/tcl-packages.nix` and are defined in `pkgs/development/tcl-modules/`.
+If possible, prefer the by-name hierarchy in `pkgs/development/tcl-modules/by-name/`.
+Its use is documented in `pkgs/development/tcl-modules/by-name/README.md`.
+
+All Tcl applications reside elsewhere.
+In case a package is used as both a library and an application (for example `expect`), it should be defined in `tcl-packages.nix`, with an alias elsewhere.
diff --git a/doc/stdenv/platform-notes.chapter.md b/doc/stdenv/platform-notes.chapter.md
index 9b0fdd149f9a..b3d0252c19e0 100644
--- a/doc/stdenv/platform-notes.chapter.md
+++ b/doc/stdenv/platform-notes.chapter.md
@@ -46,22 +46,198 @@ Some common issues when packaging software for Darwin:
}
```
-- Some packages assume xcode is available and use `xcrun` to resolve build tools like `clang`, etc. This causes errors like `xcode-select: error: no developer tools were found at '/Applications/Xcode.app'` while the build doesn’t actually depend on xcode.
+- Some packages assume Xcode is available and use `xcrun` to resolve build tools like `clang`, etc. The Darwin stdenv includes `xcrun`, and it will return the path to any binary available in a build.
```nix
stdenv.mkDerivation {
name = "libfoo-1.2.3";
# ...
+ nativeBuildInputs = [ bison ];
+ buildCommand = ''
+ xcrun bison foo.y # produces foo.tab.c
+ # ...
+ '';
+ }
+ ```
+ The package `xcbuild` can be used to build projects that really depend on Xcode. However, this replacement is not 100% compatible with Xcode and can occasionally cause issues.
+
+ Note: Some packages may hardcode an absolute path to `xcrun`, `xcodebuild`, or `xcode-select`. Those paths should be removed or replaced.
+
+ ```nix
+ stdenv.mkDerivation {
+ name = "libfoo-1.2.3";
prePatch = ''
substituteInPlace Makefile \
- --replace-fail '/usr/bin/xcrun clang' clang
+ --replace-fail /usr/bin/xcrun xcrun
+ # or: --replace-fail /usr/bin/xcrun '${lib.getExe' buildPackages.xcbuild "xcrun"}'
'';
}
```
- The package `xcbuild` can be used to build projects that really depend on Xcode. However, this replacement is not 100% compatible with Xcode and can occasionally cause issues.
+- Multiple SDKs are available for use in nixpkgs. Each platform has a default SDK (10.12.2 for x86_64-darwin and 11.3 for aarch64-darwin), which is available as the `apple-sdk` package.
-- x86_64-darwin uses the 10.12 SDK by default, but some software is not compatible with that version of the SDK. In that case,
- the 11.0 SDK used by aarch64-darwin is available for use on x86_64-darwin. To use it, reference `apple_sdk_11_0` instead of
- `apple_sdk` in your derivation and use `pkgs.darwin.apple_sdk_11_0.callPackage` instead of `pkgs.callPackage`. On Linux, this will
- have the same effect as `pkgs.callPackage`, so you can use `pkgs.darwin.apple_sdk_11_0.callPackage` regardless of platform.
+ The SDK provides the necessary headers and text-based stubs to link common frameworks and libraries (such as libSystem, which is effectively Darwin’s libc). Projects will sometimes indicate which SDK to use by the Xcode version. As a rule of thumb, subtract one from the Xcode version to get the available SDK in nixpkgs.
+
+ The `DEVELOPER_DIR` variable in the build environment has the path to the SDK in the build environment. The `SDKROOT` variable there contains a sysroot with the framework, header, and library paths. You can reference an SDK’s sysroot from Nix using the `sdkroot` attribute on the SDK package. Note that it is preferable to use `SDKROOT` because the latter will be resolved to the highest SDK version of any available to your derivation.
+
+ ```nix
+ stdenv.mkDerivation {
+ name = "libfoo-1.2.3";
+ # ...
+ env.PACKAGE_SPECIFIC_SDK_VAR = apple-sdk_10_15.sdkroot;
+ # or
+ buildInputs = [ apple-sdk_10_15 ];
+ postPatch = ''
+ export PACKAGE_SPECIFIC_SDK_VAR=$SDKROOT
+ '';
+ }
+ ```
+
+ The following is a list of Xcode versions, the SDK version in nixpkgs, and the attribute to use to add it. Generally, only the last SDK release for a major version is packaged (each _x_ in 10._x_ until 10.15 is considered a major version).
+
+ | Xcode version | SDK version | nixpkgs attribute |
+ |--------------------|---------------------------------------------------|-------------------|
+ | Varies by platform | 10.12.2 (x86_64-darwin)
11.3 (aarch64-darwin) | `apple-sdk` |
+ | 8.0–8.3.3 | 10.12.2 | `apple-sdk_10_12` |
+ | 9.0–9.4.1 | 10.13.2 | `apple-sdk_10_13` |
+ | 10.0–10.3 | 10.14.6 | `apple-sdk_10_14` |
+ | 11.0–11.7 | 10.15.6 | `apple-sdk_10_15` |
+ | 12.0–12.5.1 | 11.3 | `apple-sdk_11` |
+ | 13.0–13.4.1 | 12.3 | `apple-sdk_12` |
+ | 14.0–14.3.1 | 13.3 | `apple-sdk_13` |
+ | 15.0–15.4 | 14.4 | `apple-sdk_14` |
+ | 16.0 | 15.0 | `apple-sdk_15` |
+
+ To use a non-default SDK, add it to your build inputs.
+
+ ```nix
+ stdenv.mkDerivation {
+ name = "libfoo-1.2.3";
+ # ...
+ buildInputs = [ apple-sdk_15 ]; # Uses the 15.0 SDK instead of the default SDK for the platform.
+ }
+ ```
+
+ If your derivation has multiple SDKs its inputs (e.g., because they have been propagated by its dependencies), it will use the highest SDK version available.
+
+ ```nix
+ stdenv.mkDerivation {
+ name = "libfoo-1.2.3"; # Upstream specifies that it needs Xcode 12 to build, so use the 11.3 SDK.
+ # ...
+ buildInputs = [ apple-sdk_11 ];
+ nativeBuildInputs = [ swift ]; # Propagates the 13.3 SDK, so the 13.3 SDK package will be used instead of the 11.3 SDK.
+ }
+ ```
+
+- When a package indicates a minimum supported version, also called the deployment target, you can set it in your derivation using `darwinMinVersionHook`. If you need to set a minimum version higher than the default SDK, you should also add the corresponding SDK to your `buildInputs`.
+
+ The deployment target controls how Darwin handles availability and access to some APIs. In most cases, if a deployment target is newer than the first availability of an API, that API will be linked directly. Otherwise, the API will be weakly linked and checked at runtime.
+
+ ```nix
+ stdenv.mkDerivation {
+ name = "libfoo-1.2.3"; # Upstream specifies the minimum supported version as 12.5.
+ buildInputs = [ (darwinMinVersionHook "12.5") ];
+ }
+ ```
+
+ If your derivation has multiple versions of this hook in its inputs (e.g., because it has been propagated by one of your dependencies), it will use the highest deployment target available.
+
+ ```nix
+ stdenv.mkDerivation {
+ name = "libfoo-1.2.3"; # Upstream specifies the minimum supported version as 10.15.
+ buildInputs = [ qt6.qtbase (darwinMinVersionHook "10.15") ];
+ }
+ # Qt 6 specifies a minimum version of 12.0, so the minimum version resolves to 12.0.
+ ```
+
+
+- You should rely on the default SDK when possible. If a package specifies a required SDK version, use that version (e.g., libuv requires 11.0, so it should use `apple-sdk_11`). When a package supports multiple SDKs, determine which SDK package to use based on the following rules of thumb:
+
+ - If a package supports multiple SDK versions, use the lowest supported SDK version by the package (but no lower than the default SDK). That ensures maximal platform compatibility for the package.
+
+ - If a package specifies a range of supported SDK versions _and_ a minimum supported version, assume the package is using availability checks to support the indicated minimum version. Add the highest supported SDK and a `darwinMinVersionHook` set to the minimum version supported by the upstream package.
+
+ Warning: Avoid using newer SDKs than an upstream package supports. When a binary is linked on Darwin, the SDK version used to build it is recorded in the binary. Runtime behavior can vary based on the SDK version, which may work fine but can also result in unexpected behavior or crashes when building with an unsupported SDK.
+
+ ```nix
+ stdenv.mkDerivation {
+ name = "foo-1.2.3";
+ # ...
+ buildInputs = [ apple-sdk_15 (darwinMinVersionHook "10.15") ]; # Upstream builds with the 15.0 SDK but supports 10.15.
+ }
+ ```
+
+- Libraries that require a minimum version can propagate an appropriate SDK and `darwinMinVersionHook`. Derivations using that library will automatically use an appropriate SDK and minimum version. Even if the library builds with a newer SDK, it should propagate the minimum supported SDK. Derivations that need a newer SDK can add it to their `buildInputs`.
+
+ ```nix
+ stdenv.mkDerivation {
+ name = "libfoo-1.2.3";
+ # ...
+ buildInputs = [ apple-sdk_15 ]; # Upstream builds with the 15.0 SDK but supports 10.15.
+ propagatedBuildInputs = [ apple-sdk_10_15 (darwinMinVersionHook "10.15") ];
+ }
+ # ...
+ stdenv.mkDerivation {
+ name = "bar-1.2.3";
+ # ...
+ buildInputs = [ libfoo ]; # Builds with the 10.15 SDK
+ }
+ # ...
+ stdenv.mkDerivation {
+ name = "baz-1.2.3";
+ # ...
+ buildInputs = [ apple-sdk_12 libfoo ]; # Builds with the 12.3 SDK
+ }
+ ```
+
+- Many SDK libraries and frameworks use text-based stubs to link against system libraries and frameworks, but several are built from source (typically corresponding to the source releases for the latest release of macOS). Several of these are propagated to your package automatically. They can be accessed via the `darwin` package set along with others that are not propagated by default.
+
+ - libiconv
+ - libresolv
+ - libsbuf
+
+ Other common libraries are available in Darwin-specific versions with modifications from Apple. Note that these packages may be made the default on Darwin in the future.
+
+ - ICU (compatible with the top-level icu package, but it also provides `libicucore.B.dylib` with an ABI compatible with the Darwin system version)
+ - libpcap (compatible with the top-level libpcap, but it includes Darwin-specific extensions)
+
+- The legacy SDKs packages are still available in the `darwin` package set under their existing names, but all packages in these SDKs (frameworks, libraries, etc) are stub packages for evaluation compatibility.
+
+ In most cases, a derivation can be updated by deleting all of its SDK inputs (frameworks, libraries, etc). If you had to override the SDK, see below for how to do that using the new SDK pattern. If your derivation depends on the layout of the old frameworks or other internal details, you have more work to do.
+
+ When a package depended on the location of frameworks, references to those framework packages can usually be replaced with `${apple-sdk.sdkroot}/System` or `$SDKROOT/System`. For example, if you substituted `${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework` in your derivation, you should replace it with `${apple-sdk.sdkroot}/System/Library/Frameworks/OpenGL.framework` or `$SDKROOT/System/Library/Frameworks`. The latter is preferred because it supports using the SDK that is resolved when multiple SDKs are propagated (see above).
+
+ Note: the new SDK pattern uses the name `apple-sdk` to better align with nixpkgs naming conventions. The old SDK pattern uses `apple_sdk`.
+
+- There are two legacy patterns that are being phased out. These patterns were used in the past to change the SDK version. They have been reimplemented to use the `apple-sdk` packages.
+
+ - `pkgs.darwin.apple_sdk_11_0.callPackage` - this pattern was used to provide frameworks from the 11.0 SDK. It now adds the `apple-sdk_11` package to your derivation’s build inputs.
+ - `overrideSDK` - this stdenv adapter would try to replace the frameworks used by your derivation and its transitive dependencies. It now adds the `apple-sdk_11` package for `11.0` or the `apple-sdk_12` package for `12.3`. If `darwinMinVersion` is specified, it will add `darwinMinVersionHook` with the specified minimum version. No other SDK versions are supported.
+
+- Darwin supports cross-compilation between Darwin platforms. Cross-compilation from Linux is not currently supported but may be supported in the future. To cross-compile to Darwin, you can set `crossSystem` or use one of the Darwin systems in `pkgsCross`. The `darwinMinVersionHook` and the SDKs support cross-compilation. If you need to specify a different SDK version for a `depsBuildBuild` compiler, add it to your `nativeBuildInputs`.
+
+ ```nix
+ stdenv.mkDerivation {
+ name = "libfoo-1.2.3";
+ # ...
+ depsBuildBuild = [ buildPackages.stdenv.cc ];
+ nativeBuildInputs = [ apple-sdk_12 ];
+ buildInputs = [ apple-sdk_13 ];
+ depsTargetTargetPropagated = [ apple-sdk_14 ];
+ }
+ # The build-build clang will use the 12.3 SDK while the package build itself will use the 13.3 SDK.
+ # Derivations that add this package as an input will have the 14.4 SDK propagated to them.
+ ```
+
+ The different target SDK and hooks are mangled based on role:
+
+ - `DEVELOPER_DIR_FOR_BUILD` and `MACOSX_DEPLOYMENT_TARGET_FOR_BUILD` for the build platform;
+ - `DEVELOPER_DIR` and `MACOSX_DEPLOYMENT_TARGET` for the host platform; and
+ - `DEVELOPER_DIR_FOR_TARGET` and `MACOSX_DEPLOYMENT_TARGET_FOR_TARGET` for the build platform.
+
+ In static compilation situations, it is possible for the build and host platform to be the same platform but have different SDKs with the same version (one dynamic and one static). cc-wrapper takes care of handling this distinction.
+
+- The current default versions of the deployment target (minimum version) and SDK are indicated by Darwin-specific attributes on the platform. Because of the ways that minimum version and SDK can be changed that are not visible to Nix, they should be treated as lower bounds. If you need to parameterize over a specific version, create a function that takes the version as a parameter instead of relying on these attributes.
+
+ - `darwinMinVersion` defaults to 10.12 on x86_64-darwin and 11.0 on aarch64-darwin. It sets the default `MACOSX_DEPLOYMENT_TARGET`.
+ - `darwinSdkVersion` defaults to 10.12 on x86-64-darwin and 11.0 on aarch64-darwin. Only the major version determines the SDK version, resulting in the 10.12.2 and 11.3 SDKs being used on these platforms respectively.
diff --git a/lib/licenses.nix b/lib/licenses.nix
index fb7b6c2e837f..6ba244b88b82 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -942,6 +942,11 @@ lib.mapAttrs mkLicense ({
url = "https://license.coscl.org.cn/MulanPSL2";
};
+ naist-2003 = {
+ spdxId = "NAIST-2003";
+ fullName = "Nara Institute of Science and Technology License (2003)";
+ };
+
nasa13 = {
spdxId = "NASA-1.3";
fullName = "NASA Open Source Agreement 1.3";
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fed81e98a0ff..b8b1388843d3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -414,6 +414,12 @@
githubId = 1174810;
name = "Nikolay Amiantov";
};
+ abcsds = {
+ email = "abcsds@gmail.com";
+ github = "abcsds";
+ githubId = 2694381;
+ name = "Alberto Barradas";
+ };
abdiramen = {
email = "abdirahman.osmanthus@gmail.com";
github = "Abdiramen";
@@ -731,6 +737,12 @@
githubId = 79667753;
keys = [ { fingerprint = "B0D7 2955 235F 6AB5 ACFA 1619 8C7F F5BB 1ADE F191"; } ];
};
+ ailsa-sun = {
+ name = "Ailsa Sun";
+ email = "jjshenw@gmail.com";
+ github = "ailsa-sun";
+ githubId = 135079815;
+ };
aimpizza = {
email = "rickomo.us@gmail.com";
name = "Rick Omonsky";
@@ -743,6 +755,11 @@
githubId = 37664775;
name = "Yuto Oguchi";
};
+ airrnot = {
+ name = "airRnot";
+ github = "airRnot1106";
+ githubId = 62370527;
+ };
airwoodix = {
email = "airwoodix@posteo.me";
github = "airwoodix";
@@ -961,6 +978,12 @@
githubId = 173595;
name = "Caleb Maclennan";
};
+ alex = {
+ email = "alexander.cinnamon927@passmail.net";
+ github = "alexanderjkslfj";
+ githubId = 117545308;
+ name = "Alex";
+ };
ALEX11BR = {
email = "alexioanpopa11@gmail.com";
github = "ALEX11BR";
@@ -1873,6 +1896,12 @@
githubId = 10285250;
name = "Artur E. Ruuge";
};
+ arunoruto = {
+ email = "mirza.arnaut45@gmail.com";
+ github = "arunoruto";
+ githubId = 21687187;
+ name = "Mirza Arnaut";
+ };
asbachb = {
email = "asbachb-nixpkgs-5c2a@impl.it";
matrix = "@asbachb:matrix.org";
@@ -2480,6 +2509,7 @@
};
bbenno = {
email = "nix@bbenno.com";
+ matrix = "@bbenno:matrix.org";
github = "bbenno";
githubId = 32938211;
name = "Benno Bielmeier";
@@ -2527,6 +2557,12 @@
githubId = 34620799;
name = "Jacob Bachmann";
};
+ bcyran = {
+ email = "bazyli@cyran.dev";
+ github = "bcyran";
+ githubId = 8322846;
+ name = "Bazyli Cyran";
+ };
bdd = {
email = "bdd@mindcast.org";
github = "bdd";
@@ -2915,6 +2951,12 @@
githubId = 535135;
name = "Brennon Loveless";
};
+ bloxx12 = {
+ email = "charlie@charlieroot.dev";
+ github = "bloxx12";
+ githubId = 75451918;
+ name = "Charlie Root";
+ };
bluescreen303 = {
email = "mathijs@bluescreen303.nl";
github = "bluescreen303";
@@ -5401,6 +5443,12 @@
githubId = 4490283;
name = "diadatp";
};
+ diamond-deluxe = {
+ email = "carbon_lattice@proton.me";
+ github = "diamond-deluxe";
+ githubId = 112557036;
+ name = "Diamond";
+ };
DianaOlympos = {
github = "DianaOlympos";
githubId = 15774340;
@@ -5826,6 +5874,12 @@
githubId = 1931963;
name = "David Sferruzza";
};
+ dsluijk = {
+ name = "Dany Sluijk";
+ email = "nix@dany.dev";
+ github = "dsluijk";
+ githubId = 8537327;
+ };
dstengele = {
name = "Dennis Stengele";
email = "dennis@stengele.me";
@@ -5870,7 +5924,10 @@
github = "jollheef";
githubId = 1749762;
name = "Mikhail Klementev";
- keys = [ { fingerprint = "5DD7 C6F6 0630 F08E DAE7 4711 1525 585D 1B43 C62A"; } ];
+ keys = [
+ { fingerprint = "5AC8 C9A1 68C7 9451 1A91 2295 C990 5BA7 2B5E 02BB"; }
+ { fingerprint = "5DD7 C6F6 0630 F08E DAE7 4711 1525 585D 1B43 C62A"; }
+ ];
};
dunxen = {
email = "git@dunxen.dev";
@@ -6264,6 +6321,12 @@
github = "elliottslaughter";
githubId = 3129;
};
+ ElliottSullingeFarrall = {
+ name = "Elliott Sullinge-Farrall";
+ email = "elliott.chalford@gmail.com";
+ github = "ElliottSullingeFarrall";
+ githubId = 108588212;
+ };
elliottvillars = {
email = "elliottvillars@gmail.com";
github = "elliottvillars";
@@ -7166,6 +7229,11 @@
githubId = 183879;
name = "Florian Klink";
};
+ florensie = {
+ github = "florensie";
+ githubId = 13403842;
+ name = "Florens Pauwels";
+ };
florentc = {
github = "florentc";
githubId = 1149048;
@@ -7408,7 +7476,7 @@
matrix = "@frontear:matrix.org";
github = "Frontear";
githubId = 31909298;
- keys = [ { fingerprint = "C170 11B7 C0AA BB3F 7415 022C BCB5 CEFD E222 82F5"; } ];
+ keys = [ { fingerprint = "6A25 DEBE 41DB 0C15 3AB5 BB34 5290 E18B 8705 1A83"; } ];
};
frontsideair = {
email = "photonia@gmail.com";
@@ -8625,6 +8693,12 @@
githubId = 6430643;
name = "Henry Till";
};
+ hensoko = {
+ email = "hensoko@pub.solar";
+ github = "hensoko";
+ githubId = 13552930;
+ name = "hensoko";
+ };
heph2 = {
email = "srht@mrkeebs.eu";
github = "heph2";
@@ -9438,6 +9512,13 @@
email = "itepastra@gmail.com";
keys = [ { fingerprint = "E681 4CAF 06AE B076 D55D 3E32 A16C DCBF 1472 541F"; } ];
};
+ itsvic-dev = {
+ email = "contact@itsvic.dev";
+ name = "Victor B.";
+ github = "itsvic-dev";
+ githubId = 17727163;
+ keys = [ { fingerprint = "FBAA B86A 101B 4C5F D4F1 25D2 E93D DAC1 7E5D 6CA1"; } ];
+ };
ius = {
email = "j.de.gram@gmail.com";
name = "Joerie de Gram";
@@ -9500,6 +9581,12 @@
githubId = 1318743;
name = "Ivar";
};
+ iv-nn = {
+ name = "iv-nn";
+ github = "iv-nn";
+ githubId = 49885246;
+ keys = [ { fingerprint = "6358 EF87 86E0 EF2F 1628 103F BAB5 F165 1C71 C9C3"; } ];
+ };
ivyfanchiang = {
email = "dev@ivyfanchiang.ca";
github = "hexadecimalDinosaur";
@@ -10494,6 +10581,13 @@
githubId = 168684553;
name = "João Marques";
};
+ joinemm = {
+ email = "joonas@rautiola.co";
+ github = "joinemm";
+ githubId = 26210439;
+ name = "Joonas Rautiola";
+ keys = [ { fingerprint = "87EC DD30 6614 E510 5299 F0D4 090E B48A 4669 AA54"; } ];
+ };
jojosch = {
name = "Johannes Schleifenbaum";
email = "johannes@js-webcoding.de";
@@ -12383,6 +12477,13 @@
githubId = 169170;
name = "Mathias Schreck";
};
+ loc = {
+ matrix = "@loc:locrealloc.de";
+ github = "LoCrealloc";
+ githubId = 64095253;
+ name = "LoC";
+ keys = [ { fingerprint = "DCCE F73B 209A 6024 CAE7 F926 5563 EB4A 8634 4F15"; } ];
+ };
locallycompact = {
email = "dan.firth@homotopic.tech";
github = "locallycompact";
@@ -14809,6 +14910,11 @@
githubId = 96225281;
name = "Mustafa Çalışkan";
};
+ musjj = {
+ name = "musjj";
+ github = "musjj";
+ githubId = 72612857;
+ };
mvisonneau = {
name = "Maxime VISONNEAU";
email = "maxime@visonneau.fr";
@@ -16354,6 +16460,11 @@
githubId = 33182938;
name = "Pankaj";
};
+ PapayaJackal = {
+ github = "PapayaJackal";
+ githubId = 145766029;
+ name = "PapayaJackal";
+ };
paperdigits = {
email = "mica@silentumbrella.com";
github = "paperdigits";
@@ -16626,6 +16737,12 @@
githubId = 63069986;
name = "Per Stark";
};
+ petee = {
+ name = "Pete Erickson";
+ email = "pete.perickson@gmail.com";
+ github = "petee";
+ githubId = 89916;
+ };
petercommand = {
email = "petercommand@gmail.com";
github = "petercommand";
@@ -17479,6 +17596,12 @@
githubId = 43755002;
name = "Dmitriy P";
};
+ pta2002 = {
+ email = "pta2002@pta2002.com";
+ github = "pta2002";
+ githubId = 7443916;
+ name = "Pedro Alves";
+ };
ptival = {
email = "valentin.robert.42@gmail.com";
github = "Ptival";
@@ -17584,6 +17707,12 @@
githubId = 12017109;
name = "Rabindra Dhakal";
};
+ qbisi = {
+ name = "qbisicwate";
+ email = "qbisicwate@gmail.com";
+ github = "qbisi";
+ githubId = 84267544;
+ };
qbit = {
name = "Aaron Bieber";
email = "aaron@bolddaemon.com";
@@ -18009,6 +18138,12 @@
name = "Roland Conybeare";
keys = [ { fingerprint = "bw5Cr/4ul1C2UvxopphbZbFI1i5PCSnOmPID7mJ/Ogo"; } ];
};
+ rc-zb = {
+ name = "Xiao Haifan";
+ email = "rc-zb@outlook.com";
+ github = "rc-zb";
+ githubId = 161540043;
+ };
rdnetto = {
email = "rdnetto@gmail.com";
github = "rdnetto";
@@ -18154,6 +18289,11 @@
githubId = 3302;
name = "Renzo Carbonara";
};
+ reputable2772 = {
+ name = "Reputable2772";
+ github = "Reputable2772";
+ githubId = 153411261;
+ };
rettetdemdativ = {
email = "michael@koeppl.dev";
github = "rettetdemdativ";
@@ -19165,6 +19305,12 @@
githubId = 695473;
name = "Sascha Grunert";
};
+ satoqz = {
+ email = "mail@satoqz.net";
+ github = "satoqz";
+ githubId = 40795431;
+ name = "satoqz";
+ };
saturn745 = {
email = "git-commits.rk7uq@aleeas.com";
github = "saturn745";
@@ -19721,12 +19867,24 @@
github = "shhht";
githubId = 118352823;
};
+ shift = {
+ name = "Vincent Palmer";
+ email = "shift@someone.section.me";
+ github = "shift";
+ githubId = 1653;
+ };
shikanime = {
name = "William Phetsinorath";
email = "deva.shikanime@protonmail.com";
github = "shikanime";
githubId = 22115108;
};
+ shiphan = {
+ email = "timlin940511@gmail.com";
+ name = "Shiphan";
+ github = "Shiphan";
+ githubId = 140245703;
+ };
shiryel = {
email = "contact@shiryel.com";
name = "Shiryel";
@@ -20041,6 +20199,12 @@
githubId = 49844593;
name = "skovati";
};
+ skyesoss = {
+ name = "Skye Soss";
+ matrix = "@skyesoss:matrix.org";
+ github = "Skyb0rg007";
+ githubId = 30806179;
+ };
skykanin = {
github = "skykanin";
githubId = 3789764;
@@ -20448,6 +20612,12 @@
github = "srounce";
githubId = 60792;
};
+ Srylax = {
+ name = "Srylax";
+ email = "srylax+nixpkgs@srylax.dev";
+ github = "Srylax";
+ githubId = 71783705;
+ };
sshine = {
email = "simon@simonshine.dk";
github = "sshine";
@@ -20521,6 +20691,12 @@
githubId = 94006354;
name = "steamwalker";
};
+ steeleduncan = {
+ email = "steeleduncan@hotmail.com";
+ github = "steeleduncan";
+ githubId = 866573;
+ name = "Duncan Steele";
+ };
steell = {
email = "steve@steellworks.com";
github = "Steell";
@@ -21815,6 +21991,12 @@
githubId = 2164118;
name = "Tobias Bora";
};
+ tobifroe = {
+ email = "hi@froelich.dev";
+ github = "tobifroe";
+ githubId = 40638719;
+ name = "Tobias Frölich";
+ };
tobim = {
email = "nix@tobim.fastmail.fm";
github = "tobim";
@@ -23043,6 +23225,12 @@
githubId = 24979302;
name = "Vladimír Zahradník";
};
+ wfdewith = {
+ name = "Wim de With";
+ email = "wf@dewith.io";
+ github = "wfdewith";
+ githubId = 2306085;
+ };
wgunderwood = {
email = "wg.underwood13@gmail.com";
github = "WGUNDERWOOD";
@@ -23105,6 +23293,13 @@
githubId = 1215623;
keys = [ { fingerprint = "DA03 D6C6 3F58 E796 AD26 E99B 366A 2940 479A 06FC"; } ];
};
+ wilhelmines = {
+ email = "mail@aesz.org";
+ matrix = "@wilhelmines:matrix.org";
+ name = "Ronja Schwarz";
+ github = "wilhelmines";
+ githubId = 71409721;
+ };
willbush = {
email = "git@willbush.dev";
matrix = "@willbush:matrix.org";
@@ -23269,6 +23464,12 @@
githubId = 28888242;
name = "WORLDofPEACE";
};
+ WoutSwinkels = {
+ name = "Wout Swinkels";
+ email = "nixpkgs@woutswinkels.com";
+ github = "WoutSwinkels";
+ githubId = 113464111;
+ };
wozeparrot = {
email = "wozeparrot@gmail.com";
github = "wozeparrot";
@@ -24212,12 +24413,6 @@
githubId = 71881325;
name = "Stefan Bordei";
};
- zzamboni = {
- email = "diego@zzamboni.org";
- github = "zzamboni";
- githubId = 32876;
- name = "Diego Zamboni";
- };
zzzsy = {
email = "me@zzzsy.top";
github = "zzzsyyy";
diff --git a/nixos/doc/manual/administration/rollback.section.md b/nixos/doc/manual/administration/rollback.section.md
index 290d685a2a18..4e596fde8894 100644
--- a/nixos/doc/manual/administration/rollback.section.md
+++ b/nixos/doc/manual/administration/rollback.section.md
@@ -12,7 +12,7 @@ system has booted, you can make the selected configuration the default
for subsequent boots:
```ShellSession
-# /run/current-system/bin/switch-to-configuration boot
+# /run/current-system/bin/apply boot
```
Second, you can switch to the previous configuration in a running
@@ -25,11 +25,11 @@ system:
This is equivalent to running:
```ShellSession
-# /nix/var/nix/profiles/system-N-link/bin/switch-to-configuration switch
+# /nix/var/nix/profiles/system-N-link/bin/apply switch
```
-where `N` is the number of the NixOS system configuration. To get a
-list of the available configurations, do:
+where `N` is the number of the NixOS system configuration to roll back to.
+To get a list of the available configurations, run:
```ShellSession
$ ls -l /nix/var/nix/profiles/system-*-link
diff --git a/nixos/doc/manual/configuration/customizing-packages.section.md b/nixos/doc/manual/configuration/customizing-packages.section.md
index 074932b3f110..db7a6c60fade 100644
--- a/nixos/doc/manual/configuration/customizing-packages.section.md
+++ b/nixos/doc/manual/configuration/customizing-packages.section.md
@@ -33,8 +33,8 @@ Unfortunately, Nixpkgs currently lacks a way to query available package configur
::: {.note}
For example, many packages come with extensions one might add.
Examples include:
-- [`passExtensions.pass-otp`](https://search.nixos.org/packages/query=passExtensions.pass-otp)
-- [`python310Packages.requests`](https://search.nixos.org/packages/query=python310Packages.requests)
+- [`passExtensions.pass-otp`](https://search.nixos.org/packages?query=passExtensions.pass-otp)
+- [`python312Packages.requests`](https://search.nixos.org/packages?query=python312Packages.requests)
You can use them like this:
```nix
diff --git a/nixos/doc/manual/development/non-switchable-systems.section.md b/nixos/doc/manual/development/non-switchable-systems.section.md
index a51e8233f30b..a8cbcdd865fd 100644
--- a/nixos/doc/manual/development/non-switchable-systems.section.md
+++ b/nixos/doc/manual/development/non-switchable-systems.section.md
@@ -16,6 +16,6 @@ profile:
The most notable deviation of this profile from a standard NixOS configuration
is that after building it, you cannot switch *to* the configuration anymore.
The profile sets `config.system.switch.enable = false;`, which excludes
-`switch-to-configuration`, the central script called by `nixos-rebuild`, from
+`apply` and `switch-to-configuration`, the central scripts called by `nixos-rebuild`, from
your system. Removing this script makes the image lighter and slightly more
secure.
diff --git a/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md b/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md
index 28c06f999dac..a3e921569caa 100644
--- a/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md
+++ b/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md
@@ -5,8 +5,8 @@ This chapter explains some of the internals of this command to make it simpler
for new module developers to configure their units correctly and to make it
easier to understand what is happening and why for curious administrators.
-`nixos-rebuild`, like many deployment solutions, calls `switch-to-configuration`
-which resides in a NixOS system at `$out/bin/switch-to-configuration`. The
+`nixos-rebuild`, like many deployment solutions, calls `apply` (or for NixOS older than 24.11, `switch-to-configuration`)
+which resides in a NixOS system at `$out/bin/apply`. The
script is called with the action that is to be performed like `switch`, `test`,
`boot`. There is also the `dry-activate` action which does not really perform
the actions but rather prints what it would do if you called it with `test`.
diff --git a/nixos/doc/manual/development/writing-nixos-tests.section.md b/nixos/doc/manual/development/writing-nixos-tests.section.md
index 3ce12f41c60f..bd588e2ba80b 100644
--- a/nixos/doc/manual/development/writing-nixos-tests.section.md
+++ b/nixos/doc/manual/development/writing-nixos-tests.section.md
@@ -71,20 +71,20 @@ nix-build -A nixosTests.hostname
### Testing outside the NixOS project {#sec-call-nixos-test-outside-nixos}
-Outside the `nixpkgs` repository, you can instantiate the test by first importing the NixOS library,
+Outside the `nixpkgs` repository, you can use the `runNixOSTest` function from
+`pkgs.testers`:
```nix
-let nixos-lib = import (nixpkgs + "/nixos/lib") { };
+let pkgs = import {};
in
-nixos-lib.runTest {
+pkgs.testers.runNixOSTest {
imports = [ ./test.nix ];
- hostPkgs = pkgs; # the Nixpkgs package set used outside the VMs
defaults.services.foo.package = mypkg;
}
```
-`runTest` returns a derivation that runs the test.
+`runNixOSTest` returns a derivation that runs the test.
## Configuring the nodes {#sec-nixos-test-nodes}
diff --git a/nixos/doc/manual/installation/installing-from-other-distro.section.md b/nixos/doc/manual/installation/installing-from-other-distro.section.md
index 2d9818e6805c..0b8dbd78c392 100644
--- a/nixos/doc/manual/installation/installing-from-other-distro.section.md
+++ b/nixos/doc/manual/installation/installing-from-other-distro.section.md
@@ -247,7 +247,7 @@ The first steps to all these are the same:
```ShellSession
$ sudo mv -v /boot /boot.bak &&
- sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot
+ sudo /nix/var/nix/profiles/system/bin/apply boot
```
Cross your fingers, reboot, hopefully you should get a NixOS prompt!
diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 2bdd389a03be..ef58f0c682a3 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -54,6 +54,16 @@
If you experience any issues, please report them.
The original Perl script is deprecated and is planned for removal in the 25.05 release. It will remain accessible until then by setting `system.switch.enableNg` to `false`.
+- Built NixOS configurations now have a `$toplevel/bin/apply` script.
+ Unlike `switch-to-configuration`, it is capable of performing a complete `switch` operation.
+ If you call `switch-to-configuration` directly, you are recommended to use `apply` instead, and remove your call to `nix-env --profile /nix/var/nix/profiles/system --set $toplevel` or similar.
+ It will run the switch operation as a systemd unit if available, as `nixos-rebuild switch` would.
+
+ Benefits include:
+ - The `apply` script reduces the roundtrips required when performing a remote deployment with `nixos-rebuild switch --target-host HOST`.
+ - Developers and power users can now update NixOS in a single call.
+ - Alternative NixOS deployment methods have feature parity with `nixos-rebuild`, and NixOS can evolve all of its switching logic in one place.
+
- Support for mounting filesystems from block devices protected with [dm-verity](https://docs.kernel.org/admin-guide/device-mapper/verity.html)
was added through the `boot.initrd.systemd.dmVerity` option.
@@ -321,10 +331,23 @@
- The method to safely handle secrets in the `networking.wireless` module has been changed to benefit from a [new feature](https://w1.fi/cgit/hostap/commit/?id=e680a51e94a33591f61edb210926bcb71217a21a) of wpa_supplicant.
The syntax to refer to secrets has changed slightly and the option `networking.wireless.environmentFile` has been replaced by `networking.wireless.secretsFile`; see the description of the latter for how to upgrade.
+- NetBox was updated to `>= 4.1.0`.
+ Have a look at the breaking changes
+ of the [4.0 release](https://github.com/netbox-community/netbox/releases/tag/v4.0.0)
+ and the [4.1 release](https://github.com/netbox-community/netbox/releases/tag/v4.1.0),
+ make the required changes to your database, if needed,
+ then upgrade by setting `services.netbox.package = pkgs.netbox_4_1;`
+ in your configuration.
+
- `services.cgit` now runs as the cgit user by default instead of root.
This change requires granting access to the repositories to this user or
setting the appropriate one through `services.cgit.some-instance.user`.
+- `gradle_6` was removed due to being [unsupported upstream as of 10 Feb 2023](https://endoflife.date/gradle).
+ Additionally, it had numerous security vulnerabilities that were only patched
+ in later versions, such as [CVE-2021-29429](https://nvd.nist.gov/vuln/detail/CVE-2021-32751),
+ [CVE-2021-29427](https://nvd.nist.gov/vuln/detail/CVE-2021-29427), [CVE-2021-29428](https://nvd.nist.gov/vuln/detail/CVE-2021-29428), and [CVE-2021-32751](https://nvd.nist.gov/vuln/detail/CVE-2021-32751).
+
- `nvimpager` was updated to version 0.13.0, which changes the order of user and
nvimpager settings: user commands in `-c` and `--cmd` now override the
respective default settings because they are executed later.
@@ -385,6 +408,8 @@
`nodePackages.coc-eslint` and `vimPlugins.coc-eslint` packages offer comparable
features for `eslint`, which replaced `tslint`.
+- Tcl packages have been moved into the `tclPackages` scope.
+
- `teleport` has been upgraded from major version 15 to major version 16.
Refer to upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/)
and [release notes for v16](https://goteleport.com/docs/changelog/#1600-061324).
@@ -553,8 +578,17 @@
- The `services.prometheus.exporters.minio` option has been removed, as it's upstream implementation was broken and unmaintained.
Minio now has built-in [Prometheus metrics exposure](https://min.io/docs/minio/linux/operations/monitoring/collect-minio-metrics-using-prometheus.html), which can be used instead.
+- The `services.prometheus.exporters.tor` option has been removed, as its upstream implementation was broken and unmaintained.
+
- The `services.patroni.raft` option has been removed, as Raft has been [deprecated by upstream since 3.0.0](https://github.com/patroni/patroni/blob/master/docs/releases.rst#version-300)
+- The `jd-cli` package was removed due to an inactive upstream and a dependency on the shut down
+ JCenter JAR repository.
+ Java decompilers already packaged in Nixpkgs include `bytecode-viewer` (GUI), `cfr` (CLI), and `procyon` (CLI).
+
+- The `jd-gui` package was removed due to an inactive upstream and a dependency on the end-of-life Gradle 6.
+ Java decompilers already packaged in Nixpkgs include `bytecode-viewer` (GUI), `cfr` (CLI), and `procyon` (CLI).
+
- `services.roundcube.maxAttachmentSize` will multiply the value set with `1.37` to offset overhead introduced by the base64 encoding applied to attachments.
- The `services.mxisd` module has been removed as both [mxisd](https://github.com/kamax-matrix/mxisd) and [ma1sd](https://github.com/ma1uta/ma1sd) are not maintained any longer.
@@ -747,6 +781,8 @@
- The arguments from [](#opt-services.postgresql.initdbArgs) now get shell-escaped.
+- Mattermost has been updated from 9.5 to 9.11 ESR. See the [changelog](https://docs.mattermost.com/about/mattermost-v9-changelog.html#release-v9-11-extended-support-release) for more details.
+
- `cargo-tauri.hook` was introduced to help users build [Tauri](https://tauri.app/) projects. It is meant to be used alongside
`rustPlatform.buildRustPackage` and Node hooks such as `npmConfigHook`, `pnpm.configHook`, and the new `yarnConfig`
diff --git a/nixos/lib/testing/nixos-test-base.nix b/nixos/lib/testing/nixos-test-base.nix
index c8b15a0ecce4..3793fd5b9819 100644
--- a/nixos/lib/testing/nixos-test-base.nix
+++ b/nixos/lib/testing/nixos-test-base.nix
@@ -23,7 +23,7 @@ in
};
}
({ config, ... }: {
- # Don't pull in switch-to-configuration by default, except when specialisations or early boot shenanigans are involved.
+ # Don't pull in apply and switch-to-configuration by default, except when specialisations or early boot shenanigans are involved.
# This is mostly a Hydra optimization, so we don't rebuild all the tests every time switch-to-configuration-ng changes.
key = "no-switch-to-configuration";
system.switch.enable = mkDefault (config.isSpecialisation || config.specialisation != {} || config.virtualisation.installBootLoader);
diff --git a/nixos/lib/testing/nodes.nix b/nixos/lib/testing/nodes.nix
index 8b14d0a3bffd..4c528609fb4e 100644
--- a/nixos/lib/testing/nodes.nix
+++ b/nixos/lib/testing/nodes.nix
@@ -13,7 +13,7 @@ let
types
;
- inherit (hostPkgs) hostPlatform;
+ inherit (hostPkgs.stdenv) hostPlatform;
guestSystem =
if hostPlatform.isLinux
diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index 1b3724bfc170..e08cf572f7f9 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -1,24 +1,47 @@
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
let
- inherit (lib) mkOption optionalString types versionAtLeast;
+ inherit (lib)
+ mkOption
+ optionalString
+ types
+ versionAtLeast
+ ;
inherit (lib.options) literalExpression;
cfg = config.amazonImage;
amiBootMode = if config.ec2.efi then "uefi" else "legacy-bios";
-
-in {
-
- imports = [ ../../../modules/virtualisation/amazon-image.nix ];
+in
+{
+ imports = [
+ ../../../modules/virtualisation/amazon-image.nix
+ ../../../modules/virtualisation/disk-size-option.nix
+ (lib.mkRenamedOptionModuleWith {
+ sinceRelease = 2411;
+ from = [
+ "amazonImage"
+ "sizeMB"
+ ];
+ to = [
+ "virtualisation"
+ "diskSize"
+ ];
+ })
+ ];
# Amazon recommends setting this to the highest possible value for a good EBS
# experience, which prior to 4.15 was 255.
# https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html#timeout-nvme-ebs-volumes
config.boot.kernelParams =
- let timeout =
- if versionAtLeast config.boot.kernelPackages.kernel.version "4.15"
- then "4294967295"
- else "255";
- in [ "nvme_core.io_timeout=${timeout}" ];
+ let
+ timeout =
+ if versionAtLeast config.boot.kernelPackages.kernel.version "4.15" then "4294967295" else "255";
+ in
+ [ "nvme_core.io_timeout=${timeout}" ];
options.amazonImage = {
name = mkOption {
@@ -34,30 +57,32 @@ in {
}
]
'';
- default = [];
+ default = [ ];
description = ''
This option lists files to be copied to fixed locations in the
generated image. Glob patterns work.
'';
};
- sizeMB = mkOption {
- type = with types; either (enum [ "auto" ]) int;
- default = 3072;
- example = 8192;
- description = "The size in MB of the image";
- };
-
format = mkOption {
- type = types.enum [ "raw" "qcow2" "vpc" ];
+ type = types.enum [
+ "raw"
+ "qcow2"
+ "vpc"
+ ];
default = "vpc";
description = "The image format to output";
};
};
- config.system.build.amazonImage = let
- configFile = pkgs.writeText "configuration.nix"
- ''
+ # Use a priority just below mkOptionDefault (1500) instead of lib.mkDefault
+ # to avoid breaking existing configs using that.
+ config.virtualisation.diskSize = lib.mkOverride 1490 (3 * 1024);
+ config.virtualisation.diskSizeAutoSupported = !config.ec2.zfs.enable;
+
+ config.system.build.amazonImage =
+ let
+ configFile = pkgs.writeText "configuration.nix" ''
{ modulesPath, ... }: {
imports = [ "''${modulesPath}/virtualisation/amazon-image.nix" ];
${optionalString config.ec2.efi ''
@@ -70,91 +95,102 @@ in {
}
'';
- zfsBuilder = import ../../../lib/make-multi-disk-zfs-image.nix {
- inherit lib config configFile pkgs;
- inherit (cfg) contents format name;
+ zfsBuilder = import ../../../lib/make-multi-disk-zfs-image.nix {
+ inherit
+ lib
+ config
+ configFile
+ pkgs
+ ;
+ inherit (cfg) contents format name;
- includeChannel = true;
+ includeChannel = true;
- bootSize = 1000; # 1G is the minimum EBS volume
+ bootSize = 1000; # 1G is the minimum EBS volume
- rootSize = cfg.sizeMB;
- rootPoolProperties = {
- ashift = 12;
- autoexpand = "on";
+ rootSize = config.virtualisation.diskSize;
+ rootPoolProperties = {
+ ashift = 12;
+ autoexpand = "on";
+ };
+
+ datasets = config.ec2.zfs.datasets;
+
+ postVM = ''
+ extension=''${rootDiskImage##*.}
+ friendlyName=$out/${cfg.name}
+ rootDisk="$friendlyName.root.$extension"
+ bootDisk="$friendlyName.boot.$extension"
+ mv "$rootDiskImage" "$rootDisk"
+ mv "$bootDiskImage" "$bootDisk"
+
+ mkdir -p $out/nix-support
+ echo "file ${cfg.format} $bootDisk" >> $out/nix-support/hydra-build-products
+ echo "file ${cfg.format} $rootDisk" >> $out/nix-support/hydra-build-products
+
+ ${pkgs.jq}/bin/jq -n \
+ --arg system_label ${lib.escapeShellArg config.system.nixos.label} \
+ --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \
+ --arg root_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \
+ --arg boot_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \
+ --arg boot_mode "${amiBootMode}" \
+ --arg root "$rootDisk" \
+ --arg boot "$bootDisk" \
+ '{}
+ | .label = $system_label
+ | .boot_mode = $boot_mode
+ | .system = $system
+ | .disks.boot.logical_bytes = $boot_logical_bytes
+ | .disks.boot.file = $boot
+ | .disks.root.logical_bytes = $root_logical_bytes
+ | .disks.root.file = $root
+ ' > $out/nix-support/image-info.json
+ '';
};
- datasets = config.ec2.zfs.datasets;
+ extBuilder = import ../../../lib/make-disk-image.nix {
+ inherit
+ lib
+ config
+ configFile
+ pkgs
+ ;
- postVM = ''
- extension=''${rootDiskImage##*.}
- friendlyName=$out/${cfg.name}
- rootDisk="$friendlyName.root.$extension"
- bootDisk="$friendlyName.boot.$extension"
- mv "$rootDiskImage" "$rootDisk"
- mv "$bootDiskImage" "$bootDisk"
+ inherit (cfg) contents format name;
- mkdir -p $out/nix-support
- echo "file ${cfg.format} $bootDisk" >> $out/nix-support/hydra-build-products
- echo "file ${cfg.format} $rootDisk" >> $out/nix-support/hydra-build-products
+ fsType = "ext4";
+ partitionTableType = if config.ec2.efi then "efi" else "legacy+gpt";
- ${pkgs.jq}/bin/jq -n \
- --arg system_label ${lib.escapeShellArg config.system.nixos.label} \
- --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \
- --arg root_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \
- --arg boot_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \
- --arg boot_mode "${amiBootMode}" \
- --arg root "$rootDisk" \
- --arg boot "$bootDisk" \
- '{}
- | .label = $system_label
- | .boot_mode = $boot_mode
- | .system = $system
- | .disks.boot.logical_bytes = $boot_logical_bytes
- | .disks.boot.file = $boot
- | .disks.root.logical_bytes = $root_logical_bytes
- | .disks.root.file = $root
- ' > $out/nix-support/image-info.json
- '';
- };
+ inherit (config.virtualisation) diskSize;
- extBuilder = import ../../../lib/make-disk-image.nix {
- inherit lib config configFile pkgs;
+ postVM = ''
+ extension=''${diskImage##*.}
+ friendlyName=$out/${cfg.name}.$extension
+ mv "$diskImage" "$friendlyName"
+ diskImage=$friendlyName
- inherit (cfg) contents format name;
+ mkdir -p $out/nix-support
+ echo "file ${cfg.format} $diskImage" >> $out/nix-support/hydra-build-products
- fsType = "ext4";
- partitionTableType = if config.ec2.efi then "efi" else "legacy+gpt";
-
- diskSize = cfg.sizeMB;
-
- postVM = ''
- extension=''${diskImage##*.}
- friendlyName=$out/${cfg.name}.$extension
- mv "$diskImage" "$friendlyName"
- diskImage=$friendlyName
-
- mkdir -p $out/nix-support
- echo "file ${cfg.format} $diskImage" >> $out/nix-support/hydra-build-products
-
- ${pkgs.jq}/bin/jq -n \
- --arg system_label ${lib.escapeShellArg config.system.nixos.label} \
- --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \
- --arg logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \
- --arg boot_mode "${amiBootMode}" \
- --arg file "$diskImage" \
- '{}
- | .label = $system_label
- | .boot_mode = $boot_mode
- | .system = $system
- | .logical_bytes = $logical_bytes
- | .file = $file
- | .disks.root.logical_bytes = $logical_bytes
- | .disks.root.file = $file
- ' > $out/nix-support/image-info.json
- '';
- };
- in if config.ec2.zfs.enable then zfsBuilder else extBuilder;
+ ${pkgs.jq}/bin/jq -n \
+ --arg system_label ${lib.escapeShellArg config.system.nixos.label} \
+ --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \
+ --arg logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \
+ --arg boot_mode "${amiBootMode}" \
+ --arg file "$diskImage" \
+ '{}
+ | .label = $system_label
+ | .boot_mode = $boot_mode
+ | .system = $system
+ | .logical_bytes = $logical_bytes
+ | .file = $file
+ | .disks.root.logical_bytes = $logical_bytes
+ | .disks.root.file = $file
+ ' > $out/nix-support/image-info.json
+ '';
+ };
+ in
+ if config.ec2.zfs.enable then zfsBuilder else extBuilder;
meta.maintainers = with lib.maintainers; [ arianvp ];
}
diff --git a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix
index 9799f333aec0..57022bd2f784 100644
--- a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix
+++ b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix
@@ -1,6 +1,11 @@
# nix-build '' -A config.system.build.openstackImage --arg configuration "{ imports = [ ./nixos/maintainers/scripts/openstack/openstack-image.nix ]; }"
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
let
inherit (lib) mkOption types;
copyChannel = true;
@@ -10,9 +15,20 @@ in
{
imports = [
../../../modules/virtualisation/openstack-config.nix
+ ../../../modules/virtualisation/disk-size-option.nix
+ (lib.mkRenamedOptionModuleWith {
+ sinceRelease = 2411;
+ from = [
+ "openstackImage"
+ "sizeMB"
+ ];
+ to = [
+ "virtualisation"
+ "diskSize"
+ ];
+ })
] ++ (lib.optional copyChannel ../../../modules/installer/cd-dvd/channel.nix);
-
options.openstackImage = {
name = mkOption {
type = types.str;
@@ -22,18 +38,15 @@ in
ramMB = mkOption {
type = types.int;
- default = 1024;
+ default = (3 * 1024);
description = "RAM allocation for build VM";
};
- sizeMB = mkOption {
- type = types.int;
- default = 8192;
- description = "The size in MB of the image";
- };
-
format = mkOption {
- type = types.enum [ "raw" "qcow2" ];
+ type = types.enum [
+ "raw"
+ "qcow2"
+ ];
default = "qcow2";
description = "The image format to output";
};
@@ -54,24 +67,28 @@ in
};
};
+ # Use a priority just below mkOptionDefault (1500) instead of lib.mkDefault
+ # to avoid breaking existing configs using that.
+ virtualisation.diskSize = lib.mkOverride 1490 (8 * 1024);
+ virtualisation.diskSizeAutoSupported = false;
+
system.build.openstackImage = import ../../../lib/make-single-disk-zfs-image.nix {
inherit lib config;
inherit (cfg) contents format name;
pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
- configFile = pkgs.writeText "configuration.nix"
- ''
- { modulesPath, ... }: {
- imports = [ "''${modulesPath}/virtualisation/openstack-config.nix" ];
- openstack.zfs.enable = true;
- }
- '';
+ configFile = pkgs.writeText "configuration.nix" ''
+ { modulesPath, ... }: {
+ imports = [ "''${modulesPath}/virtualisation/openstack-config.nix" ];
+ openstack.zfs.enable = true;
+ }
+ '';
includeChannel = copyChannel;
bootSize = 1000;
memSize = cfg.ramMB;
- rootSize = cfg.sizeMB;
+ rootSize = config.virtualisation.diskSize;
rootPoolProperties = {
ashift = 12;
autoexpand = "on";
diff --git a/nixos/modules/config/resolvconf.nix b/nixos/modules/config/resolvconf.nix
index f6241e9bf96b..70ee02421cc3 100644
--- a/nixos/modules/config/resolvconf.nix
+++ b/nixos/modules/config/resolvconf.nix
@@ -161,9 +161,12 @@ in
script = ''
${lib.getExe cfg.package} -u
- files=(/run/resolvconf ${lib.escapeShellArgs cfg.subscriberFiles})
- chgrp -R resolvconf "''${files[@]}"
- chmod -R g=u "''${files[@]}"
+ chgrp resolvconf ${lib.escapeShellArgs cfg.subscriberFiles}
+ chmod g=u ${lib.escapeShellArgs cfg.subscriberFiles}
+ ${lib.getExe' pkgs.acl "setfacl"} -R \
+ -m group:resolvconf:rwx \
+ -m default:group:resolvconf:rwx \
+ /run/resolvconf
'';
};
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 69646e550f1f..845f9fdaf68e 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -6,6 +6,7 @@ let
attrNames
attrValues
concatMap
+ concatMapStringsSep
concatStrings
elem
filter
@@ -13,6 +14,7 @@ let
flatten
flip
foldr
+ generators
getAttr
hasAttr
id
@@ -944,16 +946,18 @@ in {
warnings =
flip concatMap (attrValues cfg.users) (user: let
- unambiguousPasswordConfiguration = 1 >= length (filter (x: x != null) ([
- user.hashedPassword
- user.hashedPasswordFile
- user.password
+ passwordOptions = [
+ "hashedPassword"
+ "hashedPasswordFile"
+ "password"
] ++ optionals cfg.mutableUsers [
# For immutable users, initialHashedPassword is set to hashedPassword,
# so using these options would always trigger the assertion.
- user.initialHashedPassword
- user.initialPassword
- ]));
+ "initialHashedPassword"
+ "initialPassword"
+ ];
+ unambiguousPasswordConfiguration = 1 >= length
+ (filter (x: x != null) (map (flip getAttr user) passwordOptions));
in optional (!unambiguousPasswordConfiguration) ''
The user '${user.name}' has multiple of the options
`hashedPassword`, `password`, `hashedPasswordFile`, `initialPassword`
@@ -961,6 +965,13 @@ in {
The options silently discard others by the order of precedence
given above which can lead to surprising results. To resolve this warning,
set at most one of the options above to a non-`null` value.
+
+ The values of these options are:
+ ${concatMapStringsSep
+ "\n"
+ (value:
+ "* users.users.\"${user.name}\".${value}: ${generators.toPretty {} user.${value}}")
+ passwordOptions}
'')
++ filter (x: x != null) (
flip mapAttrsToList cfg.users (_: user:
diff --git a/nixos/modules/hardware/hackrf.nix b/nixos/modules/hardware/hackrf.nix
index 7f03b765bbda..467fd71ff1b0 100644
--- a/nixos/modules/hardware/hackrf.nix
+++ b/nixos/modules/hardware/hackrf.nix
@@ -12,6 +12,7 @@ in
description = ''
Enables hackrf udev rules and ensures 'plugdev' group exists.
This is a prerequisite to using HackRF devices without being root, since HackRF USB descriptors will be owned by plugdev through udev.
+ Ensure your user is a member of the 'plugdev' group after enabling.
'';
};
};
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index ee7c3e8c887f..6e3e2eb475f3 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -106,11 +106,12 @@ let
# isNormalUser = true;
# extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
# packages = with pkgs; [
- # firefox
# tree
# ];
# };
+ # programs.firefox.enable = true;
+
# List packages installed in system profile. To search, run:
# \$ nix search wget
# environment.systemPackages = with pkgs; [
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index db917f73a064..5fe9b6c1c700 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -22,21 +22,26 @@ let
{
NAME = "${cfg.distroName}";
ID = "${cfg.distroId}";
+ ID_LIKE = optionalString (!isNixos) "nixos";
+ VENDOR_NAME = cfg.vendorName;
VERSION = "${cfg.release} (${cfg.codeName})";
VERSION_CODENAME = toLower cfg.codeName;
VERSION_ID = cfg.release;
BUILD_ID = cfg.version;
PRETTY_NAME = "${cfg.distroName} ${cfg.release} (${cfg.codeName})";
+ CPE_NAME = "cpe:/o:${cfg.vendorId}:${cfg.distroId}:${cfg.release}";
LOGO = "nix-snowflake";
HOME_URL = optionalString isNixos "https://nixos.org/";
+ VENDOR_URL = optionalString isNixos "https://nixos.org/";
DOCUMENTATION_URL = optionalString isNixos "https://nixos.org/learn.html";
SUPPORT_URL = optionalString isNixos "https://nixos.org/community.html";
BUG_REPORT_URL = optionalString isNixos "https://github.com/NixOS/nixpkgs/issues";
ANSI_COLOR = optionalString isNixos "1;34";
IMAGE_ID = optionalString (config.system.image.id != null) config.system.image.id;
IMAGE_VERSION = optionalString (config.system.image.version != null) config.system.image.version;
- } // lib.optionalAttrs (cfg.variant_id != null) {
- VARIANT_ID = cfg.variant_id;
+ VARIANT = optionalString (cfg.variantName != null) cfg.variantName;
+ VARIANT_ID = optionalString (cfg.variant_id != null) cfg.variant_id;
+ DEFAULT_HOSTNAME = config.networking.fqdnOrHostName;
};
initrdReleaseContents = (removeAttrs osReleaseContents [ "BUILD_ID" ]) // {
@@ -116,6 +121,27 @@ in
description = "A lower-case string identifying a specific variant or edition of the operating system";
example = "installer";
};
+
+ variantName = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = "A string identifying a specific variant or edition of the operating system suitable for presentation to the user";
+ example = "NixOS Installer Image";
+ };
+
+ vendorId = mkOption {
+ internal = true;
+ type = types.str;
+ default = "nixos";
+ description = "The id of the operating system vendor";
+ };
+
+ vendorName = mkOption {
+ internal = true;
+ type = types.str;
+ default = "NixOS";
+ description = "The name of the operating system vendor";
+ };
};
image = {
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 74f911f81f6a..d05bafae4a23 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -172,6 +172,7 @@
./programs/cpu-energy-meter.nix
./programs/command-not-found/command-not-found.nix
./programs/coolercontrol.nix
+ ./programs/corefreq.nix
./programs/criu.nix
./programs/darling.nix
./programs/dconf.nix
@@ -1549,6 +1550,7 @@
./services/web-servers/phpfpm/default.nix
./services/web-servers/pomerium.nix
./services/web-servers/rustus.nix
+ ./services/web-servers/send.nix
./services/web-servers/stargazer.nix
./services/web-servers/static-web-server.nix
./services/web-servers/tomcat.nix
diff --git a/nixos/modules/programs/_1password.nix b/nixos/modules/programs/_1password.nix
index 5dff199341b9..28ddb3b1a43e 100644
--- a/nixos/modules/programs/_1password.nix
+++ b/nixos/modules/programs/_1password.nix
@@ -17,7 +17,7 @@ in
enable = lib.mkEnableOption "the 1Password CLI tool";
package = lib.mkPackageOption pkgs "1Password CLI" {
- default = [ "_1password" ];
+ default = [ "_1password-cli" ];
};
};
};
diff --git a/nixos/modules/programs/corefreq.nix b/nixos/modules/programs/corefreq.nix
new file mode 100644
index 000000000000..c656b4a13da1
--- /dev/null
+++ b/nixos/modules/programs/corefreq.nix
@@ -0,0 +1,42 @@
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
+
+let
+ cfg = config.programs.corefreq;
+ kernelPackages = config.boot.kernelPackages;
+in
+{
+ options = {
+ programs.corefreq = {
+ enable = lib.mkEnableOption "Whether to enable the corefreq daemon and kernel module";
+
+ package = lib.mkOption {
+ type = lib.types.package;
+ default = kernelPackages.corefreq;
+ defaultText = lib.literalExpression "config.boot.kernelPackages.corefreq";
+ description = ''
+ The corefreq package to use.
+ '';
+ };
+ };
+ };
+
+ config = lib.mkIf cfg.enable {
+ environment.systemPackages = [ cfg.package ];
+ boot.extraModulePackages = [ cfg.package ];
+ boot.kernelModules = [ "corefreqk" ];
+
+ # Create a systemd service for the corefreq daemon
+ systemd.services.corefreq = {
+ description = "CoreFreq daemon";
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ ExecStart = lib.getExe' cfg.package "corefreqd";
+ };
+ };
+ };
+}
diff --git a/nixos/modules/programs/nix-ld.nix b/nixos/modules/programs/nix-ld.nix
index 770cccd13b50..edfe7f1f6a3e 100644
--- a/nixos/modules/programs/nix-ld.nix
+++ b/nixos/modules/programs/nix-ld.nix
@@ -34,7 +34,7 @@ in
environment.pathsToLink = [ "/share/nix-ld" ];
- environment.variables = {
+ environment.sessionVariables = {
NIX_LD = "/run/current-system/sw/share/nix-ld/lib/ld.so";
NIX_LD_LIBRARY_PATH = "/run/current-system/sw/share/nix-ld/lib";
};
diff --git a/nixos/modules/programs/wayland/sway.nix b/nixos/modules/programs/wayland/sway.nix
index 1fae6b120074..74fc216569e5 100644
--- a/nixos/modules/programs/wayland/sway.nix
+++ b/nixos/modules/programs/wayland/sway.nix
@@ -85,9 +85,10 @@ in
extraPackages = lib.mkOption {
type = with lib.types; listOf package;
- default = with pkgs; [ swaylock swayidle foot dmenu wmenu ];
+ # Packages used in default config
+ default = with pkgs; [ brightnessctl foot grim pulseaudio swayidle swaylock wmenu ];
defaultText = lib.literalExpression ''
- with pkgs; [ swaylock swayidle foot dmenu wmenu ];
+ with pkgs; [ brightnessctl foot grim pulseaudio swayidle swaylock wmenu ];
'';
example = lib.literalExpression ''
with pkgs; [ i3status i3status-rust termite rofi light ]
diff --git a/nixos/modules/programs/wayland/uwsm.nix b/nixos/modules/programs/wayland/uwsm.nix
index 5497cc269ebe..18e7fdc1f64a 100644
--- a/nixos/modules/programs/wayland/uwsm.nix
+++ b/nixos/modules/programs/wayland/uwsm.nix
@@ -108,18 +108,19 @@ in
systemd.packages = [ cfg.package ];
environment.pathsToLink = [ "/share/uwsm" ];
- services.graphical-desktop.enable = true;
-
# UWSM recommends dbus broker for better compatibility
services.dbus.implementation = "broker";
- services.displayManager.sessionPackages = lib.mapAttrsToList (
- name: value:
- mk_uwsm_desktop_entry {
- inherit name;
- inherit (value) prettyName comment binPath;
- }
- ) cfg.waylandCompositors;
+ services.displayManager = {
+ enable = true;
+ sessionPackages = lib.mapAttrsToList (
+ name: value:
+ mk_uwsm_desktop_entry {
+ inherit name;
+ inherit (value) prettyName comment binPath;
+ }
+ ) cfg.waylandCompositors;
+ };
};
meta.maintainers = with lib.maintainers; [
diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix
index 2120cf1af07e..f1ed26ddb569 100644
--- a/nixos/modules/programs/zsh/oh-my-zsh.nix
+++ b/nixos/modules/programs/zsh/oh-my-zsh.nix
@@ -87,6 +87,15 @@ in
Without this option it would default to the read-only nix store.
'';
};
+
+ preLoaded = lib.mkOption {
+ type = lib.types.lines;
+ default = "";
+ description = ''
+ Shell commands executed before the `oh-my-zsh` is loaded.
+ For example, to disable async git prompt write `zstyle ':omz:alpha:lib:git' async-prompt no` (more information https://github.com/ohmyzsh/ohmyzsh?tab=readme-ov-file#async-git-prompt)
+ '';
+ };
};
};
@@ -120,6 +129,7 @@ in
ZSH_CACHE_DIR=${cfg.cacheDir}
''}
+ ${cfg.preLoaded}
source $ZSH/oh-my-zsh.sh
'';
diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix
index 8aae6eb3f29b..76c1010f4199 100644
--- a/nixos/modules/security/ca.nix
+++ b/nixos/modules/security/ca.nix
@@ -24,7 +24,8 @@ in
internal = true;
};
- security.pki.useCompatibleBundle = mkEnableOption ''usage of a compatibility bundle.
+ security.pki.useCompatibleBundle = mkEnableOption ''
+ usage of a compatibility bundle.
Such a bundle consists exclusively of `BEGIN CERTIFICATE` and no `BEGIN TRUSTED CERTIFICATE`,
which is an OpenSSL specific PEM format.
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index b95e3e1c7ce2..3bfe921673ed 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -165,6 +165,10 @@ in
###### interface
options = {
+ security.enableWrappers = lib.mkEnableOption "SUID/SGID wrappers" // {
+ default = true;
+ };
+
security.wrappers = lib.mkOption {
type = lib.types.attrsOf wrapperType;
default = {};
@@ -227,7 +231,7 @@ in
};
###### implementation
- config = {
+ config = lib.mkIf config.security.enableWrappers {
assertions = lib.mapAttrsToList
(name: opts:
diff --git a/nixos/modules/services/audio/jack.nix b/nixos/modules/services/audio/jack.nix
index 7344fdf4a218..767f1add1cae 100644
--- a/nixos/modules/services/audio/jack.nix
+++ b/nixos/modules/services/audio/jack.nix
@@ -260,7 +260,7 @@ in {
systemd.services.jack-session = {
description = "JACK session";
script = ''
- jack_wait -w
+ ${pkgs.jack-example-tools}/bin/jack_wait -w
${cfg.jackd.session}
${lib.optionalString cfg.loopback.enable cfg.loopback.session}
'';
diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix
index 189aaf86dd2d..45d6b2428a46 100644
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@@ -330,12 +330,12 @@ in
ln -sf ${hydraConf} ${baseDir}/hydra.conf
- mkdir -m 0700 -p ${baseDir}/www
+ mkdir -m 0700 ${baseDir}/www || true
chown hydra-www:hydra ${baseDir}/www
- mkdir -m 0700 -p ${baseDir}/queue-runner
- mkdir -m 0750 -p ${baseDir}/build-logs
- mkdir -m 0750 -p ${baseDir}/runcommand-logs
+ mkdir -m 0700 ${baseDir}/queue-runner || true
+ mkdir -m 0750 ${baseDir}/build-logs || true
+ mkdir -m 0750 ${baseDir}/runcommand-logs || true
chown hydra-queue-runner:hydra \
${baseDir}/queue-runner \
${baseDir}/build-logs \
@@ -362,8 +362,8 @@ in
# Move legacy hydra-www roots.
if [ -e /nix/var/nix/gcroots/per-user/hydra-www/hydra-roots ]; then
- find /nix/var/nix/gcroots/per-user/hydra-www/hydra-roots/ -type f \
- | xargs -r mv -f -t ${cfg.gcRootsDir}/
+ find /nix/var/nix/gcroots/per-user/hydra-www/hydra-roots/ -type f -print0 \
+ | xargs -0 -r mv -f -t ${cfg.gcRootsDir}/
rmdir /nix/var/nix/gcroots/per-user/hydra-www/hydra-roots
fi
@@ -520,7 +520,7 @@ in
elif [[ $compression == zstd ]]; then
compression="zstd --rm"
fi
- find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c | xargs -r "$compression" --force --quiet
+ find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c -print0 | xargs -0 -r "$compression" --force --quiet
'';
startAt = "Sun 01:45";
serviceConfig.Slice = "system-hydra.slice";
diff --git a/nixos/modules/services/hardware/monado.nix b/nixos/modules/services/hardware/monado.nix
index 9f9c6c39a0b4..9140683df34c 100644
--- a/nixos/modules/services/hardware/monado.nix
+++ b/nixos/modules/services/hardware/monado.nix
@@ -93,6 +93,8 @@ in
environment.systemPackages = [ cfg.package ];
environment.pathsToLink = [ "/share/openxr" ];
+ hardware.opengl.extraPackages = [ pkgs.monado-vulkan-layers ];
+
environment.etc."xdg/openxr/1/active_runtime.json" = mkIf cfg.defaultRuntime {
source = "${cfg.package}/share/openxr/1/openxr_monado.json";
};
diff --git a/nixos/modules/services/misc/anki-sync-server.md b/nixos/modules/services/misc/anki-sync-server.md
index 4796abf25c43..1210cad6d0af 100644
--- a/nixos/modules/services/misc/anki-sync-server.md
+++ b/nixos/modules/services/misc/anki-sync-server.md
@@ -42,6 +42,15 @@ Here, `passwordFile` is the path to a file containing just the password in
plaintext. Make sure to set permissions to make this file unreadable to any
user besides root.
+By default, synced data are stored in */var/lib/anki-sync-server/*ankiuser**.
+You can change the directory by using `services.anki-sync-server.baseDirectory`
+
+```nix
+{
+ services.anki-sync-server.baseDirectory = "/home/anki/data";
+}
+```
+
By default, the server listen address {option}`services.anki-sync-server.host`
is set to localhost, listening on port
{option}`services.anki-sync-server.port`, and does not open the firewall. This
diff --git a/nixos/modules/services/misc/anki-sync-server.nix b/nixos/modules/services/misc/anki-sync-server.nix
index a65382009417..c77afe8c3819 100644
--- a/nixos/modules/services/misc/anki-sync-server.nix
+++ b/nixos/modules/services/misc/anki-sync-server.nix
@@ -59,6 +59,13 @@ in {
description = "Port number anki-sync-server listens to.";
};
+ baseDirectory = mkOption {
+ type = types.str;
+ default = "%S/%N";
+ description = "Base directory where user(s) synchronized data will be stored.";
+ };
+
+
openFirewall = mkOption {
default = false;
type = types.bool;
@@ -114,7 +121,7 @@ in {
wantedBy = ["multi-user.target"];
path = [cfg.package];
environment = {
- SYNC_BASE = "%S/%N";
+ SYNC_BASE = cfg.baseDirectory;
SYNC_HOST = specEscape cfg.address;
SYNC_PORT = toString cfg.port;
};
diff --git a/nixos/modules/services/misc/bazarr.nix b/nixos/modules/services/misc/bazarr.nix
index 35929beac402..30924da936b8 100644
--- a/nixos/modules/services/misc/bazarr.nix
+++ b/nixos/modules/services/misc/bazarr.nix
@@ -54,6 +54,8 @@ in
--no-update True
'';
Restart = "on-failure";
+ KillSignal = "SIGINT";
+ SuccessExitStatus = "0 156";
};
};
diff --git a/nixos/modules/services/misc/calibre-server.nix b/nixos/modules/services/misc/calibre-server.nix
index 5fa3c11a48aa..160a1c1e53c4 100644
--- a/nixos/modules/services/misc/calibre-server.nix
+++ b/nixos/modules/services/misc/calibre-server.nix
@@ -12,7 +12,7 @@ let
"--port" = cfg.port;
"--auth-mode" = cfg.auth.mode;
"--userdb" = cfg.auth.userDb;
- }) ++ [(lib.optionalString (cfg.auth.enable == true) "--enable-auth")])
+ }) ++ [ (lib.optionalString (cfg.auth.enable == true) "--enable-auth") ] ++ cfg.extraFlags)
);
in
@@ -42,6 +42,15 @@ in
'';
};
+ extraFlags = lib.mkOption {
+ type = lib.types.listOf lib.types.str;
+ default = [ ];
+ description = ''
+ Extra flags to pass to the calibre-server command.
+ See the [calibre-server documentation](${generatedDocumentationLink}) for details.
+ '';
+ };
+
user = lib.mkOption {
type = lib.types.str;
default = "calibre-server";
@@ -73,6 +82,13 @@ in
'';
};
+ openFirewall = lib.mkOption {
+ type = lib.types.bool;
+ default = false;
+ description =
+ "Open ports in the firewall for the Calibre Server web interface.";
+ };
+
auth = {
enable = lib.mkOption {
type = lib.types.bool;
@@ -137,6 +153,9 @@ in
};
};
+ networking.firewall =
+ lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; };
+
};
meta.maintainers = with lib.maintainers; [ gaelreyrol ];
diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
index 619fbcf92308..1869822a07f3 100644
--- a/nixos/modules/services/misc/disnix.nix
+++ b/nixos/modules/services/misc/disnix.nix
@@ -40,7 +40,7 @@ in
###### implementation
config = lib.mkIf cfg.enable {
- dysnomia.enable = true;
+ services.dysnomia.enable = true;
environment.systemPackages = [ pkgs.disnix ] ++ lib.optional cfg.useWebServiceInterface pkgs.DisnixWebService;
environment.variables.PATH = lib.optionals cfg.enableProfilePath (map (profileName: "/nix/var/nix/profiles/disnix/${profileName}/bin" ) cfg.profiles);
@@ -74,7 +74,7 @@ in
restartIfChanged = false;
- path = [ config.nix.package cfg.package config.dysnomia.package "/run/current-system/sw" ];
+ path = [ config.nix.package cfg.package config.services.dysnomia.package "/run/current-system/sw" ];
environment = {
HOME = "/root";
diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix
index 9f421d7ec375..36b6293843c4 100644
--- a/nixos/modules/services/misc/dysnomia.nix
+++ b/nixos/modules/services/misc/dysnomia.nix
@@ -1,6 +1,6 @@
{pkgs, lib, config, ...}:
let
- cfg = config.dysnomia;
+ cfg = config.services.dysnomia;
printProperties = properties:
lib.concatMapStrings (propertyName:
@@ -79,7 +79,7 @@ let
in
{
options = {
- dysnomia = {
+ services.dysnomia = {
enable = lib.mkOption {
type = lib.types.bool;
@@ -142,6 +142,10 @@ in
};
};
+ imports = [
+ (lib.mkRenamedOptionModule ["dysnomia"] ["services" "dysnomia"])
+ ];
+
config = lib.mkIf cfg.enable {
environment.etc = {
@@ -164,7 +168,7 @@ in
environment.systemPackages = [ cfg.package ];
- dysnomia.package = pkgs.dysnomia.override (origArgs: dysnomiaFlags // lib.optionalAttrs (cfg.enableLegacyModules) {
+ services.dysnomia.package = pkgs.dysnomia.override (origArgs: dysnomiaFlags // lib.optionalAttrs (cfg.enableLegacyModules) {
enableLegacy = builtins.trace ''
WARNING: Dysnomia has been configured to use the legacy 'process' and 'wrapper'
modules for compatibility reasons! If you rely on these modules, consider
@@ -181,7 +185,7 @@ in
'' true;
});
- dysnomia.properties = {
+ services.dysnomia.properties = {
hostname = config.networking.hostName;
inherit (pkgs.stdenv.hostPlatform) system;
@@ -208,7 +212,7 @@ in
++ lib.optional (dysnomiaFlags.enableSubversionRepository) "subversion-repository";
};
- dysnomia.containers = lib.recursiveUpdate ({
+ services.dysnomia.containers = lib.recursiveUpdate ({
process = {};
wrapper = {};
}
diff --git a/nixos/modules/services/misc/klipper.nix b/nixos/modules/services/misc/klipper.nix
index f0972f8caff4..d9eef161eb72 100644
--- a/nixos/modules/services/misc/klipper.nix
+++ b/nixos/modules/services/misc/klipper.nix
@@ -113,6 +113,7 @@ in
'';
serial = lib.mkOption {
type = lib.types.nullOr path;
+ default = null;
description = "Path to serial port this printer is connected to. Leave `null` to derive it from `service.klipper.settings`.";
};
configFile = lib.mkOption {
diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix
index 42b2926a7a1e..d8e4c9c302b3 100644
--- a/nixos/modules/services/misc/octoprint.nix
+++ b/nixos/modules/services/misc/octoprint.nix
@@ -5,10 +5,9 @@ let
baseConfig = {
plugins.curalegacy.cura_engine = "${pkgs.curaengine_stable}/bin/CuraEngine";
- server.host = cfg.host;
server.port = cfg.port;
webcam.ffmpeg = "${pkgs.ffmpeg.bin}/bin/ffmpeg";
- };
+ } // lib.optionalAttrs (cfg.host != null) {server.host = cfg.host;};
fullConfig = lib.recursiveUpdate cfg.extraConfig baseConfig;
@@ -29,8 +28,8 @@ in
enable = lib.mkEnableOption "OctoPrint, web interface for 3D printers";
host = lib.mkOption {
- type = lib.types.str;
- default = "0.0.0.0";
+ type = lib.types.nullOr lib.types.str;
+ default = null;
description = ''
Host to bind OctoPrint to.
'';
diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix
index 73f09d804f29..988d54d65695 100644
--- a/nixos/modules/services/misc/paperless.nix
+++ b/nixos/modules/services/misc/paperless.nix
@@ -290,11 +290,12 @@ in
''
+ optionalString (cfg.passwordFile != null) ''
export PAPERLESS_ADMIN_USER="''${PAPERLESS_ADMIN_USER:-admin}"
- export PAPERLESS_ADMIN_PASSWORD=$(cat $CREDENTIALS_DIRECTORY/PAPERLESS_ADMIN_PASSWORD)
+ PAPERLESS_ADMIN_PASSWORD=$(cat "$CREDENTIALS_DIRECTORY/PAPERLESS_ADMIN_PASSWORD")
+ export PAPERLESS_ADMIN_PASSWORD
superuserState="$PAPERLESS_ADMIN_USER:$PAPERLESS_ADMIN_PASSWORD"
superuserStateFile="${cfg.dataDir}/superuser-state"
- if [[ $(cat "$superuserStateFile" 2>/dev/null) != $superuserState ]]; then
+ if [[ $(cat "$superuserStateFile" 2>/dev/null) != "$superuserState" ]]; then
${cfg.package}/bin/paperless-ngx manage_superuser
echo "$superuserState" > "$superuserStateFile"
fi
@@ -353,7 +354,8 @@ in
tr -dc A-Za-z0-9 < /dev/urandom | head -c64 | ${pkgs.moreutils}/bin/sponge '${secretKeyFile}'
)
fi
- export PAPERLESS_SECRET_KEY=$(cat '${secretKeyFile}')
+ PAPERLESS_SECRET_KEY="$(cat '${secretKeyFile}')"
+ export PAPERLESS_SECRET_KEY
if [[ ! $PAPERLESS_SECRET_KEY ]]; then
echo "PAPERLESS_SECRET_KEY is empty, refusing to start."
exit 1
diff --git a/nixos/modules/services/monitoring/nezha-agent.nix b/nixos/modules/services/monitoring/nezha-agent.nix
index 6b8d0f58177e..e51328e48795 100644
--- a/nixos/modules/services/monitoring/nezha-agent.nix
+++ b/nixos/modules/services/monitoring/nezha-agent.nix
@@ -92,6 +92,14 @@ in
Address to the dashboard
'';
};
+ extraFlags = lib.mkOption {
+ type = lib.types.listOf lib.types.str;
+ default = [ ];
+ example = [ "--gpu" ];
+ description = ''
+ Extra command-line flags passed to nezha-agent.
+ '';
+ };
};
};
@@ -125,6 +133,7 @@ in
++ lib.optional cfg.gpu "--gpu"
++ lib.optional cfg.temperature "--temperature"
++ lib.optional cfg.useIPv6CountryCode "--use-ipv6-countrycode"
+ ++ cfg.extraFlags
);
wantedBy = [ "multi-user.target" ];
};
diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix
index 4de80acfa9a8..d2b23bf17570 100644
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixos/modules/services/monitoring/prometheus/default.nix
@@ -201,6 +201,26 @@ let
};
};
+ promTypes.sigv4 = types.submodule {
+ options = {
+ region = mkOpt types.str ''
+ The AWS region.
+ '';
+ access_key = mkOpt types.str ''
+ The Access Key ID.
+ '';
+ secret_key = mkOpt types.str ''
+ The Secret Access Key.
+ '';
+ profile = mkOpt types.str ''
+ The named AWS profile used to authenticate.
+ '';
+ role_arn = mkOpt types.str ''
+ The AWS role ARN.
+ '';
+ };
+ };
+
promTypes.tls_config = types.submodule {
options = {
ca_file = mkOpt types.str ''
@@ -1464,6 +1484,9 @@ let
Sets the `Authorization` header on every remote write request with the bearer token
read from the configured file. It is mutually exclusive with `bearer_token`.
'';
+ sigv4 = mkOpt promTypes.sigv4 ''
+ Configures AWS Signature Version 4 settings.
+ '';
tls_config = mkOpt promTypes.tls_config ''
Configures the remote write request's TLS settings.
'';
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index cf840a2d4514..c388a7aa5558 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -88,7 +88,6 @@ let
"statsd"
"surfboard"
"systemd"
- "tor"
"unbound"
"unifi"
"unpoller"
@@ -299,6 +298,9 @@ in
The Minio exporter has been removed, as it was broken and unmaintained.
See the 24.11 release notes for more information.
'')
+ (lib.mkRemovedOptionModule [ "tor" ] ''
+ The Tor exporter has been removed, as it was broken and unmaintained.
+ '')
];
};
description = "Prometheus exporter configuration";
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/tor.nix b/nixos/modules/services/monitoring/prometheus/exporters/tor.nix
deleted file mode 100644
index d39112d0c283..000000000000
--- a/nixos/modules/services/monitoring/prometheus/exporters/tor.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ config, lib, pkgs, options, ... }:
-
-let
- cfg = config.services.prometheus.exporters.tor;
- inherit (lib) mkOption types concatStringsSep;
-in
-{
- port = 9130;
- extraOpts = {
- torControlAddress = mkOption {
- type = types.str;
- default = "127.0.0.1";
- description = ''
- Tor control IP address or hostname.
- '';
- };
-
- torControlPort = mkOption {
- type = types.port;
- default = 9051;
- description = ''
- Tor control port.
- '';
- };
- };
- serviceOpts = {
- serviceConfig = {
- ExecStart = ''
- ${pkgs.prometheus-tor-exporter}/bin/prometheus-tor-exporter \
- -b ${cfg.listenAddress} \
- -p ${toString cfg.port} \
- -a ${cfg.torControlAddress} \
- -c ${toString cfg.torControlPort} \
- ${concatStringsSep " \\\n " cfg.extraFlags}
- '';
- };
-
- # CPython requires a process to either have $HOME defined or run as a UID
- # defined in /etc/passwd. The latter is false with DynamicUser, so define a
- # dummy $HOME. https://bugs.python.org/issue10496
- environment = { HOME = "/var/empty"; };
- };
-}
diff --git a/nixos/modules/services/monitoring/rustdesk-server.nix b/nixos/modules/services/monitoring/rustdesk-server.nix
index e757d8fdf054..10495ee0618d 100644
--- a/nixos/modules/services/monitoring/rustdesk-server.nix
+++ b/nixos/modules/services/monitoring/rustdesk-server.nix
@@ -3,6 +3,12 @@ let
TCPPorts = [21115 21116 21117 21118 21119];
UDPPorts = [21116];
in {
+ imports = [
+ (lib.mkRemovedOptionModule [ "services" "rustdesk-server" "relayIP" ] "This option has been replaced by services.rustdesk-server.signal.relayHosts")
+ (lib.mkRenamedOptionModule [ "services" "rustdesk-server" "extraRelayArgs" ] [ "services" "rustdesk-server" "relay" "extraArgs" ])
+ (lib.mkRenamedOptionModule [ "services" "rustdesk-server" "extraSignalArgs" ] [ "services" "rustdesk-server" "signal" "extraArgs" ])
+ ];
+
options.services.rustdesk-server = with lib; with types; {
enable = mkEnableOption "RustDesk, a remote access and remote control software, allowing maintenance of computers and other devices";
@@ -18,30 +24,53 @@ in {
'';
};
- relayIP = mkOption {
- type = str;
- description = ''
- The public facing IP of the RustDesk relay.
- '';
+ signal = {
+ enable = mkOption {
+ type = bool;
+ default = true;
+ description = ''
+ Whether to enable the RustDesk signal server.
+ '';
+ };
+
+ relayHosts = mkOption {
+ type = listOf str;
+ default = [];
+ # reference: https://rustdesk.com/docs/en/self-host/rustdesk-server-pro/relay/
+ description = ''
+ The relay server IP addresses or DNS names of the RustDesk relay.
+ '';
+ };
+
+ extraArgs = mkOption {
+ type = listOf str;
+ default = [];
+ example = [ "-k" "_" ];
+ description = ''
+ A list of extra command line arguments to pass to the `hbbs` process.
+ '';
+ };
+
};
- extraSignalArgs = mkOption {
- type = listOf str;
- default = [];
- example = [ "-k" "_" ];
- description = ''
- A list of extra command line arguments to pass to the `hbbs` process.
- '';
+ relay = {
+ enable = mkOption {
+ type = bool;
+ default = true;
+ description = ''
+ Whether to enable the RustDesk relay server.
+ '';
+ };
+ extraArgs = mkOption {
+ type = listOf str;
+ default = [];
+ example = [ "-k" "_" ];
+ description = ''
+ A list of extra command line arguments to pass to the `hbbr` process.
+ '';
+ };
};
- extraRelayArgs = mkOption {
- type = listOf str;
- default = [];
- example = [ "-k" "_" ];
- description = ''
- A list of extra command line arguments to pass to the `hbbr` process.
- '';
- };
};
config = let
@@ -96,13 +125,17 @@ in {
wantedBy = [ "multi-user.target" ];
};
- systemd.services.rustdesk-signal = lib.mkMerge [ serviceDefaults {
- serviceConfig.ExecStart = "${cfg.package}/bin/hbbs -r ${cfg.relayIP} ${lib.escapeShellArgs cfg.extraSignalArgs}";
- } ];
+ systemd.services.rustdesk-signal =
+ let
+ relayArg = builtins.concatStringsSep ":" cfg.signal.relayHosts;
+ in
+ lib.mkIf cfg.signal.enable (lib.mkMerge [ serviceDefaults {
+ serviceConfig.ExecStart = "${cfg.package}/bin/hbbs --relay-servers ${relayArg} ${lib.escapeShellArgs cfg.signal.extraArgs}";
+ } ]);
- systemd.services.rustdesk-relay = lib.mkMerge [ serviceDefaults {
- serviceConfig.ExecStart = "${cfg.package}/bin/hbbr ${lib.escapeShellArgs cfg.extraRelayArgs}";
- } ];
+ systemd.services.rustdesk-relay = lib.mkIf cfg.relay.enable (lib.mkMerge [ serviceDefaults {
+ serviceConfig.ExecStart = "${cfg.package}/bin/hbbr ${lib.escapeShellArgs cfg.relay.extraArgs}";
+ } ]);
};
meta.maintainers = with lib.maintainers; [ ppom ];
diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix
index 72ccb910982c..73fc210728d8 100644
--- a/nixos/modules/services/networking/avahi-daemon.nix
+++ b/nixos/modules/services/networking/avahi-daemon.nix
@@ -317,6 +317,47 @@ in
Type = "dbus";
ExecStart = "${cfg.package}/sbin/avahi-daemon --syslog -f ${avahiDaemonConf}";
ConfigurationDirectory = "avahi/services";
+
+ # Hardening
+ CapabilityBoundingSet = [
+ # https://github.com/avahi/avahi/blob/v0.9-rc1/avahi-daemon/caps.c#L38
+ "CAP_SYS_CHROOT"
+ "CAP_SETUID"
+ "CAP_SETGID"
+ ];
+ DevicePolicy = "closed";
+ LockPersonality = true;
+ MemoryDenyWriteExecute = true;
+ NoNewPrivileges = true;
+ PrivateDevices = true;
+ PrivateTmp = true;
+ PrivateUsers = false;
+ ProcSubset = "pid";
+ ProtectClock = true;
+ ProtectControlGroups = true;
+ ProtectHome = true;
+ ProtectHostname = true;
+ ProtectKernelLogs = true;
+ ProtectKernelModules = true;
+ ProtectKernelTunables = true;
+ ProtectProc = "invisible";
+ ProtectSystem = "strict";
+ RestrictAddressFamilies = [
+ "AF_INET"
+ "AF_INET6"
+ "AF_NETLINK"
+ "AF_UNIX"
+ ];
+ RestrictNamespaces = true;
+ RestrictRealtime = true;
+ RestrictSUIDSGID = true;
+ SystemCallArchitectures = "native";
+ SystemCallFilter = [
+ "@system-service"
+ "~@privileged"
+ "@chown setgroups setresuid"
+ ];
+ UMask = "0077";
};
};
diff --git a/nixos/modules/services/networking/coturn.nix b/nixos/modules/services/networking/coturn.nix
index 40c157d1006e..ab8806dc03a1 100644
--- a/nixos/modules/services/networking/coturn.nix
+++ b/nixos/modules/services/networking/coturn.nix
@@ -1,41 +1,41 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, utils, ... }:
let
cfg = config.services.coturn;
pidfile = "/run/turnserver/turnserver.pid";
configFile = pkgs.writeText "turnserver.conf" ''
-listening-port=${toString cfg.listening-port}
-tls-listening-port=${toString cfg.tls-listening-port}
-alt-listening-port=${toString cfg.alt-listening-port}
-alt-tls-listening-port=${toString cfg.alt-tls-listening-port}
-${lib.concatStringsSep "\n" (map (x: "listening-ip=${x}") cfg.listening-ips)}
-${lib.concatStringsSep "\n" (map (x: "relay-ip=${x}") cfg.relay-ips)}
-min-port=${toString cfg.min-port}
-max-port=${toString cfg.max-port}
-${lib.optionalString cfg.lt-cred-mech "lt-cred-mech"}
-${lib.optionalString cfg.no-auth "no-auth"}
-${lib.optionalString cfg.use-auth-secret "use-auth-secret"}
-${lib.optionalString (cfg.static-auth-secret != null) ("static-auth-secret=${cfg.static-auth-secret}")}
-${lib.optionalString (cfg.static-auth-secret-file != null) ("static-auth-secret=#static-auth-secret#")}
-realm=${cfg.realm}
-${lib.optionalString cfg.no-udp "no-udp"}
-${lib.optionalString cfg.no-tcp "no-tcp"}
-${lib.optionalString cfg.no-tls "no-tls"}
-${lib.optionalString cfg.no-dtls "no-dtls"}
-${lib.optionalString cfg.no-udp-relay "no-udp-relay"}
-${lib.optionalString cfg.no-tcp-relay "no-tcp-relay"}
-${lib.optionalString (cfg.cert != null) "cert=${cfg.cert}"}
-${lib.optionalString (cfg.pkey != null) "pkey=${cfg.pkey}"}
-${lib.optionalString (cfg.dh-file != null) ("dh-file=${cfg.dh-file}")}
-no-stdout-log
-syslog
-pidfile=${pidfile}
-${lib.optionalString cfg.secure-stun "secure-stun"}
-${lib.optionalString cfg.no-cli "no-cli"}
-cli-ip=${cfg.cli-ip}
-cli-port=${toString cfg.cli-port}
-${lib.optionalString (cfg.cli-password != null) ("cli-password=${cfg.cli-password}")}
-${cfg.extraConfig}
-'';
+ listening-port=${toString cfg.listening-port}
+ tls-listening-port=${toString cfg.tls-listening-port}
+ alt-listening-port=${toString cfg.alt-listening-port}
+ alt-tls-listening-port=${toString cfg.alt-tls-listening-port}
+ ${lib.concatStringsSep "\n" (map (x: "listening-ip=${x}") cfg.listening-ips)}
+ ${lib.concatStringsSep "\n" (map (x: "relay-ip=${x}") cfg.relay-ips)}
+ min-port=${toString cfg.min-port}
+ max-port=${toString cfg.max-port}
+ ${lib.optionalString cfg.lt-cred-mech "lt-cred-mech"}
+ ${lib.optionalString cfg.no-auth "no-auth"}
+ ${lib.optionalString cfg.use-auth-secret "use-auth-secret"}
+ ${lib.optionalString (cfg.static-auth-secret != null) "static-auth-secret=${cfg.static-auth-secret}"}
+ ${lib.optionalString (cfg.static-auth-secret-file != null) "static-auth-secret=#static-auth-secret#"}
+ realm=${cfg.realm}
+ ${lib.optionalString cfg.no-udp "no-udp"}
+ ${lib.optionalString cfg.no-tcp "no-tcp"}
+ ${lib.optionalString cfg.no-tls "no-tls"}
+ ${lib.optionalString cfg.no-dtls "no-dtls"}
+ ${lib.optionalString cfg.no-udp-relay "no-udp-relay"}
+ ${lib.optionalString cfg.no-tcp-relay "no-tcp-relay"}
+ ${lib.optionalString (cfg.cert != null) "cert=${cfg.cert}"}
+ ${lib.optionalString (cfg.pkey != null) "pkey=${cfg.pkey}"}
+ ${lib.optionalString (cfg.dh-file != null) "dh-file=${cfg.dh-file}"}
+ no-stdout-log
+ syslog
+ pidfile=${pidfile}
+ ${lib.optionalString cfg.secure-stun "secure-stun"}
+ ${lib.optionalString cfg.no-cli "no-cli"}
+ cli-ip=${cfg.cli-ip}
+ cli-port=${toString cfg.cli-port}
+ ${lib.optionalString (cfg.cli-password != null) "cli-password=${cfg.cli-password}"}
+ ${cfg.extraConfig}
+ '';
in {
options = {
services.coturn = {
@@ -301,7 +301,7 @@ in {
};
};
- config = lib.mkIf cfg.enable (lib.mkMerge ([
+ config = lib.mkIf cfg.enable (lib.mkMerge [
{ assertions = [
{ assertion = cfg.static-auth-secret != null -> cfg.static-auth-secret-file == null ;
message = "static-auth-secret and static-auth-secret-file cannot be set at the same time";
@@ -341,25 +341,66 @@ in {
'' }
chmod 640 ${runConfig}
'';
- serviceConfig = {
+ serviceConfig = rec {
Type = "simple";
- ExecStart = "${pkgs.coturn}/bin/turnserver -c ${runConfig}";
- RuntimeDirectory = "turnserver";
+ ExecStart = utils.escapeSystemdExecArgs [
+ (lib.getExe' pkgs.coturn "turnserver")
+ "-c"
+ runConfig
+ ];
User = "turnserver";
Group = "turnserver";
- AmbientCapabilities =
- lib.mkIf (
- cfg.listening-port < 1024 ||
- cfg.alt-listening-port < 1024 ||
- cfg.tls-listening-port < 1024 ||
- cfg.alt-tls-listening-port < 1024 ||
- cfg.min-port < 1024
- ) "cap_net_bind_service";
+ RuntimeDirectory = [
+ "coturn"
+ "turnserver"
+ ];
+ RuntimeDirectoryMode = "0700";
Restart = "on-abort";
+
+ # Hardening
+ AmbientCapabilities = if
+ cfg.listening-port < 1024 ||
+ cfg.alt-listening-port < 1024 ||
+ cfg.tls-listening-port < 1024 ||
+ cfg.alt-tls-listening-port < 1024 ||
+ cfg.min-port < 1024
+ then [ "CAP_NET_BIND_SERVICE" ] else [ "" ];
+ CapabilityBoundingSet = AmbientCapabilities;
+ DevicePolicy = "closed";
+ LockPersonality = true;
+ MemoryDenyWriteExecute = true;
+ NoNewPrivileges = true;
+ PrivateDevices = true;
+ PrivateTmp = true;
+ PrivateUsers = true;
+ ProcSubset = "pid";
+ ProtectClock = true;
+ ProtectControlGroups = true;
+ ProtectHome = true;
+ ProtectHostname = true;
+ ProtectKernelLogs = true;
+ ProtectKernelModules = true;
+ ProtectKernelTunables = true;
+ ProtectProc = "invisible";
+ ProtectSystem = "strict";
+ RemoveIPC = true;
+ RestrictAddressFamilies = [
+ "AF_INET"
+ "AF_INET6"
+ ] ++ lib.optionals (cfg.listening-ips == [ ]) [
+ # only used for interface discovery when no listening ips are configured
+ "AF_NETLINK"
+ ];
+ RestrictNamespaces = true;
+ RestrictRealtime = true;
+ RestrictSUIDSGID = true;
+ SystemCallArchitectures = "native";
+ SystemCallFilter = [
+ "@system-service"
+ "~@privileged @resources"
+ ];
+ UMask = "0077";
};
};
- systemd.tmpfiles.rules = [
- "d /run/coturn 0700 turnserver turnserver - -"
- ];
- }]));
+ }]);
}
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index a7c896cb28a2..059dc59e8a0a 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -249,7 +249,7 @@ in
ExecReload = "${dhcpcd}/sbin/dhcpcd --rebind";
Restart = "always";
AmbientCapabilities = [ "CAP_NET_ADMIN" "CAP_NET_RAW" "CAP_NET_BIND_SERVICE" ];
- ReadWritePaths = [ "/proc/sys/net/ipv6" ]
+ ReadWritePaths = [ "/proc/sys/net/ipv4" "/proc/sys/net/ipv6" ]
++ lib.optionals useResolvConf ([ "/run/resolvconf" ] ++ config.networking.resolvconf.subscriberFiles);
DeviceAllow = "";
LockPersonality = true;
diff --git a/nixos/modules/services/networking/fastnetmon-advanced.nix b/nixos/modules/services/networking/fastnetmon-advanced.nix
index 26e8ad8b76d9..d534c7fbc058 100644
--- a/nixos/modules/services/networking/fastnetmon-advanced.nix
+++ b/nixos/modules/services/networking/fastnetmon-advanced.nix
@@ -160,6 +160,8 @@ in {
}
});
'';
+ # dbus/polkit with DynamicUser is broken with the default implementation
+ services.dbus.implementation = "broker";
# We don't use the existing gobgp NixOS module and package, because the gobgp
# version might not be compatible with fastnetmon. Also, the service name
diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index c47a684571fe..9e346d3384fa 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -6,7 +6,7 @@ let
cfg = config.services.murmur;
forking = cfg.logFile != null;
configFile = pkgs.writeText "murmurd.ini" ''
- database=/var/lib/murmur/murmur.sqlite
+ database=${cfg.stateDir}/murmur.sqlite
dbDriver=QSQLITE
autobanAttempts=${toString cfg.autobanAttempts}
@@ -69,6 +69,32 @@ in
'';
};
+ user = mkOption {
+ type = types.str;
+ default = "murmur";
+ description = ''
+ The name of an existing user to use to run the service.
+ If not specified, the default user will be created.
+ '';
+ };
+
+ group = mkOption {
+ type = types.str;
+ default = "murmur";
+ description = ''
+ The name of an existing group to use to run the service.
+ If not specified, the default group will be created.
+ '';
+ };
+
+ stateDir = mkOption {
+ type = types.path;
+ default = "/var/lib/murmur";
+ description = ''
+ Directory to store data for the server.
+ '';
+ };
+
autobanAttempts = mkOption {
type = types.int;
default = 10;
@@ -257,7 +283,7 @@ in
environmentFile = mkOption {
type = types.nullOr types.path;
default = null;
- example = "/var/lib/murmur/murmurd.env";
+ example = literalExpression ''"''${config.services.murmur.stateDir}/murmurd.env"'';
description = ''
Environment file as defined in {manpage}`systemd.exec(5)`.
@@ -289,14 +315,14 @@ in
};
config = mkIf cfg.enable {
- users.users.murmur = {
+ users.users.murmur = mkIf (cfg.user == "murmur") {
description = "Murmur Service user";
- home = "/var/lib/murmur";
+ home = cfg.stateDir;
createHome = true;
uid = config.ids.uids.murmur;
- group = "murmur";
+ group = cfg.group;
};
- users.groups.murmur = {
+ users.groups.murmur = mkIf (cfg.group == "murmur") {
gid = config.ids.gids.murmur;
};
@@ -324,8 +350,8 @@ in
Restart = "always";
RuntimeDirectory = "murmur";
RuntimeDirectoryMode = "0700";
- User = "murmur";
- Group = "murmur";
+ User = cfg.user;
+ Group = cfg.group;
# service hardening
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
@@ -362,7 +388,7 @@ in
"-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-
+
@@ -387,9 +413,9 @@ in
r ${config.environment.etc."os-release".source},
r ${config.environment.etc."lsb-release".source},
- owner rwk /var/lib/murmur/murmur.sqlite,
- owner rw /var/lib/murmur/murmur.sqlite-journal,
- owner r /var/lib/murmur/,
+ owner rwk ${cfg.stateDir}/murmur.sqlite,
+ owner rw ${cfg.stateDir}/murmur.sqlite-journal,
+ owner r ${cfg.stateDir}/,
r /run/murmur/murmurd.pid,
r /run/murmur/murmurd.ini,
r ${configFile},
diff --git a/nixos/modules/services/networking/pptpd.nix b/nixos/modules/services/networking/pptpd.nix
index b28015800f3c..441ab52372f9 100644
--- a/nixos/modules/services/networking/pptpd.nix
+++ b/nixos/modules/services/networking/pptpd.nix
@@ -101,15 +101,12 @@ with lib;
secrets="/etc/ppp-pptpd/chap-secrets"
- [ -f "$secrets" ] || cat > "$secrets" << EOF
+ [ -f "$secrets" ] || install -m 600 -o root -g root /dev/stdin "$secrets" << EOF
# From: pptpd-1.4.0/samples/chap-secrets
# Secrets for authentication using CHAP
# client server secret IP addresses
#username pptpd password *
EOF
-
- chown root:root "$secrets"
- chmod 600 "$secrets"
'';
serviceConfig = {
diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix
index 62a242e88c9b..7037e6817803 100644
--- a/nixos/modules/services/networking/radicale.nix
+++ b/nixos/modules/services/networking/radicale.nix
@@ -52,7 +52,7 @@ in {
default = { };
description = ''
Configuration for Radicale. See
- .
+ .
This option is mutually exclusive with {option}`config`.
'';
example = literalExpression ''
@@ -74,7 +74,7 @@ in {
type = format.type;
description = ''
Configuration for Radicale's rights file. See
- .
+ .
This option only works in conjunction with {option}`settings`.
Setting this will also set {option}`settings.rights.type` and
{option}`settings.rights.file` to appropriate values.
diff --git a/nixos/modules/services/networking/soju.nix b/nixos/modules/services/networking/soju.nix
index 0f4969b930e4..808c708163b2 100644
--- a/nixos/modules/services/networking/soju.nix
+++ b/nixos/modules/services/networking/soju.nix
@@ -12,7 +12,7 @@ let
tlsCfg = optionalString (cfg.tlsCertificate != null)
"tls ${cfg.tlsCertificate} ${cfg.tlsCertificateKey}";
logCfg = optionalString cfg.enableMessageLogging
- "log fs ${stateDir}/logs";
+ "message-store fs ${stateDir}/logs";
configFile = pkgs.writeText "soju.conf" ''
${listenCfg}
diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix
index aaff9221d5f0..d30193ecc129 100644
--- a/nixos/modules/services/networking/tailscale.nix
+++ b/nixos/modules/services/networking/tailscale.nix
@@ -29,6 +29,12 @@ in {
description = "Username or user ID of the user allowed to to fetch Tailscale TLS certificates for the node.";
};
+ disableTaildrop = mkOption {
+ default = false;
+ type = types.bool;
+ description = "Whether to disable the Taildrop feature for sending files between nodes.";
+ };
+
package = lib.mkPackageOption pkgs "tailscale" {};
openFirewall = mkOption {
@@ -129,6 +135,8 @@ in {
''"FLAGS=--tun ${lib.escapeShellArg cfg.interfaceName} ${lib.concatStringsSep " " cfg.extraDaemonFlags}"''
] ++ (lib.optionals (cfg.permitCertUid != null) [
"TS_PERMIT_CERT_UID=${cfg.permitCertUid}"
+ ]) ++ (lib.optionals (cfg.disableTaildrop) [
+ "TS_DISABLE_TAILDROP=true"
]);
# Restart tailscaled with a single `systemctl restart` at the
# end of activation, rather than a `stop` followed by a later
diff --git a/nixos/modules/services/networking/xl2tpd.nix b/nixos/modules/services/networking/xl2tpd.nix
index 8d192be6c2fa..4ecd3c54e412 100644
--- a/nixos/modules/services/networking/xl2tpd.nix
+++ b/nixos/modules/services/networking/xl2tpd.nix
@@ -104,31 +104,18 @@ with lib;
wantedBy = [ "multi-user.target" ];
preStart = ''
- mkdir -p -m 700 /etc/xl2tpd
+ install -m 700 -d /etc/xl2tpd/ppp
- pushd /etc/xl2tpd > /dev/null
-
- mkdir -p -m 700 ppp
-
- [ -f ppp/chap-secrets ] || cat > ppp/chap-secrets << EOF
+ [ -f /etc/xl2tpd/ppp/chap-secrets ] || install -m 600 -o root -g root /dev/stdin /etc/xl2tpd/ppp/chap-secrets < l2tp-secrets
- chown root:root l2tp-secrets
- chmod 600 l2tp-secrets
+ [ -f /etc/xl2tpd/l2tp-secrets ] || install -m 600 -o root -g root <(echo -n "* * "; ${pkgs.apg}/bin/apg -n 1 -m 32 -x 32 -a 1 -M LCN) /etc/xl2tpd/l2tp-secrets
- popd > /dev/null
-
- mkdir -p /run/xl2tpd
- chown root:root /run/xl2tpd
- chmod 700 /run/xl2tpd
+ install -m 701 -o root -g root -d /run/xl2tpd
'';
serviceConfig = {
diff --git a/nixos/modules/services/security/oauth2-proxy.nix b/nixos/modules/services/security/oauth2-proxy.nix
index a897f04ea633..38da06e1538a 100644
--- a/nixos/modules/services/security/oauth2-proxy.nix
+++ b/nixos/modules/services/security/oauth2-proxy.nix
@@ -62,7 +62,7 @@ let
} // lib.optionalAttrs (cfg.passBasicAuth) {
basic-auth-password = cfg.basicAuthPassword;
} // lib.optionalAttrs (cfg.htpasswd.file != null) {
- display-htpasswd-file = cfg.htpasswd.displayForm;
+ display-htpasswd-form = cfg.htpasswd.displayForm;
} // lib.optionalAttrs tls.enable {
tls-cert-file = tls.certificate;
tls-key-file = tls.key;
diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix
index b3f38eba6642..a5fa6375c648 100644
--- a/nixos/modules/services/video/frigate.nix
+++ b/nixos/modules/services/video/frigate.nix
@@ -523,6 +523,7 @@ in
intel-gpu-tools
];
serviceConfig = {
+ ExecStartPre = "-rm /var/cache/frigate/*.mp4";
ExecStart = "${cfg.package.python.interpreter} -m frigate";
Restart = "on-failure";
diff --git a/nixos/modules/services/wayland/hypridle.nix b/nixos/modules/services/wayland/hypridle.nix
index 231a0b7f93ec..83a081aa6741 100644
--- a/nixos/modules/services/wayland/hypridle.nix
+++ b/nixos/modules/services/wayland/hypridle.nix
@@ -20,6 +20,11 @@ in
systemd = {
packages = [ cfg.package ];
user.services.hypridle.wantedBy = [ "graphical-session.target" ];
+ user.services.hypridle.path = [
+ config.programs.hyprland.package
+ config.programs.hyprlock.package
+ pkgs.procps
+ ];
};
};
diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix
index 4222b52515e5..2224ca1d8ebb 100644
--- a/nixos/modules/services/web-apps/immich.nix
+++ b/nixos/modules/services/web-apps/immich.nix
@@ -6,6 +6,7 @@
}:
let
cfg = config.services.immich;
+ format = pkgs.formats.json { };
isPostgresUnixSocket = lib.hasPrefix "/" cfg.database.host;
isRedisUnixSocket = lib.hasPrefix "/" cfg.redis.host;
@@ -110,6 +111,37 @@ in
description = "The group immich should run as.";
};
+ settings = mkOption {
+ default = null;
+ description = ''
+ Configuration for Immich.
+ See or navigate to
+ for
+ options and defaults.
+ Setting it to `null` allows configuring Immich in the web interface.
+ '';
+ type = types.nullOr (
+ types.submodule {
+ freeformType = format.type;
+ options = {
+ newVersionCheck.enabled = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Check for new versions.
+ This feature relies on periodic communication with github.com.
+ '';
+ };
+ server.externalDomain = mkOption {
+ type = types.str;
+ default = "";
+ description = "Domain for publicly shared links, including `http(s)://`.";
+ };
+ };
+ }
+ );
+ };
+
machine-learning = {
enable =
mkEnableOption "immich's machine-learning functionality to detect faces and search for objects"
@@ -258,10 +290,13 @@ in
postgresEnv
// redisEnv
// {
- HOST = cfg.host;
+ IMMICH_HOST = cfg.host;
IMMICH_PORT = toString cfg.port;
IMMICH_MEDIA_LOCATION = cfg.mediaLocation;
IMMICH_MACHINE_LEARNING_URL = "http://localhost:3003";
+ }
+ // lib.optionalAttrs (cfg.settings != null) {
+ IMMICH_CONFIG_FILE = "${format.generate "immich.json" cfg.settings}";
};
services.immich.machine-learning.environment = {
@@ -272,6 +307,11 @@ in
IMMICH_PORT = "3003";
};
+ systemd.slices.system-immich = {
+ description = "Immich (self-hosted photo and video backup solution) slice";
+ documentation = [ "https://immich.app/docs" ];
+ };
+
systemd.services.immich-server = {
description = "Immich backend server (Self-hosted photo and video backup solution)";
after = [ "network.target" ];
@@ -281,6 +321,7 @@ in
serviceConfig = commonServiceConfig // {
ExecStart = lib.getExe cfg.package;
EnvironmentFile = mkIf (cfg.secretsFile != null) cfg.secretsFile;
+ Slice = "system-immich.slice";
StateDirectory = "immich";
SyslogIdentifier = "immich";
RuntimeDirectory = "immich";
@@ -300,6 +341,7 @@ in
inherit (cfg.machine-learning) environment;
serviceConfig = commonServiceConfig // {
ExecStart = lib.getExe (cfg.package.machine-learning.override { immich = cfg.package; });
+ Slice = "system-immich.slice";
CacheDirectory = "immich";
User = cfg.user;
Group = cfg.group;
diff --git a/nixos/modules/services/web-apps/netbox.nix b/nixos/modules/services/web-apps/netbox.nix
index 7bcbde2a018e..01319722afa9 100644
--- a/nixos/modules/services/web-apps/netbox.nix
+++ b/nixos/modules/services/web-apps/netbox.nix
@@ -75,21 +75,17 @@ in {
package = lib.mkOption {
type = lib.types.package;
default =
- if lib.versionAtLeast config.system.stateVersion "24.05"
+ if lib.versionAtLeast config.system.stateVersion "24.11"
+ then pkgs.netbox_4_1
+ else if lib.versionAtLeast config.system.stateVersion "24.05"
then pkgs.netbox_3_7
- else if lib.versionAtLeast config.system.stateVersion "23.11"
- then pkgs.netbox_3_6
- else if lib.versionAtLeast config.system.stateVersion "23.05"
- then pkgs.netbox_3_5
- else pkgs.netbox_3_3;
+ else pkgs.netbox_3_6;
defaultText = lib.literalExpression ''
- if lib.versionAtLeast config.system.stateVersion "24.05"
+ if lib.versionAtLeast config.system.stateVersion "24.11"
+ then pkgs.netbox_4_1
+ else if lib.versionAtLeast config.system.stateVersion "24.05"
then pkgs.netbox_3_7
- else if lib.versionAtLeast config.system.stateVersion "23.11"
- then pkgs.netbox_3_6
- else if lib.versionAtLeast config.system.stateVersion "23.05"
- then pkgs.netbox_3_5
- else pkgs.netbox_3_3;
+ else pkgs.netbox_3_6;
'';
description = ''
NetBox package to use.
@@ -328,6 +324,7 @@ in {
--pythonpath ${pkg}/opt/netbox/netbox
'';
PrivateTmp = true;
+ TimeoutStartSec = lib.mkDefault "5min";
};
};
diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix
index e3f15f4f438c..4f5ea3390e88 100644
--- a/nixos/modules/services/web-apps/peertube.nix
+++ b/nixos/modules/services/web-apps/peertube.nix
@@ -432,7 +432,6 @@ in {
path = with pkgs; [ nodejs_18 yarn ffmpeg-headless openssl ];
script = ''
- #!/bin/sh
umask 077
cat > /var/lib/peertube/config/local.yaml < cfg.redis.host == "localhost";
+ message = "the redis host must be localhost if services.send.redis.createLocally is set to true";
+ }
+ ];
+
+ networking.firewall.allowedTCPPorts = lib.optional cfg.openFirewall cfg.port;
+
+ services.redis = lib.optionalAttrs cfg.redis.createLocally {
+ servers."${cfg.redis.name}" = {
+ enable = true;
+ bind = "localhost";
+ port = cfg.redis.port;
+ };
+ };
+
+ systemd.services.send = {
+ serviceConfig = {
+ Type = "simple";
+ Restart = "always";
+ StateDirectory = "send";
+ WorkingDirectory = cfg.dataDir;
+ ReadWritePaths = cfg.dataDir;
+ LoadCredential = lib.optionalString (
+ cfg.redis.passwordFile != null
+ ) "redis-password:${cfg.redis.passwordFile}";
+
+ # Hardening
+ RestrictAddressFamilies = [
+ "AF_UNIX"
+ "AF_INET"
+ "AF_INET6"
+ ];
+ AmbientCapabilities = lib.optionalString (cfg.port < 1024) "cap_net_bind_service";
+ DynamicUser = true;
+ CapabilityBoundingSet = "";
+ NoNewPrivileges = true;
+ RemoveIPC = true;
+ PrivateTmp = true;
+ ProcSubset = "pid";
+ ProtectClock = true;
+ ProtectControlGroups = true;
+ ProtectHome = true;
+ ProtectHostname = true;
+ ProtectKernelLogs = true;
+ ProtectKernelModules = true;
+ ProtectKernelTunables = true;
+ ProtectProc = "invisible";
+ ProtectSystem = "full";
+ RestrictNamespaces = true;
+ RestrictRealtime = true;
+ RestrictSUIDSGID = true;
+ SystemCallArchitectures = "native";
+ UMask = "0077";
+ };
+ environment =
+ {
+ IP_ADDRESS = cfg.host;
+ PORT = toString cfg.port;
+ BASE_URL = if (cfg.baseUrl == null) then "http://${cfg.host}:${toString cfg.port}" else cfg.baseUrl;
+ FILE_DIR = cfg.dataDir + "/uploads";
+ REDIS_HOST = cfg.redis.host;
+ REDIS_PORT = toString cfg.redis.port;
+ }
+ // (lib.mapAttrs (
+ name: value:
+ if lib.isList value then
+ "[" + lib.concatStringsSep ", " (map (x: toString x) value) + "]"
+ else if lib.isBool value then
+ lib.boolToString value
+ else
+ toString value
+ ) cfg.environment);
+ after =
+ [
+ "network.target"
+ ]
+ ++ lib.optionals cfg.redis.createLocally [
+ "redis-${cfg.redis.name}.service"
+ ];
+ description = "Send web service";
+ wantedBy = [ "multi-user.target" ];
+ script = ''
+ ${lib.optionalString (cfg.redis.passwordFile != null) ''
+ export REDIS_PASSWORD="$(cat $CREDENTIALS_DIRECTORY/redis-password)"
+ ''}
+ ${lib.getExe cfg.package}
+ '';
+ };
+ };
+
+ meta.maintainers = with lib.maintainers; [ moraxyc ];
+}
diff --git a/nixos/modules/system/activation/apply/apply.sh b/nixos/modules/system/activation/apply/apply.sh
new file mode 100644
index 000000000000..c494b76b7c29
--- /dev/null
+++ b/nixos/modules/system/activation/apply/apply.sh
@@ -0,0 +1,163 @@
+#!@bash@
+
+
+# This is the NixOS apply script, typically located at
+#
+# ${config.system.build.toplevel}/bin/apply
+#
+# This script is responsible for managing the profile link and calling the
+# appropriate scripts for its subcommands, such as switch, boot, and test.
+
+
+set -euo pipefail
+
+toplevel=@toplevel@
+
+subcommand=
+
+installBootloader=
+specialisation=
+profile=/nix/var/nix/profiles/system
+
+log() {
+ echo "$@" >&2
+}
+
+die() {
+ log "NixOS apply error: $*"
+ exit 1
+}
+
+usage() {
+ log "NixOS apply invocation error: $*"
+cat >&2 </dev/null; then
+ # We're not loaded into the test.sh, so we run main.
+ parse_args "$@"
+ main
+fi
diff --git a/nixos/modules/system/activation/apply/checks.nix b/nixos/modules/system/activation/apply/checks.nix
new file mode 100644
index 000000000000..bb509b9210cb
--- /dev/null
+++ b/nixos/modules/system/activation/apply/checks.nix
@@ -0,0 +1,51 @@
+# Run:
+# nix-build -A nixosTests.apply
+#
+# These are not all tests. See also nixosTests.
+
+{
+ lib,
+ stdenvNoCC,
+ testers,
+ ...
+}:
+
+let
+ fileset = lib.fileset.unions [
+ ./test.sh
+ ./apply.sh
+ ];
+in
+
+{
+ unitTests = stdenvNoCC.mkDerivation {
+ name = "nixos-apply-unit-tests";
+ src = lib.fileset.toSource {
+ root = ./.;
+ inherit fileset;
+ };
+ dontBuild = true;
+ checkPhase = ''
+ ./test.sh
+ '';
+ installPhase = ''
+ touch $out
+ '';
+ };
+
+ shellcheck =
+ (testers.shellcheck {
+ src = lib.fileset.toSource {
+ # This makes the error messages include the full path
+ root = ../../../../..;
+ inherit fileset;
+ };
+ }).overrideAttrs
+ {
+ postUnpack = ''
+ for f in $(find . -type f); do
+ substituteInPlace $f --replace @bash@ /usr/bin/bash
+ done
+ '';
+ };
+}
diff --git a/nixos/modules/system/activation/apply/test.sh b/nixos/modules/system/activation/apply/test.sh
new file mode 100755
index 000000000000..02ab01f69bea
--- /dev/null
+++ b/nixos/modules/system/activation/apply/test.sh
@@ -0,0 +1,176 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2317 disable=SC2031
+# False positives:
+# SC2317: Unreachable code: TEST_*
+# SC2031: was modified in a subshell. That change might be lost.
+# We have a lot of that, and that's expected.
+
+# This is a unit test script for the NixOS apply script.
+# It can be run quickly with the following command:
+#
+# ./test.sh
+#
+# Alternatively, run the following to run all tests and checks
+#
+# TODO
+#
+
+set -euo pipefail
+# set -x
+
+apply="${BASH_SOURCE[0]%/*}/apply.sh"
+# source_apply() {
+
+run_parse_args() {
+ bash -c "source $apply;"' parse_args "$@"' -- "$@"
+}
+
+TEST_parse_args_none() {
+ if errout="$(run_parse_args 2>&1)"; then
+ test_fail "apply without arguments should fail"
+ elif [[ $? -ne 1 ]]; then
+ test_fail "apply without arguments should exit with code 1"
+ fi
+ grep -F "no subcommand specified" <<<"$errout" >/dev/null
+}
+
+TEST_parse_args_switch() {
+ (
+ # shellcheck source=nixos/modules/system/activation/apply/apply.sh
+ source "$apply";
+ parse_args switch;
+ [[ $subcommand == switch ]]
+ [[ $specialisation == "" ]]
+ [[ $profile == "" ]]
+ )
+}
+
+TEST_parse_args_boot() {
+ (
+ # shellcheck source=nixos/modules/system/activation/apply/apply.sh
+ source "$apply";
+ parse_args boot;
+ [[ $subcommand == boot ]]
+ [[ $specialisation == "" ]]
+ [[ $profile == "" ]]
+ )
+}
+
+TEST_parse_args_test() {
+ (
+ # shellcheck source=nixos/modules/system/activation/apply/apply.sh
+ source "$apply";
+ parse_args test;
+ [[ $subcommand == test ]]
+ [[ $specialisation == "" ]]
+ [[ $profile == "" ]]
+ )
+}
+
+TEST_parse_args_dry_activate() {
+ (
+ # shellcheck source=nixos/modules/system/activation/apply/apply.sh
+ source "$apply";
+ parse_args dry-activate;
+ [[ $subcommand == dry-activate ]]
+ [[ $specialisation == "" ]]
+ [[ $profile == "" ]]
+ )
+}
+
+TEST_parse_args_unknown() {
+ if errout="$(run_parse_args foo 2>&1)"; then
+ test_fail "apply with unknown subcommand should fail"
+ fi
+ grep -F "unexpected argument or flag: foo" <<<"$errout" >/dev/null
+}
+
+TEST_parse_args_switch_specialisation_no_arg() {
+ if errout="$(run_parse_args switch --specialisation 2>&1)"; then
+ test_fail "apply with --specialisation without argument should fail"
+ fi
+ grep -F "missing argument for --specialisation" <<<"$errout" >/dev/null
+}
+
+TEST_parse_args_switch_specialisation() {
+ (
+ # shellcheck source=nixos/modules/system/activation/apply/apply.sh
+ source "$apply";
+ parse_args switch --specialisation low-power;
+ [[ $subcommand == switch ]]
+ [[ $specialisation == low-power ]]
+ [[ $profile == "" ]]
+ )
+}
+
+TEST_parse_args_switch_profile() {
+ (
+ # shellcheck source=nixos/modules/system/activation/apply/apply.sh
+ source "$apply";
+ parse_args switch --profile /nix/var/nix/profiles/system;
+ [[ $subcommand == switch ]]
+ [[ $specialisation == "" ]]
+ [[ $profile == /nix/var/nix/profiles/system ]]
+ )
+}
+
+
+
+# Support code
+
+test_fail() {
+ echo "TEST FAILURE: $*" >&2
+ exit 1
+}
+
+test_print_trace() {
+ local frame=${1:0}
+ local caller
+ # shellcheck disable=SC2207 disable=SC2086
+ while caller=( $(caller $frame) ); do
+ echo " in ${caller[1]} at ${caller[2]}:${caller[0]}"
+ frame=$((frame+1));
+ done
+}
+test_on_err() {
+ echo "ERROR running: ${BASH_COMMAND}" >&2
+ test_print_trace 1 >&2
+}
+
+test_init() {
+ trap 'test_on_err' ERR
+}
+
+test_find() {
+ declare -F | grep -o 'TEST_.*' | sort
+}
+
+test_run_tests() {
+ local status=0
+ for test in $(test_find); do
+ set +e
+ (
+ set -eEuo pipefail
+ trap 'test_on_err' ERR
+ $test
+ )
+ r=$?
+ set -e
+ if [[ $r == 0 ]]; then
+ echo "ok: $test"
+ else
+ echo "TEST FAIL: $test"; status=1;
+ fi
+ done
+ if [[ $status == 0 ]]; then
+ echo "All good"
+ else
+ echo
+ echo "TEST SUITE FAILED"
+ fi
+ exit $status
+}
+
+# Main
+test_init
+test_run_tests
diff --git a/nixos/modules/system/activation/specialisation.nix b/nixos/modules/system/activation/specialisation.nix
index 41491b67ff03..2b1fed44bbed 100644
--- a/nixos/modules/system/activation/specialisation.nix
+++ b/nixos/modules/system/activation/specialisation.nix
@@ -42,7 +42,7 @@ in
(e.g. `fewJobsManyCores`) at runtime, run:
```
- sudo /run/current-system/specialisation/fewJobsManyCores/bin/switch-to-configuration test
+ sudo /run/current-system/specialisation/fewJobsManyCores/bin/apply test
```
'';
type = types.attrsOf (types.submodule (
diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 4beca4f0a42a..622e25bc10e4 100755
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -80,12 +80,9 @@ if ("@localeArchive@" ne "") {
if (!defined($action) || ($action ne "switch" && $action ne "boot" && $action ne "test" && $action ne "dry-activate")) {
print STDERR <<"EOF";
+error: Unknown action $action
Usage: $0 [switch|boot|test|dry-activate]
-
-switch: make the configuration the boot default and activate now
-boot: make the configuration the boot default
-test: activate the configuration, but don\'t make it the boot default
-dry-activate: show what would be done if this configuration were activated
+Consider calling `apply` instead of `switch-to-configuration`.
EOF
exit(1);
}
diff --git a/nixos/modules/system/activation/switchable-system.nix b/nixos/modules/system/activation/switchable-system.nix
index d1326a18e5fe..bb3f7a7d4a78 100644
--- a/nixos/modules/system/activation/switchable-system.nix
+++ b/nixos/modules/system/activation/switchable-system.nix
@@ -40,7 +40,30 @@ in
};
};
+ options.system.apply.enable = lib.mkOption {
+ type = lib.types.bool;
+ default = config.system.switch.enable;
+ internal = true;
+ description = ''
+ Whether to include the `bin/apply` script.
+
+ Disabling puts `nixos-rebuild` in a legacy mode that won't be maintained
+ and removes cheap and useful functionality. It's also slower over ssh.
+ This should only be used for testing the `nixos-rebuild` command, to
+ pretend that the configuration is an old NixOS.
+ '';
+ };
+
config = lib.mkMerge [
+ (lib.mkIf config.system.apply.enable {
+ system.activatableSystemBuilderCommands = ''
+ mkdir -p $out/bin
+ substitute ${./apply/apply.sh} $out/bin/apply \
+ --subst-var-by bash ${lib.getExe pkgs.bash} \
+ --subst-var-by toplevel ''${!toplevelVar}
+ chmod +x $out/bin/apply
+ '';
+ })
(lib.mkIf (config.system.switch.enable && !config.system.switch.enableNg) {
warnings = [
''
@@ -54,7 +77,7 @@ in
];
system.activatableSystemBuilderCommands = ''
- mkdir $out/bin
+ mkdir -p $out/bin
substitute ${./switch-to-configuration.pl} $out/bin/switch-to-configuration \
--subst-var out \
--subst-var-by toplevel ''${!toplevelVar} \
@@ -86,7 +109,7 @@ in
(
source ${pkgs.buildPackages.makeWrapper}/nix-support/setup-hook
- mkdir $out/bin
+ mkdir -p $out/bin
ln -sf ${lib.getExe pkgs.switch-to-configuration-ng} $out/bin/switch-to-configuration
wrapProgram $out/bin/switch-to-configuration \
--set OUT $out \
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 6abbd4b673c0..4ac7bda0cc2f 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -49,8 +49,8 @@ let
# Putting it all together. This builds a store path containing
# symlinks to the various parts of the built configuration (the
# kernel, systemd units, init scripts, etc.) as well as a script
- # `switch-to-configuration' that activates the configuration and
- # makes it bootable. See `activatable-system.nix`.
+ # `bin/apply` that activates the configuration and
+ # makes it bootable. See `activatable-system.nix` and `switchable-system.nix`.
baseSystem = pkgs.stdenvNoCC.mkDerivation ({
name = "nixos-system-${config.system.name}-${config.system.nixos.label}";
preferLocalBuild = true;
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 64077125caf3..280d38ce32f4 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -405,7 +405,7 @@ let
${lib.optionalString (config.boot.initrd.secrets == {})
"exit 0"}
- export PATH=${pkgs.coreutils}/bin:${pkgs.libarchive}/bin:${pkgs.gzip}/bin:${pkgs.findutils}/bin
+ export PATH=${pkgs.coreutils}/bin:${pkgs.cpio}/bin:${pkgs.gzip}/bin:${pkgs.findutils}/bin
function cleanup {
if [ -n "$tmp" -a -d "$tmp" ]; then
@@ -426,7 +426,7 @@ let
}
# mindepth 1 so that we don't change the mode of /
- (cd "$tmp" && find . -mindepth 1 | xargs touch -amt 197001010000 && find . -mindepth 1 -print0 | sort -z | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @-) | \
+ (cd "$tmp" && find . -mindepth 1 | xargs touch -amt 197001010000 && find . -mindepth 1 -print0 | sort -z | cpio --quiet -o -H newc -R +0:+0 --reproducible --null) | \
${compressorExe} ${lib.escapeShellArgs initialRamdisk.compressorArgs} >> "$1"
'';
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 6c70f50a6073..6173fca20dbb 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -160,6 +160,7 @@ let
# Misc.
"systemd-sysctl.service"
+ "systemd-machine-id-commit.service"
] ++ optionals cfg.package.withTimedated [
"dbus-org.freedesktop.timedate1.service"
"systemd-timedated.service"
diff --git a/nixos/modules/system/boot/unl0kr.nix b/nixos/modules/system/boot/unl0kr.nix
index 3b64f580aaf4..30cf3ff8105e 100644
--- a/nixos/modules/system/boot/unl0kr.nix
+++ b/nixos/modules/system/boot/unl0kr.nix
@@ -30,11 +30,11 @@ in
example = lib.literalExpression ''
{
- general.animations = true;
- theme = {
- default = "pmos-dark";
- alternate = "pmos-light";
- };
+ general.animations = true;
+ theme = {
+ default = "pmos-dark";
+ alternate = "pmos-light";
+ };
}
'';
default = { };
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 03b67438d7b6..d4ed269efc6c 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, utils, ... }:
+{ config, lib, options, pkgs, utils, ... }:
#
# TODO: zfs tunables
@@ -56,7 +56,10 @@ let
# sufficient amount of time has passed that we can assume it won't be. In the
# latter case it makes one last attempt at importing, allowing the system to
# (eventually) boot even with a degraded pool.
- importLib = {zpoolCmd, awkCmd, cfgZfs}: ''
+ importLib = {zpoolCmd, awkCmd, pool}: let
+ devNodes = if pool != null && cfgZfs.pools ? ${pool} then cfgZfs.pools.${pool}.devNodes else cfgZfs.devNodes;
+ in ''
+ # shellcheck disable=SC2013
for o in $(cat /proc/cmdline); do
case $o in
zfs_force|zfs_force=1|zfs_force=y)
@@ -66,7 +69,7 @@ let
done
poolReady() {
pool="$1"
- state="$("${zpoolCmd}" import -d "${cfgZfs.devNodes}" 2>/dev/null | "${awkCmd}" "/pool: $pool/ { found = 1 }; /state:/ { if (found == 1) { print \$2; exit } }; END { if (found == 0) { print \"MISSING\" } }")"
+ state="$("${zpoolCmd}" import -d "${devNodes}" 2>/dev/null | "${awkCmd}" "/pool: $pool/ { found = 1 }; /state:/ { if (found == 1) { print \$2; exit } }; END { if (found == 0) { print \"MISSING\" } }")"
if [[ "$state" = "ONLINE" ]]; then
return 0
else
@@ -80,7 +83,8 @@ let
}
poolImport() {
pool="$1"
- "${zpoolCmd}" import -d "${cfgZfs.devNodes}" -N $ZFS_FORCE "$pool"
+ # shellcheck disable=SC2086
+ "${zpoolCmd}" import -d "${devNodes}" -N $ZFS_FORCE "$pool"
}
'';
@@ -141,12 +145,12 @@ let
# See comments at importLib definition.
zpoolCmd = "${cfgZfs.package}/sbin/zpool";
awkCmd = "${pkgs.gawk}/bin/awk";
- inherit cfgZfs;
+ inherit pool;
}) + ''
if ! poolImported "${pool}"; then
echo -n "importing ZFS pool \"${pool}\"..."
# Loop across the import until it succeeds, because the devices needed may not be discovered yet.
- for trial in `seq 1 60`; do
+ for _ in $(seq 1 60); do
poolReady "${pool}" && poolImport "${pool}" && break
sleep 1
done
@@ -157,7 +161,7 @@ let
${lib.optionalString keyLocations.hasKeys ''
- ${keyLocations.command} | while IFS=$'\t' read ds kl ks; do
+ ${keyLocations.command} | while IFS=$'\t' read -r ds kl ks; do
{
if [[ "$ks" != unavailable ]]; then
continue
@@ -267,10 +271,11 @@ in
type = lib.types.path;
default = "/dev/disk/by-id";
description = ''
- Name of directory from which to import ZFS devices.
+ Name of directory from which to import ZFS device, this is passed to `zpool import`
+ as the value of the `-d` option.
- This should be a path under /dev containing stable names for all devices needed, as
- import may fail if device nodes are renamed concurrently with a device failing.
+ For guidance on choosing this value, see
+ [the ZFS documentation](https://openzfs.github.io/openzfs-docs/Project%20and%20Community/FAQ.html#selecting-dev-names-when-creating-a-pool-linux).
'';
};
@@ -327,6 +332,23 @@ in
'';
};
+ pools = lib.mkOption {
+ type = lib.types.attrsOf (lib.types.submodule {
+ options = {
+ devNodes = lib.mkOption {
+ type = lib.types.path;
+ default = cfgZfs.devNodes;
+ defaultText = "config.boot.zfs.devNodes";
+ description = options.boot.zfs.devNodes.description;
+ };
+ };
+ });
+ default = { };
+ description = ''
+ Configuration for individual pools to override global defaults.
+ '';
+ };
+
removeLinuxDRM = lib.mkOption {
type = lib.types.bool;
default = false;
@@ -608,12 +630,12 @@ in
# See comments at importLib definition.
zpoolCmd = "zpool";
awkCmd = "awk";
- inherit cfgZfs;
+ pool = null;
})] ++ (map (pool: ''
echo -n "importing root ZFS pool \"${pool}\"..."
# Loop across the import until it succeeds, because the devices needed may not be discovered yet.
if ! poolImported "${pool}"; then
- for trial in `seq 1 60`; do
+ for _ in $(seq 1 60); do
poolReady "${pool}" > /dev/null && msg="$(poolImport "${pool}" 2>&1)" && break
sleep 1
echo -n .
@@ -865,6 +887,7 @@ in
Type = "simple";
};
script = ''
+ # shellcheck disable=SC2046
${cfgZfs.package}/bin/zpool scrub -w ${
if cfgScrub.pools != [] then
(lib.concatStringsSep " " cfgScrub.pools)
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index ecb57483cce9..76d8a3bb365b 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -1,22 +1,33 @@
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
with lib;
let
cfg = config.virtualisation.azureImage;
in
{
- imports = [ ./azure-common.nix ];
+ imports = [
+ ./azure-common.nix
+ ./disk-size-option.nix
+ (lib.mkRenamedOptionModuleWith {
+ sinceRelease = 2411;
+ from = [
+ "virtualisation"
+ "azureImage"
+ "diskSize"
+ ];
+ to = [
+ "virtualisation"
+ "diskSize"
+ ];
+ })
+ ];
options.virtualisation.azureImage = {
- diskSize = mkOption {
- type = with types; either (enum [ "auto" ]) int;
- default = "auto";
- example = 2048;
- description = ''
- Size of disk image. Unit is MB.
- '';
- };
-
bootSize = mkOption {
type = types.int;
default = 256;
@@ -35,7 +46,12 @@ in
};
vmGeneration = mkOption {
- type = with types; enum [ "v1" "v2" ];
+ type =
+ with types;
+ enum [
+ "v1"
+ "v2"
+ ];
default = "v1";
description = ''
VM Generation to use.
@@ -57,7 +73,8 @@ in
bootSize = "${toString cfg.bootSize}M";
partitionTableType = if cfg.vmGeneration == "v2" then "efi" else "legacy";
- inherit (cfg) diskSize contents;
+ inherit (cfg) contents;
+ inherit (config.virtualisation) diskSize;
inherit config lib pkgs;
};
};
diff --git a/nixos/modules/virtualisation/digital-ocean-image.nix b/nixos/modules/virtualisation/digital-ocean-image.nix
index 53791e911406..b6ef01516e34 100644
--- a/nixos/modules/virtualisation/digital-ocean-image.nix
+++ b/nixos/modules/virtualisation/digital-ocean-image.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
with lib;
let
@@ -6,18 +11,24 @@ let
in
{
- imports = [ ./digital-ocean-config.nix ];
+ imports = [
+ ./digital-ocean-config.nix
+ ./disk-size-option.nix
+ (lib.mkRenamedOptionModuleWith {
+ sinceRelease = 2411;
+ from = [
+ "virtualisation"
+ "digitalOceanImage"
+ "diskSize"
+ ];
+ to = [
+ "virtualisation"
+ "diskSize"
+ ];
+ })
+ ];
options = {
- virtualisation.digitalOceanImage.diskSize = mkOption {
- type = with types; either (enum [ "auto" ]) int;
- default = "auto";
- example = 4096;
- description = ''
- Size of disk image. Unit is MB.
- '';
- };
-
virtualisation.digitalOceanImage.configFile = mkOption {
type = with types; nullOr path;
default = null;
@@ -31,7 +42,10 @@ in
};
virtualisation.digitalOceanImage.compressionMethod = mkOption {
- type = types.enum [ "gzip" "bzip2" ];
+ type = types.enum [
+ "gzip"
+ "bzip2"
+ ];
default = "gzip";
example = "bzip2";
description = ''
@@ -44,27 +58,35 @@ in
#### implementation
config = {
-
system.build.digitalOceanImage = import ../../lib/make-disk-image.nix {
name = "digital-ocean-image";
format = "qcow2";
- postVM = let
- compress = {
- "gzip" = "${pkgs.gzip}/bin/gzip";
- "bzip2" = "${pkgs.bzip2}/bin/bzip2";
- }.${cfg.compressionMethod};
- in ''
- ${compress} $diskImage
- '';
- configFile = if cfg.configFile == null
- then config.virtualisation.digitalOcean.defaultConfigFile
- else cfg.configFile;
- inherit (cfg) diskSize;
+ postVM =
+ let
+ compress =
+ {
+ "gzip" = "${pkgs.gzip}/bin/gzip";
+ "bzip2" = "${pkgs.bzip2}/bin/bzip2";
+ }
+ .${cfg.compressionMethod};
+ in
+ ''
+ ${compress} $diskImage
+ '';
+ configFile =
+ if cfg.configFile == null then
+ config.virtualisation.digitalOcean.defaultConfigFile
+ else
+ cfg.configFile;
+ inherit (config.virtualisation) diskSize;
inherit config lib pkgs;
};
};
- meta.maintainers = with maintainers; [ arianvp eamsden ];
+ meta.maintainers = with maintainers; [
+ arianvp
+ eamsden
+ ];
}
diff --git a/nixos/modules/virtualisation/disk-size-option.nix b/nixos/modules/virtualisation/disk-size-option.nix
new file mode 100644
index 000000000000..487c3adfe2b7
--- /dev/null
+++ b/nixos/modules/virtualisation/disk-size-option.nix
@@ -0,0 +1,38 @@
+{ lib, config, ... }:
+let
+ t = lib.types;
+in
+{
+ options = {
+ virtualisation.diskSizeAutoSupported = lib.mkOption {
+ type = t.bool;
+ default = true;
+ description = ''
+ Whether the current image builder or vm runner supports `virtualisation.diskSize = "auto".`
+ '';
+ internal = true;
+ };
+
+ virtualisation.diskSize = lib.mkOption {
+ type = t.either (t.enum [ "auto" ]) t.ints.positive;
+ default = if config.virtualisation.diskSizeAutoSupported then "auto" else 1024;
+ defaultText = "\"auto\" if diskSizeAutoSupported, else 1024";
+ description = ''
+ The disk size in megabytes of the virtual machine.
+ '';
+ };
+ };
+
+ config =
+ let
+ inherit (config.virtualisation) diskSize diskSizeAutoSupported;
+ in
+ {
+ assertions = [
+ {
+ assertion = diskSize != "auto" || diskSizeAutoSupported;
+ message = "Setting virtualisation.diskSize to `auto` is not supported by the current image build or vm runner; use an explicit size.";
+ }
+ ];
+ };
+}
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 8e7b31b439bf..c2529bb3db3f 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
with lib;
let
@@ -14,18 +19,24 @@ let
in
{
- imports = [ ./google-compute-config.nix ];
+ imports = [
+ ./google-compute-config.nix
+ ./disk-size-option.nix
+ (lib.mkRenamedOptionModuleWith {
+ sinceRelease = 2411;
+ from = [
+ "virtualisation"
+ "googleComputeImage"
+ "diskSize"
+ ];
+ to = [
+ "virtualisation"
+ "diskSize"
+ ];
+ })
+ ];
options = {
- virtualisation.googleComputeImage.diskSize = mkOption {
- type = with types; either (enum [ "auto" ]) int;
- default = "auto";
- example = 1536;
- description = ''
- Size of disk image. Unit is MB.
- '';
- };
-
virtualisation.googleComputeImage.configFile = mkOption {
type = with types; nullOr str;
default = null;
@@ -64,7 +75,13 @@ in
system.build.googleComputeImage = import ../../lib/make-disk-image.nix {
name = "google-compute-image";
postVM = ''
- PATH=$PATH:${with pkgs; lib.makeBinPath [ gnutar gzip ]}
+ PATH=$PATH:${
+ with pkgs;
+ lib.makeBinPath [
+ gnutar
+ gzip
+ ]
+ }
pushd $out
mv $diskImage disk.raw
tar -Sc disk.raw | gzip -${toString cfg.compressionLevel} > \
@@ -75,7 +92,7 @@ in
format = "raw";
configFile = if cfg.configFile == null then defaultConfigFile else cfg.configFile;
partitionTableType = if cfg.efi then "efi" else "legacy";
- inherit (cfg) diskSize;
+ inherit (config.virtualisation) diskSize;
inherit config lib pkgs;
};
diff --git a/nixos/modules/virtualisation/hyperv-image.nix b/nixos/modules/virtualisation/hyperv-image.nix
index eb1bbe9f3a58..ea0603fa6ae5 100644
--- a/nixos/modules/virtualisation/hyperv-image.nix
+++ b/nixos/modules/virtualisation/hyperv-image.nix
@@ -1,21 +1,34 @@
-{ config, pkgs, lib, ... }:
+{
+ config,
+ pkgs,
+ lib,
+ ...
+}:
with lib;
let
cfg = config.hyperv;
+in
+{
+
+ imports = [
+ ./disk-size-option.nix
+ (lib.mkRenamedOptionModuleWith {
+ sinceRelease = 2411;
+ from = [
+ "hyperv"
+ "baseImageSize"
+ ];
+ to = [
+ "virtualisation"
+ "diskSize"
+ ];
+ })
+ ];
-in {
options = {
hyperv = {
- baseImageSize = mkOption {
- type = with types; either (enum [ "auto" ]) int;
- default = "auto";
- example = 2048;
- description = ''
- The size of the hyper-v base image in MiB.
- '';
- };
vmDerivationName = mkOption {
type = types.str;
default = "nixos-hyperv-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}";
@@ -34,6 +47,10 @@ in {
};
config = {
+ # Use a priority just below mkOptionDefault (1500) instead of lib.mkDefault
+ # to avoid breaking existing configs using that.
+ virtualisation.diskSize = lib.mkOverride 1490 (4 * 1024);
+
system.build.hypervImage = import ../../lib/make-disk-image.nix {
name = cfg.vmDerivationName;
postVM = ''
@@ -41,7 +58,7 @@ in {
rm $diskImage
'';
format = "raw";
- diskSize = cfg.baseImageSize;
+ inherit (config.virtualisation) diskSize;
partitionTableType = "efi";
inherit config lib pkgs;
};
diff --git a/nixos/modules/virtualisation/linode-image.nix b/nixos/modules/virtualisation/linode-image.nix
index 51f793ac011d..ff61c5f5d1db 100644
--- a/nixos/modules/virtualisation/linode-image.nix
+++ b/nixos/modules/virtualisation/linode-image.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
with lib;
let
@@ -12,17 +17,24 @@ let
'';
in
{
- imports = [ ./linode-config.nix ];
+ imports = [
+ ./linode-config.nix
+ ./disk-size-option.nix
+ (lib.mkRenamedOptionModuleWith {
+ sinceRelease = 2411;
+ from = [
+ "virtualisation"
+ "linodeImage"
+ "diskSize"
+ ];
+ to = [
+ "virtualisation"
+ "diskSize"
+ ];
+ })
+ ];
options = {
- virtualisation.linodeImage.diskSize = mkOption {
- type = with types; either (enum (singleton "auto")) ints.positive;
- default = "auto";
- example = 1536;
- description = ''
- Size of disk image in MB.
- '';
- };
virtualisation.linodeImage.configFile = mkOption {
type = with types; nullOr str;
@@ -57,7 +69,7 @@ in
format = "raw";
partitionTableType = "none";
configFile = if cfg.configFile == null then defaultConfigFile else cfg.configFile;
- inherit (cfg) diskSize;
+ inherit (config.virtualisation) diskSize;
inherit config lib pkgs;
};
};
diff --git a/nixos/modules/virtualisation/oci-image.nix b/nixos/modules/virtualisation/oci-image.nix
index 1e2b90bfd46e..fe286853de81 100644
--- a/nixos/modules/virtualisation/oci-image.nix
+++ b/nixos/modules/virtualisation/oci-image.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
let
cfg = config.oci;
@@ -7,9 +12,14 @@ in
imports = [ ./oci-common.nix ];
config = {
+ # Use a priority just below mkOptionDefault (1500) instead of lib.mkDefault
+ # to avoid breaking existing configs using that.
+ virtualisation.diskSize = lib.mkOverride 1490 (8 * 1024);
+ virtualisation.diskSizeAutoSupported = false;
+
system.build.OCIImage = import ../../lib/make-disk-image.nix {
inherit config lib pkgs;
- inherit (cfg) diskSize;
+ inherit (config.virtualisation) diskSize;
name = "oci-image";
configFile = ./oci-config-user.nix;
format = "qcow2";
@@ -25,7 +35,10 @@ in
after = [ "network-online.target" ];
wants = [ "network-online.target" ];
- path = [ pkgs.coreutils pkgs.curl ];
+ path = [
+ pkgs.coreutils
+ pkgs.curl
+ ];
script = ''
mkdir -m 0700 -p /root/.ssh
if [ -f /root/.ssh/authorized_keys ]; then
diff --git a/nixos/modules/virtualisation/oci-options.nix b/nixos/modules/virtualisation/oci-options.nix
index 76f3475a4281..b8d66c0290b3 100644
--- a/nixos/modules/virtualisation/oci-options.nix
+++ b/nixos/modules/virtualisation/oci-options.nix
@@ -1,5 +1,23 @@
-{ config, lib, pkgs, ... }:
{
+ lib,
+ ...
+}:
+{
+ imports = [
+ ./disk-size-option.nix
+ (lib.mkRenamedOptionModuleWith {
+ sinceRelease = 2411;
+ from = [
+ "oci"
+ "diskSize"
+ ];
+ to = [
+ "virtualisation"
+ "diskSize"
+ ];
+ })
+ ];
+
options = {
oci = {
efi = lib.mkOption {
@@ -9,12 +27,6 @@
Whether the OCI instance is using EFI.
'';
};
- diskSize = lib.mkOption {
- type = lib.types.int;
- default = 8192;
- description = "Size of the disk image created in MB.";
- example = "diskSize = 12 * 1024; # 12GiB";
- };
};
};
}
diff --git a/nixos/modules/virtualisation/proxmox-image.nix b/nixos/modules/virtualisation/proxmox-image.nix
index d390c78432ae..9bbe7a596f07 100644
--- a/nixos/modules/virtualisation/proxmox-image.nix
+++ b/nixos/modules/virtualisation/proxmox-image.nix
@@ -1,8 +1,28 @@
-{ config, pkgs, lib, ... }:
+{
+ config,
+ pkgs,
+ lib,
+ ...
+}:
with lib;
-
{
+ imports = [
+ ./disk-size-option.nix
+ (lib.mkRenamedOptionModuleWith {
+ sinceRelease = 2411;
+ from = [
+ "proxmox"
+ "qemuConf"
+ "diskSize"
+ ];
+ to = [
+ "virtualisation"
+ "diskSize"
+ ];
+ })
+ ];
+
options.proxmox = {
qemuConf = {
# essential configs
@@ -54,7 +74,10 @@ with lib;
'';
};
bios = mkOption {
- type = types.enum [ "seabios" "ovmf" ];
+ type = types.enum [
+ "seabios"
+ "ovmf"
+ ];
default = "seabios";
description = ''
Select BIOS implementation (seabios = Legacy BIOS, ovmf = UEFI).
@@ -87,16 +110,6 @@ with lib;
either "efi" or "hybrid".
'';
};
- diskSize = mkOption {
- type = types.str;
- default = "auto";
- example = "20480";
- description = ''
- The size of the disk, in megabytes.
- if "auto" size is calculated based on the contents copied to it and
- additionalSpace is taken into account.
- '';
- };
net0 = mkOption {
type = types.commas;
default = "virtio=00:00:00:00:00:00,bridge=vmbr0,firewall=1";
@@ -124,8 +137,13 @@ with lib;
};
};
qemuExtraConf = mkOption {
- type = with types; attrsOf (oneOf [ str int ]);
- default = {};
+ type =
+ with types;
+ attrsOf (oneOf [
+ str
+ int
+ ]);
+ default = { };
example = literalExpression ''
{
cpu = "host";
@@ -137,7 +155,12 @@ with lib;
'';
};
partitionTableType = mkOption {
- type = types.enum [ "efi" "hybrid" "legacy" "legacy+gpt" ];
+ type = types.enum [
+ "efi"
+ "hybrid"
+ "legacy"
+ "legacy+gpt"
+ ];
description = ''
Partition table type to use. See make-disk-image.nix partitionTableType for details.
Defaults to 'legacy' for 'proxmox.qemuConf.bios="seabios"' (default), other bios values defaults to 'efi'.
@@ -185,142 +208,163 @@ with lib;
};
};
- config = let
- cfg = config.proxmox;
- cfgLine = name: value: ''
- ${name}: ${builtins.toString value}
- '';
- virtio0Storage = builtins.head (builtins.split ":" cfg.qemuConf.virtio0);
- cfgFile = fileName: properties: pkgs.writeTextDir fileName ''
- # generated by NixOS
- ${lib.concatStrings (lib.mapAttrsToList cfgLine properties)}
- #qmdump#map:virtio0:drive-virtio0:${virtio0Storage}:raw:
- '';
- inherit (cfg) partitionTableType;
- supportEfi = partitionTableType == "efi" || partitionTableType == "hybrid";
- supportBios = partitionTableType == "legacy" || partitionTableType == "hybrid" || partitionTableType == "legacy+gpt";
- hasBootPartition = partitionTableType == "efi" || partitionTableType == "hybrid";
- hasNoFsPartition = partitionTableType == "hybrid" || partitionTableType == "legacy+gpt";
- in {
- assertions = [
- {
- assertion = config.boot.loader.systemd-boot.enable -> config.proxmox.qemuConf.bios == "ovmf";
- message = "systemd-boot requires 'ovmf' bios";
- }
- {
- assertion = partitionTableType == "efi" -> config.proxmox.qemuConf.bios == "ovmf";
- message = "'efi' disk partitioning requires 'ovmf' bios";
- }
- {
- assertion = partitionTableType == "legacy" -> config.proxmox.qemuConf.bios == "seabios";
- message = "'legacy' disk partitioning requires 'seabios' bios";
- }
- {
- assertion = partitionTableType == "legacy+gpt" -> config.proxmox.qemuConf.bios == "seabios";
- message = "'legacy+gpt' disk partitioning requires 'seabios' bios";
- }
- ];
- system.build.VMA = import ../../lib/make-disk-image.nix {
- name = "proxmox-${cfg.filenameSuffix}";
- inherit (cfg) partitionTableType;
- postVM = let
- # Build qemu with PVE's patch that adds support for the VMA format
- vma = (pkgs.qemu_kvm.override {
- alsaSupport = false;
- pulseSupport = false;
- sdlSupport = false;
- jackSupport = false;
- gtkSupport = false;
- vncSupport = false;
- smartcardSupport = false;
- spiceSupport = false;
- ncursesSupport = false;
- libiscsiSupport = false;
- tpmSupport = false;
- numaSupport = false;
- seccompSupport = false;
- guestAgentSupport = false;
- }).overrideAttrs ( super: rec {
- # Check https://github.com/proxmox/pve-qemu/tree/master for the version
- # of qemu and patch to use
- version = "9.0.0";
- src = pkgs.fetchurl {
- url = "https://download.qemu.org/qemu-${version}.tar.xz";
- hash = "sha256-MnCKxmww2MiSYz6paMdxwcdtWX1w3erSGg0izPOG2mk=";
- };
- patches = [
- # Proxmox' VMA tool is published as a particular patch upon QEMU
- "${pkgs.fetchFromGitHub {
- owner = "proxmox";
- repo = "pve-qemu";
- rev = "14afbdd55f04d250bd679ca1ad55d3f47cd9d4c8";
- hash = "sha256-lSJQA5SHIHfxJvMLIID2drv2H43crTPMNIlIT37w9Nc=";
- }}/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch"
- ];
-
- buildInputs = super.buildInputs ++ [ pkgs.libuuid ];
- nativeBuildInputs = super.nativeBuildInputs ++ [ pkgs.perl ];
-
- });
- in
- ''
- ${vma}/bin/vma create "vzdump-qemu-${cfg.filenameSuffix}.vma" \
- -c ${cfgFile "qemu-server.conf" (cfg.qemuConf // cfg.qemuExtraConf)}/qemu-server.conf drive-virtio0=$diskImage
- rm $diskImage
- ${pkgs.zstd}/bin/zstd "vzdump-qemu-${cfg.filenameSuffix}.vma"
- mv "vzdump-qemu-${cfg.filenameSuffix}.vma.zst" $out/
-
- mkdir -p $out/nix-support
- echo "file vma $out/vzdump-qemu-${cfg.filenameSuffix}.vma.zst" > $out/nix-support/hydra-build-products
+ config =
+ let
+ cfg = config.proxmox;
+ cfgLine = name: value: ''
+ ${name}: ${builtins.toString value}
'';
- inherit (cfg.qemuConf) additionalSpace diskSize bootSize;
- format = "raw";
- inherit config lib pkgs;
- };
+ virtio0Storage = builtins.head (builtins.split ":" cfg.qemuConf.virtio0);
+ cfgFile =
+ fileName: properties:
+ pkgs.writeTextDir fileName ''
+ # generated by NixOS
+ ${lib.concatStrings (lib.mapAttrsToList cfgLine properties)}
+ #qmdump#map:virtio0:drive-virtio0:${virtio0Storage}:raw:
+ '';
+ inherit (cfg) partitionTableType;
+ supportEfi = partitionTableType == "efi" || partitionTableType == "hybrid";
+ supportBios =
+ partitionTableType == "legacy"
+ || partitionTableType == "hybrid"
+ || partitionTableType == "legacy+gpt";
+ hasBootPartition = partitionTableType == "efi" || partitionTableType == "hybrid";
+ hasNoFsPartition = partitionTableType == "hybrid" || partitionTableType == "legacy+gpt";
+ in
+ {
+ assertions = [
+ {
+ assertion = config.boot.loader.systemd-boot.enable -> config.proxmox.qemuConf.bios == "ovmf";
+ message = "systemd-boot requires 'ovmf' bios";
+ }
+ {
+ assertion = partitionTableType == "efi" -> config.proxmox.qemuConf.bios == "ovmf";
+ message = "'efi' disk partitioning requires 'ovmf' bios";
+ }
+ {
+ assertion = partitionTableType == "legacy" -> config.proxmox.qemuConf.bios == "seabios";
+ message = "'legacy' disk partitioning requires 'seabios' bios";
+ }
+ {
+ assertion = partitionTableType == "legacy+gpt" -> config.proxmox.qemuConf.bios == "seabios";
+ message = "'legacy+gpt' disk partitioning requires 'seabios' bios";
+ }
+ ];
+ system.build.VMA = import ../../lib/make-disk-image.nix {
+ name = "proxmox-${cfg.filenameSuffix}";
+ inherit (cfg) partitionTableType;
+ postVM =
+ let
+ # Build qemu with PVE's patch that adds support for the VMA format
+ vma =
+ (pkgs.qemu_kvm.override {
+ alsaSupport = false;
+ pulseSupport = false;
+ sdlSupport = false;
+ jackSupport = false;
+ gtkSupport = false;
+ vncSupport = false;
+ smartcardSupport = false;
+ spiceSupport = false;
+ ncursesSupport = false;
+ libiscsiSupport = false;
+ tpmSupport = false;
+ numaSupport = false;
+ seccompSupport = false;
+ guestAgentSupport = false;
+ }).overrideAttrs
+ (super: rec {
+ # Check https://github.com/proxmox/pve-qemu/tree/master for the version
+ # of qemu and patch to use
+ version = "9.0.0";
+ src = pkgs.fetchurl {
+ url = "https://download.qemu.org/qemu-${version}.tar.xz";
+ hash = "sha256-MnCKxmww2MiSYz6paMdxwcdtWX1w3erSGg0izPOG2mk=";
+ };
+ patches = [
+ # Proxmox' VMA tool is published as a particular patch upon QEMU
+ "${
+ pkgs.fetchFromGitHub {
+ owner = "proxmox";
+ repo = "pve-qemu";
+ rev = "14afbdd55f04d250bd679ca1ad55d3f47cd9d4c8";
+ hash = "sha256-lSJQA5SHIHfxJvMLIID2drv2H43crTPMNIlIT37w9Nc=";
+ }
+ }/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch"
+ ];
- boot = {
- growPartition = true;
- kernelParams = [ "console=ttyS0" ];
- loader.grub = {
- device = lib.mkDefault (if (hasNoFsPartition || supportBios) then
- # Even if there is a separate no-fs partition ("/dev/disk/by-partlabel/no-fs" i.e. "/dev/vda2"),
- # which will be used the bootloader, do not set it as loader.grub.device.
- # GRUB installation fails, unless the whole disk is selected.
- "/dev/vda"
- else
- "nodev");
- efiSupport = lib.mkDefault supportEfi;
- efiInstallAsRemovable = lib.mkDefault supportEfi;
+ buildInputs = super.buildInputs ++ [ pkgs.libuuid ];
+ nativeBuildInputs = super.nativeBuildInputs ++ [ pkgs.perl ];
+
+ });
+ in
+ ''
+ ${vma}/bin/vma create "vzdump-qemu-${cfg.filenameSuffix}.vma" \
+ -c ${
+ cfgFile "qemu-server.conf" (cfg.qemuConf // cfg.qemuExtraConf)
+ }/qemu-server.conf drive-virtio0=$diskImage
+ rm $diskImage
+ ${pkgs.zstd}/bin/zstd "vzdump-qemu-${cfg.filenameSuffix}.vma"
+ mv "vzdump-qemu-${cfg.filenameSuffix}.vma.zst" $out/
+
+ mkdir -p $out/nix-support
+ echo "file vma $out/vzdump-qemu-${cfg.filenameSuffix}.vma.zst" > $out/nix-support/hydra-build-products
+ '';
+ inherit (cfg.qemuConf) additionalSpace bootSize;
+ inherit (config.virtualisation) diskSize;
+ format = "raw";
+ inherit config lib pkgs;
};
- loader.timeout = 0;
- initrd.availableKernelModules = [ "uas" "virtio_blk" "virtio_pci" ];
- };
+ boot = {
+ growPartition = true;
+ kernelParams = [ "console=ttyS0" ];
+ loader.grub = {
+ device = lib.mkDefault (
+ if (hasNoFsPartition || supportBios) then
+ # Even if there is a separate no-fs partition ("/dev/disk/by-partlabel/no-fs" i.e. "/dev/vda2"),
+ # which will be used the bootloader, do not set it as loader.grub.device.
+ # GRUB installation fails, unless the whole disk is selected.
+ "/dev/vda"
+ else
+ "nodev"
+ );
+ efiSupport = lib.mkDefault supportEfi;
+ efiInstallAsRemovable = lib.mkDefault supportEfi;
+ };
- fileSystems."/" = {
- device = "/dev/disk/by-label/nixos";
- autoResize = true;
- fsType = "ext4";
- };
- fileSystems."/boot" = lib.mkIf hasBootPartition {
- device = "/dev/disk/by-label/ESP";
- fsType = "vfat";
- };
-
- networking = mkIf cfg.cloudInit.enable {
- hostName = mkForce "";
- useDHCP = false;
- };
-
- services = {
- cloud-init = mkIf cfg.cloudInit.enable {
- enable = true;
- network.enable = true;
+ loader.timeout = 0;
+ initrd.availableKernelModules = [
+ "uas"
+ "virtio_blk"
+ "virtio_pci"
+ ];
};
- sshd.enable = mkDefault true;
- qemuGuest.enable = true;
- };
- proxmox.qemuExtraConf.${cfg.cloudInit.device} = "${cfg.cloudInit.defaultStorage}:vm-9999-cloudinit,media=cdrom";
- };
+ fileSystems."/" = {
+ device = "/dev/disk/by-label/nixos";
+ autoResize = true;
+ fsType = "ext4";
+ };
+ fileSystems."/boot" = lib.mkIf hasBootPartition {
+ device = "/dev/disk/by-label/ESP";
+ fsType = "vfat";
+ };
+
+ networking = mkIf cfg.cloudInit.enable {
+ hostName = mkForce "";
+ useDHCP = false;
+ };
+
+ services = {
+ cloud-init = mkIf cfg.cloudInit.enable {
+ enable = true;
+ network.enable = true;
+ };
+ sshd.enable = mkDefault true;
+ qemuGuest.enable = true;
+ };
+
+ proxmox.qemuExtraConf.${cfg.cloudInit.device} = "${cfg.cloudInit.defaultStorage}:vm-9999-cloudinit,media=cdrom";
+ };
}
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index c6084e559096..af2f13b003a4 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -4,7 +4,13 @@
# `config'. By default, the Nix store is shared read-only with the
# host, which makes (re)building VMs very efficient.
-{ config, lib, pkgs, options, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ options,
+ ...
+}:
with lib;
@@ -22,236 +28,263 @@ let
consoles = lib.concatMapStringsSep " " (c: "console=${c}") cfg.qemu.consoles;
- driveOpts = { ... }: {
+ driveOpts =
+ { ... }:
+ {
- options = {
+ options = {
- file = mkOption {
- type = types.str;
- description = "The file image used for this drive.";
- };
+ file = mkOption {
+ type = types.str;
+ description = "The file image used for this drive.";
+ };
- driveExtraOpts = mkOption {
- type = types.attrsOf types.str;
- default = {};
- description = "Extra options passed to drive flag.";
- };
+ driveExtraOpts = mkOption {
+ type = types.attrsOf types.str;
+ default = { };
+ description = "Extra options passed to drive flag.";
+ };
- deviceExtraOpts = mkOption {
- type = types.attrsOf types.str;
- default = {};
- description = "Extra options passed to device flag.";
- };
+ deviceExtraOpts = mkOption {
+ type = types.attrsOf types.str;
+ default = { };
+ description = "Extra options passed to device flag.";
+ };
+
+ name = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = "A name for the drive. Must be unique in the drives list. Not passed to qemu.";
+ };
- name = mkOption {
- type = types.nullOr types.str;
- default = null;
- description = "A name for the drive. Must be unique in the drives list. Not passed to qemu.";
};
};
- };
+ selectPartitionTableLayout =
+ { useEFIBoot, useDefaultFilesystems }:
+ if useDefaultFilesystems then if useEFIBoot then "efi" else "legacy" else "none";
- selectPartitionTableLayout = { useEFIBoot, useDefaultFilesystems }:
- if useDefaultFilesystems then
- if useEFIBoot then "efi" else "legacy"
- else "none";
-
- driveCmdline = idx: { file, driveExtraOpts, deviceExtraOpts, ... }:
+ driveCmdline =
+ idx:
+ {
+ file,
+ driveExtraOpts,
+ deviceExtraOpts,
+ ...
+ }:
let
drvId = "drive${toString idx}";
- mkKeyValue = generators.mkKeyValueDefault {} "=";
+ mkKeyValue = generators.mkKeyValueDefault { } "=";
mkOpts = opts: concatStringsSep "," (mapAttrsToList mkKeyValue opts);
- driveOpts = mkOpts (driveExtraOpts // {
- index = idx;
- id = drvId;
- "if" = "none";
- inherit file;
- });
- deviceOpts = mkOpts (deviceExtraOpts // {
- drive = drvId;
- });
+ driveOpts = mkOpts (
+ driveExtraOpts
+ // {
+ index = idx;
+ id = drvId;
+ "if" = "none";
+ inherit file;
+ }
+ );
+ deviceOpts = mkOpts (
+ deviceExtraOpts
+ // {
+ drive = drvId;
+ }
+ );
device =
if cfg.qemu.diskInterface == "scsi" then
"-device lsi53c895a -device scsi-hd,${deviceOpts}"
else
"-device virtio-blk-pci,${deviceOpts}";
in
- "-drive ${driveOpts} ${device}";
+ "-drive ${driveOpts} ${device}";
drivesCmdLine = drives: concatStringsSep "\\\n " (imap1 driveCmdline drives);
# Shell script to start the VM.
- startVM =
- ''
- #! ${hostPkgs.runtimeShell}
+ startVM = ''
+ #! ${hostPkgs.runtimeShell}
- export PATH=${makeBinPath [ hostPkgs.coreutils ]}''${PATH:+:}$PATH
+ export PATH=${makeBinPath [ hostPkgs.coreutils ]}''${PATH:+:}$PATH
- set -e
+ set -e
- # Create an empty ext4 filesystem image. A filesystem image does not
- # contain a partition table but just a filesystem.
- createEmptyFilesystemImage() {
- local name=$1
- local size=$2
- local temp=$(mktemp)
- ${qemu}/bin/qemu-img create -f raw "$temp" "$size"
- ${hostPkgs.e2fsprogs}/bin/mkfs.ext4 -L ${rootFilesystemLabel} "$temp"
- ${qemu}/bin/qemu-img convert -f raw -O qcow2 "$temp" "$name"
- rm "$temp"
- }
+ # Create an empty ext4 filesystem image. A filesystem image does not
+ # contain a partition table but just a filesystem.
+ createEmptyFilesystemImage() {
+ local name=$1
+ local size=$2
+ local temp=$(mktemp)
+ ${qemu}/bin/qemu-img create -f raw "$temp" "$size"
+ ${hostPkgs.e2fsprogs}/bin/mkfs.ext4 -L ${rootFilesystemLabel} "$temp"
+ ${qemu}/bin/qemu-img convert -f raw -O qcow2 "$temp" "$name"
+ rm "$temp"
+ }
- NIX_DISK_IMAGE=$(readlink -f "''${NIX_DISK_IMAGE:-${toString config.virtualisation.diskImage}}") || test -z "$NIX_DISK_IMAGE"
+ NIX_DISK_IMAGE=$(readlink -f "''${NIX_DISK_IMAGE:-${toString config.virtualisation.diskImage}}") || test -z "$NIX_DISK_IMAGE"
- if test -n "$NIX_DISK_IMAGE" && ! test -e "$NIX_DISK_IMAGE"; then
- echo "Disk image do not exist, creating the virtualisation disk image..."
+ if test -n "$NIX_DISK_IMAGE" && ! test -e "$NIX_DISK_IMAGE"; then
+ echo "Disk image do not exist, creating the virtualisation disk image..."
- ${if (cfg.useBootLoader && cfg.useDefaultFilesystems) then ''
- # Create a writable qcow2 image using the systemImage as a backing
- # image.
+ ${
+ if (cfg.useBootLoader && cfg.useDefaultFilesystems) then
+ ''
+ # Create a writable qcow2 image using the systemImage as a backing
+ # image.
- # CoW prevent size to be attributed to an image.
- # FIXME: raise this issue to upstream.
- ${qemu}/bin/qemu-img create \
- -f qcow2 \
- -b ${systemImage}/nixos.qcow2 \
- -F qcow2 \
- "$NIX_DISK_IMAGE"
- '' else if cfg.useDefaultFilesystems then ''
- createEmptyFilesystemImage "$NIX_DISK_IMAGE" "${toString cfg.diskSize}M"
- '' else ''
- # Create an empty disk image without a filesystem.
- ${qemu}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" "${toString cfg.diskSize}M"
- ''
- }
- echo "Virtualisation disk image created."
- fi
-
- # Create a directory for storing temporary data of the running VM.
- if [ -z "$TMPDIR" ] || [ -z "$USE_TMPDIR" ]; then
- TMPDIR=$(mktemp -d nix-vm.XXXXXXXXXX --tmpdir)
- fi
-
- ${lib.optionalString (cfg.useNixStoreImage) ''
- echo "Creating Nix store image..."
-
- ${hostPkgs.gnutar}/bin/tar --create \
- --absolute-names \
- --verbatim-files-from \
- --transform 'flags=rSh;s|/nix/store/||' \
- --transform 'flags=rSh;s|~nix~case~hack~[[:digit:]]\+||g' \
- --files-from ${hostPkgs.closureInfo { rootPaths = [ config.system.build.toplevel regInfo ]; }}/store-paths \
- | ${hostPkgs.erofs-utils}/bin/mkfs.erofs \
- --quiet \
- --force-uid=0 \
- --force-gid=0 \
- -L ${nixStoreFilesystemLabel} \
- -U eb176051-bd15-49b7-9e6b-462e0b467019 \
- -T 0 \
- --tar=f \
- "$TMPDIR"/store.img
-
- echo "Created Nix store image."
- ''
- }
-
- # Create a directory for exchanging data with the VM.
- mkdir -p "$TMPDIR/xchg"
-
- ${lib.optionalString cfg.useHostCerts
- ''
- mkdir -p "$TMPDIR/certs"
- if [ -e "$NIX_SSL_CERT_FILE" ]; then
- cp -L "$NIX_SSL_CERT_FILE" "$TMPDIR"/certs/ca-certificates.crt
- else
- echo \$NIX_SSL_CERT_FILE should point to a valid file if virtualisation.useHostCerts is enabled.
- fi
- ''}
-
- ${lib.optionalString cfg.useEFIBoot
- ''
- # Expose EFI variables, it's useful even when we are not using a bootloader (!).
- # We might be interested in having EFI variable storage present even if we aren't booting via UEFI, hence
- # no guard against `useBootLoader`. Examples:
- # - testing PXE boot or other EFI applications
- # - directbooting LinuxBoot, which `kexec()s` into a UEFI environment that can boot e.g. Windows
- NIX_EFI_VARS=$(readlink -f "''${NIX_EFI_VARS:-${config.system.name}-efi-vars.fd}")
- # VM needs writable EFI vars
- if ! test -e "$NIX_EFI_VARS"; then
- ${if cfg.efi.keepVariables then
- # We still need the EFI var from the make-disk-image derivation
- # because our "switch-to-configuration" process might
- # write into it and we want to keep this data.
- ''cp ${systemImage}/efi-vars.fd "$NIX_EFI_VARS"''
- else
- ''cp ${cfg.efi.variables} "$NIX_EFI_VARS"''
- }
- chmod 0644 "$NIX_EFI_VARS"
- fi
- ''}
-
- ${lib.optionalString cfg.tpm.enable ''
- NIX_SWTPM_DIR=$(readlink -f "''${NIX_SWTPM_DIR:-${config.system.name}-swtpm}")
- mkdir -p "$NIX_SWTPM_DIR"
- ${lib.getExe cfg.tpm.package} \
- socket \
- --tpmstate dir="$NIX_SWTPM_DIR" \
- --ctrl type=unixio,path="$NIX_SWTPM_DIR"/socket,terminate \
- --pid file="$NIX_SWTPM_DIR"/pid --daemon \
- --tpm2 \
- --log file="$NIX_SWTPM_DIR"/stdout,level=6
-
- # Enable `fdflags` builtin in Bash
- # We will need it to perform surgical modification of the file descriptor
- # passed in the coprocess to remove `FD_CLOEXEC`, i.e. close the file descriptor
- # on exec.
- # If let alone, it will trigger the coprocess to read EOF when QEMU is `exec`
- # at the end of this script. To work around that, we will just clear
- # the `FD_CLOEXEC` bits as a first step.
- enable -f ${hostPkgs.bash}/lib/bash/fdflags fdflags
- # leave a dangling subprocess because the swtpm ctrl socket has
- # "terminate" when the last connection disconnects, it stops swtpm.
- # When qemu stops, or if the main shell process ends, the coproc will
- # get signaled by virtue of the pipe between main and coproc ending.
- # Which in turns triggers a socat connect-disconnect to swtpm which
- # will stop it.
- coproc waitingswtpm {
- read || :
- echo "" | ${lib.getExe hostPkgs.socat} STDIO UNIX-CONNECT:"$NIX_SWTPM_DIR"/socket
+ # CoW prevent size to be attributed to an image.
+ # FIXME: raise this issue to upstream.
+ ${qemu}/bin/qemu-img create \
+ -f qcow2 \
+ -b ${systemImage}/nixos.qcow2 \
+ -F qcow2 \
+ "$NIX_DISK_IMAGE"
+ ''
+ else if cfg.useDefaultFilesystems then
+ ''
+ createEmptyFilesystemImage "$NIX_DISK_IMAGE" "${toString cfg.diskSize}M"
+ ''
+ else
+ ''
+ # Create an empty disk image without a filesystem.
+ ${qemu}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" "${toString cfg.diskSize}M"
+ ''
}
- # Clear `FD_CLOEXEC` on the coprocess' file descriptor stdin.
- fdflags -s-cloexec ''${waitingswtpm[1]}
- ''}
+ echo "Virtualisation disk image created."
+ fi
- cd "$TMPDIR"
+ # Create a directory for storing temporary data of the running VM.
+ if [ -z "$TMPDIR" ] || [ -z "$USE_TMPDIR" ]; then
+ TMPDIR=$(mktemp -d nix-vm.XXXXXXXXXX --tmpdir)
+ fi
- ${lib.optionalString (cfg.emptyDiskImages != []) "idx=0"}
- ${flip concatMapStrings cfg.emptyDiskImages (size: ''
- if ! test -e "empty$idx.qcow2"; then
- ${qemu}/bin/qemu-img create -f qcow2 "empty$idx.qcow2" "${toString size}M"
- fi
- idx=$((idx + 1))
- '')}
+ ${lib.optionalString (cfg.useNixStoreImage) ''
+ echo "Creating Nix store image..."
- # Start QEMU.
- exec ${qemu-common.qemuBinary qemu} \
- -name ${config.system.name} \
- -m ${toString config.virtualisation.memorySize} \
- -smp ${toString config.virtualisation.cores} \
- -device virtio-rng-pci \
- ${concatStringsSep " " config.virtualisation.qemu.networkingOptions} \
- ${concatStringsSep " \\\n "
- (mapAttrsToList
- (tag: share: "-virtfs local,path=${share.source},security_model=${share.securityModel},mount_tag=${tag}")
- config.virtualisation.sharedDirectories)} \
- ${drivesCmdLine config.virtualisation.qemu.drives} \
- ${concatStringsSep " \\\n " config.virtualisation.qemu.options} \
- $QEMU_OPTS \
- "$@"
- '';
+ ${hostPkgs.gnutar}/bin/tar --create \
+ --absolute-names \
+ --verbatim-files-from \
+ --transform 'flags=rSh;s|/nix/store/||' \
+ --transform 'flags=rSh;s|~nix~case~hack~[[:digit:]]\+||g' \
+ --files-from ${
+ hostPkgs.closureInfo {
+ rootPaths = [
+ config.system.build.toplevel
+ regInfo
+ ];
+ }
+ }/store-paths \
+ | ${hostPkgs.erofs-utils}/bin/mkfs.erofs \
+ --quiet \
+ --force-uid=0 \
+ --force-gid=0 \
+ -L ${nixStoreFilesystemLabel} \
+ -U eb176051-bd15-49b7-9e6b-462e0b467019 \
+ -T 0 \
+ --tar=f \
+ "$TMPDIR"/store.img
+ echo "Created Nix store image."
+ ''}
+
+ # Create a directory for exchanging data with the VM.
+ mkdir -p "$TMPDIR/xchg"
+
+ ${lib.optionalString cfg.useHostCerts ''
+ mkdir -p "$TMPDIR/certs"
+ if [ -e "$NIX_SSL_CERT_FILE" ]; then
+ cp -L "$NIX_SSL_CERT_FILE" "$TMPDIR"/certs/ca-certificates.crt
+ else
+ echo \$NIX_SSL_CERT_FILE should point to a valid file if virtualisation.useHostCerts is enabled.
+ fi
+ ''}
+
+ ${lib.optionalString cfg.useEFIBoot ''
+ # Expose EFI variables, it's useful even when we are not using a bootloader (!).
+ # We might be interested in having EFI variable storage present even if we aren't booting via UEFI, hence
+ # no guard against `useBootLoader`. Examples:
+ # - testing PXE boot or other EFI applications
+ # - directbooting LinuxBoot, which `kexec()s` into a UEFI environment that can boot e.g. Windows
+ NIX_EFI_VARS=$(readlink -f "''${NIX_EFI_VARS:-${config.system.name}-efi-vars.fd}")
+ # VM needs writable EFI vars
+ if ! test -e "$NIX_EFI_VARS"; then
+ ${
+ if cfg.efi.keepVariables then
+ # We still need the EFI var from the make-disk-image derivation
+ # because our "switch-to-configuration" process might
+ # write into it and we want to keep this data.
+ ''cp ${systemImage}/efi-vars.fd "$NIX_EFI_VARS"''
+ else
+ ''cp ${cfg.efi.variables} "$NIX_EFI_VARS"''
+ }
+ chmod 0644 "$NIX_EFI_VARS"
+ fi
+ ''}
+
+ ${lib.optionalString cfg.tpm.enable ''
+ NIX_SWTPM_DIR=$(readlink -f "''${NIX_SWTPM_DIR:-${config.system.name}-swtpm}")
+ mkdir -p "$NIX_SWTPM_DIR"
+ ${lib.getExe cfg.tpm.package} \
+ socket \
+ --tpmstate dir="$NIX_SWTPM_DIR" \
+ --ctrl type=unixio,path="$NIX_SWTPM_DIR"/socket,terminate \
+ --pid file="$NIX_SWTPM_DIR"/pid --daemon \
+ --tpm2 \
+ --log file="$NIX_SWTPM_DIR"/stdout,level=6
+
+ # Enable `fdflags` builtin in Bash
+ # We will need it to perform surgical modification of the file descriptor
+ # passed in the coprocess to remove `FD_CLOEXEC`, i.e. close the file descriptor
+ # on exec.
+ # If let alone, it will trigger the coprocess to read EOF when QEMU is `exec`
+ # at the end of this script. To work around that, we will just clear
+ # the `FD_CLOEXEC` bits as a first step.
+ enable -f ${hostPkgs.bash}/lib/bash/fdflags fdflags
+ # leave a dangling subprocess because the swtpm ctrl socket has
+ # "terminate" when the last connection disconnects, it stops swtpm.
+ # When qemu stops, or if the main shell process ends, the coproc will
+ # get signaled by virtue of the pipe between main and coproc ending.
+ # Which in turns triggers a socat connect-disconnect to swtpm which
+ # will stop it.
+ coproc waitingswtpm {
+ read || :
+ echo "" | ${lib.getExe hostPkgs.socat} STDIO UNIX-CONNECT:"$NIX_SWTPM_DIR"/socket
+ }
+ # Clear `FD_CLOEXEC` on the coprocess' file descriptor stdin.
+ fdflags -s-cloexec ''${waitingswtpm[1]}
+ ''}
+
+ cd "$TMPDIR"
+
+ ${lib.optionalString (cfg.emptyDiskImages != [ ]) "idx=0"}
+ ${flip concatMapStrings cfg.emptyDiskImages (size: ''
+ if ! test -e "empty$idx.qcow2"; then
+ ${qemu}/bin/qemu-img create -f qcow2 "empty$idx.qcow2" "${toString size}M"
+ fi
+ idx=$((idx + 1))
+ '')}
+
+ # Start QEMU.
+ exec ${qemu-common.qemuBinary qemu} \
+ -name ${config.system.name} \
+ -m ${toString config.virtualisation.memorySize} \
+ -smp ${toString config.virtualisation.cores} \
+ -device virtio-rng-pci \
+ ${concatStringsSep " " config.virtualisation.qemu.networkingOptions} \
+ ${
+ concatStringsSep " \\\n " (
+ mapAttrsToList (
+ tag: share:
+ "-virtfs local,path=${share.source},security_model=${share.securityModel},mount_tag=${tag}"
+ ) config.virtualisation.sharedDirectories
+ )
+ } \
+ ${drivesCmdLine config.virtualisation.qemu.drives} \
+ ${concatStringsSep " \\\n " config.virtualisation.qemu.options} \
+ $QEMU_OPTS \
+ "$@"
+ '';
regInfo = hostPkgs.closureInfo { rootPaths = config.virtualisation.additionalPaths; };
@@ -284,216 +317,239 @@ let
copyChannel = false;
OVMF = cfg.efi.OVMF;
};
-
in
-
{
imports = [
../profiles/qemu-guest.nix
- (mkRenamedOptionModule [ "virtualisation" "pathsInNixDB" ] [ "virtualisation" "additionalPaths" ])
- (mkRemovedOptionModule [ "virtualisation" "bootDevice" ] "This option was renamed to `virtualisation.rootDevice`, as it was incorrectly named and misleading. Take the time to review what you want to do and look at the new options like `virtualisation.{bootLoaderDevice, bootPartition}`, open an issue in case of issues.")
- (mkRemovedOptionModule [ "virtualisation" "efiVars" ] "This option was removed, it is possible to provide a template UEFI variable with `virtualisation.efi.variables` ; if this option is important to you, open an issue")
- (mkRemovedOptionModule [ "virtualisation" "persistBootDevice" ] "Boot device is always persisted if you use a bootloader through the root disk image ; if this does not work for your usecase, please examine carefully what `virtualisation.{bootDevice, rootDevice, bootPartition}` options offer you and open an issue explaining your need.`")
+ ./disk-size-option.nix
+ (mkRenamedOptionModule
+ [
+ "virtualisation"
+ "pathsInNixDB"
+ ]
+ [
+ "virtualisation"
+ "additionalPaths"
+ ]
+ )
+ (mkRemovedOptionModule
+ [
+ "virtualisation"
+ "bootDevice"
+ ]
+ "This option was renamed to `virtualisation.rootDevice`, as it was incorrectly named and misleading. Take the time to review what you want to do and look at the new options like `virtualisation.{bootLoaderDevice, bootPartition}`, open an issue in case of issues."
+ )
+ (mkRemovedOptionModule
+ [
+ "virtualisation"
+ "efiVars"
+ ]
+ "This option was removed, it is possible to provide a template UEFI variable with `virtualisation.efi.variables` ; if this option is important to you, open an issue"
+ )
+ (mkRemovedOptionModule
+ [
+ "virtualisation"
+ "persistBootDevice"
+ ]
+ "Boot device is always persisted if you use a bootloader through the root disk image ; if this does not work for your usecase, please examine carefully what `virtualisation.{bootDevice, rootDevice, bootPartition}` options offer you and open an issue explaining your need.`"
+ )
];
options = {
virtualisation.fileSystems = options.fileSystems;
- virtualisation.memorySize =
- mkOption {
- type = types.ints.positive;
- default = 1024;
- description = ''
- The memory size in megabytes of the virtual machine.
- '';
+ virtualisation.memorySize = mkOption {
+ type = types.ints.positive;
+ default = 1024;
+ description = ''
+ The memory size in megabytes of the virtual machine.
+ '';
+ };
+
+ virtualisation.msize = mkOption {
+ type = types.ints.positive;
+ default = 16384;
+ description = ''
+ The msize (maximum packet size) option passed to 9p file systems, in
+ bytes. Increasing this should increase performance significantly,
+ at the cost of higher RAM usage.
+ '';
+ };
+
+ virtualisation.diskImage = mkOption {
+ type = types.nullOr types.str;
+ default = "./${config.system.name}.qcow2";
+ defaultText = literalExpression ''"./''${config.system.name}.qcow2"'';
+ description = ''
+ Path to the disk image containing the root filesystem.
+ The image will be created on startup if it does not
+ exist.
+
+ If null, a tmpfs will be used as the root filesystem and
+ the VM's state will not be persistent.
+ '';
+ };
+
+ virtualisation.bootLoaderDevice = mkOption {
+ type = types.path;
+ default = "/dev/disk/by-id/virtio-${rootDriveSerialAttr}";
+ defaultText = literalExpression ''/dev/disk/by-id/virtio-${rootDriveSerialAttr}'';
+ example = "/dev/disk/by-id/virtio-boot-loader-device";
+ description = ''
+ The path (inside th VM) to the device to boot from when legacy booting.
+ '';
+ };
+
+ virtualisation.bootPartition = mkOption {
+ type = types.nullOr types.path;
+ default = if cfg.useEFIBoot then "/dev/disk/by-label/${espFilesystemLabel}" else null;
+ defaultText = literalExpression ''if cfg.useEFIBoot then "/dev/disk/by-label/${espFilesystemLabel}" else null'';
+ example = "/dev/disk/by-label/esp";
+ description = ''
+ The path (inside the VM) to the device containing the EFI System Partition (ESP).
+
+ If you are *not* booting from a UEFI firmware, this value is, by
+ default, `null`. The ESP is mounted to `boot.loader.efi.efiSysMountpoint`.
+ '';
+ };
+
+ virtualisation.rootDevice = mkOption {
+ type = types.nullOr types.path;
+ default = "/dev/disk/by-label/${rootFilesystemLabel}";
+ defaultText = literalExpression ''/dev/disk/by-label/${rootFilesystemLabel}'';
+ example = "/dev/disk/by-label/nixos";
+ description = ''
+ The path (inside the VM) to the device containing the root filesystem.
+ '';
+ };
+
+ virtualisation.emptyDiskImages = mkOption {
+ type = types.listOf types.ints.positive;
+ default = [ ];
+ description = ''
+ Additional disk images to provide to the VM. The value is
+ a list of size in megabytes of each disk. These disks are
+ writeable by the VM.
+ '';
+ };
+
+ virtualisation.graphics = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to run QEMU with a graphics window, or in nographic mode.
+ Serial console will be enabled on both settings, but this will
+ change the preferred console.
+ '';
+ };
+
+ virtualisation.resolution = mkOption {
+ type = options.services.xserver.resolutions.type.nestedTypes.elemType;
+ default = {
+ x = 1024;
+ y = 768;
};
+ description = ''
+ The resolution of the virtual machine display.
+ '';
+ };
- virtualisation.msize =
- mkOption {
- type = types.ints.positive;
- default = 16384;
- description = ''
- The msize (maximum packet size) option passed to 9p file systems, in
- bytes. Increasing this should increase performance significantly,
- at the cost of higher RAM usage.
- '';
- };
+ virtualisation.cores = mkOption {
+ type = types.ints.positive;
+ default = 1;
+ description = ''
+ Specify the number of cores the guest is permitted to use.
+ The number can be higher than the available cores on the
+ host system.
+ '';
+ };
- virtualisation.diskSize =
- mkOption {
- type = types.ints.positive;
- default = 1024;
- description = ''
- The disk size in megabytes of the virtual machine.
- '';
- };
+ virtualisation.sharedDirectories = mkOption {
+ type = types.attrsOf (
+ types.submodule {
+ options.source = mkOption {
+ type = types.str;
+ description = "The path of the directory to share, can be a shell variable";
+ };
+ options.target = mkOption {
+ type = types.path;
+ description = "The mount point of the directory inside the virtual machine";
+ };
+ options.securityModel = mkOption {
+ type = types.enum [
+ "passthrough"
+ "mapped-xattr"
+ "mapped-file"
+ "none"
+ ];
+ default = "mapped-xattr";
+ description = ''
+ The security model to use for this share:
- virtualisation.diskImage =
- mkOption {
- type = types.nullOr types.str;
- default = "./${config.system.name}.qcow2";
- defaultText = literalExpression ''"./''${config.system.name}.qcow2"'';
- description = ''
- Path to the disk image containing the root filesystem.
- The image will be created on startup if it does not
- exist.
-
- If null, a tmpfs will be used as the root filesystem and
- the VM's state will not be persistent.
- '';
- };
-
- virtualisation.bootLoaderDevice =
- mkOption {
- type = types.path;
- default = "/dev/disk/by-id/virtio-${rootDriveSerialAttr}";
- defaultText = literalExpression ''/dev/disk/by-id/virtio-${rootDriveSerialAttr}'';
- example = "/dev/disk/by-id/virtio-boot-loader-device";
- description = ''
- The path (inside th VM) to the device to boot from when legacy booting.
- '';
- };
-
- virtualisation.bootPartition =
- mkOption {
- type = types.nullOr types.path;
- default = if cfg.useEFIBoot then "/dev/disk/by-label/${espFilesystemLabel}" else null;
- defaultText = literalExpression ''if cfg.useEFIBoot then "/dev/disk/by-label/${espFilesystemLabel}" else null'';
- example = "/dev/disk/by-label/esp";
- description = ''
- The path (inside the VM) to the device containing the EFI System Partition (ESP).
-
- If you are *not* booting from a UEFI firmware, this value is, by
- default, `null`. The ESP is mounted to `boot.loader.efi.efiSysMountpoint`.
- '';
- };
-
- virtualisation.rootDevice =
- mkOption {
- type = types.nullOr types.path;
- default = "/dev/disk/by-label/${rootFilesystemLabel}";
- defaultText = literalExpression ''/dev/disk/by-label/${rootFilesystemLabel}'';
- example = "/dev/disk/by-label/nixos";
- description = ''
- The path (inside the VM) to the device containing the root filesystem.
- '';
- };
-
- virtualisation.emptyDiskImages =
- mkOption {
- type = types.listOf types.ints.positive;
- default = [];
- description = ''
- Additional disk images to provide to the VM. The value is
- a list of size in megabytes of each disk. These disks are
- writeable by the VM.
- '';
- };
-
- virtualisation.graphics =
- mkOption {
- type = types.bool;
- default = true;
- description = ''
- Whether to run QEMU with a graphics window, or in nographic mode.
- Serial console will be enabled on both settings, but this will
- change the preferred console.
+ - `passthrough`: files are stored using the same credentials as they are created on the guest (this requires QEMU to run as root)
+ - `mapped-xattr`: some of the file attributes like uid, gid, mode bits and link target are stored as file attributes
+ - `mapped-file`: the attributes are stored in the hidden .virtfs_metadata directory. Directories exported by this security model cannot interact with other unix tools
+ - `none`: same as "passthrough" except the sever won't report failures if it fails to set file attributes like ownership
'';
- };
-
- virtualisation.resolution =
- mkOption {
- type = options.services.xserver.resolutions.type.nestedTypes.elemType;
- default = { x = 1024; y = 768; };
- description = ''
- The resolution of the virtual machine display.
- '';
- };
-
- virtualisation.cores =
- mkOption {
- type = types.ints.positive;
- default = 1;
- description = ''
- Specify the number of cores the guest is permitted to use.
- The number can be higher than the available cores on the
- host system.
- '';
- };
-
- virtualisation.sharedDirectories =
- mkOption {
- type = types.attrsOf
- (types.submodule {
- options.source = mkOption {
- type = types.str;
- description = "The path of the directory to share, can be a shell variable";
- };
- options.target = mkOption {
- type = types.path;
- description = "The mount point of the directory inside the virtual machine";
- };
- options.securityModel = mkOption {
- type = types.enum [ "passthrough" "mapped-xattr" "mapped-file" "none" ];
- default = "mapped-xattr";
- description = ''
- The security model to use for this share:
-
- - `passthrough`: files are stored using the same credentials as they are created on the guest (this requires QEMU to run as root)
- - `mapped-xattr`: some of the file attributes like uid, gid, mode bits and link target are stored as file attributes
- - `mapped-file`: the attributes are stored in the hidden .virtfs_metadata directory. Directories exported by this security model cannot interact with other unix tools
- - `none`: same as "passthrough" except the sever won't report failures if it fails to set file attributes like ownership
- '';
- };
- });
- default = { };
- example = {
- my-share = { source = "/path/to/be/shared"; target = "/mnt/shared"; };
+ };
+ }
+ );
+ default = { };
+ example = {
+ my-share = {
+ source = "/path/to/be/shared";
+ target = "/mnt/shared";
};
- description = ''
- An attributes set of directories that will be shared with the
- virtual machine using VirtFS (9P filesystem over VirtIO).
- The attribute name will be used as the 9P mount tag.
- '';
};
+ description = ''
+ An attributes set of directories that will be shared with the
+ virtual machine using VirtFS (9P filesystem over VirtIO).
+ The attribute name will be used as the 9P mount tag.
+ '';
+ };
- virtualisation.additionalPaths =
- mkOption {
- type = types.listOf types.path;
- default = [];
- description = ''
- A list of paths whose closure should be made available to
- the VM.
+ virtualisation.additionalPaths = mkOption {
+ type = types.listOf types.path;
+ default = [ ];
+ description = ''
+ A list of paths whose closure should be made available to
+ the VM.
- When 9p is used, the closure is registered in the Nix
- database in the VM. All other paths in the host Nix store
- appear in the guest Nix store as well, but are considered
- garbage (because they are not registered in the Nix
- database of the guest).
+ When 9p is used, the closure is registered in the Nix
+ database in the VM. All other paths in the host Nix store
+ appear in the guest Nix store as well, but are considered
+ garbage (because they are not registered in the Nix
+ database of the guest).
- When {option}`virtualisation.useNixStoreImage` is
- set, the closure is copied to the Nix store image.
- '';
- };
+ When {option}`virtualisation.useNixStoreImage` is
+ set, the closure is copied to the Nix store image.
+ '';
+ };
virtualisation.forwardPorts = mkOption {
- type = types.listOf
- (types.submodule {
+ type = types.listOf (
+ types.submodule {
options.from = mkOption {
- type = types.enum [ "host" "guest" ];
+ type = types.enum [
+ "host"
+ "guest"
+ ];
default = "host";
description = ''
- Controls the direction in which the ports are mapped:
+ Controls the direction in which the ports are mapped:
- - `"host"` means traffic from the host ports
- is forwarded to the given guest port.
- - `"guest"` means traffic from the guest ports
- is forwarded to the given host port.
- '';
+ - `"host"` means traffic from the host ports
+ is forwarded to the given guest port.
+ - `"guest"` means traffic from the guest ports
+ is forwarded to the given host port.
+ '';
};
options.proto = mkOption {
- type = types.enum [ "tcp" "udp" ];
+ type = types.enum [
+ "tcp"
+ "udp"
+ ];
default = "tcp";
description = "The protocol to forward.";
};
@@ -515,10 +571,10 @@ in
type = types.port;
description = "The guest port to be mapped.";
};
- });
- default = [];
- example = lib.literalExpression
- ''
+ }
+ );
+ default = [ ];
+ example = lib.literalExpression ''
[ # forward local port 2222 -> 22, to ssh into the VM
{ from = "host"; host.port = 2222; guest.port = 22; }
@@ -528,122 +584,121 @@ in
host.address = "127.0.0.1"; host.port = 80;
}
]
- '';
+ '';
description = ''
- When using the SLiRP user networking (default), this option allows to
- forward ports to/from the host/guest.
+ When using the SLiRP user networking (default), this option allows to
+ forward ports to/from the host/guest.
- ::: {.warning}
- If the NixOS firewall on the virtual machine is enabled, you also
- have to open the guest ports to enable the traffic between host and
- guest.
- :::
+ ::: {.warning}
+ If the NixOS firewall on the virtual machine is enabled, you also
+ have to open the guest ports to enable the traffic between host and
+ guest.
+ :::
- ::: {.note}
- Currently QEMU supports only IPv4 forwarding.
- :::
- '';
+ ::: {.note}
+ Currently QEMU supports only IPv4 forwarding.
+ :::
+ '';
};
- virtualisation.restrictNetwork =
- mkOption {
- type = types.bool;
- default = false;
- example = true;
- description = ''
- If this option is enabled, the guest will be isolated, i.e. it will
- not be able to contact the host and no guest IP packets will be
- routed over the host to the outside. This option does not affect
- any explicitly set forwarding rules.
- '';
- };
+ virtualisation.restrictNetwork = mkOption {
+ type = types.bool;
+ default = false;
+ example = true;
+ description = ''
+ If this option is enabled, the guest will be isolated, i.e. it will
+ not be able to contact the host and no guest IP packets will be
+ routed over the host to the outside. This option does not affect
+ any explicitly set forwarding rules.
+ '';
+ };
- virtualisation.vlans =
- mkOption {
- type = types.listOf types.ints.unsigned;
- default = if config.virtualisation.interfaces == {} then [ 1 ] else [ ];
- defaultText = lib.literalExpression ''if config.virtualisation.interfaces == {} then [ 1 ] else [ ]'';
- example = [ 1 2 ];
- description = ''
- Virtual networks to which the VM is connected. Each
- number «N» in this list causes
- the VM to have a virtual Ethernet interface attached to a
- separate virtual network on which it will be assigned IP
- address
- `192.168.«N».«M»`,
- where «M» is the index of this VM
- in the list of VMs.
- '';
- };
+ virtualisation.vlans = mkOption {
+ type = types.listOf types.ints.unsigned;
+ default = if config.virtualisation.interfaces == { } then [ 1 ] else [ ];
+ defaultText = lib.literalExpression ''if config.virtualisation.interfaces == {} then [ 1 ] else [ ]'';
+ example = [
+ 1
+ 2
+ ];
+ description = ''
+ Virtual networks to which the VM is connected. Each
+ number «N» in this list causes
+ the VM to have a virtual Ethernet interface attached to a
+ separate virtual network on which it will be assigned IP
+ address
+ `192.168.«N».«M»`,
+ where «M» is the index of this VM
+ in the list of VMs.
+ '';
+ };
virtualisation.interfaces = mkOption {
- default = {};
+ default = { };
example = {
enp1s0.vlan = 1;
};
description = ''
Network interfaces to add to the VM.
'';
- type = with types; attrsOf (submodule {
- options = {
- vlan = mkOption {
- type = types.ints.unsigned;
- description = ''
- VLAN to which the network interface is connected.
- '';
- };
+ type =
+ with types;
+ attrsOf (submodule {
+ options = {
+ vlan = mkOption {
+ type = types.ints.unsigned;
+ description = ''
+ VLAN to which the network interface is connected.
+ '';
+ };
- assignIP = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Automatically assign an IP address to the network interface using the same scheme as
- virtualisation.vlans.
- '';
+ assignIP = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Automatically assign an IP address to the network interface using the same scheme as
+ virtualisation.vlans.
+ '';
+ };
};
- };
- });
+ });
};
- virtualisation.writableStore =
- mkOption {
- type = types.bool;
- default = cfg.mountHostNixStore;
- defaultText = literalExpression "cfg.mountHostNixStore";
- description = ''
- If enabled, the Nix store in the VM is made writable by
- layering an overlay filesystem on top of the host's Nix
- store.
+ virtualisation.writableStore = mkOption {
+ type = types.bool;
+ default = cfg.mountHostNixStore;
+ defaultText = literalExpression "cfg.mountHostNixStore";
+ description = ''
+ If enabled, the Nix store in the VM is made writable by
+ layering an overlay filesystem on top of the host's Nix
+ store.
- By default, this is enabled if you mount a host Nix store.
- '';
- };
+ By default, this is enabled if you mount a host Nix store.
+ '';
+ };
- virtualisation.writableStoreUseTmpfs =
- mkOption {
- type = types.bool;
- default = true;
- description = ''
- Use a tmpfs for the writable store instead of writing to the VM's
- own filesystem.
- '';
- };
+ virtualisation.writableStoreUseTmpfs = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Use a tmpfs for the writable store instead of writing to the VM's
+ own filesystem.
+ '';
+ };
- networking.primaryIPAddress =
- mkOption {
- type = types.str;
- default = "";
- internal = true;
- description = "Primary IP address used in /etc/hosts.";
- };
+ networking.primaryIPAddress = mkOption {
+ type = types.str;
+ default = "";
+ internal = true;
+ description = "Primary IP address used in /etc/hosts.";
+ };
- networking.primaryIPv6Address =
- mkOption {
- type = types.str;
- default = "";
- internal = true;
- description = "Primary IPv6 address used in /etc/hosts.";
- };
+ networking.primaryIPv6Address = mkOption {
+ type = types.str;
+ default = "";
+ internal = true;
+ description = "Primary IPv6 address used in /etc/hosts.";
+ };
virtualisation.host.pkgs = mkOption {
type = options.nixpkgs.pkgs.type;
@@ -659,31 +714,38 @@ in
};
virtualisation.qemu = {
- package =
- mkOption {
- type = types.package;
- default = if hostPkgs.stdenv.hostPlatform.qemuArch == pkgs.stdenv.hostPlatform.qemuArch then hostPkgs.qemu_kvm else hostPkgs.qemu;
- defaultText = literalExpression "if hostPkgs.stdenv.hostPlatform.qemuArch == pkgs.stdenv.hostPlatform.qemuArch then config.virtualisation.host.pkgs.qemu_kvm else config.virtualisation.host.pkgs.qemu";
- example = literalExpression "pkgs.qemu_test";
- description = "QEMU package to use.";
- };
+ package = mkOption {
+ type = types.package;
+ default =
+ if hostPkgs.stdenv.hostPlatform.qemuArch == pkgs.stdenv.hostPlatform.qemuArch then
+ hostPkgs.qemu_kvm
+ else
+ hostPkgs.qemu;
+ defaultText = literalExpression "if hostPkgs.stdenv.hostPlatform.qemuArch == pkgs.stdenv.hostPlatform.qemuArch then config.virtualisation.host.pkgs.qemu_kvm else config.virtualisation.host.pkgs.qemu";
+ example = literalExpression "pkgs.qemu_test";
+ description = "QEMU package to use.";
+ };
- options =
- mkOption {
- type = types.listOf types.str;
- default = [];
- example = [ "-vga std" ];
- description = ''
- Options passed to QEMU.
- See [QEMU User Documentation](https://www.qemu.org/docs/master/system/qemu-manpage) for a complete list.
- '';
- };
+ options = mkOption {
+ type = types.listOf types.str;
+ default = [ ];
+ example = [ "-vga std" ];
+ description = ''
+ Options passed to QEMU.
+ See [QEMU User Documentation](https://www.qemu.org/docs/master/system/qemu-manpage) for a complete list.
+ '';
+ };
consoles = mkOption {
type = types.listOf types.str;
- default = let
- consoles = [ "${qemu-common.qemuSerialDevice},115200n8" "tty0" ];
- in if cfg.graphics then consoles else reverseList consoles;
+ default =
+ let
+ consoles = [
+ "${qemu-common.qemuSerialDevice},115200n8"
+ "tty0"
+ ];
+ in
+ if cfg.graphics then consoles else reverseList consoles;
example = [ "console=tty1" ];
description = ''
The output console devices to pass to the kernel command line via the
@@ -696,176 +758,170 @@ in
'';
};
- networkingOptions =
- mkOption {
- type = types.listOf types.str;
- default = [ ];
- example = [
- "-net nic,netdev=user.0,model=virtio"
- "-netdev user,id=user.0,\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}"
- ];
- description = ''
- Networking-related command-line options that should be passed to qemu.
- The default is to use userspace networking (SLiRP).
- See the [QEMU Wiki on Networking](https://wiki.qemu.org/Documentation/Networking) for details.
+ networkingOptions = mkOption {
+ type = types.listOf types.str;
+ default = [ ];
+ example = [
+ "-net nic,netdev=user.0,model=virtio"
+ "-netdev user,id=user.0,\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}"
+ ];
+ description = ''
+ Networking-related command-line options that should be passed to qemu.
+ The default is to use userspace networking (SLiRP).
+ See the [QEMU Wiki on Networking](https://wiki.qemu.org/Documentation/Networking) for details.
- If you override this option, be advised to keep
- `''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}` (as seen in the example)
- to keep the default runtime behaviour.
- '';
- };
+ If you override this option, be advised to keep
+ `''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}` (as seen in the example)
+ to keep the default runtime behaviour.
+ '';
+ };
- drives =
- mkOption {
- type = types.listOf (types.submodule driveOpts);
- description = "Drives passed to qemu.";
- };
+ drives = mkOption {
+ type = types.listOf (types.submodule driveOpts);
+ description = "Drives passed to qemu.";
+ };
- diskInterface =
- mkOption {
- type = types.enum [ "virtio" "scsi" "ide" ];
- default = "virtio";
- example = "scsi";
- description = "The interface used for the virtual hard disks.";
- };
+ diskInterface = mkOption {
+ type = types.enum [
+ "virtio"
+ "scsi"
+ "ide"
+ ];
+ default = "virtio";
+ example = "scsi";
+ description = "The interface used for the virtual hard disks.";
+ };
- guestAgent.enable =
- mkOption {
- type = types.bool;
- default = true;
- description = ''
- Enable the Qemu guest agent.
- '';
- };
+ guestAgent.enable = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Enable the Qemu guest agent.
+ '';
+ };
- virtioKeyboard =
- mkOption {
- type = types.bool;
- default = true;
- description = ''
- Enable the virtio-keyboard device.
- '';
- };
+ virtioKeyboard = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Enable the virtio-keyboard device.
+ '';
+ };
};
- virtualisation.useNixStoreImage =
- mkOption {
- type = types.bool;
- default = false;
- description = ''
- Build and use a disk image for the Nix store, instead of
- accessing the host's one through 9p.
+ virtualisation.useNixStoreImage = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Build and use a disk image for the Nix store, instead of
+ accessing the host's one through 9p.
- For applications which do a lot of reads from the store,
- this can drastically improve performance, but at the cost of
- disk space and image build time.
+ For applications which do a lot of reads from the store,
+ this can drastically improve performance, but at the cost of
+ disk space and image build time.
- The Nix store image is built just-in-time right before the VM is
- started. Because it does not produce another derivation, the image is
- not cached between invocations and never lands in the store or binary
- cache.
+ The Nix store image is built just-in-time right before the VM is
+ started. Because it does not produce another derivation, the image is
+ not cached between invocations and never lands in the store or binary
+ cache.
- If you want a full disk image with a partition table and a root
- filesystem instead of only a store image, enable
- {option}`virtualisation.useBootLoader` instead.
- '';
- };
+ If you want a full disk image with a partition table and a root
+ filesystem instead of only a store image, enable
+ {option}`virtualisation.useBootLoader` instead.
+ '';
+ };
- virtualisation.mountHostNixStore =
- mkOption {
- type = types.bool;
- default = !cfg.useNixStoreImage && !cfg.useBootLoader;
- defaultText = literalExpression "!cfg.useNixStoreImage && !cfg.useBootLoader";
- description = ''
- Mount the host Nix store as a 9p mount.
- '';
- };
+ virtualisation.mountHostNixStore = mkOption {
+ type = types.bool;
+ default = !cfg.useNixStoreImage && !cfg.useBootLoader;
+ defaultText = literalExpression "!cfg.useNixStoreImage && !cfg.useBootLoader";
+ description = ''
+ Mount the host Nix store as a 9p mount.
+ '';
+ };
virtualisation.directBoot = {
- enable =
- mkOption {
- type = types.bool;
- default = !cfg.useBootLoader;
- defaultText = "!cfg.useBootLoader";
- description = ''
- If enabled, the virtual machine will boot directly into the kernel instead of through a bootloader.
- Read more about this feature in the [QEMU documentation on Direct Linux Boot](https://qemu-project.gitlab.io/qemu/system/linuxboot.html)
-
- This is enabled by default.
- If you want to test netboot, consider disabling this option.
- Enable a bootloader with {option}`virtualisation.useBootLoader` if you need.
-
- Relevant parameters such as those set in `boot.initrd` and `boot.kernelParams` are also passed to QEMU.
- Additional parameters can be supplied on invocation through the environment variable `$QEMU_KERNEL_PARAMS`.
- They are added to the `-append` option, see [QEMU User Documentation](https://www.qemu.org/docs/master/system/qemu-manpage) for details
- For example, to let QEMU use the parent terminal as the serial console, set `QEMU_KERNEL_PARAMS="console=ttyS0"`.
-
- This will not (re-)boot correctly into a system that has switched to a different configuration on disk.
- '';
- };
- initrd =
- mkOption {
- type = types.str;
- default = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}";
- defaultText = "\${config.system.build.initialRamdisk}/\${config.system.boot.loader.initrdFile}";
- description = ''
- In direct boot situations, you may want to influence the initrd to load
- to use your own customized payload.
-
- This is useful if you want to test the netboot image without
- testing the firmware or the loading part.
- '';
- };
- };
-
- virtualisation.useBootLoader =
- mkOption {
+ enable = mkOption {
type = types.bool;
- default = false;
+ default = !cfg.useBootLoader;
+ defaultText = "!cfg.useBootLoader";
description = ''
- Use a boot loader to boot the system.
- This allows, among other things, testing the boot loader.
+ If enabled, the virtual machine will boot directly into the kernel instead of through a bootloader.
+ Read more about this feature in the [QEMU documentation on Direct Linux Boot](https://qemu-project.gitlab.io/qemu/system/linuxboot.html)
- If disabled, the kernel and initrd are directly booted,
- forgoing any bootloader.
+ This is enabled by default.
+ If you want to test netboot, consider disabling this option.
+ Enable a bootloader with {option}`virtualisation.useBootLoader` if you need.
- Check the documentation on {option}`virtualisation.directBoot.enable` for details.
- '';
- };
+ Relevant parameters such as those set in `boot.initrd` and `boot.kernelParams` are also passed to QEMU.
+ Additional parameters can be supplied on invocation through the environment variable `$QEMU_KERNEL_PARAMS`.
+ They are added to the `-append` option, see [QEMU User Documentation](https://www.qemu.org/docs/master/system/qemu-manpage) for details
+ For example, to let QEMU use the parent terminal as the serial console, set `QEMU_KERNEL_PARAMS="console=ttyS0"`.
- virtualisation.installBootLoader =
- mkOption {
- type = types.bool;
- default = cfg.useBootLoader && cfg.useDefaultFilesystems;
- defaultText = "cfg.useBootLoader && cfg.useDefaultFilesystems";
- description = ''
- Install boot loader to target image.
-
- This is best-effort and may break with unconventional partition setups.
- Use `virtualisation.useDefaultFilesystems` for a known-working configuration.
+ This will not (re-)boot correctly into a system that has switched to a different configuration on disk.
'';
};
-
- virtualisation.useEFIBoot =
- mkOption {
- type = types.bool;
- default = false;
+ initrd = mkOption {
+ type = types.str;
+ default = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}";
+ defaultText = "\${config.system.build.initialRamdisk}/\${config.system.boot.loader.initrdFile}";
description = ''
- If enabled, the virtual machine will provide a EFI boot
- manager.
- useEFIBoot is ignored if useBootLoader == false.
- '';
- };
+ In direct boot situations, you may want to influence the initrd to load
+ to use your own customized payload.
+
+ This is useful if you want to test the netboot image without
+ testing the firmware or the loading part.
+ '';
+ };
+ };
+
+ virtualisation.useBootLoader = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Use a boot loader to boot the system.
+ This allows, among other things, testing the boot loader.
+
+ If disabled, the kernel and initrd are directly booted,
+ forgoing any bootloader.
+
+ Check the documentation on {option}`virtualisation.directBoot.enable` for details.
+ '';
+ };
+
+ virtualisation.installBootLoader = mkOption {
+ type = types.bool;
+ default = cfg.useBootLoader && cfg.useDefaultFilesystems;
+ defaultText = "cfg.useBootLoader && cfg.useDefaultFilesystems";
+ description = ''
+ Install boot loader to target image.
+
+ This is best-effort and may break with unconventional partition setups.
+ Use `virtualisation.useDefaultFilesystems` for a known-working configuration.
+ '';
+ };
+
+ virtualisation.useEFIBoot = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ If enabled, the virtual machine will provide a EFI boot
+ manager.
+ useEFIBoot is ignored if useBootLoader == false.
+ '';
+ };
virtualisation.efi = {
OVMF = mkOption {
type = types.package;
- default = (pkgs.OVMF.override {
- secureBoot = cfg.useSecureBoot;
- }).fd;
- defaultText = ''(pkgs.OVMF.override {
- secureBoot = cfg.useSecureBoot;
- }).fd'';
+ default =
+ (pkgs.OVMF.override {
+ secureBoot = cfg.useSecureBoot;
+ }).fd;
+ defaultText = ''
+ (pkgs.OVMF.override {
+ secureBoot = cfg.useSecureBoot;
+ }).fd'';
description = "OVMF firmware package, defaults to OVMF configured with secure boot if needed.";
};
@@ -874,8 +930,8 @@ in
default = cfg.efi.OVMF.firmware;
defaultText = literalExpression "cfg.efi.OVMF.firmware";
description = ''
- Firmware binary for EFI implementation, defaults to OVMF.
- '';
+ Firmware binary for EFI implementation, defaults to OVMF.
+ '';
};
variables = mkOption {
@@ -883,9 +939,9 @@ in
default = cfg.efi.OVMF.variables;
defaultText = literalExpression "cfg.efi.OVMF.variables";
description = ''
- Platform-specific flash binary for EFI variables, implementation-dependent to the EFI firmware.
- Defaults to OVMF.
- '';
+ Platform-specific flash binary for EFI variables, implementation-dependent to the EFI firmware.
+ Defaults to OVMF.
+ '';
};
keepVariables = mkOption {
@@ -903,13 +959,16 @@ in
deviceModel = mkOption {
type = types.str;
- default = ({
- "i686-linux" = "tpm-tis";
- "x86_64-linux" = "tpm-tis";
- "ppc64-linux" = "tpm-spapr";
- "armv7-linux" = "tpm-tis-device";
- "aarch64-linux" = "tpm-tis-device";
- }.${pkgs.stdenv.hostPlatform.system} or (throw "Unsupported system for TPM2 emulation in QEMU"));
+ default = (
+ {
+ "i686-linux" = "tpm-tis";
+ "x86_64-linux" = "tpm-tis";
+ "ppc64-linux" = "tpm-spapr";
+ "armv7-linux" = "tpm-tis-device";
+ "aarch64-linux" = "tpm-tis-device";
+ }
+ .${pkgs.stdenv.hostPlatform.system} or (throw "Unsupported system for TPM2 emulation in QEMU")
+ );
defaultText = ''
Based on the guest platform Linux system:
@@ -922,104 +981,104 @@ in
};
};
- virtualisation.useDefaultFilesystems =
- mkOption {
- type = types.bool;
- default = true;
- description = ''
- If enabled, the boot disk of the virtual machine will be
- formatted and mounted with the default filesystems for
- testing. Swap devices and LUKS will be disabled.
+ virtualisation.useDefaultFilesystems = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ If enabled, the boot disk of the virtual machine will be
+ formatted and mounted with the default filesystems for
+ testing. Swap devices and LUKS will be disabled.
- If disabled, a root filesystem has to be specified and
- formatted (for example in the initial ramdisk).
- '';
- };
+ If disabled, a root filesystem has to be specified and
+ formatted (for example in the initial ramdisk).
+ '';
+ };
- virtualisation.useSecureBoot =
- mkOption {
- type = types.bool;
- default = false;
- description = ''
- Enable Secure Boot support in the EFI firmware.
- '';
- };
+ virtualisation.useSecureBoot = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enable Secure Boot support in the EFI firmware.
+ '';
+ };
- virtualisation.bios =
- mkOption {
- type = types.nullOr types.package;
- default = null;
- description = ''
- An alternate BIOS (such as `qboot`) with which to start the VM.
- Should contain a file named `bios.bin`.
- If `null`, QEMU's builtin SeaBIOS will be used.
- '';
- };
+ virtualisation.bios = mkOption {
+ type = types.nullOr types.package;
+ default = null;
+ description = ''
+ An alternate BIOS (such as `qboot`) with which to start the VM.
+ Should contain a file named `bios.bin`.
+ If `null`, QEMU's builtin SeaBIOS will be used.
+ '';
+ };
- virtualisation.useHostCerts =
- mkOption {
- type = types.bool;
- default = false;
- description = ''
- If enabled, when `NIX_SSL_CERT_FILE` is set on the host,
- pass the CA certificates from the host to the VM.
- '';
- };
+ virtualisation.useHostCerts = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ If enabled, when `NIX_SSL_CERT_FILE` is set on the host,
+ pass the CA certificates from the host to the VM.
+ '';
+ };
};
config = {
assertions =
- lib.concatLists (lib.flip lib.imap cfg.forwardPorts (i: rule:
- [
- { assertion = rule.from == "guest" -> rule.proto == "tcp";
- message =
- ''
+ lib.concatLists (
+ lib.flip lib.imap cfg.forwardPorts (
+ i: rule: [
+ {
+ assertion = rule.from == "guest" -> rule.proto == "tcp";
+ message = ''
Invalid virtualisation.forwardPorts..proto:
Guest forwarding supports only TCP connections.
'';
- }
- { assertion = rule.from == "guest" -> lib.hasPrefix "10.0.2." rule.guest.address;
- message =
- ''
+ }
+ {
+ assertion = rule.from == "guest" -> lib.hasPrefix "10.0.2." rule.guest.address;
+ message = ''
Invalid virtualisation.forwardPorts..guest.address:
The address must be in the default VLAN (10.0.2.0/24).
'';
- }
- ])) ++ [
- { assertion = pkgs.stdenv.hostPlatform.is32bit -> cfg.memorySize < 2047;
- message = ''
- virtualisation.memorySize is above 2047, but qemu is only able to allocate 2047MB RAM on 32bit max.
- '';
- }
- { assertion = cfg.directBoot.enable || cfg.directBoot.initrd == options.virtualisation.directBoot.initrd.default;
- message =
- ''
- You changed the default of `virtualisation.directBoot.initrd` but you are not
- using QEMU direct boot. This initrd will not be used in your current
- boot configuration.
+ }
+ ]
+ )
+ )
+ ++ [
+ {
+ assertion = pkgs.stdenv.hostPlatform.is32bit -> cfg.memorySize < 2047;
+ message = ''
+ virtualisation.memorySize is above 2047, but qemu is only able to allocate 2047MB RAM on 32bit max.
+ '';
+ }
+ {
+ assertion =
+ cfg.directBoot.enable || cfg.directBoot.initrd == options.virtualisation.directBoot.initrd.default;
+ message = ''
+ You changed the default of `virtualisation.directBoot.initrd` but you are not
+ using QEMU direct boot. This initrd will not be used in your current
+ boot configuration.
- Either do not mutate `virtualisation.directBoot.initrd` or enable direct boot.
+ Either do not mutate `virtualisation.directBoot.initrd` or enable direct boot.
- If you have a more advanced usecase, please open an issue or a pull request.
- '';
- }
- {
- assertion = cfg.installBootLoader -> config.system.switch.enable;
- message = ''
- `system.switch.enable` must be enabled for `virtualisation.installBootLoader` to work.
- Please enable it in your configuration.
- '';
- }
- ];
+ If you have a more advanced usecase, please open an issue or a pull request.
+ '';
+ }
+ {
+ assertion = cfg.installBootLoader -> config.system.switch.enable;
+ message = ''
+ `system.switch.enable` must be enabled for `virtualisation.installBootLoader` to work.
+ Please enable it in your configuration.
+ '';
+ }
+ ];
- warnings =
- optional (cfg.directBoot.enable && cfg.useBootLoader)
- ''
- You enabled direct boot and a bootloader, QEMU will not boot your bootloader, rendering
- `useBootLoader` useless. You might want to disable one of those options.
- '';
+ warnings = optional (cfg.directBoot.enable && cfg.useBootLoader) ''
+ You enabled direct boot and a bootloader, QEMU will not boot your bootloader, rendering
+ `useBootLoader` useless. You might want to disable one of those options.
+ '';
# In UEFI boot, we use a EFI-only partition table layout, thus GRUB will fail when trying to install
# legacy and UEFI. In order to avoid this, we have to put "nodev" to force UEFI-only installs.
@@ -1037,12 +1096,11 @@ in
# allow `system.build.toplevel' to be included. (If we had a direct
# reference to ${regInfo} here, then we would get a cyclic
# dependency.)
- boot.postBootCommands = lib.mkIf config.nix.enable
- ''
- if [[ "$(cat /proc/cmdline)" =~ regInfo=([^ ]*) ]]; then
- ${config.nix.package.out}/bin/nix-store --load-db < ''${BASH_REMATCH[1]}
- fi
- '';
+ boot.postBootCommands = lib.mkIf config.nix.enable ''
+ if [[ "$(cat /proc/cmdline)" =~ regInfo=([^ ]*) ]]; then
+ ${config.nix.package.out}/bin/nix-store --load-db < ''${BASH_REMATCH[1]}
+ fi
+ '';
boot.initrd.availableKernelModules =
optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx"
@@ -1079,14 +1137,20 @@ in
virtualisation.qemu.networkingOptions =
let
- forwardingOptions = flip concatMapStrings cfg.forwardPorts
- ({ proto, from, host, guest }:
- if from == "host"
- then "hostfwd=${proto}:${host.address}:${toString host.port}-" +
- "${guest.address}:${toString guest.port},"
- else "'guestfwd=${proto}:${guest.address}:${toString guest.port}-" +
- "cmd:${pkgs.netcat}/bin/nc ${host.address} ${toString host.port}',"
- );
+ forwardingOptions = flip concatMapStrings cfg.forwardPorts (
+ {
+ proto,
+ from,
+ host,
+ guest,
+ }:
+ if from == "host" then
+ "hostfwd=${proto}:${host.address}:${toString host.port}-"
+ + "${guest.address}:${toString guest.port},"
+ else
+ "'guestfwd=${proto}:${guest.address}:${toString guest.port}-"
+ + "cmd:${pkgs.netcat}/bin/nc ${host.address} ${toString host.port}',"
+ );
restrictNetworkOption = lib.optionalString cfg.restrictNetwork "restrict=on,";
in
[
@@ -1099,20 +1163,29 @@ in
"-device virtio-keyboard"
])
(mkIf pkgs.stdenv.hostPlatform.isx86 [
- "-usb" "-device usb-tablet,bus=usb-bus.0"
+ "-usb"
+ "-device usb-tablet,bus=usb-bus.0"
])
(mkIf pkgs.stdenv.hostPlatform.isAarch [
- "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet"
- ])
- (let
- alphaNumericChars = lowerChars ++ upperChars ++ (map toString (range 0 9));
- # Replace all non-alphanumeric characters with underscores
- sanitizeShellIdent = s: concatMapStrings (c: if builtins.elem c alphaNumericChars then c else "_") (stringToCharacters s);
- in mkIf cfg.directBoot.enable [
- "-kernel \${NIXPKGS_QEMU_KERNEL_${sanitizeShellIdent config.system.name}:-${config.system.build.toplevel}/kernel}"
- "-initrd ${cfg.directBoot.initrd}"
- ''-append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${consoles} $QEMU_KERNEL_PARAMS"''
+ "-device virtio-gpu-pci"
+ "-device usb-ehci,id=usb0"
+ "-device usb-kbd"
+ "-device usb-tablet"
])
+ (
+ let
+ alphaNumericChars = lowerChars ++ upperChars ++ (map toString (range 0 9));
+ # Replace all non-alphanumeric characters with underscores
+ sanitizeShellIdent =
+ s:
+ concatMapStrings (c: if builtins.elem c alphaNumericChars then c else "_") (stringToCharacters s);
+ in
+ mkIf cfg.directBoot.enable [
+ "-kernel \${NIXPKGS_QEMU_KERNEL_${sanitizeShellIdent config.system.name}:-${config.system.build.toplevel}/kernel}"
+ "-initrd ${cfg.directBoot.initrd}"
+ ''-append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${consoles} $QEMU_KERNEL_PARAMS"''
+ ]
+ )
(mkIf cfg.useEFIBoot [
"-drive if=pflash,format=raw,unit=0,readonly=on,file=${cfg.efi.firmware}"
"-drive if=pflash,format=raw,unit=1,readonly=off,file=$NIX_EFI_VARS"
@@ -1129,26 +1202,32 @@ in
"-device ${cfg.tpm.deviceModel},tpmdev=tpm_dev_0"
])
(mkIf (pkgs.stdenv.hostPlatform.isx86 && cfg.efi.OVMF.systemManagementModeRequired) [
- "-machine" "q35,smm=on"
- "-global" "driver=cfi.pflash01,property=secure,value=on"
+ "-machine"
+ "q35,smm=on"
+ "-global"
+ "driver=cfi.pflash01,property=secure,value=on"
])
];
virtualisation.qemu.drives = mkMerge [
- (mkIf (cfg.diskImage != null) [{
- name = "root";
- file = ''"$NIX_DISK_IMAGE"'';
- driveExtraOpts.cache = "writeback";
- driveExtraOpts.werror = "report";
- deviceExtraOpts.bootindex = "1";
- deviceExtraOpts.serial = rootDriveSerialAttr;
- }])
- (mkIf cfg.useNixStoreImage [{
- name = "nix-store";
- file = ''"$TMPDIR"/store.img'';
- deviceExtraOpts.bootindex = "2";
- driveExtraOpts.format = "raw";
- }])
+ (mkIf (cfg.diskImage != null) [
+ {
+ name = "root";
+ file = ''"$NIX_DISK_IMAGE"'';
+ driveExtraOpts.cache = "writeback";
+ driveExtraOpts.werror = "report";
+ deviceExtraOpts.bootindex = "1";
+ deviceExtraOpts.serial = rootDriveSerialAttr;
+ }
+ ])
+ (mkIf cfg.useNixStoreImage [
+ {
+ name = "nix-store";
+ file = ''"$TMPDIR"/store.img'';
+ deviceExtraOpts.bootindex = "2";
+ driveExtraOpts.format = "raw";
+ }
+ ])
(imap0 (idx: _: {
file = "$(pwd)/empty${toString idx}.qcow2";
driveExtraOpts.werror = "report";
@@ -1162,91 +1241,116 @@ in
# override by setting `virtualisation.fileSystems = lib.mkForce { };`.
fileSystems = lib.mkIf (cfg.fileSystems != { }) (mkVMOverride cfg.fileSystems);
- virtualisation.fileSystems = let
- mkSharedDir = tag: share:
- {
+ virtualisation.diskSizeAutoSupported = false;
+
+ virtualisation.fileSystems =
+ let
+ mkSharedDir = tag: share: {
name = share.target;
value.device = tag;
value.fsType = "9p";
value.neededForBoot = true;
- value.options =
- [ "trans=virtio" "version=9p2000.L" "msize=${toString cfg.msize}" "x-systemd.requires=modprobe@9pnet_virtio.service" ]
- ++ lib.optional (tag == "nix-store") "cache=loose";
+ value.options = [
+ "trans=virtio"
+ "version=9p2000.L"
+ "msize=${toString cfg.msize}"
+ "x-systemd.requires=modprobe@9pnet_virtio.service"
+ ] ++ lib.optional (tag == "nix-store") "cache=loose";
};
- in lib.mkMerge [
- (lib.mapAttrs' mkSharedDir cfg.sharedDirectories)
- {
- "/" = lib.mkIf cfg.useDefaultFilesystems (if cfg.diskImage == null then {
- device = "tmpfs";
- fsType = "tmpfs";
- } else {
- device = cfg.rootDevice;
- fsType = "ext4";
- });
- "/tmp" = lib.mkIf config.boot.tmp.useTmpfs {
- device = "tmpfs";
- fsType = "tmpfs";
- neededForBoot = true;
- # Sync with systemd's tmp.mount;
- options = [ "mode=1777" "strictatime" "nosuid" "nodev" "size=${toString config.boot.tmp.tmpfsSize}" ];
- };
- "/nix/store" = lib.mkIf (cfg.useNixStoreImage || cfg.mountHostNixStore) (if cfg.writableStore then {
- overlay = {
- lowerdir = [ "/nix/.ro-store" ];
- upperdir = "/nix/.rw-store/upper";
- workdir = "/nix/.rw-store/work";
+ in
+ lib.mkMerge [
+ (lib.mapAttrs' mkSharedDir cfg.sharedDirectories)
+ {
+ "/" = lib.mkIf cfg.useDefaultFilesystems (
+ if cfg.diskImage == null then
+ {
+ device = "tmpfs";
+ fsType = "tmpfs";
+ }
+ else
+ {
+ device = cfg.rootDevice;
+ fsType = "ext4";
+ }
+ );
+ "/tmp" = lib.mkIf config.boot.tmp.useTmpfs {
+ device = "tmpfs";
+ fsType = "tmpfs";
+ neededForBoot = true;
+ # Sync with systemd's tmp.mount;
+ options = [
+ "mode=1777"
+ "strictatime"
+ "nosuid"
+ "nodev"
+ "size=${toString config.boot.tmp.tmpfsSize}"
+ ];
};
- } else {
- device = "/nix/.ro-store";
- options = [ "bind" ];
- });
- "/nix/.ro-store" = lib.mkIf cfg.useNixStoreImage {
- device = "/dev/disk/by-label/${nixStoreFilesystemLabel}";
- fsType = "erofs";
- neededForBoot = true;
- options = [ "ro" ];
- };
- "/nix/.rw-store" = lib.mkIf (cfg.writableStore && cfg.writableStoreUseTmpfs) {
- fsType = "tmpfs";
- options = [ "mode=0755" ];
- neededForBoot = true;
- };
- "${config.boot.loader.efi.efiSysMountPoint}" = lib.mkIf (cfg.useBootLoader && cfg.bootPartition != null) {
- device = cfg.bootPartition;
- fsType = "vfat";
- };
- }
- ];
+ "/nix/store" = lib.mkIf (cfg.useNixStoreImage || cfg.mountHostNixStore) (
+ if cfg.writableStore then
+ {
+ overlay = {
+ lowerdir = [ "/nix/.ro-store" ];
+ upperdir = "/nix/.rw-store/upper";
+ workdir = "/nix/.rw-store/work";
+ };
+ }
+ else
+ {
+ device = "/nix/.ro-store";
+ options = [ "bind" ];
+ }
+ );
+ "/nix/.ro-store" = lib.mkIf cfg.useNixStoreImage {
+ device = "/dev/disk/by-label/${nixStoreFilesystemLabel}";
+ fsType = "erofs";
+ neededForBoot = true;
+ options = [ "ro" ];
+ };
+ "/nix/.rw-store" = lib.mkIf (cfg.writableStore && cfg.writableStoreUseTmpfs) {
+ fsType = "tmpfs";
+ options = [ "mode=0755" ];
+ neededForBoot = true;
+ };
+ "${config.boot.loader.efi.efiSysMountPoint}" =
+ lib.mkIf (cfg.useBootLoader && cfg.bootPartition != null)
+ {
+ device = cfg.bootPartition;
+ fsType = "vfat";
+ };
+ }
+ ];
swapDevices = (if cfg.useDefaultFilesystems then mkVMOverride else mkDefault) [ ];
- boot.initrd.luks.devices = (if cfg.useDefaultFilesystems then mkVMOverride else mkDefault) {};
+ boot.initrd.luks.devices = (if cfg.useDefaultFilesystems then mkVMOverride else mkDefault) { };
# Don't run ntpd in the guest. It should get the correct time from KVM.
services.timesyncd.enable = false;
services.qemuGuest.enable = cfg.qemu.guestAgent.enable;
- system.build.vm = hostPkgs.runCommand "nixos-vm" {
- preferLocalBuild = true;
- meta.mainProgram = "run-${config.system.name}-vm";
- }
- ''
- mkdir -p $out/bin
- ln -s ${config.system.build.toplevel} $out/system
- ln -s ${hostPkgs.writeScript "run-nixos-vm" startVM} $out/bin/run-${config.system.name}-vm
- '';
+ system.build.vm =
+ hostPkgs.runCommand "nixos-vm"
+ {
+ preferLocalBuild = true;
+ meta.mainProgram = "run-${config.system.name}-vm";
+ }
+ ''
+ mkdir -p $out/bin
+ ln -s ${config.system.build.toplevel} $out/system
+ ln -s ${hostPkgs.writeScript "run-nixos-vm" startVM} $out/bin/run-${config.system.name}-vm
+ '';
# When building a regular system configuration, override whatever
# video driver the host uses.
services.xserver.videoDrivers = mkVMOverride [ "modesetting" ];
services.xserver.defaultDepth = mkVMOverride 0;
services.xserver.resolutions = mkVMOverride [ cfg.resolution ];
- services.xserver.monitorSection =
- ''
- # Set a higher refresh rate so that resolutions > 800x600 work.
- HorizSync 30-140
- VertRefresh 50-160
- '';
+ services.xserver.monitorSection = ''
+ # Set a higher refresh rate so that resolutions > 800x600 work.
+ HorizSync 30-140
+ VertRefresh 50-160
+ '';
# Wireless won't work in the VM.
networking.wireless.enable = mkVMOverride false;
@@ -1257,8 +1361,10 @@ in
networking.usePredictableInterfaceNames = false;
- system.requiredKernelConfig = with config.lib.kernelConfig;
- [ (isEnabled "VIRTIO_BLK")
+ system.requiredKernelConfig =
+ with config.lib.kernelConfig;
+ [
+ (isEnabled "VIRTIO_BLK")
(isEnabled "VIRTIO_PCI")
(isEnabled "VIRTIO_NET")
(isEnabled "EXT4_FS")
@@ -1270,10 +1376,12 @@ in
(isYes "NET_CORE")
(isYes "INET")
(isYes "NETWORK_FILESYSTEMS")
- ] ++ optionals (!cfg.graphics) [
+ ]
+ ++ optionals (!cfg.graphics) [
(isYes "SERIAL_8250_CONSOLE")
(isYes "SERIAL_8250")
- ] ++ optionals (cfg.writableStore) [
+ ]
+ ++ optionals (cfg.writableStore) [
(isEnabled "OVERLAY_FS")
];
diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index 4ab5d17ecd49..22646011d33d 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -1,22 +1,33 @@
-{ config, lib, pkgs, ... }:
+{
+ config,
+ lib,
+ pkgs,
+ ...
+}:
let
cfg = config.virtualbox;
-
-in {
+in
+{
+ imports = [
+ ./disk-size-option.nix
+ (lib.mkRenamedOptionModuleWith {
+ sinceRelease = 2411;
+ from = [
+ "virtualbox"
+ "baseImageSize"
+ ];
+ to = [
+ "virtualisation"
+ "diskSize"
+ ];
+ })
+ ];
options = {
virtualbox = {
- baseImageSize = lib.mkOption {
- type = with lib.types; either (enum [ "auto" ]) int;
- default = "auto";
- example = 50 * 1024;
- description = ''
- The size of the VirtualBox base image in MiB.
- '';
- };
baseImageFreeSpace = lib.mkOption {
- type = with lib.types; int;
+ type = lib.types.int;
default = 30 * 1024;
description = ''
Free space in the VirtualBox base image in MiB.
@@ -51,7 +62,14 @@ in {
'';
};
params = lib.mkOption {
- type = with lib.types; attrsOf (oneOf [ str int bool (listOf str) ]);
+ type =
+ with lib.types;
+ attrsOf (oneOf [
+ str
+ int
+ bool
+ (listOf str)
+ ]);
example = {
audio = "alsa";
rtcuseutc = "on";
@@ -64,11 +82,21 @@ in {
'';
};
exportParams = lib.mkOption {
- type = with lib.types; listOf (oneOf [ str int bool (listOf str) ]);
+ type =
+ with lib.types;
+ listOf (oneOf [
+ str
+ int
+ bool
+ (listOf str)
+ ]);
example = [
- "--vsys" "0" "--vendor" "ACME Inc."
+ "--vsys"
+ "0"
+ "--vendor"
+ "ACME Inc."
];
- default = [];
+ default = [ ];
description = ''
Parameters passed to the Virtualbox export command.
@@ -86,23 +114,25 @@ in {
mountPoint = "/home/demo/storage";
size = 100 * 1024;
};
- type = lib.types.nullOr (lib.types.submodule {
- options = {
- size = lib.mkOption {
- type = lib.types.int;
- description = "Size in MiB";
+ type = lib.types.nullOr (
+ lib.types.submodule {
+ options = {
+ size = lib.mkOption {
+ type = lib.types.int;
+ description = "Size in MiB";
+ };
+ label = lib.mkOption {
+ type = lib.types.str;
+ default = "vm-extra-storage";
+ description = "Label for the disk partition";
+ };
+ mountPoint = lib.mkOption {
+ type = lib.types.str;
+ description = "Path where to mount this disk.";
+ };
};
- label = lib.mkOption {
- type = lib.types.str;
- default = "vm-extra-storage";
- description = "Label for the disk partition";
- };
- mountPoint = lib.mkOption {
- type = lib.types.str;
- description = "Path where to mount this disk.";
- };
- };
- });
+ }
+ );
};
postExportCommands = lib.mkOption {
type = lib.types.lines;
@@ -122,7 +152,14 @@ in {
'';
};
storageController = lib.mkOption {
- type = with lib.types; attrsOf (oneOf [ str int bool (listOf str) ]);
+ type =
+ with lib.types;
+ attrsOf (oneOf [
+ str
+ int
+ bool
+ (listOf str)
+ ]);
example = {
name = "SCSI";
add = "scsi";
@@ -148,6 +185,9 @@ in {
};
config = {
+ # Use a priority just below mkOptionDefault (1500) instead of lib.mkDefault
+ # to avoid breaking existing configs using that.
+ virtualisation.diskSize = lib.mkOverride 1490 (50 * 1024);
virtualbox.params = lib.mkMerge [
(lib.mapAttrs (name: lib.mkDefault) {
@@ -172,80 +212,83 @@ in {
inherit pkgs lib config;
partitionTableType = "legacy";
- diskSize = cfg.baseImageSize;
+ inherit (config.virtualisation) diskSize;
additionalSpace = "${toString cfg.baseImageFreeSpace}M";
- postVM =
- ''
- export HOME=$PWD
- export PATH=${pkgs.virtualbox}/bin:$PATH
+ postVM = ''
+ export HOME=$PWD
+ export PATH=${pkgs.virtualbox}/bin:$PATH
- echo "converting image to VirtualBox format..."
- VBoxManage convertfromraw $diskImage disk.vdi
+ echo "converting image to VirtualBox format..."
+ VBoxManage convertfromraw $diskImage disk.vdi
- ${lib.optionalString (cfg.extraDisk != null) ''
- echo "creating extra disk: data-disk.raw"
- dataDiskImage=data-disk.raw
- truncate -s ${toString cfg.extraDisk.size}M $dataDiskImage
+ ${lib.optionalString (cfg.extraDisk != null) ''
+ echo "creating extra disk: data-disk.raw"
+ dataDiskImage=data-disk.raw
+ truncate -s ${toString cfg.extraDisk.size}M $dataDiskImage
- parted --script $dataDiskImage -- \
- mklabel msdos \
- mkpart primary ext4 1MiB -1
- eval $(partx $dataDiskImage -o START,SECTORS --nr 1 --pairs)
- mkfs.ext4 -F -L ${cfg.extraDisk.label} $dataDiskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K
- echo "creating extra disk: data-disk.vdi"
- VBoxManage convertfromraw $dataDiskImage data-disk.vdi
- ''}
+ parted --script $dataDiskImage -- \
+ mklabel msdos \
+ mkpart primary ext4 1MiB -1
+ eval $(partx $dataDiskImage -o START,SECTORS --nr 1 --pairs)
+ mkfs.ext4 -F -L ${cfg.extraDisk.label} $dataDiskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K
+ echo "creating extra disk: data-disk.vdi"
+ VBoxManage convertfromraw $dataDiskImage data-disk.vdi
+ ''}
- echo "creating VirtualBox VM..."
- vmName="${cfg.vmName}";
- VBoxManage createvm --name "$vmName" --register \
- --ostype ${if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "Linux26_64" else "Linux26"}
- VBoxManage modifyvm "$vmName" \
- --memory ${toString cfg.memorySize} \
- ${lib.cli.toGNUCommandLineShell { } cfg.params}
- VBoxManage storagectl "$vmName" ${lib.cli.toGNUCommandLineShell { } cfg.storageController}
- VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 0 --device 0 --type hdd \
- --medium disk.vdi
- ${lib.optionalString (cfg.extraDisk != null) ''
- VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 1 --device 0 --type hdd \
- --medium data-disk.vdi
- ''}
+ echo "creating VirtualBox VM..."
+ vmName="${cfg.vmName}";
+ VBoxManage createvm --name "$vmName" --register \
+ --ostype ${if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "Linux26_64" else "Linux26"}
+ VBoxManage modifyvm "$vmName" \
+ --memory ${toString cfg.memorySize} \
+ ${lib.cli.toGNUCommandLineShell { } cfg.params}
+ VBoxManage storagectl "$vmName" ${lib.cli.toGNUCommandLineShell { } cfg.storageController}
+ VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 0 --device 0 --type hdd \
+ --medium disk.vdi
+ ${lib.optionalString (cfg.extraDisk != null) ''
+ VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 1 --device 0 --type hdd \
+ --medium data-disk.vdi
+ ''}
- echo "exporting VirtualBox VM..."
- mkdir -p $out
- fn="$out/${cfg.vmFileName}"
- VBoxManage export "$vmName" --output "$fn" --options manifest ${lib.escapeShellArgs cfg.exportParams}
- ${cfg.postExportCommands}
+ echo "exporting VirtualBox VM..."
+ mkdir -p $out
+ fn="$out/${cfg.vmFileName}"
+ VBoxManage export "$vmName" --output "$fn" --options manifest ${lib.escapeShellArgs cfg.exportParams}
+ ${cfg.postExportCommands}
- rm -v $diskImage
+ rm -v $diskImage
- mkdir -p $out/nix-support
- echo "file ova $fn" >> $out/nix-support/hydra-build-products
- '';
+ mkdir -p $out/nix-support
+ echo "file ova $fn" >> $out/nix-support/hydra-build-products
+ '';
};
- fileSystems = {
- "/" = {
- device = "/dev/disk/by-label/nixos";
- autoResize = true;
- fsType = "ext4";
- };
- } // (lib.optionalAttrs (cfg.extraDisk != null) {
- ${cfg.extraDisk.mountPoint} = {
- device = "/dev/disk/by-label/" + cfg.extraDisk.label;
- autoResize = true;
- fsType = "ext4";
- };
- });
+ fileSystems =
+ {
+ "/" = {
+ device = "/dev/disk/by-label/nixos";
+ autoResize = true;
+ fsType = "ext4";
+ };
+ }
+ // (lib.optionalAttrs (cfg.extraDisk != null) {
+ ${cfg.extraDisk.mountPoint} = {
+ device = "/dev/disk/by-label/" + cfg.extraDisk.label;
+ autoResize = true;
+ fsType = "ext4";
+ };
+ });
boot.growPartition = true;
boot.loader.grub.device = "/dev/sda";
- swapDevices = [{
- device = "/var/swap";
- size = 2048;
- }];
+ swapDevices = [
+ {
+ device = "/var/swap";
+ size = 2048;
+ }
+ ];
virtualisation.virtualbox.guest.enable = true;
diff --git a/nixos/release.nix b/nixos/release.nix
index 8a8c45f8f842..797a07ec575e 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -312,7 +312,7 @@ in rec {
[ configuration
versionModule
./maintainers/scripts/ec2/amazon-image.nix
- ({ ... }: { amazonImage.sizeMB = "auto"; })
+ ({ ... }: { virtualisation.diskSize = "auto"; })
];
}).config.system.build.amazonImage)
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 5e60805718f6..c01401b7e044 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -129,6 +129,7 @@ in {
apfs = runTest ./apfs.nix;
appliance-repart-image = runTest ./appliance-repart-image.nix;
appliance-repart-image-verity-store = runTest ./appliance-repart-image-verity-store.nix;
+ apply = pkgs.callPackage ../modules/system/activation/apply/checks.nix { };
apparmor = handleTest ./apparmor.nix {};
archi = handleTest ./archi.nix {};
aria2 = handleTest ./aria2.nix {};
@@ -440,6 +441,7 @@ in {
pyload = handleTest ./pyload.nix {};
oci-containers = handleTestOn ["aarch64-linux" "x86_64-linux"] ./oci-containers.nix {};
odoo = handleTest ./odoo.nix {};
+ odoo17 = handleTest ./odoo.nix { package = pkgs.odoo17; };
odoo16 = handleTest ./odoo.nix { package = pkgs.odoo16; };
odoo15 = handleTest ./odoo.nix { package = pkgs.odoo15; };
# 9pnet_virtio used to mount /nix partition doesn't support
@@ -658,6 +660,8 @@ in {
networking.networkmanager = handleTest ./networking/networkmanager.nix {};
netbox_3_6 = handleTest ./web-apps/netbox.nix { netbox = pkgs.netbox_3_6; };
netbox_3_7 = handleTest ./web-apps/netbox.nix { netbox = pkgs.netbox_3_7; };
+ netbox_4_0 = handleTest ./web-apps/netbox.nix { netbox = pkgs.netbox_4_0; };
+ netbox_4_1 = handleTest ./web-apps/netbox.nix { netbox = pkgs.netbox_4_1; };
netbox-upgrade = handleTest ./web-apps/netbox-upgrade.nix {};
# TODO: put in networking.nix after the test becomes more complete
networkingProxy = handleTest ./networking-proxy.nix {};
@@ -700,7 +704,17 @@ in {
nixos-generate-config = handleTest ./nixos-generate-config.nix {};
nixos-rebuild-install-bootloader = handleTestOn ["x86_64-linux"] ./nixos-rebuild-install-bootloader.nix {};
nixos-rebuild-specialisations = runTestOn ["x86_64-linux"] ./nixos-rebuild-specialisations.nix;
+ nixos-rebuild-specialisations-legacy = runTestOn ["x86_64-linux"] {
+ name = mkForce "nixos-rebuild-specialisations-legacy";
+ imports = [ ./nixos-rebuild-specialisations.nix ];
+ extraBaseModules = { system.apply.enable = false; };
+ };
nixos-rebuild-target-host = runTest ./nixos-rebuild-target-host.nix;
+ nixos-rebuild-target-host-legacy = runTest {
+ name = mkForce "nixos-rebuild-target-host-legacy";
+ imports = [ ./nixos-rebuild-target-host.nix ];
+ extraBaseModules = { system.apply.enable = false; };
+ };
nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; };
nixseparatedebuginfod = handleTest ./nixseparatedebuginfod.nix {};
node-red = handleTest ./node-red.nix {};
@@ -825,8 +839,10 @@ in {
predictable-interface-names = handleTest ./predictable-interface-names.nix {};
pretalx = runTest ./web-apps/pretalx.nix;
pretix = runTest ./web-apps/pretix.nix;
- printing-socket = handleTest ./printing.nix { socket = true; };
- printing-service = handleTest ./printing.nix { socket = false; };
+ printing-socket = handleTest ./printing.nix { socket = true; listenTcp = true; };
+ printing-service = handleTest ./printing.nix { socket = false; listenTcp = true; };
+ printing-socket-notcp = handleTest ./printing.nix { socket = true; listenTcp = false; };
+ printing-service-notcp = handleTest ./printing.nix { socket = false; listenTcp = false; };
private-gpt = handleTest ./private-gpt.nix {};
privatebin = runTest ./privatebin.nix;
privoxy = handleTest ./privoxy.nix {};
@@ -846,8 +862,8 @@ in {
qemu-vm-volatile-root = runTest ./qemu-vm-volatile-root.nix;
qemu-vm-external-disk-image = runTest ./qemu-vm-external-disk-image.nix;
qemu-vm-store = runTest ./qemu-vm-store.nix;
- qgis = handleTest ./qgis.nix { qgisPackage = pkgs.qgis; };
- qgis-ltr = handleTest ./qgis.nix { qgisPackage = pkgs.qgis-ltr; };
+ qgis = handleTest ./qgis.nix { package = pkgs.qgis; };
+ qgis-ltr = handleTest ./qgis.nix { package = pkgs.qgis-ltr; };
qownnotes = handleTest ./qownnotes.nix {};
qtile = handleTestOn ["x86_64-linux" "aarch64-linux"] ./qtile/default.nix {};
quake3 = handleTest ./quake3.nix {};
@@ -901,6 +917,7 @@ in {
seafile = handleTest ./seafile.nix {};
searx = runTest ./searx.nix;
seatd = handleTest ./seatd.nix {};
+ send = runTest ./send.nix;
service-runner = handleTest ./service-runner.nix {};
sftpgo = runTest ./sftpgo.nix;
sfxr-qt = handleTest ./sfxr-qt.nix {};
diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix
index 4ae2f919f2f7..7a2d4bbd0ffc 100644
--- a/nixos/tests/avahi.nix
+++ b/nixos/tests/avahi.nix
@@ -75,5 +75,7 @@ import ./make-test-python.nix {
one.succeed("test `wc -l < out` -gt 0")
two.succeed("avahi-browse -r -t _ssh._tcp | tee out >&2")
two.succeed("test `wc -l < out` -gt 0")
+
+ one.log(one.execute("systemd-analyze security avahi-daemon.service | grep -v ✓")[1])
'';
} args
diff --git a/nixos/tests/coturn.nix b/nixos/tests/coturn.nix
index b44bf8d06e39..b3c96dba35f8 100644
--- a/nixos/tests/coturn.nix
+++ b/nixos/tests/coturn.nix
@@ -30,5 +30,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
secretsfile.fail("${pkgs.coturn}/bin/turnutils_uclient -W some-very-secret-string 127.0.0.1 -DgX -e 127.0.0.1 -n 1 -c -y")
# allowed-peer-ip, should succeed:
secretsfile.succeed("${pkgs.coturn}/bin/turnutils_uclient -W some-very-secret-string 192.168.1.2 -DgX -e 192.168.1.2 -n 1 -c -y")
+
+ default.log(default.execute("systemd-analyze security coturn.service | grep -v '✓'")[1])
'';
})
diff --git a/nixos/tests/docker-tools-overlay.nix b/nixos/tests/docker-tools-overlay.nix
index 6781388e639b..14e33899affc 100644
--- a/nixos/tests/docker-tools-overlay.nix
+++ b/nixos/tests/docker-tools-overlay.nix
@@ -12,7 +12,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
{ ... }:
{
virtualisation.docker.enable = true;
- virtualisation.docker.storageDriver = "overlay"; # defaults to overlay2
+ virtualisation.docker.storageDriver = "overlay2";
};
};
diff --git a/nixos/tests/etcd/etcd.nix b/nixos/tests/etcd/etcd.nix
index a32d0f9a55d1..3334cb0a4efc 100644
--- a/nixos/tests/etcd/etcd.nix
+++ b/nixos/tests/etcd/etcd.nix
@@ -1,15 +1,22 @@
# This test runs simple etcd node
-
import ../make-test-python.nix ({ pkgs, ... } : {
name = "etcd";
-
meta = with pkgs.lib.maintainers; {
maintainers = [ offline ];
};
nodes = {
node = { ... }: {
- services.etcd.enable = true;
+ services.etcd = {
+ enable = true;
+ # Ensure etcd is ready to accept connections
+ extraConf = {
+ "initial-advertise-peer-urls" = "http://localhost:2380";
+ "listen-peer-urls" = "http://localhost:2380";
+ "listen-client-urls" = "http://localhost:2379";
+ "advertise-client-urls" = "http://localhost:2379";
+ };
+ };
};
};
@@ -17,9 +24,11 @@ import ../make-test-python.nix ({ pkgs, ... } : {
with subtest("should start etcd node"):
node.start()
node.wait_for_unit("etcd.service")
+ # Add additional wait for actual readiness
+ node.wait_until_succeeds("etcdctl endpoint health")
with subtest("should write and read some values to etcd"):
- node.succeed("etcdctl put /foo/bar 'Hello world'")
- node.succeed("etcdctl get /foo/bar | grep 'Hello world'")
+ node.succeed("etcdctl --endpoints=http://localhost:2379 put /foo/bar 'Hello world'")
+ node.succeed("etcdctl --endpoints=http://localhost:2379 get /foo/bar | grep 'Hello world'")
'';
})
diff --git a/nixos/tests/freetube.nix b/nixos/tests/freetube.nix
index 4b5b2ed343f1..c886f1ee116e 100644
--- a/nixos/tests/freetube.nix
+++ b/nixos/tests/freetube.nix
@@ -35,7 +35,7 @@ let
machine.wait_for_text('Your Subscription list is currently empty')
machine.screenshot("main.png")
machine.send_key("ctrl-comma")
- machine.wait_for_text('Data Settings', timeout=60)
+ machine.wait_for_text('Data', timeout=60)
machine.screenshot("preferences.png")
'';
});
diff --git a/nixos/tests/jibri.nix b/nixos/tests/jibri.nix
index 45e30af9a9a5..2046ea86d5ac 100644
--- a/nixos/tests/jibri.nix
+++ b/nixos/tests/jibri.nix
@@ -22,9 +22,9 @@ import ./make-test-python.nix ({ pkgs, ... }: {
forceSSL = true;
};
- security.acme.email = "me@example.org";
+ security.acme.defaults.email = "me@example.org";
security.acme.acceptTerms = true;
- security.acme.server = "https://example.com"; # self-signed only
+ security.acme.defaults.server = "https://example.com"; # self-signed only
};
testScript = ''
@@ -44,7 +44,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
"journalctl -b -u prosody -o cat | grep -q 'Authenticated as jibri@auth.machine'", timeout=33
)
machine.wait_until_succeeds(
- "cat /var/log/jitsi/jibri/log.0.txt | grep -q 'Joined MUC: jibribrewery@internal.machine'", timeout=34
+ "cat /var/log/jitsi/jibri/log.0.txt | grep -q 'Joined MUC: jibribrewery@internal.auth.machine'", timeout=34
)
assert '"busyStatus":"IDLE","health":{"healthStatus":"HEALTHY"' in machine.succeed(
diff --git a/nixos/tests/mollysocket.nix b/nixos/tests/mollysocket.nix
index 8cbd0c0272e0..5135d79fcba9 100644
--- a/nixos/tests/mollysocket.nix
+++ b/nixos/tests/mollysocket.nix
@@ -16,12 +16,10 @@ in {
};
testScript = ''
- import json
-
mollysocket.wait_for_unit("mollysocket.service")
mollysocket.wait_for_open_port(${toString port})
out = mollysocket.succeed("curl --fail http://127.0.0.1:${toString port}")
- assert json.loads(out)["mollysocket"]["version"] == "${toString pkgs.mollysocket.version}"
+ assert "Version ${pkgs.mollysocket.version}" in out
'';
})
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index b413996c67db..5f719a5d97c1 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -3,12 +3,17 @@
import ./make-test-python.nix (
{ pkgs
, socket ? true # whether to use socket activation
+, listenTcp ? true # whether to open port 631 on client
, ...
}:
+let
+ inherit (pkgs) lib;
+in
+
{
name = "printing";
- meta = with pkgs.lib.maintainers; {
+ meta = with lib.maintainers; {
maintainers = [ domenkozar matthewbauer ];
};
@@ -35,9 +40,10 @@ import ./make-test-python.nix (
}];
};
- nodes.client = { ... }: {
+ nodes.client = { lib, ... }: {
services.printing.enable = true;
services.printing.startWhenNeeded = socket;
+ services.printing.listenAddresses = lib.mkIf (!listenTcp) [];
# Add printer to the client as well, via IPP.
hardware.printers.ensurePrinters = [{
name = "DeskjetRemote";
@@ -54,8 +60,8 @@ import ./make-test-python.nix (
start_all()
with subtest("Make sure that cups is up on both sides and printers are set up"):
- server.wait_for_unit("cups.${if socket then "socket" else "service"}")
- client.wait_for_unit("cups.${if socket then "socket" else "service"}")
+ server.wait_for_unit("ensure-printers.service")
+ client.wait_for_unit("ensure-printers.service")
assert "scheduler is running" in client.succeed("lpstat -r")
@@ -63,7 +69,7 @@ import ./make-test-python.nix (
assert "/var/run/cups/cups.sock" in client.succeed("lpstat -H")
with subtest("HTTP server is available too"):
- client.succeed("curl --fail http://localhost:631/")
+ ${lib.optionalString listenTcp ''client.succeed("curl --fail http://localhost:631/")''}
client.succeed(f"curl --fail http://{server.name}:631/")
server.fail(f"curl --fail --connect-timeout 2 http://{client.name}:631/")
diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix
index 71eef72df6f3..6ad1bc654084 100644
--- a/nixos/tests/prometheus-exporters.nix
+++ b/nixos/tests/prometheus-exporters.nix
@@ -1511,25 +1511,6 @@ let
'';
};
- tor = {
- exporterConfig = {
- enable = true;
- };
- metricProvider = {
- # Note: this does not connect the test environment to the Tor network.
- # Client, relay, bridge or exit connectivity are disabled by default.
- services.tor.enable = true;
- services.tor.settings.ControlPort = 9051;
- };
- exporterTest = ''
- wait_for_unit("tor.service")
- wait_for_open_port(9051)
- wait_for_unit("prometheus-tor-exporter.service")
- wait_for_open_port(9130)
- succeed("curl -sSf localhost:9130/metrics | grep 'tor_version{.\\+} 1'")
- '';
- };
-
unpoller = {
nodeName = "unpoller";
exporterConfig.enable = true;
diff --git a/nixos/tests/qgis.nix b/nixos/tests/qgis.nix
index 7706b8c07747..e8149e488562 100644
--- a/nixos/tests/qgis.nix
+++ b/nixos/tests/qgis.nix
@@ -1,5 +1,6 @@
-import ./make-test-python.nix ({ pkgs, lib, qgisPackage, ... }:
+import ./make-test-python.nix ({ pkgs, lib, package, ... }:
let
+ qgisPackage = package.override { withServer = true; };
testScript = pkgs.writeTextFile {
name = "qgis-test.py";
text = (builtins.readFile ../../pkgs/applications/gis/qgis/test.py);
@@ -12,19 +13,74 @@ import ./make-test-python.nix ({ pkgs, lib, qgisPackage, ... }:
};
nodes = {
- machine = { pkgs, ... }: {
+ machine = { config, pkgs, ... }:
+
+ let
+ qgisServerUser = config.services.nginx.user;
+ qgisServerSocket = "/run/qgis_mapserv.socket";
+ in
+ {
virtualisation.diskSize = 2 * 1024;
imports = [ ./common/x11.nix ];
- environment.systemPackages = [ qgisPackage ];
+ environment.systemPackages = [
+ qgisPackage
+ ];
+ systemd.sockets.qgis-server = {
+ listenStreams = [ qgisServerSocket ];
+ socketConfig = {
+ Accept = false;
+ SocketUser = qgisServerUser;
+ SocketMode = 0600;
+ };
+ wantedBy = ["sockets.target" "qgis-server.service"];
+ before = [ "qgis-server.service" ];
+ };
+
+ systemd.services.qgis-server = {
+ description = "QGIS server";
+ serviceConfig = {
+ User = qgisServerUser;
+ StandardOutput = "null";
+ StandardError = "journal";
+ StandardInput = "socket";
+ Environment = [
+ "QT_QPA_PLATFORM_PLUGIN_PATH=${pkgs.libsForQt5.qt5.qtbase}/${pkgs.libsForQt5.qt5.qtbase.qtPluginPrefix}/platforms"
+ "QGIS_SERVER_LOG_LEVEL=0"
+ "QGIS_SERVER_LOG_STDERR=1"
+ ];
+ ExecStart = "${qgisPackage}/lib/cgi-bin/qgis_mapserv.fcgi";
+ };
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ };
+
+ services.nginx = {
+ enable = true;
+ virtualHosts."qgis" = {
+ locations."~".extraConfig = ''
+ gzip off;
+ include ${pkgs.nginx}/conf/fastcgi_params;
+ include ${pkgs.nginx}/conf/fastcgi.conf;
+ fastcgi_pass unix:${qgisServerSocket};
+ '';
+ };
+ };
};
};
testScript = ''
start_all()
+ # test desktop
machine.succeed("${qgisPackage}/bin/qgis --version | grep 'QGIS ${qgisPackage.version}'")
machine.succeed("${qgisPackage}/bin/qgis --code ${testScript}")
+
+ # test server
+ machine.succeed("${qgisPackage}/bin/qgis_mapserver --version | grep 'QGIS ${qgisPackage.version}'")
+
+ machine.succeed("curl --head http://localhost | grep 'Server:.*${qgisPackage.version}'")
+ machine.succeed("curl http://localhost/index.json | grep 'Landing page as JSON'")
'';
})
diff --git a/nixos/tests/send.nix b/nixos/tests/send.nix
new file mode 100644
index 000000000000..b02f083fef9f
--- /dev/null
+++ b/nixos/tests/send.nix
@@ -0,0 +1,34 @@
+{ lib, pkgs, ... }:
+{
+ name = "send";
+
+ meta = {
+ maintainers = with lib.maintainers; [ moraxyc ];
+ };
+
+ nodes.machine =
+ { pkgs, ... }:
+ {
+ environment.systemPackages = with pkgs; [
+ curl
+ ffsend
+ ];
+
+ services.send = {
+ enable = true;
+ };
+ };
+
+ testScript = ''
+ machine.wait_for_unit("send.service")
+
+ machine.wait_for_open_port(1443)
+
+ machine.succeed("curl --fail --max-time 10 http://127.0.0.1:1443")
+
+ machine.succeed("echo HelloWorld > /tmp/test")
+ url = machine.succeed("ffsend upload -q -h http://127.0.0.1:1443/ /tmp/test")
+ machine.succeed(f'ffsend download --output /tmp/download {url}')
+ machine.succeed("cat /tmp/download | grep HelloWorld")
+ '';
+}
diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix
index 0742af6aa840..63c52227e7fd 100644
--- a/nixos/tests/systemd.nix
+++ b/nixos/tests/systemd.nix
@@ -85,10 +85,17 @@ import ./make-test-python.nix ({ pkgs, ... }: {
import re
import subprocess
+ machine.start(allow_reboot=True)
+
# Will not succeed unless ConditionFirstBoot=yes
machine.wait_for_unit("first-boot-complete.target")
+ # Make sure, a subsequent boot isn't a ConditionFirstBoot=yes.
+ machine.reboot()
machine.wait_for_x()
+ state = machine.get_unit_info("first-boot-complete.target")['ActiveState']
+ assert state == 'inactive', "Detected first boot despite first-boot-completed.target was already reached on a previous boot."
+
# wait for user services
machine.wait_for_unit("default.target", "alice")
diff --git a/nixos/tests/web-apps/netbox-upgrade.nix b/nixos/tests/web-apps/netbox-upgrade.nix
index 4c554e7ae613..b43313bc8a77 100644
--- a/nixos/tests/web-apps/netbox-upgrade.nix
+++ b/nixos/tests/web-apps/netbox-upgrade.nix
@@ -1,6 +1,6 @@
import ../make-test-python.nix ({ lib, pkgs, ... }: let
- oldNetbox = pkgs.netbox_3_6;
- newNetbox = pkgs.netbox_3_7;
+ oldNetbox = pkgs.netbox_3_7;
+ newNetbox = pkgs.netbox_4_1;
in {
name = "netbox-upgrade";
@@ -58,8 +58,10 @@ in {
return header.split()[1]
def check_api_version(version):
+ # Returns 403 with NetBox >= 4.0,
+ # but we still get the API version in the headers
headers = machine.succeed(
- "curl -sSfL http://localhost/api/ --head -H 'Content-Type: application/json'"
+ "curl -sSL http://localhost/api/ --head -H 'Content-Type: application/json'"
)
assert api_version(headers) == version
diff --git a/nixos/tests/web-apps/netbox.nix b/nixos/tests/web-apps/netbox.nix
index 233f16a8fe0d..2fdd70cfb1bf 100644
--- a/nixos/tests/web-apps/netbox.nix
+++ b/nixos/tests/web-apps/netbox.nix
@@ -132,7 +132,7 @@ in import ../make-test-python.nix ({ lib, pkgs, netbox, ... }: {
testScript = let
changePassword = pkgs.writeText "change-password.py" ''
- from django.contrib.auth.models import User
+ from users.models import User
u = User.objects.get(username='netbox')
u.set_password('netbox')
u.save()
@@ -171,11 +171,6 @@ in import ../make-test-python.nix ({ lib, pkgs, netbox, ... }: {
machine.succeed("curl -sSfL http://localhost/static/netbox.js")
machine.succeed("curl -sSfL http://localhost/static/docs/")
- with subtest("Can interact with API"):
- json.loads(
- machine.succeed("curl -sSfL -H 'Accept: application/json' 'http://localhost/api/'")
- )
-
def login(username: str, password: str):
encoded_data = json.dumps({"username": username, "password": password})
uri = "/users/tokens/provision/"
diff --git a/pkgs/README.md b/pkgs/README.md
index 052120faa089..f907d79ef348 100644
--- a/pkgs/README.md
+++ b/pkgs/README.md
@@ -75,7 +75,7 @@ Now that this is out of the way. To add a package to Nixpkgs:
- GNU cpio: [`pkgs/tools/archivers/cpio/default.nix`](tools/archivers/cpio/default.nix). Also a simple package. The generic builder in `stdenv` does everything for you. It has no dependencies beyond `stdenv`.
- - GNU Multiple Precision arithmetic library (GMP): [`pkgs/development/libraries/gmp/5.1.x.nix`](development/libraries/gmp/5.1.x.nix). Also done by the generic builder, but has a dependency on `m4`.
+ - GNU Multiple Precision arithmetic library (GMP): [`pkgs/development/libraries/gmp`](development/libraries/gmp). Also done by the generic builder, but has a dependency on `m4`.
- Pan, a GTK-based newsreader: [`pkgs/applications/networking/newsreaders/pan/default.nix`](applications/networking/newsreaders/pan/default.nix). Has an optional dependency on `gtkspell`, which is only built if `spellCheck` is `true`.
@@ -628,8 +628,8 @@ buildGoModule rec {
}
```
-Any derivaton can be specified as a test, even if it's in a different file.
-Such a derivaton that implements a test can depend on the package under test, even in the presence of `overrideAttrs`.
+Any derivation can be specified as a test, even if it's in a different file.
+Such a derivation that implements a test can depend on the package under test, even in the presence of `overrideAttrs`.
In the following example, `(my-package.overrideAttrs f).passthru.tests` will work as expected, as long as the definition of `tests` does not rely on the original `my-package` or overrides all occurrences of `my-package`:
diff --git a/pkgs/applications/audio/ashuffle/default.nix b/pkgs/applications/audio/ashuffle/default.nix
index 45daafa88d79..3fe5e6716bd3 100644
--- a/pkgs/applications/audio/ashuffle/default.nix
+++ b/pkgs/applications/audio/ashuffle/default.nix
@@ -7,7 +7,6 @@
, ninja
, libmpdclient
, yaml-cpp
-, darwin
}:
stdenv.mkDerivation rec {
@@ -24,11 +23,14 @@ stdenv.mkDerivation rec {
dontUseCmakeConfigure = true;
nativeBuildInputs = [ cmake pkg-config meson ninja ];
- buildInputs = [ libmpdclient yaml-cpp ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ];
+ buildInputs = [ libmpdclient yaml-cpp ];
mesonFlags = [ "-Dunsupported_use_system_yamlcpp=true" ];
+ env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+ NIX_LDFLAGS = "-framework CoreFoundation";
+ };
+
meta = with lib; {
homepage = "https://github.com/joshkunz/ashuffle";
description = "Automatic library-wide shuffle for mpd";
diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix
index 77ee141ef070..419a53006ef1 100644
--- a/pkgs/applications/audio/bambootracker/default.nix
+++ b/pkgs/applications/audio/bambootracker/default.nix
@@ -17,14 +17,14 @@ assert lib.versionAtLeast qtbase.version "6.0" -> qt5compat != null;
stdenv.mkDerivation (finalAttrs: {
pname = "bambootracker";
- version = "0.6.3";
+ version = "0.6.4";
src = fetchFromGitHub {
owner = "BambooTracker";
repo = "BambooTracker";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
- hash = "sha256-rMYs2jixzoMGem9lxAjDMbFOMrnK8BLFjZIagdZk/Ok=";
+ hash = "sha256-tFUliKR55iZybNyYIF1FXh8RGf8jKEsGrWBuldB277g=";
};
postPatch = lib.optionalString (lib.versionAtLeast qtbase.version "6.0") ''
@@ -54,6 +54,10 @@ stdenv.mkDerivation (finalAttrs: {
qmakeFlags = [
"CONFIG+=system_rtaudio"
"CONFIG+=system_rtmidi"
+ ] ++ lib.optionals (stdenv.cc.isClang || (lib.versionAtLeast qtbase.version "6.0")) [
+ # Clang is extra-strict about some deprecations
+ # Latest Qt6 deprecated QCheckBox::stateChanged(int)
+ "CONFIG+=no_warnings_are_errors"
];
postConfigure = "make qmake_all";
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
index 841570a61919..0ab023e2300c 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
@@ -29,11 +29,11 @@
stdenv.mkDerivation rec {
pname = "bitwig-studio";
- version = "5.2.4";
+ version = "5.2.5";
src = fetchurl {
url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/";
- hash = "sha256-/JEJthaFSdad5Hj5sdBQLLyDdp2Rp4ZAlhIA+RgwXRw=";
+ hash = "sha256-x6Uw6o+a3nArMm1Ev5ytGtLDGQ3r872WqlC022zT8Hk=";
};
nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ];
diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix
index da22ade3868c..c3c1fbcc47c9 100644
--- a/pkgs/applications/audio/geonkick/default.nix
+++ b/pkgs/applications/audio/geonkick/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "geonkick";
- version = "3.4.0";
+ version = "3.5.0";
src = fetchFromGitLab {
owner = "Geonkick-Synthesizer";
repo = pname;
rev = "v${version}";
- hash = "sha256-zoEC85QYcQMF92KvLBikYw1nDoSHaedpTDDqvoAtte0=";
+ hash = "sha256-bqdqAr4NX5WZ6zp0Kq7GFHiy/JkBvDvzuZz7jxtru0Q=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/applications/audio/minidsp/default.nix b/pkgs/applications/audio/minidsp/default.nix
index 6691d3e9507e..f6affaeefc3a 100644
--- a/pkgs/applications/audio/minidsp/default.nix
+++ b/pkgs/applications/audio/minidsp/default.nix
@@ -10,17 +10,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "minidsp";
- version = "0.1.9";
+ version = "0.1.12";
src = fetchFromGitHub {
owner = "mrene";
repo = "minidsp-rs";
- # v0.1.9 tag is out of date, cargo lock fixed in next commit on main
- rev = "b03a95a05917f20b9c3153c03e4e99dd943d9f6f";
- hash = "sha256-uZBrX3VCCpr7AY82PgR596mncL5wWDK7bpx2m/jCJBE=";
+ rev = "v${version}";
+ hash = "sha256-8bKP9/byVRKj1P1MP3ZVg8yw0WaNB0BcqarCti7B8CA=";
};
- cargoHash = "sha256-0PyojyimxnwEtHA98Npf4eHvycjuXdPrrIFilVuEnQk=";
+ cargoHash = "sha256-GUrYEFpTo83lKuDyENaVN3VhnZ2Y/igtsbEY7kNa1os=";
cargoBuildFlags = ["-p minidsp -p minidsp-daemon"];
diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix
index 027d3880bd9d..a7ca399e4946 100644
--- a/pkgs/applications/audio/pavucontrol/default.nix
+++ b/pkgs/applications/audio/pavucontrol/default.nix
@@ -7,7 +7,7 @@
libpulseaudio,
gtkmm4,
libsigcxx,
- # Since version 6.0, libcanberra is optional
+ # Since version 6.1, libcanberra is optional
withLibcanberra ? true,
libcanberra-gtk3,
json-glib,
@@ -20,14 +20,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pavucontrol";
- version = "6.0";
+ version = "6.1";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "pulseaudio";
repo = "pavucontrol";
rev = "refs/tags/v${finalAttrs.version}";
- hash = "sha256-nxzFvD/KUevIJOw9jgcr0Hfvg7KiSOmTBfKN3jLu3Cg=";
+ hash = "sha256-cru4I+LljYKIpIr7gSolnuLuUIXgc8l+JUmPrme4+YA=";
};
buildInputs = [
diff --git a/pkgs/applications/audio/psst/Cargo.lock b/pkgs/applications/audio/psst/Cargo.lock
index 6ef92630caf9..b8a5524665aa 100644
--- a/pkgs/applications/audio/psst/Cargo.lock
+++ b/pkgs/applications/audio/psst/Cargo.lock
@@ -49,6 +49,12 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1"
+[[package]]
+name = "allocator-api2"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+
[[package]]
name = "alsa"
version = "0.9.1"
@@ -250,7 +256,7 @@ dependencies = [
"futures-lite 2.3.0",
"parking",
"polling 3.7.3",
- "rustix 0.38.35",
+ "rustix 0.38.37",
"slab",
"tracing",
"windows-sys 0.59.0",
@@ -289,7 +295,7 @@ dependencies = [
"cfg-if",
"event-listener 3.1.0",
"futures-lite 1.13.0",
- "rustix 0.38.35",
+ "rustix 0.38.37",
"windows-sys 0.48.0",
]
@@ -316,7 +322,7 @@ dependencies = [
"cfg-if",
"futures-core",
"futures-io",
- "rustix 0.38.35",
+ "rustix 0.38.37",
"signal-hook-registry",
"slab",
"windows-sys 0.59.0",
@@ -513,15 +519,6 @@ dependencies = [
"generic-array",
]
-[[package]]
-name = "block2"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
-dependencies = [
- "objc2",
-]
-
[[package]]
name = "blocking"
version = "1.6.1"
@@ -1011,24 +1008,24 @@ dependencies = [
]
[[package]]
-name = "dirs-next"
-version = "1.0.2"
+name = "directories"
+version = "5.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf36e65a80337bea855cd4ef9b8401ffce06a7baedf2e85ec467b1ac3f6e82b6"
+checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
dependencies = [
- "cfg-if",
- "dirs-sys-next",
+ "dirs-sys",
]
[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
+name = "dirs-sys"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
dependencies = [
"libc",
+ "option-ext",
"redox_users",
- "winapi",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -1365,6 +1362,12 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+[[package]]
+name = "foldhash"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
+
[[package]]
name = "foreign-types"
version = "0.3.2"
@@ -1389,12 +1392,6 @@ dependencies = [
"percent-encoding",
]
-[[package]]
-name = "fs_extra"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
-
[[package]]
name = "futf"
version = "0.1.5"
@@ -2033,6 +2030,17 @@ version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+]
+
[[package]]
name = "heck"
version = "0.3.3"
@@ -2246,9 +2254,9 @@ dependencies = [
[[package]]
name = "image"
-version = "0.25.2"
+version = "0.25.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
+checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae"
dependencies = [
"bytemuck",
"byteorder-lite",
@@ -2269,9 +2277,9 @@ dependencies = [
[[package]]
name = "image-webp"
-version = "0.1.3"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904"
+checksum = "e031e8e3d94711a9ccb5d6ea357439ef3dcbed361798bd4071dc4d9793fbe22f"
dependencies = [
"byteorder-lite",
"quick-error",
@@ -2290,7 +2298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
dependencies = [
"equivalent",
- "hashbrown",
+ "hashbrown 0.14.5",
]
[[package]]
@@ -2573,12 +2581,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "linked-hash-map"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
-
[[package]]
name = "linux-raw-sys"
version = "0.3.8"
@@ -2617,12 +2619,12 @@ dependencies = [
]
[[package]]
-name = "lru-cache"
-version = "0.1.2"
+name = "lru"
+version = "0.12.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
+checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
dependencies = [
- "linked-hash-map",
+ "hashbrown 0.15.0",
]
[[package]]
@@ -2936,6 +2938,15 @@ dependencies = [
"syn 2.0.77",
]
+[[package]]
+name = "num_threads"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
+dependencies = [
+ "libc",
+]
+
[[package]]
name = "oauth2"
version = "4.4.2"
@@ -2965,40 +2976,6 @@ dependencies = [
"malloc_buf",
]
-[[package]]
-name = "objc-sys"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
-
-[[package]]
-name = "objc2"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
-dependencies = [
- "objc-sys",
- "objc2-encode",
-]
-
-[[package]]
-name = "objc2-encode"
-version = "4.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8"
-
-[[package]]
-name = "objc2-foundation"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
-dependencies = [
- "bitflags 2.6.0",
- "block2",
- "libc",
- "objc2",
-]
-
[[package]]
name = "object"
version = "0.36.4"
@@ -3033,9 +3010,9 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
[[package]]
name = "open"
@@ -3048,6 +3025,12 @@ dependencies = [
"pathdiff",
]
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
[[package]]
name = "ordered-stream"
version = "0.2.0"
@@ -3337,15 +3320,6 @@ version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
-[[package]]
-name = "platform-dirs"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e188d043c1a692985f78b5464853a263f1a27e5bd6322bad3a4078ee3c998a38"
-dependencies = [
- "dirs-next",
-]
-
[[package]]
name = "png"
version = "0.17.13"
@@ -3385,7 +3359,7 @@ dependencies = [
"concurrent-queue",
"hermit-abi 0.4.0",
"pin-project-lite",
- "rustix 0.38.35",
+ "rustix 0.38.37",
"tracing",
"windows-sys 0.59.0",
]
@@ -3510,7 +3484,6 @@ dependencies = [
"aes",
"audio_thread_priority",
"byteorder",
- "chrono",
"cpal",
"crossbeam-channel",
"ctr",
@@ -3537,6 +3510,7 @@ dependencies = [
"socks",
"symphonia",
"tempfile",
+ "time",
"ureq",
"url",
"windows 0.58.0",
@@ -3547,19 +3521,18 @@ name = "psst-gui"
version = "0.1.0"
dependencies = [
"crossbeam-channel",
+ "directories",
"druid",
"druid-enums",
"druid-shell",
"env_logger",
- "fs_extra",
- "image 0.25.2",
+ "image 0.25.4",
"itertools 0.13.0",
"log",
- "lru-cache",
+ "lru",
"once_cell",
"open",
"parking_lot",
- "platform-dirs",
"psst-core",
"rand",
"raw-window-handle",
@@ -3573,7 +3546,6 @@ dependencies = [
"time-humanize",
"ureq",
"url",
- "webbrowser",
"winres",
]
@@ -3765,9 +3737,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.10.6"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
dependencies = [
"aho-corasick",
"memchr",
@@ -3777,9 +3749,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
dependencies = [
"aho-corasick",
"memchr",
@@ -3788,9 +3760,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "reqwest"
@@ -3838,9 +3810,6 @@ name = "rgb"
version = "0.8.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
-dependencies = [
- "bytemuck",
-]
[[package]]
name = "ring"
@@ -3894,9 +3863,9 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.38.35"
+version = "0.38.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
dependencies = [
"bitflags 2.6.0",
"errno",
@@ -4034,18 +4003,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
[[package]]
name = "serde"
-version = "1.0.209"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.209"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
dependencies = [
"proc-macro2",
"quote",
@@ -4054,9 +4023,9 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.127"
+version = "1.0.132"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
dependencies = [
"itoa",
"memchr",
@@ -4474,14 +4443,14 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "tempfile"
-version = "3.12.0"
+version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
dependencies = [
"cfg-if",
"fastrand 2.1.1",
"once_cell",
- "rustix 0.38.35",
+ "rustix 0.38.37",
"windows-sys 0.59.0",
]
@@ -4554,7 +4523,9 @@ checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
dependencies = [
"deranged",
"itoa",
+ "libc",
"num-conv",
+ "num_threads",
"powerfmt",
"serde",
"time-core",
@@ -5079,24 +5050,6 @@ dependencies = [
"wasm-bindgen",
]
-[[package]]
-name = "webbrowser"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "425ba64c1e13b1c6e8c5d2541c8fac10022ca584f33da781db01b5756aef1f4e"
-dependencies = [
- "block2",
- "core-foundation",
- "home",
- "jni",
- "log",
- "ndk-context",
- "objc2",
- "objc2-foundation",
- "url",
- "web-sys",
-]
-
[[package]]
name = "webpki-roots"
version = "0.25.4"
diff --git a/pkgs/applications/audio/psst/default.nix b/pkgs/applications/audio/psst/default.nix
index af5b7a51f999..24dad343fc54 100644
--- a/pkgs/applications/audio/psst/default.nix
+++ b/pkgs/applications/audio/psst/default.nix
@@ -16,13 +16,13 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "psst";
- version = "unstable-2024-10-07";
+ version = "unstable-2024-10-24";
src = fetchFromGitHub {
owner = "jpochyla";
repo = pname;
- rev = "38d1c75d59848c54cb88896a93e05da3c71c7df4";
- hash = "sha256-iMtrZ1Mto3j4lFXI2Sm2R85+m8LpR7V1WoJ3X5JyF60=";
+ rev = "02923198ba0e27b2b6271340cf57dd8ce109049b";
+ hash = "sha256-gEK0yf37eREsI6kCIYTBlkkM6Fnjy0KGnd0XqcawGjU=";
};
cargoLock = {
diff --git a/pkgs/applications/audio/psst/make-build-reproducible.patch b/pkgs/applications/audio/psst/make-build-reproducible.patch
index edaf46af94ab..0e4f3c75a89e 100644
--- a/pkgs/applications/audio/psst/make-build-reproducible.patch
+++ b/pkgs/applications/audio/psst/make-build-reproducible.patch
@@ -1,20 +1,22 @@
diff --git a/psst-core/build.rs b/psst-core/build.rs
deleted file mode 100644
-index cac2c23..0000000
+index 4e899af..0000000
--- a/psst-core/build.rs
+++ /dev/null
-@@ -1,41 +0,0 @@
+@@ -1,43 +0,0 @@
+-use gix_config::File;
-use std::{env, fs, io::Write};
+-use time::OffsetDateTime;
-
-fn main() {
- let outdir = env::var("OUT_DIR").unwrap();
- let outfile = format!("{}/build-time.txt", outdir);
-
- let mut fh = fs::File::create(outfile).unwrap();
-- write!(fh, r#""{}""#, chrono::Local::now()).ok();
+- let now = OffsetDateTime::now_local().unwrap_or_else(|_| OffsetDateTime::now_utc());
+- write!(fh, r#""{}""#, now).ok();
-
-- let git_config =
-- gix_config::File::from_git_dir("../.git/".into()).expect("Git Config not found!");
+- let git_config = File::from_git_dir("../.git/".into()).expect("Git Config not found!");
- // Get Git's 'Origin' URL
- let mut remote_url = git_config
- .raw_value("remote.origin.url")
@@ -46,7 +48,7 @@ index cac2c23..0000000
- write!(file, r#""{}""#, remote_url).ok();
-}
diff --git a/psst-core/src/lib.rs b/psst-core/src/lib.rs
-index 2faa317..7d7501d 100644
+index 2faa317..b890a2d 100644
--- a/psst-core/src/lib.rs
+++ b/psst-core/src/lib.rs
@@ -2,9 +2,9 @@
@@ -56,7 +58,7 @@ index 2faa317..7d7501d 100644
-pub const GIT_VERSION: &str = git_version!();
-pub const BUILD_TIME: &str = include!(concat!(env!("OUT_DIR"), "/build-time.txt"));
-pub const REMOTE_URL: &str = include!(concat!(env!("OUT_DIR"), "/remote-url.txt"));
-+pub const GIT_VERSION: &str = "38d1c75d59848c54cb88896a93e05da3c71c7df4";
++pub const GIT_VERSION: &str = "02923198ba0e27b2b6271340cf57dd8ce109049b";
+pub const BUILD_TIME: &str = "1970-01-01 00:00:00";
+pub const REMOTE_URL: &str = "https://github.com/jpochyla/psst";
diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/applications/audio/seq66/default.nix
index 500e85d68416..304cc7767012 100644
--- a/pkgs/applications/audio/seq66/default.nix
+++ b/pkgs/applications/audio/seq66/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "seq66";
- version = "0.99.14";
+ version = "0.99.15";
src = fetchFromGitHub {
owner = "ahlstromcj";
repo = "seq66";
rev = version;
- hash = "sha256-0xexKu8qQd0HzEHYKMomeoBE1s/tC5T1jzUl+AkhTqY=";
+ hash = "sha256-/wrCBRB6AujSQwv56/OR60+A/zvIdEFsw2/W4+dkDgY=";
};
nativeBuildInputs = [ autoreconfHook pkg-config qttools which wrapQtAppsHook ];
diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix
index a3c51cfaaba2..3f297c3e9bc4 100644
--- a/pkgs/applications/audio/spotify-player/default.nix
+++ b/pkgs/applications/audio/spotify-player/default.nix
@@ -34,16 +34,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [ "" "alsa" "pulseaud
rustPlatform.buildRustPackage rec {
pname = "spotify-player";
- version = "0.19.1";
+ version = "0.20.0";
src = fetchFromGitHub {
owner = "aome510";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-R8F7s8FPnCe+shNUN/u0qcxFy3IbyfVo2xZ5/E/qwaw=";
+ hash = "sha256-heycCm2Nwyo+DegMKeXZ+dF+ZqiFT/6P08/28buJc6I=";
};
- cargoHash = "sha256-7vximGisIIXBrwHXSWQjO08OraaweG7ZT6v+gVdYGVc=";
+ cargoHash = "sha256-U3a/6uF7vOV3QnxqPnooBdvjyyIPLnQXiXtTwKeHAxA=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/applications/audio/stochas/default.nix b/pkgs/applications/audio/stochas/default.nix
index 33d9b050a1ff..84297760b32b 100644
--- a/pkgs/applications/audio/stochas/default.nix
+++ b/pkgs/applications/audio/stochas/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "stochas";
- version = "1.3.10";
+ version = "1.3.12";
src = fetchFromGitHub {
owner = "surge-synthesizer";
repo = pname;
rev = "v${version}";
- hash = "sha256-L7dzUUQNCwcuQavUx9hBH0FX5KSocfeYUv5qBcPD2Vg=";
+ hash = "sha256-GrYzsyezunFLFVzBfYCbNC53K695eYto9338iAALiSk=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix
index 6ed103a4b287..23157cd248d1 100644
--- a/pkgs/applications/blockchains/clightning/default.nix
+++ b/pkgs/applications/blockchains/clightning/default.nix
@@ -24,11 +24,11 @@ let
in
stdenv.mkDerivation rec {
pname = "clightning";
- version = "24.08.1";
+ version = "24.08.2";
src = fetchurl {
url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
- hash = "sha256-2ZKvhNuzGftKwSdmMkHOwE9UEI5Ewn5HHSyyZUcCwB4=";
+ hash = "sha256-U54HNOreulhvCYeULyBbl/WHQ7F9WQnSCSMGg5WUAdg=";
};
# when building on darwin we need cctools to provide the correct libtool
diff --git a/pkgs/applications/blockchains/lightning-loop/default.nix b/pkgs/applications/blockchains/lightning-loop/default.nix
index 3dc1356c90cb..e257c581fd51 100644
--- a/pkgs/applications/blockchains/lightning-loop/default.nix
+++ b/pkgs/applications/blockchains/lightning-loop/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "lightning-loop";
- version = "0.24.1-beta";
+ version = "0.28.8-beta";
src = fetchFromGitHub {
owner = "lightninglabs";
repo = "loop";
rev = "v${version}";
- hash = "sha256-gPWiKSwXS1eSuHss+hkiqqxqonGYSGmSh3/jL+NlqEg=";
+ hash = "sha256-zgKKYHDRYXPslPHay/V2DAL1jQfeX5qPWUQQtuvp1M0=";
};
- vendorHash = "sha256-6bRg6is1g/eRCr82tHMXTWVFv2S0d2h/J3w1gpentjo=";
+ vendorHash = "sha256-v7zSvCp63z+xZIuXbqHueamEBN/jZBr2Kysvq03e8L0=";
subPackages = [ "cmd/loop" "cmd/loopd" ];
diff --git a/pkgs/applications/display-managers/greetd/gtkgreet.nix b/pkgs/applications/display-managers/greetd/gtkgreet.nix
index 10389c262742..652459e9715e 100644
--- a/pkgs/applications/display-managers/greetd/gtkgreet.nix
+++ b/pkgs/applications/display-managers/greetd/gtkgreet.nix
@@ -24,11 +24,13 @@ stdenv.mkDerivation rec {
sha256 = "sha256-GKBYql0hzqB6uY87SsAqHwf3qLAr7xznMnAjRtP4HS8=";
};
+ depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [
pkg-config
meson
ninja
cmake
+ scdoc
wrapGAppsHook3
];
@@ -36,7 +38,6 @@ stdenv.mkDerivation rec {
gtk3
gtk-layer-shell
json_c
- scdoc
librsvg
];
@@ -44,6 +45,11 @@ stdenv.mkDerivation rec {
"-Dlayershell=enabled"
];
+ postPatch = ''
+ substituteInPlace meson.build \
+ --replace "dependency('scdoc'," "dependency('scdoc', native:true,"
+ '';
+
# G_APPLICATION_FLAGS_NONE is deprecated in GLib 2.73.3+.
env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
diff --git a/pkgs/applications/display-managers/greetd/tuigreet.nix b/pkgs/applications/display-managers/greetd/tuigreet.nix
index 11ca43c61436..39e6d482f2c0 100644
--- a/pkgs/applications/display-managers/greetd/tuigreet.nix
+++ b/pkgs/applications/display-managers/greetd/tuigreet.nix
@@ -1,8 +1,11 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-}:
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+ installShellFiles,
+ scdoc,
+}:
rustPlatform.buildRustPackage rec {
pname = "tuigreet";
version = "0.9.1";
@@ -16,6 +19,16 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-RkJjAmZ++4nc/lLh8g0LxGq2DjZGxQEjFOl8Yzx116A=";
+ nativeBuildInputs = [
+ installShellFiles
+ scdoc
+ ];
+
+ postInstall = ''
+ scdoc < contrib/man/tuigreet-1.scd > tuigreet.1
+ installManPage tuigreet.1
+ '';
+
meta = {
description = "Graphical console greeter for greetd";
homepage = "https://github.com/apognu/tuigreet";
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix
index b69423e58331..7cb806b2833d 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix
@@ -8,13 +8,13 @@
melpaBuild {
pname = "edraw";
- version = "1.2.0-unstable-2024-07-24";
+ version = "1.2.0-unstable-2024-10-04";
src = fetchFromGitHub {
owner = "misohena";
repo = "el-easydraw";
- rev = "6f93e744d5f62de2176d3d0f0aa1f9e8d84ccefd";
- hash = "sha256-dXu4hDC4qE7W+KkWb9HIqYwesOKisMiZSTAulDpjyfA=";
+ rev = "ad740d87e768052b0ef5b5e7f0822c7ac1b238fb";
+ hash = "sha256-xdyDikE8fUQ12Ra5j5lQUHVLKpTYtvfn1DosusQt61Q=";
};
propagatedUserEnvPkgs = [ gzip ];
diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix
index 2ad51433e215..521a3d83a097 100644
--- a/pkgs/applications/editors/emacs/sources.nix
+++ b/pkgs/applications/editors/emacs/sources.nix
@@ -114,10 +114,10 @@ in
emacs30 = import ./make-emacs.nix (mkArgs {
pname = "emacs";
- version = "30.0.91";
+ version = "30.0.92";
variant = "mainline";
- rev = "30.0.91";
- hash = "sha256-X5J34BUY42JgA1s76eVeGA9WNtesU2c+JyndIHFbONQ=";
+ rev = "30.0.92";
+ hash = "sha256-V2TXLemSCIPTpg6RDChv4va7pHfVcqSMw/EWqvlRQ1o=";
});
emacs28-macport = import ./make-emacs.nix (mkArgs {
diff --git a/pkgs/applications/editors/jetbrains/bin/darwin.nix b/pkgs/applications/editors/jetbrains/bin/darwin.nix
index 747f03f55d5e..f5edf904726b 100644
--- a/pkgs/applications/editors/jetbrains/bin/darwin.nix
+++ b/pkgs/applications/editors/jetbrains/bin/darwin.nix
@@ -19,8 +19,10 @@ let
loname = lib.toLower productShort;
in
stdenvNoCC.mkDerivation {
- inherit pname meta src version plugins;
+ inherit pname src version plugins;
passthru.buildNumber = buildNumber;
+ passthru.product = product;
+ meta = meta // { mainProgram = loname; };
desktopName = product;
dontFixup = true;
installPhase = ''
diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json
index 4c89a63a41fa..c66396c98611 100644
--- a/pkgs/applications/editors/jetbrains/bin/versions.json
+++ b/pkgs/applications/editors/jetbrains/bin/versions.json
@@ -35,10 +35,10 @@
"gateway": {
"update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
- "version": "2024.2.1",
- "sha256": "bc4027c3322004d041571ede49f1dc3656d7abcecf6bdeb9caab191264e60fcb",
- "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2.1.tar.gz",
- "build_number": "242.21829.203"
+ "version": "2024.2.3",
+ "sha256": "bb39d4b4d866600542502e60c722431dbbcc0b295ff2f30ef4a98cd57e1cde92",
+ "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2.3.tar.gz",
+ "build_number": "242.23339.42"
},
"goland": {
"update-channel": "GoLand RELEASE",
@@ -51,59 +51,59 @@
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
- "version": "2024.2.3",
- "sha256": "2698adf2f0c4239f21b997faf9fc85954fd654a58d52ff630613fed70fb9699d",
- "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.3.tar.gz",
- "build_number": "242.23339.11"
+ "version": "2024.2.4",
+ "sha256": "0142d03ecd3b65bfa6c0d9944e3ac52438046d51277878362279e6358b1aebfa",
+ "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.4.tar.gz",
+ "build_number": "242.23726.103"
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
- "version": "2024.2.3",
- "sha256": "579021f82d31dceb0dd8581fe5c12d7481e52c24a10688898ed00af1a0295eb3",
- "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.3.tar.gz",
- "build_number": "242.23339.11"
+ "version": "2024.2.4",
+ "sha256": "8411fda793a20356a4982e4f18f6691839d8a471e2081ab6d8cc78b3f8b02532",
+ "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.4.tar.gz",
+ "build_number": "242.23726.103"
},
"mps": {
"update-channel": "MPS RELEASE",
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
- "version": "2024.1",
- "sha256": "aa537596103545021726b72d53a46726e4834d1c57af383ca1a94afc14a25642",
- "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1.tar.gz",
- "build_number": "241.18034.1093"
+ "version": "2024.1.1",
+ "sha256": "008fc1c27002d7cd247f72cf5045b46cad35a0117e120565f4cce2311509be22",
+ "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1.1.tar.gz",
+ "build_number": "241.19072.1155"
},
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
- "version": "2024.2.3",
- "sha256": "8b3b1ba19c4d5f0cc1d6775bff58d38313414eae75976ca99915102c02368eea",
- "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.3.tar.gz",
- "build_number": "242.23339.16",
+ "version": "2024.2.4",
+ "sha256": "1a1809500d05d5e947f148d34b23394fcdd023be26d2b15f7f43a87cf564f8bc",
+ "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.4.tar.gz",
+ "build_number": "242.23726.107",
"version-major-minor": "2022.3"
},
"pycharm-community": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
- "version": "2024.2.3",
- "sha256": "448f6c48a51bb419c68c763b0e4eefc0449ad7bbad534de3f93b2f1a40308833",
- "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.3.tar.gz",
- "build_number": "242.23339.19"
+ "version": "2024.2.4",
+ "sha256": "08fc092c4c7919a43caa64ec04684060ca9f6f0df27a1be68fe088020b705b28",
+ "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.4.tar.gz",
+ "build_number": "242.23726.102"
},
"pycharm-professional": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
- "version": "2024.2.3",
- "sha256": "837876f0d4db2d6fc0c319e88fa6e24fbe81b80809d529d600ef86a524aa8312",
- "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.3.tar.gz",
- "build_number": "242.23339.19"
+ "version": "2024.2.4",
+ "sha256": "18670fd35742aa6a1fef8a2d10248f2a33cb1349e4f4d4603918b212544c86cf",
+ "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.4.tar.gz",
+ "build_number": "242.23726.102"
},
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
- "version": "2024.2.5",
- "sha256": "7c8b3fc459f0a6314ebf2b7da0a202cb0cbbc7df432fa047673f34fbad9f9dfe",
- "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.5.tar.gz",
- "build_number": "242.22855.90"
+ "version": "2024.2.7",
+ "sha256": "71dda49ff9b2eeb982c0d9ea8ff70fde3f45ddc98e2be95c260bdc9cfbba7e42",
+ "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.7.tar.gz",
+ "build_number": "242.23726.100"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
@@ -116,18 +116,18 @@
"rust-rover": {
"update-channel": "RustRover RELEASE",
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz",
- "version": "2024.2.2",
- "sha256": "ac2046c415906ba8f802a0b94119ff899efde41547a9fdd63b3c5e46bf9d42d1",
- "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.2.tar.gz",
- "build_number": "242.22855.126"
+ "version": "2024.2.4",
+ "sha256": "e8ba0dd398c5ec426128640ffc7eb94728b8f13cd33874712da0c04efa02286c",
+ "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.4.tar.gz",
+ "build_number": "242.23726.110"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
- "version": "2024.2.3",
- "sha256": "b3c861e440a6747b87e329009910858a2a21661dd09e53b1b2b5d835b3bb76b6",
- "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.3.tar.gz",
- "build_number": "242.23339.15"
+ "version": "2024.2.4",
+ "sha256": "c7cd4f9c5affc7f2d24e50130d5565165cc88ac3a4f7fbefd9986a03727f753e",
+ "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.4.tar.gz",
+ "build_number": "242.23726.96"
},
"writerside": {
"update-channel": "Writerside EAP",
@@ -174,10 +174,10 @@
"gateway": {
"update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz",
- "version": "2024.2.1",
- "sha256": "9dfe0228b651421e0972915472ea34a80940bf4b13a922b405d88207c4140c47",
- "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2.1-aarch64.tar.gz",
- "build_number": "242.21829.203"
+ "version": "2024.2.3",
+ "sha256": "5baa78931df47548bbcae35f5a55f2fb3882f57e4b662418606eba4082d8e2b0",
+ "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2.3-aarch64.tar.gz",
+ "build_number": "242.23339.42"
},
"goland": {
"update-channel": "GoLand RELEASE",
@@ -190,59 +190,59 @@
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz",
- "version": "2024.2.3",
- "sha256": "97d5b585b9c7d5465ef7a0e99a41c35c405a7658fe61ece64be84c6ed6e45e4c",
- "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.3-aarch64.tar.gz",
- "build_number": "242.23339.11"
+ "version": "2024.2.4",
+ "sha256": "94e2c0f9c3665c43f93d8853ce8fc6072a2dc098d42e9f840d6523d3d39f4101",
+ "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.4-aarch64.tar.gz",
+ "build_number": "242.23726.103"
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz",
- "version": "2024.2.3",
- "sha256": "c6bf5a8183fb1c3422dec061e5198fa18bb6edaf2c64724efecf77fddaf747e1",
- "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.3-aarch64.tar.gz",
- "build_number": "242.23339.11"
+ "version": "2024.2.4",
+ "sha256": "902494f3f7857c92019feff6a97d3001f5615d0c6844920218f5bf2625397a92",
+ "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.4-aarch64.tar.gz",
+ "build_number": "242.23726.103"
},
"mps": {
"update-channel": "MPS RELEASE",
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
- "version": "2024.1",
- "sha256": "aa537596103545021726b72d53a46726e4834d1c57af383ca1a94afc14a25642",
- "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1.tar.gz",
- "build_number": "241.18034.1093"
+ "version": "2024.1.1",
+ "sha256": "008fc1c27002d7cd247f72cf5045b46cad35a0117e120565f4cce2311509be22",
+ "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1.1.tar.gz",
+ "build_number": "241.19072.1155"
},
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz",
- "version": "2024.2.3",
- "sha256": "25fbd433eb53904efba7c05ad0a28cbd7a9e7c8e08cbf8aa81913cd8ca4db1cf",
- "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.3-aarch64.tar.gz",
- "build_number": "242.23339.16",
+ "version": "2024.2.4",
+ "sha256": "9a01b9f291ab758adb05977dd5a810108a9a9c9e5556be996b95e111d741884b",
+ "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.4-aarch64.tar.gz",
+ "build_number": "242.23726.107",
"version-major-minor": "2022.3"
},
"pycharm-community": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz",
- "version": "2024.2.3",
- "sha256": "fd398923379f340d9454e00a23dabc141af1120c5a294a8fd899c2f542b00a57",
- "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.3-aarch64.tar.gz",
- "build_number": "242.23339.19"
+ "version": "2024.2.4",
+ "sha256": "ed6a7ccdde45c3d79c6c7ada5f97bdf39bbf9303c318acd86a8ded3d11444d70",
+ "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.4-aarch64.tar.gz",
+ "build_number": "242.23726.102"
},
"pycharm-professional": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz",
- "version": "2024.2.3",
- "sha256": "2f15216657b1b7b3083aaded473b992e22fbe38704e0ebe8057aecc7ef37d78b",
- "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.3-aarch64.tar.gz",
- "build_number": "242.23339.19"
+ "version": "2024.2.4",
+ "sha256": "72d8a8c6d90f29bc76b57ba4c4bfafb9b6faf6a907a318157e6cfd937c4ee4b2",
+ "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.4-aarch64.tar.gz",
+ "build_number": "242.23726.102"
},
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz",
- "version": "2024.2.5",
- "sha256": "1a3a4cfe64525b3d744fe82378fd86d84ac87b66a69a37f930ae05bdaaecb010",
- "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.5-aarch64.tar.gz",
- "build_number": "242.22855.90"
+ "version": "2024.2.7",
+ "sha256": "5848b1949a01c11bbd48a0b048470d160dad808dc0cfa14872a3448c8f9fbffa",
+ "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.7-aarch64.tar.gz",
+ "build_number": "242.23726.100"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
@@ -255,18 +255,18 @@
"rust-rover": {
"update-channel": "RustRover RELEASE",
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz",
- "version": "2024.2.2",
- "sha256": "7d3dc3d35f56f5948c294742a06a8e1cc7fc55dae7455b5bb8f99eb244ab7a20",
- "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.2-aarch64.tar.gz",
- "build_number": "242.22855.126"
+ "version": "2024.2.4",
+ "sha256": "d0ca0cd4e6023fd4494c5f50f07acc35809721ef04b82735a367526d0d4ffc5e",
+ "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.4-aarch64.tar.gz",
+ "build_number": "242.23726.110"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz",
- "version": "2024.2.3",
- "sha256": "c57647c5c77770f76468a2aacb62655e27f6590b48967d5eafd37e468bd25437",
- "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.3-aarch64.tar.gz",
- "build_number": "242.23339.15"
+ "version": "2024.2.4",
+ "sha256": "80b64046d1eab7f1487110095fdcbb4b1bb2543f900e3a7ab7badcf2f7c17c96",
+ "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.4-aarch64.tar.gz",
+ "build_number": "242.23726.96"
},
"writerside": {
"update-channel": "Writerside EAP",
@@ -313,10 +313,10 @@
"gateway": {
"update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg",
- "version": "2024.2.1",
- "sha256": "4fabb5e9ea13fc1380779502915f0d6741ee75742a535ced679f68d72d40a41c",
- "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2.1.dmg",
- "build_number": "242.21829.203"
+ "version": "2024.2.3",
+ "sha256": "b3b4439a5ac6ef464fb7c765a0438f09ff578a8922493969793c69d86b1d2de9",
+ "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2.3.dmg",
+ "build_number": "242.23339.42"
},
"goland": {
"update-channel": "GoLand RELEASE",
@@ -329,59 +329,59 @@
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
- "version": "2024.2.3",
- "sha256": "015db6b1a9b57b55db005d6eff8752e4155d52841f03dbd679e204d8ae9289e9",
- "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.3.dmg",
- "build_number": "242.23339.11"
+ "version": "2024.2.4",
+ "sha256": "8869d81179215f03ae7caa8b9d3510e0b6d2b809bc1efa9487fe758fde1ab09f",
+ "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.4.dmg",
+ "build_number": "242.23726.103"
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
- "version": "2024.2.3",
- "sha256": "bc47dc27e81f0fd15a9b62132912e68051b5b9f31bef6faadfcf27a48db8ffa7",
- "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.3.dmg",
- "build_number": "242.23339.11"
+ "version": "2024.2.4",
+ "sha256": "1f5fe7dabe96fd5bff856f07e3ddae1178fff15761ea16fa59157db997031891",
+ "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.4.dmg",
+ "build_number": "242.23726.103"
},
"mps": {
"update-channel": "MPS RELEASE",
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg",
- "version": "2024.1",
- "sha256": "93510db63ab6f3d7b6e139730f90836ba772032526d77e3de207e848c808d398",
- "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1-macos.dmg",
- "build_number": "241.18034.1093"
+ "version": "2024.1.1",
+ "sha256": "85f936a8d4a610b0232f5716f364cfae6edac5322fd40714c07e9ffabb11e85a",
+ "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1.1-macos.dmg",
+ "build_number": "241.19072.1155"
},
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
- "version": "2024.2.3",
- "sha256": "e4824a57ba7bff5806c11c1eabe6f3615a4ae082cd83549631823fec0ca03b2f",
- "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.3.dmg",
- "build_number": "242.23339.16",
+ "version": "2024.2.4",
+ "sha256": "7cd32005901e31deff4a754108d4282cfa24d43738767c926eb3b837d4915371",
+ "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.4.dmg",
+ "build_number": "242.23726.107",
"version-major-minor": "2022.3"
},
"pycharm-community": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg",
- "version": "2024.2.3",
- "sha256": "8750abd7c24b26d8e226a1ba20f69174173e7e76cb6198c1ccc89117201417d5",
- "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.3.dmg",
- "build_number": "242.23339.19"
+ "version": "2024.2.4",
+ "sha256": "ec6320f21c96b8816f18d3713b2ff3fa037eb80ea3528ed79fb85cb379233514",
+ "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.4.dmg",
+ "build_number": "242.23726.102"
},
"pycharm-professional": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg",
- "version": "2024.2.3",
- "sha256": "a6252501f10a73151cba714080e7bb54197469de1be83b217b3479d5d0b7bc33",
- "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.3.dmg",
- "build_number": "242.23339.19"
+ "version": "2024.2.4",
+ "sha256": "cdd0321d3be625564923f1399921dcd7068e2a2d810951359c06db832cd9159d",
+ "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.4.dmg",
+ "build_number": "242.23726.102"
},
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
- "version": "2024.2.5",
- "sha256": "0161a1eb2d1e99ed88bebf26e7d1646434924a0878ab4c8e5ec1fc34b0998a5e",
- "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.5.dmg",
- "build_number": "242.22855.90"
+ "version": "2024.2.7",
+ "sha256": "5087643d82f31dbd180bbd8a697915d24b15113fc641f885ae858838ee3b2a3a",
+ "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.7.dmg",
+ "build_number": "242.23726.100"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
@@ -394,18 +394,18 @@
"rust-rover": {
"update-channel": "RustRover RELEASE",
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg",
- "version": "2024.2.2",
- "sha256": "b9c3959e7680c4b3ae341688597ac70606cb2179272440d9ee31d06633665fe2",
- "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.2.dmg",
- "build_number": "242.22855.126"
+ "version": "2024.2.4",
+ "sha256": "1f14c203ef186339a5305008ce2112275a6b293ce422b355bba0e8554b9656e2",
+ "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.4.dmg",
+ "build_number": "242.23726.110"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
- "version": "2024.2.3",
- "sha256": "f092871d04fbd5c8cfd8fac7c47d84453c7134ffb937137a7d4b916c10ba5ece",
- "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.3.dmg",
- "build_number": "242.23339.15"
+ "version": "2024.2.4",
+ "sha256": "63ebaffb17bcbe8759fbe256a7764aea3feadf18ac817a27f80b8cfed1af62d1",
+ "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.4.dmg",
+ "build_number": "242.23726.96"
},
"writerside": {
"update-channel": "Writerside EAP",
@@ -452,10 +452,10 @@
"gateway": {
"update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg",
- "version": "2024.2.1",
- "sha256": "8a8242c53ddc85304922552fdf424fbe31b729f549feda30b8e6a982c5447f4d",
- "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2.1-aarch64.dmg",
- "build_number": "242.21829.203"
+ "version": "2024.2.3",
+ "sha256": "5874e4969ac9f894f71e1ec6ac9caf3bbb9cd957b7be11a06850bd330ec69f5f",
+ "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2.3-aarch64.dmg",
+ "build_number": "242.23339.42"
},
"goland": {
"update-channel": "GoLand RELEASE",
@@ -468,59 +468,59 @@
"idea-community": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
- "version": "2024.2.3",
- "sha256": "67f71e9f2fd1401c46794e12cd660906fc4e667d68454f36807923dc5e5ffd42",
- "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.3-aarch64.dmg",
- "build_number": "242.23339.11"
+ "version": "2024.2.4",
+ "sha256": "2abc5078944a17fb81fc10c2428ebafe4a5646c4b8cd69511f1595787e0c4718",
+ "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.4-aarch64.dmg",
+ "build_number": "242.23726.103"
},
"idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
- "version": "2024.2.3",
- "sha256": "985a90d418ecef8758b466a245c3170df95dd2024922fcf9195be74465d77fe4",
- "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.3-aarch64.dmg",
- "build_number": "242.23339.11"
+ "version": "2024.2.4",
+ "sha256": "9ec1e103961379b8e2fc82b604595bc5cde854426fa2f53c860a15669b2865df",
+ "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.4-aarch64.dmg",
+ "build_number": "242.23726.103"
},
"mps": {
"update-channel": "MPS RELEASE",
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg",
- "version": "2024.1",
- "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1-macos-aarch64.dmg",
- "sha256": "2b070b9eb87fc910ef8b2ff96479e724f64864b6825375c272e1f7c604bbc4e7",
- "build_number": "241.18034.1093"
+ "version": "2024.1.1",
+ "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1.1-macos-aarch64.dmg",
+ "sha256": "381b6c527f444ca2ea652054e172afee2096c29ad445cec7fa7fe6432cb41bea",
+ "build_number": "241.19072.1155"
},
"phpstorm": {
"update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
- "version": "2024.2.3",
- "sha256": "9e406b15359c5ccc0f49cd66be0142fbe1a77dc979052943b2f54f1502acce5c",
- "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.3-aarch64.dmg",
- "build_number": "242.23339.16",
+ "version": "2024.2.4",
+ "sha256": "97e795da863c255089913f7417a8551dda3f4f42183e60a7056b38ac7f7bf495",
+ "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.4-aarch64.dmg",
+ "build_number": "242.23726.107",
"version-major-minor": "2022.3"
},
"pycharm-community": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg",
- "version": "2024.2.3",
- "sha256": "ac8c4fe330ef670f7f6dde424b4c2218a1cdb8eb58773ce73510829e99d259df",
- "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.3-aarch64.dmg",
- "build_number": "242.23339.19"
+ "version": "2024.2.4",
+ "sha256": "31cdaeb09d9fe4c60d30391bdd692b0b4257c55abb871b6165bdf2e7978a343f",
+ "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.4-aarch64.dmg",
+ "build_number": "242.23726.102"
},
"pycharm-professional": {
"update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg",
- "version": "2024.2.3",
- "sha256": "c7550781611e6a9701295f76fd9e9572b767b6969dd28f52d872a1a1bccf3a7f",
- "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.3-aarch64.dmg",
- "build_number": "242.23339.19"
+ "version": "2024.2.4",
+ "sha256": "a87493451bb904169461767eddd4d4d72463971feb7911ab29ff72936f0b5631",
+ "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.4-aarch64.dmg",
+ "build_number": "242.23726.102"
},
"rider": {
"update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
- "version": "2024.2.5",
- "sha256": "bd89a85ccfbb019916fb4536d84a61b8013fcf67e12e13fd2855e27165a3b1d8",
- "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.5-aarch64.dmg",
- "build_number": "242.22855.90"
+ "version": "2024.2.7",
+ "sha256": "119029585ebc8131330a74345f36e87e6455e4d1d902b11bd0f688d4c99d8514",
+ "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.7-aarch64.dmg",
+ "build_number": "242.23726.100"
},
"ruby-mine": {
"update-channel": "RubyMine RELEASE",
@@ -533,18 +533,18 @@
"rust-rover": {
"update-channel": "RustRover RELEASE",
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg",
- "version": "2024.2.2",
- "sha256": "9f04b137505dea34f71c8d37a9598fdc2f688dd1482dec2f554a5068a857b94a",
- "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.2-aarch64.dmg",
- "build_number": "242.22855.126"
+ "version": "2024.2.4",
+ "sha256": "3bdde43216bd21fcb93483dd9026ea15859e3e5a8d3d14c6e59526b734ebed69",
+ "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.4-aarch64.dmg",
+ "build_number": "242.23726.110"
},
"webstorm": {
"update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
- "version": "2024.2.3",
- "sha256": "581f60423d4d89275efe5c6744c7a72ebcda50edbac5ed9c876f7d7c18bc41a4",
- "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.3-aarch64.dmg",
- "build_number": "242.23339.15"
+ "version": "2024.2.4",
+ "sha256": "38c75389c1948e9a1343ad54e050483966a6eae1a4b862dc1d1bbe8e580de5f4",
+ "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.4-aarch64.dmg",
+ "build_number": "242.23726.96"
},
"writerside": {
"update-channel": "Writerside EAP",
diff --git a/pkgs/applications/editors/jetbrains/plugins/default.nix b/pkgs/applications/editors/jetbrains/plugins/default.nix
index 93e6ca28608f..1fcc8a15a834 100644
--- a/pkgs/applications/editors/jetbrains/plugins/default.nix
+++ b/pkgs/applications/editors/jetbrains/plugins/default.nix
@@ -90,23 +90,33 @@ in {
passthru.plugins = plugins ++ (ide.plugins or [ ]);
newPlugins = plugins;
disallowedReferences = [ ide ];
- nativeBuildInputs = [ autoPatchelfHook ] ++ (ide.nativeBuildInputs or [ ]);
+ nativeBuildInputs = (lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook) ++ (ide.nativeBuildInputs or [ ]);
buildInputs = lib.unique ((ide.buildInputs or [ ]) ++ [ glib ]);
inherit (ide) meta;
- buildPhase = ''
+ buildPhase =
+ let
+ rootDir = if stdenv.hostPlatform.isDarwin then "Applications/${ide.product}.app/Contents" else meta.mainProgram;
+ in
+ ''
cp -r ${ide} $out
chmod +w -R $out
- rm -f $out/${meta.mainProgram}/plugins/plugin-classpath.txt
+ rm -f $out/${rootDir}/plugins/plugin-classpath.txt
IFS=' ' read -ra pluginArray <<< "$newPlugins"
for plugin in "''${pluginArray[@]}"
do
- ln -s "$plugin" -t $out/${meta.mainProgram}/plugins/
+ ln -s "$plugin" -t "$out/${rootDir}/plugins/"
done
sed "s|${ide.outPath}|$out|" \
- -i $(realpath $out/bin/${meta.mainProgram}) \
- -i $(realpath $out/bin/${meta.mainProgram}-remote-dev-server)
+ -i $(realpath $out/bin/${meta.mainProgram})
+
+ if test -f "$out/bin/${meta.mainProgram}-remote-dev-server"; then
+ sed "s|${ide.outPath}|$out|" \
+ -i $(realpath $out/bin/${meta.mainProgram}-remote-dev-server)
+ fi
+
+ '' + lib.optionalString stdenv.hostPlatform.isLinux ''
autoPatchelf $out
'';
};
diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json
index 6d13dfb586cd..1bdc7ff5e7cb 100644
--- a/pkgs/applications/editors/jetbrains/plugins/plugins.json
+++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json
@@ -17,17 +17,17 @@
"webstorm"
],
"builds": {
- "241.18034.1093": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
+ "241.19072.1155": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
"242.21829.162": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
- "242.22855.126": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
"242.22855.75": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
- "242.22855.90": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
- "242.23339.11": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
- "242.23339.15": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
- "242.23339.16": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
"242.23339.18": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
- "242.23339.19": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
- "242.23339.24": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip"
+ "242.23339.24": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
+ "242.23726.100": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
+ "242.23726.102": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
+ "242.23726.103": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
+ "242.23726.107": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
+ "242.23726.110": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
+ "242.23726.96": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip"
},
"name": "ideavim"
},
@@ -36,7 +36,7 @@
"idea-ultimate"
],
"builds": {
- "242.23339.11": "https://plugins.jetbrains.com/files/631/608464/python-242.23339.11.zip"
+ "242.23726.103": "https://plugins.jetbrains.com/files/631/622862/python-242.23726.103.zip"
},
"name": "python"
},
@@ -46,7 +46,7 @@
"idea-ultimate"
],
"builds": {
- "242.23339.11": "https://plugins.jetbrains.com/files/1347/606389/scala-intellij-bin-2024.2.28.zip"
+ "242.23726.103": "https://plugins.jetbrains.com/files/1347/623989/scala-intellij-bin-2024.2.29.zip"
},
"name": "scala"
},
@@ -67,17 +67,17 @@
"webstorm"
],
"builds": {
- "241.18034.1093": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
+ "241.19072.1155": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
"242.21829.162": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
- "242.22855.126": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
"242.22855.75": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
- "242.22855.90": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
- "242.23339.11": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
- "242.23339.15": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
- "242.23339.16": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
"242.23339.18": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
- "242.23339.19": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
- "242.23339.24": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip"
+ "242.23339.24": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
+ "242.23726.100": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
+ "242.23726.102": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
+ "242.23726.103": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
+ "242.23726.107": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
+ "242.23726.110": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
+ "242.23726.96": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip"
},
"name": "string-manipulation"
},
@@ -98,17 +98,17 @@
"webstorm"
],
"builds": {
- "241.18034.1093": null,
+ "241.19072.1155": null,
"242.21829.162": null,
- "242.22855.126": null,
"242.22855.75": null,
- "242.22855.90": null,
- "242.23339.11": null,
- "242.23339.15": null,
- "242.23339.16": null,
"242.23339.18": null,
- "242.23339.19": null,
- "242.23339.24": null
+ "242.23339.24": null,
+ "242.23726.100": null,
+ "242.23726.102": null,
+ "242.23726.103": null,
+ "242.23726.107": null,
+ "242.23726.110": null,
+ "242.23726.96": null
},
"name": "kotlin"
},
@@ -129,17 +129,17 @@
"webstorm"
],
"builds": {
- "241.18034.1093": null,
- "242.21829.162": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip",
- "242.22855.126": "https://plugins.jetbrains.com/files/6981/608006/ini-242.22855.126.zip",
- "242.22855.75": "https://plugins.jetbrains.com/files/6981/608006/ini-242.22855.126.zip",
- "242.22855.90": "https://plugins.jetbrains.com/files/6981/608006/ini-242.22855.126.zip",
- "242.23339.11": "https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip",
- "242.23339.15": "https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip",
- "242.23339.16": "https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip",
+ "241.19072.1155": null,
+ "242.21829.162": null,
+ "242.22855.75": null,
"242.23339.18": "https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip",
- "242.23339.19": "https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip",
- "242.23339.24": "https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip"
+ "242.23339.24": "https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip",
+ "242.23726.100": "https://plugins.jetbrains.com/files/6981/623497/ini-242.23726.110.zip",
+ "242.23726.102": "https://plugins.jetbrains.com/files/6981/623497/ini-242.23726.110.zip",
+ "242.23726.103": "https://plugins.jetbrains.com/files/6981/623497/ini-242.23726.110.zip",
+ "242.23726.107": "https://plugins.jetbrains.com/files/6981/623497/ini-242.23726.110.zip",
+ "242.23726.110": "https://plugins.jetbrains.com/files/6981/623497/ini-242.23726.110.zip",
+ "242.23726.96": "https://plugins.jetbrains.com/files/6981/623497/ini-242.23726.110.zip"
},
"name": "ini"
},
@@ -160,17 +160,17 @@
"webstorm"
],
"builds": {
- "241.18034.1093": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
- "242.21829.162": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
- "242.22855.126": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
- "242.22855.75": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
- "242.22855.90": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
- "242.23339.11": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
- "242.23339.15": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
- "242.23339.16": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
- "242.23339.18": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
- "242.23339.19": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
- "242.23339.24": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip"
+ "241.19072.1155": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
+ "242.21829.162": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
+ "242.22855.75": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
+ "242.23339.18": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
+ "242.23339.24": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
+ "242.23726.100": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
+ "242.23726.102": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
+ "242.23726.103": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
+ "242.23726.107": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
+ "242.23726.110": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
+ "242.23726.96": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip"
},
"name": "acejump"
},
@@ -180,8 +180,8 @@
"phpstorm"
],
"builds": {
- "242.23339.11": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip",
- "242.23339.16": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip"
+ "242.23726.103": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip",
+ "242.23726.107": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip"
},
"name": "symfony-support"
},
@@ -191,8 +191,8 @@
"phpstorm"
],
"builds": {
- "242.23339.11": "https://plugins.jetbrains.com/files/7320/596012/PHP_Annotations-11.0.3.zip",
- "242.23339.16": "https://plugins.jetbrains.com/files/7320/596012/PHP_Annotations-11.0.3.zip"
+ "242.23726.103": "https://plugins.jetbrains.com/files/7320/619870/PHP_Annotations-11.1.0.zip",
+ "242.23726.107": "https://plugins.jetbrains.com/files/7320/619870/PHP_Annotations-11.1.0.zip"
},
"name": "php-annotations"
},
@@ -210,13 +210,13 @@
],
"builds": {
"242.21829.162": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip",
- "242.22855.126": "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip",
"242.22855.75": "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip",
- "242.22855.90": "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip",
- "242.23339.11": "https://plugins.jetbrains.com/files/7322/608478/python-ce-242.23339.11.zip",
- "242.23339.15": "https://plugins.jetbrains.com/files/7322/608478/python-ce-242.23339.11.zip",
- "242.23339.19": "https://plugins.jetbrains.com/files/7322/608478/python-ce-242.23339.11.zip",
- "242.23339.24": "https://plugins.jetbrains.com/files/7322/608478/python-ce-242.23339.11.zip"
+ "242.23339.24": "https://plugins.jetbrains.com/files/7322/608478/python-ce-242.23339.11.zip",
+ "242.23726.100": "https://plugins.jetbrains.com/files/7322/622853/python-ce-242.23726.103.zip",
+ "242.23726.102": "https://plugins.jetbrains.com/files/7322/622853/python-ce-242.23726.103.zip",
+ "242.23726.103": "https://plugins.jetbrains.com/files/7322/622853/python-ce-242.23726.103.zip",
+ "242.23726.110": "https://plugins.jetbrains.com/files/7322/622853/python-ce-242.23726.103.zip",
+ "242.23726.96": "https://plugins.jetbrains.com/files/7322/622853/python-ce-242.23726.103.zip"
},
"name": "python-community-edition"
},
@@ -237,17 +237,17 @@
"webstorm"
],
"builds": {
- "241.18034.1093": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip",
+ "241.19072.1155": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip",
"242.21829.162": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
- "242.22855.126": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
"242.22855.75": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
- "242.22855.90": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
- "242.23339.11": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
- "242.23339.15": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
- "242.23339.16": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
"242.23339.18": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
- "242.23339.19": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
- "242.23339.24": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip"
+ "242.23339.24": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
+ "242.23726.100": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
+ "242.23726.102": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
+ "242.23726.103": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
+ "242.23726.107": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
+ "242.23726.110": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
+ "242.23726.96": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip"
},
"name": "asciidoc"
},
@@ -267,16 +267,16 @@
"webstorm"
],
"builds": {
- "241.18034.1093": null,
+ "241.19072.1155": null,
"242.21829.162": null,
"242.22855.75": null,
- "242.22855.90": null,
- "242.23339.11": null,
- "242.23339.15": null,
- "242.23339.16": null,
"242.23339.18": null,
- "242.23339.19": null,
- "242.23339.24": null
+ "242.23339.24": null,
+ "242.23726.100": null,
+ "242.23726.102": null,
+ "242.23726.103": null,
+ "242.23726.107": null,
+ "242.23726.96": null
},
"name": "-deprecated-rust"
},
@@ -296,16 +296,16 @@
"webstorm"
],
"builds": {
- "241.18034.1093": null,
+ "241.19072.1155": null,
"242.21829.162": null,
"242.22855.75": null,
- "242.22855.90": null,
- "242.23339.11": null,
- "242.23339.15": null,
- "242.23339.16": null,
"242.23339.18": null,
- "242.23339.19": null,
- "242.23339.24": null
+ "242.23339.24": null,
+ "242.23726.100": null,
+ "242.23726.102": null,
+ "242.23726.103": null,
+ "242.23726.107": null,
+ "242.23726.96": null
},
"name": "-deprecated-rust-beta"
},
@@ -319,10 +319,10 @@
"ruby-mine"
],
"builds": {
- "242.23339.11": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip",
"242.23339.18": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip",
- "242.23339.19": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip",
- "242.23339.24": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip"
+ "242.23339.24": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip",
+ "242.23726.102": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip",
+ "242.23726.103": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip"
},
"name": "ide-features-trainer"
},
@@ -343,17 +343,17 @@
"webstorm"
],
"builds": {
- "241.18034.1093": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
+ "241.19072.1155": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
"242.21829.162": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
- "242.22855.126": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
"242.22855.75": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
- "242.22855.90": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
- "242.23339.11": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
- "242.23339.15": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
- "242.23339.16": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
"242.23339.18": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
- "242.23339.19": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
- "242.23339.24": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip"
+ "242.23339.24": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
+ "242.23726.100": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
+ "242.23726.102": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
+ "242.23726.103": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
+ "242.23726.107": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
+ "242.23726.110": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
+ "242.23726.96": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip"
},
"name": "nixidea"
},
@@ -363,8 +363,8 @@
"idea-ultimate"
],
"builds": {
- "242.23339.11": "https://plugins.jetbrains.com/files/9568/608453/go-plugin-242.23339.11.zip",
- "242.23339.24": "https://plugins.jetbrains.com/files/9568/608453/go-plugin-242.23339.11.zip"
+ "242.23339.24": "https://plugins.jetbrains.com/files/9568/608453/go-plugin-242.23339.11.zip",
+ "242.23726.103": "https://plugins.jetbrains.com/files/9568/616936/go-plugin-242.23726.16.zip"
},
"name": "go"
},
@@ -385,17 +385,17 @@
"webstorm"
],
"builds": {
- "241.18034.1093": "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip",
- "242.21829.162": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip",
- "242.22855.126": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip",
- "242.22855.75": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip",
- "242.22855.90": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip",
- "242.23339.11": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip",
- "242.23339.15": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip",
- "242.23339.16": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip",
- "242.23339.18": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip",
- "242.23339.19": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip",
- "242.23339.24": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip"
+ "241.19072.1155": "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip",
+ "242.21829.162": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
+ "242.22855.75": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
+ "242.23339.18": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
+ "242.23339.24": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
+ "242.23726.100": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
+ "242.23726.102": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
+ "242.23726.103": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
+ "242.23726.107": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
+ "242.23726.110": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
+ "242.23726.96": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip"
},
"name": "csv-editor"
},
@@ -416,17 +416,17 @@
"webstorm"
],
"builds": {
- "241.18034.1093": "https://plugins.jetbrains.com/files/11349/605838/aws-toolkit-jetbrains-standalone-3.29-241.zip",
- "242.21829.162": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip",
- "242.22855.126": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip",
- "242.22855.75": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip",
- "242.22855.90": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip",
- "242.23339.11": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip",
- "242.23339.15": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip",
- "242.23339.16": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip",
- "242.23339.18": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip",
- "242.23339.19": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip",
- "242.23339.24": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip"
+ "241.19072.1155": "https://plugins.jetbrains.com/files/11349/622098/aws-toolkit-jetbrains-standalone-3.34-241.zip",
+ "242.21829.162": "https://plugins.jetbrains.com/files/11349/622102/aws-toolkit-jetbrains-standalone-3.34-242.zip",
+ "242.22855.75": "https://plugins.jetbrains.com/files/11349/622102/aws-toolkit-jetbrains-standalone-3.34-242.zip",
+ "242.23339.18": "https://plugins.jetbrains.com/files/11349/622102/aws-toolkit-jetbrains-standalone-3.34-242.zip",
+ "242.23339.24": "https://plugins.jetbrains.com/files/11349/622102/aws-toolkit-jetbrains-standalone-3.34-242.zip",
+ "242.23726.100": "https://plugins.jetbrains.com/files/11349/622102/aws-toolkit-jetbrains-standalone-3.34-242.zip",
+ "242.23726.102": "https://plugins.jetbrains.com/files/11349/622102/aws-toolkit-jetbrains-standalone-3.34-242.zip",
+ "242.23726.103": "https://plugins.jetbrains.com/files/11349/622102/aws-toolkit-jetbrains-standalone-3.34-242.zip",
+ "242.23726.107": "https://plugins.jetbrains.com/files/11349/622102/aws-toolkit-jetbrains-standalone-3.34-242.zip",
+ "242.23726.110": "https://plugins.jetbrains.com/files/11349/622102/aws-toolkit-jetbrains-standalone-3.34-242.zip",
+ "242.23726.96": "https://plugins.jetbrains.com/files/11349/622102/aws-toolkit-jetbrains-standalone-3.34-242.zip"
},
"name": "aws-toolkit"
},
@@ -447,17 +447,17 @@
"webstorm"
],
"builds": {
- "241.18034.1093": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip",
+ "241.19072.1155": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip",
"242.21829.162": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
- "242.22855.126": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
"242.22855.75": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
- "242.22855.90": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
- "242.23339.11": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
- "242.23339.15": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
- "242.23339.16": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
"242.23339.18": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
- "242.23339.19": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
- "242.23339.24": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip"
+ "242.23339.24": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
+ "242.23726.100": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
+ "242.23726.102": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
+ "242.23726.103": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
+ "242.23726.107": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
+ "242.23726.110": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
+ "242.23726.96": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip"
},
"name": "vscode-keymap"
},
@@ -478,17 +478,17 @@
"webstorm"
],
"builds": {
- "241.18034.1093": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip",
+ "241.19072.1155": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip",
"242.21829.162": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
- "242.22855.126": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
"242.22855.75": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
- "242.22855.90": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
- "242.23339.11": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
- "242.23339.15": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
- "242.23339.16": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
"242.23339.18": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
- "242.23339.19": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
- "242.23339.24": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip"
+ "242.23339.24": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
+ "242.23726.100": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
+ "242.23726.102": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
+ "242.23726.103": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
+ "242.23726.107": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
+ "242.23726.110": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
+ "242.23726.96": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip"
},
"name": "eclipse-keymap"
},
@@ -509,17 +509,17 @@
"webstorm"
],
"builds": {
- "241.18034.1093": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip",
+ "241.19072.1155": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip",
"242.21829.162": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
- "242.22855.126": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
"242.22855.75": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
- "242.22855.90": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
- "242.23339.11": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
- "242.23339.15": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
- "242.23339.16": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
"242.23339.18": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
- "242.23339.19": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
- "242.23339.24": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip"
+ "242.23339.24": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
+ "242.23726.100": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
+ "242.23726.102": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
+ "242.23726.103": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
+ "242.23726.107": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
+ "242.23726.110": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
+ "242.23726.96": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip"
},
"name": "visual-studio-keymap"
},
@@ -540,17 +540,17 @@
"webstorm"
],
"builds": {
- "241.18034.1093": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip",
+ "241.19072.1155": null,
"242.21829.162": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip",
- "242.22855.126": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip",
"242.22855.75": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip",
- "242.22855.90": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip",
- "242.23339.11": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip",
- "242.23339.15": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip",
- "242.23339.16": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip",
"242.23339.18": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip",
- "242.23339.19": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip",
- "242.23339.24": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip"
+ "242.23339.24": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip",
+ "242.23726.100": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip",
+ "242.23726.102": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip",
+ "242.23726.103": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip",
+ "242.23726.107": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip",
+ "242.23726.110": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip",
+ "242.23726.96": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip"
},
"name": "protocol-buffers"
},
@@ -571,17 +571,17 @@
"webstorm"
],
"builds": {
- "241.18034.1093": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+ "241.19072.1155": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"242.21829.162": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
- "242.22855.126": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"242.22855.75": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
- "242.22855.90": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
- "242.23339.11": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
- "242.23339.15": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
- "242.23339.16": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"242.23339.18": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
- "242.23339.19": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
- "242.23339.24": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
+ "242.23339.24": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+ "242.23726.100": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+ "242.23726.102": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+ "242.23726.103": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+ "242.23726.107": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+ "242.23726.110": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+ "242.23726.96": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
},
"name": "darcula-pitch-black"
},
@@ -602,17 +602,17 @@
"webstorm"
],
"builds": {
- "241.18034.1093": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip",
- "242.21829.162": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip",
- "242.22855.126": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip",
- "242.22855.75": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip",
- "242.22855.90": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip",
- "242.23339.11": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip",
- "242.23339.15": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip",
- "242.23339.16": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip",
- "242.23339.18": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip",
- "242.23339.19": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip",
- "242.23339.24": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip"
+ "241.19072.1155": "https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip",
+ "242.21829.162": "https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip",
+ "242.22855.75": "https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip",
+ "242.23339.18": "https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip",
+ "242.23339.24": "https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip",
+ "242.23726.100": "https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip",
+ "242.23726.102": "https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip",
+ "242.23726.103": "https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip",
+ "242.23726.107": "https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip",
+ "242.23726.110": "https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip",
+ "242.23726.96": "https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip"
},
"name": "github-copilot"
},
@@ -633,17 +633,17 @@
"webstorm"
],
"builds": {
- "241.18034.1093": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+ "241.19072.1155": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"242.21829.162": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
- "242.22855.126": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"242.22855.75": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
- "242.22855.90": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
- "242.23339.11": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
- "242.23339.15": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
- "242.23339.16": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"242.23339.18": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
- "242.23339.19": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
- "242.23339.24": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
+ "242.23339.24": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+ "242.23726.100": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+ "242.23726.102": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+ "242.23726.103": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+ "242.23726.107": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+ "242.23726.110": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+ "242.23726.96": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
},
"name": "netbeans-6-5-keymap"
},
@@ -664,17 +664,17 @@
"webstorm"
],
"builds": {
- "241.18034.1093": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
+ "241.19072.1155": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
"242.21829.162": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
- "242.22855.126": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
"242.22855.75": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
- "242.22855.90": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
- "242.23339.11": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
- "242.23339.15": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
- "242.23339.16": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
"242.23339.18": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
- "242.23339.19": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
- "242.23339.24": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip"
+ "242.23339.24": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
+ "242.23726.100": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
+ "242.23726.102": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
+ "242.23726.103": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
+ "242.23726.107": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
+ "242.23726.110": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
+ "242.23726.96": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip"
},
"name": "mermaid"
},
@@ -685,49 +685,49 @@
"rust-rover"
],
"builds": {
- "242.22855.126": "https://plugins.jetbrains.com/files/22407/608018/intellij-rust-242.22855.126.zip",
- "242.22855.75": "https://plugins.jetbrains.com/files/22407/608018/intellij-rust-242.22855.126.zip",
- "242.23339.11": "https://plugins.jetbrains.com/files/22407/608018/intellij-rust-242.22855.126.zip"
+ "242.22855.75": "https://plugins.jetbrains.com/files/22407/623488/intellij-rust-242.23726.110.zip",
+ "242.23726.103": "https://plugins.jetbrains.com/files/22407/623488/intellij-rust-242.23726.110.zip",
+ "242.23726.110": "https://plugins.jetbrains.com/files/22407/623488/intellij-rust-242.23726.110.zip"
},
"name": "rust"
}
},
"files": {
"https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip": "sha256-QwguD4ENrL7GxmX+CGEyCPowbAPNpYgntVGAbHxOlyQ=",
- "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip": "sha256-CpIsmOIblkC5xMnKidbI+G+2QcZtXczu0rOSMtUcJPs=",
- "https://plugins.jetbrains.com/files/11349/605838/aws-toolkit-jetbrains-standalone-3.29-241.zip": "sha256-rMgAPGqgERLKmMNafg17h//WR9Z+etkawd/OdDse4eI=",
- "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip": "sha256-bIj7qOW4CBCwNiBK700Zh90Ijy2I+78rwN5zhUeMwuw=",
+ "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip": "sha256-DuztEfLOmwSWrWk+Q9rWYn/BzHrkx2giKTTpIbZdAOQ=",
+ "https://plugins.jetbrains.com/files/11349/622098/aws-toolkit-jetbrains-standalone-3.34-241.zip": "sha256-Q9Wi/ngotmka1fHorAQCTk3u7lXU7IMbBlCDZyzcFLA=",
+ "https://plugins.jetbrains.com/files/11349/622102/aws-toolkit-jetbrains-standalone-3.34-242.zip": "sha256-XgnQFwzWoxyO3Rk31oZgMxSHVzynoZIanuAlg4ZnaIE=",
"https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip": "sha256-LeQ5vi9PCJYmWNmT/sutWjSlwZaAYYuEljVJBYG2VpY=",
"https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip": "sha256-LpooujwYaX339yZJVe7HPYIOw+YdJLeEtRgwPxLJ9eI=",
"https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip": "sha256-/hEx0gIFvUXD799tRmMHAt9Z5ziFgaQs1RX0zQwTJIA=",
"https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip": "sha256-bAN0ifNiUqj51TYc7RLKwTMtv9OxjzqEQwXa6KtFlsU=",
"https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip": "sha256-tNgt0vIkdCB/LcaSj58mT6cNlw4lytRo0cZSt7sIERU=",
"https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip": "sha256-aIwiMT30L3KCvbrkMUdgDdUdyBqGmT4w6c4pZEnMGNo=",
- "https://plugins.jetbrains.com/files/1347/606389/scala-intellij-bin-2024.2.28.zip": "sha256-N5Hp9w/5aTYsZCRjdGCg0g1IlmRX/Lgi7Fx9OUJGz14=",
- "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip": "sha256-cltbHY5OOvf29otDNsF9Q2shJHDdW6UMbzDdZ6OATtI=",
+ "https://plugins.jetbrains.com/files/1347/623989/scala-intellij-bin-2024.2.29.zip": "sha256-mgR+H69cpaXwF1z/HiWYFYzukcvEE2cPVZ6bP3TjHTk=",
"https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip": "sha256-Y6xplTjA9bmhwLS9clcu/4znltSgDsga8Na5BmOWX5E=",
"https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip": "sha256-gI3sY4jDXsY6pUhzqejJnvGJwLj6bNMs45UR8ekrZcs=",
"https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=",
"https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip": "sha256-uMIrYoZE16X/K96HuDJx8QMh6wUbi4+qSw+HJAq7ukI=",
- "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip": "sha256-2jcTuQruuUJUKEnomzl4DmqYZelk8Gygh8NT0PRwuOw=",
+ "https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip": "sha256-BxoQXtnDFm8a/8bN6Ow309K7UlDXJ23fTN4017x3VEo=",
"https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=",
"https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip": "sha256-DUiIQYIzYoXmgtBakSLtMB+xxJMaR70Jgg9erySa3wQ=",
"https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip": "sha256-OqeQCqFe8iW/8NPg+9i+UKh+twIPQ9uLZrItMukCi7k=",
- "https://plugins.jetbrains.com/files/22407/608018/intellij-rust-242.22855.126.zip": "sha256-mIiNKoSmkHxoKdHiDPN19wH8ejhRS2F0Cb63E7PDXP0=",
- "https://plugins.jetbrains.com/files/631/608464/python-242.23339.11.zip": "sha256-qXKW4C5/XMw1MgZxUZt2RlmycNN4zRcKMsTbkKS/lTU=",
- "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip": "sha256-J6v5zHD7n1uqp3p2TptZpkPbGtkdFZdNCA+Xw4aHKDE=",
- "https://plugins.jetbrains.com/files/6981/608006/ini-242.22855.126.zip": "sha256-TtBD4NuLhPbhod56wYtg4jY1yNSK+mTp6mEhDgtidBU=",
+ "https://plugins.jetbrains.com/files/22407/623488/intellij-rust-242.23726.110.zip": "sha256-faN4knSIL9qR31zRBKt1TmxJFNBDtdGiViFJj+rLnRw=",
+ "https://plugins.jetbrains.com/files/631/622862/python-242.23726.103.zip": "sha256-rLGDVLj+HBe3EFzuwCNkHvVPaqT3z7qZnCil0kAO75I=",
"https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip": "sha256-WucgAKBoKxnZvRfN2g8in8LjOOKAtECEN0sGcz28j4c=",
- "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip": "sha256-kVUEgfEKUupV/qlB4Dpzi5pFHjhVvX74XIPetKtjysM=",
+ "https://plugins.jetbrains.com/files/6981/623497/ini-242.23726.110.zip": "sha256-gSbiV74fQNU0xOkcK5BHozmy9Msslkhx9APH0JY74J8=",
+ "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip": "sha256-Qp24juITBXEF5izdzayWq28Ioy4/kgT0qz6snZ0dND0=",
"https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip": "sha256-drNmhJMe+kuY2fcHjY+SQmkACvFk0rVI4vAhyZ/bgLc=",
- "https://plugins.jetbrains.com/files/7320/596012/PHP_Annotations-11.0.3.zip": "sha256-kRqgAW0bYEWLTCC6q2hhPmDwnOx3kiuqPhriZWizxTw=",
+ "https://plugins.jetbrains.com/files/7320/619870/PHP_Annotations-11.1.0.zip": "sha256-jvK3J3NwUrOO7+izYM/SagnqJGAUHa9yGFCcZvkPfrA=",
"https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip": "sha256-DwQNhbNO1zk75lcf35spNnzo0u103UAhXignhO+grek=",
"https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip": "sha256-As1MgvssBg+45DLRtNbirT5HyXPcabzt3ulKYBIiWj8=",
"https://plugins.jetbrains.com/files/7322/608478/python-ce-242.23339.11.zip": "sha256-tWsshZfm5czxBtF4ZfPHzi843Oztx2i0JEHcpnlLcSo=",
+ "https://plugins.jetbrains.com/files/7322/622853/python-ce-242.23726.103.zip": "sha256-mHh0o6RN1Ey1dq+9yEDBCrE3CuF9Hx7fpmxUzPlWtlA=",
"https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip": "sha256-oKczkLHAk2bJRNRgToVe0ySEJGF8+P4oWqQ33olwzWw=",
"https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip": "sha256-AGP8YY6NG/hy7xIDoiJy3GZHRB9stVNYYoHtqOmYCx0=",
"https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip": "sha256-pL+j0K6U0DZibnmcIE6kY9Kj/+5g8akuHeuppuZiEII=",
"https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip": "sha256-9GMqs/hSavcw1E4ZJTLDH1lx3HEeQ5NR8BT+Q9pN3io=",
- "https://plugins.jetbrains.com/files/9568/608453/go-plugin-242.23339.11.zip": "sha256-eEZw5q0+IHlf1Re3M6RwZOF7AXMn99a7n4nF54x5yew="
+ "https://plugins.jetbrains.com/files/9568/608453/go-plugin-242.23339.11.zip": "sha256-eEZw5q0+IHlf1Re3M6RwZOF7AXMn99a7n4nF54x5yew=",
+ "https://plugins.jetbrains.com/files/9568/616936/go-plugin-242.23726.16.zip": "sha256-BJcGRcK6Rze6QCraNxIMJW1qoDXcP+crH7kYvYBWJK0="
}
}
diff --git a/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix b/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix
index 574938eef0d3..513f0e3d74f9 100644
--- a/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix
+++ b/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix
@@ -4,17 +4,17 @@
{
"631" = {
# Python
- nativeBuildInputs = [ autoPatchelfHook ];
+ nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
buildInputs = [ stdenv.cc.cc.lib ];
};
"7322" = {
# Python community edition
- nativeBuildInputs = [ autoPatchelfHook ];
+ nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
buildInputs = [ stdenv.cc.cc.lib ];
};
"8182" = {
# Rust (deprecated)
- nativeBuildInputs = [ autoPatchelfHook ];
+ nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
buildInputs = [ stdenv.cc.cc.lib ];
buildPhase = ''
runHook preBuild
@@ -65,7 +65,7 @@
};
"22407" = {
# Rust
- nativeBuildInputs = [ autoPatchelfHook ];
+ nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
buildInputs = [ stdenv.cc.cc.lib ];
buildPhase = ''
runHook preBuild
diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix
deleted file mode 100644
index b5beb0d74d8a..000000000000
--- a/pkgs/applications/editors/leafpad/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, stdenv, fetchurl, intltool, pkg-config, gtk2 }:
-
-stdenv.mkDerivation rec {
- version = "0.8.19";
- pname = "leafpad";
- src = fetchurl {
- url = "https://download.savannah.gnu.org/releases/leafpad/${pname}-${version}.tar.gz";
- sha256 = "sha256-B9P3EvTb0KMyUf0d7hTiGv3J+SCQ/HaMEasKxVatvpc=";
- };
-
- nativeBuildInputs = [ pkg-config intltool ];
- buildInputs = [ gtk2 ];
-
- hardeningDisable = [ "format" ];
-
- configureFlags = [
- "--enable-chooser"
- ];
-
- meta = with lib; {
- description = "Notepad clone for GTK 2.0";
- homepage = "http://tarot.freeshell.org/leafpad";
- platforms = platforms.linux;
- maintainers = [ maintainers.flosse ];
- license = licenses.gpl3;
- mainProgram = "leafpad";
- };
-}
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index 0913fa0a330f..270fdf3ce878 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -29,7 +29,7 @@ let
, withNodeJs ? false
, withPerl ? false
- , rubyEnv ? null
+ , withRuby ? true
# wether to create symlinks in $out/bin/vi(m) -> $out/bin/nvim
, vimAlias ? false
@@ -127,8 +127,7 @@ let
;
providerLuaRc = neovimUtils.generateProviderRc {
- inherit (finalAttrs) withPython3 withNodeJs withPerl;
- withRuby = rubyEnv != null;
+ inherit (finalAttrs) withPython3 withNodeJs withPerl withRuby;
};
# If configure != {}, we can't generate the rplugin.vim file with e.g
@@ -155,10 +154,9 @@ let
__structuredAttrs = true;
dontUnpack = true;
- inherit viAlias vimAlias withNodeJs withPython3 withPerl;
+ inherit viAlias vimAlias withNodeJs withPython3 withPerl withRuby;
inherit wrapRc providerLuaRc packpathDirs;
inherit python3Env rubyEnv;
- withRuby = rubyEnv != null;
inherit wrapperArgs generatedWrapperArgs;
luaRcContent = rcContent;
# Remove the symlinks created by symlinkJoin which we need to perform
@@ -171,7 +169,7 @@ let
+ lib.optionalString finalAttrs.withPython3 ''
makeWrapper ${python3Env.interpreter} $out/bin/nvim-python3 --unset PYTHONPATH --unset PYTHONSAFEPATH
''
- + lib.optionalString (finalAttrs.rubyEnv != null) ''
+ + lib.optionalString (finalAttrs.withRuby) ''
ln -s ${finalAttrs.rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby
''
+ lib.optionalString finalAttrs.withNodeJs ''
diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix
index 856626bf68b0..e210787327b9 100644
--- a/pkgs/applications/editors/okteta/default.nix
+++ b/pkgs/applications/editors/okteta/default.nix
@@ -4,11 +4,11 @@
mkDerivation rec {
pname = "okteta";
- version = "0.26.15";
+ version = "0.26.18";
src = fetchurl {
url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz";
- sha256 = "sha256-BTNQDvcGjBJG4hj1N69yboNth4/ydeOS7T2KiqbPfGM=";
+ sha256 = "sha256-xAlhZtQuIRtvMaHflCr89lHH6ocqIRAECwHdRa+/imM=";
};
nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];
diff --git a/pkgs/applications/editors/qxw/default.nix b/pkgs/applications/editors/qxw/default.nix
deleted file mode 100644
index 53cdbcfc2707..000000000000
--- a/pkgs/applications/editors/qxw/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, gtk2, pcre }:
-
-stdenv.mkDerivation rec {
- pname = "qxw";
- version = "20200708";
-
- src = fetchurl {
- url = "https://www.quinapalus.com/qxw-${version}.tar.gz";
- sha256 = "1si3ila7137c7x4mp3jv1q1mh3jp0p4khir1yz1rwy0mp3znwv7d";
- };
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ gtk2 pcre ];
-
- makeFlags = [ "DESTDIR=$(out)" ];
-
- patchPhase = ''
- sed -i 's/ `dpkg-buildflags[^`]*`//g;
- /mkdir -p/d;
- s/cp -a/install -D/;
- s,/usr/games,/bin,' Makefile
- '';
-
- meta = with lib; {
- description = "Program to help create and publish crosswords";
- homepage = "https://www.quinapalus.com/qxw.html";
- license = licenses.gpl2;
- maintainers = [ maintainers.tckmn ];
- platforms = platforms.linux;
- mainProgram = "qxw";
- };
-}
diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix
index f6f1bf2b28b1..e971360b64e3 100644
--- a/pkgs/applications/editors/rehex/default.nix
+++ b/pkgs/applications/editors/rehex/default.nix
@@ -13,9 +13,7 @@
, lua53Packages
, perlPackages
, gtk3
-, Carbon
-, Cocoa
-, IOKit
+, apple-sdk_11
}:
stdenv.mkDerivation rec {
@@ -36,7 +34,7 @@ stdenv.mkDerivation rec {
++ (with lua53Packages; [ lua busted ])
++ (with perlPackages; [ perl TemplateToolkit ])
++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ]
- ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa IOKit ];
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
makeFlags = [
"prefix=${placeholder "out"}"
@@ -44,6 +42,10 @@ stdenv.mkDerivation rec {
"CXXSTD=-std=c++20"
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-f Makefile.osx" ];
+ env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+ NIX_LDFLAGS = "-liconv";
+ };
+
enableParallelBuilding = true;
meta = with lib; {
diff --git a/pkgs/applications/editors/tijolo/default.nix b/pkgs/applications/editors/tijolo/default.nix
index 54f0f154ab37..49c58a2f9010 100644
--- a/pkgs/applications/editors/tijolo/default.nix
+++ b/pkgs/applications/editors/tijolo/default.nix
@@ -53,5 +53,6 @@ crystal.buildCrystalPackage rec {
license = licenses.mit;
mainProgram = "tijolo";
maintainers = with maintainers; [ sund3RRR ];
+ broken = true;
};
}
diff --git a/pkgs/applications/editors/vim/plugins/blink-cmp/Cargo.lock b/pkgs/applications/editors/vim/plugins/blink-cmp/Cargo.lock
index 861af7fc8b51..8ef1571af13d 100644
--- a/pkgs/applications/editors/vim/plugins/blink-cmp/Cargo.lock
+++ b/pkgs/applications/editors/vim/plugins/blink-cmp/Cargo.lock
@@ -1,6 +1,6 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
-version = 3
+version = 4
[[package]]
name = "aho-corasick"
@@ -11,6 +11,12 @@ dependencies = [
"memchr",
]
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
[[package]]
name = "bincode"
version = "1.3.3"
@@ -33,41 +39,45 @@ dependencies = [
name = "blink-cmp-fuzzy"
version = "0.1.0"
dependencies = [
- "c-marshalling",
"frizbee",
- "generator",
"heed",
"lazy_static",
- "libc",
- "lua-marshalling",
+ "mlua",
"regex",
"serde",
]
+[[package]]
+name = "bstr"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
+dependencies = [
+ "memchr",
+ "serde",
+]
+
[[package]]
name = "byteorder"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-[[package]]
-name = "c-marshalling"
-version = "0.2.0"
-source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"
-dependencies = [
- "libc",
- "quick-error",
-]
-
[[package]]
name = "cc"
-version = "1.1.29"
+version = "1.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58e804ac3194a48bb129643eb1d62fcc20d18c6b8c181704489353d13120bcd1"
+checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
dependencies = [
"shlex",
]
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
[[package]]
name = "crossbeam-queue"
version = "0.3.11"
@@ -83,27 +93,6 @@ version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
-[[package]]
-name = "derive-c-marshalling-library"
-version = "0.1.0"
-source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"
-dependencies = [
- "libc",
- "quote 0.4.2",
- "syn 0.12.15",
-]
-
-[[package]]
-name = "derive-lua-marshalling"
-version = "0.2.0"
-source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"
-dependencies = [
- "derive-c-marshalling-library",
- "libc",
- "quote 0.4.2",
- "syn 0.12.15",
-]
-
[[package]]
name = "doxygen-rs"
version = "0.4.2"
@@ -113,6 +102,12 @@ dependencies = [
"phf",
]
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
[[package]]
name = "form_urlencoded"
version = "1.2.1"
@@ -125,22 +120,12 @@ dependencies = [
[[package]]
name = "frizbee"
version = "0.1.0"
-source = "git+https://github.com/saghen/frizbee#d910bec53b867ce06702520c7e05f9862bf78dd9"
+source = "git+https://github.com/saghen/frizbee#cc186f587fd2e844ab5c3b8f164e5e3b1f846605"
dependencies = [
"memchr",
"smith_waterman_macro",
]
-[[package]]
-name = "generator"
-version = "2.0.0"
-source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"
-dependencies = [
- "parser",
- "quote 0.4.2",
- "syn 0.12.15",
-]
-
[[package]]
name = "heed"
version = "0.20.5"
@@ -203,9 +188,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "libc"
-version = "0.2.159"
+version = "0.2.161"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
[[package]]
name = "lmdb-master-sys"
@@ -219,14 +204,13 @@ dependencies = [
]
[[package]]
-name = "lua-marshalling"
-version = "0.3.0"
-source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
dependencies = [
- "c-marshalling",
- "derive-lua-marshalling",
- "lazy_static",
- "libc",
+ "autocfg",
+ "scopeguard",
]
[[package]]
@@ -235,6 +219,52 @@ version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+[[package]]
+name = "mlua"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f6ddbd668297c46be4bdea6c599dcc1f001a129586272d53170b7ac0a62961e"
+dependencies = [
+ "bstr",
+ "either",
+ "mlua-sys",
+ "mlua_derive",
+ "num-traits",
+ "parking_lot",
+ "rustc-hash",
+]
+
+[[package]]
+name = "mlua-sys"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9eebac25c35a13285456c88ee2fde93d9aee8bcfdaf03f9d6d12be3391351ec"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "pkg-config",
+]
+
+[[package]]
+name = "mlua_derive"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cfc5faa2e0d044b3f5f0879be2920e0a711c97744c42cf1c295cb183668933e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.85",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
[[package]]
name = "once_cell"
version = "1.20.2"
@@ -252,12 +282,26 @@ dependencies = [
]
[[package]]
-name = "parser"
-version = "0.2.0"
-source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
dependencies = [
- "quote 0.4.2",
- "syn 0.12.15",
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets",
]
[[package]]
@@ -294,9 +338,9 @@ checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
dependencies = [
"phf_generator",
"phf_shared",
- "proc-macro2 1.0.87",
- "quote 1.0.37",
- "syn 2.0.79",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.85",
]
[[package]]
@@ -309,45 +353,27 @@ dependencies = [
]
[[package]]
-name = "proc-macro2"
-version = "0.2.3"
+name = "pkg-config"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd07deb3c6d1d9ff827999c7f9b04cdfd66b1b17ae508e14fe47b620f2282ae0"
-dependencies = [
- "unicode-xid",
-]
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
[[package]]
name = "proc-macro2"
-version = "1.0.87"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
dependencies = [
"unicode-ident",
]
-[[package]]
-name = "quick-error"
-version = "1.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
-
-[[package]]
-name = "quote"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1eca14c727ad12702eb4b6bfb5a232287dcf8385cb8ca83a3eeaf6519c44c408"
-dependencies = [
- "proc-macro2 0.2.3",
-]
-
[[package]]
name = "quote"
version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
- "proc-macro2 1.0.87",
+ "proc-macro2",
]
[[package]]
@@ -365,6 +391,15 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+[[package]]
+name = "redox_syscall"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+dependencies = [
+ "bitflags",
+]
+
[[package]]
name = "regex"
version = "1.11.0"
@@ -394,6 +429,12 @@ version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+[[package]]
+name = "rustc-hash"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+
[[package]]
name = "ryu"
version = "1.0.18"
@@ -401,30 +442,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
[[package]]
-name = "serde"
-version = "1.0.210"
+name = "scopeguard"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "serde"
+version = "1.0.213"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.210"
+version = "1.0.213"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5"
dependencies = [
- "proc-macro2 1.0.87",
- "quote 1.0.37",
- "syn 2.0.79",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.85",
]
[[package]]
name = "serde_json"
-version = "1.0.128"
+version = "1.0.132"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
dependencies = [
"itoa",
"memchr",
@@ -445,24 +492,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
[[package]]
-name = "smith_waterman_macro"
-version = "0.1.0"
-source = "git+https://github.com/saghen/frizbee#d910bec53b867ce06702520c7e05f9862bf78dd9"
-dependencies = [
- "proc-macro2 1.0.87",
- "quote 1.0.37",
- "syn 1.0.109",
-]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]]
-name = "syn"
-version = "0.12.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c97c05b8ebc34ddd6b967994d5c6e9852fa92f8b82b3858c39451f97346dcce5"
+name = "smith_waterman_macro"
+version = "0.1.0"
+source = "git+https://github.com/saghen/frizbee#cc186f587fd2e844ab5c3b8f164e5e3b1f846605"
dependencies = [
- "proc-macro2 0.2.3",
- "quote 0.4.2",
- "unicode-xid",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
]
[[package]]
@@ -471,19 +513,19 @@ version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
- "proc-macro2 1.0.87",
- "quote 1.0.37",
+ "proc-macro2",
+ "quote",
"unicode-ident",
]
[[package]]
name = "syn"
-version = "2.0.79"
+version = "2.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
dependencies = [
- "proc-macro2 1.0.87",
- "quote 1.0.37",
+ "proc-macro2",
+ "quote",
"unicode-ident",
]
@@ -532,12 +574,6 @@ dependencies = [
"tinyvec",
]
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-
[[package]]
name = "url"
version = "2.5.2"
@@ -570,3 +606,67 @@ name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
diff --git a/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix
index ce685a0c4f67..5a5ffc6123a3 100644
--- a/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix
+++ b/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix
@@ -6,12 +6,12 @@
vimUtils,
}:
let
- version = "0.3.1";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "Saghen";
repo = "blink.cmp";
rev = "refs/tags/v${version}";
- hash = "sha256-bvhLOM0NMx5S069uX2OecEpzYaR3hV4r8nCIPD0f0XQ=";
+ hash = "sha256-DmHMySR1K4j/z5+bZDJHIuqo5BqRP9XaOMEdCb78chk=";
};
libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so";
blink-fuzzy-lib = rustPlatform.buildRustPackage {
@@ -24,8 +24,7 @@ let
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
- "c-marshalling-0.2.0" = "sha256-eL6nkZOtuLLQ0r31X7uroUUDYZsWOJ9KNXl4NCVNRuw=";
- "frizbee-0.1.0" = "sha256-zO2S282DVCjnALMXu3GxmAfjCXsPNUZ7+xgiqITfGmU=";
+ "frizbee-0.1.0" = "sha256-eYth+xOIqwGPkH39OxNCMA9zE+5CTNpsuX8Ue/mySIA=";
};
};
};
diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json
index 05678e61362b..3a50da15261b 100644
--- a/pkgs/applications/editors/vim/plugins/deprecated.json
+++ b/pkgs/applications/editors/vim/plugins/deprecated.json
@@ -27,6 +27,10 @@
"date": "2022-10-14",
"new": "neodev-nvim"
},
+ "magma-nvim-goose": {
+ "date": "2024-10-28",
+ "new": "magma-nvim"
+ },
"nvchad-extensions": {
"date": "2023-08-19",
"new": "nvchad-ui"
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 135264002033..11f6cce9affa 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -65,12 +65,12 @@ final: prev:
CopilotChat-nvim = buildVimPlugin {
pname = "CopilotChat.nvim";
- version = "2024-09-25";
+ version = "2024-10-25";
src = fetchFromGitHub {
owner = "CopilotC-Nvim";
repo = "CopilotChat.nvim";
- rev = "9333944fde3c65868818e245c73aa29eef826e9b";
- sha256 = "1dgm5xz0l5y3kgr6rr6v5b0y5b11949z8p1qs5m68vd10m5hkgvg";
+ rev = "e4cb1fc27e0def7571e5329f522a79e9555a5502";
+ sha256 = "1mmc77l2wn3vrchc7g0k45910krzdhp0r82sm7a0lvj8inkd96d7";
};
meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/";
};
@@ -137,12 +137,12 @@ final: prev:
Ionide-vim = buildVimPlugin {
pname = "Ionide-vim";
- version = "2024-09-03";
+ version = "2024-10-26";
src = fetchFromGitHub {
owner = "ionide";
repo = "Ionide-vim";
- rev = "268955cc106f8328a232b160a7360cf331c0a323";
- sha256 = "0lyd719p621v0n9pm7c1nvrfccfmssdipn9fzxcds0hw4janhjml";
+ rev = "e4387026585dbd98dcb5d2a007d1fa0afefa5941";
+ sha256 = "03mbykgl50fqjsaca37gig3bwr6ikbkh0dlika0hj46jrxm3vsvl";
};
meta.homepage = "https://github.com/ionide/Ionide-vim/";
};
@@ -185,12 +185,12 @@ final: prev:
LazyVim = buildVimPlugin {
pname = "LazyVim";
- version = "2024-10-23";
+ version = "2024-10-24";
src = fetchFromGitHub {
owner = "LazyVim";
repo = "LazyVim";
- rev = "2f6c1f60834108359b3404748453a65843909a03";
- sha256 = "0zk6drcg8psqjal2cxwl7518shhlgh0x6mch8czg1bsplb252yhl";
+ rev = "cb40a09538dc0c417a7ffbbacdbdec90be4a792c";
+ sha256 = "13qwf1lh0ia700j2wq93y3g45pbmfm3l499hi8vw076xmzgh0pav";
};
meta.homepage = "https://github.com/LazyVim/LazyVim/";
};
@@ -243,6 +243,18 @@ final: prev:
meta.homepage = "https://github.com/overcache/NeoSolarized/";
};
+ NotebookNavigator-nvim = buildVimPlugin {
+ pname = "NotebookNavigator.nvim";
+ version = "2024-05-23";
+ src = fetchFromGitHub {
+ owner = "GCBallesteros";
+ repo = "NotebookNavigator.nvim";
+ rev = "20cb6f72939194e32eb3060578b445e5f2e7ae8b";
+ sha256 = "sha256-+FLHJ1tfIplXhO/6kajdcDBTIsNYN9kCOR9IdhXL6d4=";
+ };
+ meta.homepage = "https://github.com/GCBallesteros/NotebookNavigator.nvim/";
+ };
+
NrrwRgn = buildVimPlugin {
pname = "NrrwRgn";
version = "2022-02-13";
@@ -329,12 +341,12 @@ final: prev:
SchemaStore-nvim = buildVimPlugin {
pname = "SchemaStore.nvim";
- version = "2024-10-23";
+ version = "2024-10-27";
src = fetchFromGitHub {
owner = "b0o";
repo = "SchemaStore.nvim";
- rev = "fa562602268fc7335fd2b7581ddf9e67e70f18b6";
- sha256 = "1gw352inr9k8lxaicyrzwrnj0mwbw4y15hgakc3x9lrk00fmpwgn";
+ rev = "e8835ae8e941e940ed3418c3a77976a2bacc52e4";
+ sha256 = "1zkgx4xypp9wvrg8lsidpxfvl1fk2pdggr5dhghbg74n81vvkmbn";
};
meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
};
@@ -1352,12 +1364,12 @@ final: prev:
bufferline-nvim = buildVimPlugin {
pname = "bufferline.nvim";
- version = "2024-10-22";
+ version = "2024-10-24";
src = fetchFromGitHub {
owner = "akinsho";
repo = "bufferline.nvim";
- rev = "5c528bee3dd797d5bd6bae5f229411939b25b203";
- sha256 = "0pv3hylmcl781jy5y1085h247ibvjnhvwwkvz8wvbsx6gl0npcy6";
+ rev = "5cc447cb2b463cb499c82eaeabbed4f5fa6a0a44";
+ sha256 = "1k9n2xmd76h44c2h16z87slf4lir0di7vwam7cyzf0kmmvqrg51j";
};
meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
};
@@ -1448,12 +1460,12 @@ final: prev:
chadtree = buildVimPlugin {
pname = "chadtree";
- version = "2024-10-15";
+ version = "2024-10-27";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "ddd88d9f1f91c026b21bac5f8b5e8259af20434a";
- sha256 = "1q76b0j4fzb0y98jh0x273x70a0f85mwwan88d90dd6np0k10p9c";
+ rev = "bacd90ae5256ae5c1a53752f3c8f54addee68951";
+ sha256 = "1il3mbkzk8w3zjkxm0dqnl44sl8h3j9fqqqbgmghy588wpa8hfli";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -1867,12 +1879,12 @@ final: prev:
cmp-git = buildVimPlugin {
pname = "cmp-git";
- version = "2024-10-22";
+ version = "2024-10-27";
src = fetchFromGitHub {
owner = "petertriho";
repo = "cmp-git";
- rev = "741b6a759dbbcc55e9e5d72e2a84099cf6f4af9c";
- sha256 = "0n94bzjj5siqwccsbssyyjkcvaav16wqlk58vihvv2blqhqhg6j4";
+ rev = "ec049036e354ed8ed0215f2427112882e1ea7051";
+ sha256 = "0if0bqng4gibsgw00fl70b29lzyx6fi1vvhbmbyypw6j1qvdqq73";
};
meta.homepage = "https://github.com/petertriho/cmp-git/";
};
@@ -2359,12 +2371,12 @@ final: prev:
codeium-nvim = buildVimPlugin {
pname = "codeium.nvim";
- version = "2024-10-12";
+ version = "2024-10-27";
src = fetchFromGitHub {
owner = "Exafunction";
repo = "codeium.nvim";
- rev = "ca38490ef963b066d6f686146d73213c70ef7f6b";
- sha256 = "0ya0bp8l846l2zank4gbd44fzb464wz2bhdzc5k0z592xrvavjky";
+ rev = "a7196bf9472b56ecac5c93c8b6eefba932b14492";
+ sha256 = "1za7gc7m563p8a7j712hmyfvab2c46kn267jfjy4dvjb7rdvg80v";
};
meta.homepage = "https://github.com/Exafunction/codeium.nvim/";
};
@@ -2455,12 +2467,12 @@ final: prev:
command-t = buildVimPlugin {
pname = "command-t";
- version = "2024-10-15";
+ version = "2024-10-25";
src = fetchFromGitHub {
owner = "wincent";
repo = "command-t";
- rev = "cd46c34ed11e1554959fdc4efed581261ae486e8";
- sha256 = "0d1i97mdp3n21hiyqf9mpx65sxrrbajcjv25pij3xidyvj7l38sp";
+ rev = "e739fa7bde85912a6dd8bea5c48c216769272da5";
+ sha256 = "1min259i7l3lryq7dirmilhfx6fv05lg5cmy5zvx55g8vnibnkqv";
};
meta.homepage = "https://github.com/wincent/command-t/";
};
@@ -2659,12 +2671,12 @@ final: prev:
conform-nvim = buildVimPlugin {
pname = "conform.nvim";
- version = "2024-10-23";
+ version = "2024-10-27";
src = fetchFromGitHub {
owner = "stevearc";
repo = "conform.nvim";
- rev = "5fbea7d7043bae2499d643c97b407f6da44abff4";
- sha256 = "1h40h4h3hwwxvyhzk0qh614vq6habhbvkwf87lny8bqc53bl9jgz";
+ rev = "6a28c90082a67f62a323ab90d988e000a718a8c7";
+ sha256 = "0f6mn95xd1z2czvjzy3mdhkbinjb6ljp2yyz0v3sqnggk6q9x8vs";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/stevearc/conform.nvim/";
@@ -2804,12 +2816,12 @@ final: prev:
cornelis = buildVimPlugin {
pname = "cornelis";
- version = "2024-05-17";
+ version = "2024-10-24";
src = fetchFromGitHub {
owner = "isovector";
repo = "cornelis";
- rev = "06d6020eed1a3520bb2887337dd5b27b1755968b";
- sha256 = "020ykz38y5mgz1m6njscgd4pksdfx1sryl1ws950l833dhhzdzc0";
+ rev = "41b7d5ef1d1248f6a00fbd5ab798bf42ef189af0";
+ sha256 = "12grb37w3h0rcfw9gy9b8n7cdrvi7ckv229siys7bvh6rg1k5ypg";
};
meta.homepage = "https://github.com/isovector/cornelis/";
};
@@ -3020,12 +3032,12 @@ final: prev:
ddc-source-lsp = buildVimPlugin {
pname = "ddc-source-lsp";
- version = "2024-09-15";
+ version = "2024-10-28";
src = fetchFromGitHub {
owner = "Shougo";
repo = "ddc-source-lsp";
- rev = "23b69013f2948c80b3938165a0cb414f58e26ada";
- sha256 = "0h5f3i5v647ah1bxcwx6ap18qhb6b36jwi2mk89clnww6anaghh7";
+ rev = "e11540a9c4b88adc4a9c003d93df07267e13839d";
+ sha256 = "0jap9sqv8mn1m6ip6bw4fh09kswqd5f5l5kr344fgxr3ppm9p7sf";
};
meta.homepage = "https://github.com/Shougo/ddc-source-lsp/";
};
@@ -3056,24 +3068,24 @@ final: prev:
ddc-vim = buildVimPlugin {
pname = "ddc.vim";
- version = "2024-10-16";
+ version = "2024-10-27";
src = fetchFromGitHub {
owner = "Shougo";
repo = "ddc.vim";
- rev = "ae43c61dd0ebcf6ce7549c7c7bfebcdfaeac7d07";
- sha256 = "0wxaziykndc6p9nzlizfm6i7pxa9fylb1yg3hymia39v67ywphf5";
+ rev = "70a5328ce68d1a9618c73e5a65aefd0b8707685b";
+ sha256 = "1hvkhxs7gsiixl9sl0fkfb0yzqalsn6y6h8i324kalm85zvl824j";
};
meta.homepage = "https://github.com/Shougo/ddc.vim/";
};
debugprint-nvim = buildVimPlugin {
pname = "debugprint.nvim";
- version = "2024-10-22";
+ version = "2024-10-26";
src = fetchFromGitHub {
owner = "andrewferrier";
repo = "debugprint.nvim";
- rev = "f71c14e8b6a3b276ca2fcc0963cbdf599f06b443";
- sha256 = "1x1aynjvazhzv6pqbi51m9x93cjna9q68xzc5qjnls783allpy8n";
+ rev = "dcd6bb1368225a9b3f091e5a67229b54c9b065ac";
+ sha256 = "0205csmf9ndzszpp7bm6mbp5khyszr0jgwhsw5rmwlmap1yrjia3";
};
meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/";
};
@@ -3586,12 +3598,12 @@ final: prev:
dropbar-nvim = buildVimPlugin {
pname = "dropbar.nvim";
- version = "2024-10-21";
+ version = "2024-10-26";
src = fetchFromGitHub {
owner = "Bekaboo";
repo = "dropbar.nvim";
- rev = "61d1403532bf6fb3a28caef8394e34234cf674e6";
- sha256 = "14qsbjli3vgw60hpz3bbp3gs2m9paj5gllmz7mxchapzb2mj6clq";
+ rev = "9d8cad9548804a33c9a1968fe305e46e95c911ae";
+ sha256 = "1cj5rqww6dq0jkvd6k9dhwxj6zv1373r5w72dccwwxwx2k55ximp";
};
meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
};
@@ -4249,12 +4261,12 @@ final: prev:
fzf-lua = buildNeovimPlugin {
pname = "fzf-lua";
- version = "2024-10-23";
+ version = "2024-10-27";
src = fetchFromGitHub {
owner = "ibhagwan";
repo = "fzf-lua";
- rev = "fc0f2b5781587d388b743c2c114127a7036d1a31";
- sha256 = "08k9xmnkjian4mr5ak7fzbw5v14rlhr6zl6a9nk4xq155p5qlk2s";
+ rev = "ce1e24f2a48089b65deefcb0a71a9856839002b5";
+ sha256 = "0nfihl95bxrjmkin8wj6d8sznch695fk2wxkwk6wd92v5dlapypx";
};
meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
};
@@ -4693,24 +4705,24 @@ final: prev:
guard-collection = buildVimPlugin {
pname = "guard-collection";
- version = "2024-10-10";
+ version = "2024-10-27";
src = fetchFromGitHub {
owner = "nvimdev";
repo = "guard-collection";
- rev = "21864299f3f5bd8eedddf2fa7f1253fa20e1c568";
- sha256 = "1rrkf51bf7wb60vpjzhhzc9ic8hgyzp7i52affsw3fw4r96mlwfm";
+ rev = "95309915a441307b0f77f7377e87b96f2807dc3b";
+ sha256 = "1dlvkzl7djxxxnbvghs0fdf3mjd42c4k5b28pf03df06j09nw8rp";
};
meta.homepage = "https://github.com/nvimdev/guard-collection/";
};
guard-nvim = buildVimPlugin {
pname = "guard.nvim";
- version = "2024-10-11";
+ version = "2024-10-26";
src = fetchFromGitHub {
owner = "nvimdev";
repo = "guard.nvim";
- rev = "cc8df48248eb795b71be21f7a30f08fc47a2c22d";
- sha256 = "1khw69wymn22wisp29z8yh4avr826l7d0vpvks857zk79lm3lm89";
+ rev = "1e94ca1e2d4de3b6c435bbaa2a28913610a6ecd5";
+ sha256 = "16sc7ki7m9gh90fjflmqvhc62x5svc3hzfar7pshcc4q18mmjcva";
};
meta.homepage = "https://github.com/nvimdev/guard.nvim/";
};
@@ -4957,12 +4969,12 @@ final: prev:
hmts-nvim = buildVimPlugin {
pname = "hmts.nvim";
- version = "2024-09-26";
+ version = "2024-10-24";
src = fetchFromGitHub {
owner = "calops";
repo = "hmts.nvim";
- rev = "1ecb68b9f89abdb23d2754f9d69f90eab2d33eaa";
- sha256 = "15s0vxihhcqapvdr8y9h41h1vp0kjhfi4c9gxln980jb1qpnalph";
+ rev = "c7ff4c3ad96cd05664b18fb5bbbe2abbd7682dd2";
+ sha256 = "12x44kcc4bz386cbn7sl7m3lszp0bwlqjdd9ai2yj1kijwh715sp";
};
meta.homepage = "https://github.com/calops/hmts.nvim/";
};
@@ -5125,12 +5137,12 @@ final: prev:
image-nvim = buildNeovimPlugin {
pname = "image.nvim";
- version = "2024-10-02";
+ version = "2024-10-28";
src = fetchFromGitHub {
owner = "3rd";
repo = "image.nvim";
- rev = "88e9693e188b8464b1c426aebb4389fd9db2fcbf";
- sha256 = "1bpzckk1gyfyp9bc25zln09w3djsib7ppck6l7wy32lqlmdafn5k";
+ rev = "1bb91fc3a99bf599324bd32a69bf8c925269e3c8";
+ sha256 = "0ijshi300g0d1z2lasx9xhw0zcml4ahvn0p281rygd9nrk6hav07";
};
meta.homepage = "https://github.com/3rd/image.nvim/";
};
@@ -5680,12 +5692,12 @@ final: prev:
lean-nvim = buildVimPlugin {
pname = "lean.nvim";
- version = "2024-10-23";
+ version = "2024-10-27";
src = fetchFromGitHub {
owner = "Julian";
repo = "lean.nvim";
- rev = "bcdcfef2052f5f66f4765c7815d20b723a46367c";
- sha256 = "0b7fkrb1fd6pwm94v1zqvv2m7vsnvj0gmchpid23hfjbbi0kh80x";
+ rev = "c70bf4d5d462ce8ee7f315250203205568827004";
+ sha256 = "00j4z5kdzw3ky1yk051kql67g7qdbvcy5h4089f5x0b7fzc57l0j";
};
meta.homepage = "https://github.com/Julian/lean.nvim/";
};
@@ -5728,24 +5740,24 @@ final: prev:
leetcode-nvim = buildVimPlugin {
pname = "leetcode.nvim";
- version = "2024-06-27";
+ version = "2024-10-28";
src = fetchFromGitHub {
owner = "kawre";
repo = "leetcode.nvim";
- rev = "02fb2c855658ad6b60e43671f6b040c812181a1d";
- sha256 = "sha256-YoFRd9Uf+Yv4YM6/l7MVLMjfRqhroSS3RCmZvNowIAo=";
+ rev = "6a2e54ff13027fb3ce46b61a0e721eccc020ec80";
+ sha256 = "1lay2z1904xadfsfrzlwhmy873rzxb0fdinylx1g306496qsmfwc";
};
meta.homepage = "https://github.com/kawre/leetcode.nvim/";
};
legendary-nvim = buildVimPlugin {
pname = "legendary.nvim";
- version = "2024-10-18";
+ version = "2024-10-25";
src = fetchFromGitHub {
owner = "mrjones2014";
repo = "legendary.nvim";
- rev = "cf49f78dac43031e1b924a5fce2e538581c36d76";
- sha256 = "19nf2j61y3rrj9yx5mqryi59wcwvf4n2z9gsjbsg1p1nal0zl3qw";
+ rev = "8543775d5aa3a418e5e34fe6fd07e335b5df08bc";
+ sha256 = "0qfrr5pc19x1v66lh04nxx1q1rx5qdnszsqy6srdycry46808q0g";
};
meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
};
@@ -6147,12 +6159,12 @@ final: prev:
lspkind-nvim = buildVimPlugin {
pname = "lspkind.nvim";
- version = "2024-09-26";
+ version = "2024-10-25";
src = fetchFromGitHub {
owner = "onsails";
repo = "lspkind.nvim";
- rev = "59c3f419af48a2ffb2320cea85e44e5a95f71664";
- sha256 = "18wwvclabimlhn8c4l4jp63waarm5vql1qmzg1s6y6lfbq1zss7g";
+ rev = "a700f1436d4a938b1a1a93c9962dc796afbaef4d";
+ sha256 = "1af5c54ngpfqc5bcvn5xjv93mpxn6k6m583zjyxhwhw2ma7f09zy";
};
meta.homepage = "https://github.com/onsails/lspkind.nvim/";
};
@@ -6207,12 +6219,12 @@ final: prev:
luasnip = buildNeovimPlugin {
pname = "luasnip";
- version = "2024-10-23";
+ version = "2024-10-28";
src = fetchFromGitHub {
owner = "l3mon4d3";
repo = "luasnip";
- rev = "787dee55ca364cc9119787165418fe93b74c1842";
- sha256 = "02hn5irdyx8lmq3jp943klkxl9xxzvws1bsczlj1fnhzv53dinm5";
+ rev = "67c0da98d807bbbcb6e43a446a01407529e1dd10";
+ sha256 = "1vr2qxim8s4bzkfq7nds79dkcw8d68x8q2l8ir0b0cifc8nyxx90";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@@ -6266,16 +6278,16 @@ final: prev:
meta.homepage = "https://github.com/Bilal2453/luvit-meta/";
};
- magma-nvim-goose = buildVimPlugin {
- pname = "magma-nvim-goose";
- version = "2023-07-04";
+ magma-nvim = buildVimPlugin {
+ pname = "magma-nvim";
+ version = "2023-07-08";
src = fetchFromGitHub {
- owner = "WhiteBlackGoose";
- repo = "magma-nvim-goose";
- rev = "9a626aab63361d027541d023707f82e28d7f872c";
- sha256 = "1z2g96qrgnk817dh9jqavx6yaapddyih8das33v1iwxacnykrbgl";
+ owner = "dccsillag";
+ repo = "magma-nvim";
+ rev = "ff3deba8a879806a51c005e50782130246143d06";
+ sha256 = "sha256-IrMR57gk9iCk73esHO24KZeep9VrlkV5sOC4PzGexyo=";
};
- meta.homepage = "https://github.com/WhiteBlackGoose/magma-nvim-goose/";
+ meta.homepage = "https://github.com/dccsillag/magma-nvim";
};
mark-radar-nvim = buildVimPlugin {
@@ -6605,12 +6617,12 @@ final: prev:
mini-clue = buildVimPlugin {
pname = "mini.clue";
- version = "2024-10-13";
+ version = "2024-10-26";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.clue";
- rev = "378285270242fa23b441a68655d4af6cba8ac4c0";
- sha256 = "09aas4hyza4s7pwwy7vpvizw6qdzyn46h44z9b8y4j4vk7fpk82a";
+ rev = "bea794f5207d498467f4969c56616845f4616010";
+ sha256 = "0ccfwmd9v2kw6dv4ah3wwa65frj5bvm9q377jv2br038clzbkimr";
};
meta.homepage = "https://github.com/echasnovski/mini.clue/";
};
@@ -6857,24 +6869,24 @@ final: prev:
mini-nvim = buildVimPlugin {
pname = "mini.nvim";
- version = "2024-10-22";
+ version = "2024-10-26";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.nvim";
- rev = "77533e69cc4fadb7f4c25f23255ae0890a058818";
- sha256 = "1w3k703f50422k82s7rm1j9vwymd6r4xmfzy0vgi5zvls2yp22k4";
+ rev = "919b953f044d97a2243cc2d1f0b316a199434127";
+ sha256 = "0hajz2f0j07bdwckzn7hh7d9fjz4vabr53wfv24pwq030rxfhn6l";
};
meta.homepage = "https://github.com/echasnovski/mini.nvim/";
};
mini-operators = buildVimPlugin {
pname = "mini.operators";
- version = "2024-10-13";
+ version = "2024-10-26";
src = fetchFromGitHub {
owner = "echasnovski";
repo = "mini.operators";
- rev = "301882a657ac910718dbb965b57028e2967e655a";
- sha256 = "05f5xfbjhn0ydjylx8mj03k4iw0lgndi9wd1a2sq9wffwr3ljw9d";
+ rev = "3bc484733f416a09c5d571135dcfd0062bcc1478";
+ sha256 = "12dj4brh77x97476w1gv7x2r0imbkl8an2ajdv7a2rsyma2mbs3n";
};
meta.homepage = "https://github.com/echasnovski/mini.operators/";
};
@@ -7433,12 +7445,12 @@ final: prev:
neoconf-nvim = buildVimPlugin {
pname = "neoconf.nvim";
- version = "2024-10-24";
+ version = "2024-10-28";
src = fetchFromGitHub {
owner = "folke";
repo = "neoconf.nvim";
- rev = "7c14e042eff455a55b958c500d69aae9166c2e78";
- sha256 = "0zvadvi27ciz9xp3gj7j7l3xdviyyhrxrqzx0wjayydhzpx57k75";
+ rev = "658710f44c13ca44b131b51938dc009511dc2063";
+ sha256 = "19zw6rr0a91193j261xa3ly602xhia18hnb1jjpgpnrddyj6lxzk";
};
meta.homepage = "https://github.com/folke/neoconf.nvim/";
};
@@ -7505,12 +7517,12 @@ final: prev:
neogit = buildVimPlugin {
pname = "neogit";
- version = "2024-10-23";
+ version = "2024-10-28";
src = fetchFromGitHub {
owner = "NeogitOrg";
repo = "neogit";
- rev = "5e51097f964c01bc457f3a0f6fb7287d6782c04e";
- sha256 = "0wfhwbqpc7ni7qs1cdajy44m4avygk1ic6pzn6mxs3j28vk3kkm9";
+ rev = "b81f37ec3169153394084cd564d7dc5871f0729a";
+ sha256 = "14j6qvzrfy4f4hi5isjxmckscscf898hqa8lmhkgnfhmvqjian8z";
};
meta.homepage = "https://github.com/NeogitOrg/neogit/";
};
@@ -7772,24 +7784,24 @@ final: prev:
neotest-haskell = buildVimPlugin {
pname = "neotest-haskell";
- version = "2024-10-20";
+ version = "2024-10-27";
src = fetchFromGitHub {
owner = "MrcJkb";
repo = "neotest-haskell";
- rev = "19d85cd6c1b99ff4a99c16400d5033150331b4ba";
- sha256 = "17rl29iy8d7gz0vjw3w7wnwirnkx4xpv9w1lbcn4ih2gay4a36by";
+ rev = "0c7a7f29041fcec97e99ad45b46f7f5ec27fd3f2";
+ sha256 = "1y9rrc1da2cnkizlzkgl78js2wzibwjg4ax8ssib159yap0mbfck";
};
meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
};
neotest-java = buildVimPlugin {
pname = "neotest-java";
- version = "2024-10-13";
+ version = "2024-10-27";
src = fetchFromGitHub {
owner = "rcasia";
repo = "neotest-java";
- rev = "800393067cf97b0f20eb0a3e61506cc6ffc76128";
- sha256 = "0765v6l9asinbzpynlqcm0abp1f20af934810i8rpsnx2z46wkmw";
+ rev = "e1371c1e9a09632bfaa7fbb5e8166e6f1d38201d";
+ sha256 = "0bhwsr8a9g77r9cvi2g9hndzy4zwqj19dr21ylwdbvq765j9j7bj";
};
meta.homepage = "https://github.com/rcasia/neotest-java/";
};
@@ -7940,12 +7952,12 @@ final: prev:
neotest-zig = buildVimPlugin {
pname = "neotest-zig";
- version = "2024-10-05";
+ version = "2024-10-24";
src = fetchFromGitHub {
owner = "lawrence-laz";
repo = "neotest-zig";
- rev = "a94b38aa5914993cfc8c5c9b341ff47f28c158e3";
- sha256 = "06msa23i7mww4c00cl73nqvb4wwhnf94gb651cg7dwvwy8smklpl";
+ rev = "b0e72626135b703fe186a062f38a47ac739f1cdd";
+ sha256 = "0sjphd6rc99ahlbs5hik905r18casyzfh164d9xj162yq2rchxfl";
};
meta.homepage = "https://github.com/lawrence-laz/neotest-zig/";
};
@@ -8168,12 +8180,12 @@ final: prev:
nlsp-settings-nvim = buildVimPlugin {
pname = "nlsp-settings.nvim";
- version = "2024-10-23";
+ version = "2024-10-24";
src = fetchFromGitHub {
owner = "tamago324";
repo = "nlsp-settings.nvim";
- rev = "59d6a63d1fd4c9aabe6c0516f47200384fc7470f";
- sha256 = "0i7w2dwcf8s1bgagf28mbp5vh9cbr2arfpv2z0n86p4s35bdr2q4";
+ rev = "721ec0a31e1ccf566b5ceb9290294e4f65e4bcd7";
+ sha256 = "0alq7bxqcm7jfbwhsq7isp4r2wn8m8q0bh34vz1smzmsw95nfwb9";
};
meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
};
@@ -8192,12 +8204,12 @@ final: prev:
no-clown-fiesta-nvim = buildVimPlugin {
pname = "no-clown-fiesta.nvim";
- version = "2024-10-06";
+ version = "2024-10-27";
src = fetchFromGitHub {
owner = "aktersnurra";
repo = "no-clown-fiesta.nvim";
- rev = "6fda94cc0748a57e7057ce1e68ae4a3480ff4b78";
- sha256 = "14g7spj2b3sdwcvwwvzf76cfhzqbq035wz95mr7x43jglx1zjsj4";
+ rev = "77edaeee8b691832315b4394321031cb24205d12";
+ sha256 = "04lin8yr4d26xmqkv9fh33f2gx9zpq7aj1hzf6gp6gmmrp4diwil";
};
meta.homepage = "https://github.com/aktersnurra/no-clown-fiesta.nvim/";
};
@@ -8600,12 +8612,12 @@ final: prev:
nvim-dap-python = buildVimPlugin {
pname = "nvim-dap-python";
- version = "2024-10-10";
+ version = "2024-10-24";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap-python";
- rev = "03fe9592409236b9121c03b66a682dfca15a5cac";
- sha256 = "0d72nmrvy070x5cmx9xh0bmrj1hayccs347l30cajfrzajj4bmnr";
+ rev = "3e3dd98d4d83715c9e0e429b4a5da7bd706e6ceb";
+ sha256 = "176aawvphqp2f65msf1lyvacw12jzv39zs7wflaaww0inh9cwkha";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/";
};
@@ -8732,12 +8744,12 @@ final: prev:
nvim-genghis = buildVimPlugin {
pname = "nvim-genghis";
- version = "2024-10-21";
+ version = "2024-10-26";
src = fetchFromGitHub {
owner = "chrisgrieser";
repo = "nvim-genghis";
- rev = "ed3c34d1e4dec2d62370a3a1b84c64a4d4d9b28f";
- sha256 = "19cmgr1ffchpaijmvwpgnpz6n054r1sndrlz6k56aw0p87f0jyvf";
+ rev = "e04857f2905c07e70d366f30beb0e2765dbe9413";
+ sha256 = "1nn9w0bfi6vjg316a1ag1mwxd12gd459xcpdk694qs210qbfy59f";
};
meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/";
};
@@ -8780,12 +8792,12 @@ final: prev:
nvim-highlite = buildVimPlugin {
pname = "nvim-highlite";
- version = "2024-10-21";
+ version = "2024-10-25";
src = fetchFromGitHub {
owner = "Iron-E";
repo = "nvim-highlite";
- rev = "8f224b2fb1d8c0a40f865245a62a5fd58d32e5b7";
- sha256 = "0vdxg5048j7vpp2q0pc4v4rkkdpdzvfa1arfa1kd6ippl2v35m0k";
+ rev = "eef0578e3bc0bbf64a74f0a911655f0b9f2f4a8a";
+ sha256 = "1qfhmlqz1kcdy1fzydhjniklj96jnabk4k5mhrjs5an951jgncqz";
};
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
};
@@ -8935,12 +8947,12 @@ final: prev:
nvim-lspconfig = buildVimPlugin {
pname = "nvim-lspconfig";
- version = "2024-10-23";
+ version = "2024-10-28";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
- rev = "edd9591199d1c78c0cb20514231f7f936f9412a2";
- sha256 = "0c63k4f0fazy3f01cbsawjxz54yxhc1sd1nqv474j4hdn4s5p6m1";
+ rev = "59a6766cbf32c7e4cf3ed685ccad7ffe1dde8c40";
+ sha256 = "0w04mply303j4mq6myygwgr54bxv7cirnj3qrq4il798bxs71vix";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -9115,12 +9127,12 @@ final: prev:
nvim-paredit = buildVimPlugin {
pname = "nvim-paredit";
- version = "2024-10-17";
+ version = "2024-10-24";
src = fetchFromGitHub {
owner = "julienvincent";
repo = "nvim-paredit";
- rev = "f842d84854f3ad5231bc85f52ee94f3fb4ede326";
- sha256 = "00v0hi4xlg5aln8cl2a6gl4d4kdrx5ixnr6llfk59x48cgcvj97z";
+ rev = "0fadfa5cb14c4a2a8fc3e8fbd3cb72c7d5e16eda";
+ sha256 = "1b2g16j7ijmddhx910m8azdvf9hqirffz09mslh911jqfrrqi8na";
};
meta.homepage = "https://github.com/julienvincent/nvim-paredit/";
};
@@ -9187,12 +9199,12 @@ final: prev:
nvim-rip-substitute = buildVimPlugin {
pname = "nvim-rip-substitute";
- version = "2024-10-10";
+ version = "2024-10-26";
src = fetchFromGitHub {
owner = "chrisgrieser";
repo = "nvim-rip-substitute";
- rev = "dd0ad18f207998ce08355ccefaa332376257552a";
- sha256 = "19az20g2jr2vvmkcadsdpppcn1fbsvi1dhg3lyq02a67s9525ln4";
+ rev = "b4234eb8b83135ffa3f49d58102d9b4e2e55e1c8";
+ sha256 = "00xzby5zkwc0rfl1mlgxnq3vvrlprh0y5cgvwssqrd6cz6vypjjs";
};
meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/";
};
@@ -9283,12 +9295,12 @@ final: prev:
nvim-spectre = buildVimPlugin {
pname = "nvim-spectre";
- version = "2024-07-30";
+ version = "2024-10-27";
src = fetchFromGitHub {
owner = "nvim-pack";
repo = "nvim-spectre";
- rev = "ba7fb777edff6c1fbbeffd343e113af64c04e90a";
- sha256 = "024kndjny8h8669d63796c8fnksb3vi86w20bfplxi4vbsz4syhn";
+ rev = "08be31c104df3b4b049607694ebb2b6ced4f928b";
+ sha256 = "04v1gypga9fhmkddis5yyppvmpq0b1b7zpvbfjlxfp2z498l5n2v";
};
meta.homepage = "https://github.com/nvim-pack/nvim-spectre/";
};
@@ -9355,36 +9367,36 @@ final: prev:
nvim-tree-lua = buildVimPlugin {
pname = "nvim-tree.lua";
- version = "2024-10-18";
+ version = "2024-10-28";
src = fetchFromGitHub {
owner = "nvim-tree";
repo = "nvim-tree.lua";
- rev = "2a268f631da85e83b7a95291be589bcddfc785d8";
- sha256 = "0ka4y3af9lfslmn08gsr0q9saldcf5fz7ham1f5x59rw5vndnaq5";
+ rev = "8f974879a04b93fff68b4627087782e76cdf2ed0";
+ sha256 = "0hvqjln23m7q90ycqyrz3qrq2k4nr5k4k465yw43f08xhn4h78v4";
};
meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
};
nvim-treesitter = buildVimPlugin {
pname = "nvim-treesitter";
- version = "2024-10-23";
+ version = "2024-10-28";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
- rev = "9210b9a4fa106247333495e19c843710f4d62102";
- sha256 = "0d1gf3ilaqbgxyr41rzqry75l7brcfdqcwqmw1widylfcc259sl7";
+ rev = "de70388626b398e9cfbec0ec02a0fab8d0f26648";
+ sha256 = "1272q3v9hrc0zlgr6ha1xkyg9d9ilrpiapcb561ww123mhn7rxaq";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
nvim-treesitter-context = buildVimPlugin {
pname = "nvim-treesitter-context";
- version = "2024-10-18";
+ version = "2024-10-27";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-context";
- rev = "e7fdb4cdf0942cd6e63dd822110a93c0ec777fe5";
- sha256 = "1d14699z9wdgjlksbdgkib2dr6ja0kpda9ymrv3yfyc7fyia7kjw";
+ rev = "5bd21aa75aa9e24c0680b23fc88380cd80a53641";
+ sha256 = "0rjvmfcww4ixn9qic53y1nqi1i61fhrkwxd39d37hp721ff96h7l";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
};
@@ -9451,12 +9463,12 @@ final: prev:
nvim-treesitter-textobjects = buildVimPlugin {
pname = "nvim-treesitter-textobjects";
- version = "2024-10-16";
+ version = "2024-10-25";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter-textobjects";
- rev = "0d79d169fcd45a8da464727ac893044728f121d4";
- sha256 = "0qhndwxbbaf324gp8hqd33x6a3z1vkq8jgv5aqpcb05v2i2byfzp";
+ rev = "3e450cd85243da99dc23ebbf14f9c70e9a0c26a4";
+ sha256 = "1gn4ph0p36psjc9bdlvs9sg4vm3l9f94wisgxgva5qgh37bs6g2m";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
};
@@ -9655,24 +9667,24 @@ final: prev:
octo-nvim = buildVimPlugin {
pname = "octo.nvim";
- version = "2024-10-23";
+ version = "2024-10-26";
src = fetchFromGitHub {
owner = "pwntester";
repo = "octo.nvim";
- rev = "c3faeae3f1030611d529e9242f8d9d4a4c877bc1";
- sha256 = "11agy3lvlciqa300q9fcbhjn8ksgzfjshpjg40g2dhflgz8kwrbf";
+ rev = "84a4f195bca82b99d0bf1c8acf64fda00eb0a118";
+ sha256 = "09fal1s0xay5fjdm4y087b8hxb8s2jc6ivr27jx0zjdqb2vrqqmm";
};
meta.homepage = "https://github.com/pwntester/octo.nvim/";
};
oil-nvim = buildVimPlugin {
pname = "oil.nvim";
- version = "2024-10-16";
+ version = "2024-10-25";
src = fetchFromGitHub {
owner = "stevearc";
repo = "oil.nvim";
- rev = "39dbf875861449cf09e936fa80073f3413e9439c";
- sha256 = "1j97c6f5x6vv5rdsb92d64hi1d9p2gd84n4awl6x5bdzqnjr55pn";
+ rev = "cca1631d5ea450c09ba72f3951a9e28105a3632c";
+ sha256 = "1d8xqx7mlbf92z0iiifnv2xbzbd9r1y0ldrwk396qgv3v3qgpci8";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/stevearc/oil.nvim/";
@@ -9848,12 +9860,12 @@ final: prev:
orgmode = buildVimPlugin {
pname = "orgmode";
- version = "2024-10-21";
+ version = "2024-10-28";
src = fetchFromGitHub {
owner = "nvim-orgmode";
repo = "orgmode";
- rev = "625f060d8c68f5000a21a8d0f7ca5c4541df86f1";
- sha256 = "0gpa9jf3czflrr8sf6rg0s2d52s5s8fn3g3fdgvlpj4w6bbzfzgv";
+ rev = "8b1dfcdb035008adf607aa9aa94efa06beec88f8";
+ sha256 = "1d6lcrxi13aj54yf77xzhi6rv4ic5dqzm5xczd9mxdx71h0krqsn";
};
meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
};
@@ -9896,12 +9908,12 @@ final: prev:
overseer-nvim = buildVimPlugin {
pname = "overseer.nvim";
- version = "2024-10-16";
+ version = "2024-10-26";
src = fetchFromGitHub {
owner = "stevearc";
repo = "overseer.nvim";
- rev = "6f8bc37eb729a00e185cdf38b1ed3309a05bfeef";
- sha256 = "0817pw0vaa9war0d7skf9438mazdf9ip29amw77zlbjqcdzg5nbi";
+ rev = "c416be50c2715a7f631d67e21154b8e6cd873ca3";
+ sha256 = "0iincr9z0k9jy7j46vwgf1f2v16z74mm0z4m6hqx6w8rjaiiv3s0";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/stevearc/overseer.nvim/";
@@ -10089,12 +10101,12 @@ final: prev:
plantuml-previewer-vim = buildVimPlugin {
pname = "plantuml-previewer.vim";
- version = "2024-09-23";
+ version = "2024-10-28";
src = fetchFromGitHub {
owner = "weirongxu";
repo = "plantuml-previewer.vim";
- rev = "555347700382c97b347bace57b7a9f764ed556b1";
- sha256 = "0vlx6zbdaw71vlwgs46274af60cazv6d9pa5dn9afm99vls57avq";
+ rev = "368a1f331c1ff29f6a3ee76facfca39a7f374b13";
+ sha256 = "0daknq746ac03js4jh2a30svj8jbc3d3zvq64x196fc4vcy3ymcp";
};
meta.homepage = "https://github.com/weirongxu/plantuml-previewer.vim/";
};
@@ -10294,12 +10306,12 @@ final: prev:
pum-vim = buildVimPlugin {
pname = "pum.vim";
- version = "2024-10-20";
+ version = "2024-10-27";
src = fetchFromGitHub {
owner = "Shougo";
repo = "pum.vim";
- rev = "c50cbf602dac65cba30111cf1eddb1eaf39ea448";
- sha256 = "0dnsrxm16avw97c6jirm2mrriyh97lksldq047nbg3ia2g9px58c";
+ rev = "33384573b3c38b30c69c9e88ad0a66d4e1473023";
+ sha256 = "0i63m7y4rhbiy810snzmijq6xjb5drh29i13r692rvzks1mliaci";
};
meta.homepage = "https://github.com/Shougo/pum.vim/";
};
@@ -10534,12 +10546,12 @@ final: prev:
refactoring-nvim = buildVimPlugin {
pname = "refactoring.nvim";
- version = "2024-07-28";
+ version = "2024-10-27";
src = fetchFromGitHub {
owner = "theprimeagen";
repo = "refactoring.nvim";
- rev = "c406fc5fb4d7ba5fce7b668637075fad6e75e9f8";
- sha256 = "102h8gcf86540bzs0dgis25x3w9ap0an1v75hskj3y2pbyr7hyvk";
+ rev = "53ed6854e0bba64d467c58e87084dcf8b1c22d36";
+ sha256 = "0dv1i5lb4byksakwnv91gbzl85kdbrf0rm24rq8s8kqfw2sfaq3g";
};
meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
};
@@ -10582,12 +10594,12 @@ final: prev:
render-markdown-nvim = buildVimPlugin {
pname = "render-markdown.nvim";
- version = "2024-10-23";
+ version = "2024-10-27";
src = fetchFromGitHub {
owner = "MeanderingProgrammer";
repo = "render-markdown.nvim";
- rev = "25eb261f0bb97c136864215bb90d191c189a6e08";
- sha256 = "1qdrxgrry0bxl5h9fmml7hwq3agc86hgdz90rcqiyqn4b6f460a0";
+ rev = "fc05fb7c56795f191b6800799a2ec6ea325ba715";
+ sha256 = "1604id1b0m4cj36fy8r1fnkbaxs4h388970b790mg525zz8ch6j0";
};
meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/";
};
@@ -10992,12 +11004,12 @@ final: prev:
smart-splits-nvim = buildVimPlugin {
pname = "smart-splits.nvim";
- version = "2024-10-18";
+ version = "2024-10-25";
src = fetchFromGitHub {
owner = "mrjones2014";
repo = "smart-splits.nvim";
- rev = "32172b6598c1c647b96aeead67896c59ca4b7aa6";
- sha256 = "14bi0qwrlfgb2f1bjp6y18ldp4j71afyqsmykby740fzvxgkmmj0";
+ rev = "477a004122ea180b14d3e29544857d572c861668";
+ sha256 = "0pknhibgvh9pfm0ziipfch8ibp64p77zl5yny4ncyyiy3jhv0j8q";
};
meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
};
@@ -11727,12 +11739,12 @@ final: prev:
telekasten-nvim = buildVimPlugin {
pname = "telekasten.nvim";
- version = "2024-10-15";
+ version = "2024-10-26";
src = fetchFromGitHub {
owner = "nvim-telekasten";
repo = "telekasten.nvim";
- rev = "b695fa6eff5d892d4d793326c8b313941c6a7af1";
- sha256 = "13grif3bhi89fr2hbkbqm3dd9ifma5x641g0783c8387zqjgvyhw";
+ rev = "6a10a7929421d6e696e46bbc5aa5627a8cbcf61d";
+ sha256 = "1fb6xv6q9hsbcisg055bgfjgvm7zli8sgb1gs3zq4f68d5pnpwsw";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/nvim-telekasten/telekasten.nvim/";
@@ -11897,12 +11909,12 @@ final: prev:
telescope-manix = buildNeovimPlugin {
pname = "telescope-manix";
- version = "2024-10-20";
+ version = "2024-10-27";
src = fetchFromGitHub {
owner = "MrcJkb";
repo = "telescope-manix";
- rev = "913dbb2894603ca613f4ff6864827c6383395229";
- sha256 = "13qc3cf8w0j67g61scg3jb19fyd6pr30rnmwldsqnfz3k2fdcf7a";
+ rev = "8b796ac94e87b1623844cb0d32a739a9056cdd78";
+ sha256 = "00fnqh4v2zraglayr8aa4vxcx1pswxqwsq9ycy59zcw7wv8rwycm";
};
meta.homepage = "https://github.com/MrcJkb/telescope-manix/";
};
@@ -12054,12 +12066,12 @@ final: prev:
telescope-nvim = buildNeovimPlugin {
pname = "telescope.nvim";
- version = "2024-10-10";
+ version = "2024-10-26";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
- rev = "df534c3042572fb958586facd02841e10186707c";
- sha256 = "0a82h051ymnbkzxsz21f454fbk5qq26fhxk4h42jby6vgy7myqqx";
+ rev = "37dc9233a473dd6c3f54456ef9994d8f77c80211";
+ sha256 = "0jbwmmf810jbhixd5sfdyfjcv9xrb1l1hliap09p1bhnvm55h9yf";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@@ -12294,12 +12306,12 @@ final: prev:
tmux-nvim = buildVimPlugin {
pname = "tmux.nvim";
- version = "2024-07-30";
+ version = "2024-10-25";
src = fetchFromGitHub {
owner = "aserowy";
repo = "tmux.nvim";
- rev = "65ee9d6e6308afcd7d602e1320f727c5be63a947";
- sha256 = "063bcqwxlk18ygmr34jqnl0f0yhwy2zjkj4z8x7nl8bc07x2vnln";
+ rev = "307bad95a1274f7288aaee09694c25c8cbcd6f1a";
+ sha256 = "1kwng294hm9may49byvxhmpzylpzw9hfp8ngafd8i93swb16rzbk";
};
meta.homepage = "https://github.com/aserowy/tmux.nvim/";
};
@@ -12355,12 +12367,12 @@ final: prev:
tokyonight-nvim = buildVimPlugin {
pname = "tokyonight.nvim";
- version = "2024-10-23";
+ version = "2024-10-24";
src = fetchFromGitHub {
owner = "folke";
repo = "tokyonight.nvim";
- rev = "19f39b53ef5e148bf94ea3696df36175af7e31e6";
- sha256 = "1812nv74m24nx21lg9zbqrqd8jnp8q51lj6m9z5pqhb5xi3hrgy1";
+ rev = "2e1daa1d164ad8cc3e99b44ca68e990888a66038";
+ sha256 = "118cj0bbv069m1ry9s97c929sbk46d44x9w4ww2l9xq1x5hv9jh1";
};
meta.homepage = "https://github.com/folke/tokyonight.nvim/";
};
@@ -12439,12 +12451,12 @@ final: prev:
triptych-nvim = buildVimPlugin {
pname = "triptych.nvim";
- version = "2024-10-19";
+ version = "2024-10-24";
src = fetchFromGitHub {
owner = "simonmclean";
repo = "triptych.nvim";
- rev = "ceee8bc858908a0802bcdbf4dfaf8cb732a6877a";
- sha256 = "1djbs2asscbffi4wmapmxyp4wn3jkm12516nhs2lid6cslvig7ih";
+ rev = "6f4b8ec5eaeff680aff53b1f3d97095fc4120587";
+ sha256 = "1793h1s5lzmk11mi2n20wjvm0vjhrlkvzpidzwgf7w82bj9j3q7k";
fetchSubmodules = true;
};
meta.homepage = "https://github.com/simonmclean/triptych.nvim/";
@@ -12764,12 +12776,12 @@ final: prev:
vifm-vim = buildVimPlugin {
pname = "vifm.vim";
- version = "2024-10-09";
+ version = "2024-10-27";
src = fetchFromGitHub {
owner = "vifm";
repo = "vifm.vim";
- rev = "785866e76397fafb7bce1f9bd0eb925aa29151aa";
- sha256 = "0j02065ayciz0qnqh5a9h2lka9w20ijjsnlbs8hpcv944ynls1r8";
+ rev = "211776ed10a54844720c50f9bde4f65ff70489ea";
+ sha256 = "16q3g3rdskz5pc8rnq857h0y22w6v5wn01fgmpnhxv0g57dn35g9";
};
meta.homepage = "https://github.com/vifm/vifm.vim/";
};
@@ -13124,12 +13136,12 @@ final: prev:
vim-airline = buildVimPlugin {
pname = "vim-airline";
- version = "2024-09-10";
+ version = "2024-10-24";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
- rev = "81eca994860645acbb58442285cdd70df5c71d2b";
- sha256 = "1q2wgavd2ff3iqkq8khzp1h5r651vjz5z90xlz7fyl10lmfm4j10";
+ rev = "3ddcab16c26760d7b94ef0b1f8b62f9bc1ea8cba";
+ sha256 = "0mx29fp30cn6b7w6axmq7igm0z0q6pnvvimic39c3lqc74m599c8";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
@@ -14360,12 +14372,12 @@ final: prev:
vim-flog = buildVimPlugin {
pname = "vim-flog";
- version = "2024-09-25";
+ version = "2024-10-26";
src = fetchFromGitHub {
owner = "rbong";
repo = "vim-flog";
- rev = "6f80c1ffa7068ca8cc0e29af7af4f6ed0717e65e";
- sha256 = "10y1dycyfzqrcm47yihvgbvbvm49d77lm51s3rya4q7zplr5mqzg";
+ rev = "afbbe41355122722a9e6beb23055e2b63187fc1e";
+ sha256 = "0kj2wvfxh4iy3c2fp3n3iifi7xfhnpz8imy6jrv8p76xdvb73gw1";
};
meta.homepage = "https://github.com/rbong/vim-flog/";
};
@@ -15093,12 +15105,12 @@ final: prev:
vim-jjdescription = buildVimPlugin {
pname = "vim-jjdescription";
- version = "2024-05-28";
+ version = "2024-10-26";
src = fetchFromGitHub {
owner = "avm99963";
repo = "vim-jjdescription";
- rev = "ca14325202f3cd894d01ba833451017624249222";
- sha256 = "1y83fdih991ivlvgcwp0sx97icmf9k6px7mr26vb77izjlf011w2";
+ rev = "b94c5062d52b4bb2416a113fa13d8ef7153094b8";
+ sha256 = "03765jjhgjc604vrn2hbv6lnzvm73b7fb2kgafvaa1n1y7slszcs";
};
meta.homepage = "https://github.com/avm99963/vim-jjdescription/";
};
@@ -15382,12 +15394,12 @@ final: prev:
vim-localvimrc = buildVimPlugin {
pname = "vim-localvimrc";
- version = "2024-05-07";
+ version = "2024-10-25";
src = fetchFromGitHub {
owner = "embear";
repo = "vim-localvimrc";
- rev = "ee9df429b91d3e6ea33e173ef864b02c377036d0";
- sha256 = "1f5ld9fm4fysgz9xixqkv3a87gvisc0w9q31alb6ypk3ib697c57";
+ rev = "b249c5a6bf324b0d5e62ccacfffcd36c6a703d84";
+ sha256 = "1x7q5ymmgvjki8n2w3hx33ff0x70inx6iddpqvwcpwf31p9xcnzf";
};
meta.homepage = "https://github.com/embear/vim-localvimrc/";
};
@@ -15599,12 +15611,12 @@ final: prev:
vim-matchup = buildVimPlugin {
pname = "vim-matchup";
- version = "2024-10-22";
+ version = "2024-10-28";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
- rev = "2328f4a3082093fe61f6d8004572f905cc1b58f4";
- sha256 = "0fqgg6gsld4ff8sm7vh85qsn29rsxhvvbpylk4msymnw70bqcrv0";
+ rev = "5fb083de1e06fdd134c6ad8d007d4b5576b25ba7";
+ sha256 = "1913gqqhza5nhcmxh0bdrn0bzsizk6ymlrv303dd5s1mp8k44mzn";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@@ -15911,12 +15923,12 @@ final: prev:
vim-obsession = buildVimPlugin {
pname = "vim-obsession";
- version = "2022-12-02";
+ version = "2024-10-25";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-obsession";
- rev = "fe9d3e1a9a50171e7d316a52e1e56d868e4c1fe5";
- sha256 = "0x60j6bq9aql9fqq704cg8bc930c7n1jiaczwsn6slwa55c03zmr";
+ rev = "f50baec758c4bf2702fa8f051652789a90c5bfa9";
+ sha256 = "14iiqibrbsgpzv6vraf2b1d8qb6b7qn19i11smvzzzcq33hzbik2";
};
meta.homepage = "https://github.com/tpope/vim-obsession/";
};
@@ -17123,12 +17135,12 @@ final: prev:
vim-tabby = buildVimPlugin {
pname = "vim-tabby";
- version = "2024-03-01";
+ version = "2024-10-17";
src = fetchFromGitHub {
owner = "TabbyML";
repo = "vim-tabby";
- rev = "afd76df166ed0f223ede1071e0cfde8075cc4a24";
- sha256 = "0wp5c1m95k000sw8j4b8rwphmkg529dscch6ps50fjn9j91ab96g";
+ rev = "b29c0681569fcc9857ff13835afec2dda9b8d90f";
+ sha256 = "0j87agcir467m0k5ln98crxsv8yf8cvya5l869r36m6czfm42l53";
};
meta.homepage = "https://github.com/TabbyML/vim-tabby/";
};
@@ -17856,12 +17868,12 @@ final: prev:
vimade = buildVimPlugin {
pname = "vimade";
- version = "2024-10-22";
+ version = "2024-10-26";
src = fetchFromGitHub {
owner = "TaDaa";
repo = "vimade";
- rev = "d64aadb710e7a57193a713a600fd136855744eea";
- sha256 = "1z9vk7wanmhqh2b3vwks772qavgxrzshay3h3ihpkpg6xg20rsmj";
+ rev = "919562da13222cb9d3b08a176528aa2e3a6b767f";
+ sha256 = "1dq8rvrq4rj24c0jilc3i46mxfl7psb6q6nax3hw79bs25gcn983";
};
meta.homepage = "https://github.com/TaDaa/vimade/";
};
@@ -17977,12 +17989,12 @@ final: prev:
vimtex = buildVimPlugin {
pname = "vimtex";
- version = "2024-10-23";
+ version = "2024-10-26";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "f59b2784e8e4a2cce741cc697b403428af4cf131";
- sha256 = "1v2pr2swnp0q7v3qfkpnm2k3wp8wa17dxrcn9cyaslcprcb5a340";
+ rev = "0785fd98af20f308ce6856f75a70a4ece9abab29";
+ sha256 = "1g040n5lh1b6cxvwk6admmz2sgr6m0qbc31r63dhcsgaqnvzg2bz";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
@@ -18157,12 +18169,12 @@ final: prev:
wiki-vim = buildVimPlugin {
pname = "wiki.vim";
- version = "2024-10-23";
+ version = "2024-10-26";
src = fetchFromGitHub {
owner = "lervag";
repo = "wiki.vim";
- rev = "e2f39f25ef6b5d3676161affa98d4df45b87c42a";
- sha256 = "0rc4k76m2b4ba1q6hyl8hnmgzzfnd77c6qp4bf6vihc4k8vhk2gq";
+ rev = "854b1472e2867035bd15d55a0b4d523f5662e242";
+ sha256 = "1sqkzjnq0hg4y6xrn0w6ks2klrwq5yivk0pl5jn4bs8h968ij5h0";
};
meta.homepage = "https://github.com/lervag/wiki.vim/";
};
@@ -18350,12 +18362,12 @@ final: prev:
yazi-nvim = buildVimPlugin {
pname = "yazi.nvim";
- version = "2024-10-19";
+ version = "2024-10-24";
src = fetchFromGitHub {
owner = "mikavilpas";
repo = "yazi.nvim";
- rev = "54065a98f27c562484041fd1137118a148468eb1";
- sha256 = "0w8n7ai9inlgbgzp7hfsskcqnxwxsjwr84zpdcy9p3r0cysiskvp";
+ rev = "93fd9dc5f23c7699ba50507bfe5d4136cfa487d2";
+ sha256 = "1pbiamgvfnd2lcc0nlq2wz42xfx1v2qk45z3lkn03mn2rvmr6nlf";
};
meta.homepage = "https://github.com/mikavilpas/yazi.nvim/";
};
@@ -18494,12 +18506,12 @@ final: prev:
zk-nvim = buildVimPlugin {
pname = "zk-nvim";
- version = "2024-10-01";
+ version = "2024-10-24";
src = fetchFromGitHub {
owner = "zk-org";
repo = "zk-nvim";
- rev = "16fc98ce3d037418f04c181b5cc0fc4b982ceaed";
- sha256 = "11ggr5qc6kzn3r0y5waqd8i8ax6if2dx08m0w2p739k1wgy1285l";
+ rev = "aa9b346f2b0ab0c822bef917ee7f607d5c99f7bc";
+ sha256 = "1clsi06jjr08gngkjb4jzx2v45bsdl6yd6909srpwmssrzzzaxq5";
};
meta.homepage = "https://github.com/zk-org/zk-nvim/";
};
@@ -18530,12 +18542,12 @@ final: prev:
catppuccin-nvim = buildVimPlugin {
pname = "catppuccin-nvim";
- version = "2024-10-19";
+ version = "2024-10-28";
src = fetchFromGitHub {
owner = "catppuccin";
repo = "nvim";
- rev = "ea02cc8c3c053c6c1c574e0791d743338e3e788f";
- sha256 = "0z0wff1dd8wh0cqd7yx3d14wcjr80iqqz0s8a3m9nllxp9bqsf65";
+ rev = "65bf0b16f57a3db70d6a93ac68882dd9a31d0565";
+ sha256 = "16ngmh7psyc5499bdz4l03gqkjxj67400kj0fd8jxac57dwfq9h7";
};
meta.homepage = "https://github.com/catppuccin/nvim/";
};
@@ -18626,12 +18638,12 @@ final: prev:
nightfly = buildVimPlugin {
pname = "nightfly";
- version = "2024-09-29";
+ version = "2024-10-27";
src = fetchFromGitHub {
owner = "bluz71";
repo = "vim-nightfly-colors";
- rev = "f4f932d3129fee10a0e944445fe6be5abf76465c";
- sha256 = "1kpba0yk6zkzws3221pmsyyaq467j3a7iqa1rjzzcgd47sf237az";
+ rev = "48d074b8a2557b4f88a1f5dd2b21fc479ef6fbf2";
+ sha256 = "0rkrx0msg2jsgk37lzr43nsg6wn9crq1jm4adxxh22ypxsigi33z";
};
meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/";
};
@@ -18650,12 +18662,12 @@ final: prev:
nvchad-ui = buildVimPlugin {
pname = "nvchad-ui";
- version = "2024-10-24";
+ version = "2024-10-28";
src = fetchFromGitHub {
owner = "nvchad";
repo = "ui";
- rev = "785bcbbf84eadcf3a831f9247577969e33c8f2ca";
- sha256 = "09zv0c17xqj39kswvnxddpxdv75sqz8h39kv6f3cszz9plgqq741";
+ rev = "ba40afccc8a27236eb735cd55e2c33ced912b8b0";
+ sha256 = "1ng0gvpb4yzljmxfvgv51mgizfnqx469r0rbqhypvzh56p2iwmhc";
};
meta.homepage = "https://github.com/nvchad/ui/";
};
@@ -18755,18 +18767,4 @@ final: prev:
};
meta.homepage = "https://github.com/jhradilek/vim-snippets/";
};
-
- NotebookNavigator-nvim = buildVimPlugin {
- pname = "NotebookNavigator.nvim";
- version = "2024-05-23";
- src = fetchFromGitHub {
- owner = "GCBallesteros";
- repo = "NotebookNavigator.nvim";
- rev = "20cb6f72939194e32eb3060578b445e5f2e7ae8b";
- sha256 = "sha256-+FLHJ1tfIplXhO/6kajdcDBTIsNYN9kCOR9IdhXL6d4=";
- };
- meta.homepage = "https://github.com/GCBallesteros/NotebookNavigator.nvim";
- };
-
-
}
diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index a9d985a5d6e9..1785c57284d0 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -401,6 +401,17 @@
};
meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart";
};
+ desktop = buildGrammar {
+ language = "desktop";
+ version = "0.0.0+rev=0d8b8cf";
+ src = fetchFromGitHub {
+ owner = "ValdezFOmar";
+ repo = "tree-sitter-desktop";
+ rev = "0d8b8cf7c9311fe3f1730df8e193d836f6dd9d1b";
+ hash = "sha256-tDZB6gkQyVF1wN4343Qft0tRkTDDm49AFzhbIz+LK40=";
+ };
+ meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-desktop";
+ };
devicetree = buildGrammar {
language = "devicetree";
version = "0.0.0+rev=16c9cb9";
@@ -526,12 +537,12 @@
};
editorconfig = buildGrammar {
language = "editorconfig";
- version = "0.0.0+rev=777f774";
+ version = "0.0.0+rev=38cf8d0";
src = fetchFromGitHub {
owner = "ValdezFOmar";
repo = "tree-sitter-editorconfig";
- rev = "777f774d6381f1bb84adffa02a4e476fb61486ae";
- hash = "sha256-7CN2fT5wwsuSwQzq7uBj26OPYRtZ6rwLNz99SKhBU74=";
+ rev = "38cf8d0af6049025de0e5486a40881dac06285b4";
+ hash = "sha256-ndZ/oGquSMkxsEHUPh5/qDEUVfhyZbI4mcQKtLHVBOU=";
};
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig";
};
@@ -559,12 +570,12 @@
};
elixir = buildGrammar {
language = "elixir";
- version = "0.0.0+rev=2ac7a0f";
+ version = "0.0.0+rev=5345854";
src = fetchFromGitHub {
owner = "elixir-lang";
repo = "tree-sitter-elixir";
- rev = "2ac7a0f81f0731d83068b2872c4a8fee39263a85";
- hash = "sha256-u0gwq4eIoFNcTeoJpY2lRE97M7JSHZ5X2zSKrNlTycM=";
+ rev = "53458546e3bb717beee1d15df30724c81eb41d1c";
+ hash = "sha256-Zuqjv4QEeCiHYCxGT9HYAXlqrRFTi8V88wAsot6O5TI=";
};
meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir";
};
@@ -713,12 +724,12 @@
};
fortran = buildGrammar {
language = "fortran";
- version = "0.0.0+rev=4a593dd";
+ version = "0.0.0+rev=cb4cb11";
src = fetchFromGitHub {
owner = "stadelmanma";
repo = "tree-sitter-fortran";
- rev = "4a593dda9cbc050a6686187249f8350ceea292ce";
- hash = "sha256-HsGDyjUymJHpaQ7ZlcTOg/fg4avVicnPf3zF9OoWQes=";
+ rev = "cb4cb11ca2dced205fb54005684a44e2ceb813c1";
+ hash = "sha256-c15BxiXhmQeOz0G5v2R9fpBUbhmcibm15ax6hbWQOnI=";
};
meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
};
@@ -1331,12 +1342,12 @@
};
javascript = buildGrammar {
language = "javascript";
- version = "0.0.0+rev=c4ce9dc";
+ version = "0.0.0+rev=a2ef079";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-javascript";
- rev = "c4ce9dc8e7e98ea25757ea26bfe9a022043ccd77";
- hash = "sha256-ZSuogu8ljy0Ve8MGzkX1Q+dkHNbVmy8LhcCmshvw7+U=";
+ rev = "a2ef0796e8b9db9107c9ad210b3121b8ad918d5e";
+ hash = "sha256-0WTH1bj2uKgfLnJqaoHYJFUFY4OWpCnY0YfbPiqIbiM=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript";
};
@@ -1419,12 +1430,12 @@
};
just = buildGrammar {
language = "just";
- version = "0.0.0+rev=6aee3d2";
+ version = "0.0.0+rev=1014d2f";
src = fetchFromGitHub {
owner = "IndianBoy42";
repo = "tree-sitter-just";
- rev = "6aee3d2f5b3a47286bae0916daaa6c7a217f6fa4";
- hash = "sha256-A5dN76/ZxoXBzqNHDhE5JeNeKBpamZ2Jp6Y67U6gZ/w=";
+ rev = "1014d2fd6396856c312054d6c30df4d78b62966c";
+ hash = "sha256-8vr55zhJOJxZhc8bXZpvO6a/eEYUJQ+HBWC4xRYbrgk=";
};
meta.homepage = "https://github.com/IndianBoy42/tree-sitter-just";
};
@@ -1463,12 +1474,12 @@
};
koto = buildGrammar {
language = "koto";
- version = "0.0.0+rev=cbf637e";
+ version = "0.0.0+rev=9e5ab09";
src = fetchFromGitHub {
owner = "koto-lang";
repo = "tree-sitter-koto";
- rev = "cbf637e5163065934c827d254b293f4d2f08f523";
- hash = "sha256-/yeC7pAk0QsPcuMfdp2l1MLGZlQ7CwgdMWNZe/hCfXU=";
+ rev = "9e5ab09710b9f035efdcef1eecaadbf261af7ec3";
+ hash = "sha256-xlU3iOjwYcoCf6kdkxTX/zASY0+n+TwAn8GBfACYr1k=";
};
meta.homepage = "https://github.com/koto-lang/tree-sitter-koto";
};
@@ -1708,12 +1719,12 @@
};
mlir = buildGrammar {
language = "mlir";
- version = "0.0.0+rev=0238b7f";
+ version = "0.0.0+rev=8cde51a";
src = fetchFromGitHub {
owner = "artagnon";
repo = "tree-sitter-mlir";
- rev = "0238b7fb6a630f77b3fc8b8a48285ef6ed45cbcc";
- hash = "sha256-rQDkvs/z+sunTlcquHLMN6wmsCP3RRT6vcnSqxNNo+0=";
+ rev = "8cde51ac0484fdf59a90641fefb92a0e846dcc7c";
+ hash = "sha256-bIqWBIOkUq9TitqNneiB+epu/+kVgW1szOm96yMrFaE=";
};
generate = true;
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -2711,12 +2722,12 @@
};
superhtml = buildGrammar {
language = "superhtml";
- version = "0.0.0+rev=3325bbb";
+ version = "0.0.0+rev=e561df3";
src = fetchFromGitHub {
owner = "kristoff-it";
repo = "superhtml";
- rev = "3325bbb2dda260131a8db0cae1f1f557d17ebced";
- hash = "sha256-3NAS3eqayFYRziryNgOWfY+3d1HcVe+jPcKkkL9jbWY=";
+ rev = "e561df3b5ce94e598a4c3d0ee4abd9635bad63b3";
+ hash = "sha256-sF5uAEYV32HROnqvM3oltvpwtBydx2au8SIJCAMmpMY=";
};
location = "tree-sitter-superhtml";
meta.homepage = "https://github.com/kristoff-it/superhtml";
@@ -2745,12 +2756,12 @@
};
swift = buildGrammar {
language = "swift";
- version = "0.0.0+rev=d351cb3";
+ version = "0.0.0+rev=5098007";
src = fetchFromGitHub {
owner = "alex-pinkus";
repo = "tree-sitter-swift";
- rev = "d351cb321c28f0a3e66242ef2f61b1f890ec4b44";
- hash = "sha256-7b9wNyHF2ZKMhMcqaFVb1xGcxWdZOS5k1CBvg4RVqXE=";
+ rev = "5098007f58f4663a5613b2fecb6b866e3d41e37b";
+ hash = "sha256-VIBjnR9pkPt9RWjaDBWv6Rhuzr8eTjNJtrfXI/+2mCs=";
};
generate = true;
meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@@ -2779,12 +2790,12 @@
};
t32 = buildGrammar {
language = "t32";
- version = "0.0.0+rev=0f6a5b1";
+ version = "0.0.0+rev=e455373";
src = fetchFromGitLab {
owner = "xasc";
repo = "tree-sitter-t32";
- rev = "0f6a5b1e031c97ebf58d3c76eadb2c6bf1e4f780";
- hash = "sha256-Pd6rudBmDVvBwlVSLtBmSsoOBU9aG0iSyEPbTaYX6JE=";
+ rev = "e455373021812abf4a0b5170caa0d882a9578bab";
+ hash = "sha256-SJYT34qw55xiN0lJ37NfPkV4WHi7/5Ymdxruk4vyOV4=";
};
meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git";
};
@@ -2835,12 +2846,12 @@
};
templ = buildGrammar {
language = "templ";
- version = "0.0.0+rev=4519e3e";
+ version = "0.0.0+rev=1dcd7db";
src = fetchFromGitHub {
owner = "vrischmann";
repo = "tree-sitter-templ";
- rev = "4519e3ec9ca92754ca25659bb1fd410d5e0f8d88";
- hash = "sha256-ic5SlqDEZoYakrJFe0H9GdzravqovlL5sTaHjyhe74M=";
+ rev = "1dcd7db19c047bc0327907a544df3207ba814ea4";
+ hash = "sha256-/WOEN+FGb65IpRZCzB2+0/aTjourcL5CYchrZxwlFWs=";
};
meta.homepage = "https://github.com/vrischmann/tree-sitter-templ";
};
@@ -2891,12 +2902,12 @@
};
tlaplus = buildGrammar {
language = "tlaplus";
- version = "0.0.0+rev=8a8413f";
+ version = "0.0.0+rev=ffb6c4b";
src = fetchFromGitHub {
owner = "tlaplus-community";
repo = "tree-sitter-tlaplus";
- rev = "8a8413f1d08e7ee40b347206d26eac4324db9fd9";
- hash = "sha256-k34gkAd0ueXEAww/Hc1mtBfn0Kp1pIBQtjDZ9GQeB4Q=";
+ rev = "ffb6c4b91862a03af767d6b0e627d3d20539b79a";
+ hash = "sha256-eKHpiAtOYn9fFhR35m1d1jLNwLeXL1GT5cAWWoYZI/k=";
};
meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus";
};
@@ -3160,12 +3171,12 @@
};
vimdoc = buildGrammar {
language = "vimdoc";
- version = "0.0.0+rev=59c5392";
+ version = "0.0.0+rev=d2e4b5c";
src = fetchFromGitHub {
owner = "neovim";
repo = "tree-sitter-vimdoc";
- rev = "59c539286e7487b267bc7808b16833f9e3ad6793";
- hash = "sha256-YDeyD9z/pXISAD7IVfzEenNy2qPORLMqG466c+6yQf0=";
+ rev = "d2e4b5c172a109966c2ce0378f73df6cede39400";
+ hash = "sha256-Vrl4/cZL+TWlUMEeWZoHCAWhvlefcl3ajGcwyTNKOhI=";
};
meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc";
};
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index ffea81bcf232..0e3f1d17c464 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1305,15 +1305,7 @@ in
nvimRequireCheck = "lzn-auto-require.loader";
};
- magma-nvim-goose = buildVimPlugin {
- pname = "magma-nvim-goose";
- version = "2023-03-13";
- src = fetchFromGitHub {
- owner = "WhiteBlackGoose";
- repo = "magma-nvim-goose";
- rev = "5d916c39c1852e09fcd39eab174b8e5bbdb25f8f";
- sha256 = "10d6dh0czdpgfpzqs5vzxfffkm0460qjzi2mfkacgghqf3iwkbja";
- };
+ magma-nvim = super.magma-nvim.overrideAttrs {
passthru.python3Dependencies =
ps: with ps; [
pynvim
@@ -1326,7 +1318,6 @@ in
pyperclip
pnglatex
];
- meta.homepage = "https://github.com/WhiteBlackGoose/magma-nvim-goose/";
};
markdown-preview-nvim =
@@ -1653,7 +1644,7 @@ in
inherit (old) version src;
sourceRoot = "${old.src.name}/spectre_oxi";
- cargoHash = "sha256-D7KUJ8q521WWgUqBBOgepGJ3NQ4DdKr+Bg/4k3Lf+mw=";
+ cargoHash = "sha256-yYUbfqkICsGDKexYjfhXfpIoT1+QrZQJPpKzk+gwm+s=";
preCheck = ''
mkdir tests/tmp/
@@ -2008,20 +1999,23 @@ in
meta.homepage = "https://github.com/ackyshake/Spacegray.vim/";
};
- sqlite-lua = super.sqlite-lua.overrideAttrs (oa: {
- postPatch =
- let
- libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}";
- in
- ''
+ sqlite-lua = super.sqlite-lua.overrideAttrs (
+ oa:
+ let
+ libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}";
+ in
+ {
+ postPatch = ''
substituteInPlace lua/sqlite/defs.lua \
- --replace "path = vim.g.sqlite_clib_path" "path = vim.g.sqlite_clib_path or ${lib.escapeShellArg libsqlite}"
+ --replace-fail "path = vim.g.sqlite_clib_path" "path = vim.g.sqlite_clib_path or '${lib.escapeShellArg libsqlite}'"
'';
- passthru = oa.passthru // {
- initLua = ''vim.g.sqlite_clib_path = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}"'';
- };
- });
+ passthru = oa.passthru // {
+ initLua = ''vim.g.sqlite_clib_path = "${libsqlite}"'';
+ };
+ nvimRequireCheck = "sqlite";
+ }
+ );
ssr = super.ssr-nvim.overrideAttrs {
dependencies = with self; [ nvim-treesitter ];
@@ -2564,11 +2558,7 @@ in
};
vim-tabby = super.vim-tabby.overrideAttrs {
- postPatch = ''
- substituteInPlace autoload/tabby/globals.vim --replace-fail \
- "let g:tabby_node_binary = get(g:, 'tabby_node_binary', 'node')" \
- "let g:tabby_node_binary = get(g:, 'tabby_node_binary', '${nodejs}/bin/node')"
- '';
+ nvimRequirecheck = "tabby";
};
vim-textobj-entire = super.vim-textobj-entire.overrideAttrs {
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 1420ff4fd04b..ad4f66f1b643 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1,238 +1,550 @@
repo,branch,alias
-https://codeberg.org/FelipeLema/cmp-async-path/,,
-https://git.sr.ht/~sircmpwn/hare.vim,HEAD,
-https://git.sr.ht/~whynothugo/lsp_lines.nvim,,
-https://github.com/0xJohnnyboy/scretch.nvim/,HEAD,
-https://github.com/3rd/diagram.nvim/,HEAD,
-https://github.com/3rd/image.nvim/,HEAD,
-https://github.com/907th/vim-auto-save/,,
-https://github.com/aaronhallaert/advanced-git-search.nvim/,HEAD,
-https://github.com/abecodes/tabout.nvim/,HEAD,
-https://github.com/aca/completion-tabnine/,,
-https://github.com/AckslD/nvim-FeMaco.lua/,HEAD,
-https://github.com/AckslD/nvim-neoclip.lua/,,
-https://github.com/AckslD/nvim-whichkey-setup.lua/,,
-https://github.com/aduros/ai.vim/,HEAD,
-https://github.com/AhmedAbdulrahman/aylin.vim/,,
-https://github.com/ahmedkhalf/lsp-rooter.nvim/,,
-https://github.com/ahmedkhalf/project.nvim/,,
-https://github.com/airblade/vim-gitgutter/,,
-https://github.com/airblade/vim-rooter/,,
-https://github.com/ajmwagar/vim-deus/,,
-https://github.com/akinsho/bufferline.nvim/,,
-https://github.com/akinsho/flutter-tools.nvim/,HEAD,
-https://github.com/akinsho/git-conflict.nvim/,HEAD,
-https://github.com/akinsho/toggleterm.nvim/,,
-https://github.com/aklt/plantuml-syntax/,,
-https://github.com/aktersnurra/no-clown-fiesta.nvim/,,
-https://github.com/Alexis12119/nightly.nvim/,,
-https://github.com/alfaix/neotest-gtest/,HEAD,
-https://github.com/allendang/nvim-expand-expr/,,
-https://github.com/Almo7aya/openingh.nvim/,,
-https://github.com/AlphaTechnolog/pywal.nvim/,,
-https://github.com/altercation/vim-colors-solarized/,,
-https://github.com/altermo/ultimate-autopair.nvim/,HEAD,
-https://github.com/alvan/vim-closetag/,,
-https://github.com/alvarosevilla95/luatab.nvim/,,
-https://github.com/alx741/vim-hindent/,,
-https://github.com/alx741/vim-stylishask/,,
-https://github.com/amiorin/ctrlp-z/,,
-https://github.com/amrbashir/nvim-docs-view/,HEAD,
-https://github.com/andersevenrud/cmp-tmux/,,
-https://github.com/andersevenrud/nordic.nvim/,,
-https://github.com/andersevenrud/nvim_context_vt/,,
-https://github.com/AndreM222/copilot-lualine/,HEAD,
-https://github.com/andrep/vimacs/,,
-https://github.com/andreshazard/vim-logreview/,,
-https://github.com/andrewferrier/debugprint.nvim/,HEAD,
-https://github.com/andrewferrier/wrapping.nvim/,HEAD,
-https://github.com/AndrewRadev/bufferize.vim/,HEAD,
-https://github.com/AndrewRadev/sideways.vim/,,
-https://github.com/AndrewRadev/splitjoin.vim/,,
-https://github.com/AndrewRadev/switch.vim/,,
-https://github.com/AndrewRadev/tagalong.vim/,,
-https://github.com/andviro/flake8-vim/,,
-https://github.com/andweeb/presence.nvim/,,
-https://github.com/andymass/vim-matchup/,,
-https://github.com/andys8/vim-elm-syntax/,,
-https://github.com/andythigpen/nvim-coverage/,HEAD,
-https://github.com/antoinemadec/coc-fzf/,,
-https://github.com/antoinemadec/FixCursorHold.nvim/,,
-https://github.com/anuvyklack/animation.nvim/,HEAD,
-https://github.com/anuvyklack/fold-preview.nvim/,HEAD,
-https://github.com/anuvyklack/keymap-layer.nvim/,HEAD,
-https://github.com/anuvyklack/pretty-fold.nvim/,HEAD,
-https://github.com/anuvyklack/windows.nvim/,,
-https://github.com/ap/vim-css-color/,,
-https://github.com/APZelos/blamer.nvim/,HEAD,
-https://github.com/aquach/vim-mediawiki-editor/,HEAD,
-https://github.com/arkav/lualine-lsp-progress/,,
-https://github.com/arnamak/stay-centered.nvim/,HEAD,
-https://github.com/arthurxavierx/vim-unicoder/,,
-https://github.com/artur-shaik/vim-javacomplete2/,,
-https://github.com/aserowy/tmux.nvim/,HEAD,
-https://github.com/asheq/close-buffers.vim/,HEAD,
-https://github.com/asiryk/auto-hlsearch.nvim/,HEAD,
-https://github.com/aspeddro/cmp-pandoc.nvim/,HEAD,
-https://github.com/AstroNvim/astrotheme/,,
-https://github.com/autozimu/LanguageClient-neovim/,,
-https://github.com/avm99963/vim-jjdescription/,HEAD,
-https://github.com/axelf4/vim-strip-trailing-whitespace/,,
-https://github.com/axelvc/template-string.nvim/,HEAD,
-https://github.com/axieax/urlview.nvim/,,
-https://github.com/ayu-theme/ayu-vim/,,
-https://github.com/aznhe21/actions-preview.nvim/,,
-https://github.com/b0o/SchemaStore.nvim/,,
-https://github.com/b3nj5m1n/kommentary/,,
-https://github.com/backdround/improved-search.nvim/,HEAD,
-https://github.com/bakpakin/fennel.vim/,,
-https://github.com/barreiroleo/ltex_extra.nvim/,HEAD,
-https://github.com/bazelbuild/vim-bazel/,,
-https://github.com/bbchung/clighter8/,,
-https://github.com/Bekaboo/dropbar.nvim/,HEAD,
-https://github.com/BeneCollyridam/futhark-vim/,,
-https://github.com/benizi/vim-automkdir/,,
-https://github.com/benlubas/molten-nvim/,HEAD,
-https://github.com/bfredl/nvim-luadev/,HEAD,
-https://github.com/bhurlow/vim-parinfer/,,
-https://github.com/Bilal2453/luvit-meta/,HEAD,
-https://github.com/bitc/vim-hdevtools/,,
-https://github.com/bkad/camelcasemotion/,,
-https://github.com/blazkowolf/gruber-darker.nvim/,,
-https://github.com/bling/vim-bufferline/,,
-https://github.com/blueballs-theme/blueballs-neovim/,,
-https://github.com/blueyed/vim-diminactive/,,
-https://github.com/bluz71/vim-nightfly-colors/,,nightfly
-https://github.com/bogado/file-line/,,
-https://github.com/bohlender/vim-smt2/,,
-https://github.com/booperlv/nvim-gomove/,HEAD,
-https://github.com/brennanfee/vim-gui-position/,,
-https://github.com/brenoprata10/nvim-highlight-colors/,HEAD,
-https://github.com/bronson/vim-trailing-whitespace/,,
-https://github.com/bronson/vim-visual-star-search/,HEAD,
-https://github.com/brooth/far.vim/,,
-https://github.com/brymer-meneses/grammar-guard.nvim/,HEAD,
-https://github.com/bullets-vim/bullets.vim/,,
-https://github.com/buoto/gotests-vim/,,
-https://github.com/cakebaker/scss-syntax.vim/,,
-https://github.com/calops/hmts.nvim/,,
-https://github.com/camspiers/lens.vim/,,
-https://github.com/camspiers/snap/,,
-https://github.com/Canop/nvim-bacon/,HEAD,
-https://github.com/cappyzawa/trim.nvim/,,
-https://github.com/carlitux/deoplete-ternjs/,,
-https://github.com/catppuccin/nvim/,,catppuccin-nvim
-https://github.com/catppuccin/vim/,HEAD,catppuccin-vim
-https://github.com/cbochs/grapple.nvim/,HEAD,
-https://github.com/ccarpita/rtorrent-syntax-file/,,
-https://github.com/cespare/vim-toml/,,
-https://github.com/chaoren/vim-wordmotion/,,
-https://github.com/chentoast/marks.nvim/,,
-https://github.com/chikamichi/mediawiki.vim/,HEAD,
-https://github.com/chikatoike/concealedyank.vim/,,
-https://github.com/chikatoike/sourcemap.vim/,,
-https://github.com/chipsenkbeil/distant.nvim/,HEAD,
-https://github.com/chkno/vim-haskell-module-name/,,
-https://github.com/chomosuke/term-edit.nvim/,HEAD,
-https://github.com/chr4/nginx.vim/,,
-https://github.com/chr4/sslsecure.vim/,,
+https://github.com/euclidianAce/BetterLua.vim/,,
+https://github.com/vim-scripts/BufOnly.vim/,,
+https://github.com/jackMort/ChatGPT.nvim/,HEAD,
https://github.com/chrisbra/CheckAttach/,,
-https://github.com/chrisbra/csv.vim/,,
-https://github.com/chrisbra/NrrwRgn/,,
-https://github.com/chrisbra/Recover.vim/,,
-https://github.com/chrisbra/SudoEdit.vim/,,
-https://github.com/chrisbra/unicode.vim/,,
-https://github.com/chrisgeo/sparkup/,,
-https://github.com/chrisgrieser/cmp_yanky/,HEAD,
-https://github.com/chrisgrieser/nvim-genghis/,HEAD,
-https://github.com/chrisgrieser/nvim-rip-substitute/,,
-https://github.com/chrisgrieser/nvim-spider/,HEAD,
-https://github.com/chrisgrieser/nvim-various-textobjs/,HEAD,
-https://github.com/chriskempson/base16-vim/,,
-https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/,,
-https://github.com/christoomey/vim-sort-motion/,,
-https://github.com/christoomey/vim-tmux-navigator/,,
-https://github.com/ciaranm/inkpot/,,
-https://github.com/Civitasv/cmake-tools.nvim/,,
-https://github.com/ckarnell/antonys-macro-repeater/,,
-https://github.com/clojure-vim/vim-jack-in/,,
-https://github.com/cloudhead/neovim-fuzzy/,,
-https://github.com/coc-extensions/coc-svelte/,,
-https://github.com/cocopon/iceberg.vim/,,
-https://github.com/code-biscuits/nvim-biscuits/,HEAD,
-https://github.com/codethread/qmk.nvim/,HEAD,
-https://github.com/codota/tabnine-vim/,,
-https://github.com/cohama/lexima.vim/,,
-https://github.com/ConradIrwin/vim-bracketed-paste/,,
+https://github.com/vim-scripts/Colour-Sampler-Pack/,,
https://github.com/CopilotC-Nvim/CopilotChat.nvim/,HEAD,
-https://github.com/creativenull/efmls-configs-nvim/,,
-https://github.com/crispgm/cmp-beancount/,HEAD,
-https://github.com/crusoexia/vim-monokai/,,
-https://github.com/cshuaimin/ssr.nvim/,HEAD,
-https://github.com/ctjhoa/spacevim/,,
-https://github.com/ctrlpvim/ctrlp.vim/,,
-https://github.com/cxwx/specs.nvim/,HEAD,
-https://github.com/dag/vim-fish/,,
-https://github.com/dag/vim2hs/,,
-https://github.com/danielfalk/smart-open.nvim/,0.2.x,
-https://github.com/danilo-augusto/vim-afterglow/,HEAD,
-https://github.com/dannyob/quickfixstatus/,,
-https://github.com/danymat/neogen/,HEAD,
-https://github.com/Darazaki/indent-o-matic/,,
-https://github.com/darfink/starsearch.vim/,,
-https://github.com/dart-lang/dart-vim-plugin/,,
-https://github.com/dasupradyumna/midnight.nvim/,,
-https://github.com/david-a-wheeler/vim-metamath/,,
-https://github.com/David-Kunz/cmp-npm/,HEAD,
-https://github.com/David-Kunz/markid/,HEAD,
-https://github.com/davidgranstrom/scnvim/,HEAD,
-https://github.com/davidhalter/jedi-vim/,,
-https://github.com/davidsierradz/cmp-conventionalcommits/,HEAD,
-https://github.com/dcampos/cmp-snippy/,HEAD,
-https://github.com/dcampos/nvim-snippy/,HEAD,
-https://github.com/dcharbon/vim-flatbuffers/,,
-https://github.com/debugloop/telescope-undo.nvim/,HEAD,
-https://github.com/declancm/cinnamon.nvim/,HEAD,
-https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/,HEAD,
-https://github.com/delphinus/cmp-ctags/,HEAD,
-https://github.com/delroth/vim-molokai-delroth/,HEAD,
+https://github.com/whonore/Coqtail/,,
+https://github.com/vim-scripts/DoxygenToolkit.vim/,,
+https://github.com/numToStr/FTerm.nvim/,,
+https://github.com/antoinemadec/FixCursorHold.nvim/,,
+https://github.com/vim-scripts/Improved-AnsiEsc/,,
+https://github.com/ionide/Ionide-vim/,HEAD,
+https://github.com/martinda/Jenkinsfile-vim-syntax/,,
+https://github.com/autozimu/LanguageClient-neovim/,,
+https://github.com/vigoux/LanguageTool.nvim/,,
+https://github.com/LazyVim/LazyVim/,,
+https://github.com/Yggdroot/LeaderF/,,
+https://github.com/Valloric/MatchTagAlways/,,
+https://github.com/numToStr/Navigator.nvim/,,
+https://github.com/overcache/NeoSolarized/,,
+https://github.com/GCBallesteros/NotebookNavigator.nvim/,HEAD,
+https://github.com/chrisbra/NrrwRgn/,,
+https://github.com/vim-scripts/PreserveNoEOL/,,
+https://github.com/henriklovhaug/Preview.nvim/,HEAD,
+https://github.com/yssl/QFEnter/,,
+https://github.com/chrisbra/Recover.vim/,,
+https://github.com/vim-scripts/Rename/,,
+https://github.com/vim-scripts/ReplaceWithRegister/,,
+https://github.com/b0o/SchemaStore.nvim/,,
+https://github.com/sunjon/Shade.nvim/,,
+https://github.com/vim-scripts/ShowMultiBase/,,
+https://github.com/tmhedberg/SimpylFold/,,
+https://github.com/vim-scripts/SmartCase/,,
+https://github.com/jaredgorski/SpaceCamp/,,
+https://github.com/SpaceVim/SpaceVim/,,
+https://github.com/chrisbra/SudoEdit.vim/,,
+https://github.com/hsitz/VimOrganizer/,,
+https://github.com/VundleVim/Vundle.vim/,,
+https://github.com/esneider/YUNOcommit.vim/,,
+https://github.com/vim-scripts/YankRing.vim/,,
+https://github.com/ycm-core/YouCompleteMe/,,
+https://github.com/vim-scripts/a.vim/,,
+https://github.com/mileszs/ack.vim/,,
+https://github.com/eikenb/acp/,,
+https://github.com/aznhe21/actions-preview.nvim/,,
+https://github.com/aaronhallaert/advanced-git-search.nvim/,HEAD,
+https://github.com/Mofiqul/adwaita.nvim/,HEAD,
+https://github.com/stevearc/aerial.nvim/,,
+https://github.com/Numkil/ag.nvim/,,
+https://github.com/derekelkins/agda-vim/,,
+https://github.com/aduros/ai.vim/,HEAD,
+https://github.com/joshuavial/aider.nvim/,HEAD,
+https://github.com/slashmili/alchemist.vim/,,
https://github.com/dense-analysis/ale/,,
+https://github.com/vim-scripts/align/,,
+https://github.com/Vonr/align.nvim/,HEAD,
+https://github.com/goolord/alpha-nvim/,HEAD,
+https://github.com/anuvyklack/animation.nvim/,HEAD,
+https://github.com/Olical/aniseed/,,
+https://github.com/pearofducks/ansible-vim/,,
+https://github.com/ckarnell/antonys-macro-repeater/,,
+https://github.com/solarnz/arcanist.vim/,,
+https://github.com/vim-scripts/argtextobj.vim/,,
+https://github.com/otavioschwanck/arrow.nvim/,,
+https://github.com/AstroNvim/astrotheme/,,
+https://github.com/prabirshrestha/async.vim/,,
+https://github.com/prabirshrestha/asyncomplete-buffer.vim/,HEAD,
+https://github.com/prabirshrestha/asyncomplete-file.vim/,HEAD,
+https://github.com/prabirshrestha/asyncomplete-lsp.vim/,,
+https://github.com/prabirshrestha/asyncomplete-omni.vim/,HEAD,
+https://github.com/prabirshrestha/asyncomplete-tags.vim/,HEAD,
+https://github.com/prabirshrestha/asyncomplete-ultisnips.vim/,HEAD,
+https://github.com/prabirshrestha/asyncomplete.vim/,,
+https://github.com/skywind3000/asyncrun.vim/,,
+https://github.com/skywind3000/asynctasks.vim/,,
+https://github.com/vmchale/ats-vim/,,
+https://github.com/ray-x/aurora/,,
+https://github.com/hotwatermorning/auto-git-diff/,,
+https://github.com/asiryk/auto-hlsearch.nvim/,HEAD,
+https://github.com/jiangmiao/auto-pairs/,,
+https://github.com/okuuva/auto-save.nvim/,HEAD,
+https://github.com/rmagatti/auto-session/,,
+https://github.com/m4xshen/autoclose.nvim/,HEAD,
+https://github.com/gaoDean/autolist.nvim/,,
+https://github.com/vim-scripts/autoload_cscope.vim/,,
+https://github.com/nullishamy/autosave.nvim/,HEAD,
+https://github.com/rafi/awesome-vim-colorschemes/,,
+https://github.com/AhmedAbdulrahman/aylin.vim/,,
+https://github.com/ayu-theme/ayu-vim/,,
+https://github.com/taybart/b64.nvim/,HEAD,
+https://github.com/m00qek/baleia.nvim/,HEAD,
+https://github.com/ribru17/bamboo.nvim/,,
+https://github.com/romgrk/barbar.nvim/,,
+https://github.com/utilyre/barbecue.nvim/,,
+https://github.com/RRethy/base16-nvim/,,
+https://github.com/chriskempson/base16-vim/,,
+https://github.com/nvchad/base46/,HEAD,
+https://github.com/jamespwilliams/bat.vim/,HEAD,
+https://github.com/vim-scripts/bats.vim/,,
+https://github.com/rbgrouleff/bclose.vim/,,
+https://github.com/max397574/better-escape.nvim/,,
+https://github.com/LunarVim/bigfile.nvim/,,
+https://github.com/APZelos/blamer.nvim/,HEAD,
+https://github.com/HampusHauffman/block.nvim/,HEAD,
+https://github.com/blueballs-theme/blueballs-neovim/,,
+https://github.com/uloco/bluloco.nvim/,,
+https://github.com/rockerBOO/boo-colorscheme-nvim/,,
+https://github.com/nat-418/boole.nvim/,HEAD,
+https://github.com/turbio/bracey.vim/,,
+https://github.com/fruit-in/brainfuck-vim/,,
+https://github.com/famiu/bufdelete.nvim/,,
+https://github.com/jlanzarotta/bufexplorer/,,
+https://github.com/AndrewRadev/bufferize.vim/,HEAD,
+https://github.com/akinsho/bufferline.nvim/,,
+https://github.com/kwkarlwang/bufjump.nvim/,HEAD,
+https://github.com/bullets-vim/bullets.vim/,,
+https://github.com/mattn/calendar-vim/,,mattn-calendar-vim
+https://github.com/itchyny/calendar.vim/,,
+https://github.com/bkad/camelcasemotion/,,
+https://github.com/tyru/caw.vim/,,
+https://github.com/uga-rosa/ccc.nvim/,HEAD,
+https://github.com/Eandrju/cellular-automaton.nvim/,HEAD,
+https://github.com/ms-jpq/chadtree/,HEAD,
+https://github.com/vim-scripts/changeColorScheme.vim/,,
+https://github.com/sudormrfbin/cheatsheet.nvim/,,
+https://github.com/yunlingz/ci_dark/,,
+https://github.com/declancm/cinnamon.nvim/,HEAD,
+https://github.com/projekt0n/circles.nvim/,,
+https://github.com/zootedb0t/citruszest.nvim/,,
+https://github.com/xavierd/clang_complete/,,
+https://github.com/p00f/clangd_extensions.nvim/,HEAD,
+https://github.com/rhysd/clever-f.vim/,,
+https://github.com/bbchung/clighter8/,,
+https://github.com/ekickx/clipboard-image.nvim/,,
+https://github.com/laytan/cloak.nvim/,HEAD,
+https://github.com/asheq/close-buffers.vim/,HEAD,
+https://github.com/Civitasv/cmake-tools.nvim/,,
+https://github.com/winston0410/cmd-parser.nvim/,,
+https://github.com/tzachar/cmp-ai/,HEAD,
+https://codeberg.org/FelipeLema/cmp-async-path/,,
+https://github.com/crispgm/cmp-beancount/,HEAD,
+https://github.com/hrsh7th/cmp-buffer/,,
+https://github.com/hrsh7th/cmp-calc/,,
+https://github.com/vappolinario/cmp-clippy/,HEAD,
+https://github.com/hrsh7th/cmp-cmdline/,,
+https://github.com/dmitmel/cmp-cmdline-history/,HEAD,
+https://github.com/PaterJason/cmp-conjure/,,
+https://github.com/davidsierradz/cmp-conventionalcommits/,HEAD,
+https://github.com/hrsh7th/cmp-copilot/,HEAD,
+https://github.com/delphinus/cmp-ctags/,HEAD,
+https://github.com/rcarriga/cmp-dap/,HEAD,
+https://github.com/uga-rosa/cmp-dictionary/,HEAD,
+https://github.com/dmitmel/cmp-digraphs/,HEAD,
+https://github.com/hrsh7th/cmp-emoji/,,
+https://github.com/mtoohey31/cmp-fish/,HEAD,
+https://github.com/tzachar/cmp-fuzzy-buffer/,HEAD,
+https://github.com/tzachar/cmp-fuzzy-path/,HEAD,
+https://github.com/petertriho/cmp-git/,HEAD,
+https://github.com/max397574/cmp-greek/,HEAD,
+https://github.com/kdheepak/cmp-latex-symbols/,,
+https://github.com/octaltree/cmp-look/,HEAD,
+https://github.com/notomo/cmp-neosnippet/,HEAD,
+https://github.com/GaetanLepage/cmp-nixpkgs-maintainers/,HEAD,
+https://github.com/David-Kunz/cmp-npm/,HEAD,
+https://github.com/hrsh7th/cmp-nvim-lsp/,,
+https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/,,
+https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/,HEAD,
+https://github.com/hrsh7th/cmp-nvim-lua/,,
+https://github.com/quangnguyen30192/cmp-nvim-tags/,HEAD,
+https://github.com/quangnguyen30192/cmp-nvim-ultisnips/,,
+https://github.com/hrsh7th/cmp-omni/,,
+https://github.com/jc-doyle/cmp-pandoc-references/,,
+https://github.com/aspeddro/cmp-pandoc.nvim/,HEAD,
+https://github.com/hrsh7th/cmp-path/,,
+https://github.com/lukas-reineke/cmp-rg/,HEAD,
+https://github.com/dcampos/cmp-snippy/,HEAD,
+https://github.com/f3fora/cmp-spell/,,
+https://github.com/nzlov/cmp-tabby/,HEAD,
+https://github.com/tzachar/cmp-tabnine/,,
+https://github.com/andersevenrud/cmp-tmux/,,
+https://github.com/ray-x/cmp-treesitter/,,
+https://github.com/lukas-reineke/cmp-under-comparator/,,
+https://github.com/dmitmel/cmp-vim-lsp/,HEAD,
+https://github.com/pontusk/cmp-vimwiki-tags/,HEAD,
+https://github.com/hrsh7th/cmp-vsnip/,,
+https://github.com/tamago324/cmp-zsh/,HEAD,
+https://github.com/saadparwaiz1/cmp_luasnip/,,
+https://github.com/chrisgrieser/cmp_yanky/,HEAD,
+https://github.com/lalitmee/cobalt2.nvim/,,
+https://github.com/vn-ki/coc-clap/,,
+https://github.com/neoclide/coc-denite/,,
+https://github.com/antoinemadec/coc-fzf/,,
+https://github.com/josa42/coc-lua/,,
+https://github.com/neoclide/coc-neco/,,
+https://github.com/coc-extensions/coc-svelte/,,
+https://github.com/iamcco/coc-tailwindcss/,,
+https://github.com/neoclide/coc.nvim/,release,
+https://github.com/manicmaniac/coconut.vim/,HEAD,
+https://github.com/Exafunction/codeium.nvim/,HEAD,
+https://github.com/Exafunction/codeium.vim/,HEAD,
+https://github.com/mistricky/codesnap.nvim/,HEAD,
+https://github.com/gorbit99/codewindow.nvim/,HEAD,
+https://github.com/metakirby5/codi.vim/,,
+https://github.com/tjdevries/colorbuddy.nvim/,,
+https://github.com/lilydjwg/colorizer/,,
+https://github.com/Domeee/com.cloudedmountain.ide.neovim/,HEAD,
+https://github.com/wincent/command-t/,,
+https://github.com/LudoPinelli/comment-box.nvim/,HEAD,
+https://github.com/numtostr/comment.nvim/,,
+https://github.com/rhysd/committia.vim/,,
+https://github.com/hrsh7th/compe-conjure/,,
+https://github.com/GoldsteinE/compe-latex-symbols/,,
+https://github.com/tzachar/compe-tabnine/,,
+https://github.com/tamago324/compe-zsh/,,
+https://github.com/xeluxee/competitest.nvim/,HEAD,
+https://github.com/krady21/compiler-explorer.nvim/,HEAD,
+https://github.com/Zeioth/compiler.nvim/,HEAD,
+https://github.com/steelsojka/completion-buffers/,,
+https://github.com/nvim-lua/completion-nvim/,,
+https://github.com/aca/completion-tabnine/,,
+https://github.com/nvim-treesitter/completion-treesitter/,,
+https://github.com/chikatoike/concealedyank.vim/,,
+https://github.com/rhysd/conflict-marker.vim/,,
+https://github.com/stevearc/conform.nvim/,HEAD,
+https://github.com/Olical/conjure/,,
+https://github.com/wellle/context.vim/,,
+https://github.com/Shougo/context_filetype.vim/,,
+https://github.com/zbirenbaum/copilot-cmp/,HEAD,
+https://github.com/AndreM222/copilot-lualine/,HEAD,
+https://github.com/zbirenbaum/copilot.lua/,HEAD,
+https://github.com/github/copilot.vim/,,
+https://github.com/ms-jpq/coq.artifacts/,HEAD,
+https://github.com/ms-jpq/coq.thirdparty/,HEAD,
+https://github.com/jvoorhis/coq.vim/,,
+https://github.com/ms-jpq/coq_nvim/,,
+https://github.com/isovector/cornelis/,HEAD,
+https://github.com/lfilho/cosco.vim/,,
+https://github.com/nixprime/cpsm/,,
+https://github.com/saecki/crates.nvim/,,
+https://github.com/godlygeek/csapprox/,,
+https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/,HEAD,
+https://github.com/chrisbra/csv.vim/,,
+https://github.com/JazzCore/ctrlp-cmatcher/,,
+https://github.com/FelikZ/ctrlp-py-matcher/,,
+https://github.com/amiorin/ctrlp-z/,,
+https://github.com/ctrlpvim/ctrlp.vim/,,
+https://github.com/scottmckendry/cyberdream.nvim/,,
+https://github.com/ptdewey/darkearth-nvim/,HEAD,
+https://github.com/dart-lang/dart-vim-plugin/,,
+https://github.com/rizzatti/dash.vim/,HEAD,
+https://github.com/nvimdev/dashboard-nvim/,,
+https://github.com/Shougo/ddc-filter-matcher_head/,HEAD,
+https://github.com/Shougo/ddc-filter-sorter_rank/,HEAD,
+https://github.com/Shougo/ddc-source-lsp/,HEAD,
+https://github.com/Shougo/ddc-ui-native/,HEAD,
+https://github.com/Shougo/ddc-ui-pum/,HEAD,
+https://github.com/Shougo/ddc.vim/,HEAD,
+https://github.com/andrewferrier/debugprint.nvim/,HEAD,
+https://github.com/Verf/deepwhite.nvim/,,
+https://github.com/kristijanhusak/defx-git/,,
+https://github.com/kristijanhusak/defx-icons/,,
+https://github.com/Shougo/defx.nvim/,,
+https://github.com/Raimondi/delimitMate/,,
+https://github.com/neoclide/denite-extra/,,
+https://github.com/neoclide/denite-git/,,
+https://github.com/Shougo/denite.nvim/,,
+https://github.com/vim-denops/denops.vim/,HEAD,
+https://github.com/Shougo/deol.nvim/,,
https://github.com/deoplete-plugins/deoplete-clang/,,
https://github.com/deoplete-plugins/deoplete-dictionary/,,
+https://github.com/ponko2/deoplete-fish/,,
+https://github.com/SevereOverfl0w/deoplete-github/,,
https://github.com/deoplete-plugins/deoplete-go/,,
+https://github.com/Inazuma110/deoplete-greek/,,
https://github.com/deoplete-plugins/deoplete-jedi/,,
+https://github.com/JuliaEditorSupport/deoplete-julia/,,
+https://github.com/nicoe/deoplete-khard/,,
https://github.com/deoplete-plugins/deoplete-lsp/,,
+https://github.com/Valodim/deoplete-notmuch/,,
+https://github.com/kristijanhusak/deoplete-phpactor/,,
+https://github.com/sebastianmarkow/deoplete-rust/,,
+https://github.com/tbodt/deoplete-tabnine/,,
+https://github.com/carlitux/deoplete-ternjs/,,
+https://github.com/lighttiger2505/deoplete-vim-lsp/,,
https://github.com/deoplete-plugins/deoplete-zsh/,,
-https://github.com/derekelkins/agda-vim/,,
-https://github.com/derekwyatt/vim-scala/,,
-https://github.com/dhruvasagar/vim-prosession/,,
-https://github.com/dhruvasagar/vim-table-mode/,,
-https://github.com/digitaltoad/vim-pug/,,
-https://github.com/DingDean/wgsl.vim/,HEAD,
+https://github.com/Shougo/deoplete.nvim/,,
+https://github.com/rhysd/devdocs.vim/,,
+https://github.com/vmchale/dhall-vim/,,
+https://github.com/onsails/diaglist.nvim/,,
+https://github.com/nvim-lua/diagnostic-nvim/,,
+https://github.com/3rd/diagram.nvim/,HEAD,
+https://github.com/monaqa/dial.nvim/,HEAD,
+https://github.com/sindrets/diffview.nvim/,,
+https://github.com/elihunter173/dirbuf.nvim/,HEAD,
https://github.com/direnv/direnv.vim/,,
-https://github.com/dleonard0/pony-vim-syntax/,,
-https://github.com/dmitmel/cmp-cmdline-history/,HEAD,
-https://github.com/dmitmel/cmp-digraphs/,HEAD,
-https://github.com/dmitmel/cmp-vim-lsp/,HEAD,
-https://github.com/dmix/elvish.vim/,,
-https://github.com/DNLHC/glance.nvim/,HEAD,
+https://github.com/chipsenkbeil/distant.nvim/,HEAD,
https://github.com/doki-theme/doki-theme-vim/,,
-https://github.com/Domeee/com.cloudedmountain.ide.neovim/,HEAD,
-https://github.com/dominikduda/vim_current_word/,,
-https://github.com/dpelle/vim-LanguageTool/,,
-https://github.com/dracula/vim/,,dracula-vim
-https://github.com/drewtempelmeyer/palenight.vim/,,
-https://github.com/drmingdrmer/xptemplate/,,
-https://github.com/dstein64/nvim-scrollview/,,
-https://github.com/dstein64/vim-startuptime/,,
-https://github.com/dundalek/lazy-lsp.nvim/,HEAD,
-https://github.com/dundalek/parpar.nvim/,,
-https://github.com/dylanaraps/wal.vim/,,
-https://github.com/eagletmt/ghcmod-vim/,,
-https://github.com/eagletmt/neco-ghc/,,
-https://github.com/Eandrju/cellular-automaton.nvim/,HEAD,
+https://github.com/NTBBloodbath/doom-one.nvim/,,
+https://github.com/Mofiqul/dracula.nvim/,HEAD,
+https://github.com/stevearc/dressing.nvim/,,
+https://github.com/Bekaboo/dropbar.nvim/,HEAD,
https://github.com/earthly/earthly.vim/,HEAD,
-https://github.com/easymotion/vim-easymotion/,,
+https://github.com/Shougo/echodoc.vim/,,
+https://github.com/sainnhe/edge/,,
+https://github.com/edgedb/edgedb-vim/,,
+https://github.com/folke/edgy.nvim/,HEAD,
+https://github.com/editorconfig/editorconfig-vim/,,
+https://github.com/gpanders/editorconfig.nvim/,,
+https://github.com/creativenull/efmls-configs-nvim/,,
+https://github.com/elixir-tools/elixir-tools.nvim/,HEAD,
+https://github.com/elmcast/elm-vim/,,
+https://github.com/dmix/elvish.vim/,,
+https://github.com/mattn/emmet-vim/,,
+https://github.com/vim-scripts/emodeline/,,
+https://github.com/vim-scripts/errormarker.vim/,,
+https://github.com/hachy/eva01.vim/,,
+https://github.com/sainnhe/everforest/,,
+https://github.com/google/executor.nvim/,HEAD,
+https://github.com/jinh0/eyeliner.nvim/,HEAD,
+https://github.com/fenetikm/falcon/,,
+https://github.com/brooth/far.vim/,,
+https://github.com/pteroctopus/faster.nvim/,HEAD,
+https://github.com/konfekt/fastfold/,,
+https://github.com/lilydjwg/fcitx.vim/,fcitx5,
+https://github.com/freddiehaddad/feline.nvim/,,
+https://github.com/bakpakin/fennel.vim/,,
+https://github.com/wincent/ferret/,,
+https://github.com/j-hui/fidget.nvim/,,
+https://github.com/bogado/file-line/,,
+https://github.com/lewis6991/fileline.nvim/,,
+https://github.com/glacambre/firenvim/,HEAD,
+https://github.com/andviro/flake8-vim/,,
+https://github.com/folke/flash.nvim/,HEAD,
+https://github.com/willothy/flatten.nvim/,HEAD,
+https://github.com/felipeagc/fleet-theme-nvim/,,
+https://github.com/ggandor/flit.nvim/,HEAD,
+https://github.com/ncm2/float-preview.nvim/,,
+https://github.com/liangxianzhe/floating-input.nvim/,HEAD,
+https://github.com/fhill2/floating.nvim/,,
+https://github.com/floobits/floobits-neovim/,,
+https://github.com/akinsho/flutter-tools.nvim/,HEAD,
+https://github.com/nvim-focus/focus.nvim/,HEAD,
+https://github.com/anuvyklack/fold-preview.nvim/,HEAD,
+https://github.com/mhartington/formatter.nvim/,,
+https://github.com/megaannum/forms/,,
+https://github.com/rubiin/fortune.nvim/,HEAD,
+https://github.com/rafamadriz/friendly-snippets/,,
+https://github.com/raghur/fruzzy/,,
+https://github.com/shumphrey/fugitive-gitlab.vim/,,
+https://github.com/BeneCollyridam/futhark-vim/,,
+https://github.com/tzachar/fuzzy.nvim/,HEAD,
+https://github.com/rktjmp/fwatch.nvim/,,
+https://github.com/stsewd/fzf-checkout.vim/,,
+https://github.com/monkoose/fzf-hoogle.vim/,HEAD,
+https://github.com/gfanto/fzf-lsp.nvim/,,
+https://github.com/ibhagwan/fzf-lua/,HEAD,
+https://github.com/junegunn/fzf.vim/,,
+https://github.com/NTBBloodbath/galaxyline.nvim/,,
+https://github.com/jsfaint/gen_tags.vim/,,
+https://github.com/gentoo/gentoo-syntax/,,
+https://github.com/ndmitchell/ghcid/,,
+https://github.com/eagletmt/ghcmod-vim/,,
+https://github.com/f-person/git-blame.nvim/,,
+https://github.com/akinsho/git-conflict.nvim/,HEAD,
+https://github.com/rhysd/git-messenger.vim/,,
+https://github.com/mikesmithgh/git-prompt-string-lualine.nvim/,HEAD,
+https://github.com/ThePrimeagen/git-worktree.nvim/,,
+https://github.com/wintermute-cell/gitignore.nvim/,HEAD,
+https://github.com/vim-scripts/gitignore.vim/,,
+https://github.com/ruifm/gitlinker.nvim/,,
+https://github.com/lewis6991/gitsigns.nvim/,,
+https://github.com/gregsexton/gitv/,,
+https://github.com/DNLHC/glance.nvim/,HEAD,
+https://github.com/gleam-lang/gleam.vim/,,
+https://github.com/ellisonleao/glow.nvim/,,
+https://github.com/ray-x/go.nvim/,HEAD,
+https://github.com/p00f/godbolt.nvim/,HEAD,
+https://github.com/roman/golden-ratio/,,
+https://github.com/buoto/gotests-vim/,,
+https://github.com/rmagatti/goto-preview/,,
+https://github.com/junegunn/goyo.vim/,,
+https://github.com/brymer-meneses/grammar-guard.nvim/,HEAD,
+https://github.com/liuchengxu/graphviz.vim/,,
+https://github.com/cbochs/grapple.nvim/,HEAD,
+https://github.com/blazkowolf/gruber-darker.nvim/,,
+https://github.com/MagicDuck/grug-far.nvim/,,
+https://github.com/gruvbox-community/gruvbox/,,gruvbox-community
+https://github.com/morhetz/gruvbox/,,
+https://github.com/luisiacc/gruvbox-baby/,HEAD,
+https://github.com/eddyekofo94/gruvbox-flat.nvim/,,
+https://github.com/sainnhe/gruvbox-material/,,
+https://github.com/f4z3r/gruvbox-material.nvim/,HEAD,
+https://github.com/ellisonleao/gruvbox.nvim/,,
+https://github.com/nvimdev/guard-collection/,HEAD,
+https://github.com/nvimdev/guard.nvim/,HEAD,
+https://github.com/nmac427/guess-indent.nvim/,HEAD,
+https://github.com/sjl/gundo.vim/,,
+https://github.com/junegunn/gv.vim/,,
+https://github.com/TheSnakeWitcher/hardhat.nvim/,HEAD,
+https://github.com/m4xshen/hardtime.nvim/,HEAD,
+https://git.sr.ht/~sircmpwn/hare.vim,HEAD,
+https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2
+https://github.com/ThePrimeagen/harpoon/,master,
+https://github.com/kiyoon/haskell-scope-highlighting.nvim/,HEAD,
+https://github.com/mrcjkb/haskell-snippets.nvim/,HEAD,
+https://github.com/neovimhaskell/haskell-vim/,,
+https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD,
+https://github.com/travitch/hasksyn/,,
+https://github.com/lukas-reineke/headlines.nvim/,HEAD,
+https://github.com/rebelot/heirline.nvim/,,
+https://github.com/OXY2DEV/helpview.nvim/,HEAD,
+https://github.com/RaafatTurki/hex.nvim/,HEAD,
+https://github.com/Yggdroot/hiPairs/,,
+https://github.com/tzachar/highlight-undo.nvim/,HEAD,
+https://github.com/pimalaya/himalaya-vim/,,
+https://github.com/mpickering/hlint-refactor-vim/,,
+https://github.com/calops/hmts.nvim/,,
+https://github.com/edluffy/hologram.nvim/,,
+https://github.com/urbit/hoon.vim/,,
+https://github.com/smoka7/hop.nvim/,,
+https://github.com/rktjmp/hotpot.nvim/,,
+https://github.com/lewis6991/hover.nvim/,HEAD,
+https://github.com/othree/html5.vim/,HEAD,
+https://github.com/julienvincent/hunk.nvim/,HEAD,
+https://github.com/nvimtools/hydra.nvim/,HEAD,
+https://github.com/mboughaba/i3config.vim/,,
+https://github.com/cocopon/iceberg.vim/,,
+https://github.com/idris-hackers/idris-vim/,,
+https://github.com/ShinKage/idris2-nvim/,,
+https://github.com/edwinb/idris2-vim/,,
+https://github.com/3rd/image.nvim/,HEAD,
+https://github.com/samodostal/image.nvim/,HEAD,samodostal-image-nvim
+https://github.com/HakonHarnes/img-clip.nvim/,HEAD,
+https://github.com/lewis6991/impatient.nvim/,,
+https://github.com/backdround/improved-search.nvim/,HEAD,
+https://github.com/smjonas/inc-rename.nvim/,HEAD,
+https://github.com/nishigori/increment-activator/,,
+https://github.com/haya14busa/incsearch-easymotion.vim/,,
+https://github.com/haya14busa/incsearch.vim/,,
+https://github.com/lukas-reineke/indent-blankline.nvim/,,
+https://github.com/Darazaki/indent-o-matic/,,
+https://github.com/Yggdroot/indentLine/,,
+https://github.com/ciaranm/inkpot/,,
+https://github.com/jbyuki/instant.nvim/,HEAD,
+https://github.com/pta2002/intellitab.nvim/,HEAD,
+https://github.com/parsonsmatt/intero-neovim/,,
+https://github.com/keith/investigate.vim/,,
+https://github.com/neutaaaaan/iosvkem/,,
+https://github.com/twerth/ir_black/,,
+https://github.com/Vigemus/iron.nvim/,HEAD,
+https://github.com/haya14busa/is.vim/,,
+https://github.com/vim-scripts/jdaddy.vim/,,
+https://github.com/davidhalter/jedi-vim/,,
+https://github.com/metalelf0/jellybeans-nvim/,,
+https://github.com/nanotech/jellybeans.vim/,,
+https://github.com/HiPhish/jinja.vim/,HEAD,
+https://github.com/vito-c/jq.vim/,,
+https://github.com/neoclide/jsonc.vim/,,
+https://github.com/Myzel394/jsonfly.nvim/,HEAD,
+https://github.com/JuliaEditorSupport/julia-vim/,,
+https://github.com/GCBallesteros/jupytext.nvim/,HEAD,
+https://github.com/rebelot/kanagawa.nvim/,,
+https://github.com/imsnif/kdl.vim/,HEAD,
+https://github.com/anuvyklack/keymap-layer.nvim/,HEAD,
+https://github.com/kmonad/kmonad-vim/,,
+https://github.com/frabjous/knap/,HEAD,
+https://github.com/b3nj5m1n/kommentary/,,
+https://github.com/udalov/kotlin-vim/,,
+https://github.com/mistweaverco/kulala.nvim/,HEAD,
+https://github.com/qnighy/lalrpop.vim/,,
+https://github.com/Wansmer/langmapper.nvim/,HEAD,
+https://github.com/sk1418/last256/,,
+https://github.com/latex-box-team/latex-box/,,
+https://github.com/dundalek/lazy-lsp.nvim/,HEAD,
+https://github.com/folke/lazy.nvim/,HEAD,
+https://github.com/folke/lazydev.nvim/,,
+https://github.com/kdheepak/lazygit.nvim/,,
+https://github.com/Julian/lean.nvim/,,
+https://github.com/leanprover/lean.vim/,,
+https://github.com/ggandor/leap-ast.nvim/,HEAD,
+https://github.com/ggandor/leap.nvim/,HEAD,
+https://github.com/kawre/leetcode.nvim/,HEAD,
+https://github.com/mrjones2014/legendary.nvim/,HEAD,
+https://github.com/camspiers/lens.vim/,,
+https://github.com/thirtythreeforty/lessspace.vim/,,
+https://github.com/cohama/lexima.vim/,,
+https://github.com/ptzz/lf.vim/,,
+https://github.com/LucHermitte/lh-brackets/,,
+https://github.com/LucHermitte/lh-vim-lib/,,
+https://github.com/maximbaz/lightline-ale/,,
+https://github.com/mengelbrecht/lightline-bufferline/,,
+https://github.com/shinchu/lightline-gruvbox.vim/,,
+https://github.com/spywhere/lightline-lsp/,,
+https://github.com/itchyny/lightline.vim/,,
+https://github.com/ggandor/lightspeed.nvim/,,
+https://github.com/junegunn/limelight.vim/,,
+https://github.com/lf-lang/lingua-franca.vim/,,
+https://github.com/tamago324/lir.nvim/,,
+https://github.com/kkharji/lispdocs.nvim/,,
+https://github.com/ldelossa/litee-calltree.nvim/,,
+https://github.com/ldelossa/litee-filetree.nvim/,,
+https://github.com/ldelossa/litee-symboltree.nvim/,,
+https://github.com/ldelossa/litee.nvim/,,
+https://github.com/smjonas/live-command.nvim/,HEAD,
+https://github.com/huggingface/llm.nvim/,HEAD,
+https://github.com/folke/lsp-colors.nvim/,,
+https://github.com/lukas-reineke/lsp-format.nvim/,HEAD,
+https://github.com/lvimuser/lsp-inlayhints.nvim/,HEAD,
+https://github.com/Issafalcon/lsp-overloads.nvim/,main,
+https://github.com/ahmedkhalf/lsp-rooter.nvim/,,
+https://github.com/nvim-lua/lsp-status.nvim/,,
+https://github.com/VonHeikemen/lsp-zero.nvim/,v3.x,
+https://github.com/nvim-lua/lsp_extensions.nvim/,,
+https://git.sr.ht/~whynothugo/lsp_lines.nvim,,
+https://github.com/ray-x/lsp_signature.nvim/,,
+https://github.com/lspcontainers/lspcontainers.nvim/,,
+https://github.com/onsails/lspkind.nvim/,,
+https://github.com/nvimdev/lspsaga.nvim/,,
+https://github.com/barreiroleo/ltex_extra.nvim/,HEAD,
+https://github.com/arkav/lualine-lsp-progress/,,
+https://github.com/nvim-lualine/lualine.nvim/,,
+https://github.com/l3mon4d3/luasnip/,,
+https://github.com/alvarosevilla95/luatab.nvim/,,
+https://github.com/rktjmp/lush.nvim/,,
+https://github.com/mkasa/lushtags/,,
+https://github.com/Bilal2453/luvit-meta/,HEAD,
+https://github.com/dccsillag/magma-nvim/,HEAD,
+https://github.com/winston0410/mark-radar.nvim/,HEAD,
+https://github.com/iamcco/markdown-preview.nvim/,,
+https://github.com/tadmccorkle/markdown.nvim/,HEAD,
+https://github.com/David-Kunz/markid/,HEAD,
+https://github.com/chentoast/marks.nvim/,,
+https://github.com/OXY2DEV/markview.nvim/,HEAD,
+https://github.com/williamboman/mason-lspconfig.nvim/,HEAD,
+https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/,HEAD,
+https://github.com/williamboman/mason.nvim/,HEAD,
+https://github.com/vim-scripts/matchit.zip/,,
+https://github.com/marko-cerovac/material.nvim/,,
+https://github.com/kaicataldo/material.vim/,HEAD,
+https://github.com/vim-scripts/mayansmoke/,,
+https://github.com/chikamichi/mediawiki.vim/,HEAD,
+https://github.com/savq/melange-nvim/,,
+https://github.com/lsig/messenger.nvim/,HEAD,
+https://github.com/xero/miasma.nvim/,,
+https://github.com/dasupradyumna/midnight.nvim/,,
+https://github.com/hadronized/mind.nvim/,HEAD,
https://github.com/echasnovski/mini-git/,HEAD,
https://github.com/echasnovski/mini.ai/,HEAD,
https://github.com/echasnovski/mini.align/,HEAD,
@@ -275,476 +587,504 @@ https://github.com/echasnovski/mini.tabline/,HEAD,
https://github.com/echasnovski/mini.test/,HEAD,
https://github.com/echasnovski/mini.trailspace/,HEAD,
https://github.com/echasnovski/mini.visits/,HEAD,
-https://github.com/eddiebergman/nvim-treesitter-pyfold/,,
-https://github.com/eddyekofo94/gruvbox-flat.nvim/,,
-https://github.com/EdenEast/nightfox.nvim/,,
-https://github.com/edgedb/edgedb-vim/,,
-https://github.com/editorconfig/editorconfig-vim/,,
-https://github.com/edkolev/tmuxline.vim/,,
-https://github.com/edluffy/hologram.nvim/,,
-https://github.com/edwinb/idris2-vim/,,
-https://github.com/ehamberg/vim-cute-python/,,
-https://github.com/eigenfoo/stan-vim/,,
-https://github.com/eikenb/acp/,,
-https://github.com/ekickx/clipboard-image.nvim/,,
-https://github.com/elihunter173/dirbuf.nvim/,HEAD,
-https://github.com/elixir-editors/vim-elixir/,,
-https://github.com/elixir-tools/elixir-tools.nvim/,HEAD,
-https://github.com/elkowar/yuck.vim/,HEAD,
-https://github.com/ellisonleao/glow.nvim/,,
-https://github.com/ellisonleao/gruvbox.nvim/,,
-https://github.com/elmcast/elm-vim/,,
-https://github.com/elzr/vim-json/,,
-https://github.com/embark-theme/vim/,,embark-vim
-https://github.com/embear/vim-localvimrc/,,
-https://github.com/enomsg/vim-haskellConcealPlus/,,
-https://github.com/enricobacis/vim-airline-clock/,,
-https://github.com/epwalsh/obsidian.nvim/,HEAD,
-https://github.com/erietz/vim-terminator/,HEAD,
-https://github.com/ervandew/supertab/,,
-https://github.com/esneider/YUNOcommit.vim/,,
-https://github.com/ethanholz/nvim-lastplace/,HEAD,
-https://github.com/euclidianAce/BetterLua.vim/,,
-https://github.com/euclio/vim-markdown-composer/,,
-https://github.com/evanleck/vim-svelte/,,
-https://github.com/ewilazarus/preto/,HEAD,
-https://github.com/Exafunction/codeium.nvim/,HEAD,
-https://github.com/Exafunction/codeium.vim/,HEAD,
-https://github.com/f-person/git-blame.nvim/,,
-https://github.com/f3fora/cmp-spell/,,
-https://github.com/f4z3r/gruvbox-material.nvim/,HEAD,
-https://github.com/fadein/vim-figlet/,HEAD,
-https://github.com/famiu/bufdelete.nvim/,,
-https://github.com/fannheyward/telescope-coc.nvim/,,
-https://github.com/farmergreg/vim-lastplace/,,
-https://github.com/fatih/vim-go/,,
-https://github.com/fcpg/vim-osc52/,,
-https://github.com/FelikZ/ctrlp-py-matcher/,,
-https://github.com/felipeagc/fleet-theme-nvim/,,
-https://github.com/fenetikm/falcon/,,
-https://github.com/fgheng/winbar.nvim/,main,
-https://github.com/fhill2/floating.nvim/,,
-https://github.com/fhill2/telescope-ultisnips.nvim/,,
-https://github.com/fiatjaf/neuron.vim/,,
-https://github.com/figsoda/nix-develop.nvim/,HEAD,
-https://github.com/filipdutescu/renamer.nvim/,,
-https://github.com/fisadev/vim-isort/,,
-https://github.com/flazz/vim-colorschemes/,,
-https://github.com/floobits/floobits-neovim/,,
-https://github.com/folke/edgy.nvim/,HEAD,
-https://github.com/folke/flash.nvim/,HEAD,
-https://github.com/folke/lazy.nvim/,HEAD,
-https://github.com/folke/lazydev.nvim/,,
-https://github.com/folke/lsp-colors.nvim/,,
+https://github.com/wfxr/minimap.vim/,,
+https://github.com/jghauser/mkdir.nvim/,main,
+https://github.com/jakewvincent/mkdnflow.nvim/,HEAD,
+https://github.com/SidOfc/mkdx/,,
+https://github.com/mawkler/modicator.nvim/,HEAD,
+https://github.com/miikanissi/modus-themes.nvim/,HEAD,
+https://github.com/tomasr/molokai/,,
+https://github.com/benlubas/molten-nvim/,HEAD,
+https://github.com/loctvl842/monokai-pro.nvim/,HEAD,
+https://github.com/shaunsingh/moonlight.nvim/,,pure-lua
+https://github.com/leafo/moonscript-vim/,HEAD,
+https://github.com/yegappan/mru/,,
+https://github.com/smoka7/multicursors.nvim/,HEAD,
+https://github.com/jbyuki/nabla.nvim/,HEAD,
+https://github.com/ncm2/ncm2/,,
+https://github.com/ncm2/ncm2-bufword/,,
+https://github.com/ncm2/ncm2-cssomni/,,
+https://github.com/yuki-yano/ncm2-dictionary/,,
+https://github.com/ncm2/ncm2-github/,,
+https://github.com/ncm2/ncm2-html-subscope/,,
+https://github.com/ncm2/ncm2-jedi/,,
+https://github.com/ncm2/ncm2-markdown-subscope/,,
+https://github.com/ncm2/ncm2-neoinclude/,,
+https://github.com/ncm2/ncm2-neosnippet/,,
+https://github.com/ncm2/ncm2-path/,,
+https://github.com/ncm2/ncm2-syntax/,,
+https://github.com/ncm2/ncm2-tagprefix/,,
+https://github.com/ncm2/ncm2-tmux/,,
+https://github.com/ncm2/ncm2-ultisnips/,,
+https://github.com/ncm2/ncm2-vim/,,
+https://github.com/eagletmt/neco-ghc/,,
+https://github.com/ujihisa/neco-look/,,
+https://github.com/Shougo/neco-syntax/,,
+https://github.com/Shougo/neco-vim/,,
+https://github.com/nvim-neo-tree/neo-tree.nvim/,HEAD,
+https://github.com/Shougo/neocomplete.vim/,,
https://github.com/folke/neoconf.nvim/,HEAD,
+https://github.com/IogaMaster/neocord/,main,
+https://github.com/KeitaNakamura/neodark.vim/,,
https://github.com/folke/neodev.nvim/,HEAD,
-https://github.com/folke/noice.nvim/,HEAD,
-https://github.com/folke/persistence.nvim/,,
-https://github.com/folke/styler.nvim/,,
-https://github.com/folke/todo-comments.nvim/,,
-https://github.com/folke/tokyonight.nvim/,,
-https://github.com/folke/trouble.nvim/,,
-https://github.com/folke/ts-comments.nvim/,HEAD,
-https://github.com/folke/twilight.nvim/,,
-https://github.com/folke/which-key.nvim/,,
-https://github.com/folke/zen-mode.nvim/,,
-https://github.com/FooSoft/vim-argwrap/,,
-https://github.com/frabjous/knap/,HEAD,
-https://github.com/freddiehaddad/feline.nvim/,,
-https://github.com/fredrikaverpil/neotest-golang/,HEAD,
-https://github.com/freitass/todo.txt-vim/,,
-https://github.com/frigoeu/psc-ide-vim/,,
-https://github.com/fruit-in/brainfuck-vim/,,
-https://github.com/fruit-in/vim-nong-theme/,,
-https://github.com/fsharp/zarchive-vim-fsharp/,,
-https://github.com/gabrielpoca/replacer.nvim/,HEAD,
-https://github.com/GaetanLepage/cmp-nixpkgs-maintainers/,HEAD,
-https://github.com/gaoDean/autolist.nvim/,,
-https://github.com/garbas/vim-snipmate/,,
-https://github.com/garymjr/nvim-snippets/,,
-https://github.com/gbprod/nord.nvim/,,gbprod-nord
-https://github.com/gbprod/substitute.nvim/,HEAD,
-https://github.com/gbprod/yanky.nvim/,HEAD,
-https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/,,
-https://github.com/GCBallesteros/jupytext.nvim/,HEAD,
-https://github.com/GCBallesteros/NotebookNavigator.nvim/,HEAD,
-https://github.com/gcmt/taboo.vim/,,
-https://github.com/gcmt/wildfire.vim/,,
-https://github.com/gelguy/wilder.nvim/,,
-https://github.com/gennaro-tedesco/nvim-jqx/,,
-https://github.com/gennaro-tedesco/nvim-peekup/,,
-https://github.com/gentoo/gentoo-syntax/,,
-https://github.com/GEverding/vim-hocon/,,
-https://github.com/gfanto/fzf-lsp.nvim/,,
-https://github.com/ggandor/flit.nvim/,HEAD,
-https://github.com/ggandor/leap-ast.nvim/,HEAD,
-https://github.com/ggandor/leap.nvim/,HEAD,
-https://github.com/ggandor/lightspeed.nvim/,,
-https://github.com/gibiansky/vim-textobj-haskell/,,
-https://github.com/gioele/vim-autoswap/,,
-https://github.com/github/copilot.vim/,,
-https://github.com/glacambre/firenvim/,HEAD,
-https://github.com/gleam-lang/gleam.vim/,,
-https://github.com/glts/vim-textobj-comment/,,
-https://github.com/godlygeek/csapprox/,,
-https://github.com/godlygeek/tabular/,,
-https://github.com/GoldsteinE/compe-latex-symbols/,,
-https://github.com/google/executor.nvim/,HEAD,
-https://github.com/google/vim-codefmt/,,
-https://github.com/google/vim-jsonnet/,,
-https://github.com/google/vim-maktaba/,,
-https://github.com/goolord/alpha-nvim/,HEAD,
-https://github.com/gorbit99/codewindow.nvim/,HEAD,
-https://github.com/gorkunov/smartpairs.vim/,,
-https://github.com/gotcha/vimelette/,,
-https://github.com/gpanders/editorconfig.nvim/,,
-https://github.com/gpanders/nvim-moonwalk/,,
-https://github.com/gpanders/nvim-parinfer/,HEAD,
-https://github.com/gregsexton/gitv/,,
-https://github.com/gruvbox-community/gruvbox/,,gruvbox-community
-https://github.com/gu-fan/riv.vim/,,
-https://github.com/guns/vim-clojure-highlight/,,
-https://github.com/guns/vim-clojure-static/,,
-https://github.com/guns/vim-sexp/,,
-https://github.com/guns/xterm-color-table.vim/,,
-https://github.com/GustavoKatel/telescope-asynctasks.nvim/,,
-https://github.com/gyim/vim-boxdraw/,,
-https://github.com/habamax/vim-godot/,HEAD,
-https://github.com/habamax/vim-habamax/,HEAD,
-https://github.com/hachy/eva01.vim/,,
-https://github.com/hadronized/mind.nvim/,HEAD,
-https://github.com/HakonHarnes/img-clip.nvim/,HEAD,
-https://github.com/HampusHauffman/block.nvim/,HEAD,
-https://github.com/hashivim/vim-packer/,,
-https://github.com/hashivim/vim-terraform/,,
-https://github.com/hashivim/vim-vagrant/,,
-https://github.com/hasundue/vim-pluto/,HEAD,
-https://github.com/hauleth/sad.vim/,,
-https://github.com/haya14busa/incsearch-easymotion.vim/,,
-https://github.com/haya14busa/incsearch.vim/,,
-https://github.com/haya14busa/is.vim/,,
-https://github.com/haya14busa/vim-asterisk/,,
-https://github.com/haya14busa/vim-poweryank/,,
-https://github.com/HealsCodes/vim-gas/,,
-https://github.com/heavenshell/vim-jsdoc/,,
-https://github.com/hecal3/vim-leader-guide/,,
-https://github.com/hedyhli/outline.nvim/,HEAD,
-https://github.com/henrik/vim-indexed-search/,,
-https://github.com/henriklovhaug/Preview.nvim/,HEAD,
-https://github.com/HerringtonDarkholme/yats.vim/,,
-https://github.com/HiPhish/jinja.vim/,HEAD,
-https://github.com/Hoffs/omnisharp-extended-lsp.nvim/,HEAD,
-https://github.com/honza/vim-snippets/,,
-https://github.com/hotwatermorning/auto-git-diff/,,
-https://github.com/hrsh7th/cmp-buffer/,,
-https://github.com/hrsh7th/cmp-calc/,,
-https://github.com/hrsh7th/cmp-cmdline/,,
-https://github.com/hrsh7th/cmp-copilot/,HEAD,
-https://github.com/hrsh7th/cmp-emoji/,,
-https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/,,
-https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/,HEAD,
-https://github.com/hrsh7th/cmp-nvim-lsp/,,
-https://github.com/hrsh7th/cmp-nvim-lua/,,
-https://github.com/hrsh7th/cmp-omni/,,
-https://github.com/hrsh7th/cmp-path/,,
-https://github.com/hrsh7th/cmp-vsnip/,,
-https://github.com/hrsh7th/compe-conjure/,,
-https://github.com/hrsh7th/nvim-cmp/,,
-https://github.com/hrsh7th/nvim-compe/,,
-https://github.com/hrsh7th/vim-vsnip-integ/,,
-https://github.com/hrsh7th/vim-vsnip/,,
-https://github.com/hsanson/vim-android/,,
-https://github.com/hsitz/VimOrganizer/,,
-https://github.com/huggingface/llm.nvim/,HEAD,
-https://github.com/humanoid-colors/vim-humanoid-colorscheme/,,
-https://github.com/hura/vim-asymptote/,,
-https://github.com/iamcco/coc-tailwindcss/,,
-https://github.com/iamcco/markdown-preview.nvim/,,
-https://github.com/ianks/vim-tsx/,,
-https://github.com/ibhagwan/fzf-lua/,HEAD,
-https://github.com/ibhagwan/smartyank.nvim/,,
-https://github.com/idanarye/vim-merginal/,,
-https://github.com/idris-hackers/idris-vim/,,
+https://github.com/sbdchd/neoformat/,,
+https://github.com/danymat/neogen/,HEAD,
+https://github.com/NeogitOrg/neogit/,,
+https://github.com/Shougo/neoinclude.vim/,,
+https://github.com/neomake/neomake/,,
+https://github.com/Shougo/neomru.vim/,,
+https://github.com/rafamadriz/neon/,,
https://github.com/ii14/neorepl.nvim/,HEAD,
-https://github.com/imsnif/kdl.vim/,HEAD,
-https://github.com/Inazuma110/deoplete-greek/,,
-https://github.com/Industrial/vim-smartbd/,HEAD,
-https://github.com/Industrial/vim-smartbw/,HEAD,
+https://github.com/nvim-neorg/neorg-telescope/,HEAD,
+https://github.com/karb94/neoscroll.nvim/,,
+https://github.com/Shougo/neosnippet-snippets/,,
+https://github.com/Shougo/neosnippet.vim/,,
+https://github.com/kassio/neoterm/,,
+https://github.com/nvim-neotest/neotest/,HEAD,
+https://github.com/rcasia/neotest-bash/,HEAD,
+https://github.com/sidlatau/neotest-dart/,HEAD,
+https://github.com/MarkEmmons/neotest-deno/,HEAD,
+https://github.com/Issafalcon/neotest-dotnet/,HEAD,
+https://github.com/jfpedroza/neotest-elixir/,HEAD,
+https://github.com/llllvvuu/neotest-foundry/,HEAD,
+https://github.com/nvim-neotest/neotest-go/,HEAD,
+https://github.com/fredrikaverpil/neotest-golang/,HEAD,
+https://github.com/weilbith/neotest-gradle/,HEAD,
+https://github.com/alfaix/neotest-gtest/,HEAD,
+https://github.com/MrcJkb/neotest-haskell/,HEAD,
+https://github.com/rcasia/neotest-java/,HEAD,
+https://github.com/nvim-neotest/neotest-jest/,HEAD,
+https://github.com/zidhuss/neotest-minitest/,HEAD,
+https://github.com/theutz/neotest-pest/,HEAD,
+https://github.com/olimorris/neotest-phpunit/,HEAD,
+https://github.com/thenbe/neotest-playwright/,HEAD,
+https://github.com/nvim-neotest/neotest-plenary/,HEAD,
+https://github.com/nvim-neotest/neotest-python/,HEAD,
+https://github.com/olimorris/neotest-rspec/,HEAD,
+https://github.com/rouge8/neotest-rust/,HEAD,
+https://github.com/stevanmilic/neotest-scala/,HEAD,
+https://github.com/shunsambongi/neotest-testthat/,HEAD,
+https://github.com/marilari88/neotest-vitest/,HEAD,
+https://github.com/lawrence-laz/neotest-zig/,HEAD,
+https://github.com/rose-pine/neovim/,main,rose-pine
+https://github.com/Shatur/neovim-ayu/,,
+https://github.com/cloudhead/neovim-fuzzy/,,
+https://github.com/jeffkreeftmeijer/neovim-sensible/,,
+https://github.com/Shougo/neoyank.vim/,,
+https://github.com/preservim/nerdcommenter/,,
+https://github.com/preservim/nerdtree/,,
+https://github.com/Xuyuanp/nerdtree-git-plugin/,,
+https://github.com/miversen33/netman.nvim/,HEAD,
+https://github.com/prichrd/netrw.nvim/,HEAD,
+https://github.com/oberblastmeister/neuron.nvim/,,
+https://github.com/fiatjaf/neuron.vim/,,
+https://github.com/Olical/nfnl/,main,
+https://github.com/chr4/nginx.vim/,,
+https://github.com/oxfist/night-owl.nvim/,,
+https://github.com/EdenEast/nightfox.nvim/,,
+https://github.com/Alexis12119/nightly.nvim/,,
+https://github.com/zah/nim.vim/,,
+https://github.com/figsoda/nix-develop.nvim/,HEAD,
+https://github.com/tamago324/nlsp-settings.nvim/,main,
+https://github.com/mcchrish/nnn.vim/,,
+https://github.com/aktersnurra/no-clown-fiesta.nvim/,,
+https://github.com/shortcuts/no-neck-pain.nvim/,HEAD,
+https://github.com/kartikp10/noctis.nvim/,,
+https://github.com/folke/noice.nvim/,HEAD,
+https://github.com/nvimtools/none-ls.nvim/,HEAD,
+https://github.com/gbprod/nord.nvim/,,gbprod-nord
+https://github.com/shaunsingh/nord.nvim/,,
+https://github.com/andersevenrud/nordic.nvim/,,
+https://github.com/vigoux/notifier.nvim/,HEAD,
+https://github.com/jlesquembre/nterm.nvim/,,
+https://github.com/MunifTanjim/nui.nvim/,main,
+https://github.com/jose-elias-alvarez/null-ls.nvim/,,
+https://github.com/nacro90/numb.nvim/,,
+https://github.com/nvchad/nvchad/,HEAD,
+https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/,,
+https://github.com/catppuccin/nvim/,,catppuccin-nvim
+https://github.com/AckslD/nvim-FeMaco.lua/,HEAD,
+https://github.com/nathanmsmith/nvim-ale-diagnostic/,,
+https://github.com/windwp/nvim-autopairs/,,
+https://github.com/Canop/nvim-bacon/,HEAD,
+https://github.com/code-biscuits/nvim-biscuits/,HEAD,
+https://github.com/kevinhwang91/nvim-bqf/,,
+https://github.com/ojroques/nvim-bufdel/,,
+https://github.com/roxma/nvim-cm-racer/,,
+https://github.com/hrsh7th/nvim-cmp/,,
+https://github.com/weilbith/nvim-code-action-menu/,,
+https://github.com/willothy/nvim-cokeline/,HEAD,
+https://github.com/nvchad/nvim-colorizer.lua/,,
+https://github.com/terrortylor/nvim-comment/,,
+https://github.com/hrsh7th/nvim-compe/,,
+https://github.com/roxma/nvim-completion-manager/,,
+https://github.com/klen/nvim-config-local/,,
+https://github.com/andythigpen/nvim-coverage/,HEAD,
+https://github.com/yamatsum/nvim-cursorline/,,
+https://github.com/mfussenegger/nvim-dap/,,
+https://github.com/leoluz/nvim-dap-go/,HEAD,
+https://github.com/mfussenegger/nvim-dap-python/,HEAD,
+https://github.com/rinx/nvim-dap-rego/,HEAD,
+https://github.com/jonboh/nvim-dap-rr/,HEAD,
+https://github.com/rcarriga/nvim-dap-ui/,,
+https://github.com/theHamsta/nvim-dap-virtual-text/,,
+https://github.com/kndndrj/nvim-dbee/,HEAD,
+https://github.com/amrbashir/nvim-docs-view/,HEAD,
+https://github.com/allendang/nvim-expand-expr/,,
+https://github.com/vijaymarupudi/nvim-fzf/,,
+https://github.com/vijaymarupudi/nvim-fzf-commands/,,
+https://github.com/sakhnik/nvim-gdb/,,
+https://github.com/chrisgrieser/nvim-genghis/,HEAD,
+https://github.com/booperlv/nvim-gomove/,HEAD,
+https://github.com/smiteshp/nvim-gps/,,
+https://github.com/brenoprata10/nvim-highlight-colors/,HEAD,
+https://github.com/Iron-E/nvim-highlite/,,
+https://github.com/kevinhwang91/nvim-hlslens/,,
+https://github.com/neovimhaskell/nvim-hs.vim/,,
+https://github.com/mfussenegger/nvim-jdtls/,,
+https://github.com/gennaro-tedesco/nvim-jqx/,,
+https://gitlab.com/usmcamp0811/nvim-julia-autotest,HEAD,
+https://github.com/ethanholz/nvim-lastplace/,HEAD,
+https://github.com/kosayoda/nvim-lightbulb/,,
+https://github.com/josa42/nvim-lightline-lsp/,,
+https://github.com/martineausimon/nvim-lilypond-suite/,HEAD,
+https://github.com/mfussenegger/nvim-lint/,,
+https://github.com/mrded/nvim-lsp-notify/,HEAD,
+https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/,,
+https://github.com/neovim/nvim-lspconfig/,,
+https://github.com/RishabhRD/nvim-lsputils/,,
+https://github.com/sam4llis/nvim-lua-gf/,HEAD,
+https://github.com/bfredl/nvim-luadev/,HEAD,
+https://github.com/rafcamlet/nvim-luapad/,,
+https://github.com/scalameta/nvim-metals/,,
+https://github.com/gpanders/nvim-moonwalk/,,
+https://github.com/SmiteshP/nvim-navbuddy/,,
+https://github.com/smiteshp/nvim-navic/,HEAD,
+https://github.com/AckslD/nvim-neoclip.lua/,,
+https://github.com/nvim-neotest/nvim-nio/,HEAD,
+https://github.com/yamatsum/nvim-nonicons/,,
+https://github.com/rcarriga/nvim-notify/,,
+https://github.com/LhKipp/nvim-nu/,HEAD,
+https://github.com/ojroques/nvim-osc52/,,
+https://github.com/julienvincent/nvim-paredit/,,
+https://github.com/gpanders/nvim-parinfer/,HEAD,
+https://github.com/gennaro-tedesco/nvim-peekup/,,
+https://github.com/yorickpeterse/nvim-pqf/,HEAD,
+https://github.com/jamestthompson3/nvim-remote-containers/,HEAD,
+https://github.com/olrtg/nvim-rename-state/,HEAD,
+https://github.com/chrisgrieser/nvim-rip-substitute/,,
+https://github.com/petertriho/nvim-scrollbar/,HEAD,
+https://github.com/dstein64/nvim-scrollview/,,
+https://github.com/s1n7ax/nvim-search-and-replace/,HEAD,
+https://github.com/garymjr/nvim-snippets/,,
+https://github.com/dcampos/nvim-snippy/,HEAD,
+https://github.com/ishan9299/nvim-solarized-lua/,,
+https://github.com/lucidph3nx/nvim-sops/,HEAD,
+https://github.com/nvim-pack/nvim-spectre/,,
+https://github.com/chrisgrieser/nvim-spider/,HEAD,
+https://github.com/kylechui/nvim-surround/,main,
+https://github.com/svermeulen/nvim-teal-maker/,HEAD,
+https://github.com/norcalli/nvim-terminal.lua/,,
+https://github.com/klen/nvim-test/,,
+https://github.com/nvim-tree/nvim-tree.lua/,,
+https://github.com/nvim-treesitter/nvim-treesitter/,,
+https://github.com/nvim-treesitter/nvim-treesitter-context/,,
+https://github.com/RRethy/nvim-treesitter-endwise/,HEAD,
+https://github.com/theHamsta/nvim-treesitter-pairs/,HEAD,
+https://github.com/eddiebergman/nvim-treesitter-pyfold/,,
+https://github.com/nvim-treesitter/nvim-treesitter-refactor/,,
+https://github.com/PaterJason/nvim-treesitter-sexp/,HEAD,
+https://github.com/nvim-treesitter/nvim-treesitter-textobjects/,,
+https://github.com/RRethy/nvim-treesitter-textsubjects/,HEAD,
+https://github.com/windwp/nvim-ts-autotag/,,
+https://github.com/joosepalviste/nvim-ts-context-commentstring/,,
+https://github.com/kevinhwang91/nvim-ufo/,HEAD,
+https://github.com/samjwill/nvim-unception/,HEAD,
+https://github.com/chrisgrieser/nvim-various-textobjs/,HEAD,
+https://github.com/nvim-tree/nvim-web-devicons/,,
+https://github.com/AckslD/nvim-whichkey-setup.lua/,,
+https://github.com/s1n7ax/nvim-window-picker/,HEAD,
+https://github.com/roxma/nvim-yarp/,,
+https://github.com/andersevenrud/nvim_context_vt/,,
+https://github.com/neovim/nvimdev.nvim/,,
+https://github.com/zbirenbaum/nvterm/,HEAD,
+https://github.com/epwalsh/obsidian.nvim/,HEAD,
+https://github.com/nvimdev/oceanic-material/,,
+https://github.com/mhartington/oceanic-next/,,
+https://github.com/pwntester/octo.nvim/,,
+https://github.com/stevearc/oil.nvim/,HEAD,
+https://github.com/nomnivore/ollama.nvim/,HEAD,
+https://github.com/yonlu/omni.vim/,,
+https://github.com/Hoffs/omnisharp-extended-lsp.nvim/,HEAD,
+https://github.com/Th3Whit3Wolf/one-nvim/,,
+https://github.com/navarasu/onedark.nvim/,,
+https://github.com/joshdick/onedark.vim/,,
+https://github.com/LunarVim/onedarker.nvim/,,
+https://github.com/olimorris/onedarkpro.nvim/,,
+https://github.com/sonph/onehalf/,,
+https://github.com/rmehri01/onenord.nvim/,main,
+https://github.com/tyru/open-browser-github.vim/,,
+https://github.com/tyru/open-browser.vim/,,
+https://github.com/Almo7aya/openingh.nvim/,,
+https://github.com/salkin-mada/openscad.nvim/,HEAD,
+https://github.com/nvim-orgmode/orgmode/,,
+https://github.com/rgroli/other.nvim/,HEAD,
+https://github.com/jmbuhr/otter.nvim/,,
+https://github.com/hedyhli/outline.nvim/,HEAD,
+https://github.com/stevearc/overseer.nvim/,HEAD,
+https://github.com/nyoom-engineering/oxocarbon.nvim/,HEAD,
+https://github.com/vuki656/package-info.nvim/,,
+https://github.com/wbthomason/packer.nvim/,,
+https://github.com/drewtempelmeyer/palenight.vim/,,
+https://github.com/JoosepAlviste/palenightfall.nvim/,,
+https://github.com/roobert/palette.nvim/,HEAD,
+https://github.com/NLKNguyen/papercolor-theme/,,
+https://github.com/dundalek/parpar.nvim/,,
+https://github.com/tmsvg/pear-tree/,,
+https://github.com/steelsojka/pears.nvim/,,
+https://github.com/olimorris/persisted.nvim/,HEAD,
+https://github.com/folke/persistence.nvim/,,
+https://github.com/pest-parser/pest.vim/,HEAD,
+https://github.com/lifepillar/pgsql.vim/,,
+https://github.com/motus/pig.vim/,,
+https://github.com/weirongxu/plantuml-previewer.vim/,HEAD,
+https://github.com/aklt/plantuml-syntax/,,
+https://github.com/nvim-treesitter/playground/,,
+https://github.com/nvim-lua/plenary.nvim/,,
+https://github.com/olivercederborg/poimandres.nvim/,HEAD,
+https://github.com/dleonard0/pony-vim-syntax/,,
+https://github.com/RishabhRD/popfix/,,
+https://github.com/nvim-lua/popup.nvim/,,
+https://github.com/tris203/precognition.nvim/,HEAD,
+https://github.com/andweeb/presence.nvim/,,
+https://github.com/sotte/presenting.vim/,,
+https://github.com/ewilazarus/preto/,HEAD,
+https://github.com/anuvyklack/pretty-fold.nvim/,HEAD,
+https://github.com/vim-scripts/prev_indent/,,
+https://github.com/ahmedkhalf/project.nvim/,,
+https://github.com/kevinhwang91/promise-async/,HEAD,
+https://github.com/frigoeu/psc-ide-vim/,,
+https://github.com/Shougo/pum.vim/,HEAD,
+https://github.com/purescript-contrib/purescript-vim/,,
+https://github.com/python-mode/python-mode/,,
+https://github.com/vim-python/python-syntax/,,
+https://github.com/AlphaTechnolog/pywal.nvim/,,
+https://github.com/codethread/qmk.nvim/,HEAD,
+https://github.com/quarto-dev/quarto-nvim/,,
+https://github.com/unblevable/quick-scope/,,
+https://github.com/stefandtw/quickfix-reflector.vim/,,
+https://github.com/dannyob/quickfixstatus/,,
+https://github.com/jbyuki/quickmath.nvim/,HEAD,
+https://github.com/luochen1990/rainbow/,,
+https://gitlab.com/HiPhish/rainbow-delimiters.nvim,HEAD,
+https://github.com/kien/rainbow_parentheses.vim/,,
+https://github.com/vim-scripts/random.vim/,,
+https://github.com/winston0410/range-highlight.nvim/,,
+https://github.com/kelly-lin/ranger.nvim/,,
+https://github.com/rafaqz/ranger.vim/,,
+https://github.com/vim-scripts/rcshell.vim/,,
+https://github.com/ryvnf/readline.vim/,,
+https://github.com/theprimeagen/refactoring.nvim/,,
+https://github.com/tversteeg/registers.nvim/,,
+https://github.com/vladdoster/remember.nvim/,,
+https://github.com/filipdutescu/renamer.nvim/,,
+https://github.com/MeanderingProgrammer/render-markdown.nvim/,,
+https://github.com/gabrielpoca/replacer.nvim/,HEAD,
+https://github.com/stevearc/resession.nvim/,HEAD,
+https://github.com/NTBBloodbath/rest.nvim/,,
+https://github.com/vim-scripts/restore_view.vim/,HEAD,restore-view-vim
+https://github.com/gu-fan/riv.vim/,,
+https://github.com/kevinhwang91/rnvimr/,,
+https://github.com/mfukar/robotframework-vim/,,
+https://github.com/ron-rs/ron.vim/,,
+https://github.com/jmederosalvarado/roslyn.nvim/,HEAD,
+https://github.com/keith/rspec.vim/,,
+https://github.com/ccarpita/rtorrent-syntax-file/,,
+https://github.com/simrat39/rust-tools.nvim/,,
+https://github.com/rust-lang/rust.vim/,,
+https://github.com/hauleth/sad.vim/,,
+https://github.com/vmware-archive/salt-vim/,,
+https://github.com/lewis6991/satellite.nvim/,HEAD,
+https://github.com/davidgranstrom/scnvim/,HEAD,
+https://github.com/tiagovla/scope.nvim/,HEAD,
+https://github.com/0xJohnnyboy/scretch.nvim/,HEAD,
+https://github.com/Xuyuanp/scrollbar.nvim/,,
+https://github.com/cakebaker/scss-syntax.vim/,,
+https://github.com/VonHeikemen/searchbox.nvim/,,
+https://github.com/RobertAudi/securemodelines/,,
+https://github.com/megaannum/self/,,
+https://github.com/jaxbot/semantic-highlight.vim/,,
+https://github.com/numirias/semshi/,,
+https://github.com/junegunn/seoul256.vim/,,
+https://github.com/sourcegraph/sg.nvim/,HEAD,
+https://github.com/osyo-manga/shabadou.vim/,,
+https://github.com/AndrewRadev/sideways.vim/,,
+https://github.com/lotabout/skim.vim/,,
+https://github.com/mopp/sky-color-clock.vim/,,
+https://github.com/kovisoft/slimv/,,
+https://github.com/danielfalk/smart-open.nvim/,0.2.x,
+https://github.com/mrjones2014/smart-splits.nvim/,,
+https://github.com/m4xshen/smartcolumn.nvim/,,
+https://github.com/gorkunov/smartpairs.vim/,,
+https://github.com/ibhagwan/smartyank.nvim/,,
+https://github.com/camspiers/snap/,,
+https://github.com/norcalli/snippets.nvim/,,
+https://github.com/shaunsingh/solarized.nvim/,HEAD,
+https://github.com/sainnhe/sonokai/,,
+https://github.com/sQVe/sort.nvim/,HEAD,
+https://github.com/chikatoike/sourcemap.vim/,,
+https://github.com/liuchengxu/space-vim/,,
+https://github.com/ctjhoa/spacevim/,,
+https://github.com/chrisgeo/sparkup/,,
+https://github.com/cxwx/specs.nvim/,HEAD,
+https://github.com/lewis6991/spellsitter.nvim/,HEAD,
+https://github.com/stsewd/sphinx.nvim/,,
+https://github.com/sjl/splice.vim/,,
+https://github.com/vimlab/split-term.vim/,,
+https://github.com/AndrewRadev/splitjoin.vim/,,
+https://github.com/kkharji/sqlite.lua/,,
+https://github.com/srcery-colors/srcery-vim/,,
+https://github.com/chr4/sslsecure.vim/,,
+https://github.com/cshuaimin/ssr.nvim/,HEAD,
+https://github.com/luukvbaal/stabilize.nvim/,,
+https://github.com/tamton-aquib/staline.nvim/,main,
+https://github.com/eigenfoo/stan-vim/,,
+https://github.com/josegamez82/starrynight/,HEAD,
+https://github.com/darfink/starsearch.vim/,,
+https://github.com/max397574/startup.nvim/,HEAD,
+https://github.com/luukvbaal/statuscol.nvim/,,
+https://github.com/arnamak/stay-centered.nvim/,HEAD,
+https://github.com/folke/styler.nvim/,,
+https://github.com/teto/stylish.nvim/,HEAD,
+https://github.com/gbprod/substitute.nvim/,HEAD,
+https://github.com/kvrohit/substrata.nvim/,HEAD,
+https://github.com/supermaven-inc/supermaven-nvim/,HEAD,
+https://github.com/ervandew/supertab/,,
+https://github.com/ur4ltz/surround.nvim/,,
+https://github.com/peterbjorgensen/sved/,,
+https://github.com/jamespeapen/swayconfig.vim/,,
+https://github.com/keith/swift.vim/,,
+https://github.com/AndrewRadev/switch.vim/,,
+https://github.com/simrat39/symbols-outline.nvim/,,
+https://github.com/vim-syntastic/syntastic/,,
+https://github.com/ziontee113/syntax-tree-surfer/,HEAD,
+https://github.com/nanozuki/tabby.nvim/,HEAD,
+https://github.com/kdheepak/tabline.nvim/,,
+https://github.com/vim-scripts/tabmerge/,,
+https://github.com/codota/tabnine-vim/,,
+https://github.com/gcmt/taboo.vim/,,
+https://github.com/abecodes/tabout.nvim/,HEAD,
+https://github.com/Shougo/tabpagebuffer.vim/,,
+https://github.com/godlygeek/tabular/,,
+https://github.com/AndrewRadev/tagalong.vim/,,
+https://github.com/preservim/tagbar/,,
+https://github.com/vim-scripts/taglist.vim/,,
+https://github.com/luckasRanarison/tailwind-tools.nvim/,HEAD,
+https://github.com/themaxmarchuk/tailwindcss-colors.nvim/,HEAD,
+https://github.com/wellle/targets.vim/,,
+https://github.com/tools-life/taskwiki/,,
+https://github.com/tomtom/tcomment_vim/,,
+https://github.com/nvim-telekasten/telekasten.nvim/,,
+https://github.com/GustavoKatel/telescope-asynctasks.nvim/,,
+https://github.com/nvim-telescope/telescope-cheat.nvim/,,
+https://github.com/fannheyward/telescope-coc.nvim/,,
+https://github.com/nvim-telescope/telescope-dap.nvim/,,
+https://github.com/nvim-telescope/telescope-file-browser.nvim/,,
+https://github.com/nvim-telescope/telescope-frecency.nvim/,,
+https://github.com/nvim-telescope/telescope-fzf-native.nvim/,,
+https://github.com/nvim-telescope/telescope-fzf-writer.nvim/,,
+https://github.com/nvim-telescope/telescope-fzy-native.nvim/,,
+https://github.com/Snikimonkd/telescope-git-conflicts.nvim/,HEAD,
+https://github.com/nvim-telescope/telescope-github.nvim/,,
+https://github.com/nvim-telescope/telescope-live-grep-args.nvim/,HEAD,
+https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/,,
+https://github.com/MrcJkb/telescope-manix/,HEAD,
+https://github.com/nvim-telescope/telescope-media-files.nvim/,HEAD,
+https://github.com/nvim-telescope/telescope-project.nvim/,,
+https://github.com/Marskey/telescope-sg/,HEAD,
+https://github.com/nvim-telescope/telescope-smart-history.nvim/,HEAD,
+https://github.com/nvim-telescope/telescope-symbols.nvim/,,
+https://github.com/nvim-telescope/telescope-ui-select.nvim/,,
+https://github.com/fhill2/telescope-ultisnips.nvim/,,
+https://github.com/debugloop/telescope-undo.nvim/,HEAD,
+https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,,
+https://github.com/nvim-telescope/telescope-z.nvim/,,
+https://github.com/natecraddock/telescope-zf-native.nvim/,HEAD,
+https://github.com/jvgrootveld/telescope-zoxide/,,
+https://github.com/nvim-telescope/telescope.nvim/,,
+https://github.com/luc-tielen/telescope_hoogle/,HEAD,
+https://github.com/joerdav/templ.vim/,HEAD,
+https://github.com/axelvc/template-string.nvim/,HEAD,
+https://github.com/jacoborus/tender.vim/,,
+https://github.com/chomosuke/term-edit.nvim/,HEAD,
+https://github.com/wincent/terminus/,,
+https://github.com/oberblastmeister/termwrapper.nvim/,,
+https://github.com/ternjs/tern_for_vim/,,
+https://github.com/KeitaNakamura/tex-conceal.vim/,,
+https://github.com/let-def/texpresso.vim/,HEAD,
+https://github.com/johmsalas/text-case.nvim/,HEAD,
+https://github.com/vhsconnect/themed-tabs.nvim/,HEAD,
+https://github.com/ron89/thesaurus_query.vim/,,
+https://github.com/itchyny/thumbnail.vim/,,
+https://github.com/vim-scripts/timestamp.vim/,,
+https://github.com/levouh/tint.nvim/,HEAD,
+https://github.com/rachartier/tiny-inline-diagnostic.nvim/,HEAD,
+https://github.com/tomtom/tinykeymap_vim/,,tinykeymap
+https://github.com/tomtom/tlib_vim/,,
+https://github.com/wellle/tmux-complete.vim/,,
+https://github.com/aserowy/tmux.nvim/,HEAD,
+https://github.com/edkolev/tmuxline.vim/,,
+https://github.com/folke/todo-comments.nvim/,,
+https://github.com/freitass/todo.txt-vim/,,
+https://github.com/akinsho/toggleterm.nvim/,,
+https://github.com/folke/tokyonight.nvim/,,
+https://github.com/markonm/traces.vim/,,
+https://github.com/tjdevries/train.nvim/,,
+https://github.com/xiyaowong/transparent.nvim/,HEAD,
+https://github.com/Wansmer/treesj/,main,
+https://github.com/tremor-rs/tremor-vim/,,
+https://github.com/cappyzawa/trim.nvim/,,
+https://github.com/simonmclean/triptych.nvim/,HEAD,
+https://github.com/folke/trouble.nvim/,,
+https://github.com/Pocco81/true-zen.nvim/,,
+https://github.com/tesaguri/trust.vim/,HEAD,
+https://github.com/folke/ts-comments.nvim/,HEAD,
+https://github.com/jgdavey/tslime.vim/,,
+https://github.com/mtrajano/tssorter.nvim/,HEAD,
+https://github.com/Quramy/tsuquyomi/,,
+https://github.com/folke/twilight.nvim/,,
+https://github.com/pmizio/typescript-tools.nvim/,,
+https://github.com/leafgarland/typescript-vim/,,
+https://github.com/jose-elias-alvarez/typescript.nvim/,,
+https://github.com/kaarmu/typst.vim/,HEAD,
+https://github.com/nvchad/ui/,HEAD,nvchad-ui
+https://github.com/altermo/ultimate-autopair.nvim/,HEAD,
+https://github.com/SirVer/ultisnips/,,
+https://github.com/mbbill/undotree/,,
+https://github.com/chrisbra/unicode.vim/,,
+https://github.com/tummetott/unimpaired.nvim/,HEAD,
+https://github.com/unisonweb/unison/,,
+https://github.com/Shougo/unite.vim/,,
+https://github.com/sontungexpt/url-open/,HEAD,
+https://github.com/axieax/urlview.nvim/,,
+https://github.com/vim-scripts/utl.vim/,,
+https://github.com/KabbAmine/vCoolor.vim/,,
+https://github.com/junegunn/vader.vim/,,
+https://github.com/jbyuki/venn.nvim/,,
+https://github.com/vhda/verilog_systemverilog.vim/,,
+https://github.com/vifm/vifm.vim/,,
+https://github.com/catppuccin/vim/,HEAD,catppuccin-vim
+https://github.com/dracula/vim/,,dracula-vim
+https://github.com/embark-theme/vim/,,embark-vim
+https://github.com/nordtheme/vim/,,nord-vim
https://github.com/inkarkat/vim-AdvancedSorters/,,vim-advanced-sorters
+https://github.com/Konfekt/vim-CtrlXA/,,
+https://github.com/konfekt/vim-DetectSpellLang/,,
+https://github.com/dpelle/vim-LanguageTool/,,
https://github.com/inkarkat/vim-ReplaceWithRegister/,,
https://github.com/inkarkat/vim-ReplaceWithSameIndentRegister/,,
https://github.com/inkarkat/vim-SyntaxRange/,,
-https://github.com/inside/vim-search-pulse/,,
-https://github.com/int3/vim-extradite/,,
-https://github.com/IogaMaster/neocord/,main,
-https://github.com/ionide/Ionide-vim/,HEAD,
-https://github.com/Iron-E/nvim-highlite/,,
-https://github.com/ishan9299/nvim-solarized-lua/,,
-https://github.com/isobit/vim-caddyfile/,HEAD,
-https://github.com/isovector/cornelis/,HEAD,
-https://github.com/Issafalcon/lsp-overloads.nvim/,main,
-https://github.com/Issafalcon/neotest-dotnet/,HEAD,
-https://github.com/itchyny/calendar.vim/,,
-https://github.com/itchyny/lightline.vim/,,
-https://github.com/itchyny/thumbnail.vim/,,
-https://github.com/itchyny/vim-cursorword/,,
-https://github.com/itchyny/vim-gitbranch/,,
-https://github.com/itspriddle/vim-shellcheck/,,
-https://github.com/ivalkeen/vim-simpledb/,,
-https://github.com/ivanov/vim-ipython/,,
-https://github.com/j-hui/fidget.nvim/,,
-https://github.com/jackguo380/vim-lsp-cxx-highlight/,,
-https://github.com/jackMort/ChatGPT.nvim/,HEAD,
-https://github.com/jacoborus/tender.vim/,,
-https://github.com/jakewvincent/mkdnflow.nvim/,HEAD,
-https://github.com/jamespeapen/swayconfig.vim/,,
-https://github.com/jamespwilliams/bat.vim/,HEAD,
-https://github.com/jamessan/vim-gnupg/,,
-https://github.com/jamestthompson3/nvim-remote-containers/,HEAD,
-https://github.com/jaredgorski/SpaceCamp/,,
-https://github.com/jasonccox/vim-wayland-clipboard/,,
-https://github.com/jaxbot/semantic-highlight.vim/,,
-https://github.com/JazzCore/ctrlp-cmatcher/,,
-https://github.com/jbyuki/instant.nvim/,HEAD,
-https://github.com/jbyuki/nabla.nvim/,HEAD,
-https://github.com/jbyuki/quickmath.nvim/,HEAD,
-https://github.com/jbyuki/venn.nvim/,,
-https://github.com/jc-doyle/cmp-pandoc-references/,,
-https://github.com/jceb/vim-hier/,,
-https://github.com/jceb/vim-orgmode/,,
-https://github.com/jeetsukumaran/vim-buffergator/,,
-https://github.com/jeetsukumaran/vim-indentwise/,,
-https://github.com/jeffkreeftmeijer/neovim-sensible/,,
-https://github.com/jeffkreeftmeijer/vim-dim/,HEAD,
-https://github.com/jeffkreeftmeijer/vim-numbertoggle/,,
-https://github.com/jelera/vim-javascript-syntax/,,
-https://github.com/jenterkin/vim-autosource/,,
-https://github.com/jfpedroza/neotest-elixir/,HEAD,
-https://github.com/jgdavey/tslime.vim/,,
-https://github.com/jghauser/mkdir.nvim/,main,
-https://github.com/jhradilek/vim-docbk/,,
-https://github.com/jhradilek/vim-snippets/,,vim-docbk-snippets
-https://github.com/jiangmiao/auto-pairs/,,
-https://github.com/jinh0/eyeliner.nvim/,HEAD,
-https://github.com/jistr/vim-nerdtree-tabs/,,
-https://github.com/jjo/vim-cue/,,
-https://github.com/jlanzarotta/bufexplorer/,,
-https://github.com/jlesquembre/nterm.nvim/,,
-https://github.com/jmbuhr/otter.nvim/,,
-https://github.com/jmederosalvarado/roslyn.nvim/,HEAD,
-https://github.com/jnurmine/zenburn/,,
-https://github.com/joerdav/templ.vim/,HEAD,
-https://github.com/johmsalas/text-case.nvim/,HEAD,
-https://github.com/johnfrankmorgan/whitespace.nvim/,HEAD,
-https://github.com/jonboh/nvim-dap-rr/,HEAD,
-https://github.com/jonbri/vim-colorstepper/,,
-https://github.com/jonsmithers/vim-html-template-literals/,,
-https://github.com/joonty/vim-xdebug/,,
-https://github.com/joosepalviste/nvim-ts-context-commentstring/,,
-https://github.com/JoosepAlviste/palenightfall.nvim/,,
-https://github.com/jordwalke/vim-reasonml/,,
-https://github.com/josa42/coc-lua/,,
-https://github.com/josa42/nvim-lightline-lsp/,,
-https://github.com/josa42/vim-lightline-coc/,,
-https://github.com/jose-elias-alvarez/null-ls.nvim/,,
-https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/,,
-https://github.com/jose-elias-alvarez/typescript.nvim/,,
-https://github.com/josegamez82/starrynight/,HEAD,
-https://github.com/joshdick/onedark.vim/,,
-https://github.com/joshuavial/aider.nvim/,HEAD,
-https://github.com/jpalardy/vim-slime/,,
-https://github.com/jparise/vim-graphql/,,
-https://github.com/jparise/vim-phabricator/,,
-https://github.com/jreybert/vimagit/,,
-https://github.com/jsfaint/gen_tags.vim/,,
-https://github.com/jubnzv/virtual-types.nvim/,HEAD,
-https://github.com/JuliaEditorSupport/deoplete-julia/,,
-https://github.com/JuliaEditorSupport/julia-vim/,,
-https://github.com/Julian/lean.nvim/,,
-https://github.com/Julian/vim-textobj-variable-segment/,,
-https://github.com/julienvincent/hunk.nvim/,HEAD,
-https://github.com/julienvincent/nvim-paredit/,,
-https://github.com/juliosueiras/vim-terraform-completion/,,
-https://github.com/junegunn/fzf.vim/,,
-https://github.com/junegunn/goyo.vim/,,
-https://github.com/junegunn/gv.vim/,,
-https://github.com/junegunn/limelight.vim/,,
-https://github.com/junegunn/seoul256.vim/,,
-https://github.com/junegunn/vader.vim/,,
-https://github.com/junegunn/vim-after-object/,,
-https://github.com/junegunn/vim-easy-align/,,
-https://github.com/junegunn/vim-emoji/,,
-https://github.com/junegunn/vim-github-dashboard/,,
-https://github.com/junegunn/vim-peekaboo/,,
-https://github.com/junegunn/vim-plug/,,
-https://github.com/junegunn/vim-slash/,,
-https://github.com/justincampbell/vim-eighties/,,
-https://github.com/justinj/vim-pico8-syntax/,,
-https://github.com/justinmk/vim-dirvish/,,
-https://github.com/justinmk/vim-sneak/,,
-https://github.com/jvgrootveld/telescope-zoxide/,,
-https://github.com/jvirtanen/vim-hcl/,,
-https://github.com/jvoorhis/coq.vim/,,
-https://github.com/kaarmu/typst.vim/,HEAD,
-https://github.com/KabbAmine/vCoolor.vim/,,
-https://github.com/KabbAmine/zeavim.vim/,,
-https://github.com/kaicataldo/material.vim/,HEAD,
-https://github.com/kalbasit/vim-colemak/,,
-https://github.com/kana/vim-niceblock/,,
-https://github.com/kana/vim-operator-replace/,,
-https://github.com/kana/vim-operator-user/,,
-https://github.com/kana/vim-tabpagecd/,,
-https://github.com/kana/vim-textobj-entire/,,
-https://github.com/kana/vim-textobj-function/,,
-https://github.com/kana/vim-textobj-user/,,
-https://github.com/karb94/neoscroll.nvim/,,
-https://github.com/kartikp10/noctis.nvim/,,
-https://github.com/kassio/neoterm/,,
-https://github.com/kawre/leetcode.nvim/,HEAD,
-https://github.com/kbenzie/vim-spirv/,,
-https://github.com/kchmck/vim-coffee-script/,,
-https://github.com/kdheepak/cmp-latex-symbols/,,
-https://github.com/kdheepak/lazygit.nvim/,,
-https://github.com/kdheepak/tabline.nvim/,,
-https://github.com/KeitaNakamura/neodark.vim/,,
-https://github.com/KeitaNakamura/tex-conceal.vim/,,
-https://github.com/keith/investigate.vim/,,
-https://github.com/keith/rspec.vim/,,
-https://github.com/keith/swift.vim/,,
-https://github.com/kelly-lin/ranger.nvim/,,
-https://github.com/kentarosasaki/vim-emacs-bindings/,HEAD,
-https://github.com/kevinhwang91/nvim-bqf/,,
-https://github.com/kevinhwang91/nvim-hlslens/,,
-https://github.com/kevinhwang91/nvim-ufo/,HEAD,
-https://github.com/kevinhwang91/promise-async/,HEAD,
-https://github.com/kevinhwang91/rnvimr/,,
-https://github.com/kien/rainbow_parentheses.vim/,,
-https://github.com/kiyoon/haskell-scope-highlighting.nvim/,HEAD,
-https://github.com/kkharji/lispdocs.nvim/,,
-https://github.com/kkharji/sqlite.lua/,,
-https://github.com/klen/nvim-config-local/,,
-https://github.com/klen/nvim-test/,,
-https://github.com/kmonad/kmonad-vim/,,
-https://github.com/kndndrj/nvim-dbee/,HEAD,
-https://github.com/knubie/vim-kitty-navigator/,,
-https://github.com/konfekt/fastfold/,,
-https://github.com/Konfekt/vim-alias/,,
-https://github.com/Konfekt/vim-CtrlXA/,,
-https://github.com/konfekt/vim-DetectSpellLang/,,
-https://github.com/Konfekt/vim-sentence-chopper/,HEAD,
-https://github.com/kosayoda/nvim-lightbulb/,,
-https://github.com/kovisoft/slimv/,,
-https://github.com/krady21/compiler-explorer.nvim/,HEAD,
-https://github.com/kristijanhusak/defx-git/,,
-https://github.com/kristijanhusak/defx-icons/,,
-https://github.com/kristijanhusak/deoplete-phpactor/,,
-https://github.com/kristijanhusak/vim-carbon-now-sh/,,
-https://github.com/kristijanhusak/vim-dadbod-completion/,,
-https://github.com/kristijanhusak/vim-dadbod-ui/,,
-https://github.com/kristijanhusak/vim-dirvish-git/,,
-https://github.com/kristijanhusak/vim-hybrid-material/,,
-https://github.com/kshenoy/vim-signature/,,
-https://github.com/ku1ik/vim-pasta/,,
-https://github.com/kvrohit/substrata.nvim/,HEAD,
-https://github.com/kwkarlwang/bufjump.nvim/,HEAD,
-https://github.com/kylechui/nvim-surround/,main,
-https://github.com/l3mon4d3/luasnip/,,
-https://github.com/lalitmee/cobalt2.nvim/,,
-https://github.com/lambdalisue/vim-fern/,,
-https://github.com/lambdalisue/vim-gina/,,
-https://github.com/lambdalisue/vim-gista/,,
-https://github.com/lambdalisue/vim-manpager/,,
-https://github.com/lambdalisue/vim-pager/,,
-https://github.com/lambdalisue/vim-suda/,,
-https://github.com/lark-parser/vim-lark-syntax/,HEAD,
-https://github.com/latex-box-team/latex-box/,,
-https://github.com/lawrence-laz/neotest-zig/,HEAD,
-https://github.com/laytan/cloak.nvim/,HEAD,
-https://github.com/LazyVim/LazyVim/,,
-https://github.com/ldelossa/litee-calltree.nvim/,,
-https://github.com/ldelossa/litee-filetree.nvim/,,
-https://github.com/ldelossa/litee-symboltree.nvim/,,
-https://github.com/ldelossa/litee.nvim/,,
-https://github.com/leafgarland/typescript-vim/,,
-https://github.com/leafo/moonscript-vim/,HEAD,
-https://github.com/leafOfTree/vim-matchtag/,HEAD,
-https://github.com/leafOfTree/vim-vue-plugin/,HEAD,
-https://github.com/leanprover/lean.vim/,,
-https://github.com/ledger/vim-ledger/,,
-https://github.com/leoluz/nvim-dap-go/,HEAD,
-https://github.com/lepture/vim-jinja/,,
-https://github.com/lervag/vimtex/,,
-https://github.com/lervag/wiki-ft.vim/,HEAD,
-https://github.com/lervag/wiki.vim/,HEAD,
-https://github.com/let-def/texpresso.vim/,HEAD,
-https://github.com/levouh/tint.nvim/,HEAD,
-https://github.com/lewis6991/fileline.nvim/,,
-https://github.com/lewis6991/gitsigns.nvim/,,
-https://github.com/lewis6991/hover.nvim/,HEAD,
-https://github.com/lewis6991/impatient.nvim/,,
-https://github.com/lewis6991/satellite.nvim/,HEAD,
-https://github.com/lewis6991/spellsitter.nvim/,HEAD,
-https://github.com/lf-lang/lingua-franca.vim/,,
-https://github.com/lfe-support/vim-lfe/,,
-https://github.com/lfilho/cosco.vim/,,
-https://github.com/LhKipp/nvim-nu/,HEAD,
-https://github.com/liangxianzhe/floating-input.nvim/,HEAD,
-https://github.com/lifepillar/pgsql.vim/,,
-https://github.com/lifepillar/vim-gruvbox8/,,
-https://github.com/lifepillar/vim-mucomplete/,,
-https://github.com/lifepillar/vim-solarized8/,HEAD,
-https://github.com/lighttiger2505/deoplete-vim-lsp/,,
-https://github.com/Lilja/zellij.nvim/,HEAD,
-https://github.com/lilydjwg/colorizer/,,
-https://github.com/lilydjwg/fcitx.vim/,fcitx5,
-https://github.com/liuchengxu/graphviz.vim/,,
-https://github.com/liuchengxu/space-vim/,,
-https://github.com/liuchengxu/vim-which-key/,,
-https://github.com/liuchengxu/vista.vim/,,
-https://github.com/llllvvuu/neotest-foundry/,HEAD,
-https://github.com/LnL7/vim-nix/,,
-https://github.com/loctvl842/monokai-pro.nvim/,HEAD,
-https://github.com/lotabout/skim.vim/,,
-https://github.com/lsig/messenger.nvim/,HEAD,
-https://github.com/lspcontainers/lspcontainers.nvim/,,
-https://github.com/luan/vim-concourse/,,
-https://github.com/luc-tielen/telescope_hoogle/,HEAD,
-https://github.com/lucasew/yescapsquit.vim/,HEAD,
-https://github.com/LucHermitte/lh-brackets/,,
-https://github.com/LucHermitte/lh-vim-lib/,,
-https://github.com/lucidph3nx/nvim-sops/,HEAD,
-https://github.com/luckasRanarison/tailwind-tools.nvim/,HEAD,
-https://github.com/LudoPinelli/comment-box.nvim/,HEAD,
-https://github.com/ludovicchabant/vim-gutentags/,,
-https://github.com/ludovicchabant/vim-lawrencium/,,
-https://github.com/luisiacc/gruvbox-baby/,HEAD,
-https://github.com/lukas-reineke/cmp-rg/,HEAD,
-https://github.com/lukas-reineke/cmp-under-comparator/,,
-https://github.com/lukas-reineke/headlines.nvim/,HEAD,
-https://github.com/lukas-reineke/indent-blankline.nvim/,,
-https://github.com/lukas-reineke/lsp-format.nvim/,HEAD,
-https://github.com/lukas-reineke/virt-column.nvim/,HEAD,
-https://github.com/lukaszkorecki/workflowish/,,
-https://github.com/lumiliet/vim-twig/,,
-https://github.com/lunacookies/vim-substrata/,HEAD,
-https://github.com/LunarVim/bigfile.nvim/,,
-https://github.com/LunarVim/onedarker.nvim/,,
-https://github.com/luochen1990/rainbow/,,
-https://github.com/luukvbaal/stabilize.nvim/,,
-https://github.com/luukvbaal/statuscol.nvim/,,
-https://github.com/lvimuser/lsp-inlayhints.nvim/,HEAD,
-https://github.com/lyokha/vim-xkbswitch/,,
-https://github.com/m-pilia/vim-ccls/,,
-https://github.com/m00qek/baleia.nvim/,HEAD,
-https://github.com/m4xshen/autoclose.nvim/,HEAD,
-https://github.com/m4xshen/hardtime.nvim/,HEAD,
-https://github.com/m4xshen/smartcolumn.nvim/,,
-https://github.com/machakann/vim-highlightedyank/,,
-https://github.com/machakann/vim-sandwich/,,
-https://github.com/machakann/vim-swap/,,
-https://github.com/MagicDuck/grug-far.nvim/,,
-https://github.com/maksimr/vim-jsbeautify/,,
-https://github.com/manicmaniac/coconut.vim/,HEAD,
+https://github.com/tpope/vim-abolish/,,
https://github.com/MarcWeber/vim-addon-actions/,,
https://github.com/MarcWeber/vim-addon-async/,,
https://github.com/MarcWeber/vim-addon-background-cmd/,,
@@ -764,799 +1104,459 @@ https://github.com/MarcWeber/vim-addon-sql/,,
https://github.com/MarcWeber/vim-addon-syntax-checker/,,
https://github.com/MarcWeber/vim-addon-toggle-buffer/,,
https://github.com/MarcWeber/vim-addon-xdebug/,,
-https://github.com/marilari88/neotest-vitest/,HEAD,
-https://github.com/MarkEmmons/neotest-deno/,HEAD,
-https://github.com/marko-cerovac/material.nvim/,,
-https://github.com/markonm/traces.vim/,,
-https://github.com/marrub--/vim-zscript/,HEAD,
-https://github.com/Marskey/telescope-sg/,HEAD,
-https://github.com/martinda/Jenkinsfile-vim-syntax/,,
-https://github.com/martineausimon/nvim-lilypond-suite/,HEAD,
-https://github.com/MattesGroeger/vim-bookmarks/,,
-https://github.com/mattn/calendar-vim/,,mattn-calendar-vim
-https://github.com/mattn/emmet-vim/,,
-https://github.com/mattn/vim-gist/,,
-https://github.com/mattn/vim-lsp-settings/,HEAD,
-https://github.com/mattn/webapi-vim/,,
-https://github.com/matze/vim-move/,,
-https://github.com/mawkler/modicator.nvim/,HEAD,
-https://github.com/max397574/better-escape.nvim/,,
-https://github.com/max397574/cmp-greek/,HEAD,
-https://github.com/max397574/startup.nvim/,HEAD,
-https://github.com/maximbaz/lightline-ale/,,
-https://github.com/maxjacobson/vim-fzf-coauthorship/,,
-https://github.com/MaxMEllon/vim-jsx-pretty/,,
-https://github.com/mbbill/undotree/,,
-https://github.com/mboughaba/i3config.vim/,,
-https://github.com/mcchrish/nnn.vim/,,
-https://github.com/meain/vim-printer/,HEAD,
-https://github.com/MeanderingProgrammer/render-markdown.nvim/,,
-https://github.com/MeF0504/vim-pets/,HEAD,
-https://github.com/megaannum/forms/,,
-https://github.com/megaannum/self/,,
-https://github.com/mengelbrecht/lightline-bufferline/,,
-https://github.com/metakirby5/codi.vim/,,
-https://github.com/metalelf0/jellybeans-nvim/,,
-https://github.com/mfukar/robotframework-vim/,,
-https://github.com/mfussenegger/nvim-dap-python/,HEAD,
-https://github.com/mfussenegger/nvim-dap/,,
-https://github.com/mfussenegger/nvim-jdtls/,,
-https://github.com/mfussenegger/nvim-lint/,,
-https://github.com/mg979/vim-visual-multi/,,
-https://github.com/mg979/vim-xtabline/,,
-https://github.com/mhartington/formatter.nvim/,,
-https://github.com/mhartington/oceanic-next/,,
-https://github.com/mhinz/vim-crates/,,
-https://github.com/mhinz/vim-grepper/,,
-https://github.com/mhinz/vim-janah/,,
-https://github.com/mhinz/vim-sayonara/,7e774f58c5865d9c10d40396850b35ab95af17c5,
-https://github.com/mhinz/vim-signify/,,
-https://github.com/mhinz/vim-startify/,,
-https://github.com/michaeljsmith/vim-indent-object/,,
-https://github.com/michal-h21/vim-zettel/,HEAD,
-https://github.com/miikanissi/modus-themes.nvim/,HEAD,
-https://github.com/mikavilpas/yazi.nvim/,HEAD,
-https://github.com/mikesmithgh/git-prompt-string-lualine.nvim/,HEAD,
-https://github.com/mileszs/ack.vim/,,
-https://github.com/milkypostman/vim-togglelist/,,
-https://github.com/mistricky/codesnap.nvim/,HEAD,
-https://github.com/mistweaverco/kulala.nvim/,HEAD,
-https://github.com/miversen33/netman.nvim/,HEAD,
-https://github.com/mk12/vim-lean/,,
-https://github.com/mkasa/lushtags/,,
-https://github.com/mlr-msft/vim-loves-dafny/,,
-https://github.com/Mofiqul/adwaita.nvim/,HEAD,
-https://github.com/Mofiqul/dracula.nvim/,HEAD,
-https://github.com/Mofiqul/vscode.nvim/,,
-https://github.com/mogelbrod/vim-jsonpath/,HEAD,
-https://github.com/moll/vim-bbye/,,
-https://github.com/monaqa/dial.nvim/,HEAD,
-https://github.com/monkoose/fzf-hoogle.vim/,HEAD,
-https://github.com/monkoose/vim9-stargate/,HEAD,
-https://github.com/mopp/sky-color-clock.vim/,,
-https://github.com/morhetz/gruvbox/,,
-https://github.com/motus/pig.vim/,,
-https://github.com/mpickering/hlint-refactor-vim/,,
-https://github.com/mrcjkb/haskell-snippets.nvim/,HEAD,
-https://github.com/MrcJkb/neotest-haskell/,HEAD,
-https://github.com/MrcJkb/telescope-manix/,HEAD,
-https://github.com/mrded/nvim-lsp-notify/,HEAD,
-https://github.com/mrjones2014/legendary.nvim/,HEAD,
-https://github.com/mrjones2014/smart-splits.nvim/,,
-https://github.com/mroavi/vim-julia-cell/,HEAD,
-https://github.com/ms-jpq/chadtree/,HEAD,
-https://github.com/ms-jpq/coq.artifacts/,HEAD,
-https://github.com/ms-jpq/coq.thirdparty/,HEAD,
-https://github.com/ms-jpq/coq_nvim/,,
+https://github.com/junegunn/vim-after-object/,,
+https://github.com/danilo-augusto/vim-afterglow/,HEAD,
https://github.com/msuperdock/vim-agda/,HEAD,
-https://github.com/mtikekar/vim-bsv/,,
-https://github.com/mtoohey31/cmp-fish/,HEAD,
-https://github.com/mtrajano/tssorter.nvim/,HEAD,
-https://github.com/MunifTanjim/nui.nvim/,main,
-https://github.com/mustache/vim-mustache-handlebars/,,
-https://github.com/Myzel394/jsonfly.nvim/,HEAD,
-https://github.com/mzlogin/vim-markdown-toc/,,
-https://github.com/mzlogin/vim-smali/,,
-https://github.com/nacro90/numb.nvim/,,
-https://github.com/nanotech/jellybeans.vim/,,
-https://github.com/nanotee/zoxide.vim/,,
-https://github.com/nanozuki/tabby.nvim/,HEAD,
-https://github.com/nat-418/boole.nvim/,HEAD,
-https://github.com/natebosch/vim-lsc/,,
-https://github.com/natecraddock/telescope-zf-native.nvim/,HEAD,
-https://github.com/nathangrigg/vim-beancount/,,
-https://github.com/nathanmsmith/nvim-ale-diagnostic/,,
-https://github.com/navarasu/onedark.nvim/,,
-https://github.com/navicore/vissort.vim/,,
-https://github.com/nbouscal/vim-stylish-haskell/,,
-https://github.com/ncm2/float-preview.nvim/,,
-https://github.com/ncm2/ncm2-bufword/,,
-https://github.com/ncm2/ncm2-cssomni/,,
-https://github.com/ncm2/ncm2-github/,,
-https://github.com/ncm2/ncm2-html-subscope/,,
-https://github.com/ncm2/ncm2-jedi/,,
-https://github.com/ncm2/ncm2-markdown-subscope/,,
-https://github.com/ncm2/ncm2-neoinclude/,,
-https://github.com/ncm2/ncm2-neosnippet/,,
-https://github.com/ncm2/ncm2-path/,,
-https://github.com/ncm2/ncm2-syntax/,,
-https://github.com/ncm2/ncm2-tagprefix/,,
-https://github.com/ncm2/ncm2-tmux/,,
-https://github.com/ncm2/ncm2-ultisnips/,,
-https://github.com/ncm2/ncm2-vim/,,
-https://github.com/ncm2/ncm2/,,
-https://github.com/ndmitchell/ghcid/,,
-https://github.com/neoclide/coc-denite/,,
-https://github.com/neoclide/coc-neco/,,
-https://github.com/neoclide/coc.nvim/,release,
-https://github.com/neoclide/denite-extra/,,
-https://github.com/neoclide/denite-git/,,
-https://github.com/neoclide/jsonc.vim/,,
-https://github.com/neoclide/vim-easygit/,,
-https://github.com/NeogitOrg/neogit/,,
-https://github.com/neomake/neomake/,,
-https://github.com/neovim/nvim-lspconfig/,,
-https://github.com/neovim/nvimdev.nvim/,,
-https://github.com/neovimhaskell/haskell-vim/,,
-https://github.com/neovimhaskell/nvim-hs.vim/,,
-https://github.com/neutaaaaan/iosvkem/,,
-https://github.com/nfnty/vim-nftables/,,
-https://github.com/ngemily/vim-vp4/,HEAD,
-https://github.com/nickel-lang/vim-nickel/,main,
-https://github.com/nicoe/deoplete-khard/,,
-https://github.com/nishigori/increment-activator/,,
-https://github.com/nixprime/cpsm/,,
-https://github.com/NLKNguyen/papercolor-theme/,,
-https://github.com/nmac427/guess-indent.nvim/,HEAD,
-https://github.com/noahfrederick/vim-noctu/,,
-https://github.com/NoahTheDuke/vim-just/,,
-https://github.com/noc7c9/vim-iced-coffee-script/,,
-https://github.com/nomnivore/ollama.nvim/,HEAD,
-https://github.com/norcalli/nvim-terminal.lua/,,
-https://github.com/norcalli/snippets.nvim/,,
-https://github.com/nordtheme/vim/,,nord-vim
-https://github.com/notomo/cmp-neosnippet/,HEAD,
-https://github.com/NTBBloodbath/doom-one.nvim/,,
-https://github.com/NTBBloodbath/galaxyline.nvim/,,
-https://github.com/NTBBloodbath/rest.nvim/,,
-https://github.com/ntk148v/vim-horizon/,,
-https://github.com/ntpeters/vim-better-whitespace/,,
-https://github.com/nullishamy/autosave.nvim/,HEAD,
-https://github.com/numirias/semshi/,,
-https://github.com/Numkil/ag.nvim/,,
-https://github.com/numtostr/comment.nvim/,,
-https://github.com/numToStr/FTerm.nvim/,,
-https://github.com/numToStr/Navigator.nvim/,,
-https://github.com/nvchad/base46/,HEAD,
-https://github.com/nvchad/nvchad/,HEAD,
-https://github.com/nvchad/nvim-colorizer.lua/,,
-https://github.com/nvchad/ui/,HEAD,nvchad-ui
-https://github.com/nvie/vim-flake8/,,
-https://github.com/nvim-focus/focus.nvim/,HEAD,
-https://github.com/nvim-lua/completion-nvim/,,
-https://github.com/nvim-lua/diagnostic-nvim/,,
-https://github.com/nvim-lua/lsp-status.nvim/,,
-https://github.com/nvim-lua/lsp_extensions.nvim/,,
-https://github.com/nvim-lua/plenary.nvim/,,
-https://github.com/nvim-lua/popup.nvim/,,
-https://github.com/nvim-lualine/lualine.nvim/,,
-https://github.com/nvim-neo-tree/neo-tree.nvim/,HEAD,
-https://github.com/nvim-neorg/neorg-telescope/,HEAD,
-https://github.com/nvim-neotest/neotest-go/,HEAD,
-https://github.com/nvim-neotest/neotest-jest/,HEAD,
-https://github.com/nvim-neotest/neotest-plenary/,HEAD,
-https://github.com/nvim-neotest/neotest-python/,HEAD,
-https://github.com/nvim-neotest/neotest/,HEAD,
-https://github.com/nvim-neotest/nvim-nio/,HEAD,
-https://github.com/nvim-orgmode/orgmode/,,
-https://github.com/nvim-pack/nvim-spectre/,,
-https://github.com/nvim-telekasten/telekasten.nvim/,,
-https://github.com/nvim-telescope/telescope-cheat.nvim/,,
-https://github.com/nvim-telescope/telescope-dap.nvim/,,
-https://github.com/nvim-telescope/telescope-file-browser.nvim/,,
-https://github.com/nvim-telescope/telescope-frecency.nvim/,,
-https://github.com/nvim-telescope/telescope-fzf-native.nvim/,,
-https://github.com/nvim-telescope/telescope-fzf-writer.nvim/,,
-https://github.com/nvim-telescope/telescope-fzy-native.nvim/,,
-https://github.com/nvim-telescope/telescope-github.nvim/,,
-https://github.com/nvim-telescope/telescope-live-grep-args.nvim/,HEAD,
-https://github.com/nvim-telescope/telescope-media-files.nvim/,HEAD,
-https://github.com/nvim-telescope/telescope-project.nvim/,,
-https://github.com/nvim-telescope/telescope-smart-history.nvim/,HEAD,
-https://github.com/nvim-telescope/telescope-symbols.nvim/,,
-https://github.com/nvim-telescope/telescope-ui-select.nvim/,,
-https://github.com/nvim-telescope/telescope-z.nvim/,,
-https://github.com/nvim-telescope/telescope.nvim/,,
-https://github.com/nvim-tree/nvim-tree.lua/,,
-https://github.com/nvim-tree/nvim-web-devicons/,,
-https://github.com/nvim-treesitter/completion-treesitter/,,
-https://github.com/nvim-treesitter/nvim-treesitter-context/,,
-https://github.com/nvim-treesitter/nvim-treesitter-refactor/,,
-https://github.com/nvim-treesitter/nvim-treesitter-textobjects/,,
-https://github.com/nvim-treesitter/nvim-treesitter/,,
-https://github.com/nvim-treesitter/playground/,,
-https://github.com/nvimdev/dashboard-nvim/,,
-https://github.com/nvimdev/guard-collection/,HEAD,
-https://github.com/nvimdev/guard.nvim/,HEAD,
-https://github.com/nvimdev/lspsaga.nvim/,,
-https://github.com/nvimdev/oceanic-material/,,
-https://github.com/nvimdev/zephyr-nvim/,,
-https://github.com/nvimtools/hydra.nvim/,HEAD,
-https://github.com/nvimtools/none-ls.nvim/,HEAD,
-https://github.com/nyoom-engineering/oxocarbon.nvim/,HEAD,
-https://github.com/nzlov/cmp-tabby/,HEAD,
-https://github.com/oberblastmeister/neuron.nvim/,,
-https://github.com/oberblastmeister/termwrapper.nvim/,,
-https://github.com/ocaml/vim-ocaml/,,
-https://github.com/octaltree/cmp-look/,HEAD,
-https://github.com/octol/vim-cpp-enhanced-highlight/,,
-https://github.com/ojroques/nvim-bufdel/,,
-https://github.com/ojroques/nvim-osc52/,,
-https://github.com/ojroques/vim-oscyank/,,
-https://github.com/okuuva/auto-save.nvim/,HEAD,
-https://github.com/Olical/aniseed/,,
-https://github.com/Olical/conjure/,,
-https://github.com/Olical/nfnl/,main,
-https://github.com/Olical/vim-enmasse/,HEAD,
-https://github.com/olimorris/neotest-phpunit/,HEAD,
-https://github.com/olimorris/neotest-rspec/,HEAD,
-https://github.com/olimorris/onedarkpro.nvim/,,
-https://github.com/olimorris/persisted.nvim/,HEAD,
-https://github.com/olivercederborg/poimandres.nvim/,HEAD,
-https://github.com/olrtg/nvim-rename-state/,HEAD,
-https://github.com/onsails/diaglist.nvim/,,
-https://github.com/onsails/lspkind.nvim/,,
-https://github.com/OrangeT/vim-csharp/,,
-https://github.com/osyo-manga/shabadou.vim/,,
-https://github.com/osyo-manga/vim-anzu/,,
-https://github.com/osyo-manga/vim-over/,,
-https://github.com/osyo-manga/vim-textobj-multiblock/,,
-https://github.com/osyo-manga/vim-watchdogs/,,
-https://github.com/otavioschwanck/arrow.nvim/,,
-https://github.com/othree/html5.vim/,HEAD,
-https://github.com/overcache/NeoSolarized/,,
-https://github.com/oxfist/night-owl.nvim/,,
-https://github.com/OXY2DEV/helpview.nvim/,HEAD,
-https://github.com/OXY2DEV/markview.nvim/,HEAD,
-https://github.com/p00f/clangd_extensions.nvim/,HEAD,
-https://github.com/p00f/godbolt.nvim/,HEAD,
-https://github.com/pangloss/vim-javascript/,,
-https://github.com/parsonsmatt/intero-neovim/,,
-https://github.com/PaterJason/cmp-conjure/,,
-https://github.com/PaterJason/nvim-treesitter-sexp/,HEAD,
-https://github.com/patstockwell/vim-monokai-tasty/,HEAD,
-https://github.com/pearofducks/ansible-vim/,,
-https://github.com/peitalin/vim-jsx-typescript/,,
-https://github.com/pest-parser/pest.vim/,HEAD,
-https://github.com/peterbjorgensen/sved/,,
-https://github.com/peterhoeg/vim-qml/,,
-https://github.com/PeterRincker/vim-argumentative/,,
-https://github.com/petertriho/cmp-git/,HEAD,
-https://github.com/petertriho/nvim-scrollbar/,HEAD,
-https://github.com/petRUShka/vim-opencl/,,
-https://github.com/phanviet/vim-monokai-pro/,,
-https://github.com/phha/zenburn.nvim/,,phha-zenburn
-https://github.com/piersolenski/wtf.nvim/,HEAD,
-https://github.com/pimalaya/himalaya-vim/,,
-https://github.com/pmizio/typescript-tools.nvim/,,
-https://github.com/Pocco81/true-zen.nvim/,,
-https://github.com/ponko2/deoplete-fish/,,
-https://github.com/pontusk/cmp-vimwiki-tags/,HEAD,
-https://github.com/posva/vim-vue/,,
-https://github.com/powerman/vim-plugin-AnsiEsc/,,
-https://github.com/PProvost/vim-ps1/,,
-https://github.com/prabirshrestha/async.vim/,,
-https://github.com/prabirshrestha/asyncomplete-buffer.vim/,HEAD,
-https://github.com/prabirshrestha/asyncomplete-file.vim/,HEAD,
-https://github.com/prabirshrestha/asyncomplete-lsp.vim/,,
-https://github.com/prabirshrestha/asyncomplete-omni.vim/,HEAD,
-https://github.com/prabirshrestha/asyncomplete-tags.vim/,HEAD,
-https://github.com/prabirshrestha/asyncomplete-ultisnips.vim/,HEAD,
-https://github.com/prabirshrestha/asyncomplete.vim/,,
-https://github.com/prabirshrestha/vim-lsp/,,
-https://github.com/preservim/nerdcommenter/,,
-https://github.com/preservim/nerdtree/,,
-https://github.com/preservim/tagbar/,,
-https://github.com/preservim/vim-indent-guides/,,
-https://github.com/preservim/vim-lexical/,HEAD,
-https://github.com/preservim/vim-markdown/,,
-https://github.com/preservim/vim-pencil/,,
-https://github.com/preservim/vim-wordy/,,
-https://github.com/preservim/vimux/,,
-https://github.com/prettier/vim-prettier/,,
-https://github.com/prichrd/netrw.nvim/,HEAD,
-https://github.com/prisma/vim-prisma/,,
-https://github.com/projekt0n/circles.nvim/,,
-https://github.com/psliwka/vim-smoothie/,,
-https://github.com/pta2002/intellitab.nvim/,HEAD,
-https://github.com/ptdewey/darkearth-nvim/,HEAD,
-https://github.com/pteroctopus/faster.nvim/,HEAD,
-https://github.com/ptzz/lf.vim/,,
-https://github.com/puremourning/vimspector/,,
-https://github.com/purescript-contrib/purescript-vim/,,
-https://github.com/pwntester/octo.nvim/,,
-https://github.com/python-mode/python-mode/,,
-https://github.com/qnighy/lalrpop.vim/,,
-https://github.com/qpkorr/vim-bufkill/,,
-https://github.com/quangnguyen30192/cmp-nvim-tags/,HEAD,
-https://github.com/quangnguyen30192/cmp-nvim-ultisnips/,,
-https://github.com/quarto-dev/quarto-nvim/,,
-https://github.com/Quramy/tsuquyomi/,,
-https://github.com/RaafatTurki/hex.nvim/,HEAD,
-https://github.com/racer-rust/vim-racer/,,
-https://github.com/rachartier/tiny-inline-diagnostic.nvim/,HEAD,
-https://github.com/radenling/vim-dispatch-neovim/,,
-https://github.com/rafamadriz/friendly-snippets/,,
-https://github.com/rafamadriz/neon/,,
-https://github.com/rafaqz/ranger.vim/,,
-https://github.com/rafcamlet/nvim-luapad/,,
-https://github.com/rafi/awesome-vim-colorschemes/,,
-https://github.com/raghur/fruzzy/,,
-https://github.com/raghur/vim-ghost/,,
-https://github.com/Raimondi/delimitMate/,,
-https://github.com/rakr/vim-one/,,
-https://github.com/ray-x/aurora/,,
-https://github.com/ray-x/cmp-treesitter/,,
-https://github.com/ray-x/go.nvim/,HEAD,
-https://github.com/ray-x/lsp_signature.nvim/,,
-https://github.com/rbgrouleff/bclose.vim/,,
-https://github.com/rbong/vim-flog/,,
-https://github.com/rcarriga/cmp-dap/,HEAD,
-https://github.com/rcarriga/nvim-dap-ui/,,
-https://github.com/rcarriga/nvim-notify/,,
-https://github.com/rcarriga/vim-ultest/,,
-https://github.com/rcasia/neotest-bash/,HEAD,
-https://github.com/rcasia/neotest-java/,HEAD,
-https://github.com/rebelot/heirline.nvim/,,
-https://github.com/rebelot/kanagawa.nvim/,,
-https://github.com/rgroli/other.nvim/,HEAD,
-https://github.com/rhysd/clever-f.vim/,,
-https://github.com/rhysd/committia.vim/,,
-https://github.com/rhysd/conflict-marker.vim/,,
-https://github.com/rhysd/devdocs.vim/,,
-https://github.com/rhysd/git-messenger.vim/,,
-https://github.com/rhysd/vim-clang-format/,,
-https://github.com/rhysd/vim-grammarous/,,
-https://github.com/rhysd/vim-llvm/,HEAD,
-https://github.com/rhysd/vim-lsp-ale/,HEAD,
-https://github.com/rhysd/vim-operator-surround/,,
-https://github.com/ribru17/bamboo.nvim/,,
-https://github.com/rinx/nvim-dap-rego/,HEAD,
-https://github.com/RishabhRD/nvim-lsputils/,,
-https://github.com/RishabhRD/popfix/,,
-https://github.com/rizzatti/dash.vim/,HEAD,
-https://github.com/rktjmp/fwatch.nvim/,,
-https://github.com/rktjmp/hotpot.nvim/,,
-https://github.com/rktjmp/lush.nvim/,,
-https://github.com/rmagatti/auto-session/,,
-https://github.com/rmagatti/goto-preview/,,
-https://github.com/rmehri01/onenord.nvim/,main,
-https://github.com/RobertAudi/securemodelines/,,
-https://github.com/rockerBOO/boo-colorscheme-nvim/,,
-https://github.com/rodjek/vim-puppet/,,
-https://github.com/romainl/vim-cool/,,
-https://github.com/romainl/vim-qf/,,
-https://github.com/romainl/vim-qlist/,,
-https://github.com/roman/golden-ratio/,,
-https://github.com/romgrk/barbar.nvim/,,
-https://github.com/ron-rs/ron.vim/,,
-https://github.com/ron89/thesaurus_query.vim/,,
-https://github.com/roobert/palette.nvim/,HEAD,
-https://github.com/rose-pine/neovim/,main,rose-pine
-https://github.com/rouge8/neotest-rust/,HEAD,
-https://github.com/roxma/nvim-cm-racer/,,
-https://github.com/roxma/nvim-completion-manager/,,
-https://github.com/roxma/nvim-yarp/,,
-https://github.com/roxma/vim-tmux-clipboard/,,
-https://github.com/RRethy/base16-nvim/,,
-https://github.com/RRethy/nvim-treesitter-endwise/,HEAD,
-https://github.com/RRethy/nvim-treesitter-textsubjects/,HEAD,
-https://github.com/RRethy/vim-hexokinase/,,
-https://github.com/RRethy/vim-illuminate/,,
-https://github.com/rstacruz/vim-closer/,,
-https://github.com/ruanyl/vim-gh-line/,,
-https://github.com/rubiin/fortune.nvim/,HEAD,
-https://github.com/ruifm/gitlinker.nvim/,,
-https://github.com/rust-lang/rust.vim/,,
-https://github.com/ryanoasis/vim-devicons/,,
-https://github.com/ryvnf/readline.vim/,,
-https://github.com/s1n7ax/nvim-search-and-replace/,HEAD,
-https://github.com/s1n7ax/nvim-window-picker/,HEAD,
-https://github.com/saadparwaiz1/cmp_luasnip/,,
-https://github.com/saecki/crates.nvim/,,
-https://github.com/sainnhe/edge/,,
-https://github.com/sainnhe/everforest/,,
-https://github.com/sainnhe/gruvbox-material/,,
-https://github.com/sainnhe/sonokai/,,
-https://github.com/sakhnik/nvim-gdb/,,
-https://github.com/salkin-mada/openscad.nvim/,HEAD,
-https://github.com/sam4llis/nvim-lua-gf/,HEAD,
-https://github.com/samjwill/nvim-unception/,HEAD,
-https://github.com/samodostal/image.nvim/,HEAD,samodostal-image-nvim
-https://github.com/samoshkin/vim-mergetool/,,
-https://github.com/savq/melange-nvim/,,
-https://github.com/sbdchd/neoformat/,,
-https://github.com/scalameta/nvim-metals/,,
-https://github.com/scottmckendry/cyberdream.nvim/,,
-https://github.com/sdiehl/vim-ormolu/,,
-https://github.com/sebastianmarkow/deoplete-rust/,,
-https://github.com/seirl/vim-jinja-languages/,HEAD,
-https://github.com/SevereOverfl0w/deoplete-github/,,
-https://github.com/Shatur/neovim-ayu/,,
-https://github.com/shaunsingh/moonlight.nvim/,,pure-lua
-https://github.com/shaunsingh/nord.nvim/,,
-https://github.com/shaunsingh/solarized.nvim/,HEAD,
-https://github.com/sheerun/vim-polyglot/,,
-https://github.com/sheoak/vim-bepoptimist/,HEAD,
-https://github.com/shinchu/lightline-gruvbox.vim/,,
-https://github.com/ShinKage/idris2-nvim/,,
-https://github.com/shortcuts/no-neck-pain.nvim/,HEAD,
-https://github.com/Shougo/context_filetype.vim/,,
-https://github.com/Shougo/ddc-filter-matcher_head/,HEAD,
-https://github.com/Shougo/ddc-filter-sorter_rank/,HEAD,
-https://github.com/Shougo/ddc-source-lsp/,HEAD,
-https://github.com/Shougo/ddc-ui-native/,HEAD,
-https://github.com/Shougo/ddc-ui-pum/,HEAD,
-https://github.com/Shougo/ddc.vim/,HEAD,
-https://github.com/Shougo/defx.nvim/,,
-https://github.com/Shougo/denite.nvim/,,
-https://github.com/Shougo/deol.nvim/,,
-https://github.com/Shougo/deoplete.nvim/,,
-https://github.com/Shougo/echodoc.vim/,,
-https://github.com/Shougo/neco-syntax/,,
-https://github.com/Shougo/neco-vim/,,
-https://github.com/Shougo/neocomplete.vim/,,
-https://github.com/Shougo/neoinclude.vim/,,
-https://github.com/Shougo/neomru.vim/,,
-https://github.com/Shougo/neosnippet-snippets/,,
-https://github.com/Shougo/neosnippet.vim/,,
-https://github.com/Shougo/neoyank.vim/,,
-https://github.com/Shougo/pum.vim/,HEAD,
-https://github.com/Shougo/tabpagebuffer.vim/,,
-https://github.com/Shougo/unite.vim/,,
-https://github.com/Shougo/vimfiler.vim/,,
-https://github.com/Shougo/vimproc.vim/,,
-https://github.com/Shougo/vimshell.vim/,,
-https://github.com/shumphrey/fugitive-gitlab.vim/,,
-https://github.com/shunsambongi/neotest-testthat/,HEAD,
-https://github.com/sidlatau/neotest-dart/,HEAD,
-https://github.com/SidOfc/mkdx/,,
-https://github.com/sile-typesetter/vim-sile/,HEAD,
-https://github.com/simnalamburt/vim-mundo/,,
-https://github.com/simonmclean/triptych.nvim/,HEAD,
-https://github.com/simonrw/vim-yapf/,,
-https://github.com/simrat39/rust-tools.nvim/,,
-https://github.com/simrat39/symbols-outline.nvim/,,
-https://github.com/sindrets/diffview.nvim/,,
-https://github.com/sindrets/winshift.nvim/,,
-https://github.com/sirtaj/vim-openscad/,HEAD,
-https://github.com/SirVer/ultisnips/,,
-https://github.com/sjl/gundo.vim/,,
-https://github.com/sjl/splice.vim/,,
-https://github.com/sk1418/last256/,,
-https://github.com/skywind3000/asyncrun.vim/,,
-https://github.com/skywind3000/asynctasks.vim/,,
-https://github.com/slashmili/alchemist.vim/,,
-https://github.com/smiteshp/nvim-gps/,,
-https://github.com/SmiteshP/nvim-navbuddy/,,
-https://github.com/smiteshp/nvim-navic/,HEAD,
-https://github.com/smjonas/inc-rename.nvim/,HEAD,
-https://github.com/smjonas/live-command.nvim/,HEAD,
-https://github.com/smoka7/hop.nvim/,,
-https://github.com/smoka7/multicursors.nvim/,HEAD,
-https://github.com/Snikimonkd/telescope-git-conflicts.nvim/,HEAD,
-https://github.com/sodapopcan/vim-twiggy/,,
-https://github.com/solarnz/arcanist.vim/,,
-https://github.com/sonph/onehalf/,,
-https://github.com/sontungexpt/url-open/,HEAD,
-https://github.com/sotte/presenting.vim/,,
-https://github.com/sourcegraph/sg.nvim/,HEAD,
-https://github.com/SpaceVim/SpaceVim/,,
-https://github.com/spywhere/lightline-lsp/,,
-https://github.com/sQVe/sort.nvim/,HEAD,
-https://github.com/srcery-colors/srcery-vim/,,
-https://github.com/steelsojka/completion-buffers/,,
-https://github.com/steelsojka/pears.nvim/,,
-https://github.com/stefandtw/quickfix-reflector.vim/,,
-https://github.com/stephpy/vim-yaml/,,
-https://github.com/stevanmilic/neotest-scala/,HEAD,
-https://github.com/stevearc/aerial.nvim/,,
-https://github.com/stevearc/conform.nvim/,HEAD,
-https://github.com/stevearc/dressing.nvim/,,
-https://github.com/stevearc/oil.nvim/,HEAD,
-https://github.com/stevearc/overseer.nvim/,HEAD,
-https://github.com/stevearc/resession.nvim/,HEAD,
-https://github.com/stsewd/fzf-checkout.vim/,,
-https://github.com/stsewd/sphinx.nvim/,,
-https://github.com/sudormrfbin/cheatsheet.nvim/,,
-https://github.com/sunaku/vim-dasht/,,
-https://github.com/sunjon/Shade.nvim/,,
-https://github.com/supermaven-inc/supermaven-nvim/,HEAD,
-https://github.com/svermeulen/nvim-teal-maker/,HEAD,
-https://github.com/svermeulen/vim-subversive/,,
-https://github.com/swaits/zellij-nav.nvim/,HEAD,
-https://github.com/symphorien/vim-nixhash/,,
-https://github.com/t9md/vim-choosewin/,,
-https://github.com/t9md/vim-smalls/,,
-https://github.com/TabbyML/vim-tabby/,HEAD,
-https://github.com/TaDaa/vimade/,,
-https://github.com/tadmccorkle/markdown.nvim/,HEAD,
-https://github.com/takac/vim-hardtime/,,
-https://github.com/tamago324/cmp-zsh/,HEAD,
-https://github.com/tamago324/compe-zsh/,,
-https://github.com/tamago324/lir.nvim/,,
-https://github.com/tamago324/nlsp-settings.nvim/,main,
-https://github.com/tamton-aquib/staline.nvim/,main,
-https://github.com/taybart/b64.nvim/,HEAD,
-https://github.com/tbastos/vim-lua/,,
-https://github.com/tbodt/deoplete-tabnine/,,
-https://github.com/teal-language/vim-teal/,HEAD,
-https://github.com/ternjs/tern_for_vim/,,
-https://github.com/terrortylor/nvim-comment/,,
-https://github.com/terryma/vim-expand-region/,,
-https://github.com/terryma/vim-multiple-cursors/,,
-https://github.com/tesaguri/trust.vim/,HEAD,
-https://github.com/teto/stylish.nvim/,HEAD,
-https://github.com/tex/vimpreviewpandoc/,,
-https://github.com/Th3Whit3Wolf/one-nvim/,,
-https://github.com/theHamsta/nvim-dap-virtual-text/,,
-https://github.com/theHamsta/nvim-treesitter-pairs/,HEAD,
-https://github.com/themaxmarchuk/tailwindcss-colors.nvim/,HEAD,
-https://github.com/thenbe/neotest-playwright/,HEAD,
-https://github.com/ThePrimeagen/git-worktree.nvim/,,
-https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2
-https://github.com/ThePrimeagen/harpoon/,master,
-https://github.com/theprimeagen/refactoring.nvim/,,
-https://github.com/ThePrimeagen/vim-apm/,,
-https://github.com/ThePrimeagen/vim-be-good/,HEAD,
-https://github.com/TheSnakeWitcher/hardhat.nvim/,HEAD,
-https://github.com/theutz/neotest-pest/,HEAD,
-https://github.com/thinca/vim-ft-diff_fold/,,
-https://github.com/thinca/vim-prettyprint/,,
-https://github.com/thinca/vim-quickrun/,,
-https://github.com/thinca/vim-scouter/,,
-https://github.com/thinca/vim-themis/,,
-https://github.com/thinca/vim-visualstar/,,
-https://github.com/thirtythreeforty/lessspace.vim/,,
-https://github.com/thomasfaingnaert/vim-lsp-snippets/,HEAD,
-https://github.com/thomasfaingnaert/vim-lsp-ultisnips/,HEAD,
-https://github.com/thosakwe/vim-flutter/,,
-https://github.com/tiagofumo/vim-nerdtree-syntax-highlight/,,
-https://github.com/tiagovla/scope.nvim/,HEAD,
-https://github.com/tikhomirov/vim-glsl/,,
-https://github.com/tjdevries/colorbuddy.nvim/,,
-https://github.com/tjdevries/train.nvim/,,
-https://github.com/tmhedberg/SimpylFold/,,
-https://github.com/tmsvg/pear-tree/,,
-https://github.com/tmux-plugins/vim-tmux-focus-events/,,
-https://github.com/tmux-plugins/vim-tmux/,,
-https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,,
-https://github.com/tomasiser/vim-code-dark/,,
-https://github.com/tomasr/molokai/,,
-https://github.com/tomlion/vim-solidity/,,
-https://github.com/tommcdo/vim-exchange/,,
-https://github.com/tommcdo/vim-fubitive/,,
-https://github.com/tommcdo/vim-lion/,,
-https://github.com/tommcdo/vim-ninja-feet/,,
-https://github.com/tomtom/tcomment_vim/,,
-https://github.com/tomtom/tinykeymap_vim/,,tinykeymap
-https://github.com/tomtom/tlib_vim/,,
-https://github.com/tools-life/taskwiki/,,
-https://github.com/towolf/vim-helm/,,
-https://github.com/tpope/vim-abolish/,,
-https://github.com/tpope/vim-capslock/,,
-https://github.com/tpope/vim-commentary/,,
-https://github.com/tpope/vim-dadbod/,,
-https://github.com/tpope/vim-dispatch/,,
-https://github.com/tpope/vim-dotenv/,,
-https://github.com/tpope/vim-endwise/,,
-https://github.com/tpope/vim-eunuch/,,
-https://github.com/tpope/vim-fireplace/,,
-https://github.com/tpope/vim-flagship/,,
-https://github.com/tpope/vim-fugitive/,,
-https://github.com/tpope/vim-git/,,
-https://github.com/tpope/vim-liquid/,,
-https://github.com/tpope/vim-obsession/,,
-https://github.com/tpope/vim-pathogen/,,
-https://github.com/tpope/vim-projectionist/,,
-https://github.com/tpope/vim-ragtag/,,
-https://github.com/tpope/vim-rails/,,
-https://github.com/tpope/vim-repeat/,,
-https://github.com/tpope/vim-rhubarb/,,
-https://github.com/tpope/vim-rsi/,,
-https://github.com/tpope/vim-salve/,,
-https://github.com/tpope/vim-scriptease/,,
-https://github.com/tpope/vim-sensible/,,
-https://github.com/tpope/vim-sexp-mappings-for-regular-people/,,
-https://github.com/tpope/vim-sleuth/,,
-https://github.com/tpope/vim-speeddating/,,
-https://github.com/tpope/vim-surround/,,
-https://github.com/tpope/vim-tbone/,,
-https://github.com/tpope/vim-unimpaired/,,
-https://github.com/tpope/vim-vinegar/,,
-https://github.com/travitch/hasksyn/,,
-https://github.com/tremor-rs/tremor-vim/,,
-https://github.com/tridactyl/vim-tridactyl/,HEAD,
-https://github.com/triglav/vim-visual-increment/,,
-https://github.com/tris203/precognition.nvim/,HEAD,
-https://github.com/troydm/zoomwintab.vim/,,
-https://github.com/tummetott/unimpaired.nvim/,HEAD,
-https://github.com/turbio/bracey.vim/,,
-https://github.com/tversteeg/registers.nvim/,,
-https://github.com/tweekmonster/wstrip.vim/,,
-https://github.com/twerth/ir_black/,,
-https://github.com/twinside/vim-haskellconceal/,,
-https://github.com/Twinside/vim-hoogle/,,
-https://github.com/tyru/caw.vim/,,
-https://github.com/tyru/open-browser-github.vim/,,
-https://github.com/tyru/open-browser.vim/,,
-https://github.com/tzachar/cmp-ai/,HEAD,
-https://github.com/tzachar/cmp-fuzzy-buffer/,HEAD,
-https://github.com/tzachar/cmp-fuzzy-path/,HEAD,
-https://github.com/tzachar/cmp-tabnine/,,
-https://github.com/tzachar/compe-tabnine/,,
-https://github.com/tzachar/fuzzy.nvim/,HEAD,
-https://github.com/tzachar/highlight-undo.nvim/,HEAD,
-https://github.com/uarun/vim-protobuf/,,
-https://github.com/udalov/kotlin-vim/,,
-https://github.com/uga-rosa/ccc.nvim/,HEAD,
-https://github.com/uga-rosa/cmp-dictionary/,HEAD,
-https://github.com/ujihisa/neco-look/,,
-https://github.com/uloco/bluloco.nvim/,,
-https://github.com/unblevable/quick-scope/,,
-https://github.com/unisonweb/unison/,,
-https://github.com/ur4ltz/surround.nvim/,,
-https://github.com/urbit/hoon.vim/,,
-https://github.com/utilyre/barbecue.nvim/,,
-https://github.com/Valloric/MatchTagAlways/,,
-https://github.com/Valodim/deoplete-notmuch/,,
-https://github.com/vappolinario/cmp-clippy/,HEAD,
-https://github.com/Verf/deepwhite.nvim/,,
-https://github.com/vhda/verilog_systemverilog.vim/,,
-https://github.com/vhdirk/vim-cmake/,,
-https://github.com/vhsconnect/themed-tabs.nvim/,HEAD,
-https://github.com/vifm/vifm.vim/,,
-https://github.com/Vigemus/iron.nvim/,HEAD,
-https://github.com/vigoux/LanguageTool.nvim/,,
-https://github.com/vigoux/notifier.nvim/,HEAD,
-https://github.com/vijaymarupudi/nvim-fzf-commands/,,
-https://github.com/vijaymarupudi/nvim-fzf/,,
-https://github.com/vim-airline/vim-airline-themes/,,
https://github.com/vim-airline/vim-airline/,,
+https://github.com/enricobacis/vim-airline-clock/,,
+https://github.com/vim-airline/vim-airline-themes/,,
+https://github.com/Konfekt/vim-alias/,,
+https://github.com/hsanson/vim-android/,,
+https://github.com/osyo-manga/vim-anzu/,,
+https://github.com/ThePrimeagen/vim-apm/,,
+https://github.com/PeterRincker/vim-argumentative/,,
+https://github.com/FooSoft/vim-argwrap/,,
+https://github.com/haya14busa/vim-asterisk/,,
+https://github.com/wuelnerdotexe/vim-astro/,HEAD,
+https://github.com/hura/vim-asymptote/,,
+https://github.com/907th/vim-auto-save/,,
https://github.com/vim-autoformat/vim-autoformat/,,
+https://github.com/benizi/vim-automkdir/,,
+https://github.com/jenterkin/vim-autosource/,,
+https://github.com/gioele/vim-autoswap/,,
+https://github.com/bazelbuild/vim-bazel/,,
+https://github.com/moll/vim-bbye/,,
+https://github.com/ThePrimeagen/vim-be-good/,HEAD,
+https://github.com/nathangrigg/vim-beancount/,,
+https://github.com/sheoak/vim-bepoptimist/,HEAD,
+https://github.com/ntpeters/vim-better-whitespace/,,
+https://github.com/MattesGroeger/vim-bookmarks/,,
+https://github.com/gyim/vim-boxdraw/,,
+https://github.com/ConradIrwin/vim-bracketed-paste/,,
+https://github.com/mtikekar/vim-bsv/,,
+https://github.com/jeetsukumaran/vim-buffergator/,,
+https://github.com/bling/vim-bufferline/,,
+https://github.com/qpkorr/vim-bufkill/,,
+https://github.com/isobit/vim-caddyfile/,HEAD,
+https://github.com/tpope/vim-capslock/,,
+https://github.com/kristijanhusak/vim-carbon-now-sh/,,
+https://github.com/m-pilia/vim-ccls/,,
+https://github.com/t9md/vim-choosewin/,,
+https://github.com/rhysd/vim-clang-format/,,
+https://github.com/guns/vim-clojure-highlight/,,
+https://github.com/guns/vim-clojure-static/,,
+https://github.com/rstacruz/vim-closer/,,
+https://github.com/alvan/vim-closetag/,,
+https://github.com/vhdirk/vim-cmake/,,
+https://github.com/tomasiser/vim-code-dark/,,
+https://github.com/google/vim-codefmt/,,
+https://github.com/kchmck/vim-coffee-script/,,
+https://github.com/kalbasit/vim-colemak/,,
+https://github.com/altercation/vim-colors-solarized/,,
+https://github.com/flazz/vim-colorschemes/,,
+https://github.com/jonbri/vim-colorstepper/,,
+https://github.com/tpope/vim-commentary/,,
+https://github.com/luan/vim-concourse/,,
+https://github.com/romainl/vim-cool/,,
+https://github.com/octol/vim-cpp-enhanced-highlight/,,
+https://github.com/mhinz/vim-crates/,,
https://github.com/vim-crystal/vim-crystal/,HEAD,
-https://github.com/vim-denops/denops.vim/,HEAD,
+https://github.com/OrangeT/vim-csharp/,,
+https://github.com/ap/vim-css-color/,,
+https://github.com/jjo/vim-cue/,,
+https://github.com/itchyny/vim-cursorword/,,
+https://github.com/ehamberg/vim-cute-python/,,
+https://github.com/tpope/vim-dadbod/,,
+https://github.com/kristijanhusak/vim-dadbod-completion/,,
+https://github.com/kristijanhusak/vim-dadbod-ui/,,
+https://github.com/sunaku/vim-dasht/,,
+https://github.com/ajmwagar/vim-deus/,,
+https://github.com/ryanoasis/vim-devicons/,,
+https://github.com/jeffkreeftmeijer/vim-dim/,HEAD,
+https://github.com/blueyed/vim-diminactive/,,
+https://github.com/will133/vim-dirdiff/,,
+https://github.com/justinmk/vim-dirvish/,,
+https://github.com/kristijanhusak/vim-dirvish-git/,,
+https://github.com/tpope/vim-dispatch/,,
+https://github.com/radenling/vim-dispatch-neovim/,,
+https://github.com/jhradilek/vim-docbk/,,
+https://github.com/tpope/vim-dotenv/,,
+https://github.com/junegunn/vim-easy-align/,,
+https://github.com/zhou13/vim-easyescape/,,
+https://github.com/neoclide/vim-easygit/,,
+https://github.com/easymotion/vim-easymotion/,,
+https://github.com/xolox/vim-easytags/,,
+https://github.com/justincampbell/vim-eighties/,,
+https://github.com/elixir-editors/vim-elixir/,,
+https://github.com/andys8/vim-elm-syntax/,,
+https://github.com/kentarosasaki/vim-emacs-bindings/,HEAD,
+https://github.com/junegunn/vim-emoji/,,
+https://github.com/tpope/vim-endwise/,,
+https://github.com/Olical/vim-enmasse/,HEAD,
https://github.com/vim-erlang/vim-erlang-compiler/,,
https://github.com/vim-erlang/vim-erlang-omnicomplete/,,
https://github.com/vim-erlang/vim-erlang-runtime/,,
https://github.com/vim-erlang/vim-erlang-tags/,,
+https://github.com/tpope/vim-eunuch/,,
+https://github.com/tommcdo/vim-exchange/,,
+https://github.com/terryma/vim-expand-region/,,
+https://github.com/int3/vim-extradite/,,
+https://github.com/lambdalisue/vim-fern/,,
+https://github.com/wsdjeg/vim-fetch/,,
+https://github.com/fadein/vim-figlet/,HEAD,
+https://github.com/tpope/vim-fireplace/,,
+https://github.com/dag/vim-fish/,,
+https://github.com/tpope/vim-flagship/,,
+https://github.com/nvie/vim-flake8/,,
+https://github.com/dcharbon/vim-flatbuffers/,,
+https://github.com/voldikss/vim-floaterm/,,
+https://github.com/rbong/vim-flog/,,
+https://github.com/thosakwe/vim-flutter/,,
+https://github.com/thinca/vim-ft-diff_fold/,,
+https://github.com/tommcdo/vim-fubitive/,,
+https://github.com/tpope/vim-fugitive/,,
+https://github.com/maxjacobson/vim-fzf-coauthorship/,,
+https://github.com/HealsCodes/vim-gas/,,
+https://github.com/ruanyl/vim-gh-line/,,
+https://github.com/raghur/vim-ghost/,,
+https://github.com/lambdalisue/vim-gina/,,
+https://github.com/mattn/vim-gist/,,
+https://github.com/lambdalisue/vim-gista/,,
+https://github.com/tpope/vim-git/,,
+https://github.com/itchyny/vim-gitbranch/,,
+https://github.com/airblade/vim-gitgutter/,,
+https://github.com/junegunn/vim-github-dashboard/,,
+https://github.com/tikhomirov/vim-glsl/,,
+https://github.com/jamessan/vim-gnupg/,,
+https://github.com/fatih/vim-go/,,
+https://github.com/habamax/vim-godot/,HEAD,
+https://github.com/rhysd/vim-grammarous/,,
+https://github.com/jparise/vim-graphql/,,
+https://github.com/mhinz/vim-grepper/,,
+https://github.com/lifepillar/vim-gruvbox8/,,
+https://github.com/brennanfee/vim-gui-position/,,
+https://github.com/ludovicchabant/vim-gutentags/,,
+https://github.com/habamax/vim-habamax/,HEAD,
+https://github.com/takac/vim-hardtime/,,
+https://github.com/chkno/vim-haskell-module-name/,,
+https://github.com/enomsg/vim-haskellConcealPlus/,,
+https://github.com/twinside/vim-haskellconceal/,,
+https://github.com/jvirtanen/vim-hcl/,,
+https://github.com/bitc/vim-hdevtools/,,
+https://github.com/towolf/vim-helm/,,
+https://github.com/RRethy/vim-hexokinase/,,
+https://github.com/jceb/vim-hier/,,
+https://github.com/machakann/vim-highlightedyank/,,
+https://github.com/alx741/vim-hindent/,,
+https://github.com/GEverding/vim-hocon/,,
+https://github.com/Twinside/vim-hoogle/,,
+https://github.com/ntk148v/vim-horizon/,,
+https://github.com/jonsmithers/vim-html-template-literals/,,
+https://github.com/humanoid-colors/vim-humanoid-colorscheme/,,
+https://github.com/vim-utils/vim-husk/,,
+https://github.com/w0ng/vim-hybrid/,,
+https://github.com/kristijanhusak/vim-hybrid-material/,,
+https://github.com/noc7c9/vim-iced-coffee-script/,,
+https://github.com/RRethy/vim-illuminate/,,
+https://github.com/preservim/vim-indent-guides/,,
+https://github.com/michaeljsmith/vim-indent-object/,,
+https://github.com/jeetsukumaran/vim-indentwise/,,
+https://github.com/henrik/vim-indexed-search/,,
+https://github.com/ivanov/vim-ipython/,,
+https://github.com/fisadev/vim-isort/,,
+https://github.com/clojure-vim/vim-jack-in/,,
+https://github.com/mhinz/vim-janah/,,
+https://github.com/artur-shaik/vim-javacomplete2/,,
+https://github.com/pangloss/vim-javascript/,,
+https://github.com/jelera/vim-javascript-syntax/,,
+https://github.com/lepture/vim-jinja/,,
+https://github.com/seirl/vim-jinja-languages/,HEAD,
+https://github.com/avm99963/vim-jjdescription/,HEAD,
+https://github.com/maksimr/vim-jsbeautify/,,
+https://github.com/heavenshell/vim-jsdoc/,,
+https://github.com/elzr/vim-json/,,
+https://github.com/google/vim-jsonnet/,,
+https://github.com/mogelbrod/vim-jsonpath/,HEAD,
+https://github.com/MaxMEllon/vim-jsx-pretty/,,
+https://github.com/peitalin/vim-jsx-typescript/,,
+https://github.com/mroavi/vim-julia-cell/,HEAD,
+https://github.com/NoahTheDuke/vim-just/,,
+https://github.com/knubie/vim-kitty-navigator/,,
+https://github.com/lark-parser/vim-lark-syntax/,HEAD,
+https://github.com/farmergreg/vim-lastplace/,,
+https://github.com/xuhdev/vim-latex-live-preview/,,
+https://github.com/ludovicchabant/vim-lawrencium/,,
+https://github.com/hecal3/vim-leader-guide/,,
+https://github.com/mk12/vim-lean/,,
+https://github.com/ledger/vim-ledger/,,
+https://github.com/preservim/vim-lexical/,HEAD,
+https://github.com/lfe-support/vim-lfe/,,
+https://github.com/josa42/vim-lightline-coc/,,
+https://github.com/tommcdo/vim-lion/,,
+https://github.com/tpope/vim-liquid/,,
+https://github.com/rhysd/vim-llvm/,HEAD,
+https://github.com/embear/vim-localvimrc/,,
+https://github.com/andreshazard/vim-logreview/,,
+https://github.com/mlr-msft/vim-loves-dafny/,,
+https://github.com/natebosch/vim-lsc/,,
+https://github.com/prabirshrestha/vim-lsp/,,
+https://github.com/rhysd/vim-lsp-ale/,HEAD,
+https://github.com/jackguo380/vim-lsp-cxx-highlight/,,
+https://github.com/mattn/vim-lsp-settings/,HEAD,
+https://github.com/thomasfaingnaert/vim-lsp-snippets/,HEAD,
+https://github.com/thomasfaingnaert/vim-lsp-ultisnips/,HEAD,
+https://github.com/tbastos/vim-lua/,,
+https://github.com/google/vim-maktaba/,,
+https://github.com/lambdalisue/vim-manpager/,,
+https://github.com/Yilin-Yang/vim-markbar/,,
+https://github.com/preservim/vim-markdown/,,
+https://github.com/euclio/vim-markdown-composer/,,
+https://github.com/mzlogin/vim-markdown-toc/,,
+https://github.com/leafOfTree/vim-matchtag/,HEAD,
+https://github.com/andymass/vim-matchup/,,
+https://github.com/aquach/vim-mediawiki-editor/,HEAD,
+https://github.com/samoshkin/vim-mergetool/,,
+https://github.com/idanarye/vim-merginal/,,
+https://github.com/david-a-wheeler/vim-metamath/,,
+https://github.com/xolox/vim-misc/,,
+https://github.com/delroth/vim-molokai-delroth/,HEAD,
+https://github.com/crusoexia/vim-monokai/,,
+https://github.com/phanviet/vim-monokai-pro/,,
+https://github.com/patstockwell/vim-monokai-tasty/,HEAD,
+https://github.com/matze/vim-move/,,
+https://github.com/lifepillar/vim-mucomplete/,,
+https://github.com/terryma/vim-multiple-cursors/,,
+https://github.com/simnalamburt/vim-mundo/,,
+https://github.com/mustache/vim-mustache-handlebars/,,
+https://github.com/tiagofumo/vim-nerdtree-syntax-highlight/,,
+https://github.com/jistr/vim-nerdtree-tabs/,,
+https://github.com/nfnty/vim-nftables/,,
+https://github.com/kana/vim-niceblock/,,
+https://github.com/nickel-lang/vim-nickel/,main,
+https://github.com/bluz71/vim-nightfly-colors/,,nightfly
+https://github.com/tommcdo/vim-ninja-feet/,,
+https://github.com/LnL7/vim-nix/,,
+https://github.com/symphorien/vim-nixhash/,,
+https://github.com/noahfrederick/vim-noctu/,,
+https://github.com/fruit-in/vim-nong-theme/,,
+https://github.com/jeffkreeftmeijer/vim-numbertoggle/,,
+https://github.com/tpope/vim-obsession/,,
+https://github.com/ocaml/vim-ocaml/,,
+https://github.com/rakr/vim-one/,,
+https://github.com/petRUShka/vim-opencl/,,
+https://github.com/sirtaj/vim-openscad/,HEAD,
+https://github.com/kana/vim-operator-replace/,,
+https://github.com/rhysd/vim-operator-surround/,,
+https://github.com/kana/vim-operator-user/,,
+https://github.com/jceb/vim-orgmode/,,
+https://github.com/sdiehl/vim-ormolu/,,
+https://github.com/fcpg/vim-osc52/,,
+https://github.com/ojroques/vim-oscyank/,,
+https://github.com/osyo-manga/vim-over/,,
+https://github.com/hashivim/vim-packer/,,
+https://github.com/lambdalisue/vim-pager/,,
+https://github.com/vim-pandoc/vim-pandoc/,,
https://github.com/vim-pandoc/vim-pandoc-after/,,
https://github.com/vim-pandoc/vim-pandoc-syntax/,,
-https://github.com/vim-pandoc/vim-pandoc/,,
-https://github.com/vim-python/python-syntax/,,
-https://github.com/vim-ruby/vim-ruby/,,
-https://github.com/vim-scripts/a.vim/,,
-https://github.com/vim-scripts/align/,,
-https://github.com/vim-scripts/argtextobj.vim/,,
-https://github.com/vim-scripts/autoload_cscope.vim/,,
-https://github.com/vim-scripts/bats.vim/,,
-https://github.com/vim-scripts/BufOnly.vim/,,
-https://github.com/vim-scripts/changeColorScheme.vim/,,
-https://github.com/vim-scripts/Colour-Sampler-Pack/,,
-https://github.com/vim-scripts/DoxygenToolkit.vim/,,
-https://github.com/vim-scripts/emodeline/,,
-https://github.com/vim-scripts/errormarker.vim/,,
-https://github.com/vim-scripts/gitignore.vim/,,
-https://github.com/vim-scripts/Improved-AnsiEsc/,,
-https://github.com/vim-scripts/jdaddy.vim/,,
-https://github.com/vim-scripts/matchit.zip/,,
-https://github.com/vim-scripts/mayansmoke/,,
-https://github.com/vim-scripts/PreserveNoEOL/,,
-https://github.com/vim-scripts/prev_indent/,,
-https://github.com/vim-scripts/random.vim/,,
-https://github.com/vim-scripts/rcshell.vim/,,
-https://github.com/vim-scripts/Rename/,,
-https://github.com/vim-scripts/ReplaceWithRegister/,,
-https://github.com/vim-scripts/restore_view.vim/,HEAD,restore-view-vim
-https://github.com/vim-scripts/ShowMultiBase/,,
-https://github.com/vim-scripts/SmartCase/,,
-https://github.com/vim-scripts/tabmerge/,,
-https://github.com/vim-scripts/taglist.vim/,,
-https://github.com/vim-scripts/timestamp.vim/,,
-https://github.com/vim-scripts/utl.vim/,,
-https://github.com/vim-scripts/vis/,,
-https://github.com/vim-scripts/wombat256.vim/,,
-https://github.com/vim-scripts/YankRing.vim/,,
-https://github.com/vim-syntastic/syntastic/,,
-https://github.com/vim-test/vim-test/,,
-https://github.com/vim-utils/vim-husk/,,
-https://github.com/Vimjas/vim-python-pep8-indent/,,
-https://github.com/vimlab/split-term.vim/,,
-https://github.com/vimoutliner/vimoutliner/,,
-https://github.com/vimpostor/vim-tpipeline/,,
-https://github.com/vimsence/vimsence/,,
-https://github.com/vimwiki/vimwiki/,,
-https://github.com/vito-c/jq.vim/,,
-https://github.com/vladdoster/remember.nvim/,,
-https://github.com/vmchale/ats-vim/,,
-https://github.com/vmchale/dhall-vim/,,
-https://github.com/vmware-archive/salt-vim/,,
-https://github.com/vn-ki/coc-clap/,,
-https://github.com/voldikss/vim-floaterm/,,
-https://github.com/VonHeikemen/lsp-zero.nvim/,v3.x,
-https://github.com/VonHeikemen/searchbox.nvim/,,
-https://github.com/Vonr/align.nvim/,HEAD,
-https://github.com/vuki656/package-info.nvim/,,
-https://github.com/VundleVim/Vundle.vim/,,
-https://github.com/w0ng/vim-hybrid/,,
-https://github.com/wakatime/vim-wakatime/,,
-https://github.com/wannesm/wmgraphviz.vim/,,
-https://github.com/Wansmer/langmapper.nvim/,HEAD,
-https://github.com/Wansmer/treesj/,main,
-https://github.com/wbthomason/packer.nvim/,,
-https://github.com/weilbith/neotest-gradle/,HEAD,
-https://github.com/weilbith/nvim-code-action-menu/,,
-https://github.com/weirongxu/plantuml-previewer.vim/,HEAD,
-https://github.com/wellle/context.vim/,,
-https://github.com/wellle/targets.vim/,,
-https://github.com/wellle/tmux-complete.vim/,,
-https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD,
-https://github.com/wesQ3/vim-windowswap/,,
-https://github.com/wfxr/minimap.vim/,,
-https://github.com/WhiteBlackGoose/magma-nvim-goose/,HEAD,
-https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/,HEAD,
-https://github.com/whonore/Coqtail/,,
-https://github.com/will133/vim-dirdiff/,,
-https://github.com/williamboman/mason-lspconfig.nvim/,HEAD,
-https://github.com/williamboman/mason.nvim/,HEAD,
-https://github.com/willothy/flatten.nvim/,HEAD,
-https://github.com/willothy/nvim-cokeline/,HEAD,
-https://github.com/wincent/command-t/,,
-https://github.com/wincent/ferret/,,
-https://github.com/wincent/terminus/,,
-https://github.com/windwp/nvim-autopairs/,,
-https://github.com/windwp/nvim-ts-autotag/,,
-https://github.com/winston0410/cmd-parser.nvim/,,
-https://github.com/winston0410/mark-radar.nvim/,HEAD,
-https://github.com/winston0410/range-highlight.nvim/,,
-https://github.com/wintermute-cell/gitignore.nvim/,HEAD,
-https://github.com/wlangstroth/vim-racket/,,
-https://github.com/wsdjeg/vim-fetch/,,
-https://github.com/wuelnerdotexe/vim-astro/,HEAD,
-https://github.com/xavierd/clang_complete/,,
-https://github.com/xeluxee/competitest.nvim/,HEAD,
-https://github.com/xero/miasma.nvim/,,
-https://github.com/xiyaowong/transparent.nvim/,HEAD,
-https://github.com/xolox/vim-easytags/,,
-https://github.com/xolox/vim-misc/,,
-https://github.com/xuhdev/vim-latex-live-preview/,,
-https://github.com/Xuyuanp/nerdtree-git-plugin/,,
-https://github.com/Xuyuanp/scrollbar.nvim/,,
-https://github.com/yamatsum/nvim-cursorline/,,
-https://github.com/yamatsum/nvim-nonicons/,,
-https://github.com/ycm-core/YouCompleteMe/,,
-https://github.com/yegappan/mru/,,
-https://github.com/Yggdroot/hiPairs/,,
-https://github.com/Yggdroot/indentLine/,,
-https://github.com/Yggdroot/LeaderF/,,
-https://github.com/Yilin-Yang/vim-markbar/,,
-https://github.com/yonlu/omni.vim/,,
-https://github.com/yorickpeterse/nvim-pqf/,HEAD,
https://github.com/yorickpeterse/vim-paper/,HEAD,
-https://github.com/yssl/QFEnter/,,
-https://github.com/yuki-yano/ncm2-dictionary/,,
-https://github.com/yunlingz/ci_dark/,,
-https://github.com/zah/nim.vim/,,
-https://github.com/zbirenbaum/copilot-cmp/,HEAD,
-https://github.com/zbirenbaum/copilot.lua/,HEAD,
-https://github.com/zbirenbaum/nvterm/,HEAD,
-https://github.com/Zeioth/compiler.nvim/,HEAD,
+https://github.com/bhurlow/vim-parinfer/,,
+https://github.com/ku1ik/vim-pasta/,,
+https://github.com/tpope/vim-pathogen/,,
+https://github.com/junegunn/vim-peekaboo/,,
+https://github.com/preservim/vim-pencil/,,
+https://github.com/MeF0504/vim-pets/,HEAD,
+https://github.com/jparise/vim-phabricator/,,
+https://github.com/justinj/vim-pico8-syntax/,,
+https://github.com/junegunn/vim-plug/,,
+https://github.com/powerman/vim-plugin-AnsiEsc/,,
+https://github.com/hasundue/vim-pluto/,HEAD,
+https://github.com/sheerun/vim-polyglot/,,
+https://github.com/haya14busa/vim-poweryank/,,
+https://github.com/prettier/vim-prettier/,,
+https://github.com/thinca/vim-prettyprint/,,
+https://github.com/meain/vim-printer/,HEAD,
+https://github.com/prisma/vim-prisma/,,
+https://github.com/tpope/vim-projectionist/,,
+https://github.com/dhruvasagar/vim-prosession/,,
+https://github.com/uarun/vim-protobuf/,,
+https://github.com/PProvost/vim-ps1/,,
+https://github.com/digitaltoad/vim-pug/,,
+https://github.com/rodjek/vim-puppet/,,
+https://github.com/Vimjas/vim-python-pep8-indent/,,
+https://github.com/romainl/vim-qf/,,
+https://github.com/romainl/vim-qlist/,,
+https://github.com/peterhoeg/vim-qml/,,
+https://github.com/thinca/vim-quickrun/,,
+https://github.com/racer-rust/vim-racer/,,
+https://github.com/wlangstroth/vim-racket/,,
+https://github.com/tpope/vim-ragtag/,,
+https://github.com/tpope/vim-rails/,,
+https://github.com/jordwalke/vim-reasonml/,,
+https://github.com/tpope/vim-repeat/,,
+https://github.com/tpope/vim-rhubarb/,,
+https://github.com/airblade/vim-rooter/,,
+https://github.com/tpope/vim-rsi/,,
+https://github.com/vim-ruby/vim-ruby/,,
+https://github.com/tpope/vim-salve/,,
+https://github.com/machakann/vim-sandwich/,,
+https://github.com/mhinz/vim-sayonara/,7e774f58c5865d9c10d40396850b35ab95af17c5,
+https://github.com/derekwyatt/vim-scala/,,
+https://github.com/thinca/vim-scouter/,,
+https://github.com/tpope/vim-scriptease/,,
+https://github.com/inside/vim-search-pulse/,,
+https://github.com/tpope/vim-sensible/,,
+https://github.com/Konfekt/vim-sentence-chopper/,HEAD,
+https://github.com/guns/vim-sexp/,,
+https://github.com/tpope/vim-sexp-mappings-for-regular-people/,,
+https://github.com/itspriddle/vim-shellcheck/,,
+https://github.com/kshenoy/vim-signature/,,
+https://github.com/mhinz/vim-signify/,,
+https://github.com/sile-typesetter/vim-sile/,HEAD,
+https://github.com/ivalkeen/vim-simpledb/,,
+https://github.com/junegunn/vim-slash/,,
+https://github.com/tpope/vim-sleuth/,,
+https://github.com/jpalardy/vim-slime/,,
+https://github.com/mzlogin/vim-smali/,,
+https://github.com/t9md/vim-smalls/,,
+https://github.com/Industrial/vim-smartbd/,HEAD,
+https://github.com/Industrial/vim-smartbw/,HEAD,
+https://github.com/psliwka/vim-smoothie/,,
+https://github.com/bohlender/vim-smt2/,,
+https://github.com/justinmk/vim-sneak/,,
+https://github.com/garbas/vim-snipmate/,,
+https://github.com/honza/vim-snippets/,,
+https://github.com/jhradilek/vim-snippets/,,vim-docbk-snippets
+https://github.com/lifepillar/vim-solarized8/,HEAD,
+https://github.com/tomlion/vim-solidity/,,
+https://github.com/christoomey/vim-sort-motion/,,
+https://github.com/tpope/vim-speeddating/,,
+https://github.com/kbenzie/vim-spirv/,,
+https://github.com/mhinz/vim-startify/,,
+https://github.com/dstein64/vim-startuptime/,,
+https://github.com/axelf4/vim-strip-trailing-whitespace/,,
+https://github.com/nbouscal/vim-stylish-haskell/,,
+https://github.com/alx741/vim-stylishask/,,
+https://github.com/lunacookies/vim-substrata/,HEAD,
+https://github.com/svermeulen/vim-subversive/,,
+https://github.com/lambdalisue/vim-suda/,,
+https://github.com/tpope/vim-surround/,,
+https://github.com/evanleck/vim-svelte/,,
+https://github.com/machakann/vim-swap/,,
+https://github.com/TabbyML/vim-tabby/,HEAD,
+https://github.com/dhruvasagar/vim-table-mode/,,
+https://github.com/kana/vim-tabpagecd/,,
+https://github.com/tpope/vim-tbone/,,
+https://github.com/teal-language/vim-teal/,HEAD,
+https://github.com/erietz/vim-terminator/,HEAD,
+https://github.com/hashivim/vim-terraform/,,
+https://github.com/juliosueiras/vim-terraform-completion/,,
+https://github.com/vim-test/vim-test/,,
+https://github.com/glts/vim-textobj-comment/,,
+https://github.com/kana/vim-textobj-entire/,,
+https://github.com/kana/vim-textobj-function/,,
+https://github.com/gibiansky/vim-textobj-haskell/,,
+https://github.com/osyo-manga/vim-textobj-multiblock/,,
+https://github.com/kana/vim-textobj-user/,,
+https://github.com/Julian/vim-textobj-variable-segment/,,
+https://github.com/thinca/vim-themis/,,
+https://github.com/tmux-plugins/vim-tmux/,,
+https://github.com/roxma/vim-tmux-clipboard/,,
+https://github.com/tmux-plugins/vim-tmux-focus-events/,,
+https://github.com/christoomey/vim-tmux-navigator/,,
+https://github.com/milkypostman/vim-togglelist/,,
+https://github.com/cespare/vim-toml/,,
+https://github.com/vimpostor/vim-tpipeline/,,
+https://github.com/bronson/vim-trailing-whitespace/,,
+https://github.com/tridactyl/vim-tridactyl/,HEAD,
+https://github.com/ianks/vim-tsx/,,
+https://github.com/lumiliet/vim-twig/,,
+https://github.com/sodapopcan/vim-twiggy/,,
+https://github.com/rcarriga/vim-ultest/,,
+https://github.com/arthurxavierx/vim-unicoder/,,
+https://github.com/tpope/vim-unimpaired/,,
+https://github.com/hashivim/vim-vagrant/,,
+https://github.com/tpope/vim-vinegar/,,
+https://github.com/triglav/vim-visual-increment/,,
+https://github.com/mg979/vim-visual-multi/,,
+https://github.com/bronson/vim-visual-star-search/,HEAD,
+https://github.com/thinca/vim-visualstar/,,
+https://github.com/ngemily/vim-vp4/,HEAD,
+https://github.com/hrsh7th/vim-vsnip/,,
+https://github.com/hrsh7th/vim-vsnip-integ/,,
+https://github.com/posva/vim-vue/,,
+https://github.com/leafOfTree/vim-vue-plugin/,HEAD,
+https://github.com/wakatime/vim-wakatime/,,
+https://github.com/osyo-manga/vim-watchdogs/,,
+https://github.com/jasonccox/vim-wayland-clipboard/,,
+https://github.com/liuchengxu/vim-which-key/,,
+https://github.com/wesQ3/vim-windowswap/,,
+https://github.com/chaoren/vim-wordmotion/,,
+https://github.com/preservim/vim-wordy/,,
+https://github.com/joonty/vim-xdebug/,,
+https://github.com/lyokha/vim-xkbswitch/,,
+https://github.com/mg979/vim-xtabline/,,
+https://github.com/stephpy/vim-yaml/,,
+https://github.com/simonrw/vim-yapf/,,
+https://github.com/michal-h21/vim-zettel/,HEAD,
+https://github.com/marrub--/vim-zscript/,HEAD,
+https://github.com/dag/vim2hs/,,
+https://github.com/monkoose/vim9-stargate/,HEAD,
+https://github.com/dominikduda/vim_current_word/,,
+https://github.com/andrep/vimacs/,,
+https://github.com/TaDaa/vimade/,,
+https://github.com/jreybert/vimagit/,,
+https://github.com/gotcha/vimelette/,,
+https://github.com/Shougo/vimfiler.vim/,,
+https://github.com/vimoutliner/vimoutliner/,,
+https://github.com/tex/vimpreviewpandoc/,,
+https://github.com/Shougo/vimproc.vim/,,
+https://github.com/vimsence/vimsence/,,
+https://github.com/Shougo/vimshell.vim/,,
+https://github.com/puremourning/vimspector/,,
+https://github.com/lervag/vimtex/,,
+https://github.com/preservim/vimux/,,
+https://github.com/vimwiki/vimwiki/,,
+https://github.com/lukas-reineke/virt-column.nvim/,HEAD,
+https://github.com/jubnzv/virtual-types.nvim/,HEAD,
+https://github.com/vim-scripts/vis/,,
+https://github.com/navicore/vissort.vim/,,
+https://github.com/liuchengxu/vista.vim/,,
+https://github.com/Mofiqul/vscode.nvim/,,
+https://github.com/dylanaraps/wal.vim/,,
+https://github.com/mattn/webapi-vim/,,
+https://github.com/DingDean/wgsl.vim/,HEAD,
+https://github.com/folke/which-key.nvim/,,
+https://github.com/johnfrankmorgan/whitespace.nvim/,HEAD,
+https://github.com/lervag/wiki-ft.vim/,HEAD,
+https://github.com/lervag/wiki.vim/,HEAD,
+https://github.com/gelguy/wilder.nvim/,,
+https://github.com/gcmt/wildfire.vim/,,
+https://github.com/fgheng/winbar.nvim/,main,
+https://github.com/anuvyklack/windows.nvim/,,
+https://github.com/sindrets/winshift.nvim/,,
+https://github.com/wannesm/wmgraphviz.vim/,,
+https://github.com/vim-scripts/wombat256.vim/,,
+https://github.com/lukaszkorecki/workflowish/,,
+https://github.com/andrewferrier/wrapping.nvim/,HEAD,
+https://github.com/tweekmonster/wstrip.vim/,,
+https://github.com/piersolenski/wtf.nvim/,HEAD,
+https://github.com/drmingdrmer/xptemplate/,,
+https://github.com/guns/xterm-color-table.vim/,,
+https://github.com/gbprod/yanky.nvim/,HEAD,
+https://github.com/HerringtonDarkholme/yats.vim/,,
+https://github.com/mikavilpas/yazi.nvim/,HEAD,
+https://github.com/lucasew/yescapsquit.vim/,HEAD,
+https://github.com/elkowar/yuck.vim/,HEAD,
+https://github.com/fsharp/zarchive-vim-fsharp/,,
+https://github.com/KabbAmine/zeavim.vim/,,
+https://github.com/swaits/zellij-nav.nvim/,HEAD,
+https://github.com/Lilja/zellij.nvim/,HEAD,
+https://github.com/folke/zen-mode.nvim/,,
https://github.com/zenbones-theme/zenbones.nvim/,HEAD,
-https://github.com/zhou13/vim-easyescape/,,
-https://github.com/zidhuss/neotest-minitest/,HEAD,
+https://github.com/jnurmine/zenburn/,,
+https://github.com/phha/zenburn.nvim/,,phha-zenburn
+https://github.com/nvimdev/zephyr-nvim/,,
https://github.com/ziglang/zig.vim/,,
-https://github.com/ziontee113/syntax-tree-surfer/,HEAD,
https://github.com/zk-org/zk-nvim/,HEAD,
-https://github.com/zootedb0t/citruszest.nvim/,,
-https://gitlab.com/HiPhish/rainbow-delimiters.nvim,HEAD,
-https://gitlab.com/usmcamp0811/nvim-julia-autotest,HEAD,
+https://github.com/troydm/zoomwintab.vim/,,
+https://github.com/nanotee/zoxide.vim/,,
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 6faa812d4423..37e29095c05e 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -313,8 +313,8 @@ let
mktplcRef = {
name = "vscode-apollo";
publisher = "apollographql";
- version = "2.3.3";
- hash = "sha256-pxj3BM+LJPS9KxxniEtBLT3x1FERGr4yPndxOSVLgR8=";
+ version = "2.3.6";
+ hash = "sha256-4AehjV7XO9NxS3aHpqm2sKA+kaFbYLrr3E5sUCTRW0I=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog";
@@ -406,8 +406,8 @@ let
mktplcRef = {
name = "vscode-neovim";
publisher = "asvetliakov";
- version = "1.18.12";
- hash = "sha256-3Nmk0MFIMFYQHrRyZ7ioFk9KfHSk0CSF7FwNaEJbsyg=";
+ version = "1.18.13";
+ hash = "sha256-FFgleWhzFaAE0UdKQ6lZsszBtJ46UZ3bfx1V3SopDNc=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog";
@@ -4585,8 +4585,8 @@ let
mktplcRef = {
name = "svelte-vscode";
publisher = "svelte";
- version = "108.3.3";
- hash = "sha256-q7w8DPzBLpD+13v7RnyDdC3ocDKAihHBVt3pnwSTwio=";
+ version = "109.1.0";
+ hash = "sha256-ozD9k/zfklwBJtc1WdC52hgJckxBgVRmcZOwSYboACM=";
};
meta = {
changelog = "https://github.com/sveltejs/language-tools/releases";
@@ -4904,8 +4904,8 @@ let
mktplcRef = {
name = "uiua-vscode";
publisher = "uiua-lang";
- version = "0.0.54";
- hash = "sha256-oY8z3q4LOLhiTttm9Rtcy/CnhaSHkjyCBjwqYnuNBQA=";
+ version = "0.0.56";
+ hash = "sha256-4uze2hmTV8sNDSdlvwLf1Z/4dGn4pda0mT0FCg/xWqM=";
};
meta = {
description = "VSCode language extension for Uiua";
@@ -4958,8 +4958,8 @@ let
mktplcRef = {
name = "errorlens";
publisher = "usernamehw";
- version = "3.16.0";
- hash = "sha256-Y3M/A5rYLkxQPRIZ0BUjhlkvixDae+wIRUsBn4tREFw=";
+ version = "3.20.0";
+ hash = "sha256-0gCT+u6rfkEcWcdzqRdc4EosROllD/Q0TIOQ4k640j0=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog";
diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
index 1cee541ab629..527e26c2d9c3 100644
--- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
@@ -3,32 +3,31 @@
stdenv,
vscode-utils,
fetchurl,
- ...
}:
let
- version = "0.12.0";
+ version = "0.12.2";
sources = {
"x86_64-linux" = {
arch = "linux-x64";
url = "https://download.visualjj.com/visualjj-linux-x64-${version}.vsix";
- hash = "sha256-7zIe5yTSpAhkG4S+k2SAnp4ZOrbbSsdxExpRfMG5EAo=";
+ hash = "sha256-42xUp1HDnu1YZwXYgBhqshNzA0sx7VZLZzSaQypZb1M=";
};
"x86_64-darwin" = {
arch = "darwin-x64";
url = "https://download.visualjj.com/visualjj-darwin-x64-${version}.vsix";
- hash = "sha256-0mBNcrfDUqdPfQyc38/Z8YppFP8u9tbxpOLWrQriviE=";
+ hash = "sha256-RFxhGKQpQnMbwuYfHQolFRJxI61hzog2A44x7W39yKw=";
};
"aarch64-linux" = {
arch = "linux-arm64";
url = "https://download.visualjj.com/visualjj-linux-arm64-${version}.vsix";
- hash = "sha256-YvKTs+kA4PghQkduq3aIx20bnGv1VnCtMqLmkLADfbE=";
+ hash = "sha256-KHeg2wAe1aynwAbQh5Do/rCbk2bqLZ3iIrYpDFRIw/E=";
};
"aarch64-darwin" = {
arch = "darwin-arm64";
url = "https://download.visualjj.com/visualjj-darwin-arm64-${version}.vsix";
- hash = "sha256-gV8VKwPBsgUCDd/A02ASNozuBl/tt5FW0xKOgVKVgAM=";
+ hash = "sha256-3y/MhxDgQBnbQ2OYLYFcl7488sKE7iVO4YhUhmQyCIM=";
};
};
in
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 11f913e9dc89..5c689cc37931 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -31,21 +31,21 @@ let
archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "0w452wnzyb4wmr2qqq55dhfb1jd0zqmwf65fbmxdz7jn1jimjjrn";
- x86_64-darwin = "1b333snvrw8khryhi5scfhhkg43m3b6ds3nvs24nbvx8k7h69hmm";
- aarch64-linux = "12p5cdva14s9sfgyrzg3nylpmgdnmfavwx3xxxmblzq1gcal2g6i";
- aarch64-darwin = "1l59fcdvynkl5kyz9bn31mld6pi89nynk1zw645rczjm940pac7p";
- armv7l-linux = "07ylija6chg6jc2zcavdr9yw1laniigw57f2gilyjynv1cgjm76r";
+ x86_64-linux = "12cfks56pz1fljv4zrh4q2k6vai2rpdyw5lbap9y8wa9f5pz0m55";
+ x86_64-darwin = "0zxmlpilh83grcv6jk2avlxiy2w0a1vbwmv0fjzy6nvdma91j7lj";
+ aarch64-linux = "1gx5xg54mmkiglwmv8fjppqb8bj0fqn9yg0r5q9kzdhh9702dxsg";
+ aarch64-darwin = "13wnraa13msz7rxzwk232rwrnbmwx0dpq13aq68zjz80clsf4jgp";
+ armv7l-linux = "06kngg0scrk8sz3j874iffyci70ng8j8l1v83k572vw847956850";
}.${system} or throwSystem;
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
- version = "1.94.2";
+ version = "1.95.0";
pname = "vscode" + lib.optionalString isInsiders "-insiders";
# This is used for VS Code - Remote SSH test
- rev = "384ff7382de624fb94dbaf6da11977bba1ecd427";
+ rev = "912bb683695358a54ae0c670461738984cbb5b95";
executableName = "code" + lib.optionalString isInsiders "-insiders";
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -69,7 +69,7 @@ in
src = fetchurl {
name = "vscode-server-${rev}.tar.gz";
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
- sha256 = "1mj9fg76b9x9r6ql21hbckpni179vfa9j8fiah9rd6ih7sb72048";
+ sha256 = "1chk0xwsiw6pm6ihjlp9695n0l1wfipwv4h04v5dmm9dcwlarp1m";
};
stdenv = stdenvNoCC;
};
diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix
index 18c510b8465b..f30d55ee4395 100644
--- a/pkgs/applications/emulators/retroarch/cores.nix
+++ b/pkgs/applications/emulators/retroarch/cores.nix
@@ -8,7 +8,7 @@
, curl
, fetchFromGitHub
, fetchpatch
-, ffmpeg
+, ffmpeg_6
, fluidsynth
, fmt
, freetype
@@ -318,7 +318,7 @@ in
citra = mkLibretroCore rec {
core = "citra";
- extraBuildInputs = [ libGLU libGL boost ffmpeg nasm ];
+ extraBuildInputs = [ libGLU libGL boost ffmpeg_6 nasm ];
makefile = "Makefile";
makeFlags = [
"HAVE_FFMPEG_STATIC=0"
diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix
index 581315d933b1..378f514c95eb 100644
--- a/pkgs/applications/emulators/retroarch/default.nix
+++ b/pkgs/applications/emulators/retroarch/default.nix
@@ -36,6 +36,7 @@
, udev
, vulkan-loader
, wayland
+, wayland-scanner
, wrapQtAppsHook
, zlib
}:
@@ -76,7 +77,7 @@ stdenv.mkDerivation rec {
] ++
lib.optional enableNvidiaCgToolkit nvidia_cg_toolkit ++
lib.optional withVulkan vulkan-loader ++
- lib.optional withWayland wayland ++
+ lib.optionals withWayland [wayland wayland-scanner] ++
lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib
dbus
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index 06e2cbef1f24..d7a65bb7b7a4 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -8,11 +8,13 @@
# unwrapped package parameters
, withGrass ? false
+, withServer ? false
, withWebKit ? false
}:
let
qgis-unwrapped = libsForQt5.callPackage ./unwrapped.nix {
withGrass = withGrass;
+ withServer = withServer;
withWebKit = withWebKit;
};
in symlinkJoin rec {
diff --git a/pkgs/applications/gis/qgis/ltr.nix b/pkgs/applications/gis/qgis/ltr.nix
index a588ac6dbd6a..596347a97e3f 100644
--- a/pkgs/applications/gis/qgis/ltr.nix
+++ b/pkgs/applications/gis/qgis/ltr.nix
@@ -8,11 +8,13 @@
# unwrapped package parameters
, withGrass ? false
+, withServer ? false
, withWebKit ? false
}:
let
qgis-ltr-unwrapped = libsForQt5.callPackage ./unwrapped-ltr.nix {
withGrass = withGrass;
+ withServer = withServer;
withWebKit = withWebKit;
};
in symlinkJoin rec {
diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
index 98caf348ae80..bc807b7e1074 100644
--- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix
+++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
@@ -7,6 +7,7 @@
, wrapQtAppsHook
, withGrass
+, withServer
, withWebKit
, bison
@@ -155,7 +156,10 @@ in mkDerivation rec {
"-DWITH_PDAL=True"
"-DENABLE_TESTS=False"
] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
- ++ lib.optional withGrass (let
+ ++ lib.optional withServer [
+ "-DWITH_SERVER=True"
+ "-DQGIS_CGIBIN_SUBDIR=${placeholder "out"}/lib/cgi-bin"
+ ] ++ lib.optional withGrass (let
gmajor = lib.versions.major grass.version;
gminor = lib.versions.minor grass.version;
in "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}"
diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index 49d0fd5b366e..577dfdf5e17f 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -7,6 +7,7 @@
, wrapQtAppsHook
, withGrass
+, withServer
, withWebKit
, bison
@@ -157,7 +158,10 @@ in mkDerivation rec {
"-DENABLE_TESTS=False"
"-DQT_PLUGINS_DIR=${qtbase}/${qtbase.qtPluginPrefix}"
] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
- ++ lib.optional withGrass (let
+ ++ lib.optional withServer [
+ "-DWITH_SERVER=True"
+ "-DQGIS_CGIBIN_SUBDIR=${placeholder "out"}/lib/cgi-bin"
+ ] ++ lib.optional withGrass (let
gmajor = lib.versions.major grass.version;
gminor = lib.versions.minor grass.version;
in "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}"
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index aa613ef09ae9..fd45ff16d257 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -24,6 +24,7 @@
, openjpegSupport ? !stdenv.hostPlatform.isMinGW, openjpeg
, libwebpSupport ? !stdenv.hostPlatform.isMinGW, libwebp
, libheifSupport ? true, libheif
+, fftwSupport ? true, fftw
, potrace
, coreutils
, curl
@@ -76,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.withFeature libjxlSupport "jxl")
(lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript.fonts}/share/fonts")
(lib.withFeature ghostscriptSupport "gslib")
+ (lib.withFeature fftwSupport "fftw")
] ++ lib.optionals stdenv.hostPlatform.isMinGW [
# due to libxml2 being without DLLs ATM
"--enable-static" "--disable-shared"
@@ -113,7 +115,8 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optional lcms2Support lcms2
++ lib.optional libX11Support libX11
++ lib.optional libXtSupport libXt
- ++ lib.optional libwebpSupport libwebp;
+ ++ lib.optional libwebpSupport libwebp
+ ++ lib.optional fftwSupport fftw;
postInstall = ''
(cd "$dev/include" && ln -s ImageMagick* ImageMagick)
@@ -146,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
description = "Software suite to create, edit, compose, or convert bitmap images";
pkgConfigModules = [ "ImageMagick" "MagickWand" ];
platforms = platforms.linux ++ platforms.darwin;
- maintainers = with maintainers; [ dotlambda rhendric ];
+ maintainers = with maintainers; [ dotlambda rhendric bloxx12 ];
license = licenses.asl20;
mainProgram = "magick";
};
diff --git a/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix b/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix
index 3aef4497e1cf..3a121a9bfde0 100644
--- a/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix
+++ b/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix
@@ -23,14 +23,14 @@ let
in
python3.pkgs.buildPythonApplication rec {
pname = "inkscape-silhouette";
- version = "1.28";
+ version = "1.29";
format = "setuptools";
src = fetchFromGitHub {
owner = "fablabnbg";
repo = pname;
- rev = "v${version}";
- sha256 = "sha256-uNVhdkZFadL7QNlCsXq51TbhzRKH9KYDPDNCFhw3cQs=";
+ rev = "refs/tags/v${version}";
+ sha256 = "sha256-MfR88BuaAx6n5XRIjslpIk4PnDf6TLU9AsmHxKkcFS0=";
};
patches = [
diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index 131881341f79..aa12c5861f2e 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -1,7 +1,7 @@
{ lib
, stdenv
, makeDesktopItem
-, fetchurl
+, fetchFromGitHub
, pkg-config
, copyDesktopItems
, cairo
@@ -23,11 +23,13 @@
stdenv.mkDerivation rec {
pname = "ipe";
- version = "7.2.27";
+ version = "7.2.30";
- src = fetchurl {
- url = "https://github.com/otfried/ipe/releases/download/v${version}/ipe-${version}-src.tar.gz";
- sha256 = "sha256-wx/bZy8kB7dpZsz58BeRGdS1BzbrIoafgEmLyFg7wZU=";
+ src = fetchFromGitHub {
+ owner = "otfried";
+ repo = "ipe";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-bvwEgEP/cinigixJr8e964sm6secSK+7Ul7WFfwM0gE=";
};
nativeBuildInputs = [ pkg-config copyDesktopItems wrapQtAppsHook ];
diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/applications/graphics/minidjvu/default.nix
index a8d3db4d0a94..c656eb84f75c 100644
--- a/pkgs/applications/graphics/minidjvu/default.nix
+++ b/pkgs/applications/graphics/minidjvu/default.nix
@@ -26,5 +26,8 @@ stdenv.mkDerivation rec {
maintainers = [ ];
platforms = lib.platforms.unix;
mainProgram = "minidjvu";
+ knownVulnerabilities = [
+ "minidjvu is vulnerable to a number of out-of-bound read vulnerabilities, potentially causing denials of service (CVE-2017-12441, CVE-2017-12442, CVE-2017-12443, CVE-2017-12444, CVE-2017-12445)"
+ ];
};
}
diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/applications/graphics/oculante/default.nix
index f2c7aa843dbc..643cddcf2aca 100644
--- a/pkgs/applications/graphics/oculante/default.nix
+++ b/pkgs/applications/graphics/oculante/default.nix
@@ -1,37 +1,38 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, cmake
-, pkg-config
-, openssl
-, fontconfig
-, nasm
-, libX11
-, libXcursor
-, libXrandr
-, libXi
-, libGL
-, libxkbcommon
-, wayland
-, stdenv
-, gtk3
-, darwin
-, perl
-, wrapGAppsHook3
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+ cmake,
+ pkg-config,
+ openssl,
+ fontconfig,
+ nasm,
+ libX11,
+ libXcursor,
+ libXrandr,
+ libXi,
+ libGL,
+ libxkbcommon,
+ wayland,
+ stdenv,
+ gtk3,
+ darwin,
+ perl,
+ wrapGAppsHook3,
}:
rustPlatform.buildRustPackage rec {
pname = "oculante";
- version = "0.8.23";
+ version = "0.9.1";
src = fetchFromGitHub {
owner = "woelper";
repo = "oculante";
rev = version;
- hash = "sha256-Dg1FFB9WVB4SWInSyOYb1TCPAtCa9gwsFLUX+UhL4DY=";
+ hash = "sha256-6jow0ektqmEcwFEaJgPqhJPs8LlYmPRLE+zqk1T4wDk=";
};
- cargoHash = "sha256-Ze3ACs9WyoxNsaeJlZWhR0g+aFsntwNLLYbw2RnmwfE=";
+ cargoHash = "sha256-0e4FoWhZwq6as0JYHGj1zoAOSr71ztqtWJEY3QXDs9s=";
nativeBuildInputs = [
cmake
@@ -41,33 +42,37 @@ rustPlatform.buildRustPackage rec {
wrapGAppsHook3
];
- buildInputs = [
- openssl
- fontconfig
- ] ++ lib.optionals stdenv.hostPlatform.isLinux [
- libGL
- libX11
- libXcursor
- libXi
- libXrandr
- gtk3
+ buildInputs =
+ [
+ openssl
+ fontconfig
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isLinux [
+ libGL
+ libX11
+ libXcursor
+ libXi
+ libXrandr
+ gtk3
- libxkbcommon
- wayland
- ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
- darwin.libobjc
- ];
+ libxkbcommon
+ wayland
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ darwin.libobjc
+ ];
checkFlags = [
"--skip=bench"
"--skip=tests::net" # requires network access
+ "--skip=tests::flathub"
];
postInstall = ''
- install -Dm444 $src/res/oculante.png -t $out/share/icons/hicolor/128x128/apps/
+ install -Dm444 $src/res/icons/icon.png -t $out/share/icons/hicolor/128x128/apps/
install -Dm444 $src/res/oculante.desktop -t $out/share/applications
wrapProgram $out/bin/oculante \
- --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [libGL]}
+ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}
'';
meta = with lib; {
@@ -77,6 +82,9 @@ rustPlatform.buildRustPackage rec {
changelog = "https://github.com/woelper/oculante/blob/${version}/CHANGELOG.md";
license = licenses.mit;
mainProgram = "oculante";
- maintainers = with maintainers; [ dit7ya figsoda ];
+ maintainers = with maintainers; [
+ dit7ya
+ figsoda
+ ];
};
}
diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix
index 9c465c32c378..423ceaadc087 100644
--- a/pkgs/applications/graphics/pineapple-pictures/default.nix
+++ b/pkgs/applications/graphics/pineapple-pictures/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pineapple-pictures";
- version = "0.8.1";
+ version = "0.8.2.1";
src = fetchFromGitHub {
owner = "BLumia";
repo = "pineapple-pictures";
rev = finalAttrs.version;
- hash = "sha256-7X0A3tjdr8hnnovkbgIOLx5h/eWy0gkM8SEB2/bpwkQ=";
+ hash = "sha256-24VDmB0eR8h0JGqpsdN0HkRRIHLw9DIT2sM4rCvPwhE=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/pureref/default.nix b/pkgs/applications/graphics/pureref/default.nix
index 3d54b41290f7..d9ff3269f162 100644
--- a/pkgs/applications/graphics/pureref/default.nix
+++ b/pkgs/applications/graphics/pureref/default.nix
@@ -1,22 +1,39 @@
-{ lib, appimageTools, runCommand, curl, gnugrep, cacert }:
+{
+ lib,
+ appimageTools,
+ runCommand,
+ curl,
+ gnugrep,
+ cacert,
+}:
appimageTools.wrapType1 rec {
pname = "pureref";
version = "2.0.3";
- src = runCommand "PureRef-${version}_x64.Appimage" {
- nativeBuildInputs = [ curl gnugrep cacert ];
- outputHash = "sha256-0iR1cP2sZvWWqKwRAwq6L/bmIBSYHKrlI8u8V2hANfM=";
- } ''
- key="$(curl "https://www.pureref.com/download.php" --silent | grep '%3D%3D' | cut -d '"' -f2)"
- curl -L "https://www.pureref.com/files/build.php?build=LINUX64.Appimage&version=${version}&downloadKey=$key" --output $out
- '';
+ src =
+ runCommand "PureRef-${version}_x64.Appimage"
+ {
+ nativeBuildInputs = [
+ curl
+ gnugrep
+ cacert
+ ];
+ outputHash = "sha256-0iR1cP2sZvWWqKwRAwq6L/bmIBSYHKrlI8u8V2hANfM=";
+ }
+ ''
+ key="$(curl -A 'nixpkgs/Please contact maintainer if there is an issue' "https://www.pureref.com/download.php" --silent | grep '%3D%3D' | cut -d '"' -f2)"
+ curl -L "https://www.pureref.com/files/build.php?build=LINUX64.Appimage&version=${version}&downloadKey=$key" --output $out
+ '';
meta = with lib; {
description = "Reference Image Viewer";
homepage = "https://www.pureref.com";
license = licenses.unfree;
- maintainers = with maintainers; [ elnudev ];
+ maintainers = with maintainers; [
+ elnudev
+ husjon
+ ];
platforms = [ "x86_64-linux" ];
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
};
diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
index e19da3fa15fe..79ad559a5f38 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
-, fetchpatch
, pkg-config
, autoreconfHook
, wrapGAppsHook3
@@ -29,12 +28,12 @@
}:
let
- version = "1.5.1";
+ version = "1.5.3";
src = fetchFromGitHub {
owner = "synfig";
repo = "synfig";
rev = "v${version}";
- hash = "sha256-9vBYESaSgW/1FWH2uFBvPiYvxLlX0LLNnd4S7ACJcwI=";
+ hash = "sha256-D+FUEyzJ74l0USq3V9HIRAfgyJfRP372aEKDqF8+hsQ=";
};
ETL = stdenv.mkDerivation {
@@ -56,17 +55,6 @@ let
pname = "synfig";
inherit version src;
- patches = [
- # Pull upstream fix for autoconf-2.72 support:
- # https://github.com/synfig/synfig/pull/2930
- (fetchpatch {
- name = "autoconf-2.72.patch";
- url = "https://github.com/synfig/synfig/commit/80a3386c701049f597cf3642bb924d2ff832ae05.patch";
- stripLen = 1;
- hash = "sha256-7gX8tJCR81gw8ZDyNYa8UaeZFNOx4o1Lnq0cAcaKb2I=";
- })
- ];
-
sourceRoot = "${src.name}/synfig-core";
configureFlags = [
@@ -78,6 +66,8 @@ let
"CXXFLAGS=-std=c++14"
];
+ enableParallelBuilding = true;
+
nativeBuildInputs = [
pkg-config
autoreconfHook
@@ -159,7 +149,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "2D animation program";
homepage = "http://www.synfig.org";
- license = licenses.gpl2Plus;
+ license = licenses.gpl3Plus;
maintainers = [ ];
platforms = platforms.linux ++ platforms.darwin;
};
diff --git a/pkgs/by-name/gr/granian/Cargo.lock b/pkgs/applications/graphics/vkdt/Cargo.lock
similarity index 65%
rename from pkgs/by-name/gr/granian/Cargo.lock
rename to pkgs/applications/graphics/vkdt/Cargo.lock
index f6a3c5cd6736..2cdb0e8c366b 100644
--- a/pkgs/by-name/gr/granian/Cargo.lock
+++ b/pkgs/applications/graphics/vkdt/Cargo.lock
@@ -18,33 +18,60 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
-name = "aes"
-version = "0.8.4"
+name = "adler2"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
+[[package]]
+name = "adler32"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
dependencies = [
"cfg-if",
- "cipher",
- "cpufeatures",
+ "once_cell",
+ "version_check",
+ "zerocopy",
]
[[package]]
-name = "anyhow"
-version = "1.0.86"
+name = "allocator-api2"
+version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
[[package]]
-name = "arc-swap"
-version = "1.7.1"
+name = "android-tzdata"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
[[package]]
-name = "atomic-waker"
-version = "1.1.2"
+name = "android_system_properties"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "async-trait"
+version = "0.1.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.76",
+]
[[package]]
name = "autocfg"
@@ -62,22 +89,22 @@ dependencies = [
"cc",
"cfg-if",
"libc",
- "miniz_oxide",
+ "miniz_oxide 0.7.4",
"object",
"rustc-demangle",
]
[[package]]
-name = "base64"
-version = "0.22.1"
+name = "bit_field"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
[[package]]
-name = "base64ct"
-version = "1.6.0"
+name = "bitflags"
+version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
@@ -86,22 +113,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
[[package]]
-name = "block-buffer"
-version = "0.10.4"
+name = "bitstream-io"
+version = "2.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
+checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452"
[[package]]
-name = "block-padding"
-version = "0.3.3"
+name = "bumpalo"
+version = "3.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
-dependencies = [
- "generic-array",
-]
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "bytemuck"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31"
[[package]]
name = "byteorder"
@@ -115,20 +142,11 @@ version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
-[[package]]
-name = "cbc"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
-dependencies = [
- "cipher",
-]
-
[[package]]
name = "cc"
-version = "1.1.15"
+version = "1.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
+checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932"
dependencies = [
"shlex",
]
@@ -140,35 +158,64 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
-name = "cipher"
-version = "0.4.4"
+name = "chrono"
+version = "0.4.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
dependencies = [
- "crypto-common",
- "inout",
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-targets",
]
[[package]]
-name = "const-oid"
-version = "0.9.6"
+name = "color_quant"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]]
-name = "cpufeatures"
-version = "0.2.13"
+name = "core-foundation-sys"
+version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "core2"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505"
dependencies = [
- "libc",
+ "memchr",
]
[[package]]
-name = "crossbeam-channel"
-version = "0.5.13"
+name = "crc32fast"
+version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
dependencies = [
"crossbeam-utils",
]
@@ -180,41 +227,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
[[package]]
-name = "crypto-common"
-version = "0.1.6"
+name = "crunchy"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]]
-name = "data-encoding"
-version = "2.6.0"
+name = "dary_heap"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
-
-[[package]]
-name = "der"
-version = "0.7.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
-dependencies = [
- "const-oid",
- "zeroize",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
- "subtle",
-]
+checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca"
[[package]]
name = "either"
@@ -222,6 +244,17 @@ version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+[[package]]
+name = "enumn"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.76",
+]
+
[[package]]
name = "equivalent"
version = "1.0.1"
@@ -229,10 +262,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
-name = "fnv"
-version = "1.0.7"
+name = "exr"
+version = "1.72.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4"
+dependencies = [
+ "bit_field",
+ "flume",
+ "half",
+ "lebe",
+ "miniz_oxide 0.7.4",
+ "rayon-core",
+ "smallvec",
+ "zune-inflate",
+]
+
+[[package]]
+name = "fdeflate"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
+dependencies = [
+ "simd-adler32",
+]
+
+[[package]]
+name = "flate2"
+version = "1.0.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide 0.8.0",
+]
+
+[[package]]
+name = "flume"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
+dependencies = [
+ "spin",
+]
[[package]]
name = "futures"
@@ -290,7 +361,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.76",
]
[[package]]
@@ -323,16 +394,6 @@ dependencies = [
"slab",
]
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
[[package]]
name = "getrandom"
version = "0.2.15"
@@ -344,6 +405,16 @@ dependencies = [
"wasi",
]
+[[package]]
+name = "gif"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2"
+dependencies = [
+ "color_quant",
+ "weezl",
+]
+
[[package]]
name = "gimli"
version = "0.29.0"
@@ -351,51 +422,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
[[package]]
-name = "granian"
-version = "1.6.0"
-dependencies = [
- "anyhow",
- "crossbeam-channel",
- "futures",
- "http-body-util",
- "hyper",
- "hyper-util",
- "itertools",
- "log",
- "mimalloc",
- "pem",
- "percent-encoding",
- "pin-project",
- "pkcs8",
- "pyo3",
- "pyo3-log",
- "rustls-pemfile",
- "socket2",
- "tikv-jemallocator",
- "tls-listener",
- "tokio",
- "tokio-stream",
- "tokio-tungstenite",
- "tokio-util",
-]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
-name = "h2"
-version = "0.4.6"
+name = "half"
+version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
+checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
dependencies = [
- "atomic-waker",
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
+ "cfg-if",
+ "crunchy",
]
[[package]]
@@ -403,12 +442,10 @@ name = "hashbrown"
version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+dependencies = [
+ "ahash",
+ "allocator-api2",
+]
[[package]]
name = "hermit-abi"
@@ -417,121 +454,62 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
[[package]]
-name = "hmac"
-version = "0.12.1"
+name = "hex"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
dependencies = [
- "digest",
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
]
[[package]]
-name = "http"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-body"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
-dependencies = [
- "bytes",
- "http",
-]
-
-[[package]]
-name = "http-body-util"
+name = "iana-time-zone-haiku"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
dependencies = [
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "pin-project-lite",
+ "cc",
]
[[package]]
-name = "httparse"
-version = "1.9.4"
+name = "image"
+version = "0.24.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
-
-[[package]]
-name = "httpdate"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
-
-[[package]]
-name = "hyper"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "smallvec",
- "tokio",
-]
-
-[[package]]
-name = "hyper-util"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
-dependencies = [
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "hyper",
- "pin-project-lite",
- "tokio",
+ "bytemuck",
+ "byteorder",
+ "color_quant",
+ "exr",
+ "gif",
+ "jpeg-decoder",
+ "num-traits",
+ "png",
+ "qoi",
+ "tiff",
]
[[package]]
name = "indexmap"
-version = "2.5.0"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
dependencies = [
"equivalent",
"hashbrown",
]
-[[package]]
-name = "indoc"
-version = "2.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
-
-[[package]]
-name = "inout"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
-dependencies = [
- "block-padding",
- "generic-array",
-]
-
[[package]]
name = "itertools"
version = "0.13.0"
@@ -547,6 +525,36 @@ version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+[[package]]
+name = "jpeg-decoder"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
+dependencies = [
+ "rayon",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "lebe"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
+
[[package]]
name = "libc"
version = "0.2.158"
@@ -554,13 +562,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
[[package]]
-name = "libmimalloc-sys"
-version = "0.1.39"
+name = "libflate"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44"
+checksum = "45d9dfdc14ea4ef0900c1cddbc8dcd553fbaacd8a4a282cf4018ae9dd04fb21e"
dependencies = [
- "cc",
- "libc",
+ "adler32",
+ "core2",
+ "crc32fast",
+ "dary_heap",
+ "libflate_lz77",
+]
+
+[[package]]
+name = "libflate_lz77"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e0d73b369f386f1c44abd9c570d5318f55ccde816ff4b562fa452e5182863d"
+dependencies = [
+ "core2",
+ "hashbrown",
+ "rle-decode-fast",
]
[[package]]
@@ -579,30 +601,18 @@ version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+[[package]]
+name = "md5"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
+
[[package]]
name = "memchr"
version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "mimalloc"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633"
-dependencies = [
- "libmimalloc-sys",
-]
-
[[package]]
name = "miniz_oxide"
version = "0.7.4"
@@ -610,6 +620,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
dependencies = [
"adler",
+ "simd-adler32",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+dependencies = [
+ "adler2",
]
[[package]]
@@ -625,10 +645,62 @@ dependencies = [
]
[[package]]
-name = "object"
-version = "0.36.4"
+name = "multiversion"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "c4851161a11d3ad0bf9402d90ffc3967bf231768bfd7aeb61755ad06dbf1a142"
+dependencies = [
+ "multiversion-macros",
+ "target-features",
+]
+
+[[package]]
+name = "multiversion-macros"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79a74ddee9e0c27d2578323c13905793e91622148f138ba29738f9dddb835e90"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "target-features",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.76",
+]
+
+[[package]]
+name = "object"
+version = "0.36.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
dependencies = [
"memchr",
]
@@ -662,52 +734,6 @@ dependencies = [
"windows-targets",
]
-[[package]]
-name = "pbkdf2"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
-dependencies = [
- "digest",
- "hmac",
-]
-
-[[package]]
-name = "pem"
-version = "3.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae"
-dependencies = [
- "base64",
- "serde",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
[[package]]
name = "pin-project-lite"
version = "0.2.14"
@@ -721,45 +747,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
-name = "pkcs5"
-version = "0.7.1"
+name = "png"
+version = "0.17.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e847e2c91a18bfa887dd028ec33f2fe6f25db77db3619024764914affe8b69a6"
+checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
dependencies = [
- "aes",
- "cbc",
- "der",
- "pbkdf2",
- "scrypt",
- "sha2",
- "spki",
+ "bitflags 1.3.2",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide 0.7.4",
]
[[package]]
-name = "pkcs8"
-version = "0.10.2"
+name = "proc-macro-crate"
+version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
dependencies = [
- "der",
- "pkcs5",
- "rand_core",
- "spki",
-]
-
-[[package]]
-name = "portable-atomic"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
-dependencies = [
- "zerocopy",
+ "toml_edit 0.21.1",
]
[[package]]
@@ -772,87 +778,12 @@ dependencies = [
]
[[package]]
-name = "pyo3"
-version = "0.22.2"
+name = "qoi"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433"
+checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
dependencies = [
- "anyhow",
- "cfg-if",
- "indoc",
- "libc",
- "memoffset",
- "once_cell",
- "portable-atomic",
- "pyo3-build-config",
- "pyo3-ffi",
- "pyo3-macros",
- "unindent",
-]
-
-[[package]]
-name = "pyo3-build-config"
-version = "0.22.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8"
-dependencies = [
- "once_cell",
- "python3-dll-a",
- "target-lexicon",
-]
-
-[[package]]
-name = "pyo3-ffi"
-version = "0.22.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6"
-dependencies = [
- "libc",
- "pyo3-build-config",
-]
-
-[[package]]
-name = "pyo3-log"
-version = "0.11.0"
-source = "git+https://github.com/vorner/pyo3-log?rev=b62a250533#b62a250533f0a85e245dfcd189cadb368b1c73fc"
-dependencies = [
- "arc-swap",
- "log",
- "pyo3",
-]
-
-[[package]]
-name = "pyo3-macros"
-version = "0.22.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206"
-dependencies = [
- "proc-macro2",
- "pyo3-macros-backend",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pyo3-macros-backend"
-version = "0.22.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372"
-dependencies = [
- "heck",
- "proc-macro2",
- "pyo3-build-config",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "python3-dll-a"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd0b78171a90d808b319acfad166c4790d9e9759bbc14ac8273fe133673dd41b"
-dependencies = [
- "cc",
+ "bytemuck",
]
[[package]]
@@ -865,33 +796,65 @@ dependencies = [
]
[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+name = "rawler"
+version = "0.6.3"
+source = "git+https://github.com/dnglab/dnglab?branch=main#51d1a746797893108c99897d5f43c70a46598256"
+dependencies = [
+ "async-trait",
+ "backtrace",
+ "bitstream-io",
+ "byteorder",
+ "chrono",
+ "enumn",
+ "futures",
+ "glob",
+ "hex",
+ "image",
+ "itertools",
+ "lazy_static",
+ "libc",
+ "libflate",
+ "log",
+ "md5",
+ "multiversion",
+ "num_enum",
+ "rayon",
+ "rustc_version",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "toml",
+ "uuid",
+ "weezl",
+]
+
+[[package]]
+name = "rawloader-clib"
+version = "0.1.0"
dependencies = [
"libc",
- "rand_chacha",
- "rand_core",
+ "rawler",
]
[[package]]
-name = "rand_chacha"
-version = "0.3.1"
+name = "rayon"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
dependencies = [
- "ppv-lite86",
- "rand_core",
+ "either",
+ "rayon-core",
]
[[package]]
-name = "rand_core"
-version = "0.6.4"
+name = "rayon-core"
+version = "1.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
dependencies = [
- "getrandom",
+ "crossbeam-deque",
+ "crossbeam-utils",
]
[[package]]
@@ -900,23 +863,14 @@ version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
dependencies = [
- "bitflags",
+ "bitflags 2.6.0",
]
[[package]]
-name = "ring"
-version = "0.17.8"
+name = "rle-decode-fast"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
-dependencies = [
- "cc",
- "cfg-if",
- "getrandom",
- "libc",
- "spin",
- "untrusted",
- "windows-sys",
-]
+checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422"
[[package]]
name = "rustc-demangle"
@@ -925,54 +879,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
[[package]]
-name = "rustls"
-version = "0.22.4"
+name = "rustc_version"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
- "log",
- "ring",
- "rustls-pki-types",
- "rustls-webpki",
- "subtle",
- "zeroize",
+ "semver",
]
[[package]]
-name = "rustls-pemfile"
-version = "2.1.3"
+name = "ryu"
+version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
-dependencies = [
- "base64",
- "rustls-pki-types",
-]
-
-[[package]]
-name = "rustls-pki-types"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
-
-[[package]]
-name = "rustls-webpki"
-version = "0.102.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
-dependencies = [
- "ring",
- "rustls-pki-types",
- "untrusted",
-]
-
-[[package]]
-name = "salsa20"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213"
-dependencies = [
- "cipher",
-]
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
[[package]]
name = "scopeguard"
@@ -981,15 +900,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
-name = "scrypt"
-version = "0.11.0"
+name = "semver"
+version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f"
-dependencies = [
- "pbkdf2",
- "salsa20",
- "sha2",
-]
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
[[package]]
name = "serde"
@@ -1008,29 +922,28 @@ checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.76",
]
[[package]]
-name = "sha1"
-version = "0.10.6"
+name = "serde_json"
+version = "1.0.127"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
]
[[package]]
-name = "sha2"
-version = "0.10.8"
+name = "serde_spanned"
+version = "0.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
+ "serde",
]
[[package]]
@@ -1048,6 +961,12 @@ dependencies = [
"libc",
]
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
[[package]]
name = "slab"
version = "0.4.9"
@@ -1078,28 +997,15 @@ name = "spin"
version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
-[[package]]
-name = "spki"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
dependencies = [
- "base64ct",
- "der",
+ "lock_api",
]
-[[package]]
-name = "subtle"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
-
[[package]]
name = "syn"
-version = "2.0.77"
+version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
"proc-macro2",
"quote",
@@ -1107,10 +1013,21 @@ dependencies = [
]
[[package]]
-name = "target-lexicon"
-version = "0.12.16"
+name = "syn"
+version = "2.0.76"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "target-features"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1bbb9f3c5c463a01705937a24fdabc5047929ac764b2d5b9cf681c1f5041ed5"
[[package]]
name = "thiserror"
@@ -1129,47 +1046,25 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.76",
]
[[package]]
-name = "tikv-jemalloc-sys"
-version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7"
+name = "tiff"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d"
+checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e"
dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "tikv-jemallocator"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865"
-dependencies = [
- "libc",
- "tikv-jemalloc-sys",
-]
-
-[[package]]
-name = "tls-listener"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a296135fdab7b3a1f708c338c50bab570bcd77d44080cde9341df45c0c6d73"
-dependencies = [
- "futures-util",
- "pin-project-lite",
- "thiserror",
- "tokio",
- "tokio-rustls",
+ "flate2",
+ "jpeg-decoder",
+ "weezl",
]
[[package]]
name = "tokio"
-version = "1.40.0"
+version = "1.39.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
dependencies = [
"backtrace",
"bytes",
@@ -1191,99 +1086,54 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.76",
]
[[package]]
-name = "tokio-rustls"
-version = "0.25.0"
+name = "toml"
+version = "0.8.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
dependencies = [
- "rustls",
- "rustls-pki-types",
- "tokio",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.22.20",
]
[[package]]
-name = "tokio-stream"
-version = "0.1.15"
+name = "toml_datetime"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
+ "serde",
]
[[package]]
-name = "tokio-tungstenite"
-version = "0.23.1"
+name = "toml_edit"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
dependencies = [
- "futures-util",
- "log",
- "tokio",
- "tungstenite",
+ "indexmap",
+ "toml_datetime",
+ "winnow 0.5.40",
]
[[package]]
-name = "tokio-util"
-version = "0.7.11"
+name = "toml_edit"
+version = "0.22.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow 0.6.18",
]
-[[package]]
-name = "tracing"
-version = "0.1.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
-dependencies = [
- "pin-project-lite",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "tungstenite"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8"
-dependencies = [
- "byteorder",
- "bytes",
- "data-encoding",
- "http",
- "httparse",
- "log",
- "rand",
- "sha1",
- "thiserror",
- "utf-8",
-]
-
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
[[package]]
name = "unicode-ident"
version = "1.0.12"
@@ -1291,22 +1141,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
[[package]]
-name = "unindent"
-version = "0.2.3"
+name = "uuid"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
-
-[[package]]
-name = "untrusted"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
-
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+dependencies = [
+ "getrandom",
+ "serde",
+]
[[package]]
name = "version_check"
@@ -1320,6 +1162,76 @@ version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.76",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.76",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+
+[[package]]
+name = "weezl"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets",
+]
+
[[package]]
name = "windows-sys"
version = "0.52.0"
@@ -1393,13 +1305,30 @@ version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+[[package]]
+name = "winnow"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.6.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+dependencies = [
+ "memchr",
+]
+
[[package]]
name = "zerocopy"
version = "0.7.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
dependencies = [
- "byteorder",
"zerocopy-derive",
]
@@ -1411,11 +1340,14 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.76",
]
[[package]]
-name = "zeroize"
-version = "1.8.1"
+name = "zune-inflate"
+version = "0.2.54"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
+dependencies = [
+ "simd-adler32",
+]
diff --git a/pkgs/applications/graphics/vkdt/default.nix b/pkgs/applications/graphics/vkdt/default.nix
index ee9357bc04af..41380271dd7d 100644
--- a/pkgs/applications/graphics/vkdt/default.nix
+++ b/pkgs/applications/graphics/vkdt/default.nix
@@ -21,20 +21,33 @@
, libmad
, testers
, vkdt
+, xxd
+, alsa-lib
+, cargo
+, rustPlatform
}:
stdenv.mkDerivation rec {
pname = "vkdt";
- version = "0.7.0";
+ version = "0.9.0";
src = fetchurl {
url = "https://github.com/hanatos/${pname}/releases/download/${version}/${pname}-${version}.tar.xz";
- hash = "sha256-Sk/K+EWvJBkwwD5R1gH9ZQHetojrJTTJrKW9Dvr+lHA=";
+ hash = "sha256-LXUTDwUjlfyhtXkYW4Zivqt8vyctoz+ID5AQ7gg+d9A=";
};
strictDeps = true;
+ cargoDeps = rustPlatform.importCargoLock {
+ lockFile = ./Cargo.lock;
+ outputHashes = {
+ "rawler-0.6.3" = "sha256-EJ0uWc3pp7ixRxDIdTIVVaT2ph3P2IvuK+ecBSB5HYw=";
+ };
+ };
+ cargoRoot = "src/pipe/modules/i-raw/rawloader-c";
+
nativeBuildInputs = [
+ cargo
clang
cmake
glslang
@@ -42,9 +55,12 @@ stdenv.mkDerivation rec {
llvmPackages.openmp
pkg-config
rsync
+ rustPlatform.cargoSetupHook
+ xxd
];
buildInputs = [
+ alsa-lib
exiv2
ffmpeg
freetype
diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix
index d32f1f11d15e..d0d18bdd16ab 100644
--- a/pkgs/applications/misc/1password-gui/default.nix
+++ b/pkgs/applications/misc/1password-gui/default.nix
@@ -10,43 +10,43 @@
let
pname = "1password";
- version = if channel == "stable" then "8.10.46" else "8.10.48-17.BETA";
+ version = if channel == "stable" then "8.10.48" else "8.10.50-8.BETA";
sources = {
stable = {
x86_64-linux = {
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
- hash = "sha256-oewS90rSBqxA0V+ttcmUXznUZ3+mb5FKtmYD4kUDmTk=";
+ hash = "sha256-6yC7wDYd6FJluiVXyc6O03GiZkG48ttRl1N1A9djI9A=";
};
aarch64-linux = {
url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz";
- hash = "sha256-tHQIhLPTD2dFRK542kFnpExg36paaNuzyOED8ZKyIYk=";
+ hash = "sha256-RN3FC7JIAJvd1hWdVH1CAOUsYr5rpq9o3JVbyfwWWKk=";
};
x86_64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
- hash = "sha256-pnAE1UTMXX89wshEI/wzhySb1NZY5ke5bSYmUjvU/pc=";
+ hash = "sha256-iJkIzVeI/mqFbBAGqQPABq1sAeS9k0j+EuUND1VYWJQ=";
};
aarch64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
- hash = "sha256-MmHUa96keBV9+E2GQdgz/aCTXeFkVNqHV0eH8/WhvhY=";
+ hash = "sha256-LZ56dIJ5vXJ1SbCI8hdeldKJwzkfM0Tp8d9eZ4tQ9/k=";
};
};
beta = {
x86_64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
- hash = "sha256-4SPZJP/ebnyAMEWrIGonb+5nYXuM8KCPK9modC/Cr/Y=";
+ hash = "sha256-Wm8TZjPVkqn+Y0PvSxTBAGduQNBAWUvy0AEGveVvMS0=";
};
aarch64-linux = {
url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
- hash = "sha256-V5Nt81Trw6l7DAUtCX2Yv/fL2wBJpJER0iaOBmMfQ5o=";
+ hash = "sha256-pF1DmzfcfyT/JVJx97dykbFwEjgOMpTvofTaZvwIIvE=";
};
x86_64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
- hash = "sha256-UfSUPqZgbYdWyrfw41SdnnI1IeA+dYsfBAu/UQl0vVI=";
+ hash = "sha256-MOilWgFZazVrMc6cCHqZO03KmBP8HCPevrxcKAMKEoE=";
};
aarch64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
- hash = "sha256-ynkDnJtoKMAtegeilB0XIH+YrSS9EKYV1ceN0Ecls+A=";
+ hash = "sha256-TBA2OJXSjKzAR+gvVPCetSc7MVCNoyw4xo6w+9EIayc=";
};
};
};
diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix
index efeb82110cf0..372131d9f82b 100644
--- a/pkgs/applications/misc/ArchiSteamFarm/default.nix
+++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix
@@ -11,13 +11,13 @@
buildDotnetModule rec {
pname = "ArchiSteamFarm";
# nixpkgs-update: no auto update
- version = "6.0.6.4";
+ version = "6.0.7.5";
src = fetchFromGitHub {
owner = "JustArchiNET";
repo = "ArchiSteamFarm";
rev = version;
- hash = "sha256-U4RApOUtrZ9su4O1jamjDbVrjozujW+vYRI1R7rSzpc=";
+ hash = "sha256-YmwbANzwpda/ZJyGZ5lqa/4AVz7QNTXqHXOJNiZcc/M=";
};
dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix
index d33bed6722a4..58f17050c6fb 100644
--- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix
+++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix
@@ -61,8 +61,9 @@
(fetchNuGet { pname = "Markdig.Signed"; version = "0.37.0"; hash = "sha256-hYyyZz0iETAE2HydbyudPdoOUi6wHQRG0BjuS87Tnl0="; })
(fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.22.0"; hash = "sha256-mUQ63atpT00r49ca50uZu2YCiLg3yd6r3HzTryqcuEA="; })
(fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; })
- (fetchNuGet { pname = "Microsoft.CodeAnalysis.ResxSourceGenerator"; version = "3.11.0-beta1.24324.1"; hash = "sha256-+YEdFt4em1e8SMC3PnRAwOfyMZLwWPJo7/loTt7l9kQ="; })
- (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.10.0"; hash = "sha256-yQFwqVChRtIRpbtkJr92JH2i+O7xn91NGbYgnKs8G2g="; })
+ (fetchNuGet { pname = "Microsoft.Bcl.TimeProvider"; version = "8.0.1"; hash = "sha256-TQRaWjk1aZu+jn/rR8oOv8BJEG31i6mPkf3BkIR7C+c="; })
+ (fetchNuGet { pname = "Microsoft.CodeAnalysis.ResxSourceGenerator"; version = "3.11.0-beta1.24415.1"; hash = "sha256-mZISof2BEaehgkVhw/G/vb6yvnNJtfoDEdGOHqAiWAg="; })
+ (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.11.0"; hash = "sha256-XglInnx5GePUYHG7n2NLX+WfK7kJnornsWOW/5FnOXE="; })
(fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; hash = "sha256-RJjBWz+UHxkQE2s7CeGYdTZ218mCufrxl0eBykZdIt4="; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; })
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; hash = "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="; })
@@ -78,33 +79,33 @@
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; })
(fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; })
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; })
- (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "8.0.2"; hash = "sha256-j37WWYrYgINKVn5eWhytGad7k2GwQPCemumJXU7cHsw="; })
- (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "8.0.2"; hash = "sha256-siKloYOZKBRV//apM/O+A+KwhAWTZ0ZnnCI7Pq+pxMs="; })
- (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "8.0.2"; hash = "sha256-Ref5E5JXHXDAdog/Yix25fsYO7R4eCHP8L/GIJz70p8="; })
- (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "8.0.2"; hash = "sha256-VM5Tw4lS1XxVajmA8PB4yn8J+Abi388U//5//0aNOHo="; })
- (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.10.0"; hash = "sha256-rkHIqB2mquNXF89XBTFpUL2z5msjTBsOcyjSBCh36I0="; })
+ (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "8.1.0"; hash = "sha256-BupPW6gN3p1LhIdDTcCVFmAMx3kMl7+Oq4kNWpbPsp4="; })
+ (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "8.1.0"; hash = "sha256-TzyHvyQQ/v1pr5IXOcyubLiB2l1uZLYiZyrg/QZADiM="; })
+ (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "8.1.0"; hash = "sha256-focc7oT7KbA3hDs6huy7PrPorH6EhRaVnaCkhrXPfq8="; })
+ (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "8.1.0"; hash = "sha256-wH3TDd7NcbGlMy1Z5clPcH/DjCNbDV1EJtDJcg9YcHA="; })
+ (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.11.0"; hash = "sha256-WjyA78+PG9ZloWTt9Hf1ek3VVj2FfJ9fAjqklnN+fWw="; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; })
(fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.6.14"; hash = "sha256-dSJUic2orPGfYVgto9DieRckbtLpPyxHtf+RJ2tmKPM="; })
- (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.3.2"; hash = "sha256-q6ZGafMpM3HunHtjVATcIa+gPUM1ef4y3Do8Syf2pa4="; })
- (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.3.2"; hash = "sha256-0+O40vygEoX0K2NDMSv1zFB4H10su0FAA1QTqzi1KcA="; })
- (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.3.2"; hash = "sha256-H8dK/+S39mXZWnM9dB0CQhu23vQD9JRAaHivnutUDEY="; })
- (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.3.2"; hash = "sha256-1H34nSpdSL+P91F5Ynjr8590eNFcm+1Rp27vYclx2Xc="; })
- (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.3.2"; hash = "sha256-1SVTVvrFqStKoxuQSqaKBuKp+qDHZkCTpIECPuEEdQI="; })
- (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.10.0"; hash = "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4="; })
- (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.10.0"; hash = "sha256-+yzP3FY6WoOosSpYnB7duZLhOPUZMQYy8zJ1d3Q4hK4="; })
+ (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.4.0"; hash = "sha256-j9D+ts+CoP1xj/ZM7Eucp3Dx16NUQ7FsyALB7ArmJCw="; })
+ (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.4.0"; hash = "sha256-k3DIWLQe2Y8Q1lV75wNTqzvnbfhIyp/gOGLB6u8hBZs="; })
+ (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.4.0"; hash = "sha256-P+Sy651SvEE+4/e5jsm79xhWJ4D/qUoTYEqgLEN6hUc="; })
+ (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.4.0"; hash = "sha256-xTBi8jb1e8xF5n/HPYnAjNRPM/zS8gVR/51hJXx7Vkg="; })
+ (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.4.0"; hash = "sha256-xW9SRkROePnNMX6BQYHOFmivmPaSbJ5/YeuwcJNrzQg="; })
+ (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.11.0"; hash = "sha256-mCI3MCV6nyrGLrBat5VvK5LrXTEKlsdp9NkpZyJYwVg="; })
+ (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.11.0"; hash = "sha256-gViDLobza22kuLvB4JdlGtbANqwBHRwf1wLmIHMw9Eo="; })
(fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; })
- (fetchNuGet { pname = "MSTest"; version = "3.5.2"; hash = "sha256-BZLyxq2WtJL338s9cIVlpodvVInsrjZ6L7vYalIFk5Y="; })
- (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.5.2"; hash = "sha256-Jwmtm/+yk8DoPnjOqauDXknVtmVzsrmqJwZuP6QfHvw="; })
- (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.5.2"; hash = "sha256-tbKREqe9w5Tkhib4AfWR9vB7DYLmvAjEov8UM2D2gA0="; })
- (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.5.2"; hash = "sha256-ZudwTMNhxbxehLz9hCOgrhTzegVs4P6avUpFiez+u10="; })
+ (fetchNuGet { pname = "MSTest"; version = "3.6.0"; hash = "sha256-p1w/OOAdFOy+WLV16cn2adGl5MeyDhltDllrDpPhYLE="; })
+ (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.6.0"; hash = "sha256-/EdgXvk5a38DjpAcu3+13Xm9yjZUYHqBy3Q3UQxAEVo="; })
+ (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.6.0"; hash = "sha256-XpSVWgNU36VVUssPUc11R/StiyzzmSu7imXu7kBzLkE="; })
+ (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.6.0"; hash = "sha256-3j4Gp+BOhhKZav23gED/dtAnsoOrG+wtI9+p6IHNVMA="; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; })
(fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; hash = "sha256-NHMnIBkGzzuoZL0qHKAwFC35doB08IDvmCQptC2uu2s="; })
(fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; hash = "sha256-W5jxZZ0pbPHte6TkWTq4FDtHOejvlrdyb1Inw+Yhl4c="; })
(fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; hash = "sha256-6Pmz6XQ+rY32O21Z3cUDVQsLH+i53LId18UCPTAxRZQ="; })
(fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; hash = "sha256-FKDLUWysqroSHLU2kLjK1m0g417AAPh6n2TIkwiapcM="; })
- (fetchNuGet { pname = "NLog"; version = "5.3.3"; hash = "sha256-M6IbNKj4cUplxS7vi54m2SZe4bQdmMusDTMmsjqmZKg="; })
- (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.12"; hash = "sha256-KAqPPDIXrqM85yb1TfhqHUhBYrHug/bOlrEepV+0BEc="; })
- (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.12"; hash = "sha256-ZnPQeBLrGkP4EqfoJtDjJuuPqCZW5AMv/3XJaB0o0L0="; })
+ (fetchNuGet { pname = "NLog"; version = "5.3.4"; hash = "sha256-Cwr1Wu9VbOcRz3GdVKkt7lIpNwC1E4Hdb0g+qEkEr3k="; })
+ (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.13"; hash = "sha256-H1u+mccp7XYHJePISiV6PgqGLJ/gAnK/+Q/wBf4jq+w="; })
+ (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.14"; hash = "sha256-slCdA4LZ6nDhBirE5/dXyDmVuWKCZiUgLvB6wCgkCKE="; })
(fetchNuGet { pname = "OpenTelemetry"; version = "1.9.0"; hash = "sha256-QVV6ecnVk73bvi4Lw1RnTsaEUH/6CT0/zIJkYdg6CGg="; })
(fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.9.0"; hash = "sha256-raXpHi2DZ3mSLn9dnJYF64XaP23epdfu8zgagSpm8+4="; })
(fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.9.0"; hash = "sha256-Yy3EcKBW7XH7nhLcvwQB0NIfxiGChuy6UPc7MJpxEbE="; })
@@ -115,12 +116,12 @@
(fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.9.0"; hash = "sha256-Xov89h4Py7MCz6SAOjV0tjtZvvjHbx7NyPXZsY1PZhk="; })
(fetchNuGet { pname = "protobuf-net"; version = "3.2.30"; hash = "sha256-keRy5OWT+/tlZt3D7x+9PEdjTvEJcZdYsf/i1ZBtciE="; })
(fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.30"; hash = "sha256-GMpJNecoBfrV2VgpYOhcZnKZaLFDObNLcX2LBTThrwY="; })
- (fetchNuGet { pname = "SteamKit2"; version = "3.0.0-beta.2"; hash = "sha256-aQ1zMyWPOvGFcDYYscn/qTpnWS4HfK/k1NLk37zeVAE="; })
- (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.7.2"; hash = "sha256-clFYZAy7v6mbWr1a+yy0BVbqoQGlqDvzXGlVMXzqg9s="; })
- (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.7.2"; hash = "sha256-tBsLIRSWAknFWvNu524sSFmOB4aIKuYX9I3Wp9AHxwE="; })
- (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.7.2"; hash = "sha256-cH+/13iri7PMxlymzLUT+YEoJKxlXNNK56x8oQAkuAs="; })
- (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.7.2"; hash = "sha256-EzHxMjlwAsyNOFdHZTiQ7Wk6ZEWpRJqwoQGSe/eFoJE="; })
- (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.7.2"; hash = "sha256-4+aBYecxcA/Et8sAxoJ2+e86WO7s3rYT6xd9MOaQIxQ="; })
+ (fetchNuGet { pname = "SteamKit2"; version = "3.0.0-beta.3"; hash = "sha256-G3Apy5g0TT273Ake6/4DnrJGY4lWrTbyHDJMntiSuzE="; })
+ (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.8.0"; hash = "sha256-2CMwJt9QDVrQ0FCGol0TTInEbchcXItVjgwh2HeJts4="; })
+ (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.8.0"; hash = "sha256-ADbd0g8R79X1lQ2A5SDX3yYvNFnMiztuDd6OtNC5It0="; })
+ (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.8.0"; hash = "sha256-tqJRsvb4snA/1EmAh2oKzGFBC6atFCkg4+b1PMSmfoo="; })
+ (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.8.0"; hash = "sha256-g7D+WGZAmUccExd5IzGwNGypJKcve85YdT3kof1w/LI="; })
+ (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.8.0"; hash = "sha256-45+fRCATI+MKYa9/rXIylBItVXV+pJhY2y7iO3ida+o="; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; hash = "sha256-WMMAUqoxT3J1gW9DI8v31VAuhwqTc4Posose5jq1BNo="; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; })
(fetchNuGet { pname = "System.Composition"; version = "8.0.0"; hash = "sha256-rA118MFj6soKN++BvD3y9gXAJf0lZJAtGARuznG5+Xg="; })
diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
index 8231e831b4fe..16e25dcefd9c 100644
--- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
+++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
@@ -2,7 +2,7 @@
buildNpmPackage rec {
pname = "asf-ui";
- version = "1641151b9f430908bc63bbe9927fa8414538e7f1";
+ version = "9f5672d65a1bd3b0f5d16ea6a1b5d220d670223c";
src = fetchFromGitHub {
owner = "JustArchiNET";
@@ -10,10 +10,10 @@ buildNpmPackage rec {
# updated by the update script
# this is always the commit that should be used with asf-ui from the latest asf version
rev = version;
- hash = "sha256-0qfX0vHaDY4Mv9N6nXcn2/9DgRAAl07c8eNHBC3rX6I=";
+ hash = "sha256-ngIPUy3iAkC5yFsH9lZlRcBlFs4sEkzfTrJ+ajB+weo=";
};
- npmDepsHash = "sha256-/DRkzwU32RgXR+58MrD2KbxF55nJJxnMAnU3kafqtXg=";
+ npmDepsHash = "sha256-GKkXh0FjsorllAukg6hYBSU0JEP6Bv7tvzEgRM4zAgw=";
installPhase = ''
runHook preInstall
diff --git a/pkgs/applications/misc/ausweisapp/default.nix b/pkgs/applications/misc/ausweisapp/default.nix
index ab5cda688562..7b4f813e8084 100644
--- a/pkgs/applications/misc/ausweisapp/default.nix
+++ b/pkgs/applications/misc/ausweisapp/default.nix
@@ -12,16 +12,17 @@
qttools,
qtwayland,
qtwebsockets,
+ gitUpdater
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ausweisapp";
- version = "2.2.1";
+ version = "2.2.2";
src = fetchFromGitHub {
owner = "Governikus";
repo = "AusweisApp2";
rev = finalAttrs.version;
- hash = "sha256-+hkbtxw1Bj/lMgyf3OkwmRXyZL6CS3bTHUlGH9xxe/E=";
+ hash = "sha256-YjnMDHXzL16XMVwewoQztE5yjwn1MA1KAiEmEjIYoPY=";
};
nativeBuildInputs = [
@@ -45,9 +46,12 @@ stdenv.mkDerivation (finalAttrs: {
qtwebsockets
];
- passthru.tests.version = testers.testVersion {
- package = finalAttrs.finalPackage;
- command = "QT_QPA_PLATFORM=offscreen ${finalAttrs.meta.mainProgram} --version";
+ passthru = {
+ tests.version = testers.testVersion {
+ package = finalAttrs.finalPackage;
+ command = "QT_QPA_PLATFORM=offscreen ${finalAttrs.meta.mainProgram} --version";
+ };
+ updateScript = gitUpdater { };
};
meta = {
diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix
index 4084734aa58e..481f36571706 100644
--- a/pkgs/applications/misc/bambu-studio/default.nix
+++ b/pkgs/applications/misc/bambu-studio/default.nix
@@ -22,10 +22,7 @@
glib,
glib-networking,
gmp,
- gstreamer,
- gst-plugins-base,
- gst-plugins-bad,
- gst-plugins-good,
+ gst_all_1,
gtest,
gtk3,
hicolor-icon-theme,
@@ -36,6 +33,7 @@
nlopt,
opencascade-occt_7_6,
openvdb,
+ opencv,
pcre,
systemd,
tbb_2021_11,
@@ -45,14 +43,20 @@
withSystemd ? stdenv.hostPlatform.isLinux,
}:
let
- opencascade-occt = opencascade-occt_7_6;
- wxGTK31' = wxGTK31.overrideAttrs (old: {
- configureFlags = old.configureFlags ++ [
- # Disable noisy debug dialogs
- "--enable-debug=no"
- ];
- });
- openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: {
+ wxGTK' =
+ (wxGTK31.override {
+ withCurl = true;
+ withPrivateFonts = true;
+ withWebKit = true;
+ }).overrideAttrs
+ (old: {
+ configureFlags = old.configureFlags ++ [
+ # Disable noisy debug dialogs
+ "--enable-debug=no"
+ ];
+ });
+
+ openvdb' = openvdb.overrideAttrs (old: {
buildInputs = [
openexr
boost179
@@ -65,13 +69,13 @@ let
in
stdenv.mkDerivation rec {
pname = "bambu-studio";
- version = "01.09.00.70";
+ version = "01.09.07.52";
src = fetchFromGitHub {
owner = "bambulab";
repo = "BambuStudio";
rev = "v${version}";
- hash = "sha256-RBctBhKo7mjxsP7OJhGfoU1eIiGVuMiAqwwSU+gsMds=";
+ hash = "sha256-fhH4N29P/ysdHHbZt+FnBl3+QtTNhbVE3j4ZnFJyJH0=";
};
nativeBuildInputs = [
@@ -95,10 +99,10 @@ stdenv.mkDerivation rec {
glib
glib-networking
gmp
- gstreamer
- gst-plugins-base
- gst-plugins-bad
- gst-plugins-good
+ gst_all_1.gstreamer
+ gst_all_1.gst-plugins-base
+ gst_all_1.gst-plugins-bad
+ gst_all_1.gst-plugins-good
gtk3
hicolor-icon-theme
ilmbase
@@ -106,20 +110,23 @@ stdenv.mkDerivation rec {
mesa.osmesa
mpfr
nlopt
- opencascade-occt
- openvdb_tbb_2021_8
+ opencascade-occt_7_6
+ openvdb'
pcre
tbb_2021_11
webkitgtk_4_0
- wxGTK31'
+ wxGTK'
xorg.libX11
+ opencv
] ++ lib.optionals withSystemd [ systemd ] ++ checkInputs;
patches = [
# Fix for webkitgtk linking
- ./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
+ ./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
# Fix build with cgal-5.6.1+
- ./meshboolean-const.patch
+ ./patches/meshboolean-const.patch
+ # Fix an issue with
+ ./patches/dont-link-opencv-world-bambu.patch
];
doCheck = true;
@@ -136,7 +143,10 @@ stdenv.mkDerivation rec {
# Disable compiler warnings that clutter the build log.
# It seems to be a known issue for Eigen:
# http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221
- NIX_CFLAGS_COMPILE = "-Wno-ignored-attributes";
+ NIX_CFLAGS_COMPILE = toString [
+ "-Wno-ignored-attributes"
+ "-I${opencv.out}/include/opencv4"
+ ];
# prusa-slicer uses dlopen on `libudev.so` at runtime
NIX_LDFLAGS = lib.optionalString withSystemd "-ludev";
@@ -181,8 +191,12 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "PC Software for BambuLab's 3D printers";
homepage = "https://github.com/bambulab/BambuStudio";
+ changelog = "https://github.com/bambulab/BambuStudio/releases/tag/v${version}";
license = licenses.agpl3Plus;
- maintainers = with maintainers; [ zhaofengli ];
+ maintainers = with maintainers; [
+ zhaofengli
+ dsluijk
+ ];
mainProgram = "bambu-studio";
platforms = platforms.linux;
};
diff --git a/pkgs/applications/misc/bambu-studio/orca-slicer.nix b/pkgs/applications/misc/bambu-studio/orca-slicer.nix
index 353252dfea17..db86a8c40815 100644
--- a/pkgs/applications/misc/bambu-studio/orca-slicer.nix
+++ b/pkgs/applications/misc/bambu-studio/orca-slicer.nix
@@ -2,7 +2,6 @@
lib,
fetchFromGitHub,
bambu-studio,
- opencv,
}:
bambu-studio.overrideAttrs (
finalAttrs: previousAttrs: {
@@ -16,20 +15,15 @@ bambu-studio.overrideAttrs (
hash = "sha256-7fusdSYpZb4sYl5L/+81PzMd42Nsejj+kCZsq0f7eIk=";
};
- patches =
- previousAttrs.patches
- ++ [
- # FIXME: only required for 2.1.1, can be removed in the next version
- ./0002-fix-build-for-gcc-13.diff
-
- ./dont-link-opencv-world.patch
- ];
-
- buildInputs =
- previousAttrs.buildInputs
- ++ [
- opencv
- ];
+ patches =[
+ # FIXME: only required for 2.1.1, can be removed in the next version
+ ./patches/0002-fix-build-for-gcc-13.diff
+ # Fix for webkitgtk linking
+ ./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
+ # Fix build with cgal-5.6.1+
+ ./patches/meshboolean-const.patch
+ ./patches/dont-link-opencv-world-orca.patch
+ ];
preFixup = ''
gappsWrapperArgs+=(
diff --git a/pkgs/applications/misc/bambu-studio/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch b/pkgs/applications/misc/bambu-studio/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
similarity index 100%
rename from pkgs/applications/misc/bambu-studio/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
rename to pkgs/applications/misc/bambu-studio/patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
diff --git a/pkgs/applications/misc/bambu-studio/0002-fix-build-for-gcc-13.diff b/pkgs/applications/misc/bambu-studio/patches/0002-fix-build-for-gcc-13.diff
similarity index 100%
rename from pkgs/applications/misc/bambu-studio/0002-fix-build-for-gcc-13.diff
rename to pkgs/applications/misc/bambu-studio/patches/0002-fix-build-for-gcc-13.diff
diff --git a/pkgs/applications/misc/bambu-studio/patches/dont-link-opencv-world-bambu.patch b/pkgs/applications/misc/bambu-studio/patches/dont-link-opencv-world-bambu.patch
new file mode 100644
index 000000000000..cb7e212144ac
--- /dev/null
+++ b/pkgs/applications/misc/bambu-studio/patches/dont-link-opencv-world-bambu.patch
@@ -0,0 +1,14 @@
+diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
+index 2cdc525..44e6602 100644
+--- a/src/libslic3r/CMakeLists.txt
++++ b/src/libslic3r/CMakeLists.txt
+@@ -533,7 +533,8 @@ target_link_libraries(libslic3r
+ ${OCCT_LIBS}
+ Clipper2
+ mcut
+- opencv_world
++ opencv_core
++ opencv_imgproc
+ )
+
+ if(NOT WIN32)
\ No newline at end of file
diff --git a/pkgs/applications/misc/bambu-studio/dont-link-opencv-world.patch b/pkgs/applications/misc/bambu-studio/patches/dont-link-opencv-world-orca.patch
similarity index 100%
rename from pkgs/applications/misc/bambu-studio/dont-link-opencv-world.patch
rename to pkgs/applications/misc/bambu-studio/patches/dont-link-opencv-world-orca.patch
diff --git a/pkgs/applications/misc/bambu-studio/meshboolean-const.patch b/pkgs/applications/misc/bambu-studio/patches/meshboolean-const.patch
similarity index 100%
rename from pkgs/applications/misc/bambu-studio/meshboolean-const.patch
rename to pkgs/applications/misc/bambu-studio/patches/meshboolean-const.patch
diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix
index 16f4c0bd2d6f..1c7eedc56570 100644
--- a/pkgs/applications/misc/bb/default.nix
+++ b/pkgs/applications/misc/bb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, darwin, aalib, ncurses, xorg, libmikmod }:
+{ stdenv, lib, fetchurl, autoreconfHook, aalib, ncurses, xorg, libmikmod }:
stdenv.mkDerivation rec {
pname = "bb";
@@ -9,19 +9,24 @@ stdenv.mkDerivation rec {
sha256 = "1i411glxh7g4pfg4gw826lpwngi89yrbmxac8jmnsfvrfb48hgbr";
};
+ patches = [
+ # add / update include files to get function prototypes
+ ./included-files-updates.diff
+ ];
+
+ nativeBuildInputs = [ autoreconfHook ];
+
buildInputs = [
aalib ncurses libmikmod
xorg.libXau xorg.libXdmcp xorg.libX11
- ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.CoreAudio;
+ ];
- postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
- sed -i -e '/^#include $/d' *.c
+ # regparm attribute is not supported by clang
+ postPatch = lib.optionalString stdenv.cc.isClang ''
+ substituteInPlace config.h \
+ --replace-fail "__attribute__ ((regparm(n)))" ""
'';
- # error: 'regparm' is not valid on this platform
- env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)
- "-D__STRICT_ANSI__";
-
meta = with lib; {
homepage = "http://aa-project.sourceforge.net/bb";
description = "AA-lib demo";
diff --git a/pkgs/applications/misc/bb/included-files-updates.diff b/pkgs/applications/misc/bb/included-files-updates.diff
new file mode 100644
index 000000000000..07fa331a96c0
--- /dev/null
+++ b/pkgs/applications/misc/bb/included-files-updates.diff
@@ -0,0 +1,145 @@
+diff --git a/bb.c b/bb.c
+index 95850ef..6a7cc78 100644
+--- a/bb.c
++++ b/bb.c
+@@ -23,6 +23,7 @@
+
+ #include
+ #include
++#include
+ #include
+ #include
+ #include "bb.h"
+diff --git a/credits.c b/credits.c
+index 8514579..b304d8c 100644
+--- a/credits.c
++++ b/credits.c
+@@ -24,7 +24,6 @@
+ #include
+ #include
+ #include
+-#include
+ #include
+ #include "bb.h"
+ #define STAR 1
+diff --git a/credits2.c b/credits2.c
+index 65d2431..9dcdf2d 100644
+--- a/credits2.c
++++ b/credits2.c
+@@ -25,7 +25,6 @@
+ #include
+ #include
+ #include
+-#include
+ #include
+ #include "bb.h"
+ #define STATE (TIME-starttime)
+diff --git a/main.c b/main.c
+index ae852a7..c0648b4 100644
+--- a/main.c
++++ b/main.c
+@@ -21,6 +21,8 @@
+ * 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
++#include
++#include
+ #include
+ #include "timers.h"
+ #include "bb.h"
+diff --git a/messager.c b/messager.c
+index 95cc410..5164577 100644
+--- a/messager.c
++++ b/messager.c
+@@ -22,7 +22,7 @@
+ */
+
+ #include
+-#include
++#include
+ #include "bb.h"
+
+ static int cursor_x, cursor_y;
+diff --git a/scene5.c b/scene5.c
+index 8d3c798..4a79258 100644
+--- a/scene5.c
++++ b/scene5.c
+@@ -22,7 +22,7 @@
+ */
+
+ #include
+-#include
++#include
+ #include
+ #include "bb.h"
+ #include "tex.h"
+diff --git a/scene8.c b/scene8.c
+index 2bcba1e..72ea231 100644
+--- a/scene8.c
++++ b/scene8.c
+@@ -22,7 +22,7 @@
+ */
+
+ #include
+-#include
++#include
+ #include "bb.h"
+ #define STATE1 (TIME-starttime1)
+ #define STATE (time-starttime)
+diff --git a/textform.c b/textform.c
+index 859d367..eb9d1cb 100644
+--- a/textform.c
++++ b/textform.c
+@@ -1,6 +1,6 @@
+ #include
+ #include
+-#include
++#include
+ #include
+ #include "bb.h"
+ #define MAXLINES 10000
+diff --git a/timers.c b/timers.c
+index ac822f7..6342c1b 100644
+--- a/timers.c
++++ b/timers.c
+@@ -45,12 +45,9 @@
+ #include
+ #endif
+ /*HAVE_TIME_H*/
+-#include
++#include
+ #include
+ #include
+-#ifndef _MAC
+-#include
+-#endif
+ #ifdef __BEOS__
+ #include
+ #endif
+diff --git a/uncompfn.c b/uncompfn.c
+index d8eaaea..bc707f8 100644
+--- a/uncompfn.c
++++ b/uncompfn.c
+@@ -21,7 +21,7 @@
+ * 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+-#include
++#include
+ #include
+ #include "bb.h"
+
+diff --git a/zoom.c b/zoom.c
+index 7450095..4b37b2d 100644
+--- a/zoom.c
++++ b/zoom.c
+@@ -31,9 +31,6 @@
+ #else
+ #include
+ #include
+-#ifndef _MAC
+-#include
+-#endif
+ #ifdef __DJGPP__
+ #include "aconfig.dos"
+ #else
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 1a9ea4fd5ea4..7d89339da102 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -108,13 +108,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "blender";
- version = "4.2.2";
+ version = "4.2.3";
srcs = [
(fetchzip {
name = "source";
url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
- hash = "sha256-wv9EwB4DXSVS5K+lb+7gU3pTrMDO/ELeV2eErivfsWU=";
+ hash = "sha256-58wgduTHGfuYohaPjNuAnLFrpXOosEYOk5gJvbxTlQk=";
})
(fetchgit {
name = "assets";
diff --git a/pkgs/applications/misc/camunda-modeler/default.nix b/pkgs/applications/misc/camunda-modeler/default.nix
index 3dce538aa007..0972247271a8 100644
--- a/pkgs/applications/misc/camunda-modeler/default.nix
+++ b/pkgs/applications/misc/camunda-modeler/default.nix
@@ -9,11 +9,11 @@
stdenvNoCC.mkDerivation rec {
pname = "camunda-modeler";
- version = "5.26.0";
+ version = "5.28.0";
src = fetchurl {
url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz";
- hash = "sha256-jtTlqVsd+EGBkh05O+fRn6e6Q+Gw68uGruQqaTfsolM=";
+ hash = "sha256-0xOgnpHoFxBzDoDGI7bcBFRu47HDYASIu4ApQo288Bo=";
};
sourceRoot = "camunda-modeler-${version}-linux-x64";
diff --git a/pkgs/applications/misc/chatblade/default.nix b/pkgs/applications/misc/chatblade/default.nix
index 696cf52ba414..3927c57950ac 100644
--- a/pkgs/applications/misc/chatblade/default.nix
+++ b/pkgs/applications/misc/chatblade/default.nix
@@ -2,12 +2,12 @@
python3Packages.buildPythonApplication rec {
pname = "chatblade";
- version = "0.6.4";
+ version = "0.7.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- hash = "sha256-d8XavZBuWsuIUxraC2XaWM6tgo2JmsPZwzyl9Rj5wWM=";
+ hash = "sha256-v6X5aqArhp33bm8JELDCUoxE3nsvla4I3n0ZLLMMeJI=";
};
doCheck = false; # there are no tests
diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix
index eb0f2359cc29..fadb989bff4f 100644
--- a/pkgs/applications/misc/corectrl/default.nix
+++ b/pkgs/applications/misc/corectrl/default.nix
@@ -25,13 +25,13 @@
stdenv.mkDerivation rec{
pname = "corectrl";
- version = "1.4.1";
+ version = "1.4.2";
src = fetchFromGitLab {
owner = "corectrl";
repo = "corectrl";
rev = "v${version}";
- hash = "sha256-E2Dqe1IYXjFb/nShQX+ARZW/AWpNonRimb3yQ6/2CFw=";
+ hash = "sha256-WOljOakh177om7tLlroFwWO4gYsarfTCeVXX6+dmZs4=";
};
patches = [
./polkit-dir.patch
diff --git a/pkgs/applications/misc/dmenu-rs/default.nix b/pkgs/applications/misc/dmenu-rs/default.nix
deleted file mode 100644
index 4b15eae9e614..000000000000
--- a/pkgs/applications/misc/dmenu-rs/default.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{ stdenv
-, rustPlatform
-, lib
-, fetchFromGitHub
-, cargo
-, expat
-, fontconfig
-, libXft
-, libXinerama
-, m4
-, pkg-config
-, python3
-}:
-
-# The dmenu-rs package has extensive plugin support. However, this derivation
-# only builds the package with the default set of plugins. If you'd like to
-# further customize dmenu-rs you can build it from the source.
-# See: https://github.com/Shizcow/dmenu-rs#plugins
-stdenv.mkDerivation rec {
- pname = "dmenu-rs";
- version = "5.5.4";
-
- src = fetchFromGitHub {
- owner = "Shizcow";
- repo = "dmenu-rs";
- rev = version;
- hash = "sha256-LdbTvuq1IbzWEoASscIh3j3VAHm+W3UekJNiMHTxSQI=";
- };
-
- nativeBuildInputs = [
- cargo
- m4
- pkg-config
- python3
- rustPlatform.bindgenHook
- rustPlatform.cargoSetupHook
- ];
-
- buildInputs = [
- expat
- fontconfig
- libXft
- libXinerama
- ];
-
- # The dmenu-rs repository does not include a Cargo.lock because of its
- # dynamic build and plugin support. Generating it with make and checking it
- # in to nixpkgs here was the easiest way to supply it to rustPlatform.
- # See: https://github.com/Shizcow/dmenu-rs/issues/34#issuecomment-757415584
- cargoDeps = rustPlatform.importCargoLock {
- lockFile = ./Cargo.lock;
- };
-
- # Copy the Cargo.lock stored here in nixpkgs into the build directory.
- postPatch = ''
- cp ${./Cargo.lock} src/Cargo.lock
- '';
-
- cargoRoot = "src";
-
- installFlags = [ "PREFIX=$(out)" ];
-
- # Running make test requires an X11 server. It also runs dmenu, which then
- # hangs on user input. It was too hard to figure out how to run these tests
- # deterministically. See the original PR for some discussion on this.
- doCheck = false;
-
- meta = with lib; {
- description = "Pixel perfect port of dmenu, rewritten in Rust with extensive plugin support";
- homepage = "https://github.com/Shizcow/dmenu-rs";
- license = with licenses; [ gpl3Only ];
- maintainers = with maintainers; [ benjaminedwardwebb ];
- platforms = platforms.linux;
- broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
- };
-}
diff --git a/pkgs/applications/misc/doctave/cargo-lock.patch b/pkgs/applications/misc/doctave/cargo-lock.patch
deleted file mode 100644
index b9b7797bc350..000000000000
--- a/pkgs/applications/misc/doctave/cargo-lock.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -295,7 +295,7 @@ dependencies = [
-
- [[package]]
- name = "doctave"
--version = "0.4.0"
-+version = "0.4.2"
- dependencies = [
- "alphanumeric-sort",
- "ascii",
diff --git a/pkgs/applications/misc/doctave/default.nix b/pkgs/applications/misc/doctave/default.nix
deleted file mode 100644
index 8ddbe3a126e1..000000000000
--- a/pkgs/applications/misc/doctave/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib, rustPlatform, fetchFromGitHub, stdenv, CoreServices }:
-
-rustPlatform.buildRustPackage rec {
- pname = "doctave";
- version = "0.4.2";
-
- src = fetchFromGitHub {
- owner = "doctave";
- repo = pname;
- rev = version;
- sha256 = "1780pqvnlbxxhm7rynnysqr0vihdkwmc6rmgp43bmj1k18ar4qgj";
- };
-
- # Cargo.lock is outdated
- cargoPatches = [ ./cargo-lock.patch ];
-
- cargoHash = "sha256-keLcNttdM9JUnn3qi/bWkcObIHl3MRACDHKPSZuScOc=";
-
- buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
- CoreServices
- ];
-
- meta = with lib; {
- description = "Batteries-included developer documentation site generator";
- homepage = "https://github.com/doctave/doctave";
- changelog = "https://github.com/doctave/doctave/blob/${version}/CHANGELOG.md";
- license = licenses.mit;
- maintainers = with maintainers; [ figsoda ];
- mainProgram = "doctave";
- };
-}
diff --git a/pkgs/applications/misc/dwmbar/default.nix b/pkgs/applications/misc/dwmbar/default.nix
index 3f7e9c821a2e..e2fa8155edd7 100644
--- a/pkgs/applications/misc/dwmbar/default.nix
+++ b/pkgs/applications/misc/dwmbar/default.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation {
pname = "dwmbar";
- version = "unstable-2021-12-22";
+ version = "0-unstable-2021-12-22";
src = fetchFromGitHub {
owner = "thytom";
diff --git a/pkgs/applications/misc/dwmblocks/default.nix b/pkgs/applications/misc/dwmblocks/default.nix
index 0b7abc7e3dfc..91e08995c9af 100644
--- a/pkgs/applications/misc/dwmblocks/default.nix
+++ b/pkgs/applications/misc/dwmblocks/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "dwmblocks";
- version = "unstable-2020-12-27";
+ version = "0-unstable-2024-08-24";
src = fetchFromGitHub {
owner = "torrinfail";
repo = "dwmblocks";
- rev = "96cbb453e5373c05372fd4bf3faacfa53e409067";
- sha256 = "00lxfxsrvhm60zzqlcwdv7xkqzya69mgpi2mr3ivzbc8s9h8nwqx";
+ rev = "8cedd220684064f1433749ed2a19a6184c22cf07";
+ hash = "sha256-QtYQB2mvw1k2LA8D+/cVnA8+GRDWjhIM6rxfi/IGjEw=";
};
buildInputs = [ libX11 ];
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 50c6c9ac944a..6078c17f4cbb 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -26,11 +26,11 @@ in
python3.pkgs.buildPythonApplication rec {
pname = "electrum";
- version = "4.5.6";
+ version = "4.5.8";
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
- hash = "sha256-LO2ZUvbDJaIxrdgA+cM3sGgqJ+N+UlA9ObNINQcrorA=";
+ hash = "sha256-3YWVoTgTLe6Hzuds52Ch1iL8L9ZdO2rH335Tt/tup+g=";
};
build-system = [ protobuf ] ++ lib.optionals enableQt [ wrapQtAppsHook ];
diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix
deleted file mode 100644
index ec43e5a18ca6..000000000000
--- a/pkgs/applications/misc/epdfview/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gtk2, poppler }:
-
-stdenv.mkDerivation rec {
- pname = "epdfview";
- version = "0.1.8";
-
- src = fetchurl {
- url = "mirror://debian/pool/main/e/epdfview/epdfview_${version}.orig.tar.gz";
- sha256 = "0ibyb60a0b4n34bsjgvhdw8yf24463ky0hpmf6a2jjqsbm5g4v64";
- };
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ gtk2 poppler ];
-
- hardeningDisable = [ "format" ];
-
- patches = [ (fetchpatch {
- name = "epdfview-0.1.8-glib2-headers.patch";
- url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk/epdfview-0.1.8-glib2-headers.patch?h=packages/epdfview&id=40ba115c860bdec31d03a30fa594a7ec2864d634";
- sha256 = "17df6s1zij5ficj67xszq6kd88cy620az3ic55065ccnmsd73f8h";
- })
- (fetchpatch {
- name = "epdfview-0.1.8-modern-cups.patch";
- url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk/epdfview-0.1.8-modern-cups.patch?h=packages/epdfview&id=40ba115c860bdec31d03a30fa594a7ec2864d634";
- sha256 = "07yvgvai2bvbr5fa1mv6lg7nqr0qyryjn1xyjlh8nidg9k9vv001";
- })
- ];
-
- meta = with lib; {
- homepage = "https://packages.debian.org/wheezy/epdfview";
- description = "Lightweight PDF document viewer using Poppler and GTK";
- longDescription = ''
- ePDFView is a free lightweight PDF document viewer using Poppler and
- GTK libraries. The aim of ePDFView is to make a simple PDF document
- viewer, in the lines of Evince but without using the Gnome libraries.
- '';
- license = licenses.gpl2;
- maintainers = [ maintainers.astsmtl ];
- platforms = platforms.linux;
- mainProgram = "epdfview";
- };
-}
diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix
index ac8e15d38908..590ce86a52e7 100644
--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/pkgs/applications/misc/gallery-dl/default.nix
@@ -10,13 +10,13 @@
buildPythonApplication rec {
pname = "gallery-dl";
- version = "1.27.6";
+ version = "1.27.7";
format = "setuptools";
src = fetchPypi {
inherit version;
pname = "gallery_dl";
- hash = "sha256-bxh15aZIupTaHnYM65MAYuYtKx0z2OIQl3WKEU1gO4Q=";
+ hash = "sha256-9YcxD7AH4U2dOhAiUnknwwGFy9pplFFQ7Rn4cOvDdEc=";
};
propagatedBuildInputs = [
@@ -26,6 +26,11 @@ buildPythonApplication rec {
nativeCheckInputs = [ pytestCheckHook ];
+ disabledTests = [
+ # requires network access
+ "test_init"
+ ];
+
pytestFlagsArray = [
# requires network access
"--ignore=test/test_results.py"
diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock
index 302c0b17727a..90fe5379264a 100644
--- a/pkgs/applications/misc/gollum/Gemfile.lock
+++ b/pkgs/applications/misc/gollum/Gemfile.lock
@@ -5,7 +5,7 @@ GEM
asciidoctor (2.0.23)
base64 (0.2.0)
builder (3.3.0)
- concurrent-ruby (1.3.3)
+ concurrent-ruby (1.3.4)
crass (1.0.6)
creole (0.5.0)
expression_parser (0.9.0)
@@ -43,36 +43,38 @@ GEM
mime-types (~> 3.4)
rugged (~> 1.5)
htmlentities (4.3.4)
- i18n (1.14.5)
+ i18n (1.14.6)
concurrent-ruby (~> 1.0)
- json (2.7.2)
+ json (2.7.4)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
- loofah (2.22.0)
+ logger (1.6.1)
+ loofah (2.23.1)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
- mime-types (3.5.2)
+ mime-types (3.6.0)
+ logger
mime-types-data (~> 3.2015)
- mime-types-data (3.2024.0702)
+ mime-types-data (3.2024.1001)
mini_portile2 (2.8.7)
multi_json (1.15.0)
mustache (1.1.1)
mustache-sinatra (2.0.0)
mustache (~> 1.0)
- mustermann (3.0.0)
+ mustermann (3.0.3)
ruby2_keywords (~> 0.0.1)
nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
- octicons (19.11.0)
+ octicons (19.12.0)
org-ruby (0.9.12)
rubypants (~> 0.2)
psych (5.1.2)
stringio
- racc (1.8.0)
- rack (3.1.7)
+ racc (1.8.1)
+ rack (3.1.8)
rack-protection (4.0.0)
base64 (>= 0.1.0)
rack (>= 3.0.0, < 4)
@@ -83,10 +85,9 @@ GEM
webrick (~> 1.8)
rdoc (6.7.0)
psych (>= 4.0.0)
- rexml (3.3.2)
- strscan
+ rexml (3.3.9)
rouge (3.30.0)
- rss (0.3.0)
+ rss (0.3.1)
rexml
ruby2_keywords (0.0.5)
rubypants (0.7.1)
@@ -109,7 +110,6 @@ GEM
sprockets-helpers (1.4.0)
sprockets (>= 2.2)
stringio (3.1.1)
- strscan (3.1.0)
therubyrhino (2.1.2)
therubyrhino_jar (>= 1.7.4, < 1.7.9)
therubyrhino_jar (1.7.8)
@@ -120,7 +120,7 @@ GEM
unf_ext
unf_ext (0.0.9.1)
useragent (0.16.10)
- webrick (1.8.1)
+ webrick (1.8.2)
wikicloth (0.8.3)
builder
expression_parser
diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix
index e9948188e149..c45f4c367251 100644
--- a/pkgs/applications/misc/gollum/gemset.nix
+++ b/pkgs/applications/misc/gollum/gemset.nix
@@ -34,10 +34,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g";
+ sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
type = "gem";
};
- version = "1.3.3";
+ version = "1.3.4";
};
crass = {
groups = ["default"];
@@ -139,20 +139,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16";
+ sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw";
type = "gem";
};
- version = "1.14.5";
+ version = "1.14.6";
};
json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q";
+ sha256 = "1klf2mnfilzjqwcjdi5qb1zl3ghrifz1amcnvwjvsfnx9a5jb9ly";
type = "gem";
};
- version = "2.7.2";
+ version = "2.7.4";
};
kramdown = {
dependencies = ["rexml"];
@@ -176,37 +176,47 @@
};
version = "1.1.0";
};
+ logger = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
+ type = "gem";
+ };
+ version = "1.6.1";
+ };
loofah = {
dependencies = ["crass" "nokogiri"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zkjqf37v2d7s11176cb35cl83wls5gm3adnfkn2zcc61h3nxmqh";
+ sha256 = "0ppp2cgli5avzk0z3dwnah6y65ymyr793yja28p2fs9vrci7986h";
type = "gem";
};
- version = "2.22.0";
+ version = "2.23.1";
};
mime-types = {
- dependencies = ["mime-types-data"];
+ dependencies = ["logger" "mime-types-data"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1";
+ sha256 = "0r34mc3n7sxsbm9mzyzy8m3dvq7pwbryyc8m452axkj0g2axnwbg";
type = "gem";
};
- version = "3.5.2";
+ version = "3.6.0";
};
mime-types-data = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "104r7glqjal9fgvnv49wjzp4ssai9hmyn3npkari51s2ska3jnr0";
+ sha256 = "06dbn0j13jwdrmlvrjd50mxqrjlkh3lvxp0afh4glyzbliqvqpsd";
type = "gem";
};
- version = "3.2024.0702";
+ version = "3.2024.1001";
};
mini_portile2 = {
groups = ["default"];
@@ -255,10 +265,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rwbq20s2gdh8dljjsgj5s6wqqfmnbclhvv2c2608brv7jm6jdbd";
+ sha256 = "123ycmq6pkivv29bqbv79jv2cs04xakzd0fz1lalgvfs5nxfky6i";
type = "gem";
};
- version = "3.0.0";
+ version = "3.0.3";
};
nokogiri = {
dependencies = ["mini_portile2" "racc"];
@@ -276,10 +286,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07nb9i9yl3xk6dr7aacxx3dfrrslrw9cn9a55gn9rrhgckb3pymy";
+ sha256 = "00ld13van1xiayr24gwpbxfb63zbw44fx25xs9cp29g6cdzi5hrp";
type = "gem";
};
- version = "19.11.0";
+ version = "19.12.0";
};
org-ruby = {
dependencies = ["rubypants"];
@@ -308,20 +318,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09";
+ sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa";
type = "gem";
};
- version = "1.8.0";
+ version = "1.8.1";
};
rack = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12z55b90vvr4sh93az2yfr3fg91jivsag8lcg0k360d99vdq568f";
+ sha256 = "1cd13019gnnh2c0a3kj27ij5ibk72v0bmpypqv4l6ayw8g5cpyyk";
type = "gem";
};
- version = "3.1.7";
+ version = "3.1.8";
};
rack-protection = {
dependencies = ["base64" "rack"];
@@ -378,15 +388,14 @@
version = "4.3.4";
};
rexml = {
- dependencies = ["strscan"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zr5qpa8lampaqzhdcjcvyqnrqcjl7439mqjlkjz43wdhmpnh4s5";
+ sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p";
type = "gem";
};
- version = "3.3.2";
+ version = "3.3.9";
};
rouge = {
groups = ["default"];
@@ -404,10 +413,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1wv27axi39hhr0nmaffdl5bdjqiafcvp9xhfgnsgfczsblja50sn";
+ sha256 = "0dv74a07j3ih5ykyszs1k2cjvgs5c1pzrvcb1wc2bfai8p038qml";
type = "gem";
};
- version = "0.3.0";
+ version = "0.3.1";
};
ruby2_keywords = {
groups = ["default"];
@@ -493,16 +502,6 @@
};
version = "3.1.1";
};
- strscan = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01";
- type = "gem";
- };
- version = "3.1.0";
- };
therubyrhino = {
dependencies = ["therubyrhino_jar"];
groups = ["default"];
@@ -581,10 +580,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r";
+ sha256 = "089gy5494j560b242vi173wnbj2913hwlwnjkpzld58r96ilc5s3";
type = "gem";
};
- version = "1.8.1";
+ version = "1.8.2";
};
wikicloth = {
dependencies = ["builder" "expression_parser" "htmlentities" "nokogiri" "twitter-text"];
diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix
index eccb7df29166..9024589c297a 100644
--- a/pkgs/applications/misc/gremlin-console/default.nix
+++ b/pkgs/applications/misc/gremlin-console/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "gremlin-console";
- version = "3.7.2";
+ version = "3.7.3";
src = fetchzip {
url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip";
- sha256 = "sha256-lIrqMvI/sYGu36X3jNptoIz7mPVomk8YCIR/6y8mpEc=";
+ sha256 = "sha256-27S1ukq9rHncFuPBZmwIP/bKuPYm3AxdBK3PliYTGEQ=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix
deleted file mode 100644
index f55e32baebf8..000000000000
--- a/pkgs/applications/misc/gtk2fontsel/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{lib, stdenv, fetchurl, pkg-config, gtk2 }:
-
-stdenv.mkDerivation rec {
- version = "0.1";
- pname = "gtk2fontsel";
-
- src = fetchurl {
- url = "mirror://sourceforge/gtk2fontsel/${pname}-${version}.tar.gz";
- sha256 = "0s2sj19n8ys92q9832hkn36ld91bb4qavicc6nygkry6qdpkkmjw";
- };
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ gtk2 ];
-
- preferLocalBuild = true;
-
- meta = with lib; {
- description = "Font selection program for X11 using the GTK 2 toolkit";
- longDescription = ''
- Font selection tool similar to xfontsel implemented using GTK 2.
- Trivial, but useful nonetheless.
- '';
- homepage = "https://gtk2fontsel.sourceforge.net/";
- downloadPage = "https://sourceforge.net/projects/gtk2fontsel/";
- license = licenses.gpl2;
- maintainers = [ maintainers.prikhi ];
- platforms = platforms.linux;
- mainProgram = "gtk2fontsel";
- };
-}
diff --git a/pkgs/applications/misc/insulator2/Cargo.lock b/pkgs/applications/misc/insulator2/Cargo.lock
index e119d57c4d10..571bd845a5fb 100644
--- a/pkgs/applications/misc/insulator2/Cargo.lock
+++ b/pkgs/applications/misc/insulator2/Cargo.lock
@@ -2,6 +2,15 @@
# It is not intended for manual editing.
version = 3
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
[[package]]
name = "adler"
version = "1.0.2"
@@ -16,31 +25,32 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
[[package]]
name = "ahash"
-version = "0.7.6"
+version = "0.7.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.12",
"once_cell",
"version_check",
]
[[package]]
name = "ahash"
-version = "0.8.3"
+version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
+checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
dependencies = [
"cfg-if",
"once_cell",
"version_check",
+ "zerocopy 0.7.32",
]
[[package]]
name = "aho-corasick"
-version = "0.7.20"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
dependencies = [
"memchr",
]
@@ -60,6 +70,18 @@ dependencies = [
"alloc-no-stdlib",
]
+[[package]]
+name = "allocator-api2"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
[[package]]
name = "android_system_properties"
version = "0.1.5"
@@ -71,14 +93,14 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.69"
+version = "1.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
+checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
[[package]]
name = "apache-avro"
-version = "0.15.0"
-source = "git+https://github.com/apache/avro?rev=b8b83b72f7184cf1b388fc20331d11eabbd93e06#b8b83b72f7184cf1b388fc20331d11eabbd93e06"
+version = "0.16.0"
+source = "git+https://github.com/andrewinci/avro#81a44a1b2df4a117a0a27d164cd2a0638f31ffc3"
dependencies = [
"byteorder",
"digest",
@@ -96,14 +118,14 @@ dependencies = [
"thiserror",
"typed-builder",
"uuid",
- "zerocopy",
+ "zerocopy 0.6.6",
]
[[package]]
name = "arrayvec"
-version = "0.7.2"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
[[package]]
name = "ascii-canvas"
@@ -126,72 +148,114 @@ dependencies = [
[[package]]
name = "async-channel"
-version = "1.8.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
dependencies = [
"concurrent-queue",
- "event-listener",
+ "event-listener 2.5.3",
"futures-core",
]
[[package]]
-name = "async-executor"
-version = "1.5.0"
+name = "async-channel"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b"
+checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c"
dependencies = [
- "async-lock",
+ "concurrent-queue",
+ "event-listener 4.0.3",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c"
+dependencies = [
+ "async-lock 3.3.0",
"async-task",
"concurrent-queue",
- "fastrand",
- "futures-lite",
+ "fastrand 2.0.1",
+ "futures-lite 2.2.0",
"slab",
]
[[package]]
name = "async-global-executor"
-version = "2.3.1"
+version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776"
+checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
dependencies = [
- "async-channel",
+ "async-channel 2.1.1",
"async-executor",
- "async-io",
- "async-lock",
+ "async-io 2.3.1",
+ "async-lock 3.3.0",
"blocking",
- "futures-lite",
+ "futures-lite 2.2.0",
"once_cell",
]
[[package]]
name = "async-io"
-version = "1.12.0"
+version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794"
+checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
dependencies = [
- "async-lock",
+ "async-lock 2.8.0",
"autocfg",
+ "cfg-if",
"concurrent-queue",
- "futures-lite",
- "libc",
+ "futures-lite 1.13.0",
"log",
"parking",
- "polling",
+ "polling 2.8.0",
+ "rustix 0.37.27",
"slab",
- "socket2",
+ "socket2 0.4.10",
"waker-fn",
- "windows-sys 0.42.0",
+]
+
+[[package]]
+name = "async-io"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65"
+dependencies = [
+ "async-lock 3.3.0",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite 2.2.0",
+ "parking",
+ "polling 3.3.2",
+ "rustix 0.38.31",
+ "slab",
+ "tracing",
+ "windows-sys 0.52.0",
]
[[package]]
name = "async-lock"
-version = "2.6.0"
+version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685"
+checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
dependencies = [
- "event-listener",
- "futures-lite",
+ "event-listener 2.5.3",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
+dependencies = [
+ "event-listener 4.0.3",
+ "event-listener-strategy",
+ "pin-project-lite",
]
[[package]]
@@ -205,20 +269,37 @@ dependencies = [
[[package]]
name = "async-process"
-version = "1.6.0"
+version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6381ead98388605d0d9ff86371043b5aa922a3905824244de40dc263a14fcba4"
+checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88"
dependencies = [
- "async-io",
- "async-lock",
- "autocfg",
+ "async-io 1.13.0",
+ "async-lock 2.8.0",
+ "async-signal",
"blocking",
"cfg-if",
- "event-listener",
- "futures-lite",
- "libc",
- "signal-hook",
- "windows-sys 0.42.0",
+ "event-listener 3.1.0",
+ "futures-lite 1.13.0",
+ "rustix 0.38.31",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "async-signal"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5"
+dependencies = [
+ "async-io 2.3.1",
+ "async-lock 2.8.0",
+ "atomic-waker",
+ "cfg-if",
+ "futures-core",
+ "futures-io",
+ "rustix 0.38.31",
+ "signal-hook-registry",
+ "slab",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -227,16 +308,16 @@ version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
dependencies = [
- "async-channel",
+ "async-channel 1.9.0",
"async-global-executor",
- "async-io",
- "async-lock",
+ "async-io 1.13.0",
+ "async-lock 2.8.0",
"async-process",
"crossbeam-utils",
"futures-channel",
"futures-core",
"futures-io",
- "futures-lite",
+ "futures-lite 1.13.0",
"gloo-timers",
"kv-log-macro",
"log",
@@ -250,19 +331,19 @@ dependencies = [
[[package]]
name = "async-task"
-version = "4.3.0"
+version = "4.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
+checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799"
[[package]]
name = "async-trait"
-version = "0.1.68"
+version = "0.1.77"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
+checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.12",
+ "syn 2.0.48",
]
[[package]]
@@ -272,7 +353,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd"
dependencies = [
"atk-sys",
- "bitflags",
+ "bitflags 1.3.2",
"glib",
"libc",
]
@@ -286,41 +367,14 @@ dependencies = [
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 6.0.3",
+ "system-deps 6.2.0",
]
[[package]]
name = "atomic-waker"
-version = "1.1.0"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599"
-
-[[package]]
-name = "attohttpc"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fcf00bc6d5abb29b5f97e3c61a90b6d3caa12f3faf897d4a3e3607c050a35a7"
-dependencies = [
- "flate2",
- "http",
- "log",
- "native-tls",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "url",
-]
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
[[package]]
name = "autocfg"
@@ -328,6 +382,21 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+[[package]]
+name = "backtrace"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
[[package]]
name = "base64"
version = "0.13.1"
@@ -336,15 +405,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64"
-version = "0.21.0"
+version = "0.21.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
[[package]]
name = "basic-cookies"
-version = "0.1.4"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb53b6b315f924c7f113b162e53b3901c05fc9966baf84d201dfcc7432a4bb38"
+checksum = "67bd8fd42c16bdb08688243dc5f0cc117a3ca9efeeaba3a345a18a6159ad96f7"
dependencies = [
"lalrpop",
"lalrpop-util",
@@ -372,6 +441,24 @@ version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+[[package]]
+name = "bitflags"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
[[package]]
name = "block"
version = "0.1.6"
@@ -380,88 +467,58 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
[[package]]
name = "block-buffer"
-version = "0.10.3"
+version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
dependencies = [
"generic-array",
]
[[package]]
name = "blocking"
-version = "1.3.0"
+version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8"
+checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118"
dependencies = [
- "async-channel",
- "async-lock",
+ "async-channel 2.1.1",
+ "async-lock 3.3.0",
"async-task",
- "atomic-waker",
- "fastrand",
- "futures-lite",
-]
-
-[[package]]
-name = "bollard-stubs"
-version = "1.41.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed2f2e73fffe9455141e170fb9c1feb0ac521ec7e7dcd47a7cab72a658490fb8"
-dependencies = [
- "chrono",
- "serde",
- "serde_with 1.14.0",
+ "fastrand 2.0.1",
+ "futures-io",
+ "futures-lite 2.2.0",
+ "piper",
+ "tracing",
]
[[package]]
name = "borsh"
-version = "0.10.2"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40f9ca3698b2e4cb7c15571db0abc5551dca417a21ae8140460b50309bb2cc62"
+checksum = "f58b559fd6448c6e2fd0adb5720cd98a2506594cafa4737ff98c396f3e82f667"
dependencies = [
"borsh-derive",
- "hashbrown 0.13.2",
+ "cfg_aliases",
]
[[package]]
name = "borsh-derive"
-version = "0.10.2"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "598b3eacc6db9c3ee57b22707ad8f6a8d2f6d442bfe24ffeb8cbb70ca59e6a35"
-dependencies = [
- "borsh-derive-internal",
- "borsh-schema-derive-internal",
- "proc-macro-crate 0.1.5",
- "proc-macro2",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "borsh-derive-internal"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "186b734fa1c9f6743e90c95d7233c9faab6360d1a96d4ffa19d9cfd1e9350f8a"
+checksum = "7aadb5b6ccbd078890f6d7003694e33816e6b784358f18e15e7e6d9f065a57cd"
dependencies = [
+ "once_cell",
+ "proc-macro-crate 3.1.0",
"proc-macro2",
"quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "borsh-schema-derive-internal"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99b7ff1008316626f485991b960ade129253d4034014616b94f309a15366cc49"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "syn 2.0.48",
+ "syn_derive",
]
[[package]]
name = "brotli"
-version = "3.3.4"
+version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68"
+checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f"
dependencies = [
"alloc-no-stdlib",
"alloc-stdlib",
@@ -470,9 +527,9 @@ dependencies = [
[[package]]
name = "brotli-decompressor"
-version = "2.3.4"
+version = "2.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744"
+checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f"
dependencies = [
"alloc-no-stdlib",
"alloc-stdlib",
@@ -480,9 +537,9 @@ dependencies = [
[[package]]
name = "bstr"
-version = "1.3.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1"
+checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc"
dependencies = [
"memchr",
"serde",
@@ -490,25 +547,26 @@ dependencies = [
[[package]]
name = "bumpalo"
-version = "3.12.0"
+version = "3.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
[[package]]
name = "bytecheck"
-version = "0.6.9"
+version = "0.6.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d11cac2c12b5adc6570dad2ee1b87eff4955dac476fe12d81e5fdd352e52406f"
+checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627"
dependencies = [
"bytecheck_derive",
"ptr_meta",
+ "simdutf8",
]
[[package]]
name = "bytecheck_derive"
-version = "0.6.9"
+version = "0.6.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e576ebe98e605500b3c8041bb888e966653577172df6dd97398714eb30b9bf"
+checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61"
dependencies = [
"proc-macro2",
"quote",
@@ -517,21 +575,24 @@ dependencies = [
[[package]]
name = "bytemuck"
-version = "1.13.0"
+version = "1.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393"
+checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9"
[[package]]
name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
-version = "1.4.0"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+dependencies = [
+ "serde",
+]
[[package]]
name = "cairo-rs"
@@ -539,7 +600,7 @@ version = "0.15.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cairo-sys-rs",
"glib",
"libc",
@@ -554,17 +615,17 @@ checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8"
dependencies = [
"glib-sys",
"libc",
- "system-deps 6.0.3",
+ "system-deps 6.2.0",
]
[[package]]
name = "cargo_toml"
-version = "0.15.2"
+version = "0.15.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f83bc2e401ed041b7057345ebc488c005efa0341d5541ce7004d30458d0090b"
+checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838"
dependencies = [
"serde",
- "toml 0.7.3",
+ "toml 0.7.8",
]
[[package]]
@@ -575,9 +636,12 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6"
[[package]]
name = "cc"
-version = "1.0.79"
+version = "1.0.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]
[[package]]
name = "cesu8"
@@ -607,11 +671,12 @@ dependencies = [
[[package]]
name = "cfg-expr"
-version = "0.11.0"
+version = "0.15.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa"
+checksum = "6100bc57b6209840798d95cb2775684849d332f7bd788db2a8c8caf7ef82a41a"
dependencies = [
"smallvec",
+ "target-lexicon",
]
[[package]]
@@ -621,26 +686,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
-name = "chrono"
-version = "0.4.23"
+name = "cfg_aliases"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
+[[package]]
+name = "chrono"
+version = "0.4.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb"
dependencies = [
+ "android-tzdata",
"iana-time-zone",
- "js-sys",
- "num-integer",
"num-traits",
"serde",
- "time 0.1.45",
- "wasm-bindgen",
- "winapi",
+ "windows-targets 0.52.0",
]
[[package]]
name = "cmake"
-version = "0.1.49"
+version = "0.1.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c"
+checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
dependencies = [
"cc",
]
@@ -651,7 +719,7 @@ version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"block",
"cocoa-foundation",
"core-foundation",
@@ -663,29 +731,18 @@ dependencies = [
[[package]]
name = "cocoa-foundation"
-version = "0.1.0"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318"
+checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"block",
"core-foundation",
"core-graphics-types",
- "foreign-types",
"libc",
"objc",
]
-[[package]]
-name = "codespan-reporting"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
-dependencies = [
- "termcolor",
- "unicode-width",
-]
-
[[package]]
name = "color_quant"
version = "1.1.0"
@@ -704,9 +761,9 @@ dependencies = [
[[package]]
name = "concurrent-queue"
-version = "2.1.0"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e"
+checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363"
dependencies = [
"crossbeam-utils",
]
@@ -719,9 +776,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
[[package]]
name = "core-foundation"
-version = "0.9.3"
+version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
dependencies = [
"core-foundation-sys",
"libc",
@@ -729,9 +786,9 @@ dependencies = [
[[package]]
name = "core-foundation-sys"
-version = "0.8.3"
+version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
[[package]]
name = "core-graphics"
@@ -739,7 +796,7 @@ version = "0.22.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"core-foundation",
"core-graphics-types",
"foreign-types",
@@ -748,21 +805,29 @@ dependencies = [
[[package]]
name = "core-graphics-types"
-version = "0.1.1"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"core-foundation",
- "foreign-types",
"libc",
]
[[package]]
-name = "cpufeatures"
-version = "0.2.5"
+name = "core2"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
+checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
dependencies = [
"libc",
]
@@ -778,22 +843,37 @@ dependencies = [
[[package]]
name = "crossbeam-channel"
-version = "0.5.6"
+version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
+checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
dependencies = [
- "cfg-if",
"crossbeam-utils",
]
[[package]]
name = "crossbeam-utils"
-version = "0.8.14"
+version = "0.8.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
-dependencies = [
- "cfg-if",
-]
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
[[package]]
name = "crunchy"
@@ -830,30 +910,24 @@ dependencies = [
[[package]]
name = "cssparser-macros"
-version = "0.6.0"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e"
+checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
dependencies = [
"quote",
- "syn 1.0.109",
+ "syn 2.0.48",
]
[[package]]
name = "ctor"
-version = "0.1.26"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
+checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e"
dependencies = [
"quote",
- "syn 1.0.109",
+ "syn 2.0.48",
]
-[[package]]
-name = "cty"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
-
[[package]]
name = "curl"
version = "0.4.44"
@@ -865,15 +939,15 @@ dependencies = [
"openssl-probe",
"openssl-sys",
"schannel",
- "socket2",
+ "socket2 0.4.10",
"winapi",
]
[[package]]
name = "curl-sys"
-version = "0.4.60+curl-7.88.1"
+version = "0.4.71+curl-8.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "717abe2cb465a5da6ce06617388a3980c9a2844196734bec8ccb8e575250f13f"
+checksum = "c7b12a7ab780395666cb576203dc3ed6e01513754939a600b85196ccf5356bc5"
dependencies = [
"cc",
"libc",
@@ -882,121 +956,58 @@ dependencies = [
"openssl-sys",
"pkg-config",
"vcpkg",
- "winapi",
-]
-
-[[package]]
-name = "cxx"
-version = "1.0.91"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62"
-dependencies = [
- "cc",
- "cxxbridge-flags",
- "cxxbridge-macro",
- "link-cplusplus",
-]
-
-[[package]]
-name = "cxx-build"
-version = "1.0.91"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690"
-dependencies = [
- "cc",
- "codespan-reporting",
- "once_cell",
- "proc-macro2",
- "quote",
- "scratch",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "cxxbridge-flags"
-version = "1.0.91"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf"
-
-[[package]]
-name = "cxxbridge-macro"
-version = "1.0.91"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "windows-sys 0.48.0",
]
[[package]]
name = "darling"
-version = "0.13.4"
+version = "0.20.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
+checksum = "fc5d6b04b3fd0ba9926f945895de7d806260a2d7431ba82e7edaecb043c4c6b8"
dependencies = [
- "darling_core 0.13.4",
- "darling_macro 0.13.4",
-]
-
-[[package]]
-name = "darling"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
-dependencies = [
- "darling_core 0.14.4",
- "darling_macro 0.14.4",
+ "darling_core",
+ "darling_macro",
]
[[package]]
name = "darling_core"
-version = "0.13.4"
+version = "0.20.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
+checksum = "04e48a959bcd5c761246f5d090ebc2fbf7b9cd527a492b07a67510c108f1e7e3"
dependencies = [
"fnv",
"ident_case",
"proc-macro2",
"quote",
"strsim",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn 1.0.109",
+ "syn 2.0.48",
]
[[package]]
name = "darling_macro"
-version = "0.13.4"
+version = "0.20.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
+checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77"
dependencies = [
- "darling_core 0.13.4",
+ "darling_core",
"quote",
- "syn 1.0.109",
+ "syn 2.0.48",
]
[[package]]
-name = "darling_macro"
-version = "0.14.4"
+name = "dary_heap"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
+checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca"
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
dependencies = [
- "darling_core 0.14.4",
- "quote",
- "syn 1.0.109",
+ "powerfmt",
+ "serde",
]
[[package]]
@@ -1008,7 +1019,7 @@ dependencies = [
"convert_case",
"proc-macro2",
"quote",
- "rustc_version 0.4.0",
+ "rustc_version",
"syn 1.0.109",
]
@@ -1026,13 +1037,12 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
[[package]]
name = "digest"
-version = "0.10.6"
+version = "0.10.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
dependencies = [
"block-buffer",
"crypto-common",
- "subtle",
]
[[package]]
@@ -1091,24 +1101,24 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
[[package]]
name = "dtoa"
-version = "0.4.8"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
+checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
[[package]]
name = "dtoa-short"
-version = "0.3.3"
+version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6"
+checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74"
dependencies = [
"dtoa",
]
[[package]]
name = "duct"
-version = "0.13.6"
+version = "0.13.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ae3fc31835f74c2a7ceda3aeede378b0ae2e74c8f1c36559fcc9ae2a4e7d3e"
+checksum = "e4ab5718d1224b63252cd0c6f74f6480f9ffeb117438a2e0f5cf6d9a4798929c"
dependencies = [
"libc",
"once_cell",
@@ -1118,27 +1128,28 @@ dependencies = [
[[package]]
name = "dunce"
-version = "1.0.3"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c"
+checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
[[package]]
name = "either"
-version = "1.8.1"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
[[package]]
name = "embed-resource"
-version = "2.1.1"
+version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80663502655af01a2902dff3f06869330782267924bf1788410b74edcd93770a"
+checksum = "3bde55e389bea6a966bd467ad1ad7da0ae14546a5bc794d16d1e55e7fca44881"
dependencies = [
"cc",
- "rustc_version 0.4.0",
- "toml 0.7.3",
+ "memchr",
+ "rustc_version",
+ "toml 0.8.9",
"vswhom",
- "winreg 0.11.0",
+ "winreg 0.51.0",
]
[[package]]
@@ -1149,27 +1160,27 @@ checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7"
[[package]]
name = "ena"
-version = "0.14.1"
+version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2e5d13ca2353ab7d0230988629def93914a8c4015f621f9b13ed2955614731d"
+checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1"
dependencies = [
"log",
]
[[package]]
name = "encoding_rs"
-version = "0.8.32"
+version = "0.8.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
dependencies = [
"cfg-if",
]
[[package]]
name = "env_logger"
-version = "0.10.0"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
+checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
dependencies = [
"humantime",
"is-terminal",
@@ -1179,24 +1190,19 @@ dependencies = [
]
[[package]]
-name = "errno"
-version = "0.2.8"
+name = "equivalent"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "winapi",
-]
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
+name = "errno"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
dependencies = [
- "cc",
"libc",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -1205,6 +1211,38 @@ version = "2.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+[[package]]
+name = "event-listener"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener"
+version = "4.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
+dependencies = [
+ "event-listener 4.0.3",
+ "pin-project-lite",
+]
+
[[package]]
name = "fallible-iterator"
version = "0.2.0"
@@ -1227,25 +1265,40 @@ dependencies = [
]
[[package]]
-name = "field-offset"
+name = "fastrand"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+
+[[package]]
+name = "fdeflate"
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92"
+checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
+dependencies = [
+ "simd-adler32",
+]
+
+[[package]]
+name = "field-offset"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
dependencies = [
"memoffset",
- "rustc_version 0.3.3",
+ "rustc_version",
]
[[package]]
name = "filetime"
-version = "0.2.20"
+version = "0.2.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412"
+checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
dependencies = [
"cfg-if",
"libc",
"redox_syscall",
- "windows-sys 0.45.0",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -1256,9 +1309,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
[[package]]
name = "flate2"
-version = "1.0.25"
+version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
dependencies = [
"crc32fast",
"miniz_oxide",
@@ -1296,9 +1349,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "form_urlencoded"
-version = "1.1.0"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
dependencies = [
"percent-encoding",
]
@@ -1309,6 +1362,12 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
[[package]]
name = "futf"
version = "0.1.5"
@@ -1321,9 +1380,9 @@ dependencies = [
[[package]]
name = "futures"
-version = "0.3.28"
+version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
dependencies = [
"futures-channel",
"futures-core",
@@ -1336,9 +1395,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.28"
+version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
dependencies = [
"futures-core",
"futures-sink",
@@ -1346,15 +1405,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.28"
+version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
[[package]]
name = "futures-executor"
-version = "0.3.28"
+version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
dependencies = [
"futures-core",
"futures-task",
@@ -1363,17 +1422,17 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.28"
+version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
[[package]]
name = "futures-lite"
-version = "1.12.0"
+version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
+checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
dependencies = [
- "fastrand",
+ "fastrand 1.9.0",
"futures-core",
"futures-io",
"memchr",
@@ -1383,33 +1442,46 @@ dependencies = [
]
[[package]]
-name = "futures-macro"
-version = "0.3.28"
+name = "futures-lite"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba"
+dependencies = [
+ "fastrand 2.0.1",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "futures-macro"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.12",
+ "syn 2.0.48",
]
[[package]]
name = "futures-sink"
-version = "0.3.28"
+version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
[[package]]
name = "futures-task"
-version = "0.3.28"
+version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
[[package]]
name = "futures-util"
-version = "0.3.28"
+version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
dependencies = [
"futures-channel",
"futures-core",
@@ -1438,7 +1510,7 @@ version = "0.15.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cairo-rs",
"gdk-pixbuf",
"gdk-sys",
@@ -1454,7 +1526,7 @@ version = "0.15.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"gdk-pixbuf-sys",
"gio",
"glib",
@@ -1471,7 +1543,7 @@ dependencies = [
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 6.0.3",
+ "system-deps 6.2.0",
]
[[package]]
@@ -1488,7 +1560,21 @@ dependencies = [
"libc",
"pango-sys",
"pkg-config",
- "system-deps 6.0.3",
+ "system-deps 6.2.0",
+]
+
+[[package]]
+name = "gdkwayland-sys"
+version = "0.15.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2"
+dependencies = [
+ "gdk-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "pkg-config",
+ "system-deps 6.2.0",
]
[[package]]
@@ -1500,28 +1586,28 @@ dependencies = [
"gdk-sys",
"glib-sys",
"libc",
- "system-deps 6.0.3",
+ "system-deps 6.2.0",
"x11",
]
[[package]]
name = "generator"
-version = "0.7.3"
+version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33a20a288a94683f5f4da0adecdbe095c94a77c295e514cc6484e9394dd8376e"
+checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e"
dependencies = [
"cc",
"libc",
"log",
"rustversion",
- "windows 0.44.0",
+ "windows 0.48.0",
]
[[package]]
name = "generic-array"
-version = "0.14.6"
+version = "0.14.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
dependencies = [
"typenum",
"version_check",
@@ -1540,22 +1626,28 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.8"
+version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
dependencies = [
"cfg-if",
"libc",
"wasi 0.11.0+wasi-snapshot-preview1",
]
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
[[package]]
name = "gio"
version = "0.15.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"futures-channel",
"futures-core",
"futures-io",
@@ -1575,7 +1667,7 @@ dependencies = [
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 6.0.3",
+ "system-deps 6.2.0",
"winapi",
]
@@ -1585,7 +1677,7 @@ version = "0.15.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"futures-channel",
"futures-core",
"futures-executor",
@@ -1601,13 +1693,13 @@ dependencies = [
[[package]]
name = "glib-macros"
-version = "0.15.11"
+version = "0.15.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64"
+checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a"
dependencies = [
"anyhow",
"heck 0.4.1",
- "proc-macro-crate 1.3.0",
+ "proc-macro-crate 1.3.1",
"proc-macro-error",
"proc-macro2",
"quote",
@@ -1621,7 +1713,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4"
dependencies = [
"libc",
- "system-deps 6.0.3",
+ "system-deps 6.2.0",
]
[[package]]
@@ -1632,15 +1724,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "globset"
-version = "0.4.10"
+version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
+checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
dependencies = [
"aho-corasick",
"bstr",
- "fnv",
"log",
- "regex",
+ "regex-automata 0.4.5",
+ "regex-syntax 0.8.2",
]
[[package]]
@@ -1663,7 +1755,7 @@ checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a"
dependencies = [
"glib-sys",
"libc",
- "system-deps 6.0.3",
+ "system-deps 6.2.0",
]
[[package]]
@@ -1673,7 +1765,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0"
dependencies = [
"atk",
- "bitflags",
+ "bitflags 1.3.2",
"cairo-rs",
"field-offset",
"futures-channel",
@@ -1704,17 +1796,17 @@ dependencies = [
"gobject-sys",
"libc",
"pango-sys",
- "system-deps 6.0.3",
+ "system-deps 6.2.0",
]
[[package]]
name = "gtk3-macros"
-version = "0.15.4"
+version = "0.15.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24f518afe90c23fba585b2d7697856f9e6a7bbc62f65588035e66f6afb01a2e9"
+checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d"
dependencies = [
"anyhow",
- "proc-macro-crate 1.3.0",
+ "proc-macro-crate 1.3.1",
"proc-macro-error",
"proc-macro2",
"quote",
@@ -1723,9 +1815,9 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.3.17"
+version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f"
+checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
dependencies = [
"bytes",
"fnv",
@@ -1733,7 +1825,7 @@ dependencies = [
"futures-sink",
"futures-util",
"http",
- "indexmap",
+ "indexmap 2.2.2",
"slab",
"tokio",
"tokio-util",
@@ -1746,7 +1838,7 @@ version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
dependencies = [
- "ahash 0.7.6",
+ "ahash 0.7.7",
]
[[package]]
@@ -1755,16 +1847,26 @@ version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
dependencies = [
- "ahash 0.8.3",
+ "ahash 0.8.7",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+dependencies = [
+ "ahash 0.8.7",
+ "allocator-api2",
]
[[package]]
name = "hashlink"
-version = "0.8.1"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa"
+checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
dependencies = [
- "hashbrown 0.12.3",
+ "hashbrown 0.14.3",
]
[[package]]
@@ -1784,27 +1886,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "hermit-abi"
-version = "0.1.19"
+version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f"
[[package]]
name = "hex"
@@ -1812,20 +1896,11 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest",
-]
-
[[package]]
name = "html5ever"
-version = "0.25.2"
+version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148"
+checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7"
dependencies = [
"log",
"mac",
@@ -1837,20 +1912,20 @@ dependencies = [
[[package]]
name = "http"
-version = "0.2.9"
+version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
dependencies = [
"bytes",
"fnv",
- "itoa 1.0.5",
+ "itoa 1.0.10",
]
[[package]]
name = "http-body"
-version = "0.4.5"
+version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
dependencies = [
"bytes",
"http",
@@ -1871,20 +1946,20 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
[[package]]
name = "httpdate"
-version = "1.0.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
[[package]]
name = "httpmock"
-version = "0.6.7"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6b56b6265f15908780cbee987912c1e98dbca675361f748291605a8a3a1df09"
+checksum = "4b02e044d3b4c2f94936fb05f9649efa658ca788f44eb6b87554e2033fc8ce93"
dependencies = [
"assert-json-diff",
"async-object-pool",
"async-trait",
- "base64 0.13.1",
+ "base64 0.21.7",
"basic-cookies",
"crossbeam-utils",
"form_urlencoded",
@@ -1911,9 +1986,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "hyper"
-version = "0.14.24"
+version = "0.14.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c"
+checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
dependencies = [
"bytes",
"futures-channel",
@@ -1924,9 +1999,9 @@ dependencies = [
"http-body",
"httparse",
"httpdate",
- "itoa 1.0.5",
+ "itoa 1.0.10",
"pin-project-lite",
- "socket2",
+ "socket2 0.5.5",
"tokio",
"tower-service",
"tracing",
@@ -1948,33 +2023,32 @@ dependencies = [
[[package]]
name = "iana-time-zone"
-version = "0.1.53"
+version = "0.1.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
+checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539"
dependencies = [
"android_system_properties",
"core-foundation-sys",
"iana-time-zone-haiku",
"js-sys",
"wasm-bindgen",
- "winapi",
+ "windows-core",
]
[[package]]
name = "iana-time-zone-haiku"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
dependencies = [
- "cxx",
- "cxx-build",
+ "cc",
]
[[package]]
name = "ico"
-version = "0.2.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "031530fe562d8c8d71c0635013d6d155bbfe8ba0aa4b4d2d24ce8af6b71047bd"
+checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae"
dependencies = [
"byteorder",
"png",
@@ -1988,9 +2062,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
[[package]]
name = "idna"
-version = "0.3.0"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
dependencies = [
"unicode-bidi",
"unicode-normalization",
@@ -1998,40 +2072,37 @@ dependencies = [
[[package]]
name = "ignore"
-version = "0.4.18"
+version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d"
+checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1"
dependencies = [
- "crossbeam-utils",
+ "crossbeam-deque",
"globset",
- "lazy_static",
"log",
"memchr",
- "regex",
+ "regex-automata 0.4.5",
"same-file",
- "thread_local",
"walkdir",
"winapi-util",
]
[[package]]
name = "image"
-version = "0.24.5"
+version = "0.24.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945"
+checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23"
dependencies = [
"bytemuck",
"byteorder",
"color_quant",
- "num-rational",
"num-traits",
]
[[package]]
name = "indexmap"
-version = "1.9.2"
+version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
dependencies = [
"autocfg",
"hashbrown 0.12.3",
@@ -2039,10 +2110,21 @@ dependencies = [
]
[[package]]
-name = "infer"
-version = "0.12.0"
+name = "indexmap"
+version = "2.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3"
+checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.3",
+ "serde",
+]
+
+[[package]]
+name = "infer"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc"
dependencies = [
"cfb",
]
@@ -2070,6 +2152,7 @@ dependencies = [
"mockall",
"num-bigint",
"once_cell",
+ "openssl-src 111.28.1+1.1.1w",
"r2d2",
"r2d2_sqlite",
"rand 0.8.5",
@@ -2081,43 +2164,42 @@ dependencies = [
"rust_decimal",
"serde",
"serde_json",
- "sys-locale",
+ "sys-locale 0.3.1",
"tauri",
"tauri-build",
- "testcontainers",
- "time 0.3.21",
+ "time",
"tokio",
- "toml 0.7.3",
+ "toml 0.7.8",
"url",
"uuid",
]
[[package]]
name = "io-lifetimes"
-version = "1.0.5"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
dependencies = [
+ "hermit-abi",
"libc",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
]
[[package]]
name = "ipnet"
-version = "2.7.1"
+version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"
+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
[[package]]
name = "is-terminal"
-version = "0.4.4"
+version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857"
+checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455"
dependencies = [
- "hermit-abi 0.3.1",
- "io-lifetimes",
- "rustix",
- "windows-sys 0.45.0",
+ "hermit-abi",
+ "rustix 0.38.31",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -2126,19 +2208,19 @@ version = "1.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9"
dependencies = [
- "async-channel",
+ "async-channel 1.9.0",
"castaway",
"crossbeam-utils",
"curl",
"curl-sys",
"encoding_rs",
- "event-listener",
- "futures-lite",
+ "event-listener 2.5.3",
+ "futures-lite 1.13.0",
"http",
"log",
"mime",
"once_cell",
- "polling",
+ "polling 2.8.0",
"slab",
"sluice",
"tracing",
@@ -2164,9 +2246,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
[[package]]
name = "itoa"
-version = "1.0.5"
+version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
+checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
[[package]]
name = "javascriptcore-rs"
@@ -2174,7 +2256,7 @@ version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"glib",
"javascriptcore-rs-sys",
]
@@ -2213,44 +2295,34 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
[[package]]
name = "js-sys"
-version = "0.3.61"
+version = "0.3.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
+checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1"
dependencies = [
"wasm-bindgen",
]
[[package]]
name = "json-patch"
-version = "0.2.7"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3fa5a61630976fc4c353c70297f2e93f1930e3ccee574d59d618ccbd5154ce"
-dependencies = [
- "serde",
- "serde_json",
- "treediff 3.0.2",
-]
-
-[[package]]
-name = "json-patch"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f54898088ccb91df1b492cc80029a6fdf1c48ca0db7c6822a8babad69c94658"
+checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6"
dependencies = [
"serde",
"serde_json",
"thiserror",
- "treediff 4.0.2",
+ "treediff",
]
[[package]]
-name = "kuchiki"
-version = "0.8.1"
+name = "kuchikiki"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358"
+checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8"
dependencies = [
"cssparser",
"html5ever",
+ "indexmap 1.9.3",
"matches",
"selectors",
]
@@ -2266,21 +2338,21 @@ dependencies = [
[[package]]
name = "lalrpop"
-version = "0.19.8"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b30455341b0e18f276fa64540aff54deafb54c589de6aca68659c63dd2d5d823"
+checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8"
dependencies = [
"ascii-canvas",
- "atty",
"bit-set",
"diff",
"ena",
+ "is-terminal",
"itertools",
"lalrpop-util",
"petgraph",
"pico-args",
"regex",
- "regex-syntax",
+ "regex-syntax 0.7.5",
"string_cache",
"term",
"tiny-keccak",
@@ -2289,9 +2361,9 @@ dependencies = [
[[package]]
name = "lalrpop-util"
-version = "0.19.8"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf796c978e9b4d983414f4caedc9273aa33ee214c5b887bd55fde84c85d2dc4"
+checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d"
dependencies = [
"regex",
]
@@ -2310,40 +2382,55 @@ checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760"
[[package]]
name = "libc"
-version = "0.2.139"
+version = "0.2.153"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
[[package]]
name = "libflate"
-version = "1.3.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97822bf791bd4d5b403713886a5fbe8bf49520fe78e323b0dc480ca1a03e50b0"
+checksum = "9f7d5654ae1795afc7ff76f4365c2c8791b0feb18e8996a96adad8ffd7c3b2bf"
dependencies = [
"adler32",
+ "core2",
"crc32fast",
+ "dary_heap",
"libflate_lz77",
]
[[package]]
name = "libflate_lz77"
-version = "1.2.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf"
+checksum = "be5f52fb8c451576ec6b79d3f4deb327398bc05bbdbd99021a6e77a4c855d524"
dependencies = [
+ "core2",
+ "hashbrown 0.13.2",
"rle-decode-fast",
]
[[package]]
name = "libnghttp2-sys"
-version = "0.1.7+1.45.0"
+version = "0.1.9+1.58.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f"
+checksum = "b57e858af2798e167e709b9d969325b6d8e9d50232fcbc494d7d54f976854a64"
dependencies = [
"cc",
"libc",
]
+[[package]]
+name = "libredox"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
+dependencies = [
+ "bitflags 2.4.2",
+ "libc",
+ "redox_syscall",
+]
+
[[package]]
name = "libsqlite3-sys"
version = "0.25.2"
@@ -2357,9 +2444,9 @@ dependencies = [
[[package]]
name = "libz-sys"
-version = "1.1.8"
+version = "1.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf"
+checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6"
dependencies = [
"cc",
"libc",
@@ -2377,25 +2464,22 @@ dependencies = [
]
[[package]]
-name = "link-cplusplus"
-version = "1.0.8"
+name = "linux-raw-sys"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
-dependencies = [
- "cc",
-]
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]]
name = "linux-raw-sys"
-version = "0.1.4"
+version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
[[package]]
name = "lock_api"
-version = "0.4.9"
+version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
dependencies = [
"autocfg",
"scopeguard",
@@ -2403,11 +2487,10 @@ dependencies = [
[[package]]
name = "log"
-version = "0.4.17"
+version = "0.4.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
dependencies = [
- "cfg-if",
"value-bag",
]
@@ -2443,13 +2526,13 @@ dependencies = [
[[package]]
name = "markup5ever"
-version = "0.10.1"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd"
+checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016"
dependencies = [
"log",
- "phf 0.8.0",
- "phf_codegen",
+ "phf 0.10.1",
+ "phf_codegen 0.10.0",
"string_cache",
"string_cache_codegen",
"tendril",
@@ -2461,7 +2544,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
dependencies = [
- "regex-automata",
+ "regex-automata 0.1.10",
]
[[package]]
@@ -2472,24 +2555,24 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
[[package]]
name = "memchr"
-version = "2.5.0"
+version = "2.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
[[package]]
name = "memoffset"
-version = "0.6.5"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
dependencies = [
"autocfg",
]
[[package]]
name = "mime"
-version = "0.3.16"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]]
name = "minisign-verify"
@@ -2499,23 +2582,23 @@ checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881"
[[package]]
name = "miniz_oxide"
-version = "0.6.2"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
dependencies = [
"adler",
+ "simd-adler32",
]
[[package]]
name = "mio"
-version = "0.8.6"
+version = "0.8.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
+checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
dependencies = [
"libc",
- "log",
"wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -2569,7 +2652,7 @@ version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"jni-sys",
"ndk-sys",
"num_enum",
@@ -2603,15 +2686,6 @@ version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-[[package]]
-name = "nom8"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
-dependencies = [
- "memchr",
-]
-
[[package]]
name = "normalize-line-endings"
version = "0.3.0"
@@ -2630,15 +2704,21 @@ dependencies = [
[[package]]
name = "num-bigint"
-version = "0.4.3"
+version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
+checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
dependencies = [
"autocfg",
"num-integer",
"num-traits",
]
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
[[package]]
name = "num-integer"
version = "0.1.45"
@@ -2649,33 +2729,22 @@ dependencies = [
"num-traits",
]
-[[package]]
-name = "num-rational"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
[[package]]
name = "num-traits"
-version = "0.2.15"
+version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
dependencies = [
"autocfg",
]
[[package]]
name = "num_cpus"
-version = "1.15.0"
+version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
dependencies = [
- "hermit-abi 0.2.6",
+ "hermit-abi",
"libc",
]
@@ -2694,7 +2763,7 @@ version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
dependencies = [
- "proc-macro-crate 1.3.0",
+ "proc-macro-crate 1.3.1",
"proc-macro2",
"quote",
"syn 1.0.109",
@@ -2740,18 +2809,27 @@ dependencies = [
]
[[package]]
-name = "once_cell"
-version = "1.17.1"
+name = "object"
+version = "0.32.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
[[package]]
name = "openssl"
-version = "0.10.45"
+version = "0.10.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1"
+checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8"
dependencies = [
- "bitflags",
+ "bitflags 2.4.2",
"cfg-if",
"foreign-types",
"libc",
@@ -2762,13 +2840,13 @@ dependencies = [
[[package]]
name = "openssl-macros"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.48",
]
[[package]]
@@ -2779,22 +2857,31 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-src"
-version = "111.25.0+1.1.1t"
-source = "git+https://github.com/andrewinci/openssl-src-rs.git?branch=release/111#7c965abbe8d9375334a2e32b357a792a04283471"
+version = "111.28.1+1.1.1w"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bf7e82ffd6d3d6e6524216a0bfd85509f68b5b28354e8e7800057e44cefa9b4"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "openssl-src"
+version = "300.2.2+3.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bbfad0063610ac26ee79f7484739e2b07555a75c42453b89263830b5c8103bc"
dependencies = [
"cc",
]
[[package]]
name = "openssl-sys"
-version = "0.9.80"
+version = "0.9.99"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7"
+checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae"
dependencies = [
- "autocfg",
"cc",
"libc",
- "openssl-src",
+ "openssl-src 300.2.2+3.2.1",
"pkg-config",
"vcpkg",
]
@@ -2807,9 +2894,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
[[package]]
name = "os_info"
-version = "3.6.0"
+version = "3.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c424bc68d15e0778838ac013b5b3449544d8133633d8016319e7e05a820b8c0"
+checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e"
dependencies = [
"log",
"serde",
@@ -2818,12 +2905,12 @@ dependencies = [
[[package]]
name = "os_pipe"
-version = "1.1.3"
+version = "1.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a53dbb20faf34b16087a931834cba2d7a73cc74af2b7ef345a4c8324e2409a12"
+checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9"
dependencies = [
"libc",
- "windows-sys 0.45.0",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -2838,7 +2925,7 @@ version = "0.15.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"glib",
"libc",
"once_cell",
@@ -2854,14 +2941,14 @@ dependencies = [
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 6.0.3",
+ "system-deps 6.2.0",
]
[[package]]
name = "parking"
-version = "2.0.0"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
+checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
[[package]]
name = "parking_lot"
@@ -2875,47 +2962,31 @@ dependencies = [
[[package]]
name = "parking_lot_core"
-version = "0.9.7"
+version = "0.9.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
dependencies = [
"cfg-if",
"libc",
"redox_syscall",
"smallvec",
- "windows-sys 0.45.0",
+ "windows-targets 0.48.5",
]
-[[package]]
-name = "paste"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
-
[[package]]
name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
-
-[[package]]
-name = "pest"
-version = "2.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660"
-dependencies = [
- "thiserror",
- "ucd-trie",
-]
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]]
name = "petgraph"
-version = "0.6.3"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
+checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
dependencies = [
"fixedbitset",
- "indexmap",
+ "indexmap 2.2.2",
]
[[package]]
@@ -2935,9 +3006,17 @@ version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
dependencies = [
- "phf_macros 0.10.0",
"phf_shared 0.10.0",
- "proc-macro-hack",
+]
+
+[[package]]
+name = "phf"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
+dependencies = [
+ "phf_macros 0.11.2",
+ "phf_shared 0.11.2",
]
[[package]]
@@ -2950,6 +3029,16 @@ dependencies = [
"phf_shared 0.8.0",
]
+[[package]]
+name = "phf_codegen"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
+dependencies = [
+ "phf_generator 0.10.0",
+ "phf_shared 0.10.0",
+]
+
[[package]]
name = "phf_generator"
version = "0.8.0"
@@ -2970,6 +3059,16 @@ dependencies = [
"rand 0.8.5",
]
+[[package]]
+name = "phf_generator"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
+dependencies = [
+ "phf_shared 0.11.2",
+ "rand 0.8.5",
+]
+
[[package]]
name = "phf_macros"
version = "0.8.0"
@@ -2986,16 +3085,15 @@ dependencies = [
[[package]]
name = "phf_macros"
-version = "0.10.0"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
- "proc-macro-hack",
+ "phf_generator 0.11.2",
+ "phf_shared 0.11.2",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.48",
]
[[package]]
@@ -3017,36 +3115,45 @@ dependencies = [
]
[[package]]
-name = "pico-args"
-version = "0.4.2"
+name = "phf_shared"
+version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pico-args"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
[[package]]
name = "pin-project"
-version = "1.0.12"
+version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
+checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.0.12"
+version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
+checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.48",
]
[[package]]
name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
[[package]]
name = "pin-utils"
@@ -3055,51 +3162,85 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
-name = "pkg-config"
-version = "0.3.26"
+name = "piper"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4"
+dependencies = [
+ "atomic-waker",
+ "fastrand 2.0.1",
+ "futures-io",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb"
[[package]]
name = "plist"
-version = "1.4.1"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9469799ca90293a376f68f6fcb8f11990d9cff55602cfba0ba83893c973a7f46"
+checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef"
dependencies = [
- "base64 0.21.0",
- "indexmap",
+ "base64 0.21.7",
+ "indexmap 2.2.2",
"line-wrap",
"quick-xml",
"serde",
- "time 0.3.21",
+ "time",
]
[[package]]
name = "png"
-version = "0.17.7"
+version = "0.17.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638"
+checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"crc32fast",
+ "fdeflate",
"flate2",
"miniz_oxide",
]
[[package]]
name = "polling"
-version = "2.5.2"
+version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6"
+checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
dependencies = [
"autocfg",
+ "bitflags 1.3.2",
"cfg-if",
+ "concurrent-queue",
"libc",
"log",
- "wepoll-ffi",
- "windows-sys 0.42.0",
+ "pin-project-lite",
+ "windows-sys 0.48.0",
]
+[[package]]
+name = "polling"
+version = "3.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "pin-project-lite",
+ "rustix 0.38.31",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
[[package]]
name = "ppv-lite86"
version = "0.2.17"
@@ -3128,15 +3269,15 @@ dependencies = [
[[package]]
name = "predicates-core"
-version = "1.0.5"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72f883590242d3c6fc5bf50299011695fa6590c2c70eac95ee1bdb9a733ad1a2"
+checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
[[package]]
name = "predicates-tree"
-version = "1.0.7"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d"
+checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
dependencies = [
"predicates-core",
"termtree",
@@ -3144,21 +3285,21 @@ dependencies = [
[[package]]
name = "proc-macro-crate"
-version = "0.1.5"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
dependencies = [
- "toml 0.5.11",
+ "once_cell",
+ "toml_edit 0.19.15",
]
[[package]]
name = "proc-macro-crate"
-version = "1.3.0"
+version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
dependencies = [
- "once_cell",
- "toml_edit 0.18.1",
+ "toml_edit 0.21.1",
]
[[package]]
@@ -3193,9 +3334,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
-version = "1.0.54"
+version = "1.0.78"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
dependencies = [
"unicode-ident",
]
@@ -3228,18 +3369,18 @@ checksum = "658fa1faf7a4cc5f057c9ee5ef560f717ad9d8dc66d975267f709624d6e1ab88"
[[package]]
name = "quick-xml"
-version = "0.26.0"
+version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd"
+checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
dependencies = [
"memchr",
]
[[package]]
name = "quote"
-version = "1.0.26"
+version = "1.0.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
dependencies = [
"proc-macro2",
]
@@ -3265,6 +3406,12 @@ dependencies = [
"rusqlite",
]
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
[[package]]
name = "rand"
version = "0.7.3"
@@ -3325,7 +3472,7 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.12",
]
[[package]]
@@ -3348,17 +3495,15 @@ dependencies = [
[[package]]
name = "raw-window-handle"
-version = "0.5.0"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a"
-dependencies = [
- "cty",
-]
+checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
[[package]]
name = "rdkafka"
-version = "0.29.0"
-source = "git+https://github.com/andrewinci/rust-rdkafka.git#cb6b5a98ab85cd7119dc5f6814017b8adb170148"
+version = "0.36.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1beea247b9a7600a81d4cc33f659ce1a77e1988323d7d2809c7ed1c21f4c316d"
dependencies = [
"futures-channel",
"futures-util",
@@ -3374,8 +3519,9 @@ dependencies = [
[[package]]
name = "rdkafka-sys"
-version = "4.3.0+2.0.2"
-source = "git+https://github.com/andrewinci/rust-rdkafka.git#cb6b5a98ab85cd7119dc5f6814017b8adb170148"
+version = "4.7.0+2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55e0d2f9ba6253f6ec72385e453294f8618e9e15c2c6aba2a5c01ccf9622d615"
dependencies = [
"cmake",
"libc",
@@ -3388,33 +3534,34 @@ dependencies = [
[[package]]
name = "redox_syscall"
-version = "0.2.16"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
]
[[package]]
name = "redox_users"
-version = "0.4.3"
+version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
dependencies = [
- "getrandom 0.2.8",
- "redox_syscall",
+ "getrandom 0.2.12",
+ "libredox",
"thiserror",
]
[[package]]
name = "regex"
-version = "1.7.3"
+version = "1.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
dependencies = [
"aho-corasick",
"memchr",
- "regex-syntax",
+ "regex-automata 0.4.5",
+ "regex-syntax 0.8.2",
]
[[package]]
@@ -3423,7 +3570,18 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
dependencies = [
- "regex-syntax",
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.2",
]
[[package]]
@@ -3433,30 +3591,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
+name = "regex-syntax"
+version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
+checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
[[package]]
name = "rend"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab"
+checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd"
dependencies = [
"bytecheck",
]
[[package]]
name = "reqwest"
-version = "0.11.18"
+version = "0.11.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
+checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251"
dependencies = [
- "base64 0.21.0",
+ "base64 0.21.7",
"bytes",
"encoding_rs",
"futures-core",
@@ -3474,17 +3635,22 @@ dependencies = [
"once_cell",
"percent-encoding",
"pin-project-lite",
+ "rustls-pemfile",
"serde",
"serde_json",
"serde_urlencoded",
+ "sync_wrapper",
+ "system-configuration",
"tokio",
"tokio-native-tls",
+ "tokio-util",
"tower-service",
"url",
"wasm-bindgen",
"wasm-bindgen-futures",
+ "wasm-streams",
"web-sys",
- "winreg 0.10.1",
+ "winreg 0.50.0",
]
[[package]]
@@ -3513,23 +3679,27 @@ dependencies = [
[[package]]
name = "rkyv"
-version = "0.7.40"
+version = "0.7.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c30f1d45d9aa61cbc8cd1eb87705470892289bb2d01943e7803b873a57404dc3"
+checksum = "527a97cdfef66f65998b5f3b637c26f5a5ec09cc52a3f9932313ac645f4190f5"
dependencies = [
+ "bitvec",
"bytecheck",
+ "bytes",
"hashbrown 0.12.3",
"ptr_meta",
"rend",
"rkyv_derive",
"seahash",
+ "tinyvec",
+ "uuid",
]
[[package]]
name = "rkyv_derive"
-version = "0.7.40"
+version = "0.7.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff26ed6c7c4dfc2aa9480b86a60e3c7233543a270a680e10758a507c5a4ce476"
+checksum = "b5c462a1328c8e67e4d6dbad1eb0355dd43e8ab432c6e227a43657f16ade5033"
dependencies = [
"proc-macro2",
"quote",
@@ -3544,9 +3714,9 @@ checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422"
[[package]]
name = "rlimit"
-version = "0.9.1"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8a29d87a652dc4d43c586328706bb5cdff211f3f39a530f240b53f7221dab8e"
+checksum = "3560f70f30a0f16d11d01ed078a07740fe6b489667abc7c7b029155d9f21c3d8"
dependencies = [
"libc",
]
@@ -3557,7 +3727,7 @@ version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"fallible-iterator",
"fallible-streaming-iterator",
"hashlink",
@@ -3578,14 +3748,12 @@ dependencies = [
[[package]]
name = "rust_decimal"
-version = "1.29.1"
+version = "1.34.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26bd36b60561ee1fb5ec2817f198b6fd09fa571c897a5e86d1487cfc2b096dfc"
+checksum = "755392e1a2f77afd95580d3f0d0e94ac83eeeb7167552c9b5bca549e61a94d83"
dependencies = [
"arrayvec",
"borsh",
- "bytecheck",
- "byteorder",
"bytes",
"num-traits",
"rand 0.8.5",
@@ -3595,13 +3763,10 @@ dependencies = [
]
[[package]]
-name = "rustc_version"
-version = "0.3.3"
+name = "rustc-demangle"
+version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
-dependencies = [
- "semver 0.11.0",
-]
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
[[package]]
name = "rustc_version"
@@ -3609,34 +3774,56 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
- "semver 1.0.16",
+ "semver",
]
[[package]]
name = "rustix"
-version = "0.36.8"
+version = "0.37.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644"
+checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"errno",
"io-lifetimes",
"libc",
- "linux-raw-sys",
- "windows-sys 0.45.0",
+ "linux-raw-sys 0.3.8",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
+dependencies = [
+ "bitflags 2.4.2",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.13",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+dependencies = [
+ "base64 0.21.7",
]
[[package]]
name = "rustversion"
-version = "1.0.11"
+version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
[[package]]
name = "ryu"
-version = "1.0.12"
+version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
+checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
[[package]]
name = "safemem"
@@ -3667,18 +3854,18 @@ dependencies = [
[[package]]
name = "schannel"
-version = "0.1.21"
+version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
dependencies = [
- "windows-sys 0.42.0",
+ "windows-sys 0.52.0",
]
[[package]]
name = "scheduled-thread-pool"
-version = "0.2.6"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf"
+checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19"
dependencies = [
"parking_lot",
]
@@ -3691,15 +3878,9 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
[[package]]
name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "scratch"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "seahash"
@@ -3709,11 +3890,11 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
[[package]]
name = "security-framework"
-version = "2.8.2"
+version = "2.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"core-foundation",
"core-foundation-sys",
"libc",
@@ -3722,9 +3903,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
-version = "2.8.0"
+version = "2.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
dependencies = [
"core-foundation-sys",
"libc",
@@ -3736,14 +3917,14 @@ version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cssparser",
"derive_more",
"fxhash",
"log",
"matches",
"phf 0.8.0",
- "phf_codegen",
+ "phf_codegen 0.8.0",
"precomputed-hash",
"servo_arc",
"smallvec",
@@ -3752,58 +3933,40 @@ dependencies = [
[[package]]
name = "semver"
-version = "0.11.0"
+version = "1.0.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
+checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
dependencies = [
"serde",
]
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
-
[[package]]
name = "serde"
-version = "1.0.163"
+version = "1.0.196"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
+checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.163"
+version = "1.0.196"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
+checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.12",
+ "syn 2.0.48",
]
[[package]]
name = "serde_json"
-version = "1.0.96"
+version = "1.0.113"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
dependencies = [
- "itoa 1.0.5",
+ "itoa 1.0.10",
"ryu",
"serde",
]
@@ -3820,20 +3983,20 @@ dependencies = [
[[package]]
name = "serde_repr"
-version = "0.1.10"
+version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e"
+checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.48",
]
[[package]]
name = "serde_spanned"
-version = "0.6.1"
+version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
+checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
dependencies = [
"serde",
]
@@ -3845,59 +4008,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
dependencies = [
"form_urlencoded",
- "itoa 1.0.5",
+ "itoa 1.0.10",
"ryu",
"serde",
]
[[package]]
name = "serde_with"
-version = "1.14.0"
+version = "3.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff"
+checksum = "1b0ed1662c5a68664f45b76d18deb0e234aff37207086803165c961eb695e981"
dependencies = [
- "serde",
- "serde_with_macros 1.5.2",
-]
-
-[[package]]
-name = "serde_with"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "331bb8c3bf9b92457ab7abecf07078c13f7d270ba490103e84e8b014490cd0b0"
-dependencies = [
- "base64 0.13.1",
+ "base64 0.21.7",
"chrono",
"hex",
- "indexmap",
+ "indexmap 1.9.3",
+ "indexmap 2.2.2",
"serde",
"serde_json",
- "serde_with_macros 2.3.2",
- "time 0.3.21",
+ "serde_with_macros",
+ "time",
]
[[package]]
name = "serde_with_macros"
-version = "1.5.2"
+version = "3.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
+checksum = "568577ff0ef47b879f736cd66740e022f3672788cdf002a05a4e609ea5a6fb15"
dependencies = [
- "darling 0.13.4",
+ "darling",
"proc-macro2",
"quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "serde_with_macros"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "859011bddcc11f289f07f467cc1fe01c7a941daa4d8f6c40d4d1c92eb6d9319c"
-dependencies = [
- "darling 0.14.4",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "syn 2.0.48",
]
[[package]]
@@ -3934,9 +4076,9 @@ dependencies = [
[[package]]
name = "sha1"
-version = "0.10.5"
+version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
dependencies = [
"cfg-if",
"cpufeatures",
@@ -3945,9 +4087,9 @@ dependencies = [
[[package]]
name = "sha2"
-version = "0.10.6"
+version = "0.10.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
dependencies = [
"cfg-if",
"cpufeatures",
@@ -3956,9 +4098,9 @@ dependencies = [
[[package]]
name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
dependencies = [
"lazy_static",
]
@@ -3973,16 +4115,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "signal-hook"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
[[package]]
name = "signal-hook-registry"
version = "1.4.1"
@@ -3993,10 +4125,22 @@ dependencies = [
]
[[package]]
-name = "similar"
-version = "2.2.1"
+name = "simd-adler32"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "simdutf8"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
+
+[[package]]
+name = "similar"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21"
[[package]]
name = "simple_asn1"
@@ -4007,20 +4151,20 @@ dependencies = [
"num-bigint",
"num-traits",
"thiserror",
- "time 0.3.21",
+ "time",
]
[[package]]
name = "siphasher"
-version = "0.3.10"
+version = "0.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
[[package]]
name = "slab"
-version = "0.4.8"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
dependencies = [
"autocfg",
]
@@ -4031,34 +4175,44 @@ version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5"
dependencies = [
- "async-channel",
+ "async-channel 1.9.0",
"futures-core",
"futures-io",
]
[[package]]
name = "smallvec"
-version = "1.10.0"
+version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
[[package]]
name = "socket2"
-version = "0.4.9"
+version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
dependencies = [
"libc",
"winapi",
]
+[[package]]
+name = "socket2"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+dependencies = [
+ "libc",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "soup2"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"gio",
"glib",
"libc",
@@ -4072,7 +4226,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"gio-sys",
"glib-sys",
"gobject-sys",
@@ -4097,9 +4251,9 @@ dependencies = [
[[package]]
name = "string_cache"
-version = "0.8.4"
+version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08"
+checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
dependencies = [
"new_debug_unreachable",
"once_cell",
@@ -4129,29 +4283,23 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "strum"
-version = "0.24.1"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
+checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
[[package]]
name = "strum_macros"
-version = "0.24.3"
+version = "0.25.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
+checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
dependencies = [
"heck 0.4.1",
"proc-macro2",
"quote",
"rustversion",
- "syn 1.0.109",
+ "syn 2.0.48",
]
-[[package]]
-name = "subtle"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
-
[[package]]
name = "syn"
version = "1.0.109"
@@ -4165,9 +4313,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.12"
+version = "2.0.48"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79d9531f94112cfc3e4c8f5f02cb2b58f72c97b7efd85f70203cc6d8efda5927"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
dependencies = [
"proc-macro2",
"quote",
@@ -4175,13 +4323,64 @@ dependencies = [
]
[[package]]
-name = "sys-locale"
-version = "0.3.0"
+name = "syn_derive"
+version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea0b9eefabb91675082b41eb94c3ecd91af7656caee3fb4961a07c0ec8c7ca6f"
+checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
+[[package]]
+name = "sys-locale"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8a11bd9c338fdba09f7881ab41551932ad42e405f61d01e8406baea71c07aee"
+dependencies = [
+ "js-sys",
+ "libc",
+ "wasm-bindgen",
+ "web-sys",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "sys-locale"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0"
dependencies = [
"libc",
- "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "system-configuration"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
]
[[package]]
@@ -4199,24 +4398,24 @@ dependencies = [
[[package]]
name = "system-deps"
-version = "6.0.3"
+version = "6.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff"
+checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331"
dependencies = [
- "cfg-expr 0.11.0",
+ "cfg-expr 0.15.6",
"heck 0.4.1",
"pkg-config",
- "toml 0.5.11",
+ "toml 0.8.9",
"version-compare 0.1.1",
]
[[package]]
name = "tao"
-version = "0.15.8"
+version = "0.16.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac8e6399427c8494f9849b58694754d7cc741293348a6836b6c8d2c5aa82d8e6"
+checksum = "d22205b267a679ca1c590b9f178488d50981fc3e48a1b91641ae31593db875ce"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cairo-rs",
"cc",
"cocoa",
@@ -4227,6 +4426,7 @@ dependencies = [
"gdk",
"gdk-pixbuf",
"gdk-sys",
+ "gdkwayland-sys",
"gdkx11-sys",
"gio",
"glib",
@@ -4244,11 +4444,11 @@ dependencies = [
"objc",
"once_cell",
"parking_lot",
- "paste",
"png",
"raw-window-handle",
"scopeguard",
"serde",
+ "tao-macros",
"unicode-segmentation",
"uuid",
"windows 0.39.0",
@@ -4257,10 +4457,27 @@ dependencies = [
]
[[package]]
-name = "tar"
-version = "0.4.38"
+name = "tao-macros"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6"
+checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
+name = "tar"
+version = "0.4.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
dependencies = [
"filetime",
"libc",
@@ -4268,14 +4485,20 @@ dependencies = [
]
[[package]]
-name = "tauri"
-version = "1.2.5"
+name = "target-lexicon"
+version = "0.12.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3a1fe72365a6d860fddf3403934649a5157b2bbb6f0b50dd3a8858cd1a22412"
+checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae"
+
+[[package]]
+name = "tauri"
+version = "1.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd27c04b9543776a972c86ccf70660b517ecabbeced9fb58d8b961a13ad129af"
dependencies = [
"anyhow",
- "attohttpc",
- "base64 0.13.1",
+ "base64 0.21.7",
+ "bytes",
"cocoa",
"dirs-next",
"embed_plist",
@@ -4295,13 +4518,15 @@ dependencies = [
"percent-encoding",
"rand 0.8.5",
"raw-window-handle",
+ "reqwest",
"rfd",
- "semver 1.0.16",
+ "semver",
"serde",
"serde_json",
"serde_repr",
"serialize-to-javascript",
"state",
+ "sys-locale 0.2.4",
"tar",
"tauri-macros",
"tauri-runtime",
@@ -4309,7 +4534,7 @@ dependencies = [
"tauri-utils",
"tempfile",
"thiserror",
- "time 0.3.21",
+ "time",
"tokio",
"url",
"uuid",
@@ -4321,52 +4546,53 @@ dependencies = [
[[package]]
name = "tauri-build"
-version = "1.3.0"
+version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "929b3bd1248afc07b63e33a6a53c3f82c32d0b0a5e216e4530e94c467e019389"
+checksum = "e9914a4715e0b75d9f387a285c7e26b5bbfeb1249ad9f842675a82481565c532"
dependencies = [
"anyhow",
"cargo_toml",
+ "dirs-next",
"heck 0.4.1",
- "json-patch 1.0.0",
- "semver 1.0.16",
+ "json-patch",
+ "semver",
"serde",
"serde_json",
"tauri-utils",
"tauri-winres",
- "winnow",
+ "walkdir",
]
[[package]]
name = "tauri-codegen"
-version = "1.2.1"
+version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14388d484b6b1b5dc0f6a7d6cc6433b3b230bec85eaa576adcdf3f9fafa49251"
+checksum = "a1554c5857f65dbc377cefb6b97c8ac77b1cb2a90d30d3448114d5d6b48a77fc"
dependencies = [
- "base64 0.13.1",
+ "base64 0.21.7",
"brotli",
"ico",
- "json-patch 0.2.7",
+ "json-patch",
"plist",
"png",
"proc-macro2",
"quote",
- "semver 1.0.16",
+ "semver",
"serde",
"serde_json",
"sha2",
"tauri-utils",
"thiserror",
- "time 0.3.21",
+ "time",
"uuid",
"walkdir",
]
[[package]]
name = "tauri-macros"
-version = "1.2.1"
+version = "1.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069319e5ecbe653a799b94b0690d9f9bf5d00f7b1d3989aa331c524d4e354075"
+checksum = "277abf361a3a6993ec16bcbb179de0d6518009b851090a01adfea12ac89fa875"
dependencies = [
"heck 0.4.1",
"proc-macro2",
@@ -4378,9 +4604,9 @@ dependencies = [
[[package]]
name = "tauri-runtime"
-version = "0.12.2"
+version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc36898ad4acb6c381878acf903c320a36cf29b68b74f6e791d6045b6557128c"
+checksum = "cf2d0652aa2891ff3e9caa2401405257ea29ab8372cce01f186a5825f1bd0e76"
dependencies = [
"gtk",
"http",
@@ -4399,9 +4625,9 @@ dependencies = [
[[package]]
name = "tauri-runtime-wry"
-version = "0.12.3"
+version = "0.14.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2ebc22bc5566ba33310744fadd86709fa591ed163491b165855474523ac1aab"
+checksum = "6cae61fbc731f690a4899681c9052dde6d05b159b44563ace8186fc1bfb7d158"
dependencies = [
"cocoa",
"gtk",
@@ -4410,7 +4636,6 @@ dependencies = [
"raw-window-handle",
"tauri-runtime",
"tauri-utils",
- "url",
"uuid",
"webkit2gtk",
"webview2-com",
@@ -4420,30 +4645,32 @@ dependencies = [
[[package]]
name = "tauri-utils"
-version = "1.3.0"
+version = "1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a6f9c2dafef5cbcf52926af57ce9561bd33bb41d7394f8bb849c0330260d864"
+checksum = "ece74810b1d3d44f29f732a7ae09a63183d63949bbdd59c61f8ed2a1b70150db"
dependencies = [
"brotli",
"ctor",
+ "dunce",
"glob",
"heck 0.4.1",
"html5ever",
"infer",
- "json-patch 1.0.0",
- "kuchiki",
+ "json-patch",
+ "kuchikiki",
+ "log",
"memchr",
- "phf 0.10.1",
+ "phf 0.11.2",
"proc-macro2",
"quote",
- "semver 1.0.16",
+ "semver",
"serde",
"serde_json",
- "serde_with 2.3.2",
+ "serde_with",
"thiserror",
"url",
"walkdir",
- "windows 0.39.0",
+ "windows-version",
]
[[package]]
@@ -4453,21 +4680,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb"
dependencies = [
"embed-resource",
- "toml 0.7.3",
+ "toml 0.7.8",
]
[[package]]
name = "tempfile"
-version = "3.3.0"
+version = "3.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
+checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa"
dependencies = [
"cfg-if",
- "fastrand",
- "libc",
+ "fastrand 2.0.1",
"redox_syscall",
- "remove_dir_all",
- "winapi",
+ "rustix 0.38.31",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -4494,35 +4720,18 @@ dependencies = [
[[package]]
name = "termcolor"
-version = "1.2.0"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
dependencies = [
"winapi-util",
]
[[package]]
name = "termtree"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8"
-
-[[package]]
-name = "testcontainers"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e2b1567ca8a2b819ea7b28c92be35d9f76fb9edb214321dcc86eb96023d1f87"
-dependencies = [
- "bollard-stubs",
- "futures",
- "hex",
- "hmac",
- "log",
- "rand 0.8.5",
- "serde",
- "serde_json",
- "sha2",
-]
+checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
[[package]]
name = "thin-slice"
@@ -4532,22 +4741,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"
[[package]]
name = "thiserror"
-version = "1.0.40"
+version = "1.0.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.12",
+ "syn 2.0.48",
]
[[package]]
@@ -4562,22 +4771,14 @@ dependencies = [
[[package]]
name = "time"
-version = "0.1.45"
+version = "0.3.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi",
-]
-
-[[package]]
-name = "time"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc"
-dependencies = [
- "itoa 1.0.5",
+ "deranged",
+ "itoa 1.0.10",
+ "num-conv",
+ "powerfmt",
"serde",
"time-core",
"time-macros",
@@ -4585,16 +4786,17 @@ dependencies = [
[[package]]
name = "time-core"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
[[package]]
name = "time-macros"
-version = "0.2.9"
+version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
dependencies = [
+ "num-conv",
"time-core",
]
@@ -4624,11 +4826,11 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.28.1"
+version = "1.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105"
+checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
dependencies = [
- "autocfg",
+ "backtrace",
"bytes",
"libc",
"mio",
@@ -4636,20 +4838,20 @@ dependencies = [
"parking_lot",
"pin-project-lite",
"signal-hook-registry",
- "socket2",
+ "socket2 0.5.5",
"tokio-macros",
"windows-sys 0.48.0",
]
[[package]]
name = "tokio-macros"
-version = "2.1.0"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.12",
+ "syn 2.0.48",
]
[[package]]
@@ -4664,9 +4866,9 @@ dependencies = [
[[package]]
name = "tokio-util"
-version = "0.7.7"
+version = "0.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2"
+checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
dependencies = [
"bytes",
"futures-core",
@@ -4687,52 +4889,60 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.7.3"
+version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
+checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
dependencies = [
"serde",
"serde_spanned",
- "toml_datetime 0.6.1",
- "toml_edit 0.19.8",
+ "toml_datetime",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6a4b9e8023eb94392d3dca65d717c53abc5dad49c07cb65bb8fcd87115fa325"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.21.1",
]
[[package]]
name = "toml_datetime"
-version = "0.5.1"
+version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5"
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
dependencies = [
"serde",
]
[[package]]
name = "toml_edit"
-version = "0.18.1"
+version = "0.19.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
dependencies = [
- "indexmap",
- "nom8",
- "toml_datetime 0.5.1",
+ "indexmap 2.2.2",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
]
[[package]]
name = "toml_edit"
-version = "0.19.8"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
dependencies = [
- "indexmap",
+ "indexmap 2.2.2",
"serde",
"serde_spanned",
- "toml_datetime 0.6.1",
+ "toml_datetime",
"winnow",
]
@@ -4744,11 +4954,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
[[package]]
name = "tracing"
-version = "0.1.37"
+version = "0.1.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
dependencies = [
- "cfg-if",
"log",
"pin-project-lite",
"tracing-attributes",
@@ -4757,20 +4966,20 @@ dependencies = [
[[package]]
name = "tracing-attributes"
-version = "0.1.23"
+version = "0.1.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.48",
]
[[package]]
name = "tracing-core"
-version = "0.1.30"
+version = "0.1.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
dependencies = [
"once_cell",
"valuable",
@@ -4788,20 +4997,20 @@ dependencies = [
[[package]]
name = "tracing-log"
-version = "0.1.3"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
dependencies = [
- "lazy_static",
"log",
+ "once_cell",
"tracing-core",
]
[[package]]
name = "tracing-subscriber"
-version = "0.3.16"
+version = "0.3.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
dependencies = [
"matchers",
"nu-ansi-term",
@@ -4815,15 +5024,6 @@ dependencies = [
"tracing-log",
]
-[[package]]
-name = "treediff"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "761e8d5ad7ce14bb82b7e61ccc0ca961005a275a060b9644a2431aa11553c2ff"
-dependencies = [
- "serde_json",
-]
-
[[package]]
name = "treediff"
version = "4.0.2"
@@ -4835,44 +5035,47 @@ dependencies = [
[[package]]
name = "try-lock"
-version = "0.2.4"
+version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]]
name = "typed-builder"
-version = "0.14.0"
+version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64cba322cb9b7bc6ca048de49e83918223f35e7a86311267013afff257004870"
+checksum = "7fe83c85a85875e8c4cb9ce4a890f05b23d38cd0d47647db7895d3d2a79566d2"
+dependencies = [
+ "typed-builder-macro",
+]
+
+[[package]]
+name = "typed-builder-macro"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29a3151c41d0b13e3d011f98adc24434560ef06673a155a6c7f66b9879eecce2"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.48",
]
[[package]]
name = "typenum"
-version = "1.16.0"
+version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
[[package]]
name = "unicode-bidi"
-version = "0.3.10"
+version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
[[package]]
name = "unicode-ident"
-version = "1.0.6"
+version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
[[package]]
name = "unicode-normalization"
@@ -4889,12 +5092,6 @@ version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
-[[package]]
-name = "unicode-width"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
-
[[package]]
name = "unicode-xid"
version = "0.2.4"
@@ -4903,9 +5100,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
[[package]]
name = "url"
-version = "2.3.1"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
dependencies = [
"form_urlencoded",
"idna",
@@ -4921,11 +5118,11 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
[[package]]
name = "uuid"
-version = "1.3.3"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2"
+checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.12",
"serde",
]
@@ -4937,13 +5134,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
[[package]]
name = "value-bag"
-version = "1.0.0-alpha.9"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55"
-dependencies = [
- "ctor",
- "version_check",
-]
+checksum = "126e423afe2dd9ac52142e7e9d5ce4135d7e13776c529d27fd6bc49f19e3280b"
[[package]]
name = "vcpkg"
@@ -4991,28 +5184,26 @@ dependencies = [
[[package]]
name = "waker-fn"
-version = "1.1.0"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
+checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
[[package]]
name = "walkdir"
-version = "2.3.2"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
dependencies = [
"same-file",
- "winapi",
"winapi-util",
]
[[package]]
name = "want"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
dependencies = [
- "log",
"try-lock",
]
@@ -5022,12 +5213,6 @@ version = "0.9.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
[[package]]
name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
@@ -5036,9 +5221,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.84"
+version = "0.2.90"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
+checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
@@ -5046,24 +5231,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.84"
+version = "0.2.90"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
+checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.48",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.34"
+version = "0.4.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
+checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461"
dependencies = [
"cfg-if",
"js-sys",
@@ -5073,9 +5258,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.84"
+version = "0.2.90"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
+checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -5083,28 +5268,41 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.84"
+version = "0.2.90"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
+checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.48",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.84"
+version = "0.2.90"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
+checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b"
+
+[[package]]
+name = "wasm-streams"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
+dependencies = [
+ "futures-util",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
[[package]]
name = "web-sys"
-version = "0.3.61"
+version = "0.3.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
+checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -5116,7 +5314,7 @@ version = "0.18.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370"
dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
"cairo-rs",
"gdk",
"gdk-sys",
@@ -5141,7 +5339,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3"
dependencies = [
"atk-sys",
- "bitflags",
+ "bitflags 1.3.2",
"cairo-sys-rs",
"gdk-pixbuf-sys",
"gdk-sys",
@@ -5154,7 +5352,7 @@ dependencies = [
"pango-sys",
"pkg-config",
"soup2-sys",
- "system-deps 6.0.3",
+ "system-deps 6.2.0",
]
[[package]]
@@ -5195,15 +5393,6 @@ dependencies = [
"windows-metadata",
]
-[[package]]
-name = "wepoll-ffi"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
-dependencies = [
- "cc",
-]
-
[[package]]
name = "winapi"
version = "0.3.9"
@@ -5222,9 +5411,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-util"
-version = "0.1.5"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
dependencies = [
"winapi",
]
@@ -5264,11 +5453,11 @@ dependencies = [
[[package]]
name = "windows"
-version = "0.44.0"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
dependencies = [
- "windows-targets 0.42.1",
+ "windows-targets 0.48.5",
]
[[package]]
@@ -5281,6 +5470,15 @@ dependencies = [
"windows-tokens",
]
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.0",
+]
+
[[package]]
name = "windows-implement"
version = "0.39.0"
@@ -5297,28 +5495,13 @@ version = "0.39.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278"
-[[package]]
-name = "windows-sys"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.1",
- "windows_aarch64_msvc 0.42.1",
- "windows_i686_gnu 0.42.1",
- "windows_i686_msvc 0.42.1",
- "windows_x86_64_gnu 0.42.1",
- "windows_x86_64_gnullvm 0.42.1",
- "windows_x86_64_msvc 0.42.1",
-]
-
[[package]]
name = "windows-sys"
version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
dependencies = [
- "windows-targets 0.42.1",
+ "windows-targets 0.42.2",
]
[[package]]
@@ -5327,37 +5510,61 @@ version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
- "windows-targets 0.48.0",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.0",
]
[[package]]
name = "windows-targets"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
dependencies = [
- "windows_aarch64_gnullvm 0.42.1",
- "windows_aarch64_msvc 0.42.1",
- "windows_i686_gnu 0.42.1",
- "windows_i686_msvc 0.42.1",
- "windows_x86_64_gnu 0.42.1",
- "windows_x86_64_gnullvm 0.42.1",
- "windows_x86_64_msvc 0.42.1",
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
]
[[package]]
name = "windows-targets"
-version = "0.48.0"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
- "windows_aarch64_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
]
[[package]]
@@ -5367,16 +5574,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597"
[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.1"
+name = "windows-version"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+checksum = "75aa004c988e080ad34aff5739c39d0312f4684699d6d71fc8a198d057b8b9b4"
+dependencies = [
+ "windows-targets 0.52.0",
+]
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.48.0"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
[[package]]
name = "windows_aarch64_msvc"
@@ -5392,15 +5614,21 @@ checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.48.0"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
[[package]]
name = "windows_i686_gnu"
@@ -5416,15 +5644,21 @@ checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b"
[[package]]
name = "windows_i686_gnu"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
[[package]]
name = "windows_i686_gnu"
-version = "0.48.0"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
[[package]]
name = "windows_i686_msvc"
@@ -5440,15 +5674,21 @@ checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106"
[[package]]
name = "windows_i686_msvc"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
[[package]]
name = "windows_i686_msvc"
-version = "0.48.0"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
[[package]]
name = "windows_x86_64_gnu"
@@ -5464,27 +5704,39 @@ checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.48.0"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
[[package]]
name = "windows_x86_64_msvc"
@@ -5500,49 +5752,56 @@ checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.42.1"
+version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.48.0"
+version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
[[package]]
name = "winnow"
-version = "0.4.1"
+version = "0.5.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
+checksum = "a7cad8365489051ae9f054164e459304af2e7e9bb407c958076c8bf4aef52da5"
dependencies = [
"memchr",
]
[[package]]
name = "winreg"
-version = "0.10.1"
+version = "0.50.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
dependencies = [
- "winapi",
+ "cfg-if",
+ "windows-sys 0.48.0",
]
[[package]]
name = "winreg"
-version = "0.11.0"
+version = "0.51.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189"
+checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc"
dependencies = [
"cfg-if",
- "winapi",
+ "windows-sys 0.48.0",
]
[[package]]
name = "wry"
-version = "0.23.4"
+version = "0.24.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c1ad8e2424f554cc5bdebe8aa374ef5b433feff817aebabca0389961fc7ef98"
+checksum = "6ad85d0e067359e409fcb88903c3eac817c392e5d638258abfb3da5ad8ba6fc4"
dependencies = [
"base64 0.13.1",
"block",
@@ -5556,7 +5815,7 @@ dependencies = [
"gtk",
"html5ever",
"http",
- "kuchiki",
+ "kuchikiki",
"libc",
"log",
"objc",
@@ -5576,6 +5835,15 @@ dependencies = [
"windows-implement",
]
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
[[package]]
name = "x11"
version = "2.21.0"
@@ -5599,39 +5867,61 @@ dependencies = [
[[package]]
name = "xattr"
-version = "0.2.3"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc"
+checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
dependencies = [
"libc",
+ "linux-raw-sys 0.4.13",
+ "rustix 0.38.31",
]
[[package]]
name = "zerocopy"
-version = "0.6.1"
+version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "332f188cc1bcf1fe1064b8c58d150f497e697f49774aa846f2dc949d9a25f236"
+checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6"
dependencies = [
"byteorder",
- "zerocopy-derive",
+ "zerocopy-derive 0.6.6",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+dependencies = [
+ "zerocopy-derive 0.7.32",
]
[[package]]
name = "zerocopy-derive"
-version = "0.3.2"
+version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6505e6815af7de1746a08f69c69606bb45695a17149517680f3b2149713b19a3"
+checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
]
[[package]]
name = "zip"
-version = "0.6.4"
+version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0445d0fbc924bb93539b4316c11afb121ea39296f99a3c4c9edad09e3658cdef"
+checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
dependencies = [
"byteorder",
"crc32fast",
diff --git a/pkgs/applications/misc/insulator2/default.nix b/pkgs/applications/misc/insulator2/default.nix
index 423a77302684..bf26c7c8ba9e 100644
--- a/pkgs/applications/misc/insulator2/default.nix
+++ b/pkgs/applications/misc/insulator2/default.nix
@@ -1,4 +1,5 @@
{ lib
+, cmake
, dbus
, fetchFromGitHub
, fetchYarnDeps
@@ -11,7 +12,6 @@
, perl
, cyrus_sasl
, stdenv
-, fixup_yarn_lock
, yarnConfigHook
, nodejs-slim
, cargo-tauri
@@ -20,19 +20,25 @@
, rustc
, jq
, moreutils
+, fetchpatch
}:
stdenv.mkDerivation rec {
pname = "insulator2";
- version = "2.12.2";
+ version = "2.13.2";
src = fetchFromGitHub {
owner = "andrewinci";
repo = pname;
rev = "v${version}";
- hash = "sha256-Bi9GCQr7yox5Plc7o0svRKYi1XoK/HDGj1VbW1z4jac=";
+ hash = "sha256-34JRIB7/x7miReWOxR/m+atjfUiE3XGyh9OBSbMg3m4=";
};
+ patches = [
+ # see: https://github.com/andrewinci/insulator2/pull/733
+ ./fix-rust-1.80.0.patch
+ ];
+
# Yarn *really* wants us to use corepack if this is set
postPatch = ''
jq 'del(.packageManager)' package.json | sponge package.json
@@ -40,30 +46,34 @@ stdenv.mkDerivation rec {
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
- hash = "sha256-ih5NSOvYje981SkVfPHm/u2sS1B36kgxpfe9LmQaxdo=";
+ hash = "sha256-5wOgVrcHJVF07QpnN52d4VWEM3FKw3NdLrZ1goAP2oI=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
- "apache-avro-0.15.0" = "sha256-bjA/x/IDzAYugsc1vn9fBVKaCiLOJYdA1Q9H2pffBh0=";
- "openssl-src-111.25.0+1.1.1t" = "sha256-1BEtb38ilJJAw35KW+NOIe1rhxxOPsnz0gA2zJnof8c=";
- "rdkafka-0.29.0" = "sha256-a739Fc+qjmIrK754GT22Gb/Ftd82lLSUzv53Ej7Khu4=";
+ "apache-avro-0.16.0" = "sha256-v4TeJEhLEqQUgj+EHgFRVUGoLC+SpOUhAXngMP7R7nM=";
"rust-keystore-0.1.1" = "sha256-Cj64uJFZNxnrplhRuqf9/HK/RAaawzfYHo/J9snZ+TU=";
};
};
cargoRoot = "backend/";
- buildAndTestDir = cargoRoot;
+ buildAndTestSubdir = cargoRoot;
+
+ dontUseCmakeConfigure = true;
+
+ preInstall = ''
+ mkdir -p "$out"
+ '';
nativeBuildInputs = [
+ cmake
pkg-config
perl
rustPlatform.cargoSetupHook
cargo
rustc
cargo-tauri.hook
- fixup_yarn_lock
yarnConfigHook
nodejs-slim
cyrus_sasl
@@ -87,5 +97,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ tc-kaluza ];
mainProgram = "insulator-2";
};
-
}
diff --git a/pkgs/applications/misc/insulator2/fix-rust-1.80.0.patch b/pkgs/applications/misc/insulator2/fix-rust-1.80.0.patch
new file mode 100644
index 000000000000..c9a8fa0701ad
--- /dev/null
+++ b/pkgs/applications/misc/insulator2/fix-rust-1.80.0.patch
@@ -0,0 +1,51 @@
+From 7dbff0777c4364eec68cf90488d99f06b11dfa98 Mon Sep 17 00:00:00 2001
+From: Felix Buehler
+Date: Tue, 8 Oct 2024 23:49:40 +0200
+Subject: [PATCH] build: Bump time from 0.3.34 to 0.3.36 in /backend
+
+---
+ backend/Cargo.lock | 8 ++++----
+ backend/Cargo.toml | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/backend/Cargo.lock b/backend/Cargo.lock
+index dc3ac0d4..571bd845 100644
+--- a/backend/Cargo.lock
++++ b/backend/Cargo.lock
+@@ -4771,9 +4771,9 @@ dependencies = [
+
+ [[package]]
+ name = "time"
+-version = "0.3.34"
++version = "0.3.36"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+ dependencies = [
+ "deranged",
+ "itoa 1.0.10",
+@@ -4792,9 +4792,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+ [[package]]
+ name = "time-macros"
+-version = "0.2.17"
++version = "0.2.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+ dependencies = [
+ "num-conv",
+ "time-core",
+diff --git a/backend/Cargo.toml b/backend/Cargo.toml
+index 2a689961..3d198dff 100644
+--- a/backend/Cargo.toml
++++ b/backend/Cargo.toml
+@@ -49,7 +49,7 @@ r2d2 = "0.8.10"
+ r2d2_sqlite = "0.21.0"
+ toml = "0.7"
+ rand = "0.8.5"
+-time = "0.3.34"
++time = "0.3.36"
+ sys-locale = "0.3.0"
+ uuid = "1.4.1"
+ rlimit = "0.10.1"
diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
index 4957ce226173..130790aec641 100644
--- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
@@ -1,22 +1,23 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (7.1.3.4)
+ activesupport (7.2.1.2)
base64
bigdecimal
- concurrent-ruby (~> 1.0, >= 1.0.2)
+ concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
+ logger (>= 1.4.2)
minitest (>= 5.1)
- mutex_m
- tzinfo (~> 2.0)
+ securerandom (>= 0.3)
+ tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
base64 (0.2.0)
bigdecimal (3.1.8)
colorator (1.1.0)
- concurrent-ruby (1.3.3)
+ concurrent-ruby (1.3.4)
connection_pool (2.4.1)
drb (2.2.1)
em-websocket (0.5.3)
@@ -26,16 +27,16 @@ GEM
ffi (1.17.0)
forwardable-extended (2.6.0)
gemoji (4.1.0)
- google-protobuf (4.27.2)
+ google-protobuf (4.28.3)
bigdecimal
rake (>= 13)
html-pipeline (2.14.3)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.8.0)
- i18n (1.14.5)
+ i18n (1.14.6)
concurrent-ruby (~> 1.0)
- jekyll (4.3.3)
+ jekyll (4.3.4)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
@@ -76,35 +77,34 @@ GEM
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
+ logger (1.6.1)
mercenary (0.4.0)
mini_portile2 (2.8.7)
- minitest (5.24.0)
- mutex_m (0.2.0)
- nokogiri (1.16.6)
+ minitest (5.25.1)
+ nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
- public_suffix (6.0.0)
- racc (1.8.0)
+ public_suffix (6.0.1)
+ racc (1.8.1)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
- rexml (3.3.1)
- strscan
- rouge (4.3.0)
+ rexml (3.3.9)
+ rouge (4.4.0)
safe_yaml (1.0.5)
- sass-embedded (1.77.5)
- google-protobuf (>= 3.25, < 5.0)
+ sass-embedded (1.80.4)
+ google-protobuf (~> 4.28)
rake (>= 13)
- strscan (3.1.0)
+ securerandom (0.3.1)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
- unicode-display_width (2.5.0)
- webrick (1.8.1)
+ unicode-display_width (2.6.0)
+ webrick (1.8.2)
PLATFORMS
ruby
@@ -118,4 +118,4 @@ DEPENDENCIES
jemoji
BUNDLED WITH
- 2.5.11
+ 2.5.9
diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix
index f135bf6ccdef..1f1ba7ea50a7 100644
--- a/pkgs/applications/misc/jekyll/basic/gemset.nix
+++ b/pkgs/applications/misc/jekyll/basic/gemset.nix
@@ -1,14 +1,14 @@
{
activesupport = {
- dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"];
+ dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "logger" "minitest" "securerandom" "tzinfo"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0283wk1zxb76lg79dk501kcf5xy9h25qiw15m86s4nrfv11vqns5";
+ sha256 = "1cacrvmn1561fb88fn99ig52wdz1k67s7vbssqwwwljf1kanlgvc";
type = "gem";
};
- version = "7.1.3.4";
+ version = "7.2.1.2";
};
addressable = {
dependencies = ["public_suffix"];
@@ -56,10 +56,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g";
+ sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
type = "gem";
};
- version = "1.3.3";
+ version = "1.3.4";
};
connection_pool = {
groups = ["default"];
@@ -138,10 +138,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0vwnr6fmxig4pkag86yzbznpxk8ii7rhjz0rrprkqvnymhhfnscz";
+ sha256 = "1d99vyhmyp2n5zd0qmfymzwbcn71dbnwwvc0m4z14msjb7b8dvf0";
type = "gem";
};
- version = "4.27.2";
+ version = "4.28.3";
};
html-pipeline = {
dependencies = ["activesupport" "nokogiri"];
@@ -170,10 +170,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16";
+ sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw";
type = "gem";
};
- version = "1.14.5";
+ version = "1.14.6";
};
jekyll = {
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table" "webrick"];
@@ -181,10 +181,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0638cvpmk3py1w2dxpav6l0c854y6l94b6gyc2aa16i7r897z64a";
+ sha256 = "0124fnqizh7njn99qg4f3jvf9kg2rpm88drs9p9r5hqr50n2i264";
type = "gem";
};
- version = "4.3.3";
+ version = "4.3.4";
};
jekyll-avatar = {
dependencies = ["jekyll"];
@@ -306,6 +306,16 @@
};
version = "3.9.0";
};
+ logger = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
+ type = "gem";
+ };
+ version = "1.6.1";
+ };
mercenary = {
groups = ["default"];
platforms = [];
@@ -331,20 +341,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zgq31wa0ygqnmpqh3plsig32xc8k4l99r49ncmidfg91kfagymg";
+ sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix";
type = "gem";
};
- version = "5.24.0";
- };
- mutex_m = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn";
- type = "gem";
- };
- version = "0.2.0";
+ version = "5.25.1";
};
nokogiri = {
dependencies = ["mini_portile2" "racc"];
@@ -352,10 +352,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk";
+ sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq";
type = "gem";
};
- version = "1.16.6";
+ version = "1.16.7";
};
pathutil = {
dependencies = ["forwardable-extended"];
@@ -373,20 +373,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17m8q2dzm7a74amnab5rf3f3m466i300awihl3ygh4v80wpf3j6j";
+ sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
type = "gem";
};
- version = "6.0.0";
+ version = "6.0.1";
};
racc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09";
+ sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa";
type = "gem";
};
- version = "1.8.0";
+ version = "1.8.1";
};
rake = {
groups = ["default"];
@@ -420,25 +420,24 @@
version = "0.11.1";
};
rexml = {
- dependencies = ["strscan"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09f3sw7f846fpcpwdm362ylqldwqxpym6z0qpld4av7zisrrzbrl";
+ sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p";
type = "gem";
};
- version = "3.3.1";
+ version = "3.3.9";
};
rouge = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "072qvvrcqj0yfr3b0j932mlhvn41i38bq37z7z07i3ikagndkqwy";
+ sha256 = "0r0b48945hakgy0y7lg6h1bb7pkfz8jqd0r6777f80ij3sansvbs";
type = "gem";
};
- version = "4.3.0";
+ version = "4.4.0";
};
safe_yaml = {
groups = ["default"];
@@ -456,20 +455,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nmy052pm46781s7ca6x3l4yb5p3glh8sf201xwcwpk9rv2av9m2";
+ sha256 = "09hydxaq3bwwpflqz93g7pvj5kq0ylj2kvc87q2fvki5h7svbd51";
type = "gem";
};
- version = "1.77.5";
+ version = "1.80.4";
};
- strscan = {
+ securerandom = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01";
+ sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q";
type = "gem";
};
- version = "3.1.0";
+ version = "0.3.1";
};
terminal-table = {
dependencies = ["unicode-display_width"];
@@ -498,19 +497,19 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky";
+ sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj";
type = "gem";
};
- version = "2.5.0";
+ version = "2.6.0";
};
webrick = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r";
+ sha256 = "089gy5494j560b242vi173wnbj2913hwlwnjkpzld58r96ilc5s3";
type = "gem";
};
- version = "1.8.1";
+ version = "1.8.2";
};
}
diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix
index 263acefe7cb6..45d48bc23ae7 100644
--- a/pkgs/applications/misc/jekyll/default.nix
+++ b/pkgs/applications/misc/jekyll/default.nix
@@ -1,6 +1,10 @@
-{ lib, bundlerApp, ruby
-, writeShellScriptBin, makeWrapper
-, withOptionalDependencies ? false
+{
+ lib,
+ bundlerApp,
+ makeWrapper,
+ ruby,
+ writeShellScriptBin,
+ withOptionalDependencies ? false,
}:
let
@@ -21,14 +25,13 @@ let
# Else: Don't modify the arguments:
exec ${ruby}/bin/ruby "$@"
'';
-in bundlerApp {
+in
+bundlerApp {
pname = "jekyll";
exes = [ "jekyll" ];
inherit ruby;
- gemdir = if withOptionalDependencies
- then ./full
- else ./basic;
+ gemdir = if withOptionalDependencies then ./full else ./basic;
nativeBuildInputs = [ makeWrapper ];
@@ -48,11 +51,11 @@ in bundlerApp {
web server. Jekyll is the engine behind GitHub Pages, which you can use to
host sites right from your GitHub repositories.
'';
- homepage = "https://jekyllrb.com/";
- #changelog = "https://raw.githubusercontent.com/jekyll/jekyll/v${version}/History.markdown";
- license = licenses.mit;
- maintainers = [ ];
- platforms = platforms.unix;
+ homepage = "https://jekyllrb.com/";
+ changelog = "https://jekyllrb.com/news/releases/";
+ license = licenses.mit;
+ maintainers = [ maintainers.anthonyroussel ];
+ platforms = platforms.unix;
mainProgram = "jekyll";
};
}
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile b/pkgs/applications/misc/jekyll/full/Gemfile
index 5f095debe6d6..b95198936ab3 100644
--- a/pkgs/applications/misc/jekyll/full/Gemfile
+++ b/pkgs/applications/misc/jekyll/full/Gemfile
@@ -21,7 +21,7 @@ gem "jekyll-redirect-from"
gem "kramdown-syntax-coderay"
gem "mime-types", "~> 3.0"
gem "rdoc", "~> 6.0"
-gem "tomlrb", "~> 1.2"
+gem "tomlrb"
platform :ruby, :mswin, :mingw, :x64_mingw do
gem "classifier-reborn", "~> 2.2"
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock
index de800bfeb75d..29229d1d0e35 100644
--- a/pkgs/applications/misc/jekyll/full/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock
@@ -1,16 +1,17 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (7.1.3.4)
+ activesupport (7.2.1.2)
base64
bigdecimal
- concurrent-ruby (~> 1.0, >= 1.0.2)
+ concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
+ logger (>= 1.4.2)
minitest (>= 5.1)
- mutex_m
- tzinfo (~> 2.0)
+ securerandom (>= 0.3)
+ tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
base64 (0.2.0)
@@ -24,32 +25,34 @@ GEM
execjs
coffee-script-source (1.12.2)
colorator (1.1.0)
- concurrent-ruby (1.3.3)
+ concurrent-ruby (1.3.4)
connection_pool (2.4.1)
drb (2.2.1)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
eventmachine (1.2.7)
- execjs (2.9.1)
- faraday (2.9.2)
- faraday-net_http (>= 2.0, < 3.2)
- faraday-net_http (3.1.0)
+ execjs (2.10.0)
+ faraday (2.12.0)
+ faraday-net_http (>= 2.0, < 3.4)
+ json
+ logger
+ faraday-net_http (3.3.0)
net-http
fast-stemmer (1.0.2)
ffi (1.17.0)
forwardable-extended (2.6.0)
gemoji (4.1.0)
- google-protobuf (4.27.2)
+ google-protobuf (4.28.3)
bigdecimal
rake (>= 13)
html-pipeline (2.14.3)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.8.0)
- i18n (1.14.5)
+ i18n (1.14.6)
concurrent-ruby (~> 1.0)
- jekyll (4.3.3)
+ jekyll (4.3.4)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
@@ -84,7 +87,7 @@ GEM
html-pipeline (~> 2.3)
jekyll (>= 3.7, < 5.0)
jekyll-paginate (1.1.0)
- jekyll-polyglot (1.8.0)
+ jekyll-polyglot (1.8.1)
jekyll (>= 4.0, >= 3.0)
jekyll-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0)
@@ -100,6 +103,7 @@ GEM
gemoji (>= 3, < 5)
html-pipeline (~> 2.2)
jekyll (>= 3.0, < 5.0)
+ json (2.7.4)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
@@ -113,18 +117,19 @@ GEM
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
+ logger (1.6.1)
matrix (0.4.2)
mercenary (0.4.0)
- mime-types (3.5.2)
+ mime-types (3.6.0)
+ logger
mime-types-data (~> 3.2015)
- mime-types-data (3.2024.0604)
- mini_magick (4.13.1)
+ mime-types-data (3.2024.1001)
+ mini_magick (4.13.2)
mini_portile2 (2.8.7)
- minitest (5.24.0)
- mutex_m (0.2.0)
+ minitest (5.25.1)
net-http (0.4.1)
uri
- nokogiri (1.16.6)
+ nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
octokit (4.25.1)
@@ -134,34 +139,33 @@ GEM
forwardable-extended (~> 2.6)
psych (5.1.2)
stringio
- public_suffix (6.0.0)
- racc (1.8.0)
+ public_suffix (6.0.1)
+ racc (1.8.1)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rdoc (6.7.0)
psych (>= 4.0.0)
- rexml (3.3.1)
- strscan
- rouge (4.3.0)
+ rexml (3.3.9)
+ rouge (4.4.0)
safe_yaml (1.0.5)
- sass-embedded (1.77.5)
- google-protobuf (>= 3.25, < 5.0)
+ sass-embedded (1.80.4)
+ google-protobuf (~> 4.28)
rake (>= 13)
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
+ securerandom (0.3.1)
stringio (3.1.1)
- strscan (3.1.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
- tomlrb (1.3.0)
+ tomlrb (2.0.3)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
- unicode-display_width (2.5.0)
- uri (0.13.0)
- webrick (1.8.1)
+ unicode-display_width (2.6.0)
+ uri (0.13.1)
+ webrick (1.8.2)
yajl-ruby (1.4.3)
PLATFORMS
@@ -187,8 +191,8 @@ DEPENDENCIES
liquid-c (~> 4.0)
mime-types (~> 3.0)
rdoc (~> 6.0)
- tomlrb (~> 1.2)
+ tomlrb
yajl-ruby (~> 1.4)
BUNDLED WITH
- 2.5.11
+ 2.5.9
diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix
index 4260c081f19c..576eee752df8 100644
--- a/pkgs/applications/misc/jekyll/full/gemset.nix
+++ b/pkgs/applications/misc/jekyll/full/gemset.nix
@@ -1,14 +1,14 @@
{
activesupport = {
- dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"];
+ dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "logger" "minitest" "securerandom" "tzinfo"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0283wk1zxb76lg79dk501kcf5xy9h25qiw15m86s4nrfv11vqns5";
+ sha256 = "1cacrvmn1561fb88fn99ig52wdz1k67s7vbssqwwwljf1kanlgvc";
type = "gem";
};
- version = "7.1.3.4";
+ version = "7.2.1.2";
};
addressable = {
dependencies = ["public_suffix"];
@@ -110,10 +110,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g";
+ sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
type = "gem";
};
- version = "1.3.3";
+ version = "1.3.4";
};
connection_pool = {
groups = ["default"];
@@ -161,21 +161,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1yywajqlpjhrj1m43s3lfg3i4lkb6pxwccmwps7qw37ndmphdzg8";
+ sha256 = "03a590q16nhqvfms0lh42mp6a1i41w41qpdnf39zjbq5y3l8pjvb";
type = "gem";
};
- version = "2.9.1";
+ version = "2.10.0";
};
faraday = {
- dependencies = ["faraday-net_http"];
+ dependencies = ["faraday-net_http" "json" "logger"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1913fk7szy3bj8mf1dxs4waym5ya5fzzc5d3a8z24qs67fzfv5b5";
+ sha256 = "05s5pyxh7y68jphb0lgrh0ksxbp4lmbsc6a6qg0ahj15pjqx01ni";
type = "gem";
};
- version = "2.9.2";
+ version = "2.12.0";
};
faraday-net_http = {
dependencies = ["net-http"];
@@ -183,10 +183,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17w51yk4rrm9rpnbc3x509s619kba0jga3qrj4b17l30950vw9qn";
+ sha256 = "0rg54k4skaz8z7j358p6pdzc9pr84fjq7sdlpicf7s5ig7vb1rlk";
type = "gem";
};
- version = "3.1.0";
+ version = "3.3.0";
};
fast-stemmer = {
groups = ["default"];
@@ -246,10 +246,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0vwnr6fmxig4pkag86yzbznpxk8ii7rhjz0rrprkqvnymhhfnscz";
+ sha256 = "1d99vyhmyp2n5zd0qmfymzwbcn71dbnwwvc0m4z14msjb7b8dvf0";
type = "gem";
};
- version = "4.27.2";
+ version = "4.28.3";
};
html-pipeline = {
dependencies = ["activesupport" "nokogiri"];
@@ -278,10 +278,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16";
+ sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw";
type = "gem";
};
- version = "1.14.5";
+ version = "1.14.6";
};
jekyll = {
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table" "webrick"];
@@ -289,10 +289,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0638cvpmk3py1w2dxpav6l0c854y6l94b6gyc2aa16i7r897z64a";
+ sha256 = "0124fnqizh7njn99qg4f3jvf9kg2rpm88drs9p9r5hqr50n2i264";
type = "gem";
};
- version = "4.3.3";
+ version = "4.3.4";
};
jekyll-avatar = {
dependencies = ["jekyll"];
@@ -387,10 +387,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xbmsm30jgpbamqvbjvjgfq2w9ihdpqsbay9jrd5pljrbhvy02di";
+ sha256 = "1q50kvzvc58547km41d8zp227z07jwjbc1kzqikkhqfbxb79cakd";
type = "gem";
};
- version = "1.8.0";
+ version = "1.8.1";
};
jekyll-redirect-from = {
dependencies = ["jekyll"];
@@ -458,6 +458,16 @@
};
version = "0.13.0";
};
+ json = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1klf2mnfilzjqwcjdi5qb1zl3ghrifz1amcnvwjvsfnx9a5jb9ly";
+ type = "gem";
+ };
+ version = "2.7.4";
+ };
kramdown = {
dependencies = ["rexml"];
groups = ["default"];
@@ -547,6 +557,16 @@
};
version = "3.9.0";
};
+ logger = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
+ type = "gem";
+ };
+ version = "1.6.1";
+ };
matrix = {
groups = ["default"];
platforms = [{
@@ -580,35 +600,35 @@
version = "0.4.0";
};
mime-types = {
- dependencies = ["mime-types-data"];
+ dependencies = ["logger" "mime-types-data"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1";
+ sha256 = "0r34mc3n7sxsbm9mzyzy8m3dvq7pwbryyc8m452axkj0g2axnwbg";
type = "gem";
};
- version = "3.5.2";
+ version = "3.6.0";
};
mime-types-data = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rri45lldyk3bsg4yqpxcl1xrnxnqasnw94x03w5arq3yy7kff65";
+ sha256 = "06dbn0j13jwdrmlvrjd50mxqrjlkh3lvxp0afh4glyzbliqvqpsd";
type = "gem";
};
- version = "3.2024.0604";
+ version = "3.2024.1001";
};
mini_magick = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zbfldqc3dp9fiyz9d4hkkabkvsmx5649bs78j5008i5gzr0x6zg";
+ sha256 = "1nfxjpmka12ihbwd87d5k2hh7d2pv3aq95x0l2lh8gca1s72bmki";
type = "gem";
};
- version = "4.13.1";
+ version = "4.13.2";
};
mini_portile2 = {
groups = ["default"];
@@ -625,20 +645,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zgq31wa0ygqnmpqh3plsig32xc8k4l99r49ncmidfg91kfagymg";
+ sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix";
type = "gem";
};
- version = "5.24.0";
- };
- mutex_m = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn";
- type = "gem";
- };
- version = "0.2.0";
+ version = "5.25.1";
};
net-http = {
dependencies = ["uri"];
@@ -657,10 +667,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk";
+ sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq";
type = "gem";
};
- version = "1.16.6";
+ version = "1.16.7";
};
octokit = {
dependencies = ["faraday" "sawyer"];
@@ -700,20 +710,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17m8q2dzm7a74amnab5rf3f3m466i300awihl3ygh4v80wpf3j6j";
+ sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
type = "gem";
};
- version = "6.0.0";
+ version = "6.0.1";
};
racc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09";
+ sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa";
type = "gem";
};
- version = "1.8.0";
+ version = "1.8.1";
};
rake = {
groups = ["default"];
@@ -758,25 +768,24 @@
version = "6.7.0";
};
rexml = {
- dependencies = ["strscan"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09f3sw7f846fpcpwdm362ylqldwqxpym6z0qpld4av7zisrrzbrl";
+ sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p";
type = "gem";
};
- version = "3.3.1";
+ version = "3.3.9";
};
rouge = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "072qvvrcqj0yfr3b0j932mlhvn41i38bq37z7z07i3ikagndkqwy";
+ sha256 = "0r0b48945hakgy0y7lg6h1bb7pkfz8jqd0r6777f80ij3sansvbs";
type = "gem";
};
- version = "4.3.0";
+ version = "4.4.0";
};
safe_yaml = {
groups = ["default"];
@@ -794,10 +803,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nmy052pm46781s7ca6x3l4yb5p3glh8sf201xwcwpk9rv2av9m2";
+ sha256 = "09hydxaq3bwwpflqz93g7pvj5kq0ylj2kvc87q2fvki5h7svbd51";
type = "gem";
};
- version = "1.77.5";
+ version = "1.80.4";
};
sawyer = {
dependencies = ["addressable" "faraday"];
@@ -810,6 +819,16 @@
};
version = "0.9.2";
};
+ securerandom = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q";
+ type = "gem";
+ };
+ version = "0.3.1";
+ };
stringio = {
groups = ["default"];
platforms = [];
@@ -820,16 +839,6 @@
};
version = "3.1.1";
};
- strscan = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01";
- type = "gem";
- };
- version = "3.1.0";
- };
terminal-table = {
dependencies = ["unicode-display_width"];
groups = ["default"];
@@ -846,10 +855,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00x5y9h4fbvrv4xrjk4cqlkm4vq8gv73ax4alj3ac2x77zsnnrk8";
+ sha256 = "1xyl2nlfm39lklyaf0p7zj9psr60jvrlyfh26hrpk7wi4k7nlwy2";
type = "gem";
};
- version = "1.3.0";
+ version = "2.0.3";
};
tzinfo = {
dependencies = ["concurrent-ruby"];
@@ -867,30 +876,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky";
+ sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj";
type = "gem";
};
- version = "2.5.0";
+ version = "2.6.0";
};
uri = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96";
+ sha256 = "07ndgxyhzd02cg94s6rnfhkb9rwx9z72lzk368sa9j78wc9qnbfz";
type = "gem";
};
- version = "0.13.0";
+ version = "0.13.1";
};
webrick = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r";
+ sha256 = "089gy5494j560b242vi173wnbj2913hwlwnjkpzld58r96ilc5s3";
type = "gem";
};
- version = "1.8.1";
+ version = "1.8.2";
};
yajl-ruby = {
groups = ["default"];
diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix
index 6af515865dbf..b4e30c49faa4 100644
--- a/pkgs/applications/misc/klayout/default.nix
+++ b/pkgs/applications/misc/klayout/default.nix
@@ -5,13 +5,13 @@
mkDerivation rec {
pname = "klayout";
- version = "0.29.7";
+ version = "0.29.8";
src = fetchFromGitHub {
owner = "KLayout";
repo = "klayout";
rev = "v${version}";
- hash = "sha256-4GjCV/Z9al7Hrj7Ik/EvmLy5jPCsU/3Ti9HwOjzPKYc=";
+ hash = "sha256-cWLekSfyAOWI0ID9SlxN8XxHQR9oo1y5tTBn2schCtI=";
};
postPatch = ''
diff --git a/pkgs/applications/misc/kuro/default.nix b/pkgs/applications/misc/kuro/default.nix
index e0240b38afec..95126d1ba1f1 100644
--- a/pkgs/applications/misc/kuro/default.nix
+++ b/pkgs/applications/misc/kuro/default.nix
@@ -8,12 +8,9 @@
, makeWrapper
, makeDesktopItem
, copyDesktopItems
-, electron_29
+, electron
}:
-let
- electron = electron_29;
-in
stdenv.mkDerivation rec {
pname = "kuro";
version = "9.0.0";
diff --git a/pkgs/applications/misc/leetcode-cli/default.nix b/pkgs/applications/misc/leetcode-cli/default.nix
index 24d7faf40722..dbad8d651247 100644
--- a/pkgs/applications/misc/leetcode-cli/default.nix
+++ b/pkgs/applications/misc/leetcode-cli/default.nix
@@ -32,7 +32,10 @@ rustPlatform.buildRustPackage rec {
openssl
dbus
sqlite
- ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
+ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ darwin.apple_sdk.frameworks.Security
+ darwin.apple_sdk.frameworks.SystemConfiguration
+ ];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd leetcode \
diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix
index d326169e560d..43b179977301 100644
--- a/pkgs/applications/misc/pdfstudio/default.nix
+++ b/pkgs/applications/misc/pdfstudio/default.nix
@@ -80,4 +80,18 @@ in
];
jdk = jdk17;
};
+
+ pdfstudio2024 = callPackage ./common.nix rec {
+ inherit desktopName longDescription pname program year;
+ version = "${year}.0.0";
+ src = fetchurl {
+ url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb";
+ sha256 = "sha256-9TMSKtBE0+T7wRnBgtUjRr/JUmCaYdyD/7y0ML37wCM=";
+ };
+ extraBuildInputs = [
+ (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1
+ ];
+ jdk = jdk17;
+ };
+
}.${pname}
diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix
index 08835ba6a08a..59c732ec81d0 100644
--- a/pkgs/applications/misc/pgmodeler/default.nix
+++ b/pkgs/applications/misc/pgmodeler/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "pgmodeler";
- version = "1.1.4";
+ version = "1.1.5";
src = fetchFromGitHub {
owner = "pgmodeler";
repo = "pgmodeler";
rev = "v${version}";
- sha256 = "sha256-axw0/QFQfnEc2P8tFRtSY5vVUJTqv+kRn68GXdZ5SeQ=";
+ sha256 = "sha256-VbAGdMeuIQLzcHwYoPbkC0UjzxXgW4BGlYfz32oHmms=";
};
nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook copyDesktopItems ];
diff --git a/pkgs/applications/misc/pyditz/default.nix b/pkgs/applications/misc/pyditz/default.nix
deleted file mode 100644
index 9fda9dee0949..000000000000
--- a/pkgs/applications/misc/pyditz/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, pythonPackages, fetchPypi }:
-
-with pythonPackages;
-
-buildPythonApplication rec {
- pname = "pyditz";
- version = "0.11";
-
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-2gNlrpBk4wxKJ1JvsNeoAv2lyGUc2mmQ0Xvn7eiaJVE=";
- };
- nativeBuildInputs = [ setuptools-scm ];
- propagatedBuildInputs = [ pyyaml six jinja2 cerberus ];
-
- nativeCheckInputs = [ unittestCheckHook ];
-
- meta = with lib; {
- homepage = "https://pypi.org/project/pyditz/";
- description = "Drop-in replacement for the Ditz distributed issue tracker";
- maintainers = [ maintainers.ilikeavocadoes ];
- license = licenses.lgpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/misc/therion/default.nix b/pkgs/applications/misc/therion/default.nix
index fbe734ddc1b6..3dd72b9f6829 100644
--- a/pkgs/applications/misc/therion/default.nix
+++ b/pkgs/applications/misc/therion/default.nix
@@ -5,10 +5,9 @@
, pkg-config
, perl
, tcl
-, tcllib
+, tclPackages
, tk
, expat
-, bwidget
, python3
, texliveTeTeX
, survex
@@ -25,7 +24,6 @@
, sqlite
, libtiff
, curl
-, tkimg
}:
stdenv.mkDerivation rec {
@@ -59,7 +57,7 @@ stdenv.mkDerivation rec {
buildInputs = [
expat
- tkimg
+ tclPackages.tkimg
proj
wxGTK32
vtk
@@ -74,8 +72,8 @@ stdenv.mkDerivation rec {
curl
fmt
tcl
- tcllib
- bwidget
+ tclPackages.tcllib
+ tclPackages.bwidget
];
fixupPhase = ''
diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix
index 2e74f2fe3e0b..b706ff58ca46 100644
--- a/pkgs/applications/misc/todoist-electron/default.nix
+++ b/pkgs/applications/misc/todoist-electron/default.nix
@@ -1,10 +1,10 @@
{ lib, appimageTools, fetchurl, asar }: let
pname = "todoist-electron";
- version = "8.10.1";
+ version = "9.8.0";
src = fetchurl {
- url = "https://electron-dl.todoist.com/linux/Todoist-linux-x86_64-${version}.AppImage";
- hash = "sha256-Yp4wfibymHLGlaPDzu2rhSXxanwdXoNpF/d6+S0r+1U=";
+ url = "https://electron-dl.todoist.com/linux/Todoist-linux-${version}-x86_64-latest.AppImage";
+ hash = "sha256-ZuoeeQ7SusRhr5BXBYEWCZ9pjdcWClKoR0mnom1XkPg=";
};
appimageContents = (appimageTools.extract { inherit pname version src; }).overrideAttrs (oA: {
diff --git a/pkgs/applications/misc/tuckr/default.nix b/pkgs/applications/misc/tuckr/default.nix
index 952f79a39325..04a72a8f493b 100644
--- a/pkgs/applications/misc/tuckr/default.nix
+++ b/pkgs/applications/misc/tuckr/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "tuckr";
- version = "0.9.1";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "RaphGL";
repo = "Tuckr";
rev = version;
- hash = "sha256-5KDBtbovs3tPuLNJqHyMM9mGV8cNgJFv3QqAtLVOhns=";
+ hash = "sha256-JxXFz7ijCQktpYrwBA8ajvZj3gRloO/cAOo4wskF70o=";
};
- cargoHash = "sha256-LvvC60CNl/y1rx4UTKVLFeiaJBNpou5JrCdsmZvTccU=";
+ cargoHash = "sha256-mGBsQd3yiwuAH3KHtAsLx0ai3ui2EUaf9SW+czvo9vE=";
doCheck = false; # test result: FAILED. 5 passed; 3 failed;
diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix
index 2392feb8a476..23fa019d75dc 100644
--- a/pkgs/applications/misc/yubioath-flutter/default.nix
+++ b/pkgs/applications/misc/yubioath-flutter/default.nix
@@ -43,21 +43,21 @@ flutter324.buildFlutterApplication rec {
postInstall = ''
# Swap the authenticator-helper symlink with the correct symlink.
- ln -fs "${passthru.helper}/bin/authenticator-helper" "$out/app/helper/authenticator-helper"
+ ln -fs "${passthru.helper}/bin/authenticator-helper" "$out/app/$pname/helper/authenticator-helper"
# Move the icon.
mkdir $out/share/icons
- mv $out/app/linux_support/com.yubico.yubioath.png $out/share/icons
+ mv $out/app/$pname/linux_support/com.yubico.yubioath.png $out/share/icons
# Cleanup.
rm -rf \
- "$out/app/README.adoc" \
- "$out/app/desktop_integration.sh" \
- "$out/app/linux_support" \
+ "$out/app/$pname/README.adoc" \
+ "$out/app/$pname/desktop_integration.sh" \
+ "$out/app/$pname/linux_support" \
$out/bin/* # We will repopulate this directory later.
# Symlink binary.
- ln -sf "$out/app/authenticator" "$out/bin/yubioath-flutter"
+ ln -sf "$out/app/$pname/authenticator" "$out/bin/yubioath-flutter"
# Set the correct path to the binary in desktop file.
substituteInPlace "$out/share/applications/com.yubico.authenticator.desktop" \
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 9e2a0d173ffc..86b09ef7d10f 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -252,14 +252,6 @@ let
# We also need enable_widevine_cdm_component to be false. Unfortunately it isn't exposed as gn
# flag (declare_args) so we simply hardcode it to false.
./patches/widevine-disable-auto-download-allow-bundle.patch
- ] ++ lib.optionals (versionRange "125" "126") [
- # Fix building M125 with ninja 1.12. Not needed for M126+.
- # https://issues.chromium.org/issues/336911498
- # https://chromium-review.googlesource.com/c/chromium/src/+/5487538
- (githubPatch {
- commit = "a976cb05b4024b7a6452d1541378d718cdfe33e6";
- hash = "sha256-K2PSeJAvhGH2/Yp63/4mJ85NyqXqDDkMWY+ptrpgmOI=";
- })
] ++ lib.optionals (versionRange "127" "128") [
# Fix missing chrome/browser/ui/webui_name_variants.h dependency
# and ninja 1.12 compat in M127.
@@ -293,21 +285,14 @@ let
# Chromium reads initial_preferences from its own executable directory
# This patch modifies it to read /etc/chromium/initial_preferences
./patches/chromium-initial-prefs.patch
- ] ++ lib.optionals (versionRange "120" "126") [
- # Partial revert to build M120+ with LLVM 17:
# https://github.com/chromium/chromium/commit/02b6456643700771597c00741937e22068b0f956
# https://github.com/chromium/chromium/commit/69736ffe943ff996d4a88d15eb30103a8c854e29
- ./patches/chromium-120-llvm-17.patch
- ] ++ lib.optionals (chromiumVersionAtLeast "126") [
- # Rebased variant of patch right above to build M126+ with LLVM 17.
+ # Rebased variant of patch to build M126+ with LLVM 17.
# staging-next will bump LLVM to 18, so we will be able to drop this soon.
./patches/chromium-126-llvm-17.patch
- ] ++ lib.optionals (versionRange "121" "126") [
- # M121 is the first version to require the new rust toolchain.
+ ] ++ lib.optionals (versionRange "126" "129") [
# Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61
# allowing us to use our rustc and our clang.
- ./patches/chromium-121-rust.patch
- ] ++ lib.optionals (versionRange "126" "129") [
# Rebased variant of patch right above to build M126+ with our rust and our clang.
./patches/chromium-126-rust.patch
] ++ lib.optionals (chromiumVersionAtLeast "129") [
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-120-llvm-17.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-120-llvm-17.patch
deleted file mode 100644
index 921ffe451139..000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/chromium-120-llvm-17.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index de1cd6e..bb5700b 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -616,24 +616,6 @@ config("compiler") {
- }
- }
-
-- # TODO(crbug.com/1488374): This causes binary size growth and potentially
-- # other problems.
-- # TODO(crbug.com/1491036): This isn't supported by Cronet's mainline llvm version.
-- if (default_toolchain != "//build/toolchain/cros:target" &&
-- !llvm_android_mainline) {
-- cflags += [
-- "-mllvm",
-- "-split-threshold-for-reg-with-hint=0",
-- ]
-- if (use_thin_lto && is_a_target_toolchain) {
-- if (is_win) {
-- ldflags += [ "-mllvm:-split-threshold-for-reg-with-hint=0" ]
-- } else {
-- ldflags += [ "-Wl,-mllvm,-split-threshold-for-reg-with-hint=0" ]
-- }
-- }
-- }
--
- # TODO(crbug.com/1235145): Investigate why/if this should be needed.
- if (is_win) {
- cflags += [ "/clang:-ffp-contract=off" ]
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-121-rust.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-121-rust.patch
deleted file mode 100644
index b5292c80858b..000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/chromium-121-rust.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -1629,16 +1629,6 @@
- configs += [ "//build/config/c++:runtime_library" ]
- }
-
-- # Rust and C++ both provide intrinsics for LLVM to call for math operations. We
-- # want to use the C++ intrinsics, not the ones in the Rust compiler_builtins
-- # library. The Rust symbols are marked as weak, so that they can be replaced by
-- # the C++ symbols. This config ensures the C++ symbols exist and are strong in
-- # order to cause that replacement to occur by explicitly linking in clang's
-- # compiler-rt library.
-- if (is_clang && toolchain_has_rust) {
-- configs += [ "//build/config/clang:compiler_builtins" ]
-- }
--
- # TODO(crbug.com/830987): Come up with a better name for is POSIX + Fuchsia
- # configuration.
- if (is_posix || is_fuchsia) {
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 448a50432448..202375b4867e 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,11 +1,11 @@
{
stable = {
chromedriver = {
- hash_darwin = "sha256-YndBzhUNmn5tJdCqLmpUrs2WBXXpTxiKCNczWEz6DU4=";
+ hash_darwin = "sha256-SZfl93TcaD9j59zGflPFmHgIP5NaS8bgDi3l3SRRFiI=";
hash_darwin_aarch64 =
- "sha256-taG58kMgQUD40aGqnyx9O9e9m4qGsTWX57cjD3NeHm4=";
- hash_linux = "sha256-raWGzhjqWdm5bRK+Z7Qga8QM9kQYSXxdL5N+wk1hlXI=";
- version = "130.0.6723.58";
+ "sha256-wLX63aA8l+23ehdBHPcXtoZ2WEhrmYVKzqUDBbrhSRw=";
+ hash_linux = "sha256-kP6N7fM+7+S3JwT2JvqfWDRCfAQiNc/rQlHxjJ8DNuo=";
+ version = "130.0.6723.69";
};
deps = {
gn = {
@@ -15,8 +15,8 @@
version = "2024-09-09";
};
};
- hash = "sha256-w1xQr+B7ROeCqBRN+M9vmh45YTRqVfjDYSsN5saDuDo=";
- version = "130.0.6723.58";
+ hash = "sha256-k0epbUw9D3Vx7ELNDXIFEnsML+cYvDnHZFOW0kz4Kq8=";
+ version = "130.0.6723.69";
};
ungoogled-chromium = {
deps = {
@@ -27,11 +27,11 @@
version = "2024-09-09";
};
ungoogled-patches = {
- hash = "sha256-M+aJ1hhFV88lBBPl9xBYpYRut7yHa/HJYXoclckaZVM=";
- rev = "130.0.6723.58-1";
+ hash = "sha256-usNlX/ol8Zn3lQTvp311DuyYbSHF/HN0r7k8qeUIJmU=";
+ rev = "130.0.6723.69-1";
};
};
- hash = "sha256-w1xQr+B7ROeCqBRN+M9vmh45YTRqVfjDYSsN5saDuDo=";
- version = "130.0.6723.58";
+ hash = "sha256-k0epbUw9D3Vx7ELNDXIFEnsML+cYvDnHZFOW0kz4Kq8=";
+ version = "130.0.6723.69";
};
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 4a2464681b2c..67efec7ec4c8 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,1035 +1,1035 @@
{
- version = "132.0b9";
+ version = "133.0b1";
sources = [
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ach/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/ach/firefox-133.0b1.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "2bf1ccf753ee0f63de4c99dce1947add6ae443a3a7c016edcc7c2c8db2483e90";
+ sha256 = "50448ed2d2609a0841d6c8b62215a7ca41e504a6221549631ef5fa2609ca54e2";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/af/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/af/firefox-133.0b1.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "7fc7eef2a27e86355628a32c341372a1c9029f25d5791e9f5a5e4a702f4efd0e";
+ sha256 = "c5ed4f79f883a62a3f30efb80b7050075083aa032c5e1639a6a9778becc735b3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/an/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/an/firefox-133.0b1.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "fc5bf48ed17526b860c282070bfc7475516cf8cb3dcca1f5943c239b225254d4";
+ sha256 = "378e0b4bfac32d51e935a73cd8c28ccc78018c677c8704acada353bf9046d10b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ar/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/ar/firefox-133.0b1.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "6e600a4d224af329f98e8898207b97d568aec7086f3dbd3aebf64756818a7bb7";
+ sha256 = "f1c0003a8f7c5428384aa43a0cd51d4953457e64f519770f3962de2c68bb8b47";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ast/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/ast/firefox-133.0b1.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "d2f5adc71fe72f8d17fea11b6d9c0cb32fc787ea91320ecb63d9b47d774954f0";
+ sha256 = "d35b47257a29887af21c3708af489eda87fcad049bb49ecbe8c63ce9bc68a874";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/az/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/az/firefox-133.0b1.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "cf7f020204382c7bdd5134aa436c77aa8c2d97a67cde6875560aced14ed6bc12";
+ sha256 = "e007e7c55258e75f9a631320673e585bb1228a1133e78b8f786954c3eed10400";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/be/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/be/firefox-133.0b1.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "1dbbd2b1b36bdbeb93b4f2702b0567749903adb45161468287b4d0b267c1df5c";
+ sha256 = "503ce419dd33f277c9fec6631bfb58d829a76a0e1e2a1ef84cb18546215d0353";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/bg/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/bg/firefox-133.0b1.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "dddb31bbdd0eb21551ec2f8223cf40d30ab4436b381f9cdaf6011afd85f7464b";
+ sha256 = "0361204369ba150f27da8713d13fc8bccdc71608ff7ff7962e2f141dfab23692";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/bn/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/bn/firefox-133.0b1.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "aeb5cfe60baeecfea03c68d610b0296a76e3481d15c656413a16cb102042d50c";
+ sha256 = "1ec47024fd30ebeb6024551ad3ac509c305c2908878b66683cc5179f1184df78";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/br/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/br/firefox-133.0b1.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "723f991b7c27a6cfdf35e9eb21a36c5b16b3ff5f89d38c31f53dcd81ab03a194";
+ sha256 = "bfb50b57561f6714dce74c9ba239dcf650a778e088887e074a36368c2f922ae3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/bs/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/bs/firefox-133.0b1.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "1fc1a108d18a2c12413fbbeb4f5b4d3a07ae5ba7ab987087bcdea9cbe8477579";
+ sha256 = "873461626019e539130251d10ea8d0bfc28e6e176c972397e8f70715753e521b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ca-valencia/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/ca-valencia/firefox-133.0b1.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "0164347e61ec42124bcd92d9cdda3cafbeff1a1bfc90f471a7a466de8ef81074";
+ sha256 = "5382a0fec2a25ab8a62c6a2ba947cf001db1acbc029dcd2f7b424ff08968bb47";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ca/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/ca/firefox-133.0b1.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "c6951037e07d9c97ab3490d486c1698222ba99e3e6e61bd8d5916172d0538ce0";
+ sha256 = "244c895e03cc8efa832f8b409ccde9358e7dfaee62ff15e63b10981e77b37915";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/cak/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/cak/firefox-133.0b1.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "2ae7d27b0cd4066e9804fc499ded8d0493e6ef93a76a2e705c4208dbaa0748bf";
+ sha256 = "3699b807f1f52e9b2a37721caee90cc4c33a1febcb8b226630c2a8808e81c0e5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/cs/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/cs/firefox-133.0b1.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "d9bffc7e6f9ab2ca00716d5df6cf552034d7c5d12922b71b34d2e8aae2bff994";
+ sha256 = "b82171d35607b22743d3b538d5e4ba8866e80e228815cb861a6edd9d8c8a4364";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/cy/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/cy/firefox-133.0b1.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "792862fb4834aa7b6126400059dc86ab476066683f3197f428d734cdb15dda55";
+ sha256 = "10ef45030aabd785a2a72f7cb23ae68c8c256c96f6e48e75e1570ea7d6f8a49b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/da/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/da/firefox-133.0b1.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "fb08cc0f8e783ec931a2714f362b46327e031ac172613e5cae26d40be3f2b44d";
+ sha256 = "da86b6c9c30e549c41c1656be255c3b6429e2e33111d321ce8b7e07e3dc6a82b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/de/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/de/firefox-133.0b1.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "45cb5a2905fc963269c4c5cc815d4259afaf8d8025bcfe1a19f88e52f5c42ac5";
+ sha256 = "375c7379350c0848cc11a605031a96ad19e23bd594c2cceb3378b3401f13ddef";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/dsb/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/dsb/firefox-133.0b1.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "e9e85f24c36ff6b7e2fb49965a7c4c6210b75f81c42487ad4c918ace9f41c5c5";
+ sha256 = "ca8fe1dfb2e01383068cc2c546e58221088f62af70ffb8758568197336f31f1c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/el/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/el/firefox-133.0b1.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "ff1b1fd800fbac9e27b3af66e0d9c350d42a70256d954b502663d1f482f8cf73";
+ sha256 = "84b024b1a1c514d530e14879e4af86759ddf356c23e955fa1ddb16ba3fd850db";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/en-CA/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/en-CA/firefox-133.0b1.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "70fc2d9c20712adeab3307f951e78d858d936feda102a30d272eff88866c6bea";
+ sha256 = "e890b11c02ce8fbfe296351332f6e49442e899f1d785826287915707c024cdf4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/en-GB/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/en-GB/firefox-133.0b1.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "9bb160c8a19eff6a9b53b2c5bebd1bc10c37dbc3bd15257b1e6f6cf09b71824a";
+ sha256 = "b340584afcbe7c345ddbb803abc5617b164dbf3faf4b24ad04d624434c8bc3a9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/en-US/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/en-US/firefox-133.0b1.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "702b2e7227e8ec775da12f293381e41a22623818a4af51040b71843c07aadf47";
+ sha256 = "e61434729b6c0be2cc1d27b6c1847f54c1b228a49a4480260de1e10ca2a115c2";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/eo/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/eo/firefox-133.0b1.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "7c266f6fe02cd073a7811901d6d2d3f3ed86ddc552d4a06ffd179734235c012b";
+ sha256 = "639920010dc72fea3a4d9ba89acaf89087772c8acbd3251bc50545d3c0c0663e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/es-AR/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/es-AR/firefox-133.0b1.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "6d14f75b49a7fdac8b89283bc017191a1f8dc708223cc68641752d0f84e85835";
+ sha256 = "8370c0935776001f40c362fb3a046f9f42c4882ce234496579d9c642ea9152d6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/es-CL/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/es-CL/firefox-133.0b1.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "18d32f6a1d582d9a4e8e427d0c6269eb744296ca21fb0bd609d4f0c0361c36fa";
+ sha256 = "7b0dbfb8d4122864b56a42f9284c479d344b3e5db68b2ef5022e599c5632cdba";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/es-ES/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/es-ES/firefox-133.0b1.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "55b77f39bbce79dfe835b1d15cc732b4079614251854db47cf6446726213ad7e";
+ sha256 = "53ed736b87998a2ebee7b61a982ac123d93a73efaea9281177f8d4babf62d408";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/es-MX/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/es-MX/firefox-133.0b1.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "5a0cb2c3c93615045ad9cadac0922759958bafb0bf35cbd88155cc3b8a9eb66c";
+ sha256 = "99a52fd510580ec254e1f1601bc7151c54025448e5c8d7be8f549e5ecc430589";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/et/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/et/firefox-133.0b1.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "db06ff41080c04833bf32323fb3602c727f097a05c88a48d69f901bf6be9d9ae";
+ sha256 = "69fedc57603115d563d00c95e033afa773b3c8a034f969d451b45f4154c0045b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/eu/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/eu/firefox-133.0b1.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "beaf66d72bd859d671647361e53ff47f4767b89521c477022387638b57693801";
+ sha256 = "b87c70d5104711e8d0c7e62c754909027da12ee8dfa0385b19e92caf08342363";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/fa/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/fa/firefox-133.0b1.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "07a74c134fddad0bc3d9e248734df32be97ce099c81ae3e301288906cddf8623";
+ sha256 = "a4d87b765977592928ef2e1642306b67aa2f1a09e0045b7e9c9eb69e45f14abe";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ff/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/ff/firefox-133.0b1.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "2a4475d0e18b8817d605c76e153b97703ffdeb1c3ad887820ff16d3d41580ab8";
+ sha256 = "9bd09d1bbf642873e855c28c500edb5f74f1d64ef349869d95b9833287b211a5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/fi/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/fi/firefox-133.0b1.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "e5c0d17e4e701d357601dc65bfdcd26bb805e10c28c9bd2ee252485cb12a175d";
+ sha256 = "24b8b20c21a9670ede8f87fcd17642afe1edf6b695ab0838da33a6100a802b71";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/fr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/fr/firefox-133.0b1.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "489b5823e83899733ad2f94f03205518f55ca8d0fc66799af06c966b48fc528c";
+ sha256 = "44fbfb8e5f7f0bca61767d4abeb6f628d01a2831021f7922cc3986f96b503c1e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/fur/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/fur/firefox-133.0b1.tar.bz2";
locale = "fur";
arch = "linux-x86_64";
- sha256 = "82d702031a08d80143317d816bd51a40e3affaa47d2fd30c46f05d56123c2f24";
+ sha256 = "d0fe7836f8d800f85bf498507db7f27e7eaf62eb230a792afe7a76fdb498351b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/fy-NL/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/fy-NL/firefox-133.0b1.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "86ce2d02d6e38ae4a36ce3543be3335508ca83ea8fce3a0340519ef6fb2d3b9f";
+ sha256 = "7e6b131c289998dfefc2f2596fab16b08637023a5d913e8f04939829bbc56376";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ga-IE/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/ga-IE/firefox-133.0b1.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "c934c385f2b1eb801c6fe5e3a07bb98516133d070124db48d55c00e578b2840c";
+ sha256 = "4afffb7a1a39e5ac64d7f7b7a49932be4de7d9881f7ca57a567d6ba05e9a5dbf";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/gd/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/gd/firefox-133.0b1.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "aee8d3793cc460f138a2bd9c9415e4e10ccdd4d0babb2ca1f9e92999f32702f2";
+ sha256 = "30d6617dcf5f12019c6cf414f756d6aacc12f7f19f86db9a75ad99889bf04552";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/gl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/gl/firefox-133.0b1.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "9cacc88b8b11e9716e927e0710a07d1d1e380a8a0b4c8c4889a57b8bd2b000ad";
+ sha256 = "dd3c29c51e27c03b0c8cc3ea2fe8f1b9dae3e3071271b445780a7dc156d1e2f7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/gn/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/gn/firefox-133.0b1.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "a3bc5062e804d651dd6d630f9b8cc30683b40f02821f08e8ace1f0bec276ca63";
+ sha256 = "94389826ca27e680d64f0fc59c724c46e0e69ff8c8a0eae21119f85abddb96f9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/gu-IN/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/gu-IN/firefox-133.0b1.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "660345a284c5f87176f6b11d3eb58c86ab793021ea0db084f408612812bb1210";
+ sha256 = "d8f2b630f87f6520515bc9d159b7e25cca402af15d41cea48ab67eae6a051617";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/he/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/he/firefox-133.0b1.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "20302195cd105b8ca8a925450a499997ebf9464ba8d0fe0067f92605f0d1ad6c";
+ sha256 = "a6e8f1f0d4c54cfb8e727d5d3bd946c9b3a5bb2cad69b172163935ce1c78738a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/hi-IN/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/hi-IN/firefox-133.0b1.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "fe47c61ee2f11d48d19bbe8402d0d8774ef874e777db84fec934f5224691d923";
+ sha256 = "2ed3531fc473ee1cc65b15fa43c4f1ba540658783f82fec65c5db183cf8cd07f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/hr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/hr/firefox-133.0b1.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "b1d5cb3135a1ede6e77f613e746e06198c98542bcd652e31482426065d7cd43e";
+ sha256 = "787477ab615486e03d927ffd507ec8d6eb251def4d04a2cac008193469c1c363";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/hsb/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/hsb/firefox-133.0b1.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "e66f0200113dcc156301640da227e29f55dbbaf641f40ef0c261a7d4637fb640";
+ sha256 = "5fd92d4cba6a49d33da232142e13c0e2fa2e18e9af0c65bec0861492d4ba8eba";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/hu/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/hu/firefox-133.0b1.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "d2a9db19180b7e25a30065cf463a1dca4597d9126ffbfaee4d439579a83fd66a";
+ sha256 = "2167946c22a0b2f5ed75b688a459ae546af94dae0476696d73aa8cc855910c79";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/hy-AM/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/hy-AM/firefox-133.0b1.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "14c10fa0999330ade75cc7263de98af35b5f2e1717d7ab8ee7399ea2b7f50290";
+ sha256 = "bbc96bc325ba376d77b815e9333109c77cca2b0ba2474fa9f9d65036f45db910";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ia/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/ia/firefox-133.0b1.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "ee3ebba089bdabcbedba1f467dff81b7202c6d0dcaa606fc2969c978c1b3598b";
+ sha256 = "ef9b7189581ee86aa6e0460f2053de2803c4c61ca06c09108be1b0291c6553c9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/id/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/id/firefox-133.0b1.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "747d5f79b521227b64a11766e86c0691e314ebbc33ae72a3033c125db475667f";
+ sha256 = "022a2eccf865a4328d2a920869c517d511bd5c08c7e045173a1f6308d3acedf7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/is/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/is/firefox-133.0b1.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "d4f69a8199424828c31df016ee36b54f7d1eb0bb2226ba527826ef84ab5d626e";
+ sha256 = "9b0f6a68004c0a11f8334cbf0777ebd511549b299be13bd2ef20ff83197711e5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/it/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/it/firefox-133.0b1.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "8764267032aef6eb4353587c79e3d309581b8430c0fdbe221b55c3da0dc91e66";
+ sha256 = "2671078d2d571fa3bdabc49d45e2329efbe6fe42edf0cedf2b777aa8254c2772";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ja/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/ja/firefox-133.0b1.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "13e5b0a94146880224fc2a7287aaf82535fde1842d3da323fd515706d60e9502";
+ sha256 = "d612720ee038553bf4c3be6810f21d6a3951e623f74bdde651473823472d7ac3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ka/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/ka/firefox-133.0b1.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "ae47af49caa90b98d8e400c49f1a48c4abf0186c142d3cf6b9be4d87415950b2";
+ sha256 = "55f2b736e30d0fdb0e16ecb05249c260f5a68d2a20b03c68aeb840a3f20f9b79";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/kab/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/kab/firefox-133.0b1.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "f1b3ed5ee5271208e4bfe3c4a5a08a79e4e8f0a36b2b59d041de805381f293d6";
+ sha256 = "8e514dc4473400709258508f1fa1e6c2dddc902b86abe7c1810d0dab5924f95a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/kk/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/kk/firefox-133.0b1.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "bb9e9e2c6c9d7a7a4d4a97b1553df76283a973936cb5b728b48de1593bd7f03d";
+ sha256 = "5fc2dce212ee8b9508740b554dbfaf3ba2a5a854231c17454d96747d2fa84338";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/km/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/km/firefox-133.0b1.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "b218e8b43eae13aca4c8f0756af5b1945a566eb414c40c412d7c451f32faf632";
+ sha256 = "0e0f13a075248b808dbb16197f1e93f5898e6f1dc9688fb6ac8426e71509569d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/kn/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/kn/firefox-133.0b1.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "d17b594fcdc6b7c31b89cecc2f5ce17ef8205589cf2d04b31faead6f05f35918";
+ sha256 = "ddfecc815566ba87cbfbba5162ccb20f758a488b7c1114e572ad7cf24c36eef7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ko/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/ko/firefox-133.0b1.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "07125d837dfa9934df26f6a55ab210471b24407b22905b241652ebeac4600c17";
+ sha256 = "fcba8ea312b07119ca149e63d6b78e1ceddf52053d9252409c19f864eddf08c1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/lij/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/lij/firefox-133.0b1.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "4c3494d7751926a2ee7f04dc037193cd81a3f7886f074a23315e34bd6bb63943";
+ sha256 = "b077f8cbe8824eb4fa92b3a930d44bfeef8257acb7189c6a9381daf4ada91e0c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/lt/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/lt/firefox-133.0b1.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "3140355fe1abf44aeee01bf6ac46756580fac82a222b1443046b33af8ff16427";
+ sha256 = "a87627bd369312c7dbe85c31ada2f3d76b16817a27685180ea27c0af98cfe58c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/lv/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/lv/firefox-133.0b1.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "7953ceaa9abe716a52b7f5831fe50fdb7f31507ea8fa64a6e834f08562807f73";
+ sha256 = "842e08c821b0ac1772f295863bb5d8e5bbb63525d2d165cb0d9bd66fbd182504";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/mk/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/mk/firefox-133.0b1.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "570aa3350c57f763e2686784dfc0927f01e402442de11a47001d2b673e818848";
+ sha256 = "b80b4262d93897ec29d549c51285d883dd86a3e9b7d5a5de8141655474b8180f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/mr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/mr/firefox-133.0b1.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "562e69a74017ff55c0961b9e73d8d4b45f4aa10c684dacc7b3049d7f3609b1f6";
+ sha256 = "7919cf35cc96fc2d8b8b0c61f48e335767070a0a40533702823ec225ea7f50bc";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ms/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/ms/firefox-133.0b1.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "7982e8b10ce2003b95c037c02d8a068d0eea8627bb2c41880fe60f8c796736e3";
+ sha256 = "de139e9ff4ffba4f44414821ca65fd772455d456a21a482d81c330b535c4298e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/my/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/my/firefox-133.0b1.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "b9c8a73add36261e9a557fa88b8c7f4d8c2f8c6c109c1e953aaca1b0bb88ab1a";
+ sha256 = "3d01209d755f4a38cdc9ea40401e096a49b4434433310ac24964cd9be5ab9b9f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/nb-NO/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/nb-NO/firefox-133.0b1.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "4e23ee1cce05d76b63ff3fe2013dda86159caf0bdbb9df0dc9fadd4b5b027523";
+ sha256 = "15dc7c1a07b784d962cf2aa1167d27b9cb94cee06c4236beab8144982d8357a8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ne-NP/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/ne-NP/firefox-133.0b1.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "0c8b73bb4b93937ee720f83eaac9ef4b0830535ccc3291212196618b37d60edb";
+ sha256 = "a537ee68316dd4c15f86c16b8324e727b6de28904fd4e3cc043bce2a4f4eb79e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/nl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/nl/firefox-133.0b1.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "84f219c7f0e59483f70ce45758b7a11687eaa1fc2e5359e66d01ccab2dc02ce8";
+ sha256 = "95993042cd0393f8a643876304379647e2b51cdefa64757a3b15ecadddc89230";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/nn-NO/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/nn-NO/firefox-133.0b1.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "cf923abb277ac84d493b49e3e0e82741a306291b5ccb38ec7a904c9a5d6d495c";
+ sha256 = "d44246d980cbb6ada3165ec0a1ccc860598bb248523547879d6736db905ac83e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/oc/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/oc/firefox-133.0b1.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "da9da781dee20e4b1ea5cc07473db80e64119a250e98ec36858f182c7c387ddf";
+ sha256 = "9827de2d8793b8e85e0f867f1d0ebf0f76cc69a141d4d35d9007136f73b16228";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/pa-IN/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/pa-IN/firefox-133.0b1.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "873ed71616863ff86bb5634e452efaed4c0ac876127e36274bf8f74417c37fae";
+ sha256 = "6c37fb86b03b1f980248d76f26c082dcd9ca89bd82cefcb51de4e3a226205f60";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/pl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/pl/firefox-133.0b1.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "b33edf7736e12a74514f448caa3018c0c5b6eb6ee7c942049e3a6c8ea10968ab";
+ sha256 = "c64d5c7a14c73b84419185fe58b4f78c8654d222c45b5028f2ef5bbb7c3e2643";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/pt-BR/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/pt-BR/firefox-133.0b1.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "e9ed9d73bbdffc132e8af99d347f45e6172cacdceacde990c1acae09adfbc47f";
+ sha256 = "e6e6374f212a940e7a56908879d0f6773180f71fe7f8b1e622c9bb433cc7d9de";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/pt-PT/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/pt-PT/firefox-133.0b1.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "21dea9ab323d83353cde05d982c16266e04a3d006338b81120408612d452d03a";
+ sha256 = "605430b0d8a7229a5b4420e552ab038fccf7d5ead27a7a0d387913f532598320";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/rm/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/rm/firefox-133.0b1.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "bb55efb232b0991ca144c9a8b9d1c627c2ee1d52af5f02c551e5f130d5c8db33";
+ sha256 = "d97b1a796551d8163765223c7fac57411380edc32aee2ad12f3ed579825dd345";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ro/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/ro/firefox-133.0b1.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "8f98c37308f9a0e8187bd39a8f8ce2b95cdf560d66186ae593bd4f340334fd88";
+ sha256 = "71e0fa050591874de0e1bf4d2752446df2a846a5fe95209e438fa3d0eee13a8c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ru/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/ru/firefox-133.0b1.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "19e2225b259e7c924355f17427e6ec0fe44b3240ffe407d7e9afd058c4392bae";
+ sha256 = "1f27705b2c3e2ea878da44ebb68cc73f7eeaf8e02bd1f4ece132955decd2c110";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sat/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/sat/firefox-133.0b1.tar.bz2";
locale = "sat";
arch = "linux-x86_64";
- sha256 = "7403024526b6fac55a5fcb9b955ba263f7687905fc05c799ac7ba2238f61334b";
+ sha256 = "9b6a47848477d040685ff91ee7f1f35aabb3f5c935917d60f08e361555ba44d3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sc/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/sc/firefox-133.0b1.tar.bz2";
locale = "sc";
arch = "linux-x86_64";
- sha256 = "a5c914708663bc93198bc5f02ff69c38276f330f8361ce05693d2e1b2eff4f44";
+ sha256 = "aa69aa3a288d014d977d6dff4a53c588ae9ae86fa3290673812a0ba0bb7ada1d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sco/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/sco/firefox-133.0b1.tar.bz2";
locale = "sco";
arch = "linux-x86_64";
- sha256 = "5a3fef5ec53b1a1df4945be65f276bfbc6581a8b75f7be59de5ff1f4466816b0";
+ sha256 = "eccb4f79103dab67627527a3d2be9333b69a3ebfc03eb63dbcbeb5abb21b8c61";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/si/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/si/firefox-133.0b1.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "5910de36de93d6c882f0f09335cac6ea114552f0d71bf1a02c333d1c47ca8ca7";
+ sha256 = "9102d3ce0a9a30d5109f08021bafee4f3a4aedab1c0d9e423e52c47bd256ee6c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sk/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/sk/firefox-133.0b1.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "b3d3682fbe7a7bb3b3fd469ce02746522d170b82674f318b43271452e6f1f83b";
+ sha256 = "b7a0e4112ebd1c4e4ddd81c3943de13c3e926f3a6fa4cb11abb33c1ef73852a6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/skr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/skr/firefox-133.0b1.tar.bz2";
locale = "skr";
arch = "linux-x86_64";
- sha256 = "9561167751a7a92881f9e9b165e0e1868fa42f4a148cf87c4b0d83ae750b026d";
+ sha256 = "03f732acfb00e350c26248647a697aab984ea05b447413a7af8fc8355a0a817b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/sl/firefox-133.0b1.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "f63dd87205f973a5c195fed943e1a8117f80239f4bb4811a6ef45be136a43426";
+ sha256 = "f2c4ef9b7dd8b589a006d7a77a4688ce603276538a1f8c65dc071a08ffc31490";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/son/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/son/firefox-133.0b1.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "15b0ca1537a31935ac1810db22b5b8796c21928bb1e8559726831727e1ae1509";
+ sha256 = "6aee6c3a44377811ab3533c69458595b38bf2041cd3decdefe974d3e56d0d65f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sq/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/sq/firefox-133.0b1.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "03af525e5b94adad4f490bc47948655dce0284d2334e0d8d65b06fb329318bd3";
+ sha256 = "5055e767d872e3755e825dbecd67aab87bcecdf7001df89ffac27ea28e0ffcbc";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/sr/firefox-133.0b1.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "7f90b364b0f06e31922e3bd740bd326b17afd6e9a79b483ad52ef9ea0704892b";
+ sha256 = "d3c30d640c876f5f196cbb1d00e8b0be5dca892fa801d421ed9b60c4910fa679";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/sv-SE/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/sv-SE/firefox-133.0b1.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "a9c31aa43d793c1e07ace4c5a1896684174e329c9cc6c8812cca71a7e9b6c1b2";
+ sha256 = "3cd3e3f1dc62b7a02fdcc7aa5ac05b5c2e084fbade2ba740701ca130fe858739";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/szl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/szl/firefox-133.0b1.tar.bz2";
locale = "szl";
arch = "linux-x86_64";
- sha256 = "edbfcd159eed4e4925b159803e9832b7d9c455aff69a2be74fb64bf04f2a34a2";
+ sha256 = "d696267fd9d029bb65e874eb26a1a86503e0933ac41c706b548125c13f1f5db2";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ta/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/ta/firefox-133.0b1.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "46f12f7b489cab1870711e73528b5fc5275c77e3a6d9c1c5a9bd93b4b8d116fd";
+ sha256 = "38cdf5c90bcaad190fcd41074a3336e02fbcb855d3b191c13e5ea4a54ba8ffd9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/te/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/te/firefox-133.0b1.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "dbf2a01daeb6c79902f77e17ecd120c57910cd4f9a72265ef6b5b98dd87b7f93";
+ sha256 = "d1b3d458ac0b194f3b12647e1898b0527535b905080f7c52ba1643ae7a6cf2c1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/tg/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/tg/firefox-133.0b1.tar.bz2";
locale = "tg";
arch = "linux-x86_64";
- sha256 = "490fe02bfb5a1c07d59a6e426a47b19f9757e5cae7d571c4ee44e5883759ad18";
+ sha256 = "f08e3ed2a5765db74b5b3e7d224bb52a070944daca7c9f437d686e0f7a1ae2cc";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/th/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/th/firefox-133.0b1.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "60c8f3e6ab1310899e71a05537b1fa58768835de80cc23b6f35bdf1ef639d0ca";
+ sha256 = "f1cfee29d2409fbf652ee39499a6b6988021ca678ea4138abb26c188abb4eab6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/tl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/tl/firefox-133.0b1.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "71281fced8f188e9ae6ca062468c5394a1e48448962646a8c09e0227d284db01";
+ sha256 = "0c3b0b677bbdf3bf79e67ffe99b132d1e7c8ef9395b0676e13490e598285d7c5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/tr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/tr/firefox-133.0b1.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "9929c7799792edbb2646cf09f953ae9252fcda5eccffdeb156e35e166ea68a59";
+ sha256 = "0337f94ba4df765506cd7b08fa7792d2be775efb39a12c1c07e5f48678383ee0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/trs/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/trs/firefox-133.0b1.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "f5ff3492dc8fe6f7afa85fcbdd92cf8ada3adac59b72e41ebd61d666dd00cc03";
+ sha256 = "5688e9396124ac21ae148b780c29fdf776777aee3bbca4d28d00634735eec1d9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/uk/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/uk/firefox-133.0b1.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "0701dbaddd0d9ec72680fc1104487f2635a518b6ae6fd14f2ab113ca62c8e733";
+ sha256 = "a15d2f9fa783f2a6091d966abbb615018188e18b44d9997e689d63e811a17c64";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/ur/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/ur/firefox-133.0b1.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "337962a7518ac5d69c694aaff30b6d59e7597b298d60ae19a5cb14a3753d9426";
+ sha256 = "b42c6dc40370c54b620eb0c92e9cd014f6607bb74aaa29ef8da568fec3aa9fc2";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/uz/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/uz/firefox-133.0b1.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "74fa5b76b72495eb864d78cb02c06fdf2fcf92f2e73d1baf01c1ca555ebd947f";
+ sha256 = "fd216087dbe0257a39fb158076e744b03385762c68bd00ed1477971c11d1a576";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/vi/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/vi/firefox-133.0b1.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "eab1a95b5d91bdbdec164c6732be726ecc017fda3b353d4ad622a70ec9f83619";
+ sha256 = "8ed6cdde05e52a90da8231294a60736579156f0c9ad784456af89cdf9208e87d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/xh/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/xh/firefox-133.0b1.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "e27e70b708c64b05b6ebdb68f38a95d3e06264c56fe3d749fb603473eeb12626";
+ sha256 = "d3f93516d94aef973ec8b0330351334fe31c2838e7e509412ac55e898637a5d8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/zh-CN/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/zh-CN/firefox-133.0b1.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "3976fe366481f3dce7a3f42fbd49925e7988de58a869d0d96bfe7c61cc27b4b6";
+ sha256 = "0a05de090a9ad2f7b780ccc0eff7090f1e15fbcb979948c811c7409189ac926b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-x86_64/zh-TW/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-x86_64/zh-TW/firefox-133.0b1.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "f8cd9cae21b27fea5bd04b6a54ee1152d729bc525a565fb97083039ee1244888";
+ sha256 = "697e6543caeafb2d76f6131d9c0ac986dbd8899ac8efe1c4f028d17a795db340";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ach/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/ach/firefox-133.0b1.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "189c4cf298bc5b3b21bf5ae0ee2b14d8a5bcf998fd79c27a943b6a146402c2dc";
+ sha256 = "7f18d5c086ed1fe03523a34e8d9340bcf7ddca1b8afd2913e07fe7ffd642f436";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/af/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/af/firefox-133.0b1.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "d125ed28dc6fd22bfbfd98654f0e2dba72fe54849191ebbb6cb315ee36b68e8e";
+ sha256 = "3e318f7f5363a6e7bc93b7b08e230fa67ec85bab03c9f04117f9f4e31b407c94";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/an/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/an/firefox-133.0b1.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "1e9f50533c2da8db6e802b1941a2ceccf58cfb38be1b139a04ac559e0195e9b3";
+ sha256 = "988b11cf22b7c3d9e31798ac7d93dfbc84406f09ac910edfa63358645d3c4cee";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ar/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/ar/firefox-133.0b1.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "62cf1879e3d009224cb9170bab531a8972aa897ac4707f6b343ec1d1e946df6c";
+ sha256 = "86e6cfdad96a1c96d92f3944e2e1437f5b738f123df34e65029542340fb43a7a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ast/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/ast/firefox-133.0b1.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "c58bedfb24b1b0be407abdaba951d0d4da01213d28c16edd34a84518e25c9d0c";
+ sha256 = "58af0d97d79eb6a4de810f5cef8139253c996ef73cc06e192bfa6d1462ff5059";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/az/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/az/firefox-133.0b1.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "a3a7aef57ea6292ebf8d571cfeae66b11904ce2f2da8e36d27ce0c37c5c76230";
+ sha256 = "e087d0d566b32adce5297b9eb5c5ebda1306ef0b42da168e1072a1f2a7d11382";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/be/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/be/firefox-133.0b1.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "5d8ee5fe352cc927d4afb25f961beb104e1ad9877935688c963abe9e0722878d";
+ sha256 = "688de59652784df74dd4176f7219c79a5b140f5810c4907f4c4341193b0ab27a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/bg/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/bg/firefox-133.0b1.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "148be65e21de5278a4cf1421b738f3565411a6a579814b44dc092dacf0c9535b";
+ sha256 = "f23759a72cb2bf677a5a3053d382f7edfdaa94b150dfb60b0b91838b4b5ef5f7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/bn/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/bn/firefox-133.0b1.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "b98edc55987560c4a688b15a0a069a9a7b74d06f42fd0b2d508955ec34feb256";
+ sha256 = "fad13067f119fdb36bf0541a5b63cc9f169e2373626a78000f7b809925b8a5b4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/br/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/br/firefox-133.0b1.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "aa16a1285b84b6fef8e82fd080ee08e40a2b388f4a09fbbd7036ce0dafb554a8";
+ sha256 = "fc0033628a9f1ae525de968539a9d9dc747544481827ed24e574918582d438be";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/bs/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/bs/firefox-133.0b1.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "099175325b5179d10569a223bc6a35688199d0f768975fb96d6eda90be270e4a";
+ sha256 = "8d41e7ee01666bea91b266b252ba867a16255b8ee00afdc675cd4d1f06255dc7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ca-valencia/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/ca-valencia/firefox-133.0b1.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "d00fdac2c05496cc882afb6a8de72f7a3a72b03748893d246cd46582395cc294";
+ sha256 = "f55c87ba57ac4e6af893b17f8a2f984b3171aac356af222966a3f4e4c3423dc3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ca/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/ca/firefox-133.0b1.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "012d9ae56fac6fe05d4260bc3082b7756723eb1c391cce30823641efd5cf29b7";
+ sha256 = "e05b05f9dd862e5de8e6f445161d87f66f8f63f1c1d3a5db2aa87215f4a03a2f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/cak/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/cak/firefox-133.0b1.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "99f7572cf452dee212a016bf401fdaff745ef788351a55e98962e25bd6e6f6e6";
+ sha256 = "9a5daf206e1181251945dae3c69b1b94b55f59c99bf6e017d787ec12dbfcc349";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/cs/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/cs/firefox-133.0b1.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "e860e3d87d8973abdff51ed867b3d760a7b6308c6c0f83b117200217617e076e";
+ sha256 = "3259af4cd10f76d549a71cb9f4cbce65aac2b2299c108739345b8376dcbccd84";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/cy/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/cy/firefox-133.0b1.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "277685c88c1d7a07a70b09c91254b788bd2c5faf9ae1880b91e9245535c46644";
+ sha256 = "58d542a098b79eceb8d639d9dc9ad5dbe75de2def470647be9ad442b4786d2de";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/da/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/da/firefox-133.0b1.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "dda987d22ccd29156a66bfc72b156213f033d73e066fbb7b0f8c19d1d4ed7e93";
+ sha256 = "aa50d2c77be5a937791978afded32118338f560ad89586120c9edb86aba24f36";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/de/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/de/firefox-133.0b1.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "826de1a5bfd119b8531ca985767626ac8f2f485e71a597b4d0ba847fe335d6a3";
+ sha256 = "f220a33a33a4ab6867c7d9c6c9a1c9373e903d8f83064395f84cf99a383c8d45";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/dsb/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/dsb/firefox-133.0b1.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "9899a41d404f19bede698ac516f4c3a43fa0b5117952c57696ff4908ede3eb5b";
+ sha256 = "d8c8409168e04fdf27e26c37d37703298f6b5345e57e0083587970235156c80f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/el/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/el/firefox-133.0b1.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "468a23fcb99b47e6fc6080fb8fbaf252f33d193a029f78f084522cf3a32de594";
+ sha256 = "4368360681a7133581074471e9a10e8feddc8651a36ee6c3ccabdacb77231bda";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/en-CA/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/en-CA/firefox-133.0b1.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "594340e9073e059d56d659adc54a19722d563f3e63774a46cc5c3d1a194c75ca";
+ sha256 = "c8ac00271761d3bc72b1b19b07cd12fbb64a3aaa153b4874234d56bf0bd87645";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/en-GB/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/en-GB/firefox-133.0b1.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "4d1dc94a96f133092055fe621b839516d8f54c02ed6b47107b0459d8412fa3eb";
+ sha256 = "78dba72aeab7574e74dff833fa79afd82ab429a4b82e7835da1d108ac4df92ba";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/en-US/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/en-US/firefox-133.0b1.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "ffa00c617bd97ec8ecd11167084afa986eff02c1d45501e89f0a44364196acdf";
+ sha256 = "30d917eeb1301bf11dc93f62c411c1497b5bee451042cad2811ddb5bcf1d755e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/eo/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/eo/firefox-133.0b1.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "9749a159e16630fcf885adb5ae54bd12a0cf03f4b628eded68636ce85690fecb";
+ sha256 = "bdfc8609fb28b1ec4afd29964abecd5dc5950203c71b3bb10918c99f6f35e846";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/es-AR/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/es-AR/firefox-133.0b1.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "703bf9158f3591f4b64899e1720dc62a8b007f4c1dd3d7c79f45ddfde696ee21";
+ sha256 = "0400471d55c5081777cebbb54023b9659ef2ce0df164621a9c7f2e1dcbdba603";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/es-CL/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/es-CL/firefox-133.0b1.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "47be86544f11e1e6eb21b611e7f8517d0b7bdab6d2d36fe082c47a6e933468b5";
+ sha256 = "45443e593fa446b0755f04743c3cd2b709f4b018430da8f584c4154cb254d00e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/es-ES/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/es-ES/firefox-133.0b1.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "362f3e884232c66d071747c3c024befafa04dc8e692540a1ea7c652145a7bce9";
+ sha256 = "dda52ef8312201f71d5194bcb0f1114a049c05f4e9c2c8c439986f346bad6417";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/es-MX/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/es-MX/firefox-133.0b1.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "1c464e95bfcb23a36200d36869efb17c13af2024f4eaf6b698eec3659490579b";
+ sha256 = "94095d2d0c20f8ff78b8213103a7d3d9523e0298d0a64b9fc10721bdef152f49";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/et/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/et/firefox-133.0b1.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "caedb1c032b56a89f96429d1f4be58abf9b70dfa0f1eb18aa2a9e3ae8d04cbcf";
+ sha256 = "e17b53c77a171f5776b446f7a52b7a978ad997d1978c8d1571627deaf854efca";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/eu/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/eu/firefox-133.0b1.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "a7c1427c61d676b4984bd6cf946125f7ea9f95150a0e44214a014c2a40e84925";
+ sha256 = "5d8bf76c6e97b66603cc9ccac0a824185df8d9868fb9d0a9b675e645aac7bfe3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/fa/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/fa/firefox-133.0b1.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "2aeceb6dc9b404a95dc11a36975ac8cd2d79e4ee8bdb67299a84fe102b436f74";
+ sha256 = "861a3bfd88e5bd1a772b32f7adaf042a786904db447ce5df51c2c8047fa2a9b3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ff/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/ff/firefox-133.0b1.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "fb6ff671b9ad5c188e44e817d7c52407ce53f21a589b3c4a2bebe2e3a5cfc2d7";
+ sha256 = "942487b81a3d8dce80abc275e43a424789e6cded330e61b5064c02c2b7b306a4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/fi/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/fi/firefox-133.0b1.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "c17b7a357e2fc51b826317201c3d8e8dc7625db213e5c67baa80a4c9528d1b76";
+ sha256 = "33343887932265471c5534fe0e5489fca6aec5fde616cead133a100ecf23e8cc";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/fr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/fr/firefox-133.0b1.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "de91b909c0eb79f0997c6ec6a5b9c44f0bb029ca0b10dd347ce3119bea20540b";
+ sha256 = "e3d091a0dbfbca033ca902a2f12815b58c96ee9f3d238a0280c7e150b706d07d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/fur/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/fur/firefox-133.0b1.tar.bz2";
locale = "fur";
arch = "linux-i686";
- sha256 = "d73b50eb034ca034a2059b5e5d998c4e0358f8eaab3a7ace0f8242d3a3824493";
+ sha256 = "09375830635c690f881183a3166e34342b0b9b261bbd43470c08c8f1c690d86a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/fy-NL/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/fy-NL/firefox-133.0b1.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "b75dec3610e738b172202c689b7bdf11e3e71761caa765f89559679472fb91f2";
+ sha256 = "61cb1d2c89fe5223e530b43cb1331a40635a6aa00ef87a2a9670c713c45211c4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ga-IE/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/ga-IE/firefox-133.0b1.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "fa95c04156d2763f213018dce25f0dafe226a1fb11a9c7b238e206f0169f6747";
+ sha256 = "4ba4677e162f132cc8e5fc1ca779a7f01d19b37babad8484ffcd2418251016c5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/gd/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/gd/firefox-133.0b1.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "41d7f8a03bd0d93fc8372a2688d7b797cdbb0147815a5923b0e420a65d1863f4";
+ sha256 = "d0244ed996e4cf834230b67fbb3ac7af4b30a815b1693eae9d796fd3b8e6c793";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/gl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/gl/firefox-133.0b1.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "6662d829a07d6c327c954f86b7c174398d39061e10336f217a805df4680c2b62";
+ sha256 = "a3b93dd6ca0e5fcc583f2f7b8d64ea4e97e9cf5346b67748a59ca43174e8af8a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/gn/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/gn/firefox-133.0b1.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "6a382d9f1aa39061b7ca1977a907791a044b9e4adb7d0058bd6602b450168348";
+ sha256 = "3fb699ff47f7a5f738d76a03826df256de57d26291d7ab10c9841b3433713dc0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/gu-IN/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/gu-IN/firefox-133.0b1.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "546e832b5578beb46cbb53fad43fb15abede650370edd122952e8652fb5042f8";
+ sha256 = "a0570f2541068f1629da36b1109ce30583c74ec569a5eb65530abf54bbff9244";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/he/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/he/firefox-133.0b1.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "a74e231ae7f554278b74a59e58d56beb5f4cd6d9d6aec30f27c2a47f42868237";
+ sha256 = "c6da5998acecb8c516b4bc8d2e3f951af4a4ab9d6e3ecceea031eb87dcb4a21d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/hi-IN/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/hi-IN/firefox-133.0b1.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "cdadb68af57477315bee3015115fa550ae1f3479a5b067987f67a0d6ab7cbc10";
+ sha256 = "1e4253cc6b5d3ace381785f0d083d7621c0f291ce40c27bc599f9306c4667600";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/hr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/hr/firefox-133.0b1.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "725af00249d030946d635f0c5841e947f574bacd8cd63cc51b41970424f46d65";
+ sha256 = "a9cdcc64df339f86e32b979b1bf1aa5619636fab18e33eb50efd5120435b21c2";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/hsb/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/hsb/firefox-133.0b1.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "64ecb93a0d0869279b6d048f84907ed8cc97fc3460444835cfe6241ff6d4499d";
+ sha256 = "ec067c17a0b6b9b3263c711b90ec7f7dac671e503af1184ed8d99cbbd21f7910";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/hu/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/hu/firefox-133.0b1.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "93d0c1b9d29c9c1f2538b9ea6f7138f9155432fef3963fe2f0a888947a956415";
+ sha256 = "4d09a5a702a6e5b62f415943e76763117e0eb371aa768aaeee5faa4144058251";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/hy-AM/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/hy-AM/firefox-133.0b1.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "4f126a761ecb8cf90b159085afb90752f516a0fa17018364b3bd74246c13c748";
+ sha256 = "e775c1b59727806b4bbfd173f0eb3950addd49a9a717c4965101e44680c100ac";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ia/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/ia/firefox-133.0b1.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "36d7b19594b12622aed7a246b4478fdeae82edc387bd61c613f969e09a9c9448";
+ sha256 = "76adfa65a41dd896ffb9428067870e22cdeab06fce31192832f3b11381af9f81";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/id/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/id/firefox-133.0b1.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "377f87e02358e496f3f8652f7343b4d5a2b41b2a0a62a2cb4150bb87eecd2605";
+ sha256 = "13e012afb40a5e7cfd38e33661262b541f29bf4176b6cf3099cb6861341915fd";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/is/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/is/firefox-133.0b1.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "42b9973e2453635f609d08f2fa61d4201db1d0ed220d536f7b07ecd62a8e89ff";
+ sha256 = "0f41f77c9c1e9580f06aa241b3a74d48397fcb7630be5d014b457215d9f6cc1c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/it/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/it/firefox-133.0b1.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "a2a3615fe3ff217e01b0624081c2c4a331977b5bd827762db42d5dc7aa29473b";
+ sha256 = "198bb9cee335e143618c928090e2a408d1ef8fe2db2121375f193b953338caea";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ja/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/ja/firefox-133.0b1.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "85b5013dc94f8fddd96c65d33cf358e00be0af5edc3ca7e2f5488c18f0306203";
+ sha256 = "c455dccdeb4ac6bb0ba1701bae132d3a87f4858f6e262351bf3271e7dee6cf0b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ka/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/ka/firefox-133.0b1.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "f93a665c7e6ca686aec843e4d2c25e88adfe44acd549923b0423851ca727203a";
+ sha256 = "09072e1f22e9500fa02b826c3c7759770f8168f438a360d27f936fd14bc0f02e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/kab/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/kab/firefox-133.0b1.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "1d614936fd91b53718a8f538bbc3728245f2ca57cfb59b476468a9181ffd5868";
+ sha256 = "d674c73bbd646d8bbec6e5bebafea668981a4bc31a6dabc0981e95b26d72fdfc";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/kk/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/kk/firefox-133.0b1.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "894752608f06b01a105c480e6a884a08eb8d5519d5d4eb95c906aeb76bf3aa39";
+ sha256 = "8276cef19708573dc129d6577a1f631ee21f1212f5165b8bac50bc292085da85";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/km/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/km/firefox-133.0b1.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "91ee3ed34cf51fe0f21533ce85c9df8af6a811a2128b27897869a8b166ecd7be";
+ sha256 = "3ab5f08c65c7fbf705cbefe50a6a1cb357641185ca441a1bf5fe9f78d6c623ed";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/kn/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/kn/firefox-133.0b1.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "a9dcc8548d786319bb0158ac8002b9afbfaeeafbbd0f727ef481d3769e11745f";
+ sha256 = "60c1b2a02ad9cb6432af6bce260f29ef1dac4354b1fe8835dd6e256887c15dd3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ko/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/ko/firefox-133.0b1.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "261dd39b2d29f35b517fea14ca1c1859166a9ab9350b051e61b0f87b6471f8e5";
+ sha256 = "043f27cdb78b05d1e9505badcfc5411fb6dd2ed59ef321df997baa2e505616d4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/lij/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/lij/firefox-133.0b1.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "c3d034674c804e21e05fd3a928f237fc311bd29c741f1762e59e8f335de7587d";
+ sha256 = "67918a8728577f701c151ac6aef17ca9fb2a99808de5c3de8b8ca68d78122c5b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/lt/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/lt/firefox-133.0b1.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "5d4cd4689ffc4679eb6bdea0209aeb6cc74ab246e6345abe361b31a09f76a758";
+ sha256 = "9dd3c4b73f3686e26295acd173e759da4956f0e425d0944dd6868c7b03df9873";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/lv/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/lv/firefox-133.0b1.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "4824f4f413713c4b80749c6218cc524be59fac57b96100229f9dd643f6dc6420";
+ sha256 = "4919500399aa8e57087983748a732cf75b05c629e08591eb6b3c762bf2786b3a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/mk/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/mk/firefox-133.0b1.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "2f64c8d6bb0ae6bedc35b9a6da0757708cf3588c43b74cfb699e7d066061d754";
+ sha256 = "f6416a889e0dbea57efc8c4dd7945337fdc96494d59bdbaf1a58225472fdec8f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/mr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/mr/firefox-133.0b1.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "0e313fbf71be605309305e7e1417d1a5dffcb90db71448f6ae9796cd4481bb23";
+ sha256 = "c2196953f7e56e711d49d41082ca9620daab27ce968a4ffa950c977fc6396e67";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ms/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/ms/firefox-133.0b1.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "d88900829c3c56965f487d191c59880b4d8db1c2158c2a42345c8488ce9e756b";
+ sha256 = "b0c4e1dc36eb979dcfa2cb43c92661b97116bb4916ee5863dee29e159a99230a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/my/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/my/firefox-133.0b1.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "68bb81e1d0f7b28349c21b9f3ef1767c0a16f6867c25c4eb9fab92e83bb009f0";
+ sha256 = "1571ada73cb7f8161af78c41bd5cddedf96e52e6788c92025ec47320ab308ac9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/nb-NO/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/nb-NO/firefox-133.0b1.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "907b2800d6c0f9d6c42afc1d39012bf08f91475225a87bf34ab399468d415430";
+ sha256 = "3bafbb30ba117a0650e48fe2700a19c61d41e227e13a721a93db82acf71da33c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ne-NP/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/ne-NP/firefox-133.0b1.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "922f321fd5d07207b96dd7f5aa2589b9ec2f0e15a7279722a5f3955333fa9618";
+ sha256 = "70f904988bc34e35176a84f4209814e3ace6eac4d565fa415e76dca1243988d8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/nl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/nl/firefox-133.0b1.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "0366df618f6f90ba6e31f6d6765105eea4fe0a659ee7b9aba620556488dfb5d5";
+ sha256 = "8c331fc23b415f4a5d8acb35a299cdf8495909ad95385feb6186ccbe8d58b3d9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/nn-NO/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/nn-NO/firefox-133.0b1.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "2497ba133e392efa3fdc87d7b57001161265486101fb50b516335a9c4929cd2f";
+ sha256 = "52044974796322e10fb8a55e25426ee87df0ebc0c328bef2c796a7ea171dc3b8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/oc/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/oc/firefox-133.0b1.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "c31950477111b72db49542f6f4d9a29a2642c62dd6e34b3c8673b4598aac3fa3";
+ sha256 = "b01ef5661fe1e769a183e045cfde42aec31bb94e631b1bc34f0fa861c1d8cbc6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/pa-IN/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/pa-IN/firefox-133.0b1.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "bccfcb28c3041d9a729130655b60db18ca5c095e969b3f7e534a81aa512be095";
+ sha256 = "d1e3da4c7d1cfc2c12f34c937199d834bfc737a1909759f8fc9a202250c359b5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/pl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/pl/firefox-133.0b1.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "62eb9a87d538acff99abd4fc48c67c82301e28d31cd22570f686e027889f2157";
+ sha256 = "9c7b224306891602df4685891aa4a4fe6a01aaad022aefe3b99e9bfc9b6f96fe";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/pt-BR/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/pt-BR/firefox-133.0b1.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "eb2f241dfc048de3dcc3f0c78644c9a7fff3204a80328e6ff4c8ffcd5c1b8fc2";
+ sha256 = "21a71c38de09837709a8d56244a328970415ad2c6b1acb2937f4a22fd6301ce5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/pt-PT/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/pt-PT/firefox-133.0b1.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "6d1cbbc5156669f6a8b2c716667c180093709bf2c9b719b10b367e1a35053a5d";
+ sha256 = "5a996b07ec4e978629c62fa9a928d7fd8724a79970ae43bfe045e37d46e031c3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/rm/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/rm/firefox-133.0b1.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "5d2bdfc8684cb85b738ea2cb12a5e37f111989724a64519c372d2d4c84b05ebe";
+ sha256 = "192c0ac1e3d10681e3b0538e404bfd20779f89942fdc7a20bfcc3329a2c1508f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ro/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/ro/firefox-133.0b1.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "9aa8fa19894cce2203f703f519652e60efd643bce8e3d9e9dce4f44d4af3df90";
+ sha256 = "11c21d38faa2c802ee3de24a6b8fc99829fdc1d9fbfa47463f657f46464af55c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ru/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/ru/firefox-133.0b1.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "3edbbbce178af3b9e5583eb9b57e1c946fcfa844a9675da2dc69dca98b51c959";
+ sha256 = "a9a9d0222d565751d127c7ce2e680e0aa76cc599cbe84640fb478a5d303ea53c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sat/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/sat/firefox-133.0b1.tar.bz2";
locale = "sat";
arch = "linux-i686";
- sha256 = "72182590b349bc1460aed8fcd262e755b8dda7b4f789af9bbf65ba3b9e0e4b21";
+ sha256 = "e10cb8445f60dad1b6a3570bc745d2f873a16fd5d827bc3e76287b2bb142b786";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sc/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/sc/firefox-133.0b1.tar.bz2";
locale = "sc";
arch = "linux-i686";
- sha256 = "03b1675157ba9becd866825e58abb58831171f12cd724fc222285e758f093c61";
+ sha256 = "b0256a2e909b5640eac92ab6a4f9d31d9c2f133169800f074b6e6ffc42c6f74d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sco/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/sco/firefox-133.0b1.tar.bz2";
locale = "sco";
arch = "linux-i686";
- sha256 = "0fd528ce2d1f4b7f87f225fa76ca29b32500a5d66d61858c238bb89a26784cf8";
+ sha256 = "cb4e207853546aff3a7c5ac23f2292b5bea5cb185045bfd0bf2fe248c340adef";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/si/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/si/firefox-133.0b1.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "68b492fc89fa8b33a1db3e514feeaaa6083290b47bb6b0a6b2d24018a9dfa8f5";
+ sha256 = "d49b90914afa415d3cc9d09aa3c3a9db84f5ccd974b1bf386a1c7fe29634b5ac";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sk/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/sk/firefox-133.0b1.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "c0b5c0f615220d7e746bc0a3236233430086cc120efbd1a8afca433ad1cbc63d";
+ sha256 = "05223feec4c123470e27c23ac8d605026e4d414a8e280f3530c305ee645f6722";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/skr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/skr/firefox-133.0b1.tar.bz2";
locale = "skr";
arch = "linux-i686";
- sha256 = "b3cf7e8ef07ba0d69712ad8942d4939e0242dee69602a84989b3837a3e212446";
+ sha256 = "eaaa60cf0f183d3ec4c95c8013bfebb609423c3bc574a023cafdb28c861b7de5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/sl/firefox-133.0b1.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "0ebf301475b58549e3e9e696adf1508c39132236d26a1ac8eba9227de45347db";
+ sha256 = "1880dcc00ca86e678e643db6a8210ab3ed9358ba28311be43bd549c8f50fbbcc";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/son/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/son/firefox-133.0b1.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "4fcda91a507b2067e76b6ea5a3e923c6cb0d62ec8d31c657b0503a85b907cac0";
+ sha256 = "0aff585df922cf8772f0ae8e55fcf8443961abc3c9d5ee5d83acadc75dab2aab";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sq/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/sq/firefox-133.0b1.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "3888236e063a6a724f751275ad714fd96d65b18cd1ace8242a7577c0ecd27f42";
+ sha256 = "31064a5746977fe39894f79bd5851a315d5a840da6f1e0f6cddcfc79297dfdf1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/sr/firefox-133.0b1.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "35ee32850af101c1e762e3a04ae17a6c2f33c58bd0aef0fcfcce151a6f34bbe2";
+ sha256 = "ce4b3fec35fcf00afe91f820f1d4f8fa97acd61be414080a260c89b01ec5dcb4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/sv-SE/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/sv-SE/firefox-133.0b1.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "0c7c5bb2edbb8f0ff72eccf07c01ac078e1d9b92da8ea6789a2c8abe4e78e93b";
+ sha256 = "e2875dcffa7cb08a4bd02c9c0215f251b5736e367c067612cf2887f3917f41be";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/szl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/szl/firefox-133.0b1.tar.bz2";
locale = "szl";
arch = "linux-i686";
- sha256 = "2924c50d23472134428b699bcb4fc3714a90ff54820fd58fbd46ea55fbefde79";
+ sha256 = "fe2a6902dca9485e083908b5a625547bc3e4465125ca3e63282d5abb31d9e7ec";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ta/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/ta/firefox-133.0b1.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "454b7dc139d407e95b94d4fc5fcb0d298501dddfd6d8d78416668e4d3e606eb5";
+ sha256 = "f02adcafa12ffecf4fc761dbaf5bdd644ff617dc7885eca6d326e4ded0eb5499";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/te/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/te/firefox-133.0b1.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "e0bc922e34eeedc64e11da87308982a79645d0df10f9bbabbe5ae256123d8b57";
+ sha256 = "3148546c3584de77442b8af96396ecf6ec5c6df1ac9ece9ae2b3b607bda2b942";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/tg/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/tg/firefox-133.0b1.tar.bz2";
locale = "tg";
arch = "linux-i686";
- sha256 = "475559c6e4c119f9aecfa92d44323d22e986704565bdc6e929536a025ab026fb";
+ sha256 = "3292dfc5de80e0148ed6c2e58e1128304250c137bc794c1deb714cf14b81433e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/th/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/th/firefox-133.0b1.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "c6c0a5073220c1b93a869ff5abdef09fb87b234842c13940c233e3ae73233057";
+ sha256 = "3f072919b4cca9a5e8cc445acd0aa3f934645eb60aa81e777e5e1b337df0ebed";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/tl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/tl/firefox-133.0b1.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "c328c8f053ed31da91384eedd0f7f8d16fa182adf15ed92941b0cfeceb7b610e";
+ sha256 = "0600446dec54cda1d535039cb6bad5236723ead7d1c2e6dff5614eef41cfec9a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/tr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/tr/firefox-133.0b1.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "40509f9119928a59d273e34c2e090f916ca8ce48cd0c07d49305235487b924ff";
+ sha256 = "ebf3bcf8308a71d7488f29938b0992f2159cd0e74846c6b82551fa44d6213340";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/trs/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/trs/firefox-133.0b1.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "b7521924ade0a2e62ebc0a3d22b84f69dcfb9c217d65ce289de800bd258c8c0b";
+ sha256 = "ce4196ab77ab59d59e38fdf4790216bbd58209c57d3ca9ced0cc3f081c7ace6f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/uk/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/uk/firefox-133.0b1.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "f15d5c4a631aa0b76fa43790105caa5cf7fcbcc501dcd11e7160b9ac4d68519a";
+ sha256 = "9bac584acb244bbba449acd872fd1c4bd9e209ec3d91f29a3868d95e0cfddf88";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/ur/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/ur/firefox-133.0b1.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "a429006b7f8112425e959f26ec1d80a0e9583b33fde9201eb7ac34af108d4a6a";
+ sha256 = "93a1fea04881e68193d8d47880891fb17672d9bd277ac23a5359cf6355f61342";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/uz/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/uz/firefox-133.0b1.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "73371c4d0d2a90e9e7eb7fb6a8b678ae5403babc04b48c783dc755d22aa2692f";
+ sha256 = "1b0a2cad22dc01e47ecd6983cb54bc25eb7c5eb70a3fa3cba532ba88b21fe024";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/vi/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/vi/firefox-133.0b1.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "d6b483d269de8b29c8531a2180203765b06d8327bf4fc03a1b4f1388e6e090bf";
+ sha256 = "c5e86a980c28dfa321d6359ccbf747c00b10b1a7dd53cc0e710a4ba4def9ee46";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/xh/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/xh/firefox-133.0b1.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "a3356b334119bcb5510ae065def9639dc5edc70691e6418f4bb54dbd14f369ad";
+ sha256 = "87b91bec48e8b8655f230c368f24473f5e69d0c6248cac85e3d74a9ad91a1c3c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/zh-CN/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/zh-CN/firefox-133.0b1.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "76efdf2ece93286022cbeed82d2a0ea871c000c43175c7e2b1f4ea2d424ac72c";
+ sha256 = "58c0e7fc521e49febaf9795d54979e7980f61b3903c69c26f33cb56ee459705f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/132.0b9/linux-i686/zh-TW/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/133.0b1/linux-i686/zh-TW/firefox-133.0b1.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "bc3db9fd0958bf3497c3955ece9c82972429112a6f497dfa6587bf0d33c7e0ed";
+ sha256 = "c3b9abf1039d9584fb1257adddf960fae5e8384a0906e5def1708247ca3b7ccd";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
index 45ad155ce351..156ab2725eaa 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
@@ -1,1035 +1,1035 @@
{
- version = "132.0b9";
+ version = "133.0b1";
sources = [
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ach/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ach/firefox-133.0b1.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "1f39caa65b32ee1cc42747e1fdd6e0bfdc7a306c5ab4e067d6170522eda281d3";
+ sha256 = "5c42ebef65493ca583a7f00d22bc1b7f62cc9bd91ae96c08dbd74d7126df38ad";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/af/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/af/firefox-133.0b1.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "87720c01424b68f0c1c6f200c4550fb8ee7aea8fec8f3bc54f1dea9d97d9a443";
+ sha256 = "6d1ff31eaf8fe786b9de349314175a1b542b7fbed9510d30795cd7898260580d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/an/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/an/firefox-133.0b1.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "210408dd6c738553ed32f1bda08b7ebc2534358905d4c5900af24f81b73fea02";
+ sha256 = "9e4aee3ae27ce32ef25865d23dd00e62c627e4e1cea5cc71a456aa514b41f8fe";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ar/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ar/firefox-133.0b1.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "072f4f032af9998c6b495c9517c6b008188be71171db4a4610a99e28a64ff212";
+ sha256 = "173b9c75fa988e17f85ebaedc81d7f01a47e1cebe9b5705c21b6ebd9b68f870c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ast/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ast/firefox-133.0b1.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "5918a67ff82170cd46dc384eb6558f096fe269111997fcf0815a057943e2b84c";
+ sha256 = "82322cc9db2fb89267b28b869cc1d3abd9a99f53967bd588e1debd8c7c3d2a44";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/az/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/az/firefox-133.0b1.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "9ec5f80f4a2f779e6cac79c51664afd8f8fd52615fe0f275108955c43869e76b";
+ sha256 = "8eded83bc34d39495ae67333f96efc00e71d3152d842ea8b70ad09303b479af9";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/be/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/be/firefox-133.0b1.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "841e1b0e7d8b57fe4652df1dd6df75bdd92e08facdee5dac3d19018086541257";
+ sha256 = "240be57831e1981cbb6fb803e7c269d3e4f880aafefc4a94eb848d8296e511a2";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/bg/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/bg/firefox-133.0b1.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "d188f99f3cc7d434f83b4f6c2cc061ce5ccce34e5d0f5417ff598f818402e3c9";
+ sha256 = "75181bb251f3a0ed3ee54a59d8336cc5ae1b9275b513c6a251e8f7b61acca0bc";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/bn/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/bn/firefox-133.0b1.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "88aad5c943bdf59f84231b3cdef43ed58cd7bf4657e4cac4d7e17ea826277709";
+ sha256 = "b98e1240f7a254de8d11a20081b9b78977ca5fb457a554a59a9898f6a02aa2fd";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/br/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/br/firefox-133.0b1.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "1165d36af18c63adbebd849f8f7e5f60904eb4a12720a64294dfc7ed8ae949f5";
+ sha256 = "f9ba2badd98674e657d6cc11a8bb0a9dc40a987fdd9feb6c5c09cc724b15a1c8";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/bs/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/bs/firefox-133.0b1.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "d76e76da3c393a98189cb91d03e946a0a75b47d9a071e645321d2cd003dc6dd8";
+ sha256 = "7b2bc6c540c69db95777ca8237408bb0c7d9722edbce25a1b0ff768ce401e759";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ca-valencia/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ca-valencia/firefox-133.0b1.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "1bf2fbffa615caaf148413ddab98ba33bcfcbdc1c4977a79e74bea306c48ce8c";
+ sha256 = "48f589c0ae08b84600897683d8cc88fa8e0b6b7feb9803a9ac7d0f6eff57e39d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ca/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ca/firefox-133.0b1.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "6f88889713b16a5efaf5c4cab1f4c18d44f847939d535115e5532f52af04d130";
+ sha256 = "dc9b36d6d4fffd577d793edb4a15e115ca623e7160c3ba122ed5b7b91e6213b9";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/cak/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/cak/firefox-133.0b1.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "193548816c4d771513e85aa5922d19b17b9b11409f5f2e619802f57992bbbf5c";
+ sha256 = "d23edc8e857bd65bddd142c9f8d324951e1d8c47ec5457aa5c17db1c1f8abad0";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/cs/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/cs/firefox-133.0b1.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "d4174d7cfb015cd4d50efe60abfab4d94311f1c063f28b4791a483c07933ca10";
+ sha256 = "aff33a070bde117bc895a9341db21a66e22b81834c4035a7d8d490f276778027";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/cy/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/cy/firefox-133.0b1.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "ffc4d3f186e40e0cabc1950e60c61500491838d26a17dbc254c264112f77b69c";
+ sha256 = "75bcfe33c4d161a64e259112032ade36fb8d02284b3882c948c62e04082caa0b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/da/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/da/firefox-133.0b1.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "d2fa4c6f2ece1ca73a9b8dec8d3fe8b5bdfe9e43a57390a20114b2af24ac1729";
+ sha256 = "797573e69ac32c81011e8f627ec2cbf621a5bf189ced7514e3fc125ecc889f7d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/de/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/de/firefox-133.0b1.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "fc6ae3275ab21a0903d958b31df8ccb016f109ebad3ab4856d43dd9cf4a5295e";
+ sha256 = "414afe0dc658893cce23a21ddd4f879e8402a1eea60d62ce591e483da657b48b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/dsb/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/dsb/firefox-133.0b1.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "5fac9d445c67e19aad732f3e8ee65bbfab452b40585bf3df04a7448914cac59d";
+ sha256 = "4ca0de6888fdf03640b2d25eb46a88ed8b43eef26a71e2aceadd8c22341ce1fb";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/el/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/el/firefox-133.0b1.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "b11a214087f8c73a973c88241616f3eb4e1eec1276476dd2b8a7d3677a386b5e";
+ sha256 = "9eb42c8323ac9f05f157a36265b3cffc3b8c20f9730018912db76e9bb511a023";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/en-CA/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/en-CA/firefox-133.0b1.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "564f4a4d8fba9aa26e36ee8a9d01f1dd8ccbfbd4af4e1f465704a70f44ea65c7";
+ sha256 = "54a05bcd08463251bd62b5e1b43e2a063d6a757f66855cac981c19482c171205";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/en-GB/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/en-GB/firefox-133.0b1.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "ce6c0c613868cfabf505edee1b7fd6835e1d8aedbafbbe0e4628ca74679db7ff";
+ sha256 = "8d6070c9e4d20aa11aec0b1b89963c103c665035f6a315adf5c1321a8f84c03d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/en-US/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/en-US/firefox-133.0b1.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "ad1415d623d08acf32a6a891f4c161a576eda25fca64443ac84b366769b4fec1";
+ sha256 = "bd60365443d1063aaabf555df4fb11411fd29ea31ac2aa1c80c9ada0e363e087";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/eo/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/eo/firefox-133.0b1.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "9ba1d43f5899c4eaf9c01da2032cf77bf21918d93c6cd9e89721a84ec20c497d";
+ sha256 = "c145076111c58985e25d4ca937ca51a92e1359b8b87d117c1ccdd8aeda58bb83";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/es-AR/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/es-AR/firefox-133.0b1.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "0c1ecef4dd5c824e766c715f9112b7f848341193dbb26548459ea9816878c6bd";
+ sha256 = "aadd10fa5e2c58b77caef30e59d4ba6f6d0c7502387bc6e96921b3308383f065";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/es-CL/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/es-CL/firefox-133.0b1.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "70f07e829e31228793a36cdd71324b8d1e4e7a6da9830338c6d2520af2fe1864";
+ sha256 = "5635b30ca049a62e7ae2bd2ddb5a5d0bd3a89ddc4fbaebb9aa8069d55c28b6ea";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/es-ES/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/es-ES/firefox-133.0b1.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "65b78e48e9aa307e8e9d77640ad1a3332393ceec40422bd7da104200deea61ab";
+ sha256 = "cb65652cc54501185be04b33c2f89d29ae118f84d30149f747270551fb1a1b9b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/es-MX/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/es-MX/firefox-133.0b1.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "3a42bfb73b33f0eb5a05b166dfa4032d34c4ac0a7470d85bff6c3a02474d702f";
+ sha256 = "2a9ed3f17448c7c2158bb13c757fa42a473bab4208e17879f7be7f45d2b3e532";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/et/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/et/firefox-133.0b1.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "5c11d5679515a2c459ef9e2092cb1a7272a2592f61e082c9da2b856bc6455392";
+ sha256 = "edaef66989d1641d2854dc2766d99ed46764b2d769093094b3dfe15a31f52d4c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/eu/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/eu/firefox-133.0b1.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "e5dd46e8f7acadb4b2167b9f123bf8415d97943ccbf837ba62b0ecc19775df62";
+ sha256 = "92f713be50d333f4a09eacf4ae63d3031fef13893ec96d4e5fc1f6a8085cfc7f";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/fa/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/fa/firefox-133.0b1.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "732a5a1d28e388393109ca1395f5ac0214a51d736f778e769b6f1c81b63ea800";
+ sha256 = "d67cb179bb6ab763867a0c3e37f4a60c0374343a5c3832ebd515bc22e10db74b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ff/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ff/firefox-133.0b1.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "b3cbf42d087663b1c9f81eb42b1ddc649995fe212208e752d6c346638693392d";
+ sha256 = "a3a2453735601d5ff84214061bd0a13c34d0c77c186fb224565573bddf27fff6";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/fi/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/fi/firefox-133.0b1.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "06f02bbbc6f3799c7473a2113076f949704ec30025235d76416cd228b18dd4bd";
+ sha256 = "0be6d6b66280b352783a276eda0bd4895f05d27b0012528c1d1c73ab15326585";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/fr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/fr/firefox-133.0b1.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "09d3fd010b55e7732624beacd56b5bb5bb4b7b7cbcaf99078b31477e0c042edb";
+ sha256 = "2ebeaab8ca0e53240e8ba2858b7a161a7725336be452c8deb643f36b4398e619";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/fur/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/fur/firefox-133.0b1.tar.bz2";
locale = "fur";
arch = "linux-x86_64";
- sha256 = "da4fda907872e126ead94f96b1dd57f106855eb7ad394a265ffeeaabe04dfc2f";
+ sha256 = "a5bf8c850244ac685fcdc21e988398bfe740b4b7cf8bb871e9966b12f73cd1f9";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/fy-NL/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/fy-NL/firefox-133.0b1.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "0794e5be4c6e3b12f0a60d90faeee861093f46030fced53dedd1c0edb1ccc28b";
+ sha256 = "09db11c5eda2a8b3b0f456fb5dcd35dc794d0793d5b48c33cb3c045ff6ac7ab3";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ga-IE/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ga-IE/firefox-133.0b1.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "f0590e9a1f22b8b801c9f302f2c02bea6214ab679300eb3961b4f965c8db55b5";
+ sha256 = "9f3b087ad1193a637173b912139750acc0c06a52e11326fcebdc8371b74602e5";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/gd/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/gd/firefox-133.0b1.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "dfd233907dc1d4a67a9e6b93183b570f759adfee4903f1b44d010dd0a689afef";
+ sha256 = "8989162bb822f5a9a9f51eda496022066e232e93f97fc0a4c3a533c37f688090";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/gl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/gl/firefox-133.0b1.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "6934b32cafd86716039827eacf5509f7d3a59657ade55fa342684c197b95fd0d";
+ sha256 = "84a82790c373b0b70410fa06df2e63d776ac709345eb11a6464143371c9e7dd8";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/gn/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/gn/firefox-133.0b1.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "f04e6d704828a86227a81e5e830570ace80ef1534a646e90c89aab068ad8fa45";
+ sha256 = "409c4d33cd7120e9e6b81c245f6b704052644c262b7417316d02c965e3127ab2";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/gu-IN/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/gu-IN/firefox-133.0b1.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "98976288478afbad1df8f9b230e6008b07e93e5c895cf78f3e5d95919998b123";
+ sha256 = "dda2b37db9e0913d4bff59671eca21479e6e64b41f41ea9879c98d42864eb4fa";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/he/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/he/firefox-133.0b1.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "8863e64f00c277ab35e04d364e784f844ee4bf524ebbafa472e70b16aca123b2";
+ sha256 = "1b7b0eda7e646daff52964f619fe9c463127aba76a4dcc472c75af25ce412927";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/hi-IN/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/hi-IN/firefox-133.0b1.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "97fbade4177031acaa3f2db7f3674aba5a4c523872606295e2b178242460cdad";
+ sha256 = "8a0858bdfb74aeb3fb5dc7f6f58de97ba72b1a7280f23a7261c838cdc3f3b4c3";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/hr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/hr/firefox-133.0b1.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "5cd45fc25e4c9f6dfb85e0ad6fc9cc4b61ea76dc4ac3ab2c81e1628c7cb6d901";
+ sha256 = "666c22ef6c63393fcfadc106e5d9e45f9045871d7320084bb27bea2bc940a4dd";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/hsb/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/hsb/firefox-133.0b1.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "31588cd5fda9eb3016e65ea2373dc1ca8d8bc1ab76a39e3ec805b24d017e4f11";
+ sha256 = "3687f58291699a0998156e17384da66cafab51834d7c5dbe8a4b6a106173b32c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/hu/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/hu/firefox-133.0b1.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "222b21e3d732de1133fee305c46b62b3234efcdcae3798cbc0a74aced1922067";
+ sha256 = "96809520bad15744ac0882acadcce7b5bcf5fa0bc4b352a0d4ed2577ff625750";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/hy-AM/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/hy-AM/firefox-133.0b1.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "80980c0db12255f09e755210f8ec71c7e9439ef1745fbe8d281b8b0ce5c65444";
+ sha256 = "c8ceac8c1d97cb6526b4d5010762afe6a4259f02e7e0bb7e237f811ebdf73eab";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ia/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ia/firefox-133.0b1.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "fcca230e6285991a8b469540e6a819cda8b9b769d9d98f3ec40241b377dc6953";
+ sha256 = "114b0c25121b47a83b6614e7e1c7d4f267b38033b4d9ba1da0299cc2e64c9388";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/id/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/id/firefox-133.0b1.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "63350866ecc7ad6f902f22945d8de6c5b2b5b73a1c90ceceb16221ee0e1d2864";
+ sha256 = "67aac95105b980657b01eddd19fe36febb3bbd085be505695a1addb7681d0e4c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/is/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/is/firefox-133.0b1.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "b25a150e4de973c77a935635e2b45d34c476c766cda415d3cfc059265b4714fe";
+ sha256 = "6e712498fdab6993e70245a81a3dd34ef28743d08222637963028efff80ce076";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/it/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/it/firefox-133.0b1.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "74e94928ef4e49c5dc5ad49e56adf5fd958b362192c711c8405b63cde43138b7";
+ sha256 = "b17a924b15c6fa4f2b894557d596d7e9e44829fbd1aee36ad8923bbb183dd2f4";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ja/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ja/firefox-133.0b1.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "0f26bef2bc97755c82b4ff38480c5763fab1764cad82f398ed8accc4a755aa71";
+ sha256 = "fba05f5aed261d17be91fd8b244decbd376d9a99d845c14d9a233a6e480cf7ec";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ka/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ka/firefox-133.0b1.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "efa10add7c6198d2709e0943ec52675cbd98931c8ba6a2b03240210e367bbc26";
+ sha256 = "7d6ec78930a4d530f4dbdb471e870c0b9ec4b908d83100edaf1eec5a4c1a69fb";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/kab/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/kab/firefox-133.0b1.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "c6189ae86a6c502c0e6ec5a1110cae5fb49377eaa3a3d72740661090731d900d";
+ sha256 = "f819c92656b1d7a11e73ed35d5bfc443ef5af0468935dbd783788e48cb07ae40";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/kk/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/kk/firefox-133.0b1.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "91a9ea6a270bcf43f05eee0d45c7b1247dc6bb1ceb5390726f9b582cca91e0f8";
+ sha256 = "616dab450ca82656646018e5718a83b4689e3e51f82a10211c543e39fcbba3a4";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/km/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/km/firefox-133.0b1.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "3ae6ad9c2a34deba6067fadde0afcaac784030c839729ed2449784350a713223";
+ sha256 = "946d66dac62726147ffae686410a761b7187c1230a740bee61937fc5acfd3b68";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/kn/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/kn/firefox-133.0b1.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "e3b221495a989ffeb3dd6352c29519764554f8e06591b2cebf70039c2f4c7fa0";
+ sha256 = "57aa68e667431152b26dce17f52d381daea3bbbd51d20d2d41c282b71506b4d0";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ko/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ko/firefox-133.0b1.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "13302a48b65fcd0feb9719199f5f997737e7458c06cad6d098c1838fbab2904b";
+ sha256 = "8a8b38085990d15443e819ea087b1b241af99ed843351308d7cd49962e434fb5";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/lij/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/lij/firefox-133.0b1.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "2c94a010840d08035a7f11e40d7f1a92e805aa70e6348b1802b7e1dac3d78307";
+ sha256 = "5d88633bc0cc1badd60c32ae3ca597ecbd6f82c8ba17c363ba35504451aa0966";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/lt/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/lt/firefox-133.0b1.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "e0e38869b9d299624623b0fcaadd5562b0a1c5f9ecd897348a495b48a969ceec";
+ sha256 = "c70d3e92bd3f9027c69589fb17996a8085bb4c74f447f0cd32610988851817ed";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/lv/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/lv/firefox-133.0b1.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "964f17d9129fa6eb3a3ed6b30392aa5f4fa19708bdf0dc4f0c1a0db32df0310b";
+ sha256 = "066ac178e2e6076f9d15f731e71b0346e30b54be2d896cf00cd78eb6601083db";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/mk/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/mk/firefox-133.0b1.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "9c95ddcf7099e8d88932d94431610b21ed24d33efddabdec47778f5e67351836";
+ sha256 = "31c8eff29a9ebe3b29c683533cad12aa48b3afd5ee7845f3033f70b6c0bc6241";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/mr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/mr/firefox-133.0b1.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "e4e4a887b1c2cba684ba2528c6cc471af3bb82d8d9a2fd1833930d915a2e16bf";
+ sha256 = "078da76e4f7b8764593f1701cef1f06d9e77fd607c68be7481948ee2fb4a791a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ms/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ms/firefox-133.0b1.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "c73b6f01896873de4388f73e92fdcd0d04d7dd7816e7827b7a6aba5284aaa03f";
+ sha256 = "94229a433c2487ac653c82b2daad6503cdf80602b4ded2fb7072c7d0a64afb3d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/my/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/my/firefox-133.0b1.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "aaf0343a3e3c8cd9ba4b9e61b412381ddedc124a14646379904aeaf11ed4dd79";
+ sha256 = "317294bf218a0d19f205b908a48a90fbe06cf5c0fa114e8e831d033ddb3e32b4";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/nb-NO/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/nb-NO/firefox-133.0b1.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "4420332b3105bbc53dbbe1185a554e208e39ded5541eb7452add0f8b49e6655f";
+ sha256 = "64014f27b7cd516da9f76bea26a2e37729a535740b5c52e1556932fa8e357c82";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ne-NP/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ne-NP/firefox-133.0b1.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "2936ac1de8e97ba8e393f687efd5bb3b358ee3c919b6fab7f20d04e46d11ac23";
+ sha256 = "d5c3cd9524e069953305c1a52b8e6a9967f0eb947baedeeff8736ef6a6ac83ca";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/nl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/nl/firefox-133.0b1.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "b3e46bd840beeae40cd3594626b86a849d31e30b416ec477fcd99ae98cbfd87e";
+ sha256 = "a575e4899c81ac773d0a40a1a9f89af0c3ad77b8776634abed33fc9fe7511fca";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/nn-NO/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/nn-NO/firefox-133.0b1.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "19ebb27df8cd258410d953ed54a02281f33bdeb892060db9fc43bff81cb8d3fb";
+ sha256 = "36ad31e105bf6edb37fac55bfd58e50afe32b4a705c74e5c2b6e9db27a869d54";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/oc/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/oc/firefox-133.0b1.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "d4b24f8468891079e86136ad2ac99240faebf843672bb839cccf42203fb82a69";
+ sha256 = "e3fb3a792cb7afc025ce3b4d19f089c80a542a9b91ea0cf8945e69a229ccfe6f";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/pa-IN/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/pa-IN/firefox-133.0b1.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "c534e8a87cec2f0e9ee0915bf74f3a3a268112ba2eae9907e2850a7e6e294fae";
+ sha256 = "0c5a828f6c7d42026cf896fba8423d04e094de396bf26dde94621fcff363e975";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/pl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/pl/firefox-133.0b1.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "ee475ed9aa8c00d6dcf02f817cff43f689334d1c9f16f42ebf2b45e5f0812c0e";
+ sha256 = "4b122397e9ccdabccdf7f0f5ddbfc734c5675170d8e32a1059ff42da08fe11e5";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/pt-BR/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/pt-BR/firefox-133.0b1.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "326df9dedadca13f46ae26b8bef8fe9127e0588f84d839214bf52ef013dc45ba";
+ sha256 = "076a75a158bea4023bd38e4f5a534187ba329b0ddfcf3ab0b97657bf21dccc66";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/pt-PT/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/pt-PT/firefox-133.0b1.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "c222ff822a6433b216ad164a5d5985cbe046e220a5dd7f4f1e043531e07ef457";
+ sha256 = "6c254118ee767d71a0203487512ab2411dacea0903074def934581c92d5b5fb3";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/rm/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/rm/firefox-133.0b1.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "ec93394cefc1c458349a5b91527e4159e6958614b96d626e15c751bcf31dd780";
+ sha256 = "313917e95e615d934308b127f56a35a69bb516a5e4d6ef5f63fe4a2f7a5fcf2a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ro/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ro/firefox-133.0b1.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "ffe3ea9129d2aa1d998391965f5f7c58867226e750fe79282718550983d994ab";
+ sha256 = "8ad52f9cd80a2bb1df257f7a3b5c09ebc6abff52eaa5d504a9a45819e2329a85";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ru/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ru/firefox-133.0b1.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "c3c68bf3cb48854238ea83e95db04006f099e378f5f073f93a460b61a3ca8298";
+ sha256 = "ad91ca54f0b7cde1de770bb57078ba8d891300ea5554aac6e7b1e8fbd750e097";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sat/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/sat/firefox-133.0b1.tar.bz2";
locale = "sat";
arch = "linux-x86_64";
- sha256 = "f348f5400fd8f9f7272193824bf873b171cb01b3416e30d7697a0206439ad0e1";
+ sha256 = "f8e310b7fde9ba123fdf478038dd9597979dc710491a1fe4316a0759b756e5e6";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sc/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/sc/firefox-133.0b1.tar.bz2";
locale = "sc";
arch = "linux-x86_64";
- sha256 = "8cb3ca91aebaf60ba754bc2f3f9ef004a4b1fe2f96aa9699a651793929548fb0";
+ sha256 = "15b761a6fbb95c47ba6fe2d7bb1d2cedfd522ce43645f070e1403ba6fef74e08";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sco/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/sco/firefox-133.0b1.tar.bz2";
locale = "sco";
arch = "linux-x86_64";
- sha256 = "7caa1d9b5167056e64407c87126796e9b2c3595fab890ccc8f600cf2d6ba3b82";
+ sha256 = "bb56b3741ddcfd7d1d3751a364985cd94a59b4b26f18c4502a57687cc269ae1a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/si/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/si/firefox-133.0b1.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "0596297cc39de0580f5eff0e6bf11ad9eef58714964277df24afbf2266f78169";
+ sha256 = "4f6011912dd99fbc23e3d764874c1e6e532957c561e79b30252f6dfcccd400f3";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sk/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/sk/firefox-133.0b1.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "c232615c60808666cf7eb42390c957ace79fc2964539dc9d78337db2c82a8df8";
+ sha256 = "82af3e4d39dfa2f5c8f399af21c0f167941a46bd7ad4ca512c652909b45d034a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/skr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/skr/firefox-133.0b1.tar.bz2";
locale = "skr";
arch = "linux-x86_64";
- sha256 = "ef5cd9a9677377fe3cacfc7234e3180c016fd0ae8809663966ca3f735b996efb";
+ sha256 = "3fd67475eb317ea3f83c0787cac862d8b8725aedfd3f6dc8d0274f368dd1a36a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/sl/firefox-133.0b1.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "968357070418cb7175b438e0192f8eefb42e3fb7604df9bd08e1f060e7cd6ac3";
+ sha256 = "5c8991a89e795de0d8c5c6b2a08e1029d7ddbfd25045951b33a0b04223a41bad";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/son/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/son/firefox-133.0b1.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "44828102302c416f2cdc2858aecf843d72e0015a743a4a33a6e1256449c686b8";
+ sha256 = "d9a96931cfeb04cc23bc03954c69934d21bf4c5a5810c94ac961a6088e39054e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sq/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/sq/firefox-133.0b1.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "b1d849e2af49f7c9bf7c05870fb79ff6e0f9ee0fb58513987632847300235e53";
+ sha256 = "8d27d21903f512004900cdc7198de4991f22218ce948d5242cda649cc30ccf68";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/sr/firefox-133.0b1.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "99cf9f0f9c853849a18d0dc05c2f8416c42884bbf92d8e046e835ae09b800f97";
+ sha256 = "b78db319c021661d41824f2267ae462695745e19345364495c40827e0a5247ca";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/sv-SE/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/sv-SE/firefox-133.0b1.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "664c2231fdde88b8d2e438429a699cf98c878f41625b89d6a5b14d2270e96fa0";
+ sha256 = "1215e48cacd11570a2f3a8914328a472c6167d7810f94953699e5c6f44d2bac3";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/szl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/szl/firefox-133.0b1.tar.bz2";
locale = "szl";
arch = "linux-x86_64";
- sha256 = "038477815c83f2566bf4c00cffd37ba0ed60383c90badeb685ac95bcd302d0bb";
+ sha256 = "2828965807f5b8ec7718cc58eb9ef38452acd6018a89987fb1e07faca47c1c9a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ta/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ta/firefox-133.0b1.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "3be063a9199cfcbb08a59e448c41b6382d5d13e998d6a3d4198f3bdfc389ceb8";
+ sha256 = "ea30035871e66630a9057c54ca67fa49b94f0c75772a4fc2f1aad486481ed385";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/te/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/te/firefox-133.0b1.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "3a80f9b8916d2827e0ed0a7d6c4e968aba80c97e2d1a595b8a0c10f226849d16";
+ sha256 = "e878689ad558db568f50baf0803978f2c6fde36fa8020cdcd7706b2f223d4e05";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/tg/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/tg/firefox-133.0b1.tar.bz2";
locale = "tg";
arch = "linux-x86_64";
- sha256 = "cb171a6f21afe5df09f41b11e68c6cb93bfe8c64f1c32e75ed248d8eb7fcc055";
+ sha256 = "4611925af4e593b82f4fbd7517bcb48ba3757093c819af3c5c5b69e0b45672bc";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/th/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/th/firefox-133.0b1.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "60bf0863d527971f35fb903c2801c7b607d43d882ba4ff8be7d1da3ba7ef9cd1";
+ sha256 = "fb6240f394ff58a04557117ed281d28c28abcbb7a37223281e42cba3aba58a8e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/tl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/tl/firefox-133.0b1.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "16eb05f365b447a7535d12388d27e2d439d6dbffc44ffa1dab2319ad922738f6";
+ sha256 = "e6233f5f26b5b22aec20cab3c0fa434ca8cdbd301c671650e8a4385f2785517d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/tr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/tr/firefox-133.0b1.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "b008823c635128eb3f25e0594999cd25a7264355be82b7c30b3fb8ae7a2ede0f";
+ sha256 = "de2e4b9ebbec7428044df32206338318a77625c70bef63b86a87df7880f899e9";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/trs/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/trs/firefox-133.0b1.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "218fae2f2f4a6e0f2c217ae35d6f7b62d955ef60d1de0d923de05dd6f839c58a";
+ sha256 = "e23e749741ae2afdf3cbe580221753c90a5dc115327f1dc1b17a840cd05b93d2";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/uk/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/uk/firefox-133.0b1.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "ad28b1873e2c7781dfb14e8f692c08f549496fc8afbb4eb4ccd49ff403e221d2";
+ sha256 = "7641ff9a44fed05133ec2a7876f7a70b7fc701efb98a99c9099f0263cf100701";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/ur/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/ur/firefox-133.0b1.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "9d8ac480fd55cb749c6cf8166d681b619310dc25f352d109004a61655d0bb779";
+ sha256 = "76b84dea317b8d096626636e4317df7a0de33f045824494dc1076fbf9a11c3ce";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/uz/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/uz/firefox-133.0b1.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "7c19126e32881e496e538028dc2a336cfafcfa5ae8e53d5ae1f76415829adc7a";
+ sha256 = "ea3bbd715f93ac09524258ef039f97b67ae04163f9ba490217e3448a50ea69db";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/vi/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/vi/firefox-133.0b1.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "4fed1d825342d963e45b81b9931f152c4600494866f54795f353ae1c84c94e40";
+ sha256 = "d26f876dc7458fec133133cb4bc25350f96a0a7b4b6ffcfe26483fa62c03985f";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/xh/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/xh/firefox-133.0b1.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "6cf56b2c6a0cbb6fe4161e126595f61cc0b099b526c2cbb44f5024cdc428fb86";
+ sha256 = "69e8a971f8925945c0323320f45a843d98d7ab73b80f9428f47e83626651b6ef";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/zh-CN/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/zh-CN/firefox-133.0b1.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "bacdc8db6802246ff6293f80027eb690f02e41eef04ceb1155a3ef35c99d27d5";
+ sha256 = "1eaa3adc05330db6849d01314a7bb8afea8dd69b7ad1dde5c0b373d84341eeb3";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-x86_64/zh-TW/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-x86_64/zh-TW/firefox-133.0b1.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "1c41f550ba2c67d8dbbecac783642e2b21b04e4d3a6fc1bef7d9bba0dc35638a";
+ sha256 = "22d501328e4728fdd2e8e22c44b164ea3435b5905f57adfcaa97843abf3d1d2b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ach/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ach/firefox-133.0b1.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "3a2eb5827dce67f9f5ffef0d68ae8b0a38bcb8635c77e3662426c6068c340836";
+ sha256 = "5235e26e6100a1216b7e814f4885cb70f18544926cd5717bd10ce0f921a5dfa7";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/af/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/af/firefox-133.0b1.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "daa0df7174e377c6ed64759460d0a7a98881a1afe1e366c5047b1dea23c7afae";
+ sha256 = "ecd5f7edcf44f0bc6c8f9cb2e959d64652477c0a91138186a47d049090333967";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/an/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/an/firefox-133.0b1.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "636e32c6b2cf823895ba1fc21c49a93d845285f1c0bb4d4edde05c88337f273b";
+ sha256 = "62080977a6f277a02982a1ca4f95226539d896cbcab49be5ada9419fbb35c2a7";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ar/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ar/firefox-133.0b1.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "cbc5a4a80bedfc115aa3d8450b809ef39ef80a6a5ca7446b233a11045d78da1c";
+ sha256 = "d159f1146a116f128fd93468f9a52b264bb97c8f98cd615b4c22fd0f4bb54369";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ast/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ast/firefox-133.0b1.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "11a799ebbc18f489ed0043718c7091d352d21e8f5669b841eec17c3b930e15be";
+ sha256 = "c7786d6134922c00a7add9d55b36aa277f791c57e7ae1370a57ad2293c279a58";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/az/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/az/firefox-133.0b1.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "e491a0d636a602d8881080f237c55583270d0ca62b3350905deb8c26d092b190";
+ sha256 = "37a7f70e459ce17ba506dcf57a2d0a918b1d34f6d65d71a65cacdded1d36cbec";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/be/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/be/firefox-133.0b1.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "ed3a53f09502548054476ae26475de0068c33c1dbe2080b68dc88da2c6c07f86";
+ sha256 = "f35bfd4c67e2e16241bf5d18058d01da003b6db98ef20a5c5ff80866dee2a3a5";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/bg/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/bg/firefox-133.0b1.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "7e19ca96797de41c55f2d81e17418f4912e286099193c4d23356432d937dd467";
+ sha256 = "6e591047810cdeb9fb455146a6d7fc40e2bc07be8ba80b9000956c958bc4590a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/bn/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/bn/firefox-133.0b1.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "23e1ad144a6564e91420ff1616ed81b577e15bb2c48803dd73a408788a791e8d";
+ sha256 = "94018749fd939955bda8911d44ebfa1336e1ed6b0deb78cfcf51c978ca21c586";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/br/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/br/firefox-133.0b1.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "32b8631482a1a27aceac69aec87d4094f7e7a8dbfe04310cda692241bb1d51b2";
+ sha256 = "dc9a5b38938dc4ee51a1774b57ea9b8ed178908d5c792b5c8d6072f964a8ce2b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/bs/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/bs/firefox-133.0b1.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "575ac3d86f62665a4c496e634778e3d1a7258dc73f6c2ce6727e2a96e9d2ac03";
+ sha256 = "4dfecd9c6b843636df4a952769d30779ca167968c204556ca21be822f2c6488b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ca-valencia/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ca-valencia/firefox-133.0b1.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "5e5c1f70fda621f566064248bfef9fc1629c81acc31fd3e21b23d2b122754470";
+ sha256 = "d95465f69ff0a31c5c5fab725a0c8bfc9564a896993f5eaef9f1a46badef9d16";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ca/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ca/firefox-133.0b1.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "1f622038735474932239888d00c47eb8a8c719854340a838cf580ecc28a8c1cb";
+ sha256 = "f60d2f04ef97c94604a38c9065fbc4d7762a0e97cb7a951963d977f599574fb4";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/cak/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/cak/firefox-133.0b1.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "f4fa8cc59a44bcefbcfc9d41ca67f1872f29073b1ead1e4da576091605721d86";
+ sha256 = "8fc8cee299c1eb3a7bff416cb749eca7a26840d7b4934f31bc36cf6b9ac0a40e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/cs/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/cs/firefox-133.0b1.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "fa764b4dae4384442f1e2c4424b8b82678a3910a5873dc068b605795ab803673";
+ sha256 = "6a1adadeb5516c35fe30874c3805f31276aae3638213a3b14a491e2b091aacef";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/cy/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/cy/firefox-133.0b1.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "c16333d4334148e77f4c36a1dbdeebbad52964af903f4913cc12a76997651585";
+ sha256 = "9eb63eded5bdb7199b26bc621fca862df9aa7aab1886b79e1c1d3e230742976e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/da/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/da/firefox-133.0b1.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "49f5bbe32fd51898fea03249af04cf922891fa57b5d03afd49b92a7eb6305fa2";
+ sha256 = "e4e33e4319a9072892ef395aaf6c1175223e802bfc1f7dc474ad1ef9f91c5883";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/de/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/de/firefox-133.0b1.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "4b5b5a07a09fb47451ce79aa9b4331d12e64222e7bddc950db4e8c4f660e682a";
+ sha256 = "ec69257df5cfe9a37c3a69726f2281a3d0e6a9a85a501f19e46535eae80a5e2d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/dsb/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/dsb/firefox-133.0b1.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "9ecc41b2fd42e3595bff98aacbb670081340175c1594b2e5e863d49be9747575";
+ sha256 = "e7244987df4e971dedd31de64586863f5d2888382d3da68d1386b406f2405200";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/el/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/el/firefox-133.0b1.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "c14cb71af1fa07286df672db42140528807015e4c633862f145d311ee67d211f";
+ sha256 = "5b3c989407a6ed42f095cf8b5656aa2a49dca17adb117458828424812881183d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/en-CA/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/en-CA/firefox-133.0b1.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "de205306cdcabc1f8764e048b0189f31dd59265282a0d48804dd5e01d65eb4b7";
+ sha256 = "2377969cb6f7e2f169932c7f20581bcd1bf740db9f1e2f464896666a3fc38987";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/en-GB/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/en-GB/firefox-133.0b1.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "87337c3c036f2dacce295ce3044f313266910f7911037c1d1eddb7c633c79703";
+ sha256 = "039ceea2c9ebc264d01bfefed9bf8fbc16434698d5c4d4cfe457794d92a92a1f";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/en-US/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/en-US/firefox-133.0b1.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "8bc2cbabfe34d0bf8eb72f3ae9a5db6b4da83b659385c80059ff468f436e122c";
+ sha256 = "32ce9d0bbb2080ce8afa73ae5d1bf166105b6dfe8bf26ccce3721d42815f0581";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/eo/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/eo/firefox-133.0b1.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "ae1ad3d5c365a96e4ec862eb59cabed185e0f5ed0ea1c196a726db8307d56722";
+ sha256 = "90a50460c92718c62a0c0f0c3e58348ef5cb4757db8fd05aca4c251bf23ab3d7";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/es-AR/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/es-AR/firefox-133.0b1.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "c7f7c52b27a98a6ec5620178e0d7d9989cc80ff33d8a8bb8c9901d14d470ecd1";
+ sha256 = "4ae7d1644197612b266b8844e27c6ea7b5e3df079e0ef1b44f8b885b93e1f18f";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/es-CL/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/es-CL/firefox-133.0b1.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "5c40f644cdcc273a7c5296758c903386bdf72c928d71c598ab1cc524791bd12f";
+ sha256 = "e547ecb14f8bd32c91f4025022029bb79af4b065e71c234940306949b5c5e462";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/es-ES/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/es-ES/firefox-133.0b1.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "66cf9339ae8c7703b23ac94fbe4d641b3dd2d4201011a49c3d98859874481fe8";
+ sha256 = "e5a6d7dc34190992814995a0b57b4d9188c3ed6c8746a045750a56bd079713e2";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/es-MX/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/es-MX/firefox-133.0b1.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "6424538eb209875fa42391bf4457b1160d066ff94cbcb35cacb4698a6c87a158";
+ sha256 = "53ad3eaa0f7b969350ae43c023586d42fb18044926bde5c1f5d8337c8d83f7f6";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/et/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/et/firefox-133.0b1.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "2d24a51753787c300fdee4a837d360706a206d81063ba90e45b0a39dfec19704";
+ sha256 = "c647317e95f41ea684e38d3aace7055d920f3b119a82759b335012446f1b5724";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/eu/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/eu/firefox-133.0b1.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "e071a830171829fd0ae7407a0e36e2cd4d732d0bdc5d95f308ae645b15e43352";
+ sha256 = "873e4d999c8a96c8aafcbffea4c18cfce5166c395309ccbeec638ea26a80dfa2";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/fa/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/fa/firefox-133.0b1.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "28f1e8e0e4c663d1f4651b598f0981f02170fb70f566b56ecb4fa695ad43b062";
+ sha256 = "fa443519be951c02b12dd2cf8a5c163deb8408ce3142d499484078d8f7040f9d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ff/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ff/firefox-133.0b1.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "8538d13b4036fa20eb9f05588ceb58615e47a91f40e52b80fe8bacb0815d2280";
+ sha256 = "dd025f7616a71ff7fc71162acbfef86ae1a6905c039ec2749c7742982dc89a4a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/fi/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/fi/firefox-133.0b1.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "5db06424e691bb8a38752f8b4479682b211b944054b624c6fb2b0517d6dbe8a7";
+ sha256 = "bed429db1a03783615ddcd1ecd1383f3f4c52e1295bc7cff0af450718d079db7";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/fr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/fr/firefox-133.0b1.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "0d239d9d7f6e7072d44faa571ed47c1943c6593532e8f5d13adcfb3c6270858c";
+ sha256 = "7d577bd3cad1e960424aceffcea266d1e0f26757e5942dcb473a1657c3290ba0";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/fur/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/fur/firefox-133.0b1.tar.bz2";
locale = "fur";
arch = "linux-i686";
- sha256 = "0cf201905007894685d3e2f2a5555ba478385e576546112912ad51304aa0fcb9";
+ sha256 = "5fa36efcefbb0626419b9a8beae643ef1e6f0c386a2f507e72247c565e1e8998";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/fy-NL/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/fy-NL/firefox-133.0b1.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "4390d196894b898724dc31ccd30d85795a6094641839ea3b688253fd7fa59925";
+ sha256 = "02997236f0488ce1b9fa1ec40648154bda3c445c0130d7a08982abc25ea2ebf1";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ga-IE/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ga-IE/firefox-133.0b1.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "07f04a17bea08570c902a7588b770a0b32763a792de46b2c6ebf4c6323d8e72a";
+ sha256 = "41bbc0b9583e97acb6c52751974e602345e1ed593673574a9c6d6ae4fc185990";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/gd/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/gd/firefox-133.0b1.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "ab87018a5cf04c903a41bee02528796d5537533688d50e21f66dc7c5210e2197";
+ sha256 = "a6831f8632128c1b2d02935f63000b1bf7d0e88b6bea0b2d814a8e8774aa24fe";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/gl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/gl/firefox-133.0b1.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "d2b36736a16b6673d9051cad9df7bf503903c09b0bd4c0492c3445a55ee11f9f";
+ sha256 = "54b7785440073d33262667bfa6c2867a8f623741274dc55ac70b3053ff17032b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/gn/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/gn/firefox-133.0b1.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "587333196ad1a404bafca6bc72a9fa76601454a1510143d8ac1aa3a21b2ac0ce";
+ sha256 = "e2542e3c1d1fa72bfaa601bc6db5c327cf3d992efeb0d40dda79c8c2a91e57e0";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/gu-IN/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/gu-IN/firefox-133.0b1.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "f5fd1e4959895c253186feedcf64abe577452c7099778067046438f6409c0f4a";
+ sha256 = "e67053a7ab1a8549de586a38271239188aa77572514945781d34d3c56b61259d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/he/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/he/firefox-133.0b1.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "f5d3701b4ea8715e8ce3d8870ca2ef103804b529006c264d35df5174048cac7a";
+ sha256 = "a0d06ad4015f912dbf8f12b97a7193ffbba48afe63b53bf24242f4eec44b21ad";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/hi-IN/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/hi-IN/firefox-133.0b1.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "cc3f712afd9b6866798158be07855cb49a30764a03c64463c458774bf6303af3";
+ sha256 = "74d9298bf2219c3fd8e9ee0783b90d2fdeec7dc11ef48d7dd388a20b9e99079b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/hr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/hr/firefox-133.0b1.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "3833d16b4b9c98547f9f405fee4d150763529d4c87e09d2ae1e9c62bdf09ebe1";
+ sha256 = "067f27467dced6d01362b396802cd33dd9c80d45c849a579b49f3c5c07ebd182";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/hsb/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/hsb/firefox-133.0b1.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "f9f6802195c74368f4306470bff9352644f592f84334104ec2df829118cd0889";
+ sha256 = "46581a547587e8469d171192d7f45c029c6868addc0df73ae52ce86eec5b555d";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/hu/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/hu/firefox-133.0b1.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "da459abb9b9b55626c11b4ec09e3de6b4ce64928e1af8c1c7edc6937d9df2fff";
+ sha256 = "7401a0dd3ea993a1b35252e383258b03ea3b66bb5f8760b06556b1141598f740";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/hy-AM/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/hy-AM/firefox-133.0b1.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "34277bb22941f8a3e5a71646fc6a1304660a6087f66fbd6e1066ecc3efd952d9";
+ sha256 = "2aa425086ff2ceefca72afb084992225b33383492379e91b85441c33140f34d0";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ia/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ia/firefox-133.0b1.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "c3f2695c4a3f15a60a83f6f1561e451a75ddfa25db6827541be3d948ee3cd5e4";
+ sha256 = "0aa4009346092ad02ec4242f5748c087ca3a1f0f49c753101b70a03ec8e07a42";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/id/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/id/firefox-133.0b1.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "b44069f8b898d751dd42825ed55a216b7cb2b78dbc187894ae886cbb0ce1303f";
+ sha256 = "be998daeebbf20dbd12976f33c75edd7dd1db838c439ae16120ad96e887f5e7c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/is/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/is/firefox-133.0b1.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "d566b05d2de587f8f377f0552b8611f3232a1b2ce71270a956690b04edeaa8a2";
+ sha256 = "89c5a3329217c033b12a706b1dfd239a31b9b6c25bcc44fc250cde6cae9a7a5e";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/it/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/it/firefox-133.0b1.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "5b79674af83be412e986376807a04ae59f5b96c4a59c905c951b7b29baf76cf0";
+ sha256 = "b2eb6281f75c734ff2d8190bbefe360e239a384161fbd61eb61dca837be6df3c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ja/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ja/firefox-133.0b1.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "1324e8ca99b2e7a9e7d671c0dd066553dd2a60f5f0535103d372aad287e36281";
+ sha256 = "cfb7a0c45fc51a75c888f27c119e841e4afbf59a68af79ed81fd054a8fab3292";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ka/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ka/firefox-133.0b1.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "97cfc20dd249d8934d1e92f0edc9b4db9fac00e1ae3f6e256b4cc8e960bcbc66";
+ sha256 = "134cc6680cd261624677b68c41330e7283cbf940e3c5cadc89cce10fcbcff4f8";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/kab/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/kab/firefox-133.0b1.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "746186d77f3bfac4ea34dddc6d5bc0fe1a1a2fdc1beaae6946bd58a5415bb732";
+ sha256 = "e9eef562d65a06f595cf620b96fd796c76cde9c9ebafe017bac7ee01abb09d85";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/kk/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/kk/firefox-133.0b1.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "48e2283eddc4f2eec476a7b847997705686985956ac2bcf0677b06600d2cccea";
+ sha256 = "844b7b7c2737bf8ab1beface6fb3ab66bb9447d90c7e284c0db5977f193ca608";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/km/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/km/firefox-133.0b1.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "8255888fa2771c50a7cbacca023dd2218908b46bb52a4a070073b89af86ed9f8";
+ sha256 = "3153a0d951761133902853591b8dc324f51b7937afef7f876d42cef9819de7e5";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/kn/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/kn/firefox-133.0b1.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "17ac76150b550f26af69b7cf36dae1441602d3bedf7cc8398f102b6a41b00775";
+ sha256 = "3b15251296773062dd58666feb4e4d1d069069035f7f29d0c30d89a8aa8ede52";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ko/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ko/firefox-133.0b1.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "794c3566a5ec2751dcde9b0038b0d11f64d5443972fba058d8c1d66e2a768d7e";
+ sha256 = "26d3ec847cb4f4a63dc65e5f85b71a83c0000b3a2245242aeb0c85717f638c05";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/lij/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/lij/firefox-133.0b1.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "5dcad09ef1e16c8c8fbdfa76b180f66df354dd3a3184a95a9ee219619d623126";
+ sha256 = "821cebf1615b8d6ccc886f1ba6f71b7c96d1f905f25656c06202aa9823b9fd7c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/lt/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/lt/firefox-133.0b1.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "67ea002179152fd697c2b7cc6028f67eb8d1809233127ad3a79e48937874e479";
+ sha256 = "67f446c2dc13ab0f5e807c359f58b6629237b84b270119e1a07b4783c0f32f8a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/lv/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/lv/firefox-133.0b1.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "ee90670d050beb555b8375903397cf55cc9f4a54d806a32c9383150799b67a9e";
+ sha256 = "3610f2928483acf76391b76d6daa7163dd2f67fafc9f52fd24741cb9fceb6c27";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/mk/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/mk/firefox-133.0b1.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "b47befd2ad2eaf66842e159601bb312dad71b665d8c8af9eec5d2ba646e26fc8";
+ sha256 = "59952564993c98da66d5b88672fd9c40911601cb7845d64587f88636ac724310";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/mr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/mr/firefox-133.0b1.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "33dfca6116afcbc1edf83d4e30c32c3e52a320a1b447521a017502a2cf2abc33";
+ sha256 = "a28a7e3bc05f3053d35a2f7ec1e6f6e9a23b09039d129986fdda4f8e827b85ec";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ms/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ms/firefox-133.0b1.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "310f06f2ccbb321da8b2f7ea1b302f0c90fa6d0d19aa4cac40e08710adb42c49";
+ sha256 = "7ffaa99af8244ab466607bccefded8b0e6e714fd40243160a9c4bc8778faa1bc";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/my/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/my/firefox-133.0b1.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "4e8b59a810144fc8407ffcee81bae69f3b3b8458920eb8c30affb59e432ca49f";
+ sha256 = "c709c5f9dc3626a3bc9bc68d833ee1c4f1d31fe316f5b764d40f73540e0a38f6";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/nb-NO/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/nb-NO/firefox-133.0b1.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "3fc8c97733acab28b7b59142e8acd6438251c83cdc7b37ced2a74c7ad5de9af2";
+ sha256 = "a97b29ebe0a76915cc4faedea6c448300ab8c7e8767c9f3244f1b339c8ebed5b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ne-NP/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ne-NP/firefox-133.0b1.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "939a528486c9e9a7d5692c9c248aa8f2c9ba9d86bd6508fc1eaf84f8a21c8731";
+ sha256 = "3214b27b65fbd84ebb8f409a6d05e2afe76f838432e4c35865ff3bd3fbc5b5b7";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/nl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/nl/firefox-133.0b1.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "01a5fcf60e9599128f7d5663d83428825db59d5a49139348c3b3a5fe48ce5d25";
+ sha256 = "fe1de7ebf13cf5fd0d9460a331d66d490b00fca1c1f5f36877297f65b34acb9a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/nn-NO/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/nn-NO/firefox-133.0b1.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "4e8fe32b83d51a01c1a718fdbdf21eff87f3388995426dca460a583b63a8c3c6";
+ sha256 = "131754185d4b0bdbdd8e5456ae54051a7e974fe65c92e5e68cebbc09ad77c3cf";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/oc/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/oc/firefox-133.0b1.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "2cfcab5226ce8901cff407c9175a712ade1bae871be9c37f044e88babdfdc68e";
+ sha256 = "a83510b6064cada58cb3e69faa54081f63e118cc6a3ee82fae6b85041f4e9d7c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/pa-IN/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/pa-IN/firefox-133.0b1.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "2bab73df49224bdb79f6d0db857d181e8a0153631eebe4b54c40302dbf664ca5";
+ sha256 = "7ff6673e6851a9c7885803d4410534fbef1e383b24f5675dc0cd4536278bd6a8";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/pl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/pl/firefox-133.0b1.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "022130cd8d3a4f13a2734b09eafada4cb3582f0a04771a2b38e2e8782a077eb7";
+ sha256 = "21958228263df676dd210810523848a25875f45897b2c777a23c0b41e57aceb9";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/pt-BR/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/pt-BR/firefox-133.0b1.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "d4804bb273803d762711416831ed6fadfed28e09a92cae166b47d436fee3ce2a";
+ sha256 = "e5b6e65b2e94fd4c083405ff9402d8b8121578e429403413969e973217d8edec";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/pt-PT/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/pt-PT/firefox-133.0b1.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "e7e0bb5138aae26ceb12aa014a4a365d69141a3f6d0d437e5d9112a1e1d9222e";
+ sha256 = "bce05639655230d8fddae84489f89505517dcdf7d2270635de952f02a1dfb0f8";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/rm/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/rm/firefox-133.0b1.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "09e93cde46ee4d590c233a5a1731657722d7d68772867a9601b9d561e166c8c0";
+ sha256 = "fad7e57b866dd5484a3c2987cfa7092d3b1505b9ff1bbe8b4abae01cb2862893";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ro/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ro/firefox-133.0b1.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "cdc004090e30db5bba10906550ed9532e7053a3cdbd6525280978d06fa87aa44";
+ sha256 = "91680a58a8178c48f22ca36a7d86bb09bed0ae26b223b8d3ee4b1401aae56f29";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ru/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ru/firefox-133.0b1.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "be2bc2843148d4241f5a59c8cf840552eacff056906f4712172047186d7e1ca5";
+ sha256 = "9071420c5ad59bbf55c86c6b399d664547cc3f0e061985ddafc084c7ecb20996";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sat/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/sat/firefox-133.0b1.tar.bz2";
locale = "sat";
arch = "linux-i686";
- sha256 = "c326732c2ac6b12ebc2fadb464bff49d24b193e229f32be7c17ce30b8c8584e8";
+ sha256 = "ebdb74ac24cd8844efcdb33eaecf2e3e6638708e87c720c81b7f2c5e968c068a";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sc/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/sc/firefox-133.0b1.tar.bz2";
locale = "sc";
arch = "linux-i686";
- sha256 = "f7c6823d9196245f2f6ecf4cbdd9b82397cbb39bd2be7c3866a6bf592b055a22";
+ sha256 = "caa20cc0c17491356bb4e1a5bbaa00278145773ede483f8aafdc42be39afd438";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sco/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/sco/firefox-133.0b1.tar.bz2";
locale = "sco";
arch = "linux-i686";
- sha256 = "3533e52edd9ee565119adb2eb04048e7f03442a59d0342cf63ba0e515edd544b";
+ sha256 = "09c69b7988f004b8a8ead03ecc784d11a3360d73dad12360692252660472f3b5";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/si/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/si/firefox-133.0b1.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "94a37d1d5dc04726f2b10831db8fc21ca48ad22eb08d4bd64641f849ef395d0f";
+ sha256 = "c087b6c581e769ae4d66761ff8826fb329d7f0bf6420b73368d2ceb538bf3d9f";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sk/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/sk/firefox-133.0b1.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "53bdf98c1b6f21c8134d3f68241dcf64bc351f5926ee23ef1435d5e1fd7469df";
+ sha256 = "1b1226826371a1ebe2fcff4b8c874f0e0bbc854f8a3d6ea38aff82ff859b5eb9";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/skr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/skr/firefox-133.0b1.tar.bz2";
locale = "skr";
arch = "linux-i686";
- sha256 = "780e110da1c6e8c50a406cb20c5dcb25b3ea9be9701b2136372fb3f08226269b";
+ sha256 = "3a40bee963b81c94eac34b0da4163751f04dd97f9e18e22a408ea2e055c34a46";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/sl/firefox-133.0b1.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "2cd694302448ba68635b672597428a605f3f8d2cdbb22df86c57e28d75d1aec7";
+ sha256 = "7b34537382118ab1fd811d81a7ffb2a7292d447d3e5c922412676ddcca2c94dc";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/son/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/son/firefox-133.0b1.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "f73388326340bae37206eb1fbbf92660f6e8c0a9aab266624d71a3e7b6ab3f81";
+ sha256 = "fa1660e07117c736a2d7c4249b3b34da98c70061dafcb7971ebaddf88c8fff18";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sq/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/sq/firefox-133.0b1.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "2468e0434793844579dcee985ba36920d637e4adf4fdaeb4b7c1613567d9704c";
+ sha256 = "e4fb5bfb39bac51113b585daca8d60734a551252d7ae1196fb96023b2ba57c72";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/sr/firefox-133.0b1.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "5771c8dc7555725d5579095f5dd50ed6e23d92361bfbfed4e553bc358549fa6b";
+ sha256 = "62594ac892147e1a21bd7bb7b0d8609e779f18fab6c45cf9910b79bc6a7eae03";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/sv-SE/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/sv-SE/firefox-133.0b1.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "dcd1c02909989a1638dffff4ee1fb75c37e870741dbfd1cd32a3c0b514d6043e";
+ sha256 = "dd1e6823bfbd0063912258e0da87df33d770fef2847643fda0a9b806d196e049";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/szl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/szl/firefox-133.0b1.tar.bz2";
locale = "szl";
arch = "linux-i686";
- sha256 = "d988fdfc0e57fe822e2e41f6e21b3aec3a6469008498f8a974fdcafe2e042f54";
+ sha256 = "28329d3165c3a0f629b71450df71ef264d0b962e0a19969c7fb1dce35c88b290";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ta/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ta/firefox-133.0b1.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "a98e68d852422275c0529050248402ea9e6729e824cb9792df3c55e326c876b6";
+ sha256 = "8ab0bd1542f5484edeb1c8d4290a33ccbac6702bf732e9a57e34e28218605f7f";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/te/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/te/firefox-133.0b1.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "a8050a4a065eb9d6cf78e61dce4ae006c7b6d10dc404b1ae4d201c9403852c03";
+ sha256 = "6e73c1550ea59e9177b13daefc84f9cd024c285865aba024af84ccea87e7ed30";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/tg/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/tg/firefox-133.0b1.tar.bz2";
locale = "tg";
arch = "linux-i686";
- sha256 = "d81e3d9420a988f584564f56293ce4989cb99a9e68beff0bb591ed131baf1d41";
+ sha256 = "956a5816c8d32a9d513fb36889f1910c2d2e61b2e19ef4244572d993bd768611";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/th/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/th/firefox-133.0b1.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "e020cffc3cc7617bae35ed7675d1b264d77e6f0f76800197790941fe4584fae9";
+ sha256 = "685abae351da387a88ab5810c63fc7aba98f2c6329ef278e14666c1528be2554";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/tl/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/tl/firefox-133.0b1.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "dddabf60e22b6e394e6b1f8353dbed640ef5726c795ea5eee75f5b0256fbd12d";
+ sha256 = "596044bebf8631c25f0025ed4b48a3ace63e854a6c35f7e5703780c5df2d814b";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/tr/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/tr/firefox-133.0b1.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "72098506c6015d0d9a419ff59c5271a592118fbcf43417375b6a405ff431243a";
+ sha256 = "a8de705710efc4bba5cd91dccb82d609cb05c218225cd93149c945a1c514d4ef";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/trs/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/trs/firefox-133.0b1.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "0977603a758eb53309b77743d6596fc7a3cb060d0114c20327ebd86277f11b59";
+ sha256 = "2c147a19c1c09ae9ff74f885ba2e37808303d9ad78bc5f20354fcad59d345f42";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/uk/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/uk/firefox-133.0b1.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "196e7aeb323c62e50fb653ce035ebe325c94eeaa8420d5d9980dd46bd4f34f4c";
+ sha256 = "a408f1aff785082a163590575999837aa6ccaf681893266c2a3d497a32a50e8c";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/ur/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/ur/firefox-133.0b1.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "c651eddc5c4e80d6e64b3287e83b7d5dfc6b1966d4737c8cf701b4ecdf076d78";
+ sha256 = "91ccc6797e9db30917880159356d4a79edf966ad55b000bddfaa73d46afab7ba";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/uz/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/uz/firefox-133.0b1.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "e67a0a7ef1a21ae11fc17714fa9c689f863da60c7a200a5c6918c3ac9ec31dc8";
+ sha256 = "58c625b07d58c5d10ac4d445d0f2c7f04ddddbd52089ad276ee831d8af1982df";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/vi/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/vi/firefox-133.0b1.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "878b37478ab82baea6842eccd38ee9edd4062d22344a9d7529368a9a64106132";
+ sha256 = "eddc3be87d3e8f496dbdc1cc722f60d61daf32bdefa13ae3988309e672e9f2ff";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/xh/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/xh/firefox-133.0b1.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "69bcb64b013ed2287608eaafead61bde447627d29f237a380918065cd5887a75";
+ sha256 = "2e78558a4e9861230f145896f3f1d5ea36aa5dcfca8f95dc671f992510f8a062";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/zh-CN/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/zh-CN/firefox-133.0b1.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "9b3cfa6371c0ddf1269d6476833b069bdc974c2c383dbec2ec493784dcf325e9";
+ sha256 = "c4746b06cf2ebdba66d84c4a2e0cd62ff41cb5320f91542c98a315a1c0800492";
}
- { url = "https://archive.mozilla.org/pub/devedition/releases/132.0b9/linux-i686/zh-TW/firefox-132.0b9.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/devedition/releases/133.0b1/linux-i686/zh-TW/firefox-133.0b1.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "dea871f11810dacb3c8a443d85266357a164df36f8e8ce9aa50617d4e09fd307";
+ sha256 = "ce7e0872a09c86c1da689d68bc7eb4adcbdbfdc7d0a9e76ca48dafdb8ba6124f";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 2fe02ca0dd27..6b9182be8128 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,1035 +1,1035 @@
{
- version = "131.0.3";
+ version = "132.0";
sources = [
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ach/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/ach/firefox-132.0.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha256 = "ce47276828a6095998329ce540a2782ef05f528d8bb8b0734a996750c4f74297";
+ sha256 = "acd9f1aedcf0989e73d29e8b746307db747749163b1b70e8115cf4b95fe0b6d5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/af/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/af/firefox-132.0.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "0cd67c3385ba09f779020f5beb173a75b90fe8203555bc311e5ccf4b5e45c582";
+ sha256 = "a6e533a28958254723b2b6e7f1374d82cfa84d75e1df63f9deda049c93ae48b9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/an/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/an/firefox-132.0.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha256 = "0e03aae4398859378d4dc590f7df6085e82162ea3ce514e4b90660d452d8a9cb";
+ sha256 = "7cb7f0e4eb9140cdbedccabc181eb5d434af6407a68f12dccce1e32c50ed36eb";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ar/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/ar/firefox-132.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "de9566430fdc3a7a9de14d302abbb8d55a693bc5ffdb33c9078cb844578701c9";
+ sha256 = "9be0c8862d4a9611331e62e0f425c9ecf4ceedbc4673b854e13a9d45b738193b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ast/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/ast/firefox-132.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "56ff77e155ffc8e7ba9123d36aa45bd88e05128a360e7820a6531b5d80af3be6";
+ sha256 = "c0bf3697926807ff698daa1e0f68de1f2b8dd540b7f5bbd523a8b9a044f0b9b6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/az/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/az/firefox-132.0.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha256 = "c3c5f15c91011b7ff3fde9f19345a7594e4dcc600df8191e26ee4480219c5a0f";
+ sha256 = "b9c0ba1c994976d2872ff7894f7226cdfeb9ea9e1356656abfd89be2143c8db7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/be/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/be/firefox-132.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "d552d1f041fd36e2d6f46e947dfb35e4aaa2a8d64a5512a6c071e4c4c971fdf3";
+ sha256 = "1eba7740abd4f638070d689e73eb6a38c0f7a46aff4c09342078128cee98a6f3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/bg/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/bg/firefox-132.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "2f13001eb0b1ff4d7b29daee49d1705770b30e7e45c40a5bd900ad4f20c04d28";
+ sha256 = "35cfe8770d9fd40c5ab998d0d321d83dafab6611201266662eb0d15aa5fd237a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/bn/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/bn/firefox-132.0.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha256 = "4f221f904faa65eaffd6b904aca950985fb78909fdbe7408571e7db255aea7f1";
+ sha256 = "5356f67e598275bed2a56896bd2e062b26d37277dd45967dfcc583b7e6bf0c92";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/br/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/br/firefox-132.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "9adb4e21ce0a260bb5330a2c4aa7444218267d161ecc2afb900e01a2f50d0e45";
+ sha256 = "dfcc5bdf9a3316fb486819cefc0b83efcfd27367e8a70978e57222fe097c913e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/bs/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/bs/firefox-132.0.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha256 = "457fa7666193592bb67586997d48a345276b34ad2003885676412daa89cb8ccd";
+ sha256 = "eecc9501610187ffcb930881020dd36ad1fd84e0d9322cc4808afbce48742e7f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ca-valencia/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/ca-valencia/firefox-132.0.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha256 = "2a3a87879e638b7fca61abc8759fac4ac52c36d4eca3e70a65be9927e70f62f0";
+ sha256 = "060b33de75f7eb3b5d267a29b57af204ad9d36d74e9931de2a4c79324c9fb84c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ca/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/ca/firefox-132.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "b758cc28757d5140f35b5587d49f2c90f4af06a5afaedc8dd3fb8883194bad23";
+ sha256 = "bafd5a64b747e44851bdb35b21d92d85a186a2b97171291da29c46f5526c8b5b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/cak/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/cak/firefox-132.0.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "d16368cdf360e08a6588be9ca9b69622f946296850e34126ff8ba529b1090b6d";
+ sha256 = "31f09387eabc06169674091bad1131a7111745ef60f90061d2a7526fabb15539";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/cs/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/cs/firefox-132.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "23e36436b0fa5a7ae52cbc4f1ae28e94827f59a29af22203fd18adde7e31122f";
+ sha256 = "19f55b0780d2ba4bbc80aeb90b3a909e15d3c837fb6d2d9edf5d0548178454da";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/cy/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/cy/firefox-132.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "79a0d2f132e43dec9bb9f800614977befdb7b3f9b3d727dd28f5cf61699e3e53";
+ sha256 = "75af805b3fa4211f85817c912ed6dd16d557d60b0be338a11c3ae3a8474d7921";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/da/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/da/firefox-132.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "292198bfb3f0cc0ce72fdb6612537771f2d273793736f8fb00003d864eb658ae";
+ sha256 = "60b627f5c6ffd810aff9008ba980ed59609e73a336ceb4dd2a33c2806a9f99f7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/de/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/de/firefox-132.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "16d96676a2716ee32077334e505a751ef7de435f2e9f7d2755d8a52eff3351f8";
+ sha256 = "1515af47c1a39034f6588dc49c34a54c9041dab7bb21da97c785d5cc5f782d15";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/dsb/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/dsb/firefox-132.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "0685c4ec44d825d9441342a40f88b77242fdca6458d499d7fdb94b94a01f8431";
+ sha256 = "f0b6eb93066ec361a925d9c02fc9bd64c5c47447f96f9d1245d34ba5c91fb8cf";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/el/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/el/firefox-132.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "561b9796b0064aed074662f301020cd2b918b77b014ecdb329e784c1750eb2fd";
+ sha256 = "ec17f655d543fd1165bcac0f550c09b8651ee34383f3b4af4813be6a17e2ce75";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/en-CA/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/en-CA/firefox-132.0.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "75e591078f3130b441bc6bbc22a428b3f46e4544bfdc0432deb176f5e50f66d2";
+ sha256 = "63f60168040813d8c005dad11a1a23169bab9fd610c9f3113f14ac4ff511674a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/en-GB/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/en-GB/firefox-132.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "7e4909f44680700334ab9e68b7ee676b5c803ada15acb150aa4cc5f28b62d94f";
+ sha256 = "cfe26741acab5158fd849e9f32d4ab41de8a6df1e395031ba1ac2e18806d4e92";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/en-US/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/en-US/firefox-132.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "fcd1e93221074a7b44445a99d81ea26e95fdc4c7e67000e748dab93cb12c2a13";
+ sha256 = "e3a6f9a68ac72f5df01fac8c97c6de1a353af4b350b8c8b49b2c26c1fbbb2538";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/eo/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/eo/firefox-132.0.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha256 = "43e2ccaa45495ca3d2ac88975aa026eaa5ff3ad26c7fc7f0b345e08e7a2bce57";
+ sha256 = "d72048abe56b485a93bedc4ca7392604878d211992ba7b19ee8e9e83826b18c6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/es-AR/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/es-AR/firefox-132.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "9b54bbd5562423f4cd35dbafcb87eed33cd390bae464aa8a933a10970c7718ef";
+ sha256 = "a4c9c84555f69d82f5bc49a1d5bc7f3a1cde9541284d08a4b29f40a215817f30";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/es-CL/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/es-CL/firefox-132.0.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha256 = "e05306d953a51676de4c1eadba4ef1ddf5d39f7b951e29bd67f21d125b1a8016";
+ sha256 = "972a7a30d8049ed343cfa3f88beb818c3cf17903a61124b8bb5702ba4b68f343";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/es-ES/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/es-ES/firefox-132.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "7f3cf35aeb310ee49517d8d8a805d70680dd82fddd6feff89eb8ef6c00095362";
+ sha256 = "d8255165813c12da4d77b1d7912015fa73d08313a9f8dc29d2b8f293fbd13564";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/es-MX/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/es-MX/firefox-132.0.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "c6321e405ae767190defe1951e3c8dc638beb4d6ba3d5ed864a906f60c72cf2f";
+ sha256 = "c2c58c9c1831a63a753f336362e04ec70d807e28ac7e39e1b1c92e078b662cd9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/et/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/et/firefox-132.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "9445741ba8f6b4d143850dd83c179e5de81f6227cea223d661a2f4f3b0a24c11";
+ sha256 = "7c35bb71cfa4bd4e28301a1b91430ed642860ecf5b8ce810cf3c1790e034af74";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/eu/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/eu/firefox-132.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "ede769225205b61fa4e374c94a4e2696df8bab7561a0676a20d87cb3b617fa6c";
+ sha256 = "073a77f1db4adb5afd8139c0740cfb18b3aee2ffee0e51a646b2371dd98b7434";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/fa/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/fa/firefox-132.0.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha256 = "4ca3c41a73193e08c48cc26db5dfbaba240cbca27ad0febccde5b7aafe4af2aa";
+ sha256 = "f6b55569eb59c0d28904c5dc39fb4c3db8796e0bc281568200aa373183cb4551";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ff/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/ff/firefox-132.0.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha256 = "4513378ad48bac6b5a2f0f7d0dd25ce8747fdc045f31ea38334b6056ef0de7ce";
+ sha256 = "aad485b6ce2aeaaa56aa3474e88c801bbc93efd66222f744ae036d5629403ac9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/fi/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/fi/firefox-132.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "a52e910c49225b7d9ecb3744490877e60099a83cbfce34c8ed95671940612d95";
+ sha256 = "c5e0cc62c02ad38b43f14391424a9ee4d43c4bd4eac13d9a54c36060d851bb95";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/fr/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/fr/firefox-132.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "ff1e7a923e40804c167fa7266a7fff3cc35399cf102235c3d7ce7255f8eaf931";
+ sha256 = "23f12d4303cd9bd998f8bb1e800ebd36bdaaffc4f14526e38010f7d2827ecb11";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/fur/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/fur/firefox-132.0.tar.bz2";
locale = "fur";
arch = "linux-x86_64";
- sha256 = "e48a78c85cee91b8d6ef932b9358fb8e4b4a9dea77290c86eeb3bae6ea38cfbd";
+ sha256 = "9bb2058fe18d985e933c3478f6d351e04dd9f7d39f15113b5d27f88e61973f38";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/fy-NL/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/fy-NL/firefox-132.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "77084f712f7bd549219407a5c9ebd29a3795b259316718be43d6b84e32e7afd0";
+ sha256 = "a2948787dc34588b09de58d1d74d4e76d8834465f95180785eceb0f14b891301";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ga-IE/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/ga-IE/firefox-132.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "9c5db3b47b35fdbaf7a6e76e66d6ab3d1c378754d3ff0690a2d4ced6ede034cd";
+ sha256 = "be6b67420a92c5b9ef56d77de864ce64852c5dcab181501c6d41955704bf2126";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/gd/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/gd/firefox-132.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "1a490c57b83596340a15ba02c0dbec5c949ab918cb734a475e65b1c0272473d3";
+ sha256 = "ecf63146d4659cb37758239916f241dcb6a991f9a8c36a198a2b76e589aaa3f8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/gl/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/gl/firefox-132.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "3765483fb85e810b3aacca4850c34142d714fe8245e2037fc814c27249f99be4";
+ sha256 = "6c73d6e67691ec145fa340daae59029f82fe73a6767ae820859fcc162d86982e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/gn/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/gn/firefox-132.0.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha256 = "ef7319be7e1c911153102f92221b0058eeb0467b76e419fef401cf436ba3ffbd";
+ sha256 = "0b30c4b7a440ca26fdf523cdce63f02fd4e93b0bb58dd3ea8cf12c1941b65a4a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/gu-IN/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/gu-IN/firefox-132.0.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha256 = "408d8b9a40fa7f1de3b3641e5f2bec55ed32442291b947cf4c0d8959155b22ee";
+ sha256 = "b6589793e2737edb259ee8294161b47b8c74f604d64aef057c9a3a70eb6529ac";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/he/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/he/firefox-132.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "a44352de8e38088aa63900d5da91e572304eded71194dfd4f12038e3a0b58957";
+ sha256 = "84b13074ee23dca71d4992f98cd1b036e7432fcc6c0edf7b7517a739e3caab77";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/hi-IN/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/hi-IN/firefox-132.0.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha256 = "1c020f0c472e47076c45b7da8cd8611099b028bac85cd5c1bda05c34128044f4";
+ sha256 = "78872cd66c3c635a857b08f20d37539aa4b6b6a75b75bf39120b9b1b7b421429";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/hr/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/hr/firefox-132.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "1e078593bb28423916759ac9e1ac42a16b2d0506cdbb6166ededd7900bdfda8c";
+ sha256 = "7d85b9f1e379b50094caf14dcbffb8129653f1ab43f5228d3dba7d235cb43001";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/hsb/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/hsb/firefox-132.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "a451016738f59f58564f32352870dac276f3f5be3d271403a7cc170f20cd810b";
+ sha256 = "c94ab3ab3a5ec8019c9f0911c3ce6c4cbabe041fddef5e882543f3183923f116";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/hu/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/hu/firefox-132.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "0effc6e589bb208bd6cf255be743a2e3f87ab9667b5da79c61dad3552123cd2f";
+ sha256 = "f7f8e7fe209b2b783e90f557997640eb0ec6eafc8b6a97216e0cc9359c40e4a0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/hy-AM/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/hy-AM/firefox-132.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "c72d175478ed98b98d301c66aff8973166d6d5144232c1e357cd219990aec28c";
+ sha256 = "c01aadfbabb1963aa61bc1ba64a4cad06f7d20adf21567aa9e72677a99e144a4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ia/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/ia/firefox-132.0.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha256 = "0b71dfc7db95af38b851bd078bb208acdc11a3463e96b8e980a1a72f2876d2c4";
+ sha256 = "27ef246627210feaf9ebb3335a8c3bee65b524d44ad1716ae3457d3d5d58b44e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/id/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/id/firefox-132.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "ba7c1ae12520986d0ad2f80c2d302f6b0ef7b9251e0af91ef7077bed616ddef0";
+ sha256 = "9a6aca0f8291603faa6df26a5ed53af21989e4543f4bccc571a419fe8266a7e8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/is/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/is/firefox-132.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "108359593d08c9151f5f126499f726887082f1ee6c2876e5c55a13e68b9f7cc4";
+ sha256 = "bf2f41b216efc6a9af207addbe44ad614a0a23b0a1f51a0c114297469d6557e6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/it/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/it/firefox-132.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "c525529e385a8b125cb2486c6fb8ba616a8dd454d0f5bfb1baf7ff8c375e2792";
+ sha256 = "a89e6242c493b1b67dc67e3fef21c5440af345d91b06afa388d7aead27d5607f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ja/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/ja/firefox-132.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "1772ae1f653aea9113e770e9c33845d2905d440b6d2bc677247f05c414ad2736";
+ sha256 = "c4ceac3cd890a6a1b91ff4e472f7386a49f489e049ba17436d286ac53f56a0e9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ka/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/ka/firefox-132.0.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "8ca958603d9b94a68e54b94802de130f65c717378e19905199452a35f27890cb";
+ sha256 = "16a66d7d4d3adc7f0f2e4ae548fb8ec28cafe9900ab51d0973a371b8051f0d84";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/kab/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/kab/firefox-132.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "6da53a8845754dccc1889b8b888c4ab0a7bb62c679d2edfce2d83cbcc622bfc9";
+ sha256 = "1e0b19cc25ef0998aaa5dcd63486144ffc19c79ed9ee79e5803bcb62daf5af62";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/kk/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/kk/firefox-132.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "24eb87af3979ac820658205df96bf5b175c1023fbe662fcc3bbe25f27ce4c3a5";
+ sha256 = "5d3f91a218afef88b733a7021fcb4a97f8664263272243b593efaef5ed149e38";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/km/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/km/firefox-132.0.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha256 = "b979e2f00f65372d13a2c95de9e0bf4af2040ad32f9042f1289d09cf3acebef7";
+ sha256 = "b27e1fc742ba9e6ae2a3d2c07297638c8ae38abb2ef1cde26b70b7e1cb36943c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/kn/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/kn/firefox-132.0.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha256 = "2d32546b2fb266ce46abd45e1f82707377cf8de6fa2579e47848a508d4f2c22f";
+ sha256 = "60eed55c889884c61f17afa42b8df028ae4e90350147a64a8eefdc4d449a85f4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ko/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/ko/firefox-132.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "5bc37161aae629f8b80cb558b29f3284015987cf4233ea3808b45243e9c683c9";
+ sha256 = "cfab24961f8c00be3593fe5f112e535b4f806b4d156b90086a5628af3fbeb2c2";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/lij/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/lij/firefox-132.0.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha256 = "a732f7208e985c38209d4798f6a3a74a2dfffa9465ad40125bb03d14502a9b46";
+ sha256 = "e56ebf805aaa6b1fe429fd6e536e36723eccab5ff952f7a84283926e6cc0fc32";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/lt/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/lt/firefox-132.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "7a5419e60f4a9723b04fa71ad3ba9c255517f76441acf1b8059dced796aca4fb";
+ sha256 = "d7974f3746a0fd842dd0aed541d86706e08342179b7b92688b7b27ad96f4ac58";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/lv/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/lv/firefox-132.0.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "3636dfc8d55ae6945ad81b33a39696693ff510ddcd8ac1a4bc75d49228f1acd7";
+ sha256 = "89946fb6d98c7ed4260c9a1514cc7433f5c7fa78916207ec9c9e8d51c239db96";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/mk/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/mk/firefox-132.0.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha256 = "3506d91692a3dd74ca545b7f6e6ca8626f05e50896377933e222dd74a3c58870";
+ sha256 = "517aa55a343f22f31f5b3000bd61940d07a693bafb0b06bfcfab7661be8cad99";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/mr/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/mr/firefox-132.0.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha256 = "817032106f3daabeef95c050f788a625979481167c21a86ff95ef0a63d574bcd";
+ sha256 = "5d36dbd1cf80958c99195674ba9919036820383a7d7cab18e237937588297296";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ms/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/ms/firefox-132.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "140980a0255f64839f726dc93ad05035946871917bd2fa5ec4bd747046d2e93f";
+ sha256 = "a42a2b31193c8f2ce050c9bbe7b04a6ac7a0781db055b572bf9b29ffb3a17d53";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/my/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/my/firefox-132.0.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha256 = "c9d18fa0c9db1d079a8bfe6ce693c5bbf50bec76d8a9615626ac07032e9b35a7";
+ sha256 = "701802f110d3a70743c42bde6d82e56f990f627c9f6af19a4ad2e05afd6dec66";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/nb-NO/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/nb-NO/firefox-132.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "11ba3290b7c01c66cfcdcd1d474a979aa81e15da5e5cca91cd0919e8de18a2d1";
+ sha256 = "df03253d9422d5d1f1cee75f37fe03e4c59819054296d3f44f547f39924b436d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ne-NP/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/ne-NP/firefox-132.0.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha256 = "cebd7f73b3e8f834f54e699b534ab441affa881d77004639cf6f31b6e7d322a8";
+ sha256 = "e368b8e09e67d9d948ae63873e82316b5f61612371dad7dcc3f605a9dfa05d6b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/nl/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/nl/firefox-132.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "d96d5950779cb4c807eba5ff0538ac0ea97dd4296eecb69169033c8c8de2096a";
+ sha256 = "9fbdc9b2da9a84fc67b7d60cb63baa5eb54532e947fa59934d31ea8c1c1fcce5";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/nn-NO/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/nn-NO/firefox-132.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "b7af3b8c3639a71111aa40ba9fd25596152ec55cf9ce0956ed1b00af86d60a66";
+ sha256 = "7fbbd4562faeb78b2d6b2136b5d002a0a7a283610128d55ad21378ec139aa98f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/oc/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/oc/firefox-132.0.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha256 = "6c7cbae9fa6f1917a30716168052f7192bef3f430b6b001425e8d0e003642d27";
+ sha256 = "a474b6f65032501ccb0bbadeef18b403735640936fd3d73f9b5ae04a28b71576";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/pa-IN/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/pa-IN/firefox-132.0.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "a83758abfb8ebd43b4c13a1d30c1b28d1cccd933c78ae05b756f1550e36cadbb";
+ sha256 = "026acc63bc528f65c0f1e77eb88146c256d5e3d31143849d24219b36ca63f446";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/pl/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/pl/firefox-132.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "8b16c40fe31f2032fa7f74284bc6e21c86be0499f992a003ba9aa883ee79fb2c";
+ sha256 = "11743e596451830f0e55249b4c68ef5c0bd79366bc542b31282736f32445010e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/pt-BR/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/pt-BR/firefox-132.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "01eed64b8533fb5c3c00c9603ad874d490786b48ae8d7234605c0166e1bdfa0a";
+ sha256 = "4b205c4c0f2374c8a54f6be0125a2d915a4ed8cc630d09f0d4b41317589d5879";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/pt-PT/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/pt-PT/firefox-132.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "619c4565a70b666264b8e23edd44e1656e9565b441435c6aa2590c675b3a2dfa";
+ sha256 = "7c7d52f11d5088aeab3c41cca2a1bd915e111aed13b647920244a5ada8eaa456";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/rm/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/rm/firefox-132.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "86e5d4bdf323258279a2a776ade8b135d2cbc2f7ae29fbb13348a1ac4281c04f";
+ sha256 = "f5a53373c7222749d6354da8001e74910553ff88ad7df59ef3d607fe27ee0dc3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ro/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/ro/firefox-132.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "55cd7161953e23474edc3f1a1d0e708e38eeff17b5fe5fa8a37216effb6a8942";
+ sha256 = "2e99ee2b78554f639290ac08ed041da8692a08254def17388761a44693c24d3e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ru/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/ru/firefox-132.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "44a82191b04e93e4f537a35753e6b7134f8031af402cd1c4902ba5d714751af5";
+ sha256 = "0ab52839d6ba7b79401e053a1e2607bee6f9e4004c0b2cb6b9a1cc7a42139f91";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sat/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/sat/firefox-132.0.tar.bz2";
locale = "sat";
arch = "linux-x86_64";
- sha256 = "7211d7b59d22dd3e5f2ca5fdc13329d69ec0ded8bf3ee4d9d99dc61c316435df";
+ sha256 = "17373bc6f9c7d928f86a4f8f020627d76ca0e62ef82688b1d607225c57b81cd6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sc/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/sc/firefox-132.0.tar.bz2";
locale = "sc";
arch = "linux-x86_64";
- sha256 = "bc58f74be8f159a6c982a133e83e46f5ca0390d8d3469df89daec6894ba9b022";
+ sha256 = "a870af53d61a0be499f9c49e2809075988d5e08e3265192e9ef836ebaed21652";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sco/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/sco/firefox-132.0.tar.bz2";
locale = "sco";
arch = "linux-x86_64";
- sha256 = "018f10b910c1402f5f03617e57715dc52d86595024593fa75855bcb955fbbaa2";
+ sha256 = "ecded128f3f6ad96262ba2e1708087b84453679bf3ac1e70e4e1720913ac6d3c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/si/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/si/firefox-132.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha256 = "cac0646f559ac272ffb1f6d722ac12e4af8d29c754a87fe2a3efd4165b7857fd";
+ sha256 = "fd1f036f1a853df770a7fee1a3ce470534dabd9f5c78caa41f0bb8ae49074969";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sk/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/sk/firefox-132.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "a4be0c45b86fd09d81ae2f28b273f8fccf2c5fc64f6d1361a6b58c289cba25f1";
+ sha256 = "203d09456e4bdf153691639cea51e53490d52d37e81a97f2c4bdae6ec1c72d3c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/skr/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/skr/firefox-132.0.tar.bz2";
locale = "skr";
arch = "linux-x86_64";
- sha256 = "dca803c585ae209ad97bf193990b5072dc02b145e57a576ac24208ccb6081ab5";
+ sha256 = "cf54823803c2dd374e9681c0e372af10964cdaa449d4b59fd3912bbb6013ce79";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sl/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/sl/firefox-132.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "2c6d810fb8e75f8f7e58f5bb44cbe4ee699aec06384249afebac93667990c4ec";
+ sha256 = "88336440e7588baf2d0c7fa0b2f6a366d8bb76008db7412375d7178695dd5563";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/son/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/son/firefox-132.0.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha256 = "8ec6a4d9bf19ff26caa7235aab596a0a4668aa53d38dcefdb40061ad27b04c0c";
+ sha256 = "83d2cd924a07fa813a2ec662064677ab1fc3aa0ab84b61e3628a94050ed4ead1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sq/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/sq/firefox-132.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "1495883fcd77635e68b77157213a089841a4eca0bcac68944813c6311ce516cb";
+ sha256 = "81dab73bdb59d69b6f8d0ae6327ab59c6ca026d55f1ddb953e1aae582ca0c515";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sr/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/sr/firefox-132.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "54d80555fb0a66de7e936b7b561f1a897d90b062ed87942d11b557cc75de6c25";
+ sha256 = "4a2d3b16da394edb51274b5a0ad96896d401bf1e5c75469072fbb1d0311e901f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/sv-SE/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/sv-SE/firefox-132.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "a12623662b0a36f64f382f3c193deeb19d8d0efec77d33e5c13e72db54e9f417";
+ sha256 = "c70bbe5e002b853083ff8bdc86e309adc446cc718b2549b1983c53be394830d7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/szl/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/szl/firefox-132.0.tar.bz2";
locale = "szl";
arch = "linux-x86_64";
- sha256 = "8e49f5c4616bc918726f592c42fcb66eae00899169a3b0397221088743387018";
+ sha256 = "1f2877979ffb9d8ae0c31f5dcfe0c2a2578fc08603d4bb8085a951a849a4113c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ta/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/ta/firefox-132.0.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha256 = "ca004eb05ce3a76c210eb2d8d6f5cecca1bf2156a335af733e9f74d1e9c65a48";
+ sha256 = "72ad820f6184e6087c12d807ca8ac7912ba5f73e4e6b153b108d56597d15ca1b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/te/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/te/firefox-132.0.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha256 = "12ecd877be831b33f46887fd44cf4def9a48e7b0b33505e22d457edb7cacfeeb";
+ sha256 = "651d563fbbfe2ef435e0a086473ca528e842d64cecde136ed64c5c0a4fbf9fb7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/tg/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/tg/firefox-132.0.tar.bz2";
locale = "tg";
arch = "linux-x86_64";
- sha256 = "395d06d3ea004b1ff93a22f0d51f7737cf96abc6efe3eafcb5cf04a56e229517";
+ sha256 = "a38836bdedc84ba209b619b0b5d619b78638db7a01ceae7ae3cd0ee171ed8f0e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/th/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/th/firefox-132.0.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "432272367757339ec6bd3546580667167ed803ef63fe35ea0653e48ad4186c4b";
+ sha256 = "53b5a946fa8e58900c2fad63d1d244e2503f4ff4e576c51cfbda39fa58dd0585";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/tl/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/tl/firefox-132.0.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha256 = "7bbb560f67061703a64173ada96de177f0f72c82b3b762aaa48f91156c47553a";
+ sha256 = "e8be35e0aaae5fbc231acf632cd435ee3329b698bf69e0740172aa69446c1bb3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/tr/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/tr/firefox-132.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "a909002c7c65a46685b13120ecdb51f0e4258c9642b8b397aef7e3d076347d8e";
+ sha256 = "cd2dc794b9d9f6c0d6ad4440ad06254cb32bc8a5d5a8eaf920853e4203ea1ae4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/trs/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/trs/firefox-132.0.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha256 = "cf864d59c1770f66b72350410de5f399474cadbfb002c5f5bc260c8fd7663e3b";
+ sha256 = "10f356c3aa2e32ad94f7aadc0c0c44c0e5a4d6f0c381e9956e66bdcc33e11450";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/uk/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/uk/firefox-132.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "7e532caeca1b7ed4bb5e504b3bc8e0debc4e6662701dc4a848bde17a5d8ad99c";
+ sha256 = "d6d3fa7ae1e16ee80961b88cf3ce3c5a1a5bfacf9c5c73367bff989dbec2ceb6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/ur/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/ur/firefox-132.0.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha256 = "5ef435a27a1895f40a0650a7dd844a57f81f1d2ff4ee10690ca14b0b609307e3";
+ sha256 = "85abe78012a7f1b430487d212bf5feffd010646b35ed6927f5679f84aa9b0e02";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/uz/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/uz/firefox-132.0.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "478711e217df79f2748823d1ec87087a314418741ba94a10c1027400be7ec3f6";
+ sha256 = "5a279119f2dbff5ff6041a0984cf964c94f52944495f38a548c8c51ad722f780";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/vi/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/vi/firefox-132.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "de9fb8a496929c4aef13a439c97fd46e209a39c1c5a293f954c92339597b41d4";
+ sha256 = "9cbc80921900ec43313cac2609b1c77526649c44c91d5af60f14eab1293d96c4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/xh/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/xh/firefox-132.0.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha256 = "b562f7c49bed4df61b2d70688b1288eb6b49c45e9c12012156826fee17f641ea";
+ sha256 = "bb0f67c4d371d2e9a2b5e200fb85751851fb883881f223eed8c921238859e622";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/zh-CN/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/zh-CN/firefox-132.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "21ff6050e4f0f246571441a56bec153c3889d3b97c06cbb3fce02437b8af6c78";
+ sha256 = "1e79dd1e9a681778f7e1b38f1bb1e9e9dab3461495cc27c29507c49abf4d6a02";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-x86_64/zh-TW/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-x86_64/zh-TW/firefox-132.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "409b4210d26bbfeebcaa430827453342b37d4a0350fe71f38ca5df92566921c3";
+ sha256 = "b5dd8542b7cadd85963ec41381877e1ba6b504595ee42cc29096427a7d0c5567";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ach/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/ach/firefox-132.0.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha256 = "f1c7fbb1c80ecaf8538ba11082480093384ec412425ac631a8e0d26dba97e3c6";
+ sha256 = "f7c3d65cbf7d4cb89040de5c3172ad5cea65c66a38272ff39b990e385126d488";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/af/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/af/firefox-132.0.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "d949151dbabb4d604b15bd10122ece59238fb750d553943ed65026be0aff002d";
+ sha256 = "98aa662ec9b0e8f328a84f8396f529efa16cd42f3834d4cf0b73bdb3fd8b5e14";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/an/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/an/firefox-132.0.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha256 = "179e5dc0a40e699a62ba5ae7bba054fff4591cca4f007d264c00367128dddc04";
+ sha256 = "e609755b52801743a96269f67206a03d3765d69e61faee6dc6fc6e3190140c34";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ar/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/ar/firefox-132.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "a7fd2ec3a42ab565e6700887fd41dbdf722fe0ca060946ebc30ac1413d2a6b4a";
+ sha256 = "eb34a39326bde768e81c937b70af99b1aae83aeb570aff13379c0eaf302615a2";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ast/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/ast/firefox-132.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "cabed080c18c7196702d7efe58fee86765eded008d97e387b9e16dd316c3242e";
+ sha256 = "cde5621a117a97c6ff6e360c670151bf713c79c88b08be5ac31ec6a19c5a766a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/az/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/az/firefox-132.0.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha256 = "2d99bc14687696e1a1e78c430ba3f76459afe38a78a8a43fd7d5409495fb6d1d";
+ sha256 = "2255a82f75aba6fd36d3e8762bf5554d14035bcbf65eaa9f4ceccbb83ac351b7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/be/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/be/firefox-132.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "2ee2c35577ef44732dcead0bd28706d41052160472073d317bc52659af93e68a";
+ sha256 = "9d45d5765e65e49836639b49607c51042d9073241498ed5e88630c56bfb138ec";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/bg/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/bg/firefox-132.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "ddcaa48d6af6d2140e8b2da203d5b019580803945f6df54635d04dffd748294f";
+ sha256 = "164a237560da46a0f7ace139ae162c32f9565abe408a1a99daa1fcb29905858d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/bn/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/bn/firefox-132.0.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha256 = "65de4ff251d795abb204e4f912fc0aa1a6f161702f0747558edfc29187443744";
+ sha256 = "d03c21cbe08a7a6132c6818448194a03b59ca5515173e38d26bc6ffcffbb449c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/br/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/br/firefox-132.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "3df79435c6c9c4a40c99456b6687843802cf97f1c339cb99edcda564586cbf89";
+ sha256 = "7d26466d0331020e56a5ccd35a8f0fbb878a85302600f764e1982eaf308e744a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/bs/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/bs/firefox-132.0.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha256 = "9b6f1d25d31aa3a45ca857c2f58e68c70ebc122dde7d373905e28ef7c1ebdd95";
+ sha256 = "2b00ee9604156d665dd7d26c58e073aafde7ed548fca9b929c21f857c04fbc9b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ca-valencia/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/ca-valencia/firefox-132.0.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha256 = "26356054a5b8b9b8b03a9d6686be12468c535b5395d9a6f35b719a823d0e3cc5";
+ sha256 = "7e765681429ef6744a11a9faae68a3cfbc645021f44983c5b153bd67c4e92061";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ca/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/ca/firefox-132.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "a01df01cc831468ef5cd3abb90063bff6233877deccfba4811d20fa9f964ea45";
+ sha256 = "191f021a12437c8d49285a7f2cb2800a563f7c778ad0b561f2c80e7ca8e7c10e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/cak/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/cak/firefox-132.0.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "3287515bc6a6e31f6b6fcb7f86f5adde8772671150b6cc07b8e4d0527f945646";
+ sha256 = "8a9335266f14836b365ebf03bdd303c982f12ab93ea30eef4fd5a5c9c06043b0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/cs/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/cs/firefox-132.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "a6b8cecf6a04df386250cd5e05cd6842afc7d1b5572d6f44a0762f32feee35f9";
+ sha256 = "4c1f74973693aafb60f4322adab13b875dd9918665685cd6947761c27a3a3516";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/cy/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/cy/firefox-132.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "3a5310e276c8fd32f01ef894faffcbc2f209ae9fc74d2fd0ff59acb92604a0c4";
+ sha256 = "20c2c310d996608541e84640bacc737dc5f9d91d860ab1e7e3de10c9cd5e5d02";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/da/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/da/firefox-132.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "54b09e0364c2e77783e458c4f88fef07fd99d6871a5ad0b808640c0f717f5fef";
+ sha256 = "ef86dfeca302b783355f04c802fa8086be72fc993e3d276f437fcf06e3cb0e4e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/de/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/de/firefox-132.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "687c2a7feb76d6fcfc7da35dedea8ae658547a3a420c2d5f5e0cf6d3f9d1e8e1";
+ sha256 = "e1631f5fe78ad159fd9434d0dd0748c3efe122c1b092c929a5b64bedbfbbe85e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/dsb/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/dsb/firefox-132.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "87d2724c10312666cf64871356a062b8394f6f30a986849f1d8279f378f9bbe4";
+ sha256 = "0c05ed07f12212745993a00ea5c460bf906177b2d5f702a8ed358ab567b102c7";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/el/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/el/firefox-132.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "0e23fadf9196ba7691e016ed6ab8a19d7327f338364ff59893ba0150ef127130";
+ sha256 = "c846facc6336f00e56510f40937830e391ac364dd9e3afab6870352fe246ffd3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/en-CA/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/en-CA/firefox-132.0.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "ebc16fd234ed1bcce9405302f516322edef094d6cfc9f72970a3630bae791059";
+ sha256 = "023cf9ef67e41975c035df68b665f2db0a48b86fdbac1b3cbe32bbdc7729feca";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/en-GB/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/en-GB/firefox-132.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "74600884c3549e3aa7b66e48c790366ba94b531bd2fc78949ac38ee8027173a8";
+ sha256 = "955fff4c4acad33cb04ea9f2f8e110a1260a3f688e0ede43240235c29976f01f";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/en-US/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/en-US/firefox-132.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "84cb77484bf65fda35e2743553990ab67c9395722082c087e884ee7b62e406d9";
+ sha256 = "c3e4abd133ba30e241b4212b1ef99fcb05f96ca396b20058461dfc280d87330a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/eo/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/eo/firefox-132.0.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha256 = "8d0c73401acfe280857988dc5b3859c0fbc07d0dfe1b50e1fcbe397af01d44c9";
+ sha256 = "3c334749e0dbd7c9f39f2e6ab72ca9513e21bc7cb8b0ea4b51c4464dc20ea509";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/es-AR/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/es-AR/firefox-132.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "66720c6d506236f1ad64b678aba9da2803c452195a5b6c1514b637ad7b2a6187";
+ sha256 = "70176243b433d36c18fdc4b728429ddd6f2c69598486ebab52089b385e4896b0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/es-CL/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/es-CL/firefox-132.0.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha256 = "df09892e9cba07d1ffc0619aafa8d97a27d3b223f0fdc7f14925a53342fb8dcd";
+ sha256 = "3b888e69857a8857f33e9c1f1ccac999220844ef8268651e50450454fc02f0e6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/es-ES/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/es-ES/firefox-132.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "2392955a532eb935fdf3cc98323673106ba9d25f26492c629fe47cd17f3c9c2f";
+ sha256 = "66ab2fdad2ac71537708ddddc75117b2f5352d144e6de821d1d0b94a94ccbdca";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/es-MX/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/es-MX/firefox-132.0.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "9b47a1bf83dda68adfe59e6133c25f5664fb3777f582871ca1ad5576a8ec35ce";
+ sha256 = "2a962a534b705a3d9250e7558a0e12b393d6cc6cd54842b0b4fdfc7b36e0fc8c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/et/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/et/firefox-132.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "b4023d8f19a099e6a9069f03f5c9ea8a21a9dbf26de4b9564a854c3749126b26";
+ sha256 = "9aea7650fa8843add4723fc985d0b02720f1a24eed5d24a6677cbdfefa326eab";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/eu/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/eu/firefox-132.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "2831dac7e375e8d5fed4747ed9f0044b05e8bc4a0f405fda9256bf53a711bba0";
+ sha256 = "218c4eb9bba5d33dea60b9ce0faa716ec994e4103f6650c15ffe3b95ffa4bc09";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/fa/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/fa/firefox-132.0.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha256 = "1e38b9868f4bf4556d3a6fa0ca8e6a0458eb33935419e0966230b3dcd60e61a6";
+ sha256 = "e091f4d8b8f11b66b89abf288a321da0b31784753cae786bfc96aee8fc1a8f99";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ff/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/ff/firefox-132.0.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha256 = "e6c44ce503c278a6f367b6839d04372aa94544422bf192b0b0f92aa64adb8422";
+ sha256 = "3a7c3b07e3be60d0c203b20225523bd647de1f701bddc5d007c8012ad03a38dd";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/fi/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/fi/firefox-132.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "0110d3b07f41a6ed5c0279cc77a939709b1f3978371e4c70d82ae4f8bec11b60";
+ sha256 = "57a35765ee7136ffb3279eb0809fcfcb47fd69e9e6d879c3fc6537211361f7ea";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/fr/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/fr/firefox-132.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "f96bb3d14c5f674e64205e97cfb131ddb94bcdcb32f7005a36eaf5227c52c43c";
+ sha256 = "9a6e45585e2dce14a03935703d1d6ff2f59338a986b7228b949687e38232e160";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/fur/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/fur/firefox-132.0.tar.bz2";
locale = "fur";
arch = "linux-i686";
- sha256 = "e7e6d0e7d65b374968009dd23ba907e9d03004f0ecdfc3b30951616c80148ebc";
+ sha256 = "58f34f291190dc143f3a87dcc778a24347d39ab4fedc6edcf10ddff0f9d23e34";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/fy-NL/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/fy-NL/firefox-132.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "02f2a24542b6a18c18c98a8576ad33284255cf49d2c8aba7a85ac948829f8ca2";
+ sha256 = "f5fb45d2e7b3ef92da243850ed0f2acb9689160e957d275bc08bb69834cf7446";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ga-IE/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/ga-IE/firefox-132.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "28a7511af154a282418073c1b99c9f0130ec0334ce0089bc951147321e1753c5";
+ sha256 = "f1e8cc00a178357e2ce484460d68e55094338ea26398523fa25932f334ea9abf";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/gd/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/gd/firefox-132.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "7fe2e7ef2361c3bb4de236d972800aae9125f34bc5925c36a74a3e38f10396d8";
+ sha256 = "f92eaeaa55d45632912c04a74fac2f284ba333fea4c3cb719e99374e470d413e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/gl/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/gl/firefox-132.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "f032980c12d189cad067b2cf395dafeefe72676fb5c2f7dee1fdd2bddd9aa8fe";
+ sha256 = "120e46d8cfddde4f50c50f48d1e966d49b7d29d7d96046c3d9b13b93659486bb";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/gn/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/gn/firefox-132.0.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha256 = "43b542e8871c301e1e9f6bac209cfb92c0e053a4a79ac359cdfd482ab90aabcf";
+ sha256 = "a4d20b2f59a99e05e49ee1ecc07f7392675d05b6844a1c8360ba18d50c1fd723";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/gu-IN/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/gu-IN/firefox-132.0.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha256 = "ff4e68b57bba86ef4dff88c1b337618fc4c9c77d3842a7a2fb51f534c36b0074";
+ sha256 = "8d0898757dbbd1edbe676f214abba745a00c431c795d3dea33f6a1da2570e237";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/he/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/he/firefox-132.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "2b39ddb9fe23e564bc263e7235babea6049365d86c841692ac7d4cbdca2dad9b";
+ sha256 = "4b666c05d9961ba6ae0d3aa49bbc8e4cc85e705852ace3e764d1bdaca3d0af1c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/hi-IN/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/hi-IN/firefox-132.0.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha256 = "c516d1fd5a7e5b8fac01b882e3b5368c0f6f1bfd8b6ace9fed8fc10bf06b5294";
+ sha256 = "ba58ce8d5c3c1de62843ec7f37e00001740aba183bb693db5e00d0082e618ca1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/hr/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/hr/firefox-132.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "d4759609bef88620183e12d98b3658b3c386875a862761412e1e98e4187c536c";
+ sha256 = "21bc5d4133d24241c3c055be3435cb75d79289b131a29656700ee9871e0fc56a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/hsb/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/hsb/firefox-132.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "234e003429cd33afb353b2de9b1ce70fe3920bd9fc50ab5810ab0b22acf6e4d7";
+ sha256 = "ad01f722ce02707b062f7942b066697ae63c63b9a4c1084afea68db80bea7639";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/hu/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/hu/firefox-132.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "a8dbcdda6ba791eb3d0ced43d0250725af9c7bdc4fdc0a72efdc065651802794";
+ sha256 = "a2d6288cfe399576bdd680481e5e2fce061672fb2b4febd49d8a0f37047d8428";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/hy-AM/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/hy-AM/firefox-132.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "b54d0f12985748c3eba269974b7b6892ac727e98ba750bd0535530ea3fafc218";
+ sha256 = "3b966d97525a573c9b1e710a4cec557ab49bd344faccf8e1db1a6dd46702bebc";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ia/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/ia/firefox-132.0.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha256 = "8a415be412858202396d63e773535f790dda10a722ee5e584471e2a93cce8171";
+ sha256 = "7a421547883bfd8032128a0ed7adc43067ada727f9c4949ffcd74b987e90479e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/id/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/id/firefox-132.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "0796b4c2b21ea3a68bbb35171a316d2bb2ca9ec985b239290f59e3299fad1e4e";
+ sha256 = "e339ad1ffaa261aff278e35e32938e5745ef5a7a79f5a3e55659c0ea4fa3e81a";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/is/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/is/firefox-132.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "f3851164668890ce243f4f449f04670e212184750c4a94c425162c7ccdb1ead3";
+ sha256 = "a31b21ff30d6ef146e7b6a50ba394ca74829d9403ee12a5810d283485816ac02";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/it/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/it/firefox-132.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "c92f4a741e8676a8606c5cd001665cced335133cb921a736da96239c870c5846";
+ sha256 = "7a9f050c2a29ecb362c157a32184ab9e1a34120705c7acacd5da7e285c07bed9";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ja/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/ja/firefox-132.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "f88f77beee0ac54e7f8e94db9d657372ea4514c95d7d7a18ada46021e50aa230";
+ sha256 = "9e37fa9409c45912063448c7f59dd2b4cd49553e6e15d2d32861eb4c06604a6b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ka/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/ka/firefox-132.0.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "31e00edb58baa39e39d3b74c14ba7333c07b1d0d4ca81695d8a7ea1c80e8b0a5";
+ sha256 = "f8c042d81ba94a7391750c346dc8bf5036bc01cac55a5cc1dd1b7cb2782911e3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/kab/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/kab/firefox-132.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "7c1eebd4183ec7d63dabc17a51a7c68864eccee29916158d6fe7ba066e4697ab";
+ sha256 = "99e5f899a458f34a8efbd1f2ca2b3a181cc1db4e76243a9c13a3f238531dd2ba";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/kk/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/kk/firefox-132.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "5f77e4a0928dfdd8d66778471d1bea98e3902a08d5c38f904102142962fc08ad";
+ sha256 = "1ddfa07670c8941b0139989fc44425b9b86dfab9ec63cefe22a61eaf915dcc55";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/km/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/km/firefox-132.0.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha256 = "61a248d441d36bad22b0041e8e9b34e192dda345e245fc6e637f861abfa2999e";
+ sha256 = "107206acf6597d87396ac0d8046fb46ad22134cf5d77097715ee3e6b830c6431";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/kn/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/kn/firefox-132.0.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha256 = "7c6b5530798f88a16ce70a7749317793d1caf8c58bb0bc859dde8fb9eeca6a75";
+ sha256 = "b2beb82872f64be4bb44f344674090ac0d4cf4ad524076cc2412bda365dfd667";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ko/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/ko/firefox-132.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "6f99bbb48f3f1fecf712521f484fc3b4125660bdc927a5d004c4bd09fa75d2ab";
+ sha256 = "b93aa8f341752d4cd0d8cff1ee122e86fccfa11ee0a7be4e3bff830be79ae202";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/lij/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/lij/firefox-132.0.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha256 = "362e9a31916be41a3176f88be4f34614bdfcaaf1278667edee14b881691f2c22";
+ sha256 = "940870ebf978edb5f5f9b0cf5f704c953ad3820b9d9ac041948d36b0ca725cc0";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/lt/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/lt/firefox-132.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "ed7cff096f744bb1aa45c4442ed4306b1601fe09cbc5e30a82b88dadb5c0acd1";
+ sha256 = "5aeda3e78857fae75d4082e10dc870587616d4718cec511231d61928f6e1043b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/lv/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/lv/firefox-132.0.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "f42c2238db9238fe53841a54f974de22bc85319a5ccc6a68d1a3b1b89b8ddb1d";
+ sha256 = "4adb69ecbc54cfc95b3ffd61ed6e6116eaf8d0dd793088bb553561bee4becfb3";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/mk/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/mk/firefox-132.0.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha256 = "8700bc64b622c6fdc292f868447c6e3a5f23027e8130100c8362361fddec6284";
+ sha256 = "ee8a22796810b40e0f624f565fde36f59f6da48db0e5a646a4bc07bb04d9abca";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/mr/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/mr/firefox-132.0.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha256 = "05bc096b8bc39ca8a40bcba39ffa44ded8d4d08c9165f68ae2f89baf8d6da4c0";
+ sha256 = "cdce6b6930223ceb5af2ff393e8bebaea271f5dcc94b8e5fdad51631d7d17ec1";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ms/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/ms/firefox-132.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "ca9d85228b6dfd98a39f28dba22793dbc9f311b776663ee62e89a026ffddc184";
+ sha256 = "cd3add301fc64c79bcb104fc6837f660ca7b8ffb0af7b5f498988c0636e13dc8";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/my/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/my/firefox-132.0.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha256 = "b365d353b42ccf4b452a092edb61dcc2a6a47cc4396adae97c1bfc1761f618a6";
+ sha256 = "b50fee9b100b21d672e19b610c3f6c48e75357ff3f801383ba57312bce45da74";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/nb-NO/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/nb-NO/firefox-132.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "56c1589098256b9d848fba171d6c69a37c942ddb3260854071d48b273f32adb2";
+ sha256 = "32fa91632f99b3850aed1c5a8ac2b06623cfa727fa63e7b1942a4c46fee30601";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ne-NP/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/ne-NP/firefox-132.0.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha256 = "123af06456c3c452d6f6d8169ed288c8c16074c7e3f149b30056ecdb94db7976";
+ sha256 = "953717a3187edf413a71f74e9015c1b54ca08c631923fd8e9c354215cb073476";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/nl/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/nl/firefox-132.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "1070796e4361c8091231507a8000125b724b9f4495f23385beed3c1343f32200";
+ sha256 = "66568d6f54c54c8526df05fd652ca413d2d6503861f2d3e903a54f9267e79390";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/nn-NO/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/nn-NO/firefox-132.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "7710c9b14b7f76da97b3767fc34db53ff29f9758949de1e7f7dbfbcb352ebdb3";
+ sha256 = "80c532d74464cb235d3b66ae9f739e25a522f9b9acf643be71e63c67f4cd8c4d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/oc/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/oc/firefox-132.0.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha256 = "968df78a007ebd60503e326a8130d6e05dc99d2f0267f1a707efb4611aeb1672";
+ sha256 = "7fa8e9fbc5747fbff6fcf3a527abd64842bdb50bacaefb34d066ec541168420b";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/pa-IN/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/pa-IN/firefox-132.0.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "2bb2d2606d426746a76b9f701ee04cb5e348a196c7c772525bb7aac7c50b0067";
+ sha256 = "925caf1fef1a87e0f17f2aff8573c7ce790fcd9dd900a112d6fcbc23106f7211";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/pl/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/pl/firefox-132.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "5c87cc2e226d32cbdebe0f31b536028ca78d997e0ffb34582752abd5d26880f5";
+ sha256 = "f7bc7fa613072eb5929a0031ad8293da248f9221b2c782d1114bc12a16038a95";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/pt-BR/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/pt-BR/firefox-132.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "92ee925cb9cc44f999a22eb4792a1b6c6b64f4a7533966ca21565c7b987868e8";
+ sha256 = "9e911c64aab20db6d083ec4d7e8031a81aaee7dae0593c2a629d03bf4cd89659";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/pt-PT/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/pt-PT/firefox-132.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "58a7ece588ed7fb7cdc007a3acb20dff966f16d1cedbd47f6aff730e94b7c5e0";
+ sha256 = "6cbfd9355d5e0f36c5292bcc9bb9b70157d6d843551cc32f89bfa9980e12507e";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/rm/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/rm/firefox-132.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "73a36134064c4c3f9f74f49dc8d01de0ab7c771a63f9d96faea0a3d5239f2401";
+ sha256 = "e3c18cc02d737042f3ed1eea1ba6bd2d7dd38c9979e61d46a6069cc8a6e421e6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ro/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/ro/firefox-132.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "bd885e43b0383301caa072eb9f3c7103da1ed0ebbd14df02eb13c111e908c550";
+ sha256 = "54929ff1583abb4fc0e9bf201d15fcb286a55534f33bbf5c883e76cdc01f4a75";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ru/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/ru/firefox-132.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "f161f63d6e9061513e547abb4c5fa0ecf2d6d10cd7064bf1c24f2a5cbd44e798";
+ sha256 = "7a9fee98e554bd7efb626e923776f44bb358219d32ba95a8f8ced13072afb5ce";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sat/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/sat/firefox-132.0.tar.bz2";
locale = "sat";
arch = "linux-i686";
- sha256 = "9b81f886807acc18c0ec02e66404c7428d664d4cbe0e5c1b61ba683f45127e2a";
+ sha256 = "b27b1acaabd770f4299b558d243abd873d6876de79e9d2ca612ced5d864149ad";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sc/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/sc/firefox-132.0.tar.bz2";
locale = "sc";
arch = "linux-i686";
- sha256 = "05b6a4036d727c77d4f3dfc2d39f10111cfdd5d00e9c409b0ce08f3ea0ea3c70";
+ sha256 = "6a4d084db9a1657aacc67d36eb363aa0e9851944299cfa4a003529016775a815";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sco/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/sco/firefox-132.0.tar.bz2";
locale = "sco";
arch = "linux-i686";
- sha256 = "e88b1a122270460a4caf5bea4f4dc8d9fe584b8ab8c16a01c8899088e75121e4";
+ sha256 = "a76199547398244f837f98b0880acfe245fc8ce9842beb9bc85e4fe46bae4021";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/si/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/si/firefox-132.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha256 = "b2d4b3b80f633336bee1d9a5b582e8596e2bae87467c247fbddfcdc36b8f1d6c";
+ sha256 = "890a853680e663002d42ad913f6de676ac4056fdbae2609da65a899c7f0116a6";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sk/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/sk/firefox-132.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "3773d4862ce1834567991430d915680a97e4cbe8ebd44d2dd37dcdea1e076d94";
+ sha256 = "d0ae938539d0becf9da6ab593255b624d22d477bdc44bd60f54c4b58656912fb";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/skr/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/skr/firefox-132.0.tar.bz2";
locale = "skr";
arch = "linux-i686";
- sha256 = "c25afab9ff4614fa87681d6bcbdc5f10d4439220467f2b2a3859838d546b96d0";
+ sha256 = "f0d23102774bc537faa19225496b8fc80c9d4b88d0b126789c5c8a98f8c5e562";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sl/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/sl/firefox-132.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "539292a2f243b2a6e03bda2510d24e555d58156583e6feedf8b7dde60224b155";
+ sha256 = "db6d539fe79f5f1a6f993ca618292529cdd4035c3e390502962cb93d392457ee";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/son/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/son/firefox-132.0.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha256 = "bdb94090a7ac0a9eb22049d50dc2f330057c065375236a137cb098348efe9eb7";
+ sha256 = "417f1be3b6110d51794c7b8ee6b8e07782118ada14aff103ef742138288713ca";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sq/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/sq/firefox-132.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "90467f841b2de7b0479ccdfadde6ef7645644b770d18885a9d76049c6a43de54";
+ sha256 = "864ea16fcdfbce91e91848b581f988ee07f027f8c7a5c98c1cf1a82296169739";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sr/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/sr/firefox-132.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "1c02f6fe4302977cf7ab0b57b3a4f88764c21ee686a22b9604f0f15db38aa21f";
+ sha256 = "f7bb8998e4094c559caae8c6932ecac369986214ebcb9658e80c40290912be36";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/sv-SE/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/sv-SE/firefox-132.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "009240e251650fbc7f8aade7025f44fd1798e1b76a8f411c3aa261dd12b68a0d";
+ sha256 = "090f22a2e4a2746a8f510464b027d6023f2111515220de8521044db0c080fe35";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/szl/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/szl/firefox-132.0.tar.bz2";
locale = "szl";
arch = "linux-i686";
- sha256 = "fd11d167840bf204f895dc7104a3bd2779e29065ae109901d0c23ceb942de9db";
+ sha256 = "49794ae9a985cc2ed569745be59e5b36e8d21a4a266a594805f98c5fa395f1fe";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ta/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/ta/firefox-132.0.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha256 = "f83722089b0a1a5caf5d4b1bd541e2fa84fdfffc04638f22bf5c372cba9d3d66";
+ sha256 = "feb86ad416d64692e2542cce7c86737e2fc45e740fb3bc38c61d3bd0e4dfdc1d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/te/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/te/firefox-132.0.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha256 = "9b8728d6fac9e02819f969a7009f2246a72cc9dd0dc7da324fd255867548b242";
+ sha256 = "7c489109bb0321f32395504643ff87ffc63e44b1e86b4aa483de05c403f05adc";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/tg/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/tg/firefox-132.0.tar.bz2";
locale = "tg";
arch = "linux-i686";
- sha256 = "08f4bc21bb07a46e5e845bd5132835fcfc6d92a77807dd25f9b3119795b48800";
+ sha256 = "d8d76c56e613f81ac08029d297a36917057c79634ff3aaaa36ec65234da00bd4";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/th/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/th/firefox-132.0.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "6eab1ebc3fdac9f2423720cbc9ca1834c0b60432ed44249fc97b4e61578e3b2c";
+ sha256 = "4ab7a75d0d90a478894b1f5645054b5e852cdc5b978cb5dd39d48c7e0de163fa";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/tl/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/tl/firefox-132.0.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha256 = "1210863fbc4e94a48f051214ad27596d1cd20b6ee546ec7dfdbefb17f03b32ce";
+ sha256 = "1247abcd3e5139d85c76be72de66ce91910f9340bc288973a055baa4625c8e58";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/tr/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/tr/firefox-132.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "7209a9fb8cda175dd44abf5af5f2a852a20834e954578f324e30df807eae4b56";
+ sha256 = "d80bc043ca87319fd036452fed008394ac7f82e15fbd769b86c33eada10f5c3c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/trs/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/trs/firefox-132.0.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha256 = "0ab1a3fe03acd33f1ea0f6546992ab47e4d8649b043ec6fa1237063e6876a12f";
+ sha256 = "ec40046b1ac861401e9619e924f9653dd949942cd80cd51fce766552d845c474";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/uk/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/uk/firefox-132.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "7fe939edfc4ddefb2da97ad93d180958de0a8816d036aef1c7165a1169e8b85e";
+ sha256 = "08252f8b12abfa90fe1dbb3ea76662c84d116428b1ede24665cf0f6cc6eb7275";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/ur/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/ur/firefox-132.0.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha256 = "d8131acaa6c87b448be1e4a5076248b10956b9bc9f03db93c649e21c270b0782";
+ sha256 = "30699082953743ebecd2b9932e99d8ebeff8d47478e762cb451383cb2951a502";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/uz/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/uz/firefox-132.0.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "15767a498cdbb582028295b3f7d8f160601707f2ef112c9ad5a1b42e70185c98";
+ sha256 = "be949124d9fa3d1f3d997015849893f0b1f66ab577d13253d3fd520be6b98a1d";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/vi/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/vi/firefox-132.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "05c0455bfc5744d4adcb005f538e287197402fdd983aa7af2e4852fece20b079";
+ sha256 = "f0a0498aca98dd9dd010be71d47af06c9548cb96853f699d1a64d56c756bd7dc";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/xh/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/xh/firefox-132.0.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha256 = "977d6a65cbfaa6cef11005a8c646dad48f63dca0da899e359951940d88c458ba";
+ sha256 = "9397073ca8af49dd750bc3a77d0e37487e6bde5bf23b74c9f1ce4411745adb4c";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/zh-CN/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/zh-CN/firefox-132.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "ed242a8d527e66c1f5e6b0a4e898cca723430ac8cb1290796ad271b367e808b4";
+ sha256 = "c7cf44ec99398d39774a9b214d7a058d1fe652147b4834317ea3e43ffde325cf";
}
- { url = "https://archive.mozilla.org/pub/firefox/releases/131.0.3/linux-i686/zh-TW/firefox-131.0.3.tar.bz2";
+ { url = "https://archive.mozilla.org/pub/firefox/releases/132.0/linux-i686/zh-TW/firefox-132.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "6e4457920addfe64bb04934b1e646c197d91a7e100553e72c8632375bb06fd15";
+ sha256 = "938c3d5710c8323cfdf100c172ad8d2b5e0fce96d55ce97636588411daeed44d";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 3b4e6cdba26e..52165b672179 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -234,7 +234,8 @@ buildStdenv.mkDerivation {
"profilingPhase"
];
- patches = lib.optionals (lib.versionAtLeast version "111") [ ./env_var_for_system_dir-ff111.patch ]
+ patches = lib.optionals (lib.versionAtLeast version "111" && lib.versionOlder version "133") [ ./env_var_for_system_dir-ff111.patch ]
+ ++ lib.optionals (lib.versionAtLeast version "133") [ ./env_var_for_system_dir-ff133.patch ]
++ lib.optionals (lib.versionAtLeast version "96" && lib.versionOlder version "121") [ ./no-buildconfig-ffx96.patch ]
++ lib.optionals (lib.versionAtLeast version "121") [ ./no-buildconfig-ffx121.patch ]
++ lib.optionals (lib.versionOlder version "128.2" || (lib.versionAtLeast version "129" && lib.versionOlder version "130")) [
diff --git a/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff133.patch b/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff133.patch
new file mode 100644
index 000000000000..f35569c5909f
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff133.patch
@@ -0,0 +1,22 @@
+diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
+index 6db876975187..5882c5d7f1d6 100644
+--- a/toolkit/xre/nsXREDirProvider.cpp
++++ b/toolkit/xre/nsXREDirProvider.cpp
+@@ -11,6 +11,7 @@
+
+ #include "jsapi.h"
+ #include "xpcpublic.h"
++#include "prenv.h"
+ #include "prprf.h"
+
+ #include "nsIAppStartup.h"
+@@ -297,7 +297,8 @@ static nsresult GetSystemParentDirectory(nsIFile** aFile) {
+ "/usr/lib/mozilla"_ns
+ # endif
+ ;
+- rv = NS_NewNativeLocalFile(dirname, getter_AddRefs(localDir));
++ const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR");
++ rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast(dirname), getter_AddRefs(localDir));
+ # endif
+
+ if (NS_SUCCEEDED(rv)) {
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 5f766127de3e..02d8615c2ae1 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -5,10 +5,10 @@
{
firefox = buildMozillaMach rec {
pname = "firefox";
- version = "131.0.3";
+ version = "132.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "3aa96db839f7a45e34c43b5e7e3333e1100ca11545ad26a8e42987fbc72df5ae7ebebe7dfc8c4e856d2bb4676c0516914a07c001f6047799f314146a3329c0ce";
+ sha512 = "254ffba16d6e6c61cffaa8131f81a9a78880e5723b7ee78ac36251a27d82e6ff088238ae289d07469ba3a51b5b5969a08ecd1fc02dcb4d93325a08fac1cfc916";
};
extraPatches = [
@@ -35,11 +35,11 @@
firefox-beta = buildMozillaMach rec {
pname = "firefox-beta";
- version = "132.0b9";
+ version = "133.0b1";
applicationName = "Mozilla Firefox Beta";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "0c491e2a601d6989c10cdd757c83453e07454113dac8e4de154df04386fc0797ee5146dcdc8ca904692a6cb87246b54a4f5e93057afd20f23701abd3f61a6985";
+ sha512 = "c4a85a72b2891c5b6c6e200cd7ef13abe0f5ad090f8ef1d8243a489791f3542b2cd390c141118c4745c4ca677d1e9bf1e564e4a45e066d27ed53e6bd92844727";
};
meta = {
@@ -64,13 +64,13 @@
firefox-devedition = buildMozillaMach rec {
pname = "firefox-devedition";
- version = "132.0b9";
+ version = "133.0b1";
applicationName = "Mozilla Firefox Developer Edition";
requireSigning = false;
branding = "browser/branding/aurora";
src = fetchurl {
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "3393bb677c6e735860ef49c837ffab10720c6eb47d6cfb6c7960267e3676c69c8293b5f7e49de3f91b6eb88fa4780300db2b2653dde1ae38d546f473bca7e34b";
+ sha512 = "dced4aba71b07b68ee31c283945e7d62a7032f08f5cf71aa261fc7ba32f58277acbe9fdbdd28777d7f4b824e411815b069cab0ce791438088c9ad19c3d2de62e";
};
meta = {
@@ -96,10 +96,10 @@
firefox-esr-128 = buildMozillaMach rec {
pname = "firefox";
- version = "128.3.1esr";
+ version = "128.4.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "c5c1a2e951e0dbb1259a0f77a26b8678bfa4a4c7e909f8fcd5c6d0f807625926824ed235e114d9bab5e289232efaaf4c6691764db64860161ebc9bece9200f0c";
+ sha512 = "e720b1f993926d73f5a5727648f753176ac2fd093fb0b71393946bbc5919ce5fc7b88b82960bd1aa427b5663c7f659828dc6702485fc0c1e7a6961571c67faa3";
};
meta = {
diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix
index 1ac055213e1b..56dc4af350ab 100644
--- a/pkgs/applications/networking/browsers/floorp/default.nix
+++ b/pkgs/applications/networking/browsers/floorp/default.nix
@@ -9,7 +9,7 @@
(
(buildMozillaMach rec {
pname = "floorp";
- packageVersion = "11.19.1";
+ packageVersion = "11.20.0";
applicationName = "Floorp";
binaryName = "floorp";
branding = "browser/branding/official";
@@ -17,14 +17,14 @@
allowAddonSideload = true;
# Must match the contents of `browser/config/version.txt` in the source tree
- version = "128.4.0";
+ version = "128.5.0";
src = fetchFromGitHub {
owner = "Floorp-Projects";
repo = "Floorp";
fetchSubmodules = true;
rev = "v${packageVersion}";
- hash = "sha256-RFJ3aRbLwCf0qaluqImcF9+6frvJbw8QE3jBpxNxFjE=";
+ hash = "sha256-+FVnG8CKEQdFN9bO8rUZadp+d8keCB98T7qt9OBfLDA=";
};
extraConfigureFlags = [
diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix
index d2e9308a5021..94a2944f002e 100644
--- a/pkgs/applications/networking/browsers/ladybird/default.nix
+++ b/pkgs/applications/networking/browsers/ladybird/default.nix
@@ -48,13 +48,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "ladybird";
- version = "0-unstable-2024-10-05";
+ version = "0-unstable-2024-10-22";
src = fetchFromGitHub {
owner = "LadybirdWebBrowser";
repo = "ladybird";
- rev = "077bc68a4cbf2d8c97abc818515a22471da42c99";
- hash = "sha256-zlQEOk9rex9Evpc2+4q2e2QPwGd9kLOQ393DJPuwh7c=";
+ rev = "648fac7215e1841e3714d4c72c7aee75152da522";
+ hash = "sha256-OB9dV+dNr5eA4h1+telYitrI62m+XSK/SYc9UPs7D4M=";
};
postPatch = ''
diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/applications/networking/browsers/nyxt/default.nix
index b8d17500db27..0fb67d46bc09 100644
--- a/pkgs/applications/networking/browsers/nyxt/default.nix
+++ b/pkgs/applications/networking/browsers/nyxt/default.nix
@@ -26,15 +26,16 @@
, xdg-utils
, xclip
, wl-clipboard
+, nix-update-script
}:
stdenv.mkDerivation (finalAttrs: {
pname = "nyxt";
- version = "3.11.8";
+ version = "3.12.0";
src = fetchzip {
url = "https://github.com/atlas-engineer/nyxt/releases/download/${finalAttrs.version}/nyxt-${finalAttrs.version}-source-with-submodules.tar.xz";
- hash = "sha256-mLf2dvnXYUwPEB3QkoB/O3m/e96t6ISUZNfh+y1ArX4=";
+ hash = "sha256-T5p3OaWp28rny81ggdE9iXffmuh6wt6XSuteTOT8FLI=";
stripRoot = false;
};
@@ -97,7 +98,10 @@ stdenv.mkDerivation (finalAttrs: {
# prevent corrupting core in exe
dontStrip = true;
- passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
+ passthru = {
+ tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
+ updateScript = nix-update-script { };
+ };
meta = with lib; {
description = "Infinitely extensible web-browser (with Lisp development files using WebKitGTK platform port)";
diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix
index 693b1e8f0f50..5b6d17985d04 100644
--- a/pkgs/applications/networking/browsers/polypane/default.nix
+++ b/pkgs/applications/networking/browsers/polypane/default.nix
@@ -2,12 +2,12 @@
let
pname = "polypane";
- version = "21.1.0";
+ version = "22.0.0";
src = fetchurl {
url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage";
name = "${pname}-${version}.AppImage";
- sha256 = "sha256-MVBxKJeqIFAkSOajo1q/062BGBF6Fm2sUA6GYZIBoKQ=";
+ sha256 = "sha256-m1alnK5p5RVn/m4tFB2BG/sFNOGBjtJPrE/pJhLa5N0=";
};
appimageContents = appimageTools.extractType2 {
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 7e020a0acf67..81a1da428913 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -24,7 +24,7 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
- version = "6.9.3447.51";
+ version = "7.0.3495.6";
suffix = {
aarch64-linux = "arm64";
@@ -34,8 +34,8 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
hash = {
- aarch64-linux = "sha256-p+MihnvnVBVcsYE/7vp9b6T2bxp7cAiCq9ME+NHqi38=";
- x86_64-linux = "sha256-/izigAT9eqhgxgYosMoDoPIA0rOCeYOotEjaigBTazk=";
+ aarch64-linux = "sha256-6jr1TFhwBTaAc/UpG5yBj6A09kytmtuKVbgPgvXMpoI=";
+ x86_64-linux = "sha256-dbBdmqoY4x6+zwiWe+eRjrd0jeww3ANZNDDYH79uxaU=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
diff --git a/pkgs/applications/networking/cluster/aiac/default.nix b/pkgs/applications/networking/cluster/aiac/default.nix
index ac1d51ecee3a..ab03b5dac0c6 100644
--- a/pkgs/applications/networking/cluster/aiac/default.nix
+++ b/pkgs/applications/networking/cluster/aiac/default.nix
@@ -2,14 +2,14 @@
buildGoModule rec {
pname = "aiac";
- version = "5.2.1";
+ version = "5.3.0";
excludedPackages = [".ci"];
src = fetchFromGitHub {
owner = "gofireflyio";
repo = pname;
rev = "v${version}";
- hash = "sha256-8LMuhUeH/KNOf3IPYMSwZDxeY8M7oDYF4Q7X7ImQSMw=";
+ hash = "sha256-Lk3Bmzg1owkIWzz7jgq1YpdPyRzyZ7aNoWPIU5aWzu0=";
};
vendorHash = "sha256-uXYin6JITpy3bc7FI/3aJqvCD9cGwGL1qjB8hBUWLQE=";
diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix
index b92770374804..54764ec30572 100644
--- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix
+++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "cloudfoundry-cli";
- version = "8.8.1";
+ version = "8.8.2";
src = fetchFromGitHub {
owner = "cloudfoundry";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-0SVz97XjFeXaj56ssqFK2jTUQfL0rSc72HAdK9mikUc=";
+ sha256 = "sha256-gDWfzM5CKWIc0gZ5uzJJZY0BySxzN40+sCp0h2Sp7DE=";
};
- vendorHash = "sha256-WI4yg+r8zGLZI10/kNFkdbzXk0hZ6CCXvXLOd8l7AWo=";
+ vendorHash = "sha256-Xcoi9MZPrr0DYOcqziF+EFCQdYLWIqXX3IW6D8k6b+E=";
subPackages = [ "." ];
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index c5f161db0914..5182bb546946 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -9,15 +9,15 @@
buildGoModule rec {
pname = "kubernetes-helm";
- version = "3.16.1";
+ version = "3.16.2";
src = fetchFromGitHub {
owner = "helm";
repo = "helm";
rev = "v${version}";
- sha256 = "sha256-OTG4xPgK1WT/HUWjQZ1a7X126+PUo02yFnEAnd6MTU8=";
+ sha256 = "sha256-fbNkmZ23jWqj4E5YeUuzMhxH9DiUfj5F+Vwlvuv6hdA=";
};
- vendorHash = "sha256-rNp2aah6lAMZd07HXF2w0h7wfPc+TuRHl/jQpgqY5Sk=";
+ vendorHash = "sha256-fCU1JfVaezxyqZmzjM7+otDDLvmkfOskqhu5PpDDZUg=";
subPackages = [ "cmd/helm" ];
ldflags = [
diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix
index 7c7fdbf248a4..f22d0b97e5f5 100644
--- a/pkgs/applications/networking/cluster/k0sctl/default.nix
+++ b/pkgs/applications/networking/cluster/k0sctl/default.nix
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "k0sctl";
- version = "0.19.1";
+ version = "0.19.2";
src = fetchFromGitHub {
owner = "k0sproject";
repo = "k0sctl";
rev = "refs/tags/v${version}";
- hash = "sha256-6mvSVbSTPFiAIDxNQUmgFmS+3v3RUh10Y552u9bHOn0=";
+ hash = "sha256-TdnZZ27j++o9I4Zup4PmM2VAHwn8BPBG/CwxTUy0BWU=";
};
vendorHash = "sha256-Hl/eSFbwFiuSaaPh5blWFfz6m4VNrS5mYL8ehQlb90I=";
diff --git a/pkgs/applications/networking/cluster/k8sgpt/default.nix b/pkgs/applications/networking/cluster/k8sgpt/default.nix
deleted file mode 100644
index 46fe219868ef..000000000000
--- a/pkgs/applications/networking/cluster/k8sgpt/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, buildGoModule, fetchFromGitHub }:
-
-buildGoModule rec {
- pname = "k8sgpt";
- version = "0.3.30";
-
- src = fetchFromGitHub {
- owner = "k8sgpt-ai";
- repo = "k8sgpt";
- rev = "v${version}";
- hash = "sha256-iseyvGo9fitt8bAlbU3wF7bBLz66fijb8h35aank+0k=";
- };
-
- vendorHash = "sha256-YpCn7hZkMj3/dIC/ZMslTjXcumCH3LH/A7pjfJ0pUd4=";
-
- CGO_ENABLED = 0;
-
- ldflags = [
- "-s" "-w"
- "-X main.version=v${version}"
- "-X main.commit=${src.rev}"
- "-X main.date=1970-01-01-00:00:01"
- ];
-
- meta = {
- description = "Giving Kubernetes Superpowers to everyone";
- mainProgram = "k8sgpt";
- homepage = "https://k8sgpt.ai";
- changelog = "https://github.com/k8sgpt-ai/k8sgpt/releases/tag/v${version}";
- license = lib.licenses.asl20;
- maintainers = with lib.maintainers; [ developer-guy kranurag7 ];
- };
-}
diff --git a/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix b/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix
index 157ff1358ce0..4356788418d9 100644
--- a/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix
+++ b/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "kubectl-cnpg";
- version = "1.24.0";
+ version = "1.24.1";
src = fetchFromGitHub {
owner = "cloudnative-pg";
repo = "cloudnative-pg";
rev = "v${version}";
- hash = "sha256-/BUrUksNT6KuVLxJxnBfkU9OEeQU3u7WA6pKqcGnuSU=";
+ hash = "sha256-M33ngnpxR3fQNsAkef4Rs4I3wNpOu5wTxbl48gL88F8=";
};
- vendorHash = "sha256-s1fKwWfOSgRw6eOPc1aZzf1VzaTVHXBjQWd1132vAS0=";
+ vendorHash = "sha256-nFWMw/FpaALp347z5dO8509fJCVISwS6z57JfQ+p3Dg=";
subPackages = [ "cmd/kubectl-cnpg" ];
diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix
index 54d7adb9bfb7..b2e95b670c57 100644
--- a/pkgs/applications/networking/cluster/kubefirst/default.nix
+++ b/pkgs/applications/networking/cluster/kubefirst/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "kubefirst";
- version = "2.5.11";
+ version = "2.7.3";
src = fetchFromGitHub {
owner = "konstructio";
repo = "kubefirst";
rev = "refs/tags/v${version}";
- hash = "sha256-paGb/Ifslj2XsXhY99ETXs72s3vSXAUqTeGPg+Nviho=";
+ hash = "sha256-pMvkroPxlHIf2zWO5aqTPYlQ3LlQLaahHuTZ2E1mKJY=";
};
- vendorHash = "sha256-tOCVDp9oClfeBsyZ6gv6HoGPjZByoxxAceV/wxQeBSA=";
+ vendorHash = "sha256-O7olGZC1QZQm1BPZOQdxSgUkASuE26oMpSPMv2sBawc=";
ldflags = [
"-s"
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 8fbeda219ad6..f7bd5695202e 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -20,13 +20,13 @@
buildGoModule rec {
pname = "kubernetes";
- version = "1.31.0";
+ version = "1.31.2";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
- hash = "sha256-Oy638nIuz2xWVvMGWHUeI4T7eycXIfT+XHp0U7h8G9w=";
+ hash = "sha256-L+x1a9wttu2OBY5T6AY8k91ystu0uZAGd3px4oNVptM=";
};
vendorHash = null;
diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix
index 32aaffc07374..18ae3d825628 100644
--- a/pkgs/applications/networking/cluster/linkerd/edge.nix
+++ b/pkgs/applications/networking/cluster/linkerd/edge.nix
@@ -2,7 +2,7 @@
(callPackage ./generic.nix { }) {
channel = "edge";
- version = "24.9.3";
- sha256 = "1vm6f8abain3zjs3jymr62p7lk475av38pljczgb13fgnn2w6qii";
- vendorHash = "sha256-w7TchPXGQQSWcCVf4BMvh5U8qnkctgJAl0sHL6ml/8Y=";
+ version = "24.10.3";
+ sha256 = "1xsimk3kjniy59sw56q52cmnpg1vb1l1zbaj6nrj44pl57vkp9cp";
+ vendorHash = "sha256-JVXhZjUdU1CrWzrh7INhAd3kRP/tcdsYzlre9SB9gOQ=";
}
diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix
index 8c145ef6393f..158c8ff8242e 100644
--- a/pkgs/applications/networking/cluster/luigi/default.nix
+++ b/pkgs/applications/networking/cluster/luigi/default.nix
@@ -12,6 +12,8 @@ python3.pkgs.buildPythonApplication rec {
build-system = [ python3.pkgs.setuptools ];
+ pythonRelaxDeps = [ "tenacity" ];
+
dependencies = with python3.pkgs; [ python-dateutil tornado python-daemon tenacity ];
pythonImportsCheck = [ "luigi" ];
diff --git a/pkgs/applications/networking/cluster/nova/default.nix b/pkgs/applications/networking/cluster/nova/default.nix
index 1a91767ae1d2..b8a5f1d9e3c7 100644
--- a/pkgs/applications/networking/cluster/nova/default.nix
+++ b/pkgs/applications/networking/cluster/nova/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "nova";
- version = "3.10.2";
+ version = "3.11";
src = fetchFromGitHub {
owner = "FairwindsOps";
repo = pname;
rev = "v${version}";
- hash = "sha256-RpYlUYGqOtF9R1Fr+Smu7XMWN+Y+P3RnagjBRNnA8/8=";
+ hash = "sha256-gkEUc2mhm1r69XzAnglLhdyYI4jQ24oEk/NRMgeyw60=";
};
vendorHash = "sha256-v3ld3bHpVWNJgQ6K5iS7q8QV4ft4RE42wKi+f4++yqY=";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index db6057d758c4..6b346f768f32 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -27,13 +27,13 @@
"vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
},
"aiven": {
- "hash": "sha256-J/ZdlrYRo7Npr9zYZxvs0LWwqZN/r+IcgfOGMYaIqo4=",
+ "hash": "sha256-nWa9ohf3DOiMloJ5J8UcSZjJNHjRZw1sD6k5R8m6LWA=",
"homepage": "https://registry.terraform.io/providers/aiven/aiven",
"owner": "aiven",
"repo": "terraform-provider-aiven",
- "rev": "v4.27.0",
+ "rev": "v4.28.0",
"spdx": "MIT",
- "vendorHash": "sha256-vlL4RLe89MZ3z5xyC3r3kI4RqWXwbqWNQZlOxxpsGZo="
+ "vendorHash": "sha256-UM4EjL1qXOn2TMOupVxSyJVLarHIGTySXNJtWPrseSE="
},
"akamai": {
"hash": "sha256-KnX+PAhT7TPp9SRkGwYPvxgk/ExaJPr7vKj9hTbJGhg=",
@@ -81,13 +81,13 @@
"vendorHash": "sha256-0UM4I/oxIsWIP1G93KJsJxYofXrO4Yy86PEk0FnB1DE="
},
"artifactory": {
- "hash": "sha256-6VwEQ6fGZ1V5AkI5FvQwuFipjREduVkZePGwQqpyxig=",
+ "hash": "sha256-ehwskBqWAlbv+3ULOic8792kWulKuJ8v9/UmPngooRY=",
"homepage": "https://registry.terraform.io/providers/jfrog/artifactory",
"owner": "jfrog",
"repo": "terraform-provider-artifactory",
- "rev": "v12.2.0",
+ "rev": "v12.3.1",
"spdx": "Apache-2.0",
- "vendorHash": "sha256-HAZZ/P7zDbHs/xkIY69QbbcxwgPHEZOqeKCX8jIZTQE="
+ "vendorHash": "sha256-detefSJ3hVIk2xXsAB16XiQkaOAiBkGTnaIku7veFQU="
},
"auth0": {
"hash": "sha256-5drMyf+jymrKb6cxB2eCnvVE9hPo9aDGaloZVlOeRlI=",
@@ -525,11 +525,11 @@
"vendorHash": "sha256-jAYaVNWMEGLDPgnyD2VJwVpDwn9lcvBNLnKPdlqdRZc="
},
"gridscale": {
- "hash": "sha256-GVOjkena3zRaOxO3YRYf+gfM2/CRm8VajpuWGTU0F1Y=",
+ "hash": "sha256-J4ZLexpjYXxOTaqih0+Nucyf2soYXxGiB38xAeXUJKs=",
"homepage": "https://registry.terraform.io/providers/gridscale/gridscale",
"owner": "gridscale",
"repo": "terraform-provider-gridscale",
- "rev": "v1.26.0",
+ "rev": "v1.27.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -597,11 +597,11 @@
"vendorHash": "sha256-GoOKTT+EOhaPhpbgSW3SycYsE8LEQP0v4eQfiTEnPy8="
},
"huaweicloud": {
- "hash": "sha256-hDb3dOKaHL1fw0m+dBx6izhw7tltvzm05IyCGJgbGJw=",
+ "hash": "sha256-gCdB2aIpI4IjRldvvVTnV7OTzd64nouiFNQ5bVpGNck=",
"homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
"owner": "huaweicloud",
"repo": "terraform-provider-huaweicloud",
- "rev": "v1.69.0",
+ "rev": "v1.69.1",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -723,13 +723,13 @@
"vendorHash": "sha256-v9N7lj7bEgR5HZm1SO0+DSCmQFVnsRvHPMycYMfpYwo="
},
"libvirt": {
- "hash": "sha256-341yVJIRXSISVKfdRqv2HiI90TmgR+2uyNQhONdhjHk=",
+ "hash": "sha256-B99pSnnI+GoMX4uleDqBoAKPe15l/+C5mIUGp6KsE54=",
"homepage": "https://registry.terraform.io/providers/dmacvicar/libvirt",
"owner": "dmacvicar",
"repo": "terraform-provider-libvirt",
- "rev": "v0.8.0",
+ "rev": "v0.8.1",
"spdx": "Apache-2.0",
- "vendorHash": "sha256-MzRiAVzZXf9B1XwVz7RIJcXuyBtG7LIqp3OfP0AFl2Q="
+ "vendorHash": "sha256-Q9LdhokZol1jhSfQVIRvPe1XrE8nVvc22aWHt7wkcHY="
},
"linode": {
"hash": "sha256-jPKjxvkIxKXs74Y6teZjs7xHzPlzvyUbZaMDRGpy/t0=",
@@ -940,13 +940,13 @@
"vendorHash": "sha256-0Atbzx1DjInPMa1lNxyNKfNMILjN4S814TlIAQeTfdI="
},
"opentelekomcloud": {
- "hash": "sha256-jDPUTAXddTzO7PTZWqjFAQSj4ZUJVP4G/eHqcVPwlMU=",
+ "hash": "sha256-w98v/Vxcd1864lR7Tvt58TMZui5m8h3Z3uNs9AkIOJI=",
"homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
"owner": "opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
- "rev": "v1.36.20",
+ "rev": "v1.36.23",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-qMyMPKOpnRQERX95S9yn0Pmi7wLJy1+u4mFvMwHdRx8="
+ "vendorHash": "sha256-048tfvolxHHdqImBOgp7xIIpCJpx6QKUSi9fL9aIqh4="
},
"opsgenie": {
"hash": "sha256-+msy9kPAryR0Ll5jKOd47DMjeMxEdSIfKZZKVHohQGY=",
@@ -1102,13 +1102,13 @@
"vendorHash": "sha256-MP44e56j7rLyT4+TbFDfDb5GNc/LzZNLplm1/qqeGiw="
},
"sentry": {
- "hash": "sha256-iTwl5FowrrhznO+Zr7QXy7/6HlYWCryZTMxNsBGSfWI=",
+ "hash": "sha256-HGjePQGetglWQEGDtPZ2WAPMlvjEm+KYdagakiko39E=",
"homepage": "https://registry.terraform.io/providers/jianyuan/sentry",
"owner": "jianyuan",
"repo": "terraform-provider-sentry",
- "rev": "v0.13.1",
+ "rev": "v0.14.0",
"spdx": "MIT",
- "vendorHash": "sha256-nMI79G1e1+ISdWNjL0Qh/pD8JkD1/1khNkwULU6PyxU="
+ "vendorHash": "sha256-8ONdkr6RoAyjI6ugeGVsWDc+Sn00sJttojYS94HBqsQ="
},
"shell": {
"hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=",
@@ -1382,13 +1382,13 @@
"vendorHash": null
},
"vsphere": {
- "hash": "sha256-3894yq6UBG7k9Udnlc8bdLO87jCnA4oBR7TZlbx3uEw=",
+ "hash": "sha256-7tLqWVJL5G+OMtGVNkpfJZ6xfZ8hJy6gsitUVd0NHGc=",
"homepage": "https://registry.terraform.io/providers/hashicorp/vsphere",
"owner": "hashicorp",
"repo": "terraform-provider-vsphere",
- "rev": "v2.9.3",
+ "rev": "v2.10.0",
"spdx": "MPL-2.0",
- "vendorHash": "sha256-ozdbYuqz6ua1ubh48IkLxJZ6xAV2ho9mkhtnCTwzRIM="
+ "vendorHash": "sha256-kjS1YYMoE5IBeKWXnxzO3nFp6NpBEwUCaTzO0VSBDLA="
},
"vultr": {
"hash": "sha256-gQwLGnYmB9bwpGrLNdbw+zY0MlPPrY/37rJPtindT1Q=",
diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix
index b7b7f0ad5334..0116680f01eb 100644
--- a/pkgs/applications/networking/discordo/default.nix
+++ b/pkgs/applications/networking/discordo/default.nix
@@ -3,16 +3,16 @@
buildGoModule rec {
pname = "discordo";
- version = "0-unstable-2024-07-02";
+ version = "0-unstable-2024-10-13";
src = fetchFromGitHub {
owner = "ayn2op";
repo = pname;
- rev = "31905f3e790e63cd0f2366526afe41fb278c226e";
- hash = "sha256-IhGZGHV/A1m653WlVCwxtb9OZbMolQ3GHOr2fXehjNk=";
+ rev = "26b77d9385daa2dc056930fa302a3c06595680ba";
+ hash = "sha256-zXqYj8IBDVeDKjm0m8CYEX+tmHLpY2u7A4g38IiDNZk=";
};
- vendorHash = "sha256-5ZsvoIDwxZCGkMRxlCyp2Iv6fcvvpmzG+krz3MZSiTM=";
+ vendorHash = "sha256-68NGcdyKuabSdW6CKAJUaJ0k2dpO0bm3OfNQ7qEVcqk=";
CGO_ENABLED = 0;
diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix
index cecad11a4f63..c654bd4e8a1d 100644
--- a/pkgs/applications/networking/feedreaders/rsstail/default.nix
+++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix
@@ -1,25 +1,25 @@
-{ lib, stdenv, fetchFromGitHub, libmrss, libiconv }:
+{ lib, stdenv, fetchFromGitHub, libmrss }:
-stdenv.mkDerivation {
+stdenv.mkDerivation (final: {
pname = "rsstail";
- version = "2.1";
+ version = "2.2";
src = fetchFromGitHub {
owner = "folkertvanheusden";
repo = "rsstail";
- rev = "6f2436185372b3f945a4989406c4b6a934fe8a95";
- sha256 = "12p69i3g1fwlw0bds9jqsdmzkid3k5a41w31d227i7vm12wcvjf6";
+ rev = "v${final.version}";
+ hash = "sha256-wbdf9zhwMN7QhJ5WoJo1Csu0EcKUTON8Q2Ic5scbn7I=";
};
- buildInputs = [ libmrss ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
-
- postPatch = ''
- substituteInPlace Makefile --replace -liconv_hook ""
- '';
+ buildInputs = [ libmrss ];
makeFlags = [ "prefix=$(out)" ];
enableParallelBuilding = true;
+ env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+ NIX_LDFLAGS = "-liconv";
+ };
+
# just runs cppcheck linter
doCheck = false;
@@ -31,8 +31,8 @@ stdenv.mkDerivation {
detects a new entry it'll emit only that new entry.
'';
homepage = "https://www.vanheusden.com/rsstail/";
- license = licenses.gpl2Plus;
+ license = licenses.gpl2Only;
maintainers = [ maintainers.Necior ];
platforms = platforms.unix;
};
-}
+})
diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix
deleted file mode 100644
index f2d796b21384..000000000000
--- a/pkgs/applications/networking/flent/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
- lib,
- buildPythonApplication,
- fetchPypi,
- procps,
- python,
- qt5,
- xvfb-run,
-}:
-buildPythonApplication rec {
- pname = "flent";
- version = "2.1.1";
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-21gd6sPYCZll3Q2O7kucTRhXvc5byXeQr50+1bZVT3M=";
- };
-
- buildInputs = [python.pkgs.sphinx];
- nativeBuildInputs = [qt5.wrapQtAppsHook];
- propagatedBuildInputs = [
- procps
- python.pkgs.matplotlib
- python.pkgs.pyqt5
- python.pkgs.qtpy
- ];
- nativeCheckInputs = [
- python.pkgs.mock
- xvfb-run
- ];
-
- checkPhase = ''
- # we want the gui tests to always run
- sed -i 's|self.skip|pass; #&|' unittests/test_gui.py
-
- cat >test-runner <
+ #include
+@@ -52,7 +53,7 @@ private:
+ bool nativeEvent(
+ const QByteArray &eventType,
+ void *message,
+- qintptr *result) override;
++ base::NativeEventResult *result) override;
+
+ void hideAndDeactivate();
+ void updateDockCounter();
+diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+index e95ef79f16..c3381926a9 100644
+--- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm
++++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+@@ -305,7 +305,7 @@ void MainWindow::updateWindowIcon() {
+ bool MainWindow::nativeEvent(
+ const QByteArray &eventType,
+ void *message,
+- qintptr *result) {
++ base::NativeEventResult *result) {
+ if (message && eventType == "NSEvent") {
+ const auto event = static_cast(message);
+ if (PossiblyTextTypingEvent(event)) {
+diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
+index de28809077..2521428567 100644
+--- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
++++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
+@@ -502,11 +502,11 @@ void Manager::Private::invokeIfNotFocused(Fn callback) {
+ } else {
+ if (!_processesInited) {
+ _processesInited = true;
+- QObject::connect(&_dnd, &QProcess::finished, [=] {
++ QObject::connect(&_dnd, QOverload::of(&QProcess::finished), [=] {
+ _waitingDnd = false;
+ checkFocusState();
+ });
+- QObject::connect(&_focus, &QProcess::finished, [=] {
++ QObject::connect(&_focus, QOverload::of(&QProcess::finished), [=] {
+ _waitingFocus = false;
+ checkFocusState();
+ });
+@@ -536,7 +536,7 @@ void Manager::Private::checkFocusState() {
+ }
+ const auto istrue = [](QProcess &process) {
+ const auto output = process.readAllStandardOutput();
+- DEBUG_LOG(("Focus Check: %1").arg(output));
++ DEBUG_LOG(("Focus Check: %1").arg(QString::fromUtf8(output)));
+ const auto result = (output.trimmed() == u"true"_q);
+ return result;
+ };
+Submodule Telegram/lib_ui contains modified content
+diff --git a/Telegram/lib_ui/ui/rp_widget.cpp b/Telegram/lib_ui/ui/rp_widget.cpp
+index 0b57704..0d2ca01 100644
+--- a/Telegram/lib_ui/ui/rp_widget.cpp
++++ b/Telegram/lib_ui/ui/rp_widget.cpp
+@@ -62,7 +62,7 @@ TWidget::TWidget(QWidget *parent)
+ auto format = QSurfaceFormat::defaultFormat();
+ format.setSwapInterval(0);
+ #ifdef Q_OS_MAC
+- format.setColorSpace(QColorSpace::SRgb);
++ format.setColorSpace(QSurfaceFormat::sRGBColorSpace);
+ #endif // Q_OS_MAC
+ QSurfaceFormat::setDefaultFormat(format);
+ return true;
diff --git a/pkgs/applications/networking/libcoap/default.nix b/pkgs/applications/networking/libcoap/default.nix
index 5c3752046be3..d705536ea7df 100644
--- a/pkgs/applications/networking/libcoap/default.nix
+++ b/pkgs/applications/networking/libcoap/default.nix
@@ -4,13 +4,13 @@
}:
stdenv.mkDerivation rec {
pname = "libcoap";
- version = "4.3.4a";
+ version = "4.3.5";
src = fetchFromGitHub {
repo = "libcoap";
owner = "obgm";
rev = "v${version}";
fetchSubmodules = true;
- hash = "sha256-SzuXFn4rihZIHxKSH5waC5362mhsOtBdRatIGI6nv4I=";
+ hash = "sha256-QNrsR6VarZ2favvTZ9pMhVafwF2fOjYLKcyNqZyUl6s=";
};
nativeBuildInputs = [
automake
diff --git a/pkgs/applications/networking/lieer/default.nix b/pkgs/applications/networking/lieer/default.nix
index 8c8932c91176..32f8d6663929 100644
--- a/pkgs/applications/networking/lieer/default.nix
+++ b/pkgs/applications/networking/lieer/default.nix
@@ -1,18 +1,21 @@
{ lib
, fetchFromGitHub
, python3Packages
+, nix-update-script
}:
python3Packages.buildPythonApplication rec {
pname = "lieer";
- version = "1.5";
+ version = "1.6";
format = "setuptools";
+ passthru.updateScript = nix-update-script { };
+
src = fetchFromGitHub {
owner = "gauteh";
repo = "lieer";
rev = "refs/tags/v${version}";
- sha256 = "sha256-z3OGCjLsOi6K1udChlSih8X6e2qvT8kNhh2PWBGB9zU=";
+ sha256 = "sha256-U3+Y634oGmvIrvcbSKrrJ8PzLRsMoN0Fd/+d9WE1Q7U=";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/applications/networking/mailreaders/betterbird/default.nix b/pkgs/applications/networking/mailreaders/betterbird/default.nix
deleted file mode 100644
index 38ff368ad5fd..000000000000
--- a/pkgs/applications/networking/mailreaders/betterbird/default.nix
+++ /dev/null
@@ -1,130 +0,0 @@
-{ lib
-, buildMozillaMach
-, cacert
-, fetchFromGitHub
-, fetchurl
-, git
-, libdbusmenu-gtk3
-, runtimeShell
-, thunderbirdPackages
-}:
-
-let
- thunderbird-unwrapped = thunderbirdPackages.thunderbird-115;
-
- version = "115.14.0";
- majVer = lib.versions.major version;
-
- betterbird-patches = fetchFromGitHub {
- owner = "Betterbird";
- repo = "thunderbird-patches";
- rev = "${version}-bb31";
- postFetch = ''
- echo "Retrieving external patches"
-
- echo "#!${runtimeShell}" > external.sh
- # if no external patches need to be downloaded, don't fail
- { grep " # " $out/${majVer}/series-M-C || true ; } >> external.sh
- { grep " # " $out/${majVer}/series || true ; } >> external.sh
- sed -i -e '/^#/d' external.sh
- sed -i -e 's/\/rev\//\/raw-rev\//' external.sh
- sed -i -e 's|\(.*\) # \(.*\)|curl \2 -o $out/${majVer}/external/\1|' external.sh
- chmod 700 external.sh
-
- mkdir $out/${majVer}/external
- SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
- . ./external.sh
- rm external.sh
- '';
- hash = "sha256-dXfpu+ufBfAWl1OlpQ1i8CC7N8f0NbxfaMH6BdKr28c=";
- };
-in ((buildMozillaMach {
- pname = "betterbird";
- inherit version;
-
- applicationName = "Betterbird";
- binaryName = "betterbird";
- branding = "comm/mail/branding/betterbird";
- inherit (thunderbird-unwrapped) application extraPatches;
-
- src = fetchurl {
- # https://download.cdn.mozilla.net/pub/thunderbird/releases/
- url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
- hash = "sha256-A3/D8D9e5PI9SUetKFUE0oDpJsThprIk1zUfZoxu1/A=";
- };
-
- extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ ''
- PATH=$PATH:${lib.makeBinPath [ git ]}
- patches=$(mktemp -d)
- for dir in branding bugs external features misc; do
- cp -r ${betterbird-patches}/${majVer}/$dir/*.patch $patches/
- done
- cp ${betterbird-patches}/${majVer}/series* $patches/
- chmod -R +w $patches
-
- cd $patches
- # fix FHS paths to libdbusmenu
- substituteInPlace 12-feature-linux-systray.patch \
- --replace-fail "/usr/include/libdbusmenu-glib-0.4/" "${lib.getDev libdbusmenu-gtk3}/include/libdbusmenu-glib-0.4/" \
- --replace-fail "/usr/include/libdbusmenu-gtk3-0.4/" "${lib.getDev libdbusmenu-gtk3}/include/libdbusmenu-gtk3-0.4/"
- cd -
-
- chmod -R +w dom/base/test/gtest/
-
- while read patch; do
- patch="''${patch%%#*}"
- patch="''${patch% }"
- if [[ $patch == "" ]]; then
- continue
- fi
-
- # requires vendored icu, fails to link with our icu
- # feature-506064 depends on those icu patches
- if [[ $patch == 14-feature-regexp-searchterm.patch || $patch == 14-feature-regexp-searchterm-m-c.patch || $patch == feature-506064-match-diacritics.patch || $patch == feature-506064-match-diacritics-m-c.patch ]]; then
- continue
- fi
-
- echo Applying patch $patch.
- if [[ $patch == *-m-c.patch ]]; then
- git apply -p1 -v < $patches/$patch
- else
- cd comm
- git apply -p1 -v < $patches/$patch
- cd ..
- fi
- done < <(cat $patches/series $patches/series-M-C)
- '';
-
- extraBuildInputs = [
- libdbusmenu-gtk3
- ];
-
- meta = with lib; {
- description = "Betterbird is a fine-tuned version of Mozilla Thunderbird, Thunderbird on steroids, if you will";
- homepage = "https://www.betterbird.eu/";
- mainProgram = "betterbird";
- maintainers = with maintainers; [ SuperSandro2000 ];
- inherit (thunderbird-unwrapped.meta) platforms badPlatforms broken license;
- };
-}).override {
- crashreporterSupport = false; # not supported
- geolocationSupport = false;
- webrtcSupport = false;
-
- pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable"
-
- inherit (thunderbird-unwrapped.passthru) icu73;
-}).overrideAttrs (oldAttrs: {
- postInstall = oldAttrs.postInstall or "" + ''
- mv $out/lib/thunderbird/* $out/lib/betterbird
- rmdir $out/lib/thunderbird/
- rm $out/bin/thunderbird
- ln -srf $out/lib/betterbird/betterbird $out/bin/betterbird
- '';
-
- doInstallCheck = false;
-
- passthru = oldAttrs.passthru // {
- inherit betterbird-patches;
- };
-})
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 716f7bd019d7..3ab9759324f5 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,665 +1,665 @@
{
- version = "128.3.2esr";
+ version = "128.4.0esr";
sources = [
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/af/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/af/thunderbird-128.4.0esr.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha256 = "68e754e3280b0e47e2160d2538dbe959edde3b987a62f05c42bee02e554fbeeb";
+ sha256 = "f4b5c0c67baf17bcd36c395f4e2a103680899f4b5b5134c0772725a5cc2edcfb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ar/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/ar/thunderbird-128.4.0esr.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha256 = "06eb5688aeab9fd9c544c45079a5a711bef6bf0710d0abfc508e33d072827ee0";
+ sha256 = "b7097cb173e15e8a1ebd8d07d9695de046c950d8d363af06ab9a131597300208";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ast/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/ast/thunderbird-128.4.0esr.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha256 = "434d20e1d20acb0aefbce5d15fb3d015eee1dc474a5b5afae90b7575308c27b6";
+ sha256 = "98567596e05ff39ecfaefc77b03589dd77874e292943f665f4c31463eff0113a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/be/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/be/thunderbird-128.4.0esr.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha256 = "a4def49f05a1a479c3ac0f1267d4ab65de84d7acbcc79e1c52e55e814bad8342";
+ sha256 = "9672515b79fa7db20b77b032c21b5a43816aa405b6d712cdea1b779a701b9e49";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/bg/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/bg/thunderbird-128.4.0esr.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha256 = "d6d4770f6707dc8a246eafaa0c3a360fb49117eb2adbb12e99a02b4de2cf1805";
+ sha256 = "929517a24e94364187bfe6f4f4df25c61cdcab4a06302981a7de17c094b50eab";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/br/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/br/thunderbird-128.4.0esr.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha256 = "e2352aacca362ce56571b1f50009304355e5c2575e0aea3e84f81d386f7e5553";
+ sha256 = "23779556660e301737025a15c13554a149fa4d1414b882bad7f3d943a2189d66";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ca/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/ca/thunderbird-128.4.0esr.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha256 = "67c31bb9599c181bbaf250c2479188d7fc2e208322aa51737aed83ed9f91299a";
+ sha256 = "2e375548e9b79bf4d0227bcaae413f898c42c12e6fe45c3a8cdd3dfd66ef63c9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/cak/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/cak/thunderbird-128.4.0esr.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha256 = "b7b44e214374a526264522345e5907b76d080603b0fc6b2c4bae9621b78279a5";
+ sha256 = "7247868660c51b6a3fbe916e2203b12116ae4daf54099088d059c5f40c7ae28b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/cs/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/cs/thunderbird-128.4.0esr.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha256 = "72149f69323530b8e369fb2689a8baad097f23fe3a6039bfe56b24c0a3290744";
+ sha256 = "65918f24eab7e390e0b4ce74a2b8651702f05d3517f5ef94ecd99b5459250c8e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/cy/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/cy/thunderbird-128.4.0esr.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha256 = "207ee0a8bd84e9e8b1c759a1c9987207f701d0da2dd6c036d759475896a0f2c0";
+ sha256 = "b5b042bdcb95d1229d2d832a7e137999119321a8312c0bc672ce35d330d0b8e3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/da/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/da/thunderbird-128.4.0esr.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha256 = "b69247826491468475cae337ed62c0314ce8ca4de33ed3d8630114fddcaec41a";
+ sha256 = "1da0e908f24e3efe0e4dd43a10bb4ce620059bf6ceee3fa5f9d2a5d8d32ff31e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/de/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/de/thunderbird-128.4.0esr.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha256 = "a0ef4564aa205006fd448ddd8d03f398a1fd525c156bbcbcba297a6a2c932cb7";
+ sha256 = "4a8751d1268ce303fcba4dcdb1cf93252338908a302f3532d2adb6276fe6eac8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/dsb/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/dsb/thunderbird-128.4.0esr.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha256 = "58eb03368703f0fdd760f04102fd3f1dddf525147fb7e5e4f1919e080935d6ea";
+ sha256 = "bc9b9d26d827794f61b046788e9f965e9275b4ce15017c3115fec2c1eda5de3f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/el/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/el/thunderbird-128.4.0esr.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha256 = "1a1c48242ab368a8039edb04093c64cc41aa1885cbe67567340f324ce429dbe8";
+ sha256 = "a2a44db9099395350baad249ad252d8002cc990613b82d77b84e6f49ca60f54f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/en-CA/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/en-CA/thunderbird-128.4.0esr.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha256 = "f13a13039d3006320a71a01a6ffdcfebdfa446abd0aadc6858b4296dbbd01106";
+ sha256 = "a85f302f53ab25362dd9f60f926c7909cdb3df90587b2b930defe8b71e039adb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/en-GB/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/en-GB/thunderbird-128.4.0esr.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha256 = "10d698906140a7b104484a3e90875b1f0fc2d1d7abe3bfcc2c82ab793a8c7992";
+ sha256 = "76781c1c4e617995d79c22bf3b5aa0f0cf706ad2cb0ac59ab0ae736db2aa89f2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/en-US/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/en-US/thunderbird-128.4.0esr.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha256 = "72c185256191a6f1f8b4e497b65dde1fedd919a2251261ccad6da06c62dd627b";
+ sha256 = "e6aae02f5f9e01768b850b2df18404f19ac4f0f0e9aa176683d0152d8731876f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/es-AR/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/es-AR/thunderbird-128.4.0esr.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha256 = "211d5fbe5d72d5365c74153817fc95eb376d7eb2f1fba9aea1522491fe718afc";
+ sha256 = "7fb83af57053b258b63dec7327a814feee2550a7aef6db38ce55f1dda53eb40c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/es-ES/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/es-ES/thunderbird-128.4.0esr.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha256 = "6fcf5a499accf6882dae1c1f1a69da600a8b8ba28a902a6c7a3b4d8de51d17e1";
+ sha256 = "fe16a9eddc488c8318ada85130bc7720b4aff243e6ee02c702c1e167d6831358";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/es-MX/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/es-MX/thunderbird-128.4.0esr.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha256 = "aeba0e0b1637ce57d8ef11e73efbc39e5843c03d1efaf2e9519e60a03d6f50de";
+ sha256 = "80d23de928a1f23f9b53c593a2c39f8ec316c0b8c2614e66b77864917445b9d1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/et/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/et/thunderbird-128.4.0esr.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha256 = "04b7e75de0df9fb9ca09ea2910a618d9c6ed60d9b71c2505ec8850b183ee98a3";
+ sha256 = "066cdae27bdfcf37c8f06bee52c1b2c6dd08a87ac9046d16272958508b2164d6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/eu/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/eu/thunderbird-128.4.0esr.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha256 = "5499fac8f11acc67b1590ca43dad0c136e9c0a00134ff14469265845154b791d";
+ sha256 = "a86df82e8c15ff6f30ee30227bf3ae85c9d0c8df8264b63542f5a64fda9b2a00";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/fi/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/fi/thunderbird-128.4.0esr.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha256 = "3254378b2ee27f7462129428176a92277315c0089915c0f3a80dfa435bd2205e";
+ sha256 = "ad266dd4c903c53c48e62c62288e210c5b98ef653ef03196b9a261ce1f6e8415";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/fr/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/fr/thunderbird-128.4.0esr.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha256 = "56861692b1c421d7f5a90657397b86e678cb6c162853362e69aaa7db4f28925f";
+ sha256 = "54e6aaa6fc5b976f62930ec44a8069cda5edb0780fa342673daa0421e2eb9f6f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/fy-NL/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/fy-NL/thunderbird-128.4.0esr.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha256 = "63dca4a0a7c71b4d717f92213d8b7524b1eca29ad50e4540edaac148badf0586";
+ sha256 = "2c0e5b5f3ada77823a3812ed342dca95171b05f151bf43beac62c7ca4d37fcca";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ga-IE/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/ga-IE/thunderbird-128.4.0esr.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha256 = "70ded506c128d9e7962dcf8621b772840834f44d59ab1a6a8c8c543175242858";
+ sha256 = "29a77f6d2ebf8b1aec6942a212f0a524c5d4faa804e344cd31eae1fd2e4c2e9f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/gd/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/gd/thunderbird-128.4.0esr.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha256 = "e65b6d02421f5b37d19c6b65cba400d12f64418b80410ffebafdc83b11758eeb";
+ sha256 = "f0b3cc12e081308572eea9a122ebf53a33f042fdaa77962dd2b11c52ce964ebc";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/gl/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/gl/thunderbird-128.4.0esr.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha256 = "a92eb0bfd1efba1f5b5efe794b915050d3a67c116e78b84b0abce563553efbd1";
+ sha256 = "10c148f76d49a2bb17fd990fedfd6940ddcadde772f0026255263e6381690743";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/he/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/he/thunderbird-128.4.0esr.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha256 = "5fe6d0a4b259ddb0e85d192659e205610a11c5f1d32498dc84ff4956ce0ecc52";
+ sha256 = "00d5e80ad49c9839fea580648b02636ad3a284eefee89fceaceff1cfcfca2761";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/hr/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/hr/thunderbird-128.4.0esr.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha256 = "05d9d2a86ae030b7c036292ebbdccd5095efb26c32bb9ceb618f1e049514aa94";
+ sha256 = "b02ed6adeb246c263436f3d4f23b40ec830487b88f30585cdfe58e4ead140c9e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/hsb/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/hsb/thunderbird-128.4.0esr.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha256 = "e9a807e8ac2ee94d2ff214e92e1b69cba5f00c3b9c6cbc0244fea2e9ac2386aa";
+ sha256 = "c2c3ff348f1ee9af50c9ca068cd3970f151a679621b94f3aafef817966f50fa5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/hu/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/hu/thunderbird-128.4.0esr.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha256 = "0347ccb486557e961ef46979f4a221b8fed55307379d9eb3e77afafc4d07d736";
+ sha256 = "093059f5e6e7f9b8fd653719ed21bd7988ffe180890c9bc8a1e086ce8ec61aa3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/hy-AM/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/hy-AM/thunderbird-128.4.0esr.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha256 = "636762093f4697a778696bd56864aa8eaae04e48c7f4a4129b116247cd78b998";
+ sha256 = "a632e051dc232c36aec69531eb64d98483899f9128042c90ad0b238b498b3415";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/id/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/id/thunderbird-128.4.0esr.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha256 = "291f1bddffcc0dc308a7532455e232d6e587bc8e0a803b4f6dd85f6f80346135";
+ sha256 = "d44ca9526e7444ac56ee0edb8a29c709093a463e193cd9752b7cb00c51fbea17";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/is/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/is/thunderbird-128.4.0esr.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha256 = "01ace7af5465472c958e3e3ff1784c6b3978a46f3b008fe1a0a556e825d8b327";
+ sha256 = "6bc92c2f7eb0d7577687fe8f987798edf694944214c6fa53b02b7d2c13858f2f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/it/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/it/thunderbird-128.4.0esr.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha256 = "1ba69fa4e8baaf106a3006dd651c92be6b3ba19701ca8c553fd0c3fc7e34425f";
+ sha256 = "9751063446cce37f9d166d5d3685b9dc4c75e2dcb870acc536b99aaad809ecf9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ja/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/ja/thunderbird-128.4.0esr.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha256 = "98c79c493f9c23a698bf2a6627975cf918bead4e2e7ae9bdf8b132e8e5e205ec";
+ sha256 = "7606009ff008abc3919d93ef61c7ae2a23f8ed78b878f22bda83be211ece04a9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ka/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/ka/thunderbird-128.4.0esr.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha256 = "e4e9a739ead52440b1bf0b9dc535d530c812b4d2a91bf6828cbc635f8273a8d1";
+ sha256 = "72fe8b5150caeedbda2084ac6b09cc9793c840fd0964c8326c6ce030b62448b5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/kab/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/kab/thunderbird-128.4.0esr.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha256 = "e36858baf702c8402fa72ac4f1805852dd5d371766e47482f1bc7cb1a73c59fb";
+ sha256 = "be4a52751123bc92470f03200a5875964ff6105e31d9e4ae0f1aa6d52223dab1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/kk/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/kk/thunderbird-128.4.0esr.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha256 = "53e88b687cc6db2abeb3e1f90f861df946c06c6026f4a5cc05a598b3f98ea2ab";
+ sha256 = "159c2554fe613cb4abc157debe9b301c028f9b982b5ae8c4f2117a135cd4954e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ko/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/ko/thunderbird-128.4.0esr.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha256 = "6a18161a3977fe91e5c878dbf28f9de76c919f753dc1e29211168ecd0bb76ea4";
+ sha256 = "d8f8096f503c12429c94c42c119e21957a6cf3924d14f0030da9e46ae3b9326e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/lt/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/lt/thunderbird-128.4.0esr.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha256 = "6cf21bbaf1fee99a86f036e49c56a6c789795375db7b7c2b2d66c9cf4db2009d";
+ sha256 = "1d0ab203ef07760d3808aa92acfa734219f0fcfc2ba23f1a0d7ca8011e0a58f4";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/lv/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/lv/thunderbird-128.4.0esr.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha256 = "ee6207c449bfaf50acbb8d666a87439080ddc6c151324064c6114ddbacfc03bc";
+ sha256 = "89e2eb6f61846e69e67f9e10360b2a3e88f0b21a75996f1167f6c169b6870c9f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ms/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/ms/thunderbird-128.4.0esr.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha256 = "6f73ddde1f47f484819c14e80e9f91be095b6229a69b7ea584b670acfe88af74";
+ sha256 = "f4b11168bbaaaf519f16b8d637a635a405729f68d34b8844224a5782ea6b5afb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/nb-NO/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/nb-NO/thunderbird-128.4.0esr.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha256 = "64f324a7d0c3cfce88383ca8cb844e29df33f9b740bc6d02c718e8e436a555bf";
+ sha256 = "ca8661ecbf45808aac86b4d40acf129d04d71551f8cce206dc913ac63946c80b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/nl/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/nl/thunderbird-128.4.0esr.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha256 = "d7a982d8ba02c6ddad2c1891ae09f5cff5aa80b19e6d2fc26848f8df593fd1a4";
+ sha256 = "2b852d095844fc93f8e326adfc18572461046db0f40abb3bfa16cbf80ddfccdb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/nn-NO/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/nn-NO/thunderbird-128.4.0esr.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha256 = "0d572d3d4f79958083603e2238b3cfe1a5c7d333a1de5a55f0c320ae8415b4fe";
+ sha256 = "387aa2d3bd17236082257f049bbc1bd0ceb8bebfcfa073197fc7f906f1cc13c1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/pa-IN/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/pa-IN/thunderbird-128.4.0esr.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha256 = "ded2cd04fec68d5639c5ebf93a9f50ebd7855cd316b8135c4be36d15dc03d6e5";
+ sha256 = "baff051c11778958a6c52e4127760987d323bf0b100fb6c205f0ec3f8925ba86";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/pl/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/pl/thunderbird-128.4.0esr.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha256 = "a7b4c48be5aaa11b836069862bf471d19f7297575b579411938cd9a1b5f19886";
+ sha256 = "08bd02a1e671c88f7ae9689b6cfca9b138c3923071e8278e529790deaee4272b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/pt-BR/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/pt-BR/thunderbird-128.4.0esr.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha256 = "32a1c309b143c5b2c9d9993c65f3f475ddc279c683d5c6434c1fa92176908e49";
+ sha256 = "7b55c074e0342876e5cfe2c069724e673742069fce307576021407edf9ae87c0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/pt-PT/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/pt-PT/thunderbird-128.4.0esr.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha256 = "9f3b43fef1200627869eeef5d0814a7831ef6be2b9893cef94f6060ac579f4f9";
+ sha256 = "8f81ab9e58d69f751aed4dfe16a23b667196a520115e2d0cc930295a8fa8189f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/rm/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/rm/thunderbird-128.4.0esr.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha256 = "900a77024280148075888fc3dfadeaa7944b7fbe96cbcf359e3cc4cd421ef71d";
+ sha256 = "0c07d0faea7d8795ad2389960bd5b8c47e2000fdfea14b93ff8f6c7e6c3db730";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ro/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/ro/thunderbird-128.4.0esr.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha256 = "7d556f80f1fa9b60f93ec0a9bfdcc02cb063569515ff5e285aec2b8d6ef3b0f6";
+ sha256 = "7beeb1f9c6a3159c351596caae91609a7247de3eef2df775703fd8ac71d1f858";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/ru/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/ru/thunderbird-128.4.0esr.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha256 = "bbbf234d7b1e8c7cdd71f582f1c4cf1b14ae2e9e695e9edfd56e7358ffcf9daa";
+ sha256 = "c52a4a86626b025dd5b421f9033cd9ca8b13b7278946fc061b60706364541147";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sk/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/sk/thunderbird-128.4.0esr.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha256 = "665f506a18615247a57c7b936d3b4f0fef7240967c2e64e206ca44fe8842f65f";
+ sha256 = "3b5e3d688b6168b42cb8142c095749e6339618fb56f77fbf43bb4abf1ee49e7e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sl/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/sl/thunderbird-128.4.0esr.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha256 = "6cb65f62b5759336d08cf4735cd4eb4a4dfa3664786e06988dc5db3fa74267b9";
+ sha256 = "b8301c1136e9145a1b45c9eaabaee5daec9eac84a883978cac91b4eecfb1a13d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sq/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/sq/thunderbird-128.4.0esr.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha256 = "578d0542d3e0b4615653832d4474d5253ab7f11aafecc4a4bfb370ff14d09c85";
+ sha256 = "21ce583b646bdb0451f6cf2b0178ab7d56b80fce5bdba38cb3b65598cd91e3e3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sr/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/sr/thunderbird-128.4.0esr.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha256 = "69f922567c45c44c2902255c6abc58312f625d2be421cbf986a488addc96af92";
+ sha256 = "95b476e61cc72787642c9ceec7d26b652cc5d1ec8f756e62a89e4d45022f3d66";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/sv-SE/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/sv-SE/thunderbird-128.4.0esr.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha256 = "338f53c983182a93febd49671b73e519da023e6d9653d16dcb1e96d62589d095";
+ sha256 = "36f24520dfaea9a3090812b326ca29434f93fdad055793f6aeff85aad6f47599";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/th/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/th/thunderbird-128.4.0esr.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha256 = "89498e7b762e95e27d5a5cb7b33cfdcb04057f7c25bbec594f02b5ba11049cd3";
+ sha256 = "c63e0b7c645a0dc60fdf74c98f3e429fd2ce7f0e460e3eaaad51bbb8a3c753e8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/tr/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/tr/thunderbird-128.4.0esr.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha256 = "e08daa81402551cada7b056d40ddcd77f19d19584552349895cb6d206fc3e3b2";
+ sha256 = "8713083de4a756194e48038923d5584722ec49368a33a2b08157a51963ff658b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/uk/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/uk/thunderbird-128.4.0esr.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha256 = "d008cdb485bfa80654acbda091761f31cea620b5fda06cea86df9920f807da90";
+ sha256 = "fd83a6354ccdedb72a41a74755a637ca8fc3f44424306abcab5f8af7efefecef";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/uz/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/uz/thunderbird-128.4.0esr.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha256 = "6d73e85cc68bc9dbe519a46e217f2c62d4b002757cac6f3eee73142642259575";
+ sha256 = "fa5bb891a80deca794b190e52c8496e43ea0b610f85451c31eb5d6851a1181a0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/vi/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/vi/thunderbird-128.4.0esr.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha256 = "6f7b1aa7b314f9f7a23bea9f7e5dcf654891f14eadf543603e057a62e56eb1c3";
+ sha256 = "f6b09e305770da8cd27702c0024e5b237b3e7c0a7d237324188e569eaaafdba9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/zh-CN/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/zh-CN/thunderbird-128.4.0esr.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha256 = "4b63f9cc7e02e1048273de888df5238c4e308a5b62caa97b9177ac9daddfaef1";
+ sha256 = "0f4d8444c65d57294ab5a2eb110386d90164da2f40959b6ccbd2f959515c1f7e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-x86_64/zh-TW/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-x86_64/zh-TW/thunderbird-128.4.0esr.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha256 = "c3697d78a62dd49b6c9c264809fa3a208edee853fd6f2371a90a3180d88e3ec8";
+ sha256 = "d87055f5fbd0970c3123d3b3dc5d3e5ac30a056af4ba0b5030e14a995691f543";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/af/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/af/thunderbird-128.4.0esr.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha256 = "d396f5bd5a22cf7e7edff3ea71cc05922c4b0326859f7460f363eb31df09ddcd";
+ sha256 = "40b8316fb40a81f674a1ab8b070f36a0250006d815ebaef338b429ec2c477a9c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ar/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/ar/thunderbird-128.4.0esr.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha256 = "c095953766c3aa7f1308a8931017b202ef63783562404344efbab9a9367f38b6";
+ sha256 = "ba6316f8d639b21b29c0400dcd5004c55250dde52eefb290c406b52764fae625";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ast/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/ast/thunderbird-128.4.0esr.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha256 = "1039b107a3adcadc4d1e329416792fe668c0588a4a1e1283caed89789b2c49e8";
+ sha256 = "0a3be4e77102a994a61280615cefdee894611c94c0902bb446c5bc7dd19e0780";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/be/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/be/thunderbird-128.4.0esr.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha256 = "43a3da378465f4e3b7a6adcd55dfbb9a100392d06dd96e49a3d50ae756a3ca02";
+ sha256 = "12299b04da9ba5dbf0ac3d6ee6d11a0e0f7dda07c90f6b5f874b29702acd6f7d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/bg/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/bg/thunderbird-128.4.0esr.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha256 = "03be328293a1039ea0c4d05fc8ea091c073d95c4b72dfb4f348f5982647ac5db";
+ sha256 = "f668f2dae9b4f3071af1a3a0e87d019ed3ad044f20f45153e62603a2e90edeb3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/br/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/br/thunderbird-128.4.0esr.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha256 = "11e5309a82b6ae36906d2285aefca39db32247501cf60a582bfe69a879646a9e";
+ sha256 = "aab0c30d08a1687389c53b14170839828b7ee5c85be1e77b30db72135119804a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ca/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/ca/thunderbird-128.4.0esr.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha256 = "9a17b59732a651b3247f7af810bd633f07e608ba66c1e7d00b341baac9f0ec69";
+ sha256 = "bbfbb488667237a4cde6e73948df78f2a8ebf4fd78e40227c2000eb15155ef9a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/cak/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/cak/thunderbird-128.4.0esr.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha256 = "2796ae01d6fa7b48d22837d0c6f10ba6bf00ffbd35794bb1f38e3a136c8cccb2";
+ sha256 = "64c28f5a4b123ce00884c90fbf246e34bce6453ce30e3bfea6b2574496d46052";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/cs/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/cs/thunderbird-128.4.0esr.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha256 = "f2e65539e93222d4a7e552b7f670be776853b65aeb2f7fb144d68072b3bdd50d";
+ sha256 = "e86a6704f92a5a0b8bdffca1ea066310818690e0dec2a5ddd2029504f677258c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/cy/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/cy/thunderbird-128.4.0esr.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha256 = "a59825b1692b9dffeb39bf30ea8b5f36cc30445dcd5ea184cc8487fc01fdff75";
+ sha256 = "2dc05b825b3f1d58eea7042fd502da562999391d1e889f267916a2bef0fe008e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/da/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/da/thunderbird-128.4.0esr.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha256 = "d0c8b043c86e83ccc86a728743489a48cb0cc4e46d6976bd3595752a306c0774";
+ sha256 = "5cbccb42d58dd622e1f7d165523597f1be5d527dc532400919e5b0e84e9cd95b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/de/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/de/thunderbird-128.4.0esr.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha256 = "917ce52fc4d81ebbe5276240b41565fbce6bdfc53ffa7753db97e7e640a2f90a";
+ sha256 = "25c6cefa9eae00bb8983d071a8bb7c2175d69386b96236c8c75389901919392e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/dsb/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/dsb/thunderbird-128.4.0esr.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha256 = "2c6ffd2c7e140d7710e5d702008f85892761e834e81ee1dd80f561e1aa56ddf6";
+ sha256 = "ff2a8ad07dbf6ea8c0860c984b438c94f01fd37861b16805a0f50e8bc9401cf7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/el/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/el/thunderbird-128.4.0esr.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha256 = "9213a7c441951f9a07766ccff191da85cab2a24fd7fbce1f19bae077387e5c08";
+ sha256 = "ee6eeb93e95a960b2e6b43566896d2c3ce9eb24ed477c9600148ccc533809bed";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/en-CA/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/en-CA/thunderbird-128.4.0esr.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha256 = "77895c740967e60406ca466afbcf294be052a6ee81d5c4b2cd531750d23fa661";
+ sha256 = "6c6f11aa8f46bb49e07105c8a4a7391663cdfda166285b326ff35c1a40a38abd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/en-GB/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/en-GB/thunderbird-128.4.0esr.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha256 = "4c547974c874a4ce973b02a890fd12ac917d89c8ebf0a9d332262092ef8b9be9";
+ sha256 = "6fc49aed294f7bdce470834596ba3ba7f65c938105d0d747daa425cdc182401f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/en-US/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/en-US/thunderbird-128.4.0esr.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha256 = "161b7ea35c5d4c1ecdb8cf0229fbcf3ea152c09c22543e0762eece4b7d6bb6eb";
+ sha256 = "c4edd030485a935fdba3ec4faac0aa8a78de047af8e0d5e47ca95bc879a17621";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/es-AR/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/es-AR/thunderbird-128.4.0esr.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha256 = "bb83137654be3e90cd5c0836342f00b85b065663f5318f562b09bcd2714084e9";
+ sha256 = "f0c29400917af1bce184b994f65892115c69ed492c16e7180b83905f29bd03d7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/es-ES/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/es-ES/thunderbird-128.4.0esr.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha256 = "4744ecee5a3e72560aa25efd25c793b8786764aa7d9f8ac33cf1a33ccbe28a76";
+ sha256 = "1dd664e361a4163ec516f4526e5f60c565645cd892d61ea3c72a5ca8f0454f1a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/es-MX/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/es-MX/thunderbird-128.4.0esr.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha256 = "6a63c009191b205ced9f8147cfe36a801e9a02d5d74a9a57f66960c78a9b3671";
+ sha256 = "819e064ab10fa975d8a483f1f1b648f7ccd41d8e1cda59d6cdf26db34a74f457";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/et/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/et/thunderbird-128.4.0esr.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha256 = "aa2cc826ecbe7397b21a7c5b603026105a5db5ae3d8046ca806749b2133e38b5";
+ sha256 = "5f07c0e0b9dca3ce883dc3382141f7c38e1b042bc5609b4ae85d7d792231f58b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/eu/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/eu/thunderbird-128.4.0esr.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha256 = "28762f614cc70ebbd3d4863a671257cbbccb5d60258d7d07f7d1e42ca3c1b2ee";
+ sha256 = "b9ac89ba8815d30a527f27f3d01dec0548be1cedf9449acba17b7948d44b92d1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/fi/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/fi/thunderbird-128.4.0esr.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha256 = "f5b844a279088b43538b4e3f96cfa1c8614710398022d3cf0d4c3c4fbacea456";
+ sha256 = "313dd6d2f2bbf36395b826f7e04c69fae434c7fc9a2ad886d4af536b0b2ac098";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/fr/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/fr/thunderbird-128.4.0esr.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha256 = "4e75cc4efc0bef081cf6e0b74ac7dd74f450dd87a1a0bfbabdc8cdcc383be3c9";
+ sha256 = "8883f2c417ecc6336155d5f05c9de82409d035894726936923bb96f4d70b37f1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/fy-NL/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/fy-NL/thunderbird-128.4.0esr.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha256 = "11ec4e4be64feac976e21dadcca77145dc4fea225c0d00c9dceaa509ec61cabc";
+ sha256 = "ae4875e8dac4729546770a24dba35b904a0f34342dc2f56c3dca5870b8f3fabc";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ga-IE/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/ga-IE/thunderbird-128.4.0esr.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha256 = "b4eaace12a57f7b24f56f476fbaa9e9606f25d1f82b34e67cb1a0e10d191e3d6";
+ sha256 = "72bf9ee607ab87f9d6975eecaf3e2104cf98a32ace843178aa156bd167db9359";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/gd/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/gd/thunderbird-128.4.0esr.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha256 = "1f669d83cc4caf91bfdd61b9e63e282f90f0d7cbb96c1100c0f904d003f9e076";
+ sha256 = "9364706897f6505d4b6c8eaa315fd9c9ee85880ee58924c8d118fcd5ef551193";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/gl/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/gl/thunderbird-128.4.0esr.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha256 = "5eb51acfb2955bc0038e299d77ed8491648b4d7293d31d8a01648b67dc1e575e";
+ sha256 = "5de972bf2fc002fba0d1e5afc4e6b2f83bb6c740c7f6ef4958734fc18984f94c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/he/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/he/thunderbird-128.4.0esr.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha256 = "87f4fb6eaf8f32e9b041a8d5e5da6072b1106492a9da75a4cac4255ccb818121";
+ sha256 = "a4414c6642a7aeb4e754ae75f583dc0582e98b0e4555130590b2abf68b29cf13";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/hr/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/hr/thunderbird-128.4.0esr.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha256 = "d93a01b31369d687865d1bafca101b349c697bc7e7b48ff470831849b0444814";
+ sha256 = "d2312db3e884a4575ab3c2d0e3fedbfc85f6ace385895451c15a27f06a746a06";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/hsb/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/hsb/thunderbird-128.4.0esr.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha256 = "78d421c94906c39d64013679d786579ae60a574adebdb4b4729a2861e392b5ad";
+ sha256 = "972a1f9391fd1b32bd9eec5341483d01b1b91ed04e8febe05a9dfea9dea42300";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/hu/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/hu/thunderbird-128.4.0esr.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha256 = "cb6a581fb55422aedb80ad1cf2b67dc07a82f0e3817612454bd0894522a77051";
+ sha256 = "5ad67c2c7b215be82dcd223519b8750a68dc2a8947e6f1f2e2af1808126a2fe8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/hy-AM/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/hy-AM/thunderbird-128.4.0esr.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha256 = "b7f29b312f7c26fd5f876d864006eea66977e14e5ff6c761d25b00dedb520272";
+ sha256 = "58460cfd499f75be278fc810834188247ddf26e4909c4685d6571822d4199497";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/id/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/id/thunderbird-128.4.0esr.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha256 = "b8942767658f68d76c071a3d4c22bde09e09886a036f3b1e5fb46af18ca76434";
+ sha256 = "2c9b914b683af7434d0af1a44b1fcca0cd80ba87815aec9d0013f86a012b98a9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/is/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/is/thunderbird-128.4.0esr.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha256 = "7023c95b4036be5a1f6d8924e746b92aef9e76e8e82726a221473bd540dc3bf7";
+ sha256 = "8d0e365474bcffb29adefc95346aa39653106347130ac2168d625b251a6cc3c3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/it/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/it/thunderbird-128.4.0esr.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha256 = "cd594a8bf3e316e9598007ede696e785013f5a11bd68b14ce742d97abb7cef8d";
+ sha256 = "cb49c2dde4e8190cfe59639456940f3e96474f9cb19c72e9952107ed3806e8d0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ja/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/ja/thunderbird-128.4.0esr.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha256 = "c17eca728cf0a861f25fb9cb419ed2c20f979c19c15582b6a17a99544881d723";
+ sha256 = "e28ee17dfd116b8bdd0aca4e988df23b9ffd8a56ddd62166a4eceaa3c3224e7a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ka/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/ka/thunderbird-128.4.0esr.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha256 = "495c8d23f24dd7660e9d4836d4cb18ca48c7f3b0edb255cf18daa627ad78d6ee";
+ sha256 = "14a457fa40ee1f684663ecfc2bfdf7c812efa6822496fa68afebb15e789b9660";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/kab/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/kab/thunderbird-128.4.0esr.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha256 = "6fd780bbecad88ab558c76938599a54677e93689d0d451e96beddc886569e3a6";
+ sha256 = "32d538f85c9f77907126c7f67376b45186f583542ab3ca0df15d9feeb6c99950";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/kk/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/kk/thunderbird-128.4.0esr.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha256 = "92d2e2e9e80f75285aabb3ac62edc6db028b15b752a6cbcbb3795566cbeb744f";
+ sha256 = "16ddc3622e4c2d456aa98328f55a6bf93e0c0462b0ca72382be6f3e0edc6811f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ko/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/ko/thunderbird-128.4.0esr.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha256 = "4ea9a6c97b458928a66341d86ed0fd274b27b1e3a2259971b8bf795ab36656c7";
+ sha256 = "874447583a9c7685c48cfcfdd663d8234540e088ad6336b3281837a355ba5df3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/lt/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/lt/thunderbird-128.4.0esr.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha256 = "5037fd5bff06a053331b2ad6312f35af1dd881b2b017fb92ac4c433bf7c10a20";
+ sha256 = "dd57c0e4c96e9ddde9e49f8db763246a4f65c451be62d4f74989993d72edff11";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/lv/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/lv/thunderbird-128.4.0esr.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha256 = "0498e5ae2815fcb979230f3166cfeed89d02bddc9c7ed73646600fca2eb44aec";
+ sha256 = "e1b0fdb30d1d4129fd3e9cb1a72040f6a0cbc906e7a8f09b70bc06a742062afa";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ms/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/ms/thunderbird-128.4.0esr.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha256 = "bfbb9fa1a5c1d4aa4c9c73c7e02628c1f01c314fc252370fc6a96896a666db57";
+ sha256 = "4ef54e071c9ca46a39aec1a965cd7a0a2509ceff6643279b0655bcdacebc9adf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/nb-NO/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/nb-NO/thunderbird-128.4.0esr.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha256 = "da6ce60429e87f38ff66ce975f4a63e1f2e6f8b2a7ba4f895a32760c09fa02da";
+ sha256 = "92d48bf7e3bab1f3e56affeedf7942616b99c7702254f2e88ceacdd0bfe4ce27";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/nl/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/nl/thunderbird-128.4.0esr.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha256 = "514646876e7654bc5a7141d919cce98eff22e07180a37d6765f87629fc48724b";
+ sha256 = "08060766e951a2c45304dc16a0ab3eb25b8b5b6e0dbcf9ec3b6bf42813287e5d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/nn-NO/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/nn-NO/thunderbird-128.4.0esr.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha256 = "dda61d6545277b5d8f53100712796e2ebbf3c8b759c4bee0f5c467bf8419d9ed";
+ sha256 = "8722da03e9accc9d746ea4bbee2e54a402bb727e3e7dec89f707a3a893542aa9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/pa-IN/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/pa-IN/thunderbird-128.4.0esr.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha256 = "02b524802db090431e2c1888b1fee5148d22ae7ae7a6d4a22c18afda11bf5c84";
+ sha256 = "afa7ff5f443879b6423c5d68b320aa4783fce66a400000b87d5ab8141538ea65";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/pl/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/pl/thunderbird-128.4.0esr.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha256 = "43991a49c7e68753599b4b7b6e5b0d23f199d57b85824ccc56b9b4bfa2c4f7e5";
+ sha256 = "c464f3af685089e44b95b6d328465f84b8b9052e05d8cf6650eba704500789d1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/pt-BR/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/pt-BR/thunderbird-128.4.0esr.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha256 = "d9af07aadc66ce20772407de1a458756545775b95b70c8c56c71a6b3ca48cd94";
+ sha256 = "fb0067b077d68e8d5b11b70a72ac7fccbaf8b0a235b1a0f4b32b7ed0d21a94cd";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/pt-PT/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/pt-PT/thunderbird-128.4.0esr.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha256 = "523bcc1b478dcc9e54a1f4c6743fc546ea0b18956d907149641d34598ffccc6e";
+ sha256 = "446e8b19db276e988f1d25f057e4343f467d82f6a1ca33fe96e19f51c6d9a2e3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/rm/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/rm/thunderbird-128.4.0esr.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha256 = "5a6fef50c1acfb0cd2e91d9e03aad4afd688436dcca5280bdb49ba144e97a439";
+ sha256 = "7ea76c1352591cc5c2e612c150ad51b57d0fa18f75b667ac24551ede81f0c3fb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ro/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/ro/thunderbird-128.4.0esr.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha256 = "298aeaa7ae0afaa6531a566e2e8ce072adcc62f7646cf33bfbd3acc450335881";
+ sha256 = "8cbce1993c005a231e47a034affe17f1bcdfdba8d6a157320c997353ab63efeb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/ru/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/ru/thunderbird-128.4.0esr.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha256 = "c017f418996a8cc7fb7bd2c4062df1ba1dcf4c2b8df7d23a44fe7e0aebd00b2c";
+ sha256 = "79f4ca2a069d07ab2888061e53c360b992e95fa74129924abaf74e00158f73c9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sk/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/sk/thunderbird-128.4.0esr.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha256 = "84079eedbd6c2a5cf4733f256a583b302209dc84a30d2305b859bd10efa87c1f";
+ sha256 = "57a42e9106f6c51b0f1fe4f6c573d9efa1e5ac5f39e0573902243a1518164de7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sl/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/sl/thunderbird-128.4.0esr.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha256 = "99651a3c3c28cfc1d664066bf0c197951622e55b21ba4be8f157606d63c2dafb";
+ sha256 = "6a3ed3e7c8371cb367fda41db743a2dadf54ddd7095239c1a9ab1dd37cbbdc17";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sq/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/sq/thunderbird-128.4.0esr.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha256 = "47953845a4f03c67148bb183a629a349f3e90bb4c425fc148b1b2cab9f0631e2";
+ sha256 = "47c1e95035dcb5aae2ec736766019a5395299748d68ef1c8171f080dab50c48f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sr/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/sr/thunderbird-128.4.0esr.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha256 = "266e2d380f3607a3da4e68b9567d936a47552bd49173d1a44ecce572cc7338ee";
+ sha256 = "29eb0d3cbaec91f01af604328ee441822f1292cff73118dc62d9ff5c76c860ff";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/sv-SE/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/sv-SE/thunderbird-128.4.0esr.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha256 = "0e97466c633f662293b53e7e61b15034d1f88718232e8cfeb32797d4110dd3af";
+ sha256 = "f8b063eaae59e4401424e3e5b0a063bfbc18aabe9de850bdde21f60dfb680f6e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/th/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/th/thunderbird-128.4.0esr.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha256 = "18bb3e26ed34c2896a2b5e57d2f740e3870354785e762b7aa827a17b9b8d5708";
+ sha256 = "60121b78803375589bbfc8b0a4e5a7027d066fde61766c43245761c50fce88a8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/tr/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/tr/thunderbird-128.4.0esr.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha256 = "6c1d1f511ee94247f02e4b26d7125ef7e4cd839a508c1be7018127378e80915f";
+ sha256 = "eb20b61417b001a8d9a307d2fd83f5f5811d2fed4298fcfb5cf2b51426eea5a2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/uk/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/uk/thunderbird-128.4.0esr.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha256 = "5b36b7f5efe32bf58d14d74d773cb4cdf092fe3e89e1f2facf63183699967d48";
+ sha256 = "77a58bc92ea8f6f8b0d7c2a6875c557a4dff5e364e45409631a5ba81c28f903c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/uz/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/uz/thunderbird-128.4.0esr.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha256 = "ade3f2442dcc5b6dcce7a8114209bc7bdd3730f7e1ffd9b63b71a452fd9f657a";
+ sha256 = "eec9257fa45715942dcef7caf5e60bd257c07bd6156fffaf28df11d362ead079";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/vi/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/vi/thunderbird-128.4.0esr.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha256 = "9224b6c394daeddb695b7ccc30c21e5cbf6356db2bd1f7a6746a292a9f077b6b";
+ sha256 = "d115628a1e082a740caa3170eb7ef1f446c7c7df30589e51b22684dab8c6b00c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/zh-CN/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/zh-CN/thunderbird-128.4.0esr.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha256 = "fe17248658dd5ebcbe3f5d3dd82fa3c20f6b2a82b49e037369d8d8fa9a331083";
+ sha256 = "14bfcc00a480027136a71367183ca874ed6baa14cb81027f90b3dcc126b5a0f8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.3.2esr/linux-i686/zh-TW/thunderbird-128.3.2esr.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.4.0esr/linux-i686/zh-TW/thunderbird-128.4.0esr.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha256 = "057c904f9c5e37a9b43d8410f422bf5838f18c63135add2b3f3270e2c900ea09";
+ sha256 = "2e413d73f33586ed87eb8a736ef12b62593158bc67a3f57bec3e04b77513717a";
}
];
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index 09783123a30a..dd4ee1ff9361 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -55,20 +55,9 @@ let
in rec {
thunderbird = thunderbird-128;
- thunderbird-115 = common {
- version = "115.16.0esr";
- sha512 = "1c70050a773c92593dca2a34b25e9e6edcef6fbb9b081024e4dba024450219e06aace52d9fb90ccc2e8069b7bba0396258c86cc19848a7ac705b42641f6e36a5";
-
- updateScript = callPackage ./update.nix {
- attrPath = "thunderbirdPackages.thunderbird-115";
- versionPrefix = "115";
- versionSuffix = "esr";
- };
- };
-
thunderbird-128 = common {
- version = "128.3.1esr";
- sha512 = "9fef04a0c498eb16688c141cb7d45e803ecc75ea6fc6117ff8ad1e6b049716f49b435f3e5a1baa703fa937e25483137e22256e58572eeacf317de264b961ba6a";
+ version = "128.4.0esr";
+ sha512 = "ad031b3a9b738598358cead23cf8438435016222cd9a474c31892dc1b3db43d2d5d3a10c9639df770dc76eb3c0bc9db8be8beab84828d54ee50fc1e03f0da0a5";
updateScript = callPackage ./update.nix {
attrPath = "thunderbirdPackages.thunderbird-128";
@@ -79,5 +68,6 @@ in rec {
}
// lib.optionalAttrs config.allowAliases {
thunderbird-102 = throw "Thunderbird 102 support ended in September 2023";
+ thunderbird-115 = throw "Thunderbird 115 support ended in October 2024";
}
diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix
index 55b19785e448..95357df6af97 100644
--- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix
+++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix
@@ -1,15 +1,16 @@
{ lib
, appimageTools
, fetchurl
+, gitUpdater
}:
appimageTools.wrapType2 rec {
pname = "tutanota-desktop";
- version = "235.240718.0";
+ version = "250.241025.0";
src = fetchurl {
url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
- hash = "sha256-Pycz05cwse2SUvJlaCXMA1/Trdt6ZGOJK3NRSPb6/VM=";
+ hash = "sha256-PhcrDjqRmR1NVBLVCuj5dcc+WskWeZ9dJXdtOUveyL0=";
};
extraPkgs = pkgs: [ pkgs.libsecret ];
@@ -24,6 +25,12 @@ appimageTools.wrapType2 rec {
--replace 'Exec=AppRun' 'Exec=${pname}'
'';
+ passthru.updateScript = gitUpdater {
+ url = "https://github.com/tutao/tutanota";
+ rev-prefix = "tutanota-desktop-release-";
+ allowedVersions = ".+\\.[0-9]{6}\\..+";
+ };
+
meta = with lib; {
description = "Tuta official desktop client";
homepage = "https://tuta.com/";
diff --git a/pkgs/applications/networking/mullvad/Cargo.lock b/pkgs/applications/networking/mullvad/Cargo.lock
index 1df9eeb250f0..305345ff2067 100644
--- a/pkgs/applications/networking/mullvad/Cargo.lock
+++ b/pkgs/applications/networking/mullvad/Cargo.lock
@@ -376,9 +376,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
-version = "1.6.0"
+version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
[[package]]
name = "camellia"
@@ -432,6 +432,12 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
[[package]]
name = "chacha20"
version = "0.9.1"
@@ -466,7 +472,7 @@ dependencies = [
"iana-time-zone",
"num-traits",
"serde",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -499,7 +505,7 @@ dependencies = [
"anstream",
"anstyle",
"clap_lex",
- "strsim 0.11.1",
+ "strsim",
]
[[package]]
@@ -681,15 +687,14 @@ dependencies = [
[[package]]
name = "curve25519-dalek"
-version = "4.1.2"
+version = "4.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
+checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
dependencies = [
"cfg-if",
"cpufeatures",
"curve25519-dalek-derive",
"fiat-crypto",
- "platforms",
"rustc_version",
"subtle",
"zeroize",
@@ -708,9 +713,9 @@ dependencies = [
[[package]]
name = "darling"
-version = "0.10.2"
+version = "0.20.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
dependencies = [
"darling_core",
"darling_macro",
@@ -718,27 +723,27 @@ dependencies = [
[[package]]
name = "darling_core"
-version = "0.10.2"
+version = "0.20.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
dependencies = [
"fnv",
"ident_case",
"proc-macro2",
"quote",
- "strsim 0.9.3",
- "syn 1.0.109",
+ "strsim",
+ "syn 2.0.60",
]
[[package]]
name = "darling_macro"
-version = "0.10.2"
+version = "0.20.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [
"darling_core",
"quote",
- "syn 1.0.109",
+ "syn 2.0.60",
]
[[package]]
@@ -809,27 +814,33 @@ dependencies = [
[[package]]
name = "derive_builder"
-version = "0.9.0"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0"
+checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7"
dependencies = [
- "darling",
- "derive_builder_core",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "derive_builder_macro",
]
[[package]]
name = "derive_builder_core"
-version = "0.9.0"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef"
+checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d"
dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "derive_builder_macro"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b"
+dependencies = [
+ "derive_builder_core",
+ "syn 2.0.60",
]
[[package]]
@@ -864,6 +875,17 @@ dependencies = [
"windows-sys 0.48.0",
]
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
[[package]]
name = "duct"
version = "0.13.7"
@@ -979,7 +1001,7 @@ dependencies = [
"quote",
"rustversion",
"syn 1.0.109",
- "synstructure",
+ "synstructure 0.12.6",
]
[[package]]
@@ -1013,16 +1035,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "error-chain"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc"
-dependencies = [
- "backtrace",
- "version_check",
-]
-
[[package]]
name = "fastrand"
version = "2.0.2"
@@ -1512,9 +1524,9 @@ dependencies = [
[[package]]
name = "httparse"
-version = "1.8.0"
+version = "1.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
[[package]]
name = "httpdate"
@@ -1554,9 +1566,9 @@ dependencies = [
[[package]]
name = "hyper"
-version = "1.3.1"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
+checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
dependencies = [
"bytes",
"futures-channel",
@@ -1608,6 +1620,124 @@ dependencies = [
"cc",
]
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
[[package]]
name = "ident_case"
version = "1.0.1"
@@ -1634,6 +1764,18 @@ dependencies = [
"unicode-normalization",
]
+[[package]]
+name = "idna"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd69211b9b519e98303c015e21a007e293db403b6c85b9b124e133d25e242cdd"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+ "smallvec",
+ "utf8_iter",
+]
+
[[package]]
name = "indexmap"
version = "1.9.3"
@@ -1717,6 +1859,12 @@ version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c429fffa658f288669529fc26565f728489a2e39bc7b24a428aaaf51355182e"
+[[package]]
+name = "ioctl-sys"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bd11f3a29434026f5ff98c730b668ba74b1033637b8817940b54d040696133c"
+
[[package]]
name = "ipconfig"
version = "0.3.2"
@@ -1737,9 +1885,9 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
[[package]]
name = "ipnetwork"
-version = "0.16.0"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8eca9f51da27bc908ef3dd85c21e1bbba794edaf94d7841e37356275b82d31e"
+checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e"
dependencies = [
"serde",
]
@@ -1889,9 +2037,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
-version = "0.2.153"
+version = "0.2.158"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
[[package]]
name = "libdbus-sys"
@@ -1933,7 +2081,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
dependencies = [
"cfg-if",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -1964,6 +2112,12 @@ version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+[[package]]
+name = "litemap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+
[[package]]
name = "lock_api"
version = "0.4.11"
@@ -2027,20 +2181,29 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
[[package]]
name = "maybenot"
-version = "1.1.0"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94ed977e86fc65a7ffae967a6a973e6f7a90b5d747ebd755703d5718804f7c16"
+checksum = "e308ea251c8fe965732a020db1aa182a1df0cfb551da0d422bf83016d0f10153"
dependencies = [
"byteorder",
"hex",
"libflate",
"rand 0.8.5",
"rand_distr",
- "ring 0.16.20",
+ "ring",
"serde",
"simple-error",
]
+[[package]]
+name = "maybenot-ffi"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12a95dd874046b87f98b3a54e6beed8a63db6354088efd0ae7dc23c0f23931ce"
+dependencies = [
+ "maybenot",
+]
+
[[package]]
name = "md-5"
version = "0.10.6"
@@ -2102,6 +2265,18 @@ dependencies = [
"windows-sys 0.48.0",
]
+[[package]]
+name = "mio"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.52.0",
+]
+
[[package]]
name = "mnl"
version = "0.2.2"
@@ -2137,7 +2312,6 @@ dependencies = [
"log",
"mullvad-fs",
"mullvad-types",
- "once_cell",
"rustls-pemfile",
"serde",
"serde_json",
@@ -2165,6 +2339,8 @@ dependencies = [
"mullvad-types",
"mullvad-version",
"natord",
+ "serde",
+ "serde_json",
"talpid-types",
"thiserror",
"tokio",
@@ -2181,6 +2357,7 @@ dependencies = [
"clap",
"ctrlc",
"dirs",
+ "either",
"fern",
"futures",
"libc",
@@ -2195,7 +2372,6 @@ dependencies = [
"mullvad-version",
"nix 0.23.2",
"objc",
- "once_cell",
"regex",
"serde",
"serde_json",
@@ -2235,6 +2411,23 @@ dependencies = [
"uuid",
]
+[[package]]
+name = "mullvad-ios"
+version = "0.0.0"
+dependencies = [
+ "cbindgen",
+ "libc",
+ "log",
+ "oslog",
+ "shadowsocks-service",
+ "talpid-tunnel-config-client",
+ "talpid-types",
+ "tokio",
+ "tonic",
+ "tower",
+ "tunnel-obfuscation",
+]
+
[[package]]
name = "mullvad-jni"
version = "0.0.0"
@@ -2253,6 +2446,7 @@ dependencies = [
"talpid-tunnel",
"talpid-types",
"thiserror",
+ "tokio",
]
[[package]]
@@ -2265,7 +2459,6 @@ dependencies = [
"mullvad-paths",
"mullvad-types",
"nix 0.23.2",
- "once_cell",
"parity-tokio-ipc",
"prost",
"prost-types",
@@ -2309,7 +2502,6 @@ dependencies = [
"mullvad-api",
"mullvad-paths",
"mullvad-version",
- "once_cell",
"regex",
"talpid-platform-metadata",
"talpid-types",
@@ -2330,7 +2522,6 @@ dependencies = [
"itertools 0.12.1",
"log",
"mullvad-types",
- "once_cell",
"proptest",
"rand 0.8.5",
"serde_json",
@@ -2350,7 +2541,6 @@ dependencies = [
"mullvad-paths",
"mullvad-types",
"mullvad-version",
- "once_cell",
"talpid-core",
"talpid-future",
"talpid-types",
@@ -2364,10 +2554,10 @@ version = "0.0.0"
dependencies = [
"chrono",
"clap",
+ "either",
"intersection-derive",
"ipnetwork",
"log",
- "once_cell",
"regex",
"serde",
"talpid-types",
@@ -2515,11 +2705,23 @@ checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
dependencies = [
"bitflags 2.5.0",
"cfg-if",
- "cfg_aliases",
+ "cfg_aliases 0.1.1",
"libc",
"memoffset 0.9.1",
]
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags 2.5.0",
+ "cfg-if",
+ "cfg_aliases 0.2.1",
+ "libc",
+]
+
[[package]]
name = "no-std-net"
version = "0.6.0"
@@ -2540,7 +2742,7 @@ dependencies = [
"kqueue",
"libc",
"log",
- "mio",
+ "mio 0.8.11",
"walkdir",
"windows-sys 0.48.0",
]
@@ -2561,16 +2763,6 @@ dependencies = [
"libm",
]
-[[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 = "objc"
version = "0.2.7"
@@ -2715,9 +2907,9 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
[[package]]
name = "pcap"
-version = "2.0.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45f1686828a29fd8002fbf9c01506b4b2dd575c2305e1b884da3731abae8b9e0"
+checksum = "fe4d339439e5e7f8ce32d58c2b58d5e304790e66f3aa0bd391dd6a9dc676e054"
dependencies = [
"bitflags 1.3.2",
"errno 0.2.8",
@@ -2793,14 +2985,12 @@ dependencies = [
[[package]]
name = "pfctl"
-version = "0.4.6"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27590368dee28aa01e3024b639818a6bf0ad31635d9eca000aad63021a59284d"
+checksum = "a44e65c0d3523afa79a600a3964c3ac0fabdabe2d7c68da624b2bb0b441b9d61"
dependencies = [
"derive_builder",
- "errno 0.2.8",
- "error-chain",
- "ioctl-sys",
+ "ioctl-sys 0.8.0",
"ipnetwork",
"libc",
]
@@ -2891,12 +3081,6 @@ version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
-[[package]]
-name = "platforms"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7"
-
[[package]]
name = "pnet_base"
version = "0.34.0"
@@ -3283,21 +3467,6 @@ dependencies = [
"quick-error",
]
-[[package]]
-name = "ring"
-version = "0.16.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin 0.5.2",
- "untrusted 0.7.1",
- "web-sys",
- "winapi",
-]
-
[[package]]
name = "ring"
version = "0.17.8"
@@ -3308,8 +3477,8 @@ dependencies = [
"cfg-if",
"getrandom 0.2.14",
"libc",
- "spin 0.9.8",
- "untrusted 0.9.0",
+ "spin",
+ "untrusted",
"windows-sys 0.52.0",
]
@@ -3328,7 +3497,7 @@ dependencies = [
"p384",
"pkcs8",
"rand_core 0.6.4",
- "ring 0.17.8",
+ "ring",
"signature",
]
@@ -3394,7 +3563,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4"
dependencies = [
"log",
- "ring 0.17.8",
+ "ring",
"rustls-webpki",
"sct",
]
@@ -3414,8 +3583,8 @@ version = "0.101.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
dependencies = [
- "ring 0.17.8",
- "untrusted 0.9.0",
+ "ring",
+ "untrusted",
]
[[package]]
@@ -3463,8 +3632,8 @@ version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
dependencies = [
- "ring 0.17.8",
- "untrusted 0.9.0",
+ "ring",
+ "untrusted",
]
[[package]]
@@ -3498,18 +3667,18 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.198"
+version = "1.0.204"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc"
+checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.198"
+version = "1.0.204"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9"
+checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
dependencies = [
"proc-macro2",
"quote",
@@ -3518,11 +3687,12 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.116"
+version = "1.0.122"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
+checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da"
dependencies = [
"itoa",
+ "memchr",
"ryu",
"serde",
]
@@ -3573,9 +3743,9 @@ dependencies = [
[[package]]
name = "shadowsocks"
-version = "1.18.2"
+version = "1.20.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed5edddeff89d9874fa59366cfc506b53525410f129bbf13064ab36de15374e6"
+checksum = "fb6a87d691a190af90706a2846b6d53ab16afbbb582eed8b9e6b9dca2d0a633a"
dependencies = [
"arc-swap",
"async-trait",
@@ -3598,12 +3768,12 @@ dependencies = [
"serde_urlencoded",
"shadowsocks-crypto",
"socket2",
- "spin 0.9.8",
+ "spin",
"thiserror",
"tokio",
"tokio-tfo",
"url",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -3626,22 +3796,11 @@ dependencies = [
"sha1",
]
-[[package]]
-name = "shadowsocks-proxy"
-version = "0.0.0"
-dependencies = [
- "cbindgen",
- "log",
- "oslog",
- "shadowsocks-service",
- "tokio",
-]
-
[[package]]
name = "shadowsocks-service"
-version = "1.18.3"
+version = "1.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7be0ae9c02adf5fb2a91cdee6b3d6e3610d88411114080280e816d817fe437c8"
+checksum = "c0c0ce5a3a15e2688b7014c37ed3db33dc296d8b8fda36643c053882bf1d5f44"
dependencies = [
"arc-swap",
"async-trait",
@@ -3651,15 +3810,16 @@ dependencies = [
"cfg-if",
"futures",
"http-body-util",
- "hyper 1.3.1",
- "idna 0.5.0",
+ "httparse",
+ "hyper 1.4.1",
+ "idna 1.0.2",
"ipnet",
"iprange",
"json5",
"libc",
"log",
"lru_time_cache",
- "nix 0.28.0",
+ "nix 0.29.0",
"once_cell",
"pin-project",
"rand 0.8.5",
@@ -3667,10 +3827,10 @@ dependencies = [
"serde",
"shadowsocks",
"socket2",
- "spin 0.9.8",
+ "spin",
"thiserror",
"tokio",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -3754,12 +3914,6 @@ dependencies = [
"windows-sys 0.52.0",
]
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
[[package]]
name = "spin"
version = "0.9.8"
@@ -3780,10 +3934,10 @@ dependencies = [
]
[[package]]
-name = "strsim"
-version = "0.9.3"
+name = "stable_deref_trait"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "strsim"
@@ -3862,6 +4016,17 @@ dependencies = [
"unicode-xid",
]
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
[[package]]
name = "system-configuration"
version = "0.5.1"
@@ -3916,6 +4081,8 @@ dependencies = [
"subslice",
"system-configuration",
"talpid-dbus",
+ "talpid-macos",
+ "talpid-net",
"talpid-openvpn",
"talpid-platform-metadata",
"talpid-routing",
@@ -3943,7 +4110,6 @@ dependencies = [
"dbus",
"libc",
"log",
- "once_cell",
"thiserror",
"tokio",
]
@@ -3958,6 +4124,24 @@ dependencies = [
"tokio",
]
+[[package]]
+name = "talpid-macos"
+version = "0.0.0"
+dependencies = [
+ "libc",
+ "log",
+]
+
+[[package]]
+name = "talpid-net"
+version = "0.0.0"
+dependencies = [
+ "libc",
+ "log",
+ "socket2",
+ "talpid-types",
+]
+
[[package]]
name = "talpid-openvpn"
version = "0.0.0"
@@ -4001,6 +4185,7 @@ dependencies = [
"tonic",
"tonic-build",
"tower",
+ "winapi",
"windows-sys 0.52.0",
"winres",
]
@@ -4026,7 +4211,6 @@ dependencies = [
"netlink-packet-route",
"netlink-sys",
"nix 0.28.0",
- "once_cell",
"rtnetlink",
"system-configuration",
"talpid-types",
@@ -4069,7 +4253,6 @@ dependencies = [
name = "talpid-tunnel-config-client"
version = "0.0.0"
dependencies = [
- "cbindgen",
"classic-mceliece-rust",
"libc",
"log",
@@ -4139,6 +4322,7 @@ dependencies = [
"socket2",
"surge-ping",
"talpid-dbus",
+ "talpid-net",
"talpid-routing",
"talpid-tunnel",
"talpid-tunnel-config-client",
@@ -4150,6 +4334,7 @@ dependencies = [
"tunnel-obfuscation",
"widestring",
"windows-sys 0.52.0",
+ "wireguard-go-rs",
"zeroize",
]
@@ -4213,6 +4398,16 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
[[package]]
name = "tinyvec"
version = "1.6.0"
@@ -4230,21 +4425,20 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.37.0"
+version = "1.39.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
dependencies = [
"backtrace",
"bytes",
"libc",
- "mio",
- "num_cpus",
+ "mio 1.0.2",
"parking_lot",
"pin-project-lite",
"signal-hook-registry",
"socket2",
"tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -4259,9 +4453,9 @@ dependencies = [
[[package]]
name = "tokio-macros"
-version = "2.2.0"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
@@ -4303,9 +4497,9 @@ dependencies = [
[[package]]
name = "tokio-tfo"
-version = "0.2.2"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30b433f102de6c9b0546dc73398ba3d38d8a556f29f731268451e0b1b3aab9e"
+checksum = "3fb4382c6371e29365853d2b71e915d5398df46312a2158097d8bb3f54d0f1b4"
dependencies = [
"cfg-if",
"futures",
@@ -4315,7 +4509,7 @@ dependencies = [
"pin-project",
"socket2",
"tokio",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -4464,7 +4658,6 @@ name = "translations-converter"
version = "0.0.0"
dependencies = [
"htmlize",
- "once_cell",
"quick-xml",
"regex",
"serde",
@@ -4492,7 +4685,7 @@ dependencies = [
"byteorder",
"bytes",
"futures-core",
- "ioctl-sys",
+ "ioctl-sys 0.6.0",
"libc",
"thiserror",
"tokio",
@@ -4504,22 +4697,14 @@ name = "tunnel-obfuscation"
version = "0.0.0"
dependencies = [
"async-trait",
+ "log",
+ "nix 0.23.2",
+ "shadowsocks",
"thiserror",
"tokio",
"udp-over-tcp",
]
-[[package]]
-name = "tunnel-obfuscator-proxy"
-version = "0.0.0"
-dependencies = [
- "cbindgen",
- "log",
- "oslog",
- "tokio",
- "tunnel-obfuscation",
-]
-
[[package]]
name = "typenum"
version = "1.17.0"
@@ -4588,12 +4773,6 @@ dependencies = [
"subtle",
]
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
[[package]]
name = "untrusted"
version = "0.9.0"
@@ -4612,6 +4791,18 @@ dependencies = [
"serde",
]
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
[[package]]
name = "utf8parse"
version = "0.2.1"
@@ -4728,16 +4919,6 @@ version = "0.2.92"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
-[[package]]
-name = "web-sys"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
[[package]]
name = "which"
version = "4.4.2"
@@ -4793,7 +4974,7 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -4844,7 +5025,16 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
]
[[package]]
@@ -4879,18 +5069,18 @@ dependencies = [
[[package]]
name = "windows-targets"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
"windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
]
[[package]]
@@ -4907,9 +5097,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_msvc"
@@ -4931,9 +5121,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_i686_gnu"
@@ -4955,15 +5145,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
[[package]]
name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
[[package]]
name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_msvc"
@@ -4985,9 +5175,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
[[package]]
name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_x86_64_gnu"
@@ -5009,9 +5199,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnullvm"
@@ -5027,9 +5217,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_msvc"
@@ -5051,9 +5241,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winreg"
@@ -5084,6 +5274,29 @@ dependencies = [
"toml",
]
+[[package]]
+name = "wireguard-go-rs"
+version = "0.0.0"
+dependencies = [
+ "anyhow",
+ "log",
+ "maybenot-ffi",
+ "thiserror",
+ "zeroize",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
[[package]]
name = "x25519-dalek"
version = "2.0.1"
@@ -5096,6 +5309,30 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "yoke"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+ "synstructure 0.13.1",
+]
+
[[package]]
name = "zerocopy"
version = "0.7.32"
@@ -5117,10 +5354,31 @@ dependencies = [
]
[[package]]
-name = "zeroize"
-version = "1.7.0"
+name = "zerofrom"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+ "synstructure 0.13.1",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
dependencies = [
"zeroize_derive",
]
@@ -5135,3 +5393,25 @@ dependencies = [
"quote",
"syn 2.0.60",
]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
diff --git a/pkgs/applications/networking/mullvad/libwg.nix b/pkgs/applications/networking/mullvad/libwg.nix
index 88d0ae1b6f51..12e6c1deccc3 100644
--- a/pkgs/applications/networking/mullvad/libwg.nix
+++ b/pkgs/applications/networking/mullvad/libwg.nix
@@ -10,19 +10,19 @@ buildGoModule {
src
;
- sourceRoot = "${mullvad.src.name}/wireguard/libwg";
-
- vendorHash = "sha256-gaU3na3sjzM6lvmsGRkuGtV2AHvkl6IgzmyGx3R5ZpM=";
+ modRoot = "wireguard-go-rs/libwg";
+ proxyVendor = true;
+ vendorHash = "sha256-uyAzY1hoCtS7da3wtjxTGx5wBb9c9m749TzihVr94rc=";
# XXX: hack to make the ar archive go to the correct place
# This is necessary because passing `-o ...` to `ldflags` does not work
# (this doesn't get communicated everywhere in the chain, apparently, so
# `go` complains that it can't find an `a.out` file).
GOBIN = "${placeholder "out"}/lib";
- ldflags = [ "-s" "-w" "-buildmode=c-archive" ];
- patches = [
- ];
+ subPackages = [ "." ];
+ ldflags = [ "-s" "-w" "-buildmode=c-archive" ];
+ tags = [ "daita" ];
postInstall = ''
mv $out/lib/libwg{,.a}
@@ -30,7 +30,7 @@ buildGoModule {
meta = with lib; {
description = "Tiny wrapper around wireguard-go";
- homepage = "https://github.com/mullvad/mullvadvpn-app/tree/main/wireguard/libwg";
+ homepage = "https://github.com/mullvad/mullvadvpn-app/tree/main/wireguard-go-rs/libwg";
license = licenses.gpl3Only;
maintainers = with maintainers; [ cole-h ];
};
diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix
index b43881123a90..478c66282133 100644
--- a/pkgs/applications/networking/mullvad/mullvad.nix
+++ b/pkgs/applications/networking/mullvad/mullvad.nix
@@ -14,16 +14,27 @@
, openvpn-mullvad
, shadowsocks-rust
, installShellFiles
+, writeShellScriptBin
}:
+let
+ # NOTE(cole-h): This is necessary because wireguard-go-rs executes go in its build.rs (whose goal
+ # is to produce $OUT_DIR/libwg.a), and a mixed Rust-Go build is non-trivial (read: I didn't want
+ # to attempt it). So, we just fake the "go" binary and do what it would have done: put libwg.a
+ # under $OUT_DIR so that it can be linked against.
+ fakeGoCopyLibwg = writeShellScriptBin "go" ''
+ [ ! -e "$OUT_DIR"/libwg.a ] && cp ${libwg}/lib/libwg.a "$OUT_DIR"/libwg.a
+ '';
+in
rustPlatform.buildRustPackage rec {
pname = "mullvad";
- version = "2024.4";
+ version = "2024.7";
src = fetchFromGitHub {
owner = "mullvad";
repo = "mullvadvpn-app";
rev = version;
- hash = "sha256-d7poR1NnvqaPutXLFizpQnyipl+38N1Qe2zVXeV7v1Q=";
+ fetchSubmodules = true;
+ hash = "sha256-me0e8Cb1dRrnAeiCmsXiclcDMruVLV3t0eGAM3RU1es=";
};
cargoLock = {
@@ -41,6 +52,7 @@ rustPlatform.buildRustPackage rec {
makeWrapper
git
installShellFiles
+ fakeGoCopyLibwg
];
buildInputs = [
@@ -49,13 +61,6 @@ rustPlatform.buildRustPackage rec {
libmnl
];
- # talpid-core wants libwg.a in build/lib/{triple}
- preBuild = ''
- dest=build/lib/${stdenv.hostPlatform.config}
- mkdir -p $dest
- ln -s ${libwg}/lib/libwg.a $dest
- '';
-
postInstall = ''
compdir=$(mktemp -d)
for shell in bash zsh fish; do
diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix
index 01ced9fc8631..8c09422a11ff 100644
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@@ -27,7 +27,7 @@
stdenv.mkDerivation rec {
pname = "nextcloud-client";
- version = "3.14.1";
+ version = "3.14.2";
outputs = [ "out" "dev" ];
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
owner = "nextcloud-releases";
repo = "desktop";
rev = "refs/tags/v${version}";
- hash = "sha256-bUqHegW38NQJn4TnEQt9wRJFqR6fbLpvQvmWF3akekc=";
+ hash = "sha256-vxCt/FNfQZ7rWME2zLGESgW/+FNoENZeCr8FFcGwoFQ=";
};
patches = [
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index 767897dbd04a..891a4214fe78 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "gnunet";
- version = "0.21.2";
+ version = "0.22.1";
src = fetchurl {
url = "mirror://gnu/gnunet/gnunet-${version}.tar.gz";
- hash = "sha256-jCNRJo6bi6KtKIuLM3zjmfecGOP/2WCAP07V3n3an6E=";
+ hash = "sha256-gWsgufvA4tLWosnpAYPdAIs4yJOWfjYj4E11/Ezgr6o=";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index e6cd3a31adf5..ffda991b0c37 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -29,13 +29,13 @@ in
stdenv.mkDerivation rec {
pname = "qbittorrent"
+ lib.optionalString (!guiSupport) "-nox";
- version = "5.0.0";
+ version = "5.0.1";
src = fetchFromGitHub {
owner = "qbittorrent";
repo = "qBittorrent";
rev = "release-${version}";
- hash = "sha256-iwqJaRfwJTL6SimWTNqqqFPXxSKrgo6whYY70llZyGs";
+ hash = "sha256-BmfTQGftQIkRrlSpJy0yHTh0r3D2CWLIo+tnL0+OeA4=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/remote/freerdp/3.nix b/pkgs/applications/networking/remote/freerdp/3.nix
index 49b412bf7663..3071928503b8 100644
--- a/pkgs/applications/networking/remote/freerdp/3.nix
+++ b/pkgs/applications/networking/remote/freerdp/3.nix
@@ -66,29 +66,17 @@
, remmina
}:
-let
- cmFlag = flag: if flag then "ON" else "OFF";
-in
stdenv.mkDerivation (finalAttrs: {
pname = "freerdp";
- version = "3.8.0";
+ version = "3.9.0";
src = fetchFromGitHub {
owner = "FreeRDP";
repo = "FreeRDP";
rev = finalAttrs.version;
- hash = "sha256-zqqPfAXHjY4IV18mgbNxWDw7ZP/7SvoYn1u0FahpcNk=";
+ hash = "sha256-oThlqUpEmhcLpMMYExMA3GbtB2+lq6oc5TRZt0eKRLA=";
};
- patches = [
- (fetchpatch {
- name = "clang-fix-unwind-getlanguagespecificdata.patch";
- url = "https://github.com/FreeRDP/FreeRDP/commit/6fb7bfd043d159d3819486fb601b598102cca823.patch";
- hash = "sha256-U2Oz+IVvlIdg7kJ4rgAWhJVdzthY50YaCYKMMc2he7Y=";
- })
- ];
-
-
postPatch = ''
export HOME=$TMP
@@ -171,9 +159,9 @@ stdenv.mkDerivation (finalAttrs: {
# https://github.com/FreeRDP/FreeRDP/issues/8526#issuecomment-1357134746
cmakeFlags = [
"-Wno-dev"
- "-DCMAKE_INSTALL_LIBDIR=lib"
- "-DDOCBOOKXSL_DIR=${docbook-xsl-nons}/xml/xsl/docbook"
- ] ++ lib.mapAttrsToList (k: v: "-D${k}=${cmFlag v}") {
+ (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
+ (lib.cmakeFeature "DOCBOOKXSL_DIR" "${docbook-xsl-nons}/xml/xsl/docbook")
+ ] ++ lib.mapAttrsToList lib.cmakeBool {
BUILD_TESTING = false; # false is recommended by upstream
WITH_CAIRO = cairo != null;
WITH_CUPS = cups != null;
@@ -192,7 +180,9 @@ stdenv.mkDerivation (finalAttrs: {
WITH_WEBVIEW = false; # avoid introducing webkit2gtk-4.0
WITH_VAAPI = false; # false is recommended by upstream
WITH_X11 = true;
- };
+ } ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
+ (lib.cmakeBool "SDL_USE_COMPILED_RESOURCES" false)
+ ];
env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [
"-DTARGET_OS_IPHONE=0"
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 0ee03ab5bbeb..fe8bc2e32290 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -57,7 +57,7 @@ assert withQt -> qt6 != null;
stdenv.mkDerivation rec {
pname = "wireshark-${if withQt then "qt" else "cli"}";
- version = "4.2.7";
+ version = "4.2.8";
outputs = [ "out" "dev" ];
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
repo = "wireshark";
owner = "wireshark";
rev = "v${version}";
- hash = "sha256-0tBAmZz8tQfcTtKZf0TZ+I3aaarUCxlpaBXM4zNzkxM=";
+ hash = "sha256-QnBETFkYoeBTQFV8g2c/dZjgCXaMtFi1MQUgmkOool8=";
};
patches = [
diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix
index 67cec6eeeeaf..7bbdbf3adc1e 100644
--- a/pkgs/applications/networking/sync/rsync/rrsync.nix
+++ b/pkgs/applications/networking/sync/rsync/rrsync.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation {
meta = rsync.meta // {
description = "Helper to run rsync-only environments from ssh-logins";
+ mainProgram = "rrsync";
};
}
diff --git a/pkgs/applications/office/activitywatch/Cargo.lock b/pkgs/applications/office/activitywatch/Cargo.lock
deleted file mode 100644
index f7069e5455d2..000000000000
--- a/pkgs/applications/office/activitywatch/Cargo.lock
+++ /dev/null
@@ -1,2957 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "aead"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c192eb8f11fc081b0fe4259ba5af04217d4e0faddd02417310a927911abd7c8"
-dependencies = [
- "crypto-common",
- "generic-array",
-]
-
-[[package]]
-name = "aes"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241"
-dependencies = [
- "cfg-if 1.0.0",
- "cipher",
- "cpufeatures",
-]
-
-[[package]]
-name = "aes-gcm"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c"
-dependencies = [
- "aead",
- "aes",
- "cipher",
- "ctr",
- "ghash",
- "subtle",
-]
-
-[[package]]
-name = "ahash"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
-dependencies = [
- "getrandom",
- "once_cell",
- "version_check",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "android_log-sys"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e"
-
-[[package]]
-name = "android_logger"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8619b80c242aa7bd638b5c7ddd952addeecb71f69c75e33f1d47b2804f8f883a"
-dependencies = [
- "android_log-sys",
- "env_logger",
- "log",
- "once_cell",
-]
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "appdirs"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d512b3e61196d27562dcc71446a58ba8a93d3bed2a03a87f96101b9a17f1d378"
-dependencies = [
- "ole32-sys",
- "shell32-sys",
- "winapi 0.2.8",
-]
-
-[[package]]
-name = "async-stream"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e"
-dependencies = [
- "async-stream-impl",
- "futures-core",
-]
-
-[[package]]
-name = "async-stream-impl"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27"
-dependencies = [
- "proc-macro2 1.0.49",
- "quote 1.0.23",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "async-trait"
-version = "0.1.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282"
-dependencies = [
- "proc-macro2 1.0.49",
- "quote 1.0.23",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "atomic"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "aw-client-rust"
-version = "0.1.0"
-dependencies = [
- "aw-datastore",
- "aw-models",
- "aw-server",
- "chrono",
- "gethostname",
- "reqwest",
- "rocket",
- "serde",
- "serde_json",
- "tokio-test",
-]
-
-[[package]]
-name = "aw-datastore"
-version = "0.1.0"
-dependencies = [
- "appdirs",
- "aw-models",
- "aw-transform",
- "chrono",
- "log",
- "mpsc_requests",
- "rusqlite",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "aw-models"
-version = "0.1.0"
-dependencies = [
- "chrono",
- "log",
- "schemars",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "aw-query"
-version = "0.1.0"
-dependencies = [
- "aw-datastore",
- "aw-models",
- "aw-transform",
- "chrono",
- "fancy-regex",
- "log",
- "plex",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "aw-server"
-version = "0.12.1"
-dependencies = [
- "android_logger",
- "appdirs",
- "aw-datastore",
- "aw-models",
- "aw-query",
- "aw-transform",
- "chrono",
- "clap",
- "fern",
- "gethostname",
- "jemallocator",
- "jni",
- "lazy_static",
- "libc",
- "log",
- "multipart",
- "openssl-sys",
- "rocket",
- "rocket_cors",
- "serde",
- "serde_json",
- "toml",
- "uuid",
-]
-
-[[package]]
-name = "aw-sync"
-version = "0.1.0"
-dependencies = [
- "aw-client-rust",
- "aw-datastore",
- "aw-models",
- "aw-server",
- "chrono",
- "clap",
- "log",
- "reqwest",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "aw-transform"
-version = "0.1.0"
-dependencies = [
- "aw-models",
- "chrono",
- "fancy-regex",
- "log",
- "rocket",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[package]]
-name = "base64"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"
-
-[[package]]
-name = "binascii"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72"
-
-[[package]]
-name = "bit-set"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9bf6104718e80d7b26a68fdbacff3481cfc05df670821affc7e9cbc1884400c"
-dependencies = [
- "bit-vec 0.4.4",
-]
-
-[[package]]
-name = "bit-set"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
-dependencies = [
- "bit-vec 0.6.3",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f"
-
-[[package]]
-name = "bit-vec"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "block-buffer"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "buf_redux"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f"
-dependencies = [
- "memchr",
- "safemem",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
-
-[[package]]
-name = "bytes"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
-
-[[package]]
-name = "cc"
-version = "1.0.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
-
-[[package]]
-name = "cesu8"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chrono"
-version = "0.4.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
-dependencies = [
- "iana-time-zone",
- "js-sys",
- "num-integer",
- "num-traits",
- "serde",
- "time 0.1.45",
- "wasm-bindgen",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "cipher"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e"
-dependencies = [
- "crypto-common",
- "inout",
-]
-
-[[package]]
-name = "clap"
-version = "4.0.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39"
-dependencies = [
- "bitflags",
- "clap_derive",
- "clap_lex",
- "is-terminal",
- "once_cell",
- "strsim",
- "termcolor",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.0.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014"
-dependencies = [
- "heck",
- "proc-macro-error",
- "proc-macro2 1.0.49",
- "quote 1.0.23",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
-dependencies = [
- "os_str_bytes",
-]
-
-[[package]]
-name = "codespan-reporting"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
-dependencies = [
- "termcolor",
- "unicode-width",
-]
-
-[[package]]
-name = "colored"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59"
-dependencies = [
- "atty",
- "lazy_static",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "combine"
-version = "4.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
-dependencies = [
- "bytes",
- "memchr",
-]
-
-[[package]]
-name = "cookie"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb"
-dependencies = [
- "aes-gcm",
- "base64 0.20.0",
- "hkdf",
- "hmac",
- "percent-encoding",
- "rand",
- "sha2",
- "subtle",
- "time 0.3.17",
- "version_check",
-]
-
-[[package]]
-name = "core-foundation"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
-dependencies = [
- "crossbeam-utils",
- "maybe-uninit",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
-dependencies = [
- "autocfg",
- "cfg-if 0.1.10",
- "lazy_static",
-]
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "rand_core",
- "typenum",
-]
-
-[[package]]
-name = "ctr"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
-dependencies = [
- "cipher",
-]
-
-[[package]]
-name = "cxx"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579"
-dependencies = [
- "cc",
- "cxxbridge-flags",
- "cxxbridge-macro",
- "link-cplusplus",
-]
-
-[[package]]
-name = "cxx-build"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70"
-dependencies = [
- "cc",
- "codespan-reporting",
- "once_cell",
- "proc-macro2 1.0.49",
- "quote 1.0.23",
- "scratch",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "cxxbridge-flags"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c"
-
-[[package]]
-name = "cxxbridge-macro"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5"
-dependencies = [
- "proc-macro2 1.0.49",
- "quote 1.0.23",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "devise"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50c7580b072f1c8476148f16e0a0d5dedddab787da98d86c5082c5e9ed8ab595"
-dependencies = [
- "devise_codegen",
- "devise_core",
-]
-
-[[package]]
-name = "devise_codegen"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "123c73e7a6e51b05c75fe1a1b2f4e241399ea5740ed810b0e3e6cacd9db5e7b2"
-dependencies = [
- "devise_core",
- "quote 1.0.23",
-]
-
-[[package]]
-name = "devise_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841ef46f4787d9097405cac4e70fb8644fc037b526e8c14054247c0263c400d0"
-dependencies = [
- "bitflags",
- "proc-macro2 1.0.49",
- "proc-macro2-diagnostics",
- "quote 1.0.23",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
-dependencies = [
- "block-buffer",
- "crypto-common",
- "subtle",
-]
-
-[[package]]
-name = "dyn-clone"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60"
-
-[[package]]
-name = "either"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
-dependencies = [
- "log",
- "regex",
-]
-
-[[package]]
-name = "errno"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "fallible-iterator"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
-
-[[package]]
-name = "fallible-streaming-iterator"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
-
-[[package]]
-name = "fancy-regex"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0678ab2d46fa5195aaf59ad034c083d351377d4af57f3e073c074d0da3e3c766"
-dependencies = [
- "bit-set 0.5.3",
- "regex",
-]
-
-[[package]]
-name = "fastrand"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
-dependencies = [
- "instant",
-]
-
-[[package]]
-name = "fern"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bdd7b0849075e79ee9a1836df22c717d1eba30451796fdc631b04565dd11e2a"
-dependencies = [
- "colored",
- "log",
-]
-
-[[package]]
-name = "figment"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e56602b469b2201400dec66a66aec5a9b8761ee97cd1b8c96ab2483fcc16cc9"
-dependencies = [
- "atomic",
- "pear",
- "serde",
- "toml",
- "uncased",
- "version_check",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "fs_extra"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
-
-[[package]]
-name = "futures"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
-
-[[package]]
-name = "futures-io"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
-
-[[package]]
-name = "futures-sink"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
-
-[[package]]
-name = "futures-task"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
-
-[[package]]
-name = "futures-util"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "generator"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d266041a359dfa931b370ef684cceb84b166beb14f7f0421f4a6a3d0c446d12e"
-dependencies = [
- "cc",
- "libc",
- "log",
- "rustversion",
- "windows 0.39.0",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "gethostname"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a329e22866dd78b35d2c639a4a23d7b950aeae300dfd79f4fb19f74055c2404"
-dependencies = [
- "libc",
- "windows 0.43.0",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "ghash"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40"
-dependencies = [
- "opaque-debug",
- "polyval",
-]
-
-[[package]]
-name = "glob"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-
-[[package]]
-name = "h2"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-dependencies = [
- "ahash",
-]
-
-[[package]]
-name = "hashlink"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa"
-dependencies = [
- "hashbrown",
-]
-
-[[package]]
-name = "heck"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hkdf"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
-dependencies = [
- "hmac",
-]
-
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest",
-]
-
-[[package]]
-name = "http"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-body"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
-dependencies = [
- "bytes",
- "http",
- "pin-project-lite",
-]
-
-[[package]]
-name = "httparse"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
-
-[[package]]
-name = "httpdate"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
-
-[[package]]
-name = "hyper"
-version = "0.14.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper-tls"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
-dependencies = [
- "bytes",
- "hyper",
- "native-tls",
- "tokio",
- "tokio-native-tls",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.53"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
-dependencies = [
- "cxx",
- "cxx-build",
-]
-
-[[package]]
-name = "idna"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
-dependencies = [
- "autocfg",
- "hashbrown",
- "serde",
-]
-
-[[package]]
-name = "inlinable_string"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb"
-
-[[package]]
-name = "inout"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "io-lifetimes"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
-dependencies = [
- "libc",
- "windows-sys",
-]
-
-[[package]]
-name = "ipnet"
-version = "2.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"
-
-[[package]]
-name = "is-terminal"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
-dependencies = [
- "hermit-abi 0.2.6",
- "io-lifetimes",
- "rustix",
- "windows-sys",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
-
-[[package]]
-name = "jemalloc-sys"
-version = "0.5.2+5.3.0-patched"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134163979b6eed9564c98637b710b40979939ba351f59952708234ea11b5f3f8"
-dependencies = [
- "cc",
- "fs_extra",
- "libc",
-]
-
-[[package]]
-name = "jemallocator"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16c2514137880c52b0b4822b563fadd38257c1f380858addb74a400889696ea6"
-dependencies = [
- "jemalloc-sys",
- "libc",
-]
-
-[[package]]
-name = "jni"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c"
-dependencies = [
- "cesu8",
- "combine",
- "jni-sys",
- "log",
- "thiserror",
- "walkdir",
-]
-
-[[package]]
-name = "jni-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
-
-[[package]]
-name = "js-sys"
-version = "0.3.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "lalr"
-version = "0.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "106d7548f95adbe3019b4fc4954554d7b72535867aa9ce326d2f766b68958de7"
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.139"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
-
-[[package]]
-name = "libsqlite3-sys"
-version = "0.25.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa"
-dependencies = [
- "cc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "link-cplusplus"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
-
-[[package]]
-name = "lock_api"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "loom"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"
-dependencies = [
- "cfg-if 1.0.0",
- "generator",
- "scoped-tls",
- "serde",
- "serde_json",
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata",
-]
-
-[[package]]
-name = "maybe-uninit"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
-[[package]]
-name = "mime"
-version = "0.3.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
-
-[[package]]
-name = "mime_guess"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
-dependencies = [
- "mime",
- "unicase",
-]
-
-[[package]]
-name = "mio"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
-dependencies = [
- "libc",
- "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys",
-]
-
-[[package]]
-name = "mpsc_requests"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d778b8a8b7b31d8d23c8bbde4e571b483f3962dc9f14f447c14188e8a7fe85c"
-dependencies = [
- "crossbeam-channel",
-]
-
-[[package]]
-name = "multer"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed4198ce7a4cbd2a57af78d28c6fbb57d81ac5f1d6ad79ac6c5587419cbdf22"
-dependencies = [
- "bytes",
- "encoding_rs",
- "futures-util",
- "http",
- "httparse",
- "log",
- "memchr",
- "mime",
- "spin",
- "tokio",
- "tokio-util",
- "version_check",
-]
-
-[[package]]
-name = "multipart"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00dec633863867f29cb39df64a397cdf4a6354708ddd7759f70c7fb51c5f9182"
-dependencies = [
- "buf_redux",
- "httparse",
- "log",
- "mime",
- "mime_guess",
- "quick-error",
- "rand",
- "safemem",
- "tempfile",
- "twoway",
-]
-
-[[package]]
-name = "native-tls"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
-dependencies = [
- "autocfg",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
-dependencies = [
- "hermit-abi 0.2.6",
- "libc",
-]
-
-[[package]]
-name = "ole32-sys"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d2c49021782e5233cd243168edfa8037574afed4eba4bbaf538b3d8d1789d8c"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
-
-[[package]]
-name = "openssl"
-version = "0.10.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1"
-dependencies = [
- "bitflags",
- "cfg-if 1.0.0",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
-dependencies = [
- "proc-macro2 1.0.49",
- "quote 1.0.23",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "openssl-src"
-version = "111.24.0+1.1.1s"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3498f259dab01178c6228c6b00dcef0ed2a2d5e20d648c017861227773ea4abd"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.80"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7"
-dependencies = [
- "autocfg",
- "cc",
- "libc",
- "openssl-src",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "os_str_bytes"
-version = "6.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
-
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
-[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-sys",
-]
-
-[[package]]
-name = "pear"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e44241c5e4c868e3eaa78b7c1848cadd6344ed4f54d029832d32b415a58702"
-dependencies = [
- "inlinable_string",
- "pear_codegen",
- "yansi",
-]
-
-[[package]]
-name = "pear_codegen"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82a5ca643c2303ecb740d506539deba189e16f2754040a42901cd8105d0282d0"
-dependencies = [
- "proc-macro2 1.0.49",
- "proc-macro2-diagnostics",
- "quote 1.0.23",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
-
-[[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.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
-
-[[package]]
-name = "plex"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4aa14234571e92edfd3ac883defc6fcf310ae395cccdb10d2319d3e2e60083fc"
-dependencies = [
- "lalr",
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "redfa",
- "syn 0.15.44",
-]
-
-[[package]]
-name = "polyval"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "opaque-debug",
- "universal-hash",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2 1.0.49",
- "quote 1.0.23",
- "syn 1.0.107",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2 1.0.49",
- "quote 1.0.23",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-dependencies = [
- "unicode-xid 0.1.0",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.49"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "proc-macro2-diagnostics"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada"
-dependencies = [
- "proc-macro2 1.0.49",
- "quote 1.0.23",
- "syn 1.0.107",
- "version_check",
- "yansi",
-]
-
-[[package]]
-name = "quick-error"
-version = "1.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
-
-[[package]]
-name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-dependencies = [
- "proc-macro2 0.4.30",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
-dependencies = [
- "proc-macro2 1.0.49",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "redfa"
-version = "0.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29cc2771cc9f5fb0061cdedc05a37170254694dffec6b89920a6e767f08c4220"
-dependencies = [
- "bit-set 0.4.0",
- "vec_map",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "ref-cast"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c78fb8c9293bcd48ef6fce7b4ca950ceaf21210de6e105a883ee280c0f7b9ed"
-dependencies = [
- "ref-cast-impl",
-]
-
-[[package]]
-name = "ref-cast-impl"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f"
-dependencies = [
- "proc-macro2 1.0.49",
- "quote 1.0.23",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "regex"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "reqwest"
-version = "0.11.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c"
-dependencies = [
- "base64 0.13.1",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-tls",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "native-tls",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "tokio",
- "tokio-native-tls",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "winreg",
-]
-
-[[package]]
-name = "rocket"
-version = "0.5.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98ead083fce4a405feb349cf09abdf64471c6077f14e0ce59364aa90d4b99317"
-dependencies = [
- "async-stream",
- "async-trait",
- "atomic",
- "atty",
- "binascii",
- "bytes",
- "either",
- "figment",
- "futures",
- "indexmap",
- "log",
- "memchr",
- "multer",
- "num_cpus",
- "parking_lot",
- "pin-project-lite",
- "rand",
- "ref-cast",
- "rocket_codegen",
- "rocket_http",
- "serde",
- "serde_json",
- "state",
- "tempfile",
- "time 0.3.17",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "ubyte",
- "version_check",
- "yansi",
-]
-
-[[package]]
-name = "rocket_codegen"
-version = "0.5.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6aeb6bb9c61e9cd2c00d70ea267bf36f76a4cc615e5908b349c2f9d93999b47"
-dependencies = [
- "devise",
- "glob",
- "indexmap",
- "proc-macro2 1.0.49",
- "quote 1.0.23",
- "rocket_http",
- "syn 1.0.107",
- "unicode-xid 0.2.4",
-]
-
-[[package]]
-name = "rocket_cors"
-version = "0.6.0-alpha1"
-source = "git+https://github.com/lawliet89/rocket_cors?rev=54fae07#54fae0701dffbe5df686465780218644ee3fae5f"
-dependencies = [
- "http",
- "log",
- "regex",
- "rocket",
- "serde",
- "serde_derive",
- "unicase",
- "unicase_serde",
- "url",
-]
-
-[[package]]
-name = "rocket_http"
-version = "0.5.0-rc.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ded65d127954de3c12471630bf4b81a2792f065984461e65b91d0fdaafc17a2"
-dependencies = [
- "cookie",
- "either",
- "futures",
- "http",
- "hyper",
- "indexmap",
- "log",
- "memchr",
- "pear",
- "percent-encoding",
- "pin-project-lite",
- "ref-cast",
- "serde",
- "smallvec",
- "stable-pattern",
- "state",
- "time 0.3.17",
- "tokio",
- "uncased",
-]
-
-[[package]]
-name = "rusqlite"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01e213bc3ecb39ac32e81e51ebe31fd888a940515173e3a18a35f8c6e896422a"
-dependencies = [
- "bitflags",
- "chrono",
- "fallible-iterator",
- "fallible-streaming-iterator",
- "hashlink",
- "libsqlite3-sys",
- "serde_json",
- "smallvec",
-]
-
-[[package]]
-name = "rustix"
-version = "0.36.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549"
-dependencies = [
- "bitflags",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys",
- "windows-sys",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"
-
-[[package]]
-name = "ryu"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
-
-[[package]]
-name = "safemem"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "schannel"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
-dependencies = [
- "windows-sys",
-]
-
-[[package]]
-name = "schemars"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a5fb6c61f29e723026dc8e923d94c694313212abbecbbe5f55a7748eec5b307"
-dependencies = [
- "chrono",
- "dyn-clone",
- "schemars_derive",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "schemars_derive"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f188d036977451159430f3b8dc82ec76364a42b7e289c2b18a9a18f4470058e9"
-dependencies = [
- "proc-macro2 1.0.49",
- "quote 1.0.23",
- "serde_derive_internals",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "scratch"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
-
-[[package]]
-name = "security-framework"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"
-dependencies = [
- "bitflags",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.152"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.152"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
-dependencies = [
- "proc-macro2 1.0.49",
- "quote 1.0.23",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "serde_derive_internals"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
-dependencies = [
- "proc-macro2 1.0.49",
- "quote 1.0.23",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.91"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "shell32-sys"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ee04b46101f57121c9da2b151988283b6beb79b34f5bb29a58ee48cb695122c"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
-
-[[package]]
-name = "socket2"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
-dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "spin"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09"
-
-[[package]]
-name = "stable-pattern"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4564168c00635f88eaed410d5efa8131afa8d8699a612c80c455a0ba05c21045"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "state"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b"
-dependencies = [
- "loom",
-]
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "subtle"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
-
-[[package]]
-name = "syn"
-version = "0.15.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-dependencies = [
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "unicode-xid 0.1.0",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.107"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
-dependencies = [
- "proc-macro2 1.0.49",
- "quote 1.0.23",
- "unicode-ident",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
-dependencies = [
- "cfg-if 1.0.0",
- "fastrand",
- "libc",
- "redox_syscall",
- "remove_dir_all",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
-dependencies = [
- "proc-macro2 1.0.49",
- "quote 1.0.23",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "time"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
-dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "time"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
-dependencies = [
- "itoa",
- "serde",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
-
-[[package]]
-name = "time-macros"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"
-dependencies = [
- "time-core",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
-
-[[package]]
-name = "tokio"
-version = "1.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae"
-dependencies = [
- "autocfg",
- "bytes",
- "libc",
- "memchr",
- "mio",
- "num_cpus",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2",
- "tokio-macros",
- "windows-sys",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "1.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
-dependencies = [
- "proc-macro2 1.0.49",
- "quote 1.0.23",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-stream"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-test"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3"
-dependencies = [
- "async-stream",
- "bytes",
- "futures-core",
- "tokio",
- "tokio-stream",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "tower-service"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
-
-[[package]]
-name = "tracing"
-version = "0.1.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
-dependencies = [
- "cfg-if 1.0.0",
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
-dependencies = [
- "proc-macro2 1.0.49",
- "quote 1.0.23",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
-dependencies = [
- "lazy_static",
- "log",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70"
-dependencies = [
- "matchers",
- "nu-ansi-term",
- "once_cell",
- "regex",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
-
-[[package]]
-name = "twoway"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "typenum"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
-
-[[package]]
-name = "ubyte"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c81f0dae7d286ad0d9366d7679a77934cfc3cf3a8d67e82669794412b2368fe6"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "uncased"
-version = "0.9.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622"
-dependencies = [
- "serde",
- "version_check",
-]
-
-[[package]]
-name = "unicase"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "unicase_serde"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ef53697679d874d69f3160af80bc28de12730a985d57bdf2b47456ccb8b11f1"
-dependencies = [
- "serde",
- "unicase",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-width"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
-
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
-
-[[package]]
-name = "universal-hash"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5"
-dependencies = [
- "crypto-common",
- "subtle",
-]
-
-[[package]]
-name = "url"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
-]
-
-[[package]]
-name = "uuid"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c"
-dependencies = [
- "getrandom",
- "serde",
-]
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "vec_map"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cac5efe5cb0fa14ec2f84f83c701c562ee63f6dcc680861b21d65c682adfb05f"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "walkdir"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
-dependencies = [
- "same-file",
- "winapi 0.3.9",
- "winapi-util",
-]
-
-[[package]]
-name = "want"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
-dependencies = [
- "log",
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
-dependencies = [
- "cfg-if 1.0.0",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2 1.0.49",
- "quote 1.0.23",
- "syn 1.0.107",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
-dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
-dependencies = [
- "quote 1.0.23",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
-dependencies = [
- "proc-macro2 1.0.49",
- "quote 1.0.23",
- "syn 1.0.107",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
-
-[[package]]
-name = "web-sys"
-version = "0.3.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a"
-dependencies = [
- "windows_aarch64_msvc 0.39.0",
- "windows_i686_gnu 0.39.0",
- "windows_i686_msvc 0.39.0",
- "windows_x86_64_gnu 0.39.0",
- "windows_x86_64_msvc 0.39.0",
-]
-
-[[package]]
-name = "windows"
-version = "0.43.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.0",
- "windows_i686_gnu 0.42.0",
- "windows_i686_msvc 0.42.0",
- "windows_x86_64_gnu 0.42.0",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.0",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.0",
- "windows_i686_gnu 0.42.0",
- "windows_i686_msvc 0.42.0",
- "windows_x86_64_gnu 0.42.0",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.0",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
-
-[[package]]
-name = "winreg"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "yansi"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
diff --git a/pkgs/applications/office/activitywatch/commit-hash.patch b/pkgs/applications/office/activitywatch/commit-hash.patch
index 7f0b32bec626..083d333230b5 100644
--- a/pkgs/applications/office/activitywatch/commit-hash.patch
+++ b/pkgs/applications/office/activitywatch/commit-hash.patch
@@ -1,16 +1,13 @@
diff --git a/vue.config.js b/vue.config.js
-index 02c0699..0c4a014 100644
+index d6fdd46..141d28f 100644
--- a/vue.config.js
+++ b/vue.config.js
-@@ -4,10 +4,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
- const { argv } = require('yargs');
+@@ -9,7 +9,7 @@ const __filename = fileURLToPath(import.meta.url); // get the resolved path to t
+ const __dirname = path.dirname(__filename); // get the name of the directory
// get git info from command line
--const _COMMIT_HASH = require('child_process')
-- .execSync('git rev-parse --short HEAD')
-- .toString()
-- .trim();
+-const _COMMIT_HASH = child_process.execSync('git rev-parse --short HEAD').toString().trim();
+const _COMMIT_HASH = "@commit_hash@";
console.info('Commit hash:', _COMMIT_HASH);
- module.exports = {
+ export default {
diff --git a/pkgs/applications/office/activitywatch/default.nix b/pkgs/applications/office/activitywatch/default.nix
index 54105e7c7101..df7b95573783 100644
--- a/pkgs/applications/office/activitywatch/default.nix
+++ b/pkgs/applications/office/activitywatch/default.nix
@@ -1,50 +1,53 @@
-{ lib
-, fetchFromGitHub
-, fetchpatch
-, rustPlatform
-, makeWrapper
-, pkg-config
-, perl
-, openssl
-, rust-jemalloc-sys
-, python3
-, wrapQtAppsHook
-, qtbase
-, qtsvg
-, xdg-utils
-, substituteAll
-, buildNpmPackage
+{
+ lib,
+ fetchFromGitHub,
+ fetchpatch,
+ rustPlatform,
+ makeWrapper,
+ pkg-config,
+ perl,
+ openssl,
+ rust-jemalloc-sys,
+ python3,
+ python3Packages,
+ wrapQtAppsHook,
+ qtbase,
+ qtsvg,
+ xdg-utils,
+ substituteAll,
+ buildNpmPackage,
}:
let
- version = "0.12.2";
+ version = "0.13.2";
sources = fetchFromGitHub {
owner = "ActivityWatch";
repo = "activitywatch";
rev = "v${version}";
- sha256 = "sha256-IvRXfxTOSgBVlxy4SVij+POr7KgvXTEjGN3lSozhHkY=";
+ sha256 = "sha256-Z3WAg3b1zN0nS00u0zIose55JXRzQ7X7qy39XMY7Snk=";
fetchSubmodules = true;
};
in
rec {
- aw-watcher-afk = python3.pkgs.buildPythonApplication {
+ aw-watcher-afk = python3Packages.buildPythonApplication {
pname = "aw-watcher-afk";
inherit version;
- format = "pyproject";
-
src = "${sources}/aw-watcher-afk";
- nativeBuildInputs = [
- python3.pkgs.poetry-core
- ];
+ pyproject = true;
+ build-system = [ python3Packages.poetry-core ];
- propagatedBuildInputs = with python3.pkgs; [
+ dependencies = with python3Packages; [
aw-client
xlib
pynput
];
+ pythonRelaxDeps = [
+ "python-xlib"
+ ];
+
pythonImportsCheck = [ "aw_watcher_afk" ];
meta = with lib; {
@@ -55,23 +58,24 @@ rec {
};
};
- aw-watcher-window = python3.pkgs.buildPythonApplication {
+ aw-watcher-window = python3Packages.buildPythonApplication {
pname = "aw-watcher-window";
inherit version;
- format = "pyproject";
-
src = "${sources}/aw-watcher-window";
- nativeBuildInputs = [
- python3.pkgs.poetry-core
- ];
+ pyproject = true;
+ build-system = [ python3Packages.poetry-core ];
- propagatedBuildInputs = with python3.pkgs; [
+ dependencies = with python3Packages; [
aw-client
xlib
];
+ pythonRelaxDeps = [
+ "python-xlib"
+ ];
+
pythonImportsCheck = [ "aw_watcher_window" ];
meta = with lib; {
@@ -82,20 +86,16 @@ rec {
};
};
- aw-qt = python3.pkgs.buildPythonApplication {
+ aw-qt = python3Packages.buildPythonApplication {
pname = "aw-qt";
inherit version;
- format = "pyproject";
-
src = "${sources}/aw-qt";
- nativeBuildInputs = [
- python3.pkgs.poetry-core
- wrapQtAppsHook
- ];
+ pyproject = true;
+ build-system = [ python3Packages.poetry-core ];
- propagatedBuildInputs = with python3.pkgs; [
+ dependencies = with python3Packages; [
aw-core
qtbase
qtsvg # Rendering icons in the trayicon menu
@@ -103,6 +103,10 @@ rec {
click
];
+ nativeBuildInputs = [
+ wrapQtAppsHook
+ ];
+
# Prevent double wrapping
dontWrapQtApps = true;
@@ -110,10 +114,6 @@ rec {
"--suffix PATH : ${lib.makeBinPath [ xdg-utils ]}"
];
- postPatch = ''
- sed -E 's#PyQt6 = "6.3.1"#PyQt6 = "^6.4.0"#g' -i pyproject.toml
- '';
-
postInstall = ''
install -D resources/aw-qt.desktop $out/share/applications/aw-qt.desktop
@@ -143,21 +143,41 @@ rec {
};
};
+ aw-notify = python3Packages.buildPythonApplication {
+ pname = "aw-notify";
+ inherit version;
+
+ src = "${sources}/aw-notify";
+
+ pyproject = true;
+ build-system = [ python3Packages.poetry-core ];
+
+ dependencies = with python3Packages; [
+ aw-client
+ desktop-notifier
+ ];
+
+ pythonRelaxDeps = [
+ "desktop-notifier"
+ ];
+
+ pythonImportsCheck = [ "aw_notify" ];
+
+ meta = with lib; {
+ description = "Desktop notification service for ActivityWatch";
+ homepage = "https://github.com/ActivityWatch/aw-notify";
+ maintainers = with maintainers; [ huantian ];
+ license = licenses.mpl20;
+ };
+ };
+
aw-server-rust = rustPlatform.buildRustPackage {
pname = "aw-server-rust";
inherit version;
src = "${sources}/aw-server-rust";
- cargoLock = {
- lockFile = ./Cargo.lock;
- outputHashes = {
- "rocket_cors-0.6.0-alpha1" = "sha256-GuMekgnsyuOg6lMiVvi4TwMba4sAFJ/zkgrdzSeBrv0=";
- };
- };
-
- # Bypass rust nightly features not being available on rust stable
- RUSTC_BOOTSTRAP = 1;
+ cargoHash = "sha256-2KnfLNVw48VVQ1Ec8MS2MaiA3BpGeFd/uIrJRHhaJR8=";
patches = [
# Override version string with hardcoded value as it may be outdated upstream.
@@ -165,14 +185,6 @@ rec {
src = ./override-version.patch;
version = sources.rev;
})
-
- # Can be removed with release 0.12.3
- (fetchpatch {
- name = "remove-unused-unstable-features.patch";
- url = "https://github.com/ActivityWatch/aw-server-rust/commit/e1cd761d2f0a9309eb851b59732c2567a7ae2d3a.patch";
- hash = "sha256-wP+3XZDkr148XY5b8RV3obuLczAFBE3FhaYPqnmmGcU=";
- includes = [ "aw-server/src/lib.rs" ];
- })
];
nativeBuildInputs = [
@@ -186,13 +198,7 @@ rec {
rust-jemalloc-sys
];
- postFixup = ''
- wrapProgram "$out/bin/aw-server" \
- --prefix XDG_DATA_DIRS : "$out/share"
-
- mkdir -p "$out/share/aw-server"
- ln -s "${aw-webui}" "$out/share/aw-server/static"
- '';
+ env.AW_WEBUI_DIR = aw-webui;
preCheck = ''
# Fake home folder for tests that use ~/.cache and ~/.local/share
@@ -215,7 +221,9 @@ rec {
src = "${sources}/aw-server-rust/aw-webui";
- npmDepsHash = "sha256-yds2P2PKfTB6yUGnc+P73InV5+MZP9kmz2ZS4CRqlmA=";
+ npmDepsHash = "sha256-fPk7UpKuO3nEN1w+cf9DIZIG1+XRUk6PJfVmtpC30XE=";
+
+ makeCacheWritable = true;
patches = [
# Hardcode version to avoid the need to have the Git repo available at build time.
@@ -228,7 +236,7 @@ rec {
installPhase = ''
runHook preInstall
mv dist $out
- cp media/logo/logo.{png,svg} $out/static/
+ mv media/logo/logo.{png,svg} $out
runHook postInstall
'';
diff --git a/pkgs/applications/office/activitywatch/wrapper.nix b/pkgs/applications/office/activitywatch/wrapper.nix
index 56588e0b7400..5ae59a16df3e 100644
--- a/pkgs/applications/office/activitywatch/wrapper.nix
+++ b/pkgs/applications/office/activitywatch/wrapper.nix
@@ -1,10 +1,12 @@
-{ lib
-, symlinkJoin
-, aw-server-rust
-, aw-qt
-, aw-watcher-afk
-, aw-watcher-window
-, extraWatchers ? [ ]
+{
+ lib,
+ symlinkJoin,
+ aw-server-rust,
+ aw-qt,
+ aw-notify,
+ aw-watcher-afk,
+ aw-watcher-window,
+ extraWatchers ? [ ],
}:
symlinkJoin {
@@ -12,7 +14,19 @@ symlinkJoin {
paths = [
aw-server-rust.out
aw-qt.out
+ aw-notify.out
aw-watcher-afk.out
aw-watcher-window.out
] ++ (lib.forEach extraWatchers (p: p.out));
+
+ meta = with lib; {
+ description = "The best free and open-source automated time tracker";
+ homepage = "https://activitywatch.net/";
+ downloadPage = "https://github.com/ActivityWatch/activitywatch/releases";
+ changelog = "https://github.com/ActivityWatch/activitywatch/releases/tag/v${aw-server-rust.version}";
+ maintainers = with maintainers; [ huantian ];
+ mainProgram = "aw-qt";
+ platforms = platforms.linux;
+ license = licenses.mpl20;
+ };
}
diff --git a/pkgs/applications/office/kitsas/default.nix b/pkgs/applications/office/kitsas/default.nix
deleted file mode 100644
index 9821cdd2f2f8..000000000000
--- a/pkgs/applications/office/kitsas/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, qmake, qtsvg, poppler, libzip, pkg-config, wrapQtAppsHook }:
-
-stdenv.mkDerivation rec {
- pname = "kitsas";
- version = "4.0.5";
-
- src = fetchFromGitHub {
- owner = "artoh";
- repo = "kitupiikki";
- rev = "v${version}";
- hash = "sha256-ODl1yrtrCVhuBWbA1AvHl22d+JSdySG/Gi2hlpVW3jg=";
- };
-
- postPatch = ''
- substituteInPlace kitsas/kitsas.pro \
- --replace "LIBS += -L/usr/local/opt/poppler-qt5/lib -lpoppler-qt6" "LIBS += -lpoppler-qt5"
- '';
-
- nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ];
-
- buildInputs = [ qtsvg poppler libzip ];
-
- # We use a separate build-dir as otherwise ld seems to get confused between
- # directory and executable name on buildPhase.
- preConfigure = ''
- mkdir build && cd build
- '';
-
- qmakeFlags = [ "../kitsas/kitsas.pro" ];
-
- installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
- mkdir -p $out/Applications
- mv kitsas.app $out/Applications
- '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
- install -Dm755 kitsas -t $out/bin
- install -Dm644 ../kitsas.svg -t $out/share/icons/hicolor/scalable/apps
- install -Dm644 ../kitsas.png -t $out/share/icons/hicolor/256x256/apps
- install -Dm644 ../kitsas.desktop -t $out/share/applications
- '';
-
- meta = with lib; {
- homepage = "https://github.com/artoh/kitupiikki";
- description = "Accounting tool suitable for Finnish associations and small business";
- mainProgram = "kitsas";
- maintainers = with maintainers; [ gspia ];
- license = licenses.gpl3Plus;
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/applications/office/zotero/darwin.nix b/pkgs/applications/office/zotero/darwin.nix
new file mode 100644
index 000000000000..ad60ee9d409e
--- /dev/null
+++ b/pkgs/applications/office/zotero/darwin.nix
@@ -0,0 +1,33 @@
+{
+ pname,
+ version,
+ meta,
+ stdenv,
+ fetchurl,
+ undmg,
+}:
+
+stdenv.mkDerivation rec {
+ inherit pname version meta;
+
+ src = fetchurl {
+ url = "https://download.zotero.org/client/release/${version}/Zotero-${version}.dmg";
+ hash = "sha256-z1HAkHz4JGRfQJna2cINZTmYPzyj9ofp7mJHN/mNyOo=";
+ };
+ sourceRoot = ".";
+
+ nativeBuildInputs = [ undmg ];
+
+ dontConfigure = true;
+ dontBuild = true;
+ dontFixup = true; # breaks notarization
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/Applications
+ cp -r Zotero.app $out/Applications
+
+ runHook postInstall
+ '';
+}
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index 5c4cb5dee3b1..f6117050c97f 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -1,116 +1,30 @@
-{ lib
-, stdenv
-, fetchurl
-, wrapGAppsHook3
-, makeDesktopItem
-, alsa-lib
-, atk
-, cairo
-, dbus-glib
-, gdk-pixbuf
-, glib
-, gtk3
-, libGL
-, libva
-, xorg
-, mesa
-, pango
-, pciutils
+{
+ lib,
+ stdenv,
+ callPackage,
}:
-stdenv.mkDerivation rec {
+let
pname = "zotero";
- version = "7.0.7";
-
- src = fetchurl {
- url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
- hash = "sha256-ERL+zKjNOz+j/Q5dyTXVczLnwaTl/SzgSaKVkA9uyJ4=";
- };
-
- dontPatchELF = true;
- nativeBuildInputs = [ wrapGAppsHook3 ];
-
- libPath = lib.makeLibraryPath [
- alsa-lib
- atk
- cairo
- dbus-glib
- gdk-pixbuf
- glib
- gtk3
- libGL
- libva
- xorg.libX11
- xorg.libXcomposite
- xorg.libXcursor
- xorg.libXdamage
- xorg.libXext
- xorg.libXfixes
- xorg.libXi
- xorg.libXrandr
- xorg.libXtst
- xorg.libxcb
- mesa
- pango
- pciutils
- ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ];
-
- desktopItem = makeDesktopItem {
- name = "zotero";
- exec = "zotero -url %U";
- icon = "zotero";
- comment = meta.description;
- desktopName = "Zotero";
- genericName = "Reference Management";
- categories = [ "Office" "Database" ];
- startupNotify = true;
- mimeTypes = [ "x-scheme-handler/zotero" "text/plain" ];
- };
-
- installPhase = ''
- runHook preInstall
-
- # Copy package contents to the output directory
- mkdir -p "$prefix/usr/lib/zotero-bin-${version}"
- cp -r * "$prefix/usr/lib/zotero-bin-${version}"
- mkdir -p "$out/bin"
- ln -s "$prefix/usr/lib/zotero-bin-${version}/zotero" "$out/bin/"
-
- # Install desktop file and icons
- mkdir -p $out/share/applications
- cp ${desktopItem}/share/applications/* $out/share/applications/
- for size in 32 64 128; do
- install -Dm444 icons/icon''${size}.png \
- $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png
- done
- install -Dm444 icons/symbolic.svg \
- $out/share/icons/hicolor/symbolic/apps/zotero-symbolic.svg
-
- runHook postInstall
- '';
-
- postFixup = ''
- for executable in \
- zotero-bin plugin-container updater vaapitest \
- minidump-analyzer glxtest
- do
- if [ -e "$out/usr/lib/zotero-bin-${version}/$executable" ]; then
- patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- "$out/usr/lib/zotero-bin-${version}/$executable"
- fi
- done
- find . -executable -type f -exec \
- patchelf --set-rpath "$libPath" \
- "$out/usr/lib/zotero-bin-${version}/{}" \;
- '';
-
- meta = with lib; {
+ version = "7.0.8";
+ meta = {
homepage = "https://www.zotero.org";
description = "Collect, organize, cite, and share your research sources";
mainProgram = "zotero";
- sourceProvenance = with sourceTypes; [ binaryNativeCode ];
- license = licenses.agpl3Only;
- platforms = [ "x86_64-linux" ];
- maintainers = with maintainers; [ atila justanotherariel ];
+ sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+ license = lib.licenses.agpl3Only;
+ platforms = [
+ "x86_64-linux"
+ "x86_64-darwin"
+ "aarch64-darwin"
+ ];
+ maintainers = with lib.maintainers; [
+ atila
+ justanotherariel
+ ];
};
-}
+in
+if stdenv.hostPlatform.isDarwin then
+ callPackage ./darwin.nix { inherit pname version meta; }
+else
+ callPackage ./linux.nix { inherit pname version meta; }
diff --git a/pkgs/applications/office/zotero/linux.nix b/pkgs/applications/office/zotero/linux.nix
new file mode 100644
index 000000000000..1b7d58f86883
--- /dev/null
+++ b/pkgs/applications/office/zotero/linux.nix
@@ -0,0 +1,118 @@
+{
+ pname,
+ version,
+ meta,
+ lib,
+ stdenv,
+ fetchurl,
+ wrapGAppsHook3,
+ makeDesktopItem,
+ alsa-lib,
+ atk,
+ cairo,
+ dbus-glib,
+ gdk-pixbuf,
+ glib,
+ gtk3,
+ libGL,
+ libva,
+ xorg,
+ mesa,
+ pango,
+ pciutils,
+}:
+
+stdenv.mkDerivation rec {
+ inherit pname version meta;
+
+ src = fetchurl {
+ url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
+ hash = "sha256-utiqS4/PvlkQesqTOyEvj8uwW1sDxlqjnhv6GFfY5uk=";
+ };
+
+ dontPatchELF = true;
+ nativeBuildInputs = [ wrapGAppsHook3 ];
+
+ libPath =
+ lib.makeLibraryPath [
+ alsa-lib
+ atk
+ cairo
+ dbus-glib
+ gdk-pixbuf
+ glib
+ gtk3
+ libGL
+ libva
+ xorg.libX11
+ xorg.libXcomposite
+ xorg.libXcursor
+ xorg.libXdamage
+ xorg.libXext
+ xorg.libXfixes
+ xorg.libXi
+ xorg.libXrandr
+ xorg.libXtst
+ xorg.libxcb
+ mesa
+ pango
+ pciutils
+ ]
+ + ":"
+ + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ];
+
+ desktopItem = makeDesktopItem {
+ name = "zotero";
+ exec = "zotero -url %U";
+ icon = "zotero";
+ comment = meta.description;
+ desktopName = "Zotero";
+ genericName = "Reference Management";
+ categories = [
+ "Office"
+ "Database"
+ ];
+ startupNotify = true;
+ mimeTypes = [
+ "x-scheme-handler/zotero"
+ "text/plain"
+ ];
+ };
+
+ installPhase = ''
+ runHook preInstall
+
+ # Copy package contents to the output directory
+ mkdir -p "$prefix/usr/lib/zotero-bin-${version}"
+ cp -r * "$prefix/usr/lib/zotero-bin-${version}"
+ mkdir -p "$out/bin"
+ ln -s "$prefix/usr/lib/zotero-bin-${version}/zotero" "$out/bin/"
+
+ # Install desktop file and icons
+ mkdir -p $out/share/applications
+ cp ${desktopItem}/share/applications/* $out/share/applications/
+ for size in 32 64 128; do
+ install -Dm444 icons/icon''${size}.png \
+ $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png
+ done
+ install -Dm444 icons/symbolic.svg \
+ $out/share/icons/hicolor/symbolic/apps/zotero-symbolic.svg
+
+ runHook postInstall
+ '';
+
+ postFixup = ''
+ for executable in \
+ zotero-bin plugin-container updater vaapitest \
+ minidump-analyzer glxtest
+ do
+ if [ -e "$out/usr/lib/zotero-bin-${version}/$executable" ]; then
+ patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ "$out/usr/lib/zotero-bin-${version}/$executable"
+ fi
+ done
+ find . -executable -type f -exec \
+ patchelf --set-rpath "$libPath" \
+ "$out/usr/lib/zotero-bin-${version}/{}" \;
+ '';
+}
diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix
index b611ef66b825..3379ba4c1df9 100644
--- a/pkgs/applications/radio/gnuradio/3.8.nix
+++ b/pkgs/applications/radio/gnuradio/3.8.nix
@@ -7,7 +7,7 @@
, pkg-config
, volk
, cppunit
-, swig
+, swig3
, orc
, boost
, log4cpp
@@ -83,7 +83,7 @@ let
python-support = {
pythonRuntime = [ python.pkgs.six ];
native = [
- swig
+ swig3
python
];
cmakeEnableFlag = "PYTHON";
@@ -98,7 +98,7 @@ let
gr-ctrlport = {
cmakeEnableFlag = "GR_CTRLPORT";
native = [
- swig
+ swig3
];
runtime = [
thrift
@@ -159,7 +159,7 @@ let
cmakeEnableFlag = "GR_CHANNELS";
};
gr-qtgui = {
- runtime = [ qt5.qtbase libsForQt5.qwt ];
+ runtime = [ qt5.qtbase libsForQt5.qwt6_1 ];
pythonRuntime = [ python.pkgs.pyqt5 ];
cmakeEnableFlag = "GR_QTGUI";
};
@@ -231,22 +231,9 @@ stdenv.mkDerivation (finalAttrs: (shared // {
# Will still evaluate correctly if not used here. It only helps nix-update
# find the right file in which version is defined.
inherit (shared) src;
- # Remove failing tests
- preConfigure = (shared.preConfigure or "") + ''
- # https://github.com/gnuradio/gnuradio/issues/3801
- rm gr-blocks/python/blocks/qa_cpp_py_binding.py
- rm gr-blocks/python/blocks/qa_cpp_py_binding_set.py
- rm gr-blocks/python/blocks/qa_ctrlport_probes.py
- # Tests that fail due to numpy deprecations upstream hasn't accomodated to yet.
- rm gr-fec/python/fec/qa_polar_decoder_sc.py
- rm gr-fec/python/fec/qa_polar_decoder_sc_list.py
- rm gr-fec/python/fec/qa_polar_decoder_sc_systematic.py
- rm gr-fec/python/fec/qa_polar_encoder.py
- rm gr-fec/python/fec/qa_polar_encoder_systematic.py
- rm gr-filter/python/filter/qa_freq_xlating_fft_filter.py
- # Failed with libstdc++ from GCC 13
- rm gr-filter/python/filter/qa_filterbank.py
- '';
+ # Some of the tests we know why they fail, but others simply hang-out and
+ # timeout...
+ doCheck = false;
patches = [
# Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227
./modtool-newmod-permissions.3_8.patch
@@ -268,7 +255,7 @@ stdenv.mkDerivation (finalAttrs: (shared // {
} // lib.optionalAttrs (hasFeature "gr-uhd") {
inherit uhd;
} // lib.optionalAttrs (hasFeature "gr-qtgui") {
- inherit (libsForQt5) qwt;
+ qwt = libsForQt5.qwt6_1;
};
cmakeFlags = shared.cmakeFlags
# From some reason, if these are not set, libcodec2 and gsm are not
diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix
index f9113b0a23c3..05d4e4cdc279 100644
--- a/pkgs/applications/radio/gnuradio/default.nix
+++ b/pkgs/applications/radio/gnuradio/default.nix
@@ -9,6 +9,7 @@
, orc
, boost
, spdlog
+, swig
, mpir
, doxygen
, python
diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix
index 46b9a9ed2ea3..c1a5f1cea877 100644
--- a/pkgs/applications/radio/rtl_433/default.nix
+++ b/pkgs/applications/radio/rtl_433/default.nix
@@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
- version = "23.11";
+ version = "24.10";
pname = "rtl_433";
src = fetchFromGitHub {
owner = "merbanan";
repo = "rtl_433";
rev = version;
- hash = "sha256-qCfPweJeYHIuM1DfDmeDilkV/RLzbzlIe1sIpSx/EYc=";
+ hash = "sha256-o4eAG6iYK4JXbh9JRv5NLmSxg396ErH++H0J8tTXiUA=";
};
nativeBuildInputs = [ pkg-config cmake ];
diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix
index e22bef1541b2..9b9d6f29bce6 100644
--- a/pkgs/applications/radio/sdrangel/default.nix
+++ b/pkgs/applications/radio/sdrangel/default.nix
@@ -1,64 +1,65 @@
-{ lib
-, stdenv
-, airspy
-, airspyhf
-, aptdec
-, boost
-, cm256cc
-, cmake
-, codec2
-, dab_lib
-, dsdcc
-, faad2
-, fetchFromGitHub
-, fftwFloat
-, glew
-, hackrf
-, hidapi
-, ffmpeg
-, libiio
-, libopus
-, libpulseaudio
-, libusb1
-, limesuite
-, libbladeRF
-, mbelib
-, ninja
-, opencv4
-, pkg-config
-, qtcharts
-, qtdeclarative
-, qtgamepad
-, qtgraphicaleffects
-, qtlocation
-, qtmultimedia
-, qtquickcontrols
-, qtquickcontrols2
-, qtserialport
-, qtspeech
-, qttools
-, qtwebsockets
-, qtwebengine
-, rtl-sdr
-, serialdv
-, sdrplay
-, sgp4
-, soapysdr-with-plugins
-, uhd
-, wrapQtAppsHook
-, zlib
-, withSDRplay ? false
+{
+ lib,
+ stdenv,
+ airspy,
+ airspyhf,
+ aptdec,
+ boost,
+ cm256cc,
+ cmake,
+ codec2,
+ dab_lib,
+ dsdcc,
+ faad2,
+ fetchFromGitHub,
+ fftwFloat,
+ flac,
+ glew,
+ hackrf,
+ hidapi,
+ ffmpeg,
+ libiio,
+ libopus,
+ libpulseaudio,
+ libusb1,
+ limesuite,
+ libbladeRF,
+ mbelib,
+ ninja,
+ opencv4,
+ pkg-config,
+ qt5compat,
+ qtcharts,
+ qtdeclarative,
+ qtlocation,
+ qtmultimedia,
+ qtscxml,
+ qtserialport,
+ qtspeech,
+ qttools,
+ qtwayland,
+ qtwebsockets,
+ qtwebengine,
+ rtl-sdr,
+ serialdv,
+ sdrplay,
+ sgp4,
+ soapysdr-with-plugins,
+ uhd,
+ wrapQtAppsHook,
+ zlib,
+ withSDRplay ? false,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "sdrangel";
- version = "7.22.1";
+ version = "7.22.2";
src = fetchFromGitHub {
owner = "f4exb";
repo = "sdrangel";
rev = "v${finalAttrs.version}";
- hash = "sha256-Vhxs1KVUDCbl/9abZByUuy230PV4RrYrRjEXgYc8oZU=";
+ hash = "sha256-HFAQ+Pjl//F18O4TryU1zIiAqtb/mBXKipaqNCeeqQo=";
};
nativeBuildInputs = [
@@ -80,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
faad2
ffmpeg
fftwFloat
+ flac
glew
hackrf
hidapi
@@ -91,14 +93,12 @@ stdenv.mkDerivation (finalAttrs: {
limesuite
mbelib
opencv4
+ qt5compat
qtcharts
qtdeclarative
- qtgamepad
- qtgraphicaleffects
qtlocation
qtmultimedia
- qtquickcontrols
- qtquickcontrols2
+ qtscxml
qtserialport
qtspeech
qttools
@@ -110,8 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
soapysdr-with-plugins
uhd
zlib
- ]
- ++ lib.optionals withSDRplay [ sdrplay ];
+ ] ++ lib.optionals stdenv.isLinux [ qtwayland ] ++ lib.optionals withSDRplay [ sdrplay ];
cmakeFlags = [
"-DAPT_DIR=${aptdec}"
@@ -119,6 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
"-DSGP4_DIR=${sgp4}"
"-DSOAPYSDR_DIR=${soapysdr-with-plugins}"
"-Wno-dev"
+ "-DENABLE_QT6=ON"
];
meta = {
@@ -126,9 +126,12 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/f4exb/sdrangel";
license = lib.licenses.gpl3Plus;
longDescription = ''
- SDRangel is an Open Source Qt5 / OpenGL 3.0+ SDR and signal analyzer frontend to various hardware.
+ SDRangel is an Open Source Qt6 / OpenGL 3.0+ SDR and signal analyzer frontend to various hardware.
'';
- maintainers = with lib.maintainers; [ alkeryn Tungsten842 ];
+ maintainers = with lib.maintainers; [
+ alkeryn
+ Tungsten842
+ ];
platforms = lib.platforms.unix;
};
})
diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix
index ce668c45300f..22e734e0dac8 100644
--- a/pkgs/applications/radio/uhd/default.nix
+++ b/pkgs/applications/radio/uhd/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
#
# nix-shell maintainers/scripts/update.nix --argstr package uhd --argstr commit true
#
- version = "4.6.0.0";
+ version = "4.7.0.0";
outputs = [ "out" "dev" ];
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
rev = "v${finalAttrs.version}";
# The updateScript relies on the `src` using `hash`, and not `sha256. To
# update the correct hash for the `src` vs the `uhdImagesSrc`
- hash = "sha256-9ZGt0ZrGbprCmpAuOue6pg2gliu4MvlRFHGxyMJeKAc=";
+ hash = "sha256-TX1iLs941z8sZY0yQEXuy9jGgsn6HU4uqIdxJmNNahU=";
};
# Firmware images are downloaded (pre-built) from the respective release on Github
uhdImagesSrc = fetchurl {
diff --git a/pkgs/applications/radio/uhd/no-adapter-tests.patch b/pkgs/applications/radio/uhd/no-adapter-tests.patch
index 38865f418101..af426dcc4d57 100644
--- a/pkgs/applications/radio/uhd/no-adapter-tests.patch
+++ b/pkgs/applications/radio/uhd/no-adapter-tests.patch
@@ -1,17 +1,17 @@
diff --git i/host/tests/CMakeLists.txt w/host/tests/CMakeLists.txt
-index f40c252ad..b8a07d341 100644
---- i/host/tests/CMakeLists.txt
-+++ w/host/tests/CMakeLists.txt
-@@ -453,12 +453,6 @@ UHD_ADD_NONAPI_TEST(
+index bac599811..267f8e602 100644
+--- a/host/tests/CMakeLists.txt
++++ b/host/tests/CMakeLists.txt
+@@ -517,12 +517,6 @@ UHD_ADD_NONAPI_TEST(
${UHD_SOURCE_DIR}/lib/utils/compat_check.cpp
)
-
+
-UHD_ADD_NONAPI_TEST(
- TARGET "xport_adapter_ctrl_test.cpp"
- EXTRA_SOURCES
- ${UHD_SOURCE_DIR}/lib/usrp/cores/xport_adapter_ctrl.cpp
-)
-
- ########################################################################
- # demo of a loadable module
- ########################################################################
+ UHD_ADD_NONAPI_TEST(
+ TARGET "custom_reg_test.cpp"
+ EXTRA_SOURCES
diff --git a/pkgs/applications/science/biology/bwa-mem2/default.nix b/pkgs/applications/science/biology/bwa-mem2/default.nix
index 0a2d2c8d2052..eb6b01b147f9 100644
--- a/pkgs/applications/science/biology/bwa-mem2/default.nix
+++ b/pkgs/applications/science/biology/bwa-mem2/default.nix
@@ -34,6 +34,14 @@ stdenv.mkDerivation (finalAttrs: {
else if stdenv.hostPlatform.avx512Support then "arch=avx512"
else "arch=sse41")
];
+
+ env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+ NIX_CFLAGS_COMPILE = toString [
+ "-Wno-error=register"
+ "-Wno-error=implicit-function-declaration"
+ ];
+ };
+
enableParallelBuilding = true;
installPhase = ''
runHook preInstall
diff --git a/pkgs/applications/science/biology/dssp/default.nix b/pkgs/applications/science/biology/dssp/default.nix
index 531d025dd586..9f5c25b04cff 100644
--- a/pkgs/applications/science/biology/dssp/default.nix
+++ b/pkgs/applications/science/biology/dssp/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dssp";
- version = "4.4.8";
+ version = "4.4.10";
src = fetchFromGitHub {
owner = "PDB-REDO";
repo = "dssp";
rev = "refs/tags/v${finalAttrs.version}";
- hash = "sha256-ThQInyVuf8ejkidne/T3GdPBbf3HeThDBwWQEWB+JMI=";
+ hash = "sha256-YNYpHjp9kEszXvLF3RrNg6gYd4GPvfRVtdkUwJ89qOc=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/science/chemistry/apbs/default.nix b/pkgs/applications/science/chemistry/apbs/default.nix
index 766e4dcbd557..87cd5fed1373 100644
--- a/pkgs/applications/science/chemistry/apbs/default.nix
+++ b/pkgs/applications/science/chemistry/apbs/default.nix
@@ -8,6 +8,7 @@
, python3
, libintl
, libiconv
+, darwin
}:
let
# this is a fork version of fetk (http://www.fetk.org/)
@@ -87,6 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
libintl
libiconv
+ darwin.libutil
];
cmakeFlags = [
diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix
index d500e78b2482..f3687a64d599 100644
--- a/pkgs/applications/science/chemistry/openmolcas/default.nix
+++ b/pkgs/applications/science/chemistry/openmolcas/default.nix
@@ -1,37 +1,50 @@
-{ lib
-, stdenv
-, fetchFromGitLab
-, fetchFromGitHub
-, cmake
-, gfortran
-, perl
-, blas-ilp64
-, hdf5-cpp
-, python3
-, texliveMinimal
-, armadillo
-, libxc
-, makeWrapper
-, gsl
-, boost180
-, autoPatchelfHook
+{
+ lib,
+ stdenv,
+ fetchFromGitLab,
+ fetchFromGitHub,
+ cmake,
+ gfortran,
+ perl,
+ blas-ilp64,
+ hdf5-cpp,
+ python3,
+ texliveMinimal,
+ armadillo,
+ libxc,
+ makeWrapper,
+ gsl,
+ boost180,
+ autoPatchelfHook,
+ enableQcmaquis ? false,
# Note that the CASPT2 module is broken with MPI
# See https://gitlab.com/Molcas/OpenMolcas/-/issues/169
-, enableMpi ? false
-, mpi
-, globalarrays
+ enableMpi ? false,
+ mpi,
+ globalarrays,
}:
assert blas-ilp64.isILP64;
-assert lib.elem blas-ilp64.passthru.implementation [ "openblas" "mkl" ];
+assert lib.elem blas-ilp64.passthru.implementation [
+ "openblas"
+ "mkl"
+];
+assert enableQcmaquis -> lib.elem blas-ilp64.passthru.implementation "mkl";
let
- python = python3.withPackages (ps: with ps; [ six pyparsing numpy h5py ]);
+ python = python3.withPackages (
+ ps: with ps; [
+ six
+ pyparsing
+ numpy
+ h5py
+ ]
+ );
qcmaquisSrc = fetchFromGitHub {
owner = "qcscine";
repo = "qcmaquis";
- rev = "release-3.1.1"; # Must match tag in cmake/custom/qcmaquis.cmake
- hash = "sha256-diLDWj/Om6EHrVp+Hd24jsN6R9vV2vRl0y9gqyRWhkI=";
+ rev = "release-3.1.4"; # Must match tag in cmake/custom/qcmaquis.cmake
+ hash = "sha256-vhC5k+91IPFxdCi5oYt1NtF9W08RxonJjPpA0ls4I+o=";
};
nevtp2Src = fetchFromGitHub {
owner = "qcscine";
@@ -43,13 +56,13 @@ let
in
stdenv.mkDerivation rec {
pname = "openmolcas";
- version = "24.06";
+ version = "24.10";
src = fetchFromGitLab {
owner = "Molcas";
repo = "OpenMolcas";
rev = "v${version}";
- hash = "sha256-/y6vEvA1Zf+p7Z0WpcN4P5voLN8MmfbKz1FuthgVQp0=";
+ hash = "sha256-LXxr/xqBHG7a0rOBrb8IMZ4IjZak3NsBw40Qf+z1fic=";
};
patches = [
@@ -82,41 +95,48 @@ stdenv.mkDerivation rec {
autoPatchelfHook
];
- buildInputs = [
- blas-ilp64.passthru.provider
- hdf5-cpp
- python
- armadillo
- libxc
- gsl.dev
- boost180
- ] ++ lib.optionals enableMpi [
- mpi
- globalarrays
- ];
+ buildInputs =
+ [
+ blas-ilp64.passthru.provider
+ hdf5-cpp
+ python
+ armadillo
+ libxc
+ gsl.dev
+ boost180
+ ]
+ ++ lib.optionals enableMpi [
+ mpi
+ globalarrays
+ ];
passthru = lib.optionalAttrs enableMpi { inherit mpi; };
- cmakeFlags = [
- "-DOPENMP=ON"
- "-DLINALG=OpenBLAS"
- "-DTOOLS=ON"
- "-DHDF5=ON"
- "-DFDE=ON"
- "-DEXTERNAL_LIBXC=${lib.getDev libxc}"
- "-DDMRG=ON"
- "-DNEVPT2=ON"
- "-DCMAKE_SKIP_BUILD_RPATH=ON"
- ] ++ lib.optionals (blas-ilp64.passthru.implementation == "openblas") [
- "-DOPENBLASROOT=${blas-ilp64.passthru.provider.dev}"
- "-DLINALG=OpenBLAS"
- ] ++ lib.optionals (blas-ilp64.passthru.implementation == "mkl") [
- "-DMKLROOT=${blas-ilp64.passthru.provider}"
- "-DLINALG=MKL"
- ] ++ lib.optionals enableMpi [
- "-DGA=ON"
- "-DMPI=ON"
- ];
+ cmakeFlags =
+ [
+ "-DOPENMP=ON"
+ "-DTOOLS=ON"
+ "-DHDF5=ON"
+ "-DFDE=ON"
+ "-DEXTERNAL_LIBXC=${lib.getDev libxc}"
+ (lib.strings.cmakeBool "DMRG" enableQcmaquis)
+ (lib.strings.cmakeBool "NEVPT2" enableQcmaquis)
+ "-DCMAKE_SKIP_BUILD_RPATH=ON"
+ (lib.strings.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic)
+ (lib.strings.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+ ]
+ ++ lib.optionals (blas-ilp64.passthru.implementation == "openblas") [
+ "-DOPENBLASROOT=${blas-ilp64.passthru.provider.dev}"
+ "-DLINALG=OpenBLAS"
+ ]
+ ++ lib.optionals (blas-ilp64.passthru.implementation == "mkl") [
+ "-DMKLROOT=${blas-ilp64.passthru.provider}"
+ "-DLINALG=MKL"
+ ]
+ ++ lib.optionals enableMpi [
+ "-DGA=ON"
+ "-DMPI=ON"
+ ];
preConfigure = lib.optionalString enableMpi ''
export GAROOT=${globalarrays};
@@ -146,13 +166,18 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/pymolcas --set MOLCAS $out
'';
- meta = with lib; {
+ meta = {
description = "Advanced quantum chemistry software package";
homepage = "https://gitlab.com/Molcas/OpenMolcas";
- maintainers = [ maintainers.markuskowa ];
- license = with licenses; [ lgpl21Only bsd3 ];
- platforms = [ "aarch64-linux" "x86_64-linux" ];
+ maintainers = [ lib.maintainers.markuskowa ];
+ license = with lib.licenses; [
+ lgpl21Only
+ bsd3
+ ];
+ platforms = [
+ "aarch64-linux"
+ "x86_64-linux"
+ ];
mainProgram = "pymolcas";
};
}
-
diff --git a/pkgs/applications/science/chemistry/openmolcas/qcmaquis.patch b/pkgs/applications/science/chemistry/openmolcas/qcmaquis.patch
index ca276bb3fb58..c388f699a1cc 100644
--- a/pkgs/applications/science/chemistry/openmolcas/qcmaquis.patch
+++ b/pkgs/applications/science/chemistry/openmolcas/qcmaquis.patch
@@ -22,25 +22,26 @@ index 789739ec8..6c86a7b8c 100644
INSTALL_DIR "${PROJECT_BINARY_DIR}/qcmaquis"
)
diff --git a/cmake/custom/qcmaquis.cmake b/cmake/custom/qcmaquis.cmake
-index 176d02761..e160b7bc8 100644
+index 5fd1ef207..8d2957c6e 100644
--- a/cmake/custom/qcmaquis.cmake
+++ b/cmake/custom/qcmaquis.cmake
-@@ -78,6 +78,7 @@ list(APPEND QCMaquisCMakeArgs
- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
- -DCMAKE_CXX_FLAGS=${QCM_CMake_CXX_FLAGS}
- -DCMAKE_INSTALL_PREFIX:PATH=
-+ -DCMAKE_SKIP_BUILD_RPATH=ON
- )
- if(HDF5_ROOT)
- list(APPEND QCMaquisCMakeArgs
-@@ -278,9 +279,7 @@ set (CMAKE_DISABLE_SOURCE_CHANGES OFF)
+@@ -77,6 +77,7 @@ list (APPEND QCMaquisCMakeArgs
+ -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+ -DCMAKE_CXX_FLAGS=${QCM_CMake_CXX_FLAGS}
+ -DCMAKE_INSTALL_PREFIX:PATH=
++ -DCMAKE_SKIP_BUILD_RPATH=ON
+ )
+ if (HDF5_ROOT)
+ list (APPEND QCMaquisCMakeArgs
+@@ -274,10 +275,7 @@ if (NOT MAQUIS_DMRG_FOUND) # Does the opposite work?
- ExternalProject_Add(${EP_PROJECT}
- PREFIX ${extprojpath}
-- GIT_REPOSITORY ${reference_git_repo}
-- GIT_TAG ${reference_git_commit}
-- UPDATE_DISCONNECTED ${EP_SkipUpdate}
-+ URL @qcmaquis_src_url@
-
- SOURCE_SUBDIR dmrg
- CMAKE_ARGS ${EP_CMAKE_ARGS}
+ ExternalProject_Add (${EP_PROJECT}
+ PREFIX ${extprojpath}
+- GIT_REPOSITORY ${reference_git_repo}
+- GIT_TAG ${reference_git_commit}
+- UPDATE_DISCONNECTED ${EP_SkipUpdate}
+-
++ URL @qcmaquis_src_url@
+ SOURCE_SUBDIR dmrg
+ CMAKE_ARGS ${EP_CMAKE_ARGS}
+ CMAKE_CACHE_ARGS ${EP_CMAKE_CACHE_ARGS}
diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix
index 0c557fbeca3e..0ec5dcb683a5 100644
--- a/pkgs/applications/science/electronics/nvc/default.nix
+++ b/pkgs/applications/science/electronics/nvc/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "nvc";
- version = "1.14.0";
+ version = "1.14.1";
src = fetchFromGitHub {
owner = "nickg";
repo = "nvc";
rev = "r${version}";
- hash = "sha256-xaJt3zMAv+Op7cQAaKJOyI28oEssMw/7zvEnfReS4aw=";
+ hash = "sha256-EPnHm2bZCui8K/H1a6+pgec3Lrf+zAlFoKYBnLspdQQ=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/applications/science/electronics/openroad/default.nix
index 65bf094c2a2c..cae21d7bba4b 100644
--- a/pkgs/applications/science/electronics/openroad/default.nix
+++ b/pkgs/applications/science/electronics/openroad/default.nix
@@ -26,7 +26,7 @@
, readline
, spdlog
, tcl
-, tcllib
+, tclPackages
, xorg
, yosys
, zlib
@@ -72,7 +72,7 @@ mkDerivation rec {
readline
spdlog
tcl
- tcllib
+ tclPackages.tcllib
yosys
xorg.libX11
zlib
diff --git a/pkgs/applications/science/electronics/sv-lang/default.nix b/pkgs/applications/science/electronics/sv-lang/default.nix
index 928cf3059385..2bc5059b8b80 100644
--- a/pkgs/applications/science/electronics/sv-lang/default.nix
+++ b/pkgs/applications/science/electronics/sv-lang/default.nix
@@ -49,15 +49,14 @@ stdenv.mkDerivation rec {
cmake
python3
ninja
-
- # though only used in tests, cmake will complain its absence when configuring
- catch2_3
];
buildInputs = [
unordered_dense
boost182
fmt_9
+ # though only used in tests, cmake will complain its absence when configuring
+ catch2_3
];
# TODO: a mysterious linker error occurs when building the unittests on darwin.
diff --git a/pkgs/applications/science/logic/bitwuzla/default.nix b/pkgs/applications/science/logic/bitwuzla/default.nix
index f5a5296de9c4..6499b48d95a6 100644
--- a/pkgs/applications/science/logic/bitwuzla/default.nix
+++ b/pkgs/applications/science/logic/bitwuzla/default.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bitwuzla";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "bitwuzla";
repo = "bitwuzla";
rev = finalAttrs.version;
- hash = "sha256-/izxmN+zlrXsY6g6TRC1QqsLqltvrmZquXRd6h8RLRc=";
+ hash = "sha256-xO9+hixboGaCAIi01sWuIYtPamIwUpiTujmOD60NEm0=";
};
strictDeps = true;
diff --git a/pkgs/applications/science/logic/key/default.nix b/pkgs/applications/science/logic/key/default.nix
index d97eb42b4027..6888b5cdd35f 100644
--- a/pkgs/applications/science/logic/key/default.nix
+++ b/pkgs/applications/science/logic/key/default.nix
@@ -1,40 +1,41 @@
{ lib, stdenv
-, fetchurl
+, fetchFromGitHub
, jdk
-, gradle_7
+, gradle_8
, jre
, makeWrapper
, makeDesktopItem
, copyDesktopItems
, testers
+, git
, key
}:
let
- gradle = gradle_7;
+ gradle = gradle_8;
in stdenv.mkDerivation rec {
pname = "key";
- version = "2.10.0";
- src = fetchurl {
- url = "https://www.key-project.org/dist/${version}/key-${version}-sources.tgz";
- sha256 = "1f201cbcflqd1z6ysrkh3mff5agspw3v74ybdc3s2lfdyz3b858w";
+ version = "2.12.2";
+ src = fetchFromGitHub {
+ owner = "KeYProject";
+ repo = "key";
+ rev = "refs/tags/KeY-${version}";
+ hash = "sha256-veqaWyWEiTot2cAjvyPG+Ra8/pqS4i6w6iR+qhozIM4=";
};
- sourceRoot = "key-${version}/key";
nativeBuildInputs = [
jdk
- gradle_7
+ gradle
makeWrapper
copyDesktopItems
+ git
];
- executable-name = "KeY";
-
desktopItems = [
(makeDesktopItem {
name = "KeY";
- exec = executable-name;
+ exec = meta.mainProgram;
icon = "key";
comment = meta.description;
desktopName = "KeY";
@@ -51,7 +52,9 @@ in stdenv.mkDerivation rec {
__darwinAllowLocalNetworking = true;
# tests are broken on darwin
- doCheck = !stdenv.hostPlatform.isDarwin;
+ # TODO: on update to 2.12.3+, restore to !stdenv.hostPlatform.isDarwin;
+ # (currently some tests are failing)
+ doCheck = false;
installPhase = ''
runHook preInstall
@@ -61,7 +64,7 @@ in stdenv.mkDerivation rec {
mkdir -p $out/bin
mkdir -p $out/share/icons/hicolor/256x256/apps
cp key.ui/src/main/resources/de/uka/ilkd/key/gui/images/key-color-icon-square.png $out/share/icons/hicolor/256x256/apps/key.png
- makeWrapper ${jre}/bin/java $out/bin/KeY \
+ makeWrapper ${lib.getExe jre} $out/bin/KeY \
--add-flags "-cp $out/share/java/KeY.jar de.uka.ilkd.key.core.Main"
runHook postInstall
@@ -73,9 +76,10 @@ in stdenv.mkDerivation rec {
command = "KeY --help";
};
- meta = with lib; {
+ meta = {
description = "Java formal verification tool";
homepage = "https://www.key-project.org"; # also https://formal.iti.kit.edu/key/
+ changelog = "https://keyproject.github.io/key-docs/changelog/";
longDescription = ''
The KeY System is a formal software development tool that aims to
integrate design, implementation, formal specification, and formal
@@ -83,9 +87,9 @@ in stdenv.mkDerivation rec {
At the core of the system is a novel theorem prover for the first-order
Dynamic Logic for Java with a user-friendly graphical interface.
'';
- license = licenses.gpl2;
- maintainers = with maintainers; [ fgaz ];
- mainProgram = executable-name;
- platforms = platforms.all;
+ license = lib.licenses.gpl2Only;
+ maintainers = with lib.maintainers; [ fgaz fliegendewurst ];
+ mainProgram = "KeY";
+ platforms = jdk.meta.platforms;
};
}
diff --git a/pkgs/applications/science/logic/key/deps.json b/pkgs/applications/science/logic/key/deps.json
index 4d6dee8060f9..ab34aaffc29a 100644
--- a/pkgs/applications/science/logic/key/deps.json
+++ b/pkgs/applications/science/logic/key/deps.json
@@ -9,14 +9,58 @@
"ca/coglinc/javacc#ca.coglinc.javacc.gradle.plugin/2.4.0": {
"pom": "sha256-zmWjvt7VamHG21s6/cHApVuH6mvAewTxamaqn8DP2jw="
},
- "com/github/hierynomus/license-base#com.github.hierynomus.license-base.gradle.plugin/0.15.0": {
- "pom": "sha256-jWmQF6e7GyViPR4EGOKapRwtUYEHkgNaR8PG+hgMSXU="
+ "com/diffplug/durian#durian-collect/1.2.0": {
+ "jar": "sha256-sZTAuIAhzBFsIcHcdvScLB/hda9by3TIume527+aSMw=",
+ "pom": "sha256-i7diCGoKT9KmRzu/kFx0R2OvodWaVjD3O7BLeHLAn/M="
},
- "com/github/hierynomus/license-report#com.github.hierynomus.license-report.gradle.plugin/0.15.0": {
- "pom": "sha256-OIRMJK0goaid41C254nDEz3FeeD51kZSyQi9uCgwAxM="
+ "com/diffplug/durian#durian-core/1.2.0": {
+ "jar": "sha256-F+0KrLOjwWMjMyFou96thpTzKACytH1p1KTEmxFNXa4=",
+ "pom": "sha256-hwMg6QdVNxsBeW/oG6Ul/R3ui3A0b1VFUe7dQonwtmI="
},
- "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/7.1.0": {
- "pom": "sha256-mh4hygODDXleq/uKbALOM4QuvCPGd+xqqZ50W1FPKt4="
+ "com/diffplug/durian#durian-io/1.2.0": {
+ "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=",
+ "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4="
+ },
+ "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/6.16.0": {
+ "pom": "sha256-t7fpzal2JnrDlnQg2XKuFdCUKpaOAao/w001t4FqJB8="
+ },
+ "com/diffplug/spotless#spotless-lib-extra/2.36.0": {
+ "jar": "sha256-MZG1Gw6vUU0mzly9R+1gf9mrJj7QovAYqBkBYR+IbB4=",
+ "module": "sha256-8aXEkvFOqReh69NvxgccnJN2Zkla5crmxIo+Gk5ydWA=",
+ "pom": "sha256-nvcS3CwkJ9Hc7ZuCUwT2N2qsGrZbnW0weWVQaYqaJ5c="
+ },
+ "com/diffplug/spotless#spotless-lib/2.36.0": {
+ "jar": "sha256-X8YG5rHmDzRUljPq3WvjuL78W5phU4h1S2EpdShJ8W4=",
+ "module": "sha256-aPxoow80oNLAqh/z8l9Rq9OnJZFzX7cVR4YIARJjCCE=",
+ "pom": "sha256-XOa+58kXCmyUnZTvtzrRWbcBckyR3KT8kHWRfJ5aEMk="
+ },
+ "com/diffplug/spotless#spotless-plugin-gradle/6.16.0": {
+ "jar": "sha256-4O/38KyEdJg/vJLxYwLHgq8VZueixfHaSoyWB9pMKhs=",
+ "module": "sha256-kT7gdWRyP7wqf62KiHFJvk8TpM65u775lF6m9fZt0Po=",
+ "pom": "sha256-c2VdzN3MnbLEY9abWSaedUrpw8ueVIIiDc1DvsE1TKM="
+ },
+ "com/fasterxml#oss-parent/48": {
+ "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8="
+ },
+ "com/fasterxml/jackson#jackson-bom/2.14.1": {
+ "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw="
+ },
+ "com/fasterxml/jackson#jackson-parent/2.14": {
+ "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk="
+ },
+ "com/github/hierynomus/license-base#com.github.hierynomus.license-base.gradle.plugin/0.16.1": {
+ "pom": "sha256-zuCrwdtD5X8obbNr6sQIQoTNfdVuayPBU6zP9FGWYVw="
+ },
+ "com/github/hierynomus/license-report#com.github.hierynomus.license-report.gradle.plugin/0.16.1": {
+ "pom": "sha256-ff5nBsj74D0Gxq7ogsJxrEpR8aTQBxJlCJK4eYQhTYM="
+ },
+ "com/github/johnrengelman#shadow/8.1.1": {
+ "jar": "sha256-CEGXVVWQpTuyG1lQijMwVZ9TbdtEjq/R7GdfVGIDb88=",
+ "module": "sha256-nQ87SqpniYcj6vbF6c0nOHj5V03azWSqNwJDYgzgLko=",
+ "pom": "sha256-Mu55f8hDI3xM5cSeX0FSxYoIlK/OCg6SY25qLU/JjDU="
+ },
+ "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/8.1.1": {
+ "pom": "sha256-PLOIa5ffbgZvEIwxayGfJiyXw8st9tp4kn5kXetkPLA="
},
"com/google/guava#guava-jdk5/17.0": {
"jar": "sha256-Wb9FZUe23aPO2WjLVvfy0+FEdOLeKWCjLEfjHB5FbGE=",
@@ -25,6 +69,14 @@
"com/google/guava#guava-parent-jdk5/17.0": {
"pom": "sha256-WpYGvCdjKVazwR34h+mz54WFQGiqpOCAjtVmD2Cx+28="
},
+ "com/googlecode/concurrent-trees#concurrent-trees/2.6.1": {
+ "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=",
+ "pom": "sha256-Q8K5sULnBV0fKlgn8QlEkl0idH2XVrMlDAeqtHU4qXE="
+ },
+ "com/googlecode/javaewah#JavaEWAH/1.1.13": {
+ "jar": "sha256-TA/aKx0xd1DX6jJONscLK8SDEMCqrme5jfCRXWltcRE=",
+ "pom": "sha256-lyWx/pxoENl3dQu4RBXqEILEtIjUqDn5cEu09ej8F/Q="
+ },
"com/mycila#license-maven-plugin-parent/3.0": {
"pom": "sha256-DR8XPOud8hKSZ2Z8EMiR5eXXJm2C46hQcGaNtW2wy/o="
},
@@ -55,13 +107,21 @@
"jar": "sha256-zm+RPK0fDbOq1wGG1lxbx//Mmpnj/o4LE3MSgZ98Ni8=",
"pom": "sha256-0PLhbQVOi7l63ZyiZSXrI0b2koCfzSooeH2ozrPDXug="
},
- "gradle/plugin/com/github/johnrengelman#shadow/7.1.0": {
- "jar": "sha256-Bar4oiGwbGeS7hmZYZPolH7zv3Il6nWOUYsywoNxCJA=",
- "pom": "sha256-q7tz6sHPSyR/wBbmyohafaFjNk/vyYDICvjTy+jRSQI="
+ "gradle/plugin/com/hierynomus/gradle/plugins#license-gradle-plugin/0.16.1": {
+ "jar": "sha256-vTz8QElIBmJZ+vHfCRGMxU14s9VpaFSAi31bOzurpi0=",
+ "pom": "sha256-XHYxuV84us2anPOguyxUlADYH1qSt2YCSA6KSFgWptQ="
},
- "gradle/plugin/com/hierynomus/gradle/plugins#license-gradle-plugin/0.15.0": {
- "jar": "sha256-gpLVOVy+k7lGe/p64JgC70z9316oNexy6jxKahfw9ZY=",
- "pom": "sha256-IAmy13nhNo/tPGzHVwS58EVRv+3tFpk4F0ltrbtDyiw="
+ "io/fabric8#kubernetes-client-bom/5.12.2": {
+ "pom": "sha256-6qA8FpVlaNVKa6Q31J1Ay/DdjpOXf5hDGCQldrZQvDs="
+ },
+ "io/netty#netty-bom/4.1.86.Final": {
+ "pom": "sha256-EnFsH+ZM9b2qcETTfROq46iIIbkdR5hCDEanR2kXiv0="
+ },
+ "jakarta/platform#jakarta.jakartaee-bom/9.0.0": {
+ "pom": "sha256-kZA9Ddh23sZ/i5I/EzK6cr8pWwa9OX0Y868ZMHzhos4="
+ },
+ "jakarta/platform#jakartaee-api-parent/9.0.0": {
+ "pom": "sha256-9l3PFLbh2RSOGYo5D6/hVfrKCTJT3ekAMH8+DqgsrTs="
},
"org/apache#apache/10": {
"pom": "sha256-gC/uznKFLa/L0KQlpgNnxyxcubbqWq5ZSBEoVpGJ2vk="
@@ -75,22 +135,25 @@
"org/apache#apache/23": {
"pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw="
},
+ "org/apache#apache/27": {
+ "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk="
+ },
"org/apache#apache/4": {
"pom": "sha256-npMjomuo6yOU7+8MltMbcN9XCAhjDcFHyrHnNUHMUZQ="
},
"org/apache#apache/9": {
"pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0="
},
- "org/apache/ant#ant-launcher/1.10.11": {
- "jar": "sha256-2rUw33qYC1rI/X6NIIJDrg0+vW3gmxqiznVjYMwu0lY=",
- "pom": "sha256-7SoGiCYb624I7FSzgxLx1ILM8aO4Y8R9KNW5CkRtHB4="
+ "org/apache/ant#ant-launcher/1.10.13": {
+ "jar": "sha256-zXaVs7+2lkq3G2oLMdrWAAWud/5QITI2Rnmqzwj3eXA=",
+ "pom": "sha256-ApkvvDgFU1bzyU0B6qJJmcsCoJuqnB/fXqx2t8MVY8o="
},
- "org/apache/ant#ant-parent/1.10.11": {
- "pom": "sha256-V6BTJoLzD6MHQWoiWSnVcQrNpy17Je4IyvmNyCzTXbY="
+ "org/apache/ant#ant-parent/1.10.13": {
+ "pom": "sha256-blv8hwgiFD8f+7LG8I7EiHctsxSlKDMC9IFLEms0aTk="
},
- "org/apache/ant#ant/1.10.11": {
- "jar": "sha256-iMC4m7uq4B4Nn8rpO+eS9au+NAkQb47uhY/fNl28B1Q=",
- "pom": "sha256-wiiU2ctGq/XOv27rK8z+TXjhju6jEaDqat3VnftLH+M="
+ "org/apache/ant#ant/1.10.13": {
+ "jar": "sha256-vvv8eedE6Yks+n25bfO26C3BfSVxr0KqQnl2/CIpmDg=",
+ "pom": "sha256-J5NR7tkLj3QbtIyVvmHD7CRU48ipr7Q7zB0LrB3aE3o="
},
"org/apache/commons#commons-collections4/4.1": {
"jar": "sha256-sf6LWWi1fYRlQlNX7S2dxpVQRRi+0t9bVlxLjmjByKU=",
@@ -122,19 +185,22 @@
"jar": "sha256-h4Czu7Mah5fnTp8wIvBD3a3Crui+Y9lPgIKmoWVGxBs=",
"pom": "sha256-SPll6CQtvwF4bQqS0K1j4gogHUpTbgMh0DsQ0uDJgVM="
},
- "org/apache/logging#logging-parent/3": {
- "pom": "sha256-djouwrgJTUFh3rbCZLEmIIW5vjC/OjHCzhNyQuV3Iqc="
+ "org/apache/logging#logging-parent/7": {
+ "pom": "sha256-5YkR3J/GsXOhDlqp7bk8eZStBmAnBd0Gftz8bh6eFys="
},
- "org/apache/logging/log4j#log4j-api/2.17.1": {
- "jar": "sha256-sNikyKtPuLGIjQCVgicDsObUeTxBlVAgPanmkZYWHeQ=",
- "pom": "sha256-HirO8yILKb4QrgmXKLFYsY2UP5Ghk8xFAbtC+SnB6Io="
+ "org/apache/logging/log4j#log4j-api/2.20.0": {
+ "jar": "sha256-L0PupnnqZvFMoPE/7CqGAKwST1pSMdy034OT7dy5dVA=",
+ "pom": "sha256-zUWDKj1s0hlENcDWPKAV8ZSWjy++pPKRVTv3r7hOFjc="
},
- "org/apache/logging/log4j#log4j-core/2.17.1": {
- "jar": "sha256-yWfyI0h5gLk2TpSnx/mooB/T7nwZvb8LD5+MuFEfPUE=",
- "pom": "sha256-C7s79tTSKhv6PDwJJ8KUEK8UoPsm47Ark3JvXH6Yqv0="
+ "org/apache/logging/log4j#log4j-bom/2.20.0": {
+ "pom": "sha256-+LtpLpWmt72mAehxAJWOg9AGG38SMlC2gSiUOhlenaE="
},
- "org/apache/logging/log4j#log4j/2.17.1": {
- "pom": "sha256-lnq8AkRDqcsJaTVVmvXprW8P9hN1+Esn1EDS+nCAawk="
+ "org/apache/logging/log4j#log4j-core/2.20.0": {
+ "jar": "sha256-YTffhIza7Z9NUHb3VRPGyF2oC5U/TnrMo4CYt3B2P1U=",
+ "pom": "sha256-3nGsEAVR9KB3rsrQd70VPnHfeqacMELXZRbMXM4Ice4="
+ },
+ "org/apache/logging/log4j#log4j/2.20.0": {
+ "pom": "sha256-mje0qPZ+jUG8JHNxejAhYz1qPD8xBXnbmtC+PyRlnGk="
},
"org/apache/maven#maven-parent/21": {
"pom": "sha256-/EWviRHqMH0bV1ZO7x94tpgB6cEaVhnn61jV0Arp244="
@@ -150,6 +216,9 @@
"org/apache/maven#maven/3.0.4": {
"pom": "sha256-TSI+AaZWnWZVwfT86Elp1FFCzbq9sRjqCMXIwz7GMvY="
},
+ "org/codehaus/groovy#groovy-bom/3.0.14": {
+ "pom": "sha256-JODptzjecRjennNWD/0GA0u1zwfKE6fgNFnoi6nRric="
+ },
"org/codehaus/plexus#plexus-component-annotations/1.5.5": {
"jar": "sha256-Tfemp75ks1u8z2C1wRVpf56jQh0iZ0rmcTXd43X8yh8=",
"pom": "sha256-gV8+wxa4xfpwE4X99ACb+1HgfXgOj2puKv5yDFLX4pI="
@@ -171,9 +240,12 @@
"jar": "sha256-i5CfTKl4hkeUL4g9TlWbzGQhI/fGvNOEaYOi5GVGnDM=",
"pom": "sha256-/drU+mLIIxCuxDUl5RnNWfJ9BMdWn+IbGwPKIQiHgQw="
},
- "org/codehaus/plexus#plexus-utils/3.4.1": {
- "jar": "sha256-UtheBLORhyKvEdEoVbSoJX35ag52yPTjhS5vqoUfNXs=",
- "pom": "sha256-sUTP+bHGJZ/sT+5b38DzYNacI6vU6m5URTOpSbaeNYI="
+ "org/codehaus/plexus#plexus-utils/3.5.1": {
+ "jar": "sha256-huAlXUyHnGG0gz7X8TEk6LtnnfR967EnMm59t91JoHs=",
+ "pom": "sha256-lP9o7etIIE0SyZGJx2cWTTqfd4oTctHc4RpBRi5iNvI="
+ },
+ "org/codehaus/plexus#plexus/10": {
+ "pom": "sha256-u6nFIQZLnKEyzpfMHMfrSvwtvjK8iMuHLIjpn2FiMB8="
},
"org/codehaus/plexus#plexus/2.0.6": {
"pom": "sha256-vqEudHcI0l5zQQyhxzHr36EC6L227H2BvUUiWDsjS8w="
@@ -181,56 +253,59 @@
"org/codehaus/plexus#plexus/2.0.7": {
"pom": "sha256-K1kGIDCrChXF0Jd7oiQhcGNokmSIc5pl8leT5xXMinQ="
},
- "org/codehaus/plexus#plexus/8": {
- "pom": "sha256-/6NJ2wTnq/ZYhb3FogYvQZfA/50/H04qpXILdyM/dCw="
+ "org/eclipse/ee4j#project/1.0.6": {
+ "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0="
},
- "org/jdom#jdom2/2.0.6": {
- "jar": "sha256-E0XxG6YG0VYD1nQFUajCGUfAIVZAdw7GcnH+eL6pfPU=",
- "pom": "sha256-R7I6ef4za3QbgkNMbgSdaBZSVuQF51wQkh/XL6imXY0="
+ "org/eclipse/jetty#jetty-bom/9.4.50.v20221201": {
+ "pom": "sha256-TN5uUz1gHq+LZazulWt3BsGBkvJ1XQI9fo0Zu31bOUM="
+ },
+ "org/eclipse/jgit#org.eclipse.jgit-parent/6.4.0.202211300538-r": {
+ "pom": "sha256-WEE7RzI80aRWLJNcZy1VGVUruaYRuQP8igcwXlQ7icU="
+ },
+ "org/eclipse/jgit#org.eclipse.jgit/6.4.0.202211300538-r": {
+ "jar": "sha256-wUh5ierbU71YpHty+waWNjl7uN/t8hOHpAqGw+ey+qw=",
+ "pom": "sha256-9ja7QmqoCtQGzr1zKrEXw9cHLBFsupggIYRSnO+mnFY="
+ },
+ "org/jdom#jdom2/2.0.6.1": {
+ "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=",
+ "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M="
},
"org/junit#junit-bom/5.7.2": {
"module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=",
"pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs="
},
- "org/ow2#ow2/1.5": {
- "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs="
+ "org/junit#junit-bom/5.9.1": {
+ "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=",
+ "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw="
},
- "org/ow2/asm#asm-analysis/9.2": {
- "jar": "sha256-h4++UhcxwHLRTS1luYOxvq5q0G/aAAe2qLroH3P0M8Q=",
- "pom": "sha256-dzzBor/BTGxKl5xRoHXAI0oL9pT8Or5PrPRU83oUXxs="
+ "org/ow2#ow2/1.5.1": {
+ "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
},
- "org/ow2/asm#asm-commons/9.2": {
- "jar": "sha256-vkzlMTiiOLtSLNeBz5Hzulzi9sqT7GLUahYqEnIl4KY=",
- "pom": "sha256-AoJOg58qLw5ylZ/dMLSJckDwWvxD3kLXugsYQ3YBwHA="
+ "org/ow2/asm#asm-commons/9.4": {
+ "jar": "sha256-DBKKnsPzPJiVknL20WzxQke1CPWJUVdLzb0rVtYyY2Q=",
+ "pom": "sha256-tCyiq8+IEXdqXdwCkPIQbX8xP4LHiw3czVzOTGOjUXk="
},
- "org/ow2/asm#asm-tree/9.2": {
- "jar": "sha256-qr+b0jCRpOv8EJwfPufPPkuJ9rotP1HFJD8Ws8/64BE=",
- "pom": "sha256-9h8+vqVSDd8Z9FKwPEJscjG92KgdesKHZctScSJaw3g="
+ "org/ow2/asm#asm-tree/9.4": {
+ "jar": "sha256-xC1HnPJFZqIesgr37q7vToa9tKiGMGz3L0g7ZedbKs8=",
+ "pom": "sha256-x+nvk73YqzYwMs5TgvzGTQAtbFicF1IzI2zSmOUaPBY="
},
- "org/ow2/asm#asm/9.2": {
- "jar": "sha256-udT+TXGTjfOIOfDspCqqpkz4sxPWeNoDbwyzyhmbR/U=",
- "pom": "sha256-37EqGyJL8Bvh/WBAIEZviUJBvLZF3M45Xt2M1vilDfQ="
+ "org/ow2/asm#asm/9.4": {
+ "jar": "sha256-OdDis9xFr2Wgmwl5RXUKlKEm4FLhJPk0aEQ6HQ4V84E=",
+ "pom": "sha256-SDdR5I+y0fQ8Ya06sA/6Rm7cAzPY/C/bWibpXTKYI5Q="
},
- "org/sonarqube#org.sonarqube.gradle.plugin/3.0": {
- "pom": "sha256-1Pg7ynlN6ZPv/gtqt/HO572zNJgWc4BVkHgvv6Mj420="
+ "org/slf4j#slf4j-api/1.7.30": {
+ "jar": "sha256-zboHlk0btAoHYUhcax6ML4/Z6x0ZxTkorA1/lRAQXFc=",
+ "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ="
},
- "org/sonarsource/parent#parent/54": {
- "pom": "sha256-QVl5Y/x9ObDgJArLTYT1dbQCQtbhR9xQsCbUzvwFMV8="
- },
- "org/sonarsource/scanner/api#sonar-scanner-api-parent/2.15.0.2182": {
- "pom": "sha256-JcR02YT0wD5P147u53D0Pqks+5Xrixf3+qyFVpNgFoY="
- },
- "org/sonarsource/scanner/api#sonar-scanner-api/2.15.0.2182": {
- "jar": "sha256-h+foNKu97912pce/pM7ztxUhsfVQ/Iu+qLCphVPjNeg=",
- "pom": "sha256-H+gEKIHd2qgREtNNv0k30OM+TQFYYIJ7/R/fb0YLH9U="
- },
- "org/sonarsource/scanner/gradle#sonarqube-gradle-plugin/3.0": {
- "jar": "sha256-KLTNnuKtiAHAxeXJhPNtLizGDRkhwC61jujORTpejb8=",
- "pom": "sha256-2jJNuKvT65d8B0lY/9E4vdVTWwYojfN7WiRv53Uad7Y="
+ "org/slf4j#slf4j-parent/1.7.30": {
+ "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U="
},
"org/sonatype/forge#forge-parent/4": {
"pom": "sha256-GDjRMkeQBbS3RZt5jp2ZFVFQkMKICC/c2G2wsQmDokw="
},
+ "org/sonatype/oss#oss-parent/5": {
+ "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0="
+ },
"org/sonatype/oss#oss-parent/7": {
"pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
},
@@ -253,12 +328,16 @@
"jar": "sha256-AUp7IdtoD9iGfgJrGMO/idME3sWyEJCotqezy1z8d9I=",
"pom": "sha256-8xqLb1m2oBgOOMnBKboGB7rnoNShC5U3V3DIFKtMx1M="
},
+ "org/springframework#spring-framework-bom/5.3.24": {
+ "module": "sha256-GZbh9hfLA/p26hGFD+Kh4gsOMKEEa6bV2zvbv0QRP84=",
+ "pom": "sha256-U1ITVmu77+Jjag1OjdGnOt5hLiQwyP/TENzCo7O5ukE="
+ },
"org/springframework#spring-parent/3.1.3.RELEASE": {
"pom": "sha256-ZOkRARj4KhQnWaMW0J09jY1xfV2VB51/aziO5Hn6eC8="
},
- "org/vafer#jdependency/2.7.0": {
- "jar": "sha256-1j79V0b/QIlDp91++Frp8Jqn+2O7KxaRFCfObEW1n9A=",
- "pom": "sha256-6yRCKwo+nofVrG6oCHeG+1HEsbvg0iXvdSFSxzaiBNA="
+ "org/vafer#jdependency/2.8.0": {
+ "jar": "sha256-v9LMfhv8eKqDtEwKVL8s3jikOC7CRyivaD2Y3GvngZI=",
+ "pom": "sha256-EBhn8/npJlei74mjELYE1D0JDJuQqj4LBS3NFqO78y0="
}
},
"https://repo.maven.apache.org/maven2": {
@@ -266,109 +345,242 @@
"jar": "sha256-iPvaS5Ellrn1bo4S5YDMlUus+1F3bs/d0+GPwc9W3Ew=",
"pom": "sha256-EA95O6J/i05CBO20YXHr825U4PlM/AJSf+oHoLsfzrc="
},
- "com/atlassian/commonmark#commonmark-ext-gfm-tables/0.15.2": {
- "jar": "sha256-Wn3BAWFAwPHGnFV21kvjcYJcWlStc1sMaZuWLMTgpPo=",
- "pom": "sha256-rRZxS5MgMZDpRiSFMrWCkDdBQkg7RhdrsD3CrijycN0="
+ "backport-util-concurrent#backport-util-concurrent/3.1": {
+ "jar": "sha256-9XWbf838g6UloDbe7cvTLltTa2JevCgkJvFsoTfrWQI=",
+ "pom": "sha256-dwRxCQykChe55DbuLsAIGb5CBC2m9Ahezh03kW3Aj/k="
},
- "com/atlassian/commonmark#commonmark-parent/0.15.2": {
- "pom": "sha256-PhTratCeeq+Uow5I3kexFm+QCz6Ncm+UfMWkD3HkfCU="
+ "ch/qos/logback#logback-classic/1.4.8": {
+ "jar": "sha256-5tnBIIv2ZMQnufX+lwuDcveUJHRzaTw/XSRA+mt7tSc=",
+ "pom": "sha256-GOI+XJts04m55gnu7km1XRURtdE6g+/2peAFAJPYadk="
},
- "com/atlassian/commonmark#commonmark/0.15.2": {
- "jar": "sha256-/UmFBUzWYXaB9smSH/yTq2uGQraeV3T48InZc9HGbmo=",
- "pom": "sha256-3ZVTaHcyCDS90YRnvtbgKE7UhXKdU8LcLfWEE2vmGaI="
+ "ch/qos/logback#logback-core/1.4.8": {
+ "jar": "sha256-EjRTFCtBtie8DQNdH+6MHtTer6z72svjojiTTBmgYno=",
+ "pom": "sha256-njguj3OLVBiXfjwQwcFZJuXwHn1QDVHZmqpQxqSerMw="
},
- "com/atlassian/pom#base-pom/5.0.13": {
- "pom": "sha256-CN0hBF/fYQSL7zj/7FbiHuslxuLYRPwJ9rlW4JNzdUM="
+ "ch/qos/logback#logback-parent/1.4.8": {
+ "pom": "sha256-83hJR2Jabz7XbSgtoOIuYVJ/kOfvllGm1ezx0mwY2mY="
},
- "com/atlassian/pom#central-pom/5.0.13": {
- "pom": "sha256-zihFbTZlB8oPkQIpQqBeOI/Zj4YqbY2zEFxcRJenTOU="
+ "com/beust#jcommander/1.48": {
+ "jar": "sha256-pzE/z94HCTDkDsee3zxZSM805PDSXLOgn5lj2L3YQRM=",
+ "pom": "sha256-EH4aAn6KszS4H7KJYGDba68y430uME5glCNtPn6ymQM="
},
"com/google/code/findbugs#jsr305/3.0.2": {
"jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
"pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
},
- "com/ibm/icu#icu4j/58.2": {
- "jar": "sha256-lT4eg7K+fD6i+I2obBNhT0fp5x01eMhSHX8Yd1a2OWI=",
- "pom": "sha256-R7Zq1yxypJmlRL57ixEzX2xz/bcyFxfRGBHfs+k0FGo="
+ "com/google/code/gson#gson-parent/2.8.9": {
+ "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s="
},
- "com/miglayout#miglayout-core/5.2": {
- "jar": "sha256-Zp8NqP12vlPXX1lA9IFibym1RM2ZJbfaJhEYfSaEvHo=",
- "pom": "sha256-scvva6qqt3IaCLKlAZtpajfV4+wKfQzXmRo4MOJrfGA="
+ "com/google/code/gson#gson/2.8.9": {
+ "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=",
+ "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4="
},
- "com/miglayout#miglayout-parent/5.2": {
- "pom": "sha256-+STS0Cl2vIQu0u/4sx4Hp2Zb/NJUY9TXmtvkEFis6Zs="
+ "com/google/errorprone#error_prone_annotations/2.11.0": {
+ "jar": "sha256-chy5GEK0b6BWhH0QTVIlyLjh6LYiY7mTBR4eWgE3t+w=",
+ "pom": "sha256-AmHKAfLS6awq4uznXULFYyOzhfspS2vJQ/Yu9Okt3wg="
},
- "com/miglayout#miglayout-swing/5.2": {
- "jar": "sha256-g2n2guoVPvtoGj9YKsxIjoKpfub0fSU1LwgOl38TjIY=",
- "pom": "sha256-52Q1kq9JpxIUc+OUOzdO3Xw/u5zJBdDGq5DOcCvkQqE="
+ "com/google/errorprone#error_prone_parent/2.11.0": {
+ "pom": "sha256-goPwy0TGJKedMwtv2AuLinFaaLNoXJqVHD3oN9RUBVE="
},
- "com/sun/activation#all/1.2.0": {
- "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ="
+ "com/google/guava#failureaccess/1.0.1": {
+ "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=",
+ "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk="
},
- "javax/activation#javax.activation-api/1.2.0": {
- "jar": "sha256-Q/3vC1ts6zGwQksgi5MMdKtY+sLO63s/b9OuuLXKQ5M=",
- "pom": "sha256-2ikm88i+iYZDzBCs3sbeCwNRpX+yc1dw+gF3sGrecbk="
+ "com/google/guava#guava-parent/26.0-android": {
+ "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ="
},
- "javax/xml/bind#jaxb-api-parent/2.4.0-b180830.0359": {
- "pom": "sha256-ctEy4shY0iMPFdBI8ek6J5xAxOnshLxW+fLz61r0tLg="
+ "com/google/guava#guava-parent/31.1-jre": {
+ "pom": "sha256-RDliZ4O0StJe8F/wdiHdS7eWzE608pZqSkYf6kEw4Pw="
},
- "javax/xml/bind#jaxb-api/2.4.0-b180830.0359": {
- "jar": "sha256-VrnpcCdTdjAHQ1Fi6niAVe/P78hquSDwMsBBHcVHuDY=",
- "pom": "sha256-sck/wwHX9f5M3hPRlTKZJR2jfv/8kfUjg1UEw/+HNwc="
+ "com/google/guava#guava/31.1-jre": {
+ "jar": "sha256-pC7cnKt5Ljn+ObuU8/ymVe0Vf/h6iveOHWulsHxKAKs=",
+ "pom": "sha256-kZPQe/T2YBCNc1jliyfSG0TjToDWc06Y4hkWN28nDeI="
},
- "junit#junit/4.12": {
- "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=",
- "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ="
+ "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": {
+ "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
+ "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s="
},
- "net/java#jvnet-parent/1": {
- "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78="
+ "com/google/j2objc#j2objc-annotations/1.3": {
+ "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=",
+ "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU="
},
- "net/java#jvnet-parent/3": {
- "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o="
+ "com/ibm/icu#icu4j/72.1": {
+ "jar": "sha256-PfVyskCmjRO1zXeK0jk+iF0mQRQ0zY8JisWYfqLmTOM=",
+ "pom": "sha256-Pe8rKa9KGa2AXLFTBWklqJqQP5L77hre4S7S/BTETug="
},
- "net/java#jvnet-parent/5": {
- "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo="
+ "com/miglayout#miglayout-core/11.1": {
+ "jar": "sha256-6qoDeHmJuuyi1xVYVFL3oWTYydUFkXcx6Zm0+ODZywQ=",
+ "pom": "sha256-TDxDWInIEEIAP7RqrD9Q1DqjNHCgJTaEEpFY+FmFu8I="
+ },
+ "com/miglayout#miglayout-parent/11.1": {
+ "pom": "sha256-vLy8hQYQqWkqV1US2xVPt+YMuXUrMzNKLeaqFZFP2xE="
+ },
+ "com/miglayout#miglayout-swing/11.1": {
+ "jar": "sha256-U8pq8ys32FhvuVCHZeJy30ry2Q5NWewMx/6+Jp0W2f0=",
+ "pom": "sha256-si//ijUkv+cV545/Ze+Fv1H9jGry06FmZxfEsWt6yh4="
+ },
+ "com/puppycrawl/tools#checkstyle/10.6.0": {
+ "jar": "sha256-MTe8hcSBsytp9K2S0grpnZ0VKBFXwCG2VBpNup2TPBY=",
+ "pom": "sha256-i/a3N1So+iHuzZCN8/HWbYcEWSnHWXdvoGQMTeiKnWg="
+ },
+ "commons-beanutils#commons-beanutils/1.9.4": {
+ "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=",
+ "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA="
+ },
+ "commons-codec#commons-codec/1.15": {
+ "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=",
+ "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g="
+ },
+ "commons-collections#commons-collections/3.2.2": {
+ "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=",
+ "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws="
+ },
+ "info/picocli#picocli/4.7.0": {
+ "jar": "sha256-P2/7EM6FPvL2+TS0Z8zBPJwXCLTYOhpWZP2wfgeOjhw=",
+ "pom": "sha256-TeCd0zhFd9Vzo9lP85jNe4SUbEJkDzhSva2X9yl0YXQ="
+ },
+ "junit#junit/4.13.2": {
+ "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
+ "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
},
"net/java/dev/javacc#javacc/4.0": {
"jar": "sha256-z7qy1qzbN2TivLXAhCpZ9YPLXoui61wTqNuYNoqtzC8=",
"pom": "sha256-EBLeGTH+yhXhvQEomKaJBOXTO7TD6IhY+oagD7ePUDg="
},
+ "net/sf/retrotranslator#retrotranslator-runtime/1.2.9": {
+ "jar": "sha256-MHP6KzurGu5vBh7UqsUW3rmBh1az8znwWcyqmR/3dr0=",
+ "pom": "sha256-zKjdRXVKkGTSF0AxCUvz10Jc1nA76raZ19UjXC6S6Es="
+ },
+ "net/sf/retrotranslator#retrotranslator-transformer/1.2.9": {
+ "jar": "sha256-wcxGUGx4UV6dolMIBmz2U7qhuFL/Dnc29OhEWiwHhPc=",
+ "pom": "sha256-KbLlw9y352qBi+z9RBRnOvKgijjwWEEdpKxEbJyGfKA="
+ },
+ "net/sf/saxon#Saxon-HE/11.4": {
+ "jar": "sha256-QuNUlNwua16XJWrnzfK3zjBDnDUlZvNd4CvtOgaisWk=",
+ "pom": "sha256-zE2jTuC+5MZa2118spI0H2Wb76NSiPbjH4CdxLsvxXU="
+ },
+ "net/sourceforge/pmd#pmd-core/6.53.0": {
+ "jar": "sha256-TVRzW5uBXPrajO2Q3xneEmPJSXzOL5yXzXnPTeam0vM=",
+ "pom": "sha256-DDv8WArk966DtWEHdjjmirehC+BXeaEYG61upVqI5PQ="
+ },
+ "net/sourceforge/pmd#pmd-java/6.53.0": {
+ "jar": "sha256-1BIi8MXToBGU7Ryo5AAhKile4kmhmTZt7eDVd9pP6YE=",
+ "pom": "sha256-RWJKAFxNxC2McmSoXq79nbQautiJdcGRqLmJ8J78LxQ="
+ },
+ "net/sourceforge/pmd#pmd/6.53.0": {
+ "pom": "sha256-cCgPCSb7ENqySs3TsuGekorZ2iLZym4dL5a+aP6oPf0="
+ },
+ "net/sourceforge/saxon#saxon/9.1.0.8": {
+ "jar": "sha256-89zegQZsddtP/KNB1UNVXbu7p//3um0cLn3hEB3qOUo=",
+ "pom": "sha256-mwd5+pbfKagzvOMhjo25zAGGNgWy9zrePTCM4ff3kXk="
+ },
+ "net/sourceforge/saxon#saxon/9.1.0.8/dom": {
+ "jar": "sha256-xs8+zH9LZauLYT0A/Z6cBkilqgMmSpQboP0tpTOfkXo="
+ },
"org/abego/treelayout#org.abego.treelayout.core/1.0.3": {
"jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=",
"pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw="
},
- "org/antlr#ST4/4.0.8": {
- "jar": "sha256-WMqrxAyfdLC1mT/YaOD2SlDAdZCU5qJRqq+tmO38ejs=",
- "pom": "sha256-PAiQ3scRdOs7o9QEyp40GQH/awQhgIsAcTsNuxMGwXw="
+ "org/antlr#ST4/4.3.1": {
+ "jar": "sha256-68nZvNtnVxwINf9EHq1cHekKJaDT+oQGVKFE6PoEENQ=",
+ "pom": "sha256-CzHPgFtmQ/oI9z3jibxVsCj++46caL1EfGFoz/32GcU="
},
- "org/antlr#antlr-master/3.5.2": {
- "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y="
+ "org/antlr#ST4/4.3.4": {
+ "jar": "sha256-+SesOExG10n4texolypTrtIeADE1CSmWFu23O/oV/zM=",
+ "pom": "sha256-nnwfPkiZGUQOjBMInlljcp1bf4D3AjO/uuMJxkmryj4="
},
- "org/antlr#antlr-runtime/3.5.2": {
- "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=",
- "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU="
+ "org/antlr#antlr-master/3.5.3": {
+ "pom": "sha256-6p43JQ9cTC52tlOL6XtX8zSb2lhe31PzypfiB7OFuJU="
},
- "org/antlr#antlr/3.5.2": {
- "jar": "sha256-WsNsKs+woPPTfa/iC1tXDyZD4tAAxkjURQPCc4vmQ98=",
- "pom": "sha256-Bl5egGYv64WHldPAH3cUJHvdMZRZcF7hOxpLGWj6IuQ="
+ "org/antlr#antlr-runtime/3.5.3": {
+ "jar": "sha256-aL+fWjPfyzQDNJXFh+Yja+9ON6pmEpGfWx6EO5Bmn7k=",
+ "pom": "sha256-EymODgqvr0FP99RAZCfKtuxPv6NkJ/bXEDxDLzLAfSU="
},
- "org/antlr#antlr4-master/4.7.1": {
- "pom": "sha256-QSb2e/QT9si8wbGdh7mnJWdCz6ccJQxKmVMNrt6ghow="
+ "org/antlr#antlr/3.5.3": {
+ "jar": "sha256-0KgZr929g3snhknrf/F7FSWdWsxJxYr2FPA0aKKRvXw=",
+ "pom": "sha256-lrg9SYzpdAOxtWgeV4Aaqbt74w6QWHMsyicf4GvJ2B8="
},
- "org/antlr#antlr4-runtime/4.7.1": {
- "jar": "sha256-Q1FtGb6uNZCeBNBq9sDFjBe8lOAHDIXo3JkpymQNyR0=",
- "pom": "sha256-zhOGobkOUSy3oli1Ih1C8RJh/9qaElkBzdhs3ypZ/5E="
+ "org/antlr#antlr4-master/4.11.1": {
+ "pom": "sha256-cupd6Nq7ZhV4X9D+qqur1T3NrnD+FrzXx7lobApuAK0="
},
- "org/antlr#antlr4/4.7.1": {
- "jar": "sha256-os3C8vjriTcogyVo3FTQgOtaFJXts7ZuUblxIqYKDYc=",
- "pom": "sha256-k+AkX5wHQx6tBunpyPmO7IJUQb9PbtZr3aboypxoR5Y="
+ "org/antlr#antlr4-master/4.13.0": {
+ "pom": "sha256-IiBv17pJUVLlJvUO/sn8j03QX8tD38+PJk6Dffa2Qk8="
},
- "org/glassfish#javax.json/1.0.4": {
- "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=",
- "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ="
+ "org/antlr#antlr4-master/4.7.2": {
+ "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE="
},
- "org/glassfish#json/1.0.4": {
- "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY="
+ "org/antlr#antlr4-runtime/4.11.1": {
+ "jar": "sha256-4GxlU8HMwU02BS7EsPxvE7gIz5V7Wx3D9hv0AZlq2lk=",
+ "pom": "sha256-xFbsKVkHjFkfvX72mtlACnJ5IAaNdGmJx0q4BO1oGzQ="
+ },
+ "org/antlr#antlr4-runtime/4.13.0": {
+ "jar": "sha256-vX97XQe8CwR/EJFbMspLsd6eV9gEkJiILkRTyIwHal0=",
+ "pom": "sha256-GY40+1rHWXsaPDGTAwHgjOlB5cpQQRbdVKOnU3iRSn8="
+ },
+ "org/antlr#antlr4-runtime/4.7.2": {
+ "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=",
+ "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs="
+ },
+ "org/antlr#antlr4/4.13.0": {
+ "jar": "sha256-HA3rJpklFJIvuLmWGRmPCcMveYQkbcatHDu8SYPeHTU=",
+ "pom": "sha256-OdLSWEk8QnvL1EAGP34PQqt4j6wVp4wP73RK5hk2d8k="
+ },
+ "org/apache#apache/16": {
+ "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4="
+ },
+ "org/apache#apache/19": {
+ "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8="
+ },
+ "org/apache#apache/23": {
+ "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw="
+ },
+ "org/apache/commons#commons-lang3/3.8.1": {
+ "jar": "sha256-2sgH9lsHaY/zmxsHv+89h64/1G2Ru/iivAKyqDFhb2g=",
+ "pom": "sha256-7I4J91QRaFIFvQ2deHLMNiLmfHbfRKCiJ7J4vqBEWNU="
+ },
+ "org/apache/commons#commons-parent/39": {
+ "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac="
+ },
+ "org/apache/commons#commons-parent/47": {
+ "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc="
+ },
+ "org/apache/commons#commons-parent/52": {
+ "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4="
+ },
+ "org/apache/httpcomponents#httpcomponents-parent/12": {
+ "pom": "sha256-QgnwlZMhKYfCnWgBkXMJ3V5vcbU7Kx0ODw77mErRH6E="
+ },
+ "org/apache/httpcomponents/client5#httpclient5-parent/5.1.3": {
+ "pom": "sha256-onsUE67OkqOqR3SRX3WJ4MYXnXKNKsailddY7k+iTMU="
+ },
+ "org/apache/httpcomponents/client5#httpclient5/5.1.3": {
+ "jar": "sha256-KMdZJU9ONTGeB4u2/+p1Z2YI3BLLJDsk+zyHMlIpd/4=",
+ "pom": "sha256-GYirPRva4PUfIsg9yXuI+gdWGttiRGedi49xRs3ROq8="
+ },
+ "org/apache/httpcomponents/core5#httpcore5-h2/5.1.3": {
+ "jar": "sha256-0OeLoVqo6+d5grZgrEsJqV1uA129vqdiV33ByOKTWAc=",
+ "pom": "sha256-K8AxehSO3Jrv6j7BU1OU787T0TfWL3/1ZW0LA/lMB4Y="
+ },
+ "org/apache/httpcomponents/core5#httpcore5-parent/5.1.3": {
+ "pom": "sha256-pnU4hlrg83RLIekcpH1GEFRzfFUtH/KdpxTIYMmS1bs="
+ },
+ "org/apache/httpcomponents/core5#httpcore5/5.1.3": {
+ "jar": "sha256-8r8vLHdyFpyeMGmXGWZ60w+bRsTp14QZB96y0S2ZI/4=",
+ "pom": "sha256-f8K4BFgJ8/J6ydTZ6ZudNGIbY3HPk8cxPs2Epa8Om64="
+ },
+ "org/apiguardian#apiguardian-api/1.1.2": {
+ "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",
+ "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
+ "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
+ },
+ "org/beanshell#bsh/1.3.0": {
+ "jar": "sha256-mwTtx10Z21TxtOi1NV6TZDhMbPcesKG5ckwVnXeYefg=",
+ "pom": "sha256-DyaKBXFp+qO6hALh+8K54K4Z3voYt+xeC+hSvLoGgp0="
+ },
+ "org/checkerframework#checker-qual/3.27.0": {
+ "jar": "sha256-Jf2m8+su4hOf9dfTmSZn1Sbr8bD7h982/HWqNWeebas=",
+ "module": "sha256-H1L7VyqCR4PvVyPW0LejEUOz2JKpQerXur4OH/kWM30=",
+ "pom": "sha256-yXIt1Co1ywpkPGgAoo2sf8UXbYDkz2v4XBgjdzFjOrk="
},
"org/hamcrest#hamcrest-core/1.3": {
"jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
@@ -377,11 +589,100 @@
"org/hamcrest#hamcrest-parent/1.3": {
"pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
},
+ "org/javassist#javassist/3.28.0-GA": {
+ "jar": "sha256-V9Cp6ShvgvTqqFESUYaZf4Eb784OIGD/ChWnf1qd2ac=",
+ "pom": "sha256-w2p8E9o6SFKqiBvfnbYLnk0a8UbsKvtTmPltWYP21d0="
+ },
+ "org/junit#junit-bom/5.9.3": {
+ "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=",
+ "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc="
+ },
+ "org/junit/jupiter#junit-jupiter-api/5.9.3": {
+ "jar": "sha256-2JXj7t9PobEN4xqRvlWjAbswe/GO8yWz+l2z+A7pLRw=",
+ "module": "sha256-ba7jABTiBFWh7MbW0LOsYERECtE+9CA5jikZCYDpuHo=",
+ "pom": "sha256-f3KVZWK+1JEdMhf5DeCw0kDdklb4V99aJLvrAVS0FBs="
+ },
+ "org/junit/jupiter#junit-jupiter-engine/5.9.3": {
+ "jar": "sha256-tV4wSxzS6PEWwat3pdw+yoxNm0amnghLY6ylHN61Xw8=",
+ "module": "sha256-lY9TIPRbNNCmZ24W/1ScsBDhQm3KUs/bEFh2vM9Pdog=",
+ "pom": "sha256-D1/XZ2n95tJHMI+Dbf8TTItS9lpC5UuNCtoEFvMKc3o="
+ },
+ "org/junit/jupiter#junit-jupiter-params/5.9.3": {
+ "jar": "sha256-KvKC/pHlZJXAO4TpyucC6qIS/C9qMf2deeMcy2TNgf0=",
+ "module": "sha256-PDb9BY560Xk2w2qHkaXvks06slUbsVsYngURPhaA848=",
+ "pom": "sha256-HAzCQ766eIZChiVLRVKqvNUXrMMiAAJjaRxBUl/HtfY="
+ },
+ "org/junit/platform#junit-platform-commons/1.9.3": {
+ "jar": "sha256-hRkVffgTwhDoX8FBS3QQnj2F9D1wklY+1wTEPEjw1eY=",
+ "module": "sha256-eWpB8nJB+2dgjwGazPTBw2cVe3MjinavhvbeuuNZnrQ=",
+ "pom": "sha256-4Xof3keC8vwjtC3sp1wLBWbVwphQ0DBr5lxdpzuAIXg="
+ },
+ "org/junit/platform#junit-platform-engine/1.9.3": {
+ "jar": "sha256-DDlVPZoDUQdXIn9aHGzGUwKHsaMh7WJYRQZkh0qioWo=",
+ "module": "sha256-nQVThnLcRrITlxJjbv3B8Xg9Q5qhwktp0Ckrgci36o8=",
+ "pom": "sha256-HFq3/OvjpgEYOXm6r78vQOVUOIKnyiPp+etxkZWnR9U="
+ },
+ "org/junit/vintage#junit-vintage-engine/5.9.3": {
+ "jar": "sha256-a8G0IoKu2LnszbQGMc9FABr4qzrZ0Nhc/4bEXoX8WdA=",
+ "module": "sha256-903In7pI9S/PzSKUFEQbDXn4Cz5tgTsAvIuXT1K0bZE=",
+ "pom": "sha256-FISWCrLBD3mXJlEWmJuzsY21XJKfrFn96nS4ssd5WkY="
+ },
+ "org/key-project#docking-frames-base/1.1.3p1": {
+ "pom": "sha256-/MvGKkZ8j1YkC7AILbv5pM2X7wAYmstCBad/PrFbRgs="
+ },
+ "org/key-project#docking-frames-common/1.1.3p1": {
+ "jar": "sha256-sebcFL9BgtpRM9SPwzDECLg7J8l/HEkkiIUssda96ys=",
+ "pom": "sha256-3XvEh96tjyYXxiVJca+7ylNzrD3bdbLFB5o/pVdxqI8="
+ },
+ "org/key-project#docking-frames-core/1.1.3p1": {
+ "jar": "sha256-hXigFBxxS16XOpxffHemSIdXoXIIfmSBtcF04r5wBZc=",
+ "pom": "sha256-qkwVR2roScEeE8smsNB0dCJfr7r7B7wNoHkQtF6tV+c="
+ },
+ "org/opentest4j#opentest4j/1.2.0": {
+ "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=",
+ "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ="
+ },
+ "org/ow2#ow2/1.5": {
+ "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs="
+ },
+ "org/ow2#ow2/1.5.1": {
+ "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
+ },
+ "org/ow2/asm#asm/9.3": {
+ "jar": "sha256-EmM2m1ninJQ5GN4R1tYVLi7GCFzmPlcQUW+MZ9No5Lw=",
+ "pom": "sha256-jqwH4p+K6oOoFW17Kfo2j26/O+z7IJyaGsNqvZBhI+A="
+ },
+ "org/ow2/asm#asm/9.5": {
+ "jar": "sha256-ti6EtZgHKXUbBFjFNM8TZvcnVCu40VhiEzVoKkYPA1M=",
+ "pom": "sha256-LJzOuVHMZYbejZoWxnKtPkwwucMjAo16PDNmVg1WJ7E="
+ },
+ "org/reflections#reflections/0.10.2": {
+ "jar": "sha256-k4otCP5UBQ12ELlE2N3DoJNVcQ2ea+CqyDjbwE6aKCU=",
+ "pom": "sha256-tsqj6301vXVu1usKKoGGi408D29CJE/q5BdgrGYwbYc="
+ },
+ "org/slf4j#slf4j-api/2.0.7": {
+ "jar": "sha256-XWKYuToZBcMs2mR4gIrBTC1KR+kVNeU8Qff+64XZRvQ=",
+ "pom": "sha256-LUA8zw4KAtXBqGZ7DiozyN/GA4qyh7lnHdaBwgUmeYE="
+ },
+ "org/slf4j#slf4j-parent/2.0.7": {
+ "pom": "sha256-wYK7Ns068ck8FgPN/v54iRV9swuotYT0pEU1/NIuRec="
+ },
+ "org/sonatype/oss#oss-parent/3": {
+ "pom": "sha256-DCeIkmfAlGJEYRaZcJPGcVzMAMKzqVTmZDRDDY9Nrt4="
+ },
"org/sonatype/oss#oss-parent/7": {
"pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
},
"org/sonatype/oss#oss-parent/9": {
"pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+ },
+ "org/xmlresolver#xmlresolver/4.4.3": {
+ "jar": "sha256-nWQslsP2gR4gqfbP7jyhXshOy5Ofa+Y5/uBlZwdzp9E=",
+ "module": "sha256-8GvLyo9h/M9XRtT+zEg+GgGNCYvVGRdxTH2wBCIA+Dc=",
+ "pom": "sha256-FGtXOSRyKmK1jnF2r2hgxoD4p3+XJsXiGHnJxAHtRkI="
+ },
+ "org/xmlresolver#xmlresolver/4.4.3/data": {
+ "jar": "sha256-pX2yPXXDWAyxXrbhqFRoP0V5z9Jl9c8QEaaYPZrtDx8="
}
}
}
diff --git a/pkgs/applications/science/math/eigenmath/default.nix b/pkgs/applications/science/math/eigenmath/default.nix
index e1834548525b..6e716fa77a7e 100644
--- a/pkgs/applications/science/math/eigenmath/default.nix
+++ b/pkgs/applications/science/math/eigenmath/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "eigenmath";
- version = "3.27-unstable-2024-10-02";
+ version = "3.27-unstable-2024-10-18";
src = fetchFromGitHub {
owner = "georgeweigt";
repo = pname;
- rev = "57a7c74623cdb6ee7f3b67873f6e9af976234e9d";
- hash = "sha256-7xoSFLE4yPuWzoIS65UficBa086o1Yil0Z2ks8EARy0=";
+ rev = "a9d3be2c64a35e06691ba61fd1bf0d9b9cd5822d";
+ hash = "sha256-3t5AsUTNXnkXUfrGeGWcMwwC8kBhpSVx1ioVfKXloZA=";
};
checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in ''
diff --git a/pkgs/applications/science/math/sage/patches/disable-slow-glpk-test.patch b/pkgs/applications/science/math/sage/patches/disable-slow-glpk-test.patch
deleted file mode 100644
index 89f0613589d4..000000000000
--- a/pkgs/applications/science/math/sage/patches/disable-slow-glpk-test.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/sage/graphs/generic_graph.py b/src/sage/graphs/generic_graph.py
-index 2deb533f7f..663ff2cd13 100644
---- a/src/sage/graphs/generic_graph.py
-+++ b/src/sage/graphs/generic_graph.py
-@@ -6953,12 +6953,6 @@ class GenericGraph(GenericGraph_pyx):
- sage: G = DiGraph(d6, format='dig6')
- sage: G.edge_connectivity()
- 5
-- sage: G.edge_disjoint_spanning_trees(5) # long time # needs sage.numerical.mip
-- [Digraph on 28 vertices,
-- Digraph on 28 vertices,
-- Digraph on 28 vertices,
-- Digraph on 28 vertices,
-- Digraph on 28 vertices]
-
- Small cases::
-
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index b8d9e3e903a6..9635c30947af 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -54,13 +54,12 @@ stdenv.mkDerivation rec {
# fix those bugs themselves. This is for critical bugfixes, where "critical"
# == "causes (transient) doctest failures / somebody complained".
bugfixPatches = [
- # Sage uses mixed integer programs (MIPs) to find edge disjoint
- # spanning trees. For some reason, aarch64 glpk takes much longer
- # than x86_64 glpk to solve such MIPs. Since the MIP formulation
- # has "numerous problems" and will be replaced by a polynomial
- # algorithm soon, disable this test for now.
- # https://github.com/sagemath/sage/issues/34575
- ./patches/disable-slow-glpk-test.patch
+ # https://github.com/sagemath/sage/pull/38851, landed in 10.5.beta8
+ (fetchpatch {
+ name = "glpk-aarch64-hang-workaround.patch";
+ url = "https://github.com/sagemath/sage/commit/ce4a78dcb4178f85273619cea076c97345977ee1.diff";
+ hash = "sha256-TibTx5llkXjkEZB/MDy4hfGwKBmwtitEpWP6K/ykke0=";
+ })
# compile libs/gap/element.pyx with -O1
# a more conservative version of https://github.com/sagemath/sage/pull/37951
@@ -74,12 +73,26 @@ stdenv.mkDerivation rec {
# should come from or be proposed to upstream. This list will probably never
# be empty since dependencies update all the time.
packageUpgradePatches = [
- # https://github.com/sagemath/sage/pull/38500, positively reviewed, to land in 10.5.beta3
+ # https://github.com/sagemath/sage/pull/38500, landed in 10.5.beta3
(fetchpatch {
name = "cython-3.0.11-upgrade.patch";
url = "https://patch-diff.githubusercontent.com/raw/sagemath/sage/pull/38500.diff";
hash = "sha256-ePfH3Gy1T0UfpoVd3EZowCfy88CbE+yE2MV2itWthsA=";
})
+
+ # https://github.com/sagemath/sage/pull/36641, landed in 10.5.beta3
+ (fetchpatch {
+ name = "sympy-1.13.2-update.patch";
+ url = "https://github.com/sagemath/sage/commit/100189fa62f9a40e7aa0d856615366ea99b87aff.diff";
+ sha256 = "sha256-uWr3I15WByQYGVxbJFqG4zUJ7c7+4rjkcgwkAT85O7w=";
+ })
+
+ # https://github.com/sagemath/sage/pull/38250, landed in 10.5.beta0
+ (fetchpatch {
+ name = "numpy-2.0-compat.patch";
+ url = "https://github.com/sagemath/sage/commit/0962e0bcb159d342e7c7d83557a71e7b670fff47.diff";
+ sha256 = "sha256-4SBhgPgT9VsBxcBH8+T5uYtWzYP5tZi9+iKOG55hWgI=";
+ })
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix
index 1c616866a173..3557406e52b0 100644
--- a/pkgs/applications/science/misc/cwltool/default.nix
+++ b/pkgs/applications/science/misc/cwltool/default.nix
@@ -1,41 +1,44 @@
-{ lib
-, fetchFromGitHub
-, git
-, nodejs
-, python3
+{
+ lib,
+ fetchFromGitHub,
+ git,
+ nodejs,
+ python3,
}:
python3.pkgs.buildPythonApplication rec {
pname = "cwltool";
- version = "3.1.20240708091337";
+ version = "3.1.20241024121129";
pyproject = true;
src = fetchFromGitHub {
owner = "common-workflow-language";
repo = "cwltool";
rev = "refs/tags/${version}";
- hash = "sha256-Umxh8sRBy7fC6+GrcN1q4iO0KVpmUhGPtnqZZK/6c9M=";
+ hash = "sha256-MocgfELgis9b+byeDU7mDQcXnLhaWBtvGbqm7MtRdf8=";
};
postPatch = ''
substituteInPlace setup.py \
- --replace "ruamel.yaml >= 0.16, < 0.19" "ruamel.yaml" \
- --replace "prov == 1.5.1" "prov" \
- --replace '"schema-salad >= 8.4.20230426093816, < 9",' "" \
- --replace "PYTEST_RUNNER + " ""
+ --replace-fail "ruamel.yaml >= 0.16, < 0.19" "ruamel.yaml" \
+ --replace-fail "prov == 1.5.1" "prov" \
+ --replace-fail '"schema-salad >= 8.7, < 9",' '"schema-salad",' \
+ --replace-fail "PYTEST_RUNNER + " ""
substituteInPlace pyproject.toml \
- --replace "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml" \
- --replace "mypy==1.10.0" "mypy==1.10.*"
+ --replace-fail "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml" \
+ --replace-fail "mypy==1.13.0" "mypy"
'';
- nativeBuildInputs = [
- git
- ] ++ (with python3.pkgs; [
- setuptools
- setuptools-scm
- ]);
+ nativeBuildInputs =
+ [
+ git
+ ]
+ ++ (with python3.pkgs; [
+ setuptools
+ setuptools-scm
+ ]);
- propagatedBuildInputs = with python3.pkgs; [
+ dependencies = with python3.pkgs; [
argcomplete
bagit
coloredlogs
@@ -84,10 +87,10 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "Common Workflow Language reference implementation";
- mainProgram = "cwltool";
homepage = "https://www.commonwl.org";
changelog = "https://github.com/common-workflow-language/cwltool/releases/tag/${version}";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ veprbl ];
+ mainProgram = "cwltool";
};
}
diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix
index 392a529f0ded..4396fe135df0 100644
--- a/pkgs/applications/science/misc/cytoscape/default.nix
+++ b/pkgs/applications/science/misc/cytoscape/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "cytoscape";
- version = "3.10.2";
+ version = "3.10.3";
src = fetchurl {
url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-unix-${version}.tar.gz";
- sha256 = "sha256-ArT+g3GbtSxq3FvRi1H4z/kpsmcFCmKhzEJI4bCK44E=";
+ sha256 = "sha256-62i3F6uGNoC8z55iUIYQDAimWcQocsZ52USdpruZRLQ=";
};
patches = [
diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix
index 60615b6f0926..78d312c4011e 100644
--- a/pkgs/applications/science/misc/openrefine/default.nix
+++ b/pkgs/applications/science/misc/openrefine/default.nix
@@ -10,12 +10,12 @@
}:
let
- version = "3.8.2";
+ version = "3.8.5";
src = fetchFromGitHub {
owner = "openrefine";
repo = "openrefine";
rev = version;
- hash = "sha256-3KCO9ooYN8PPVirU2wh7wu4feHqugc3JSXWR2aWIanE=";
+ hash = "sha256-8QAnZCvSUMuRj/Rd85j79GXDQxl8HlEaiU4StsXDdpU=";
};
npmPkg = buildNpmPackage {
@@ -53,7 +53,7 @@ in maven.buildMavenPackage {
mvnJdk = jdk;
mvnParameters = "-pl !packaging";
- mvnHash = "sha256-AuZp+uq5bmb4gnzKvqXeTmBrsCT6qmJOrwtJq9iCkRQ=";
+ mvnHash = "sha256-SrEsJfiZrPy2zZ0Vzl7+d+8XUHGd2DOOs+PHBOZrbIU=";
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index 32de529c5544..b3fc3e152511 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -4,6 +4,7 @@
, fetchgit
, fetchurl
, makeWrapper
+, writeText
, cmake
, coreutils
, git
@@ -225,7 +226,11 @@ stdenv.mkDerivation rec {
'';
# error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer
- CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-faligned-allocation";
+ env.CXXFLAGS = lib.optionalString (stdenv.hostPlatform.system == "x86_64-darwin") "-faligned-allocation";
+
+ # workaround for
+ # https://github.com/root-project/root/issues/14778
+ env.NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "--version-script,${writeText "version.map" "ROOT { global: *; };"}";
# To use the debug information on the fly (without installation)
# add the outPath of root.debug into NIX_DEBUG_INFO_DIRS (in PATH-like format)
diff --git a/pkgs/applications/terminal-emulators/iterm2/default.nix b/pkgs/applications/terminal-emulators/iterm2/default.nix
index 1ce3fbf94c3b..dc9542be003d 100644
--- a/pkgs/applications/terminal-emulators/iterm2/default.nix
+++ b/pkgs/applications/terminal-emulators/iterm2/default.nix
@@ -37,8 +37,10 @@ stdenvNoCC.mkDerivation rec {
meta = with lib; {
description = "Replacement for Terminal and the successor to iTerm";
homepage = "https://www.iterm2.com/";
+ hydraPlatforms = []; # The build is little more than copying the binary
license = licenses.gpl2;
maintainers = with maintainers; [ steinybot tricktron ];
platforms = [ "x86_64-darwin" "aarch64-darwin" ];
+ sourceProvenance = [ sourceTypes.binaryNativeCode ];
};
}
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index a00cc8e78cc7..77658b58f260 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -12,7 +12,7 @@
, sqlite
, ed
, which
-, tcllib
+, tclPackages
, withJson ? true
}:
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
# required for build time tool `./tools/translate.c`
depsBuildBuild = [ buildPackages.stdenv.cc ];
- nativeBuildInputs = [ installShellFiles tcl tcllib ];
+ nativeBuildInputs = [ installShellFiles tcl tclPackages.tcllib ];
buildInputs = [ zlib openssl readline which ed ]
++ lib.optional stdenv.hostPlatform.isDarwin libiconv
diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix
index 746c8d40a393..83781ea1cfcf 100644
--- a/pkgs/applications/version-management/gh/default.nix
+++ b/pkgs/applications/version-management/gh/default.nix
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "gh";
- version = "2.59.0";
+ version = "2.60.0";
src = fetchFromGitHub {
owner = "cli";
repo = "cli";
rev = "refs/tags/v${version}";
- hash = "sha256-QOc99KmcGk9b9uy1/y1FSe0zYE1q0g06k7niqtsMDmY=";
+ hash = "sha256-Tvyf58f/9bOUiUAG6R9nhOerZh5Yt3LyKx88oF3s0jI=";
};
- vendorHash = "sha256-Mje0IbvRj6pmOe8s8PX87ntPE+ZZeciLyOP6fmv7PmI=";
+ vendorHash = "sha256-nwGmYFWyAr34F4rmqFC3cK+fbUq6LRaqXhekx4Ab5sE=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/applications/version-management/ghq/default.nix b/pkgs/applications/version-management/ghq/default.nix
index 546aeb19f327..10f923aca1ba 100644
--- a/pkgs/applications/version-management/ghq/default.nix
+++ b/pkgs/applications/version-management/ghq/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ghq";
- version = "1.6.2";
+ version = "1.6.3";
src = fetchFromGitHub {
owner = "x-motemen";
repo = "ghq";
rev = "v${version}";
- sha256 = "sha256-vO/skiVq9wFWjTWyUb9IbKRAmtGSZEtBBEbW6R+oOQM=";
+ sha256 = "sha256-fL63e0URUiGkVLyLvNeXjIFYEjWF6Xd4FXFXrpqcduQ=";
};
- vendorHash = "sha256-qUMpHFCCzfwM4wC0FIaOrnTiqq3BlG5Jr9XlkSx2HRo=";
+ vendorHash = "sha256-8n0kAowtBSCavHI6y3I7ozJg74tA8bF80WVwe+znHhc=";
doCheck = false;
diff --git a/pkgs/applications/version-management/git-credential-oauth/default.nix b/pkgs/applications/version-management/git-credential-oauth/default.nix
index 3ad36969f94d..209a3e8f7d08 100644
--- a/pkgs/applications/version-management/git-credential-oauth/default.nix
+++ b/pkgs/applications/version-management/git-credential-oauth/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "git-credential-oauth";
- version = "0.13.2";
+ version = "0.13.3";
src = fetchFromGitHub {
owner = "hickford";
repo = pname;
rev = "v${version}";
- hash = "sha256-pJ1Snq79bQvhE+D7U8pMmK4YyvoZIwv29kr5640jpns=";
+ hash = "sha256-vs+PRFyvzn25nM6oO4VybXkTr1frmSspA2isSXLJFQo=";
};
nativeBuildInputs = [ installShellFiles ];
@@ -19,7 +19,7 @@ buildGoModule rec {
"-X main.version=${version}"
];
- vendorHash = "sha256-ujsfEmDOOGCNErtBW5EyefQ+jXhfnAiwteYm8F7RLVE=";
+ vendorHash = "sha256-muK8UZW+8bhC6K0FvN6B7evTMeZnMeYlrIMJdJprPLM=";
postInstall = ''
installManPage $src/git-credential-oauth.1
diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index f9c59ad18ebf..7a95582ee0ed 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "git-repo";
- version = "2.47";
+ version = "2.48";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
- hash = "sha256-LFzUvDMNGxp5HzdjlaN0VS7HpIzN8GA5MQL61teKRvo=";
+ hash = "sha256-BrdB6SqQlLRvXbfIXHqaKD+F/SBzqGru6ISkUrEnUeQ=";
};
# Fix 'NameError: name 'ssl' is not defined'
diff --git a/pkgs/applications/version-management/git-town/default.nix b/pkgs/applications/version-management/git-town/default.nix
index 00d2722bcdbe..226afe310323 100644
--- a/pkgs/applications/version-management/git-town/default.nix
+++ b/pkgs/applications/version-management/git-town/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "git-town";
- version = "16.3.0";
+ version = "16.4.1";
src = fetchFromGitHub {
owner = "git-town";
repo = "git-town";
rev = "v${version}";
- hash = "sha256-q4bRUz6ZI6y0AYEDMUBMN1YJxmHkIDDkUiMd4rQbDHk=";
+ hash = "sha256-8Xr1R6txsJBGzBtvvKOCg2lcAHksl4hNPc9zySkTfdg=";
};
vendorHash = null;
diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix
index ddbb5b803f5b..2e2bad280684 100644
--- a/pkgs/applications/version-management/git-up/default.nix
+++ b/pkgs/applications/version-management/git-up/default.nix
@@ -6,13 +6,13 @@
pythonPackages.buildPythonApplication rec {
pname = "git-up";
- version = "2.2.0";
+ version = "2.3.0";
format = "pyproject";
src = fetchPypi {
pname = "git_up";
inherit version;
- hash = "sha256-GTX2IWLQ48yWfPnmtEa9HJ5umQLttqgTlgZQlaWgeE4=";
+ hash = "sha256-SncbnK6LxsleKRa/sSCm/8dsgPw/XJGvYfkcIeWYDy4=";
};
nativeBuildInputs = with pythonPackages; [
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 033870a4e421..42f2c2dc4756 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,15 +1,15 @@
{
- "version": "17.2.9",
- "repo_hash": "060d5rzbcnhr1fsvbaiirgjm5rjr5c5r6yi601lxvksffyn5hmxw",
- "yarn_hash": "10y540bxwaz355p9r4q34199aibadrd5p4d9ck2y3n6735k0hm74",
+ "version": "17.3.6",
+ "repo_hash": "1dysv5xblm33z4vlnkz2s43w6cqrhmzq1729sab3x0zznyaa5vks",
+ "yarn_hash": "1g5xqggdbrxz6ablav119jw8a2v8qdd2cwlbvpygablbcxqak41l",
"owner": "gitlab-org",
"repo": "gitlab",
- "rev": "v17.2.9-ee",
+ "rev": "v17.3.6-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "17.2.9",
- "GITLAB_PAGES_VERSION": "17.2.9",
- "GITLAB_SHELL_VERSION": "14.37.0",
+ "GITALY_SERVER_VERSION": "17.3.6",
+ "GITLAB_PAGES_VERSION": "17.3.6",
+ "GITLAB_SHELL_VERSION": "14.38.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.2.0",
- "GITLAB_WORKHORSE_VERSION": "17.2.9"
+ "GITLAB_WORKHORSE_VERSION": "17.3.6"
}
}
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 45f5914852db..a826ba55b080 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -6,7 +6,7 @@
}:
let
- version = "17.2.9";
+ version = "17.3.6";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@@ -20,10 +20,10 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- hash = "sha256-UgNQtM3NdAUJVP+vvTHtZWSjCmVzsHlEtXQroxKorIY=";
+ hash = "sha256-nXblQfr9ml6F5nNz64haN7ub+cuN3eao14N0Y2d3n0Y=";
};
- vendorHash = "sha256-FqnGVRldhevJgBBvJcvGXzRaYWqSHzZiXIQmCNzJv+4=";
+ vendorHash = "sha256-spfSOOe+9NGu+2ZbEGb93X3HnANEXYbvP73DD6neIXQ=";
ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];
@@ -46,6 +46,9 @@ buildGoModule ({
preConfigure = ''
mkdir -p _build/bin
cp -r ${auxBins}/bin/* _build/bin
+ for f in ${git}/bin/git-*; do
+ cp "$f" "_build/bin/gitaly-$(basename $f)";
+ done
'';
outputs = [ "out" ];
diff --git a/pkgs/applications/version-management/gitlab/gitaly/git.nix b/pkgs/applications/version-management/gitlab/gitaly/git.nix
index a6d272b2fbb7..2610c39ca711 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/git.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/git.nix
@@ -9,14 +9,14 @@
stdenv.mkDerivation rec {
pname = "gitaly-git";
- version = "2.44.2.gl1";
+ version = "2.45.2";
# `src` attribute for nix-update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "git";
rev = "v${version}";
- hash = "sha256-VIffbZZEbGjVW1No8zojSQlX/ciJ2DJnaogNlQtc77o=";
+ hash = "sha256-R4K5b4d1DQw+pwoOCAK4EJtVPXQDPossTUmVv0LJtUs=";
};
# we actually use the gitaly build system
diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix
index 202944412ca3..5cd236a468ab 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "gitlab-container-registry";
- version = "4.10.0";
+ version = "4.11.0";
rev = "v${version}-gitlab";
# nixpkgs-update: no auto update
@@ -10,10 +10,10 @@ buildGoModule rec {
owner = "gitlab-org";
repo = "container-registry";
inherit rev;
- hash = "sha256-9OiuA0TqRfnZKfAeLbIcPUw5qH6twWKqt0IP8roaWNg=";
+ hash = "sha256-wUypldxi3O5sm4i9v2HiZjqUy/JwtcRPvCCmINCk4YU=";
};
- vendorHash = "sha256-Bzhg5coOrs3JO6Qslr9csUIrnCMJiG89Fio8ziJjH9k=";
+ vendorHash = "sha256-Ed+WvdWpEU5c9v14eM1PdCcT3qRnaRF/XeUKedPmaSU=";
postPatch = ''
# Disable flaky inmemory storage driver test
diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
index 7fb674689237..f0fb34deeb91 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "gitlab-pages";
- version = "17.2.9";
+ version = "17.3.6";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
- hash = "sha256-ggfPZ/PMjgfRzzPZdVCVydd/4mdCfh2xh7QWGjp5U/0=";
+ hash = "sha256-yieOM9QQuQQ4RkfjASpcEvIKwbYMT9LkkJPHAYhY7uY=";
};
- vendorHash = "sha256-yNHeM8MExcLwv2Ga4vtBmPFBt/Rj7Gd4QQYDlnAIo+c=";
+ vendorHash = "sha256-O8kWiOpgVCUD6DdM95F1b+j4Gv9LTLRdBjByqXWV7Pk=";
subPackages = [ "." ];
meta = with lib; {
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
index eaaba0d4bd32..53614d3a39e9 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@@ -2,14 +2,14 @@
buildGoModule rec {
pname = "gitlab-shell";
- version = "14.37.0";
+ version = "14.38.0";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
- hash = "sha256-to4ZIFKEiM4FCznoLrvHua9/hIqiHcviALzfay+1rb8=";
+ hash = "sha256-oYvsSjdzfJn4ujy1qbMmqZyEQFbYTSke8t3KBqjr/Vc=";
};
buildInputs = [ ruby libkrb5 ];
@@ -18,7 +18,7 @@ buildGoModule rec {
./remove-hardcoded-locations.patch
];
- vendorHash = "sha256-TbjpCCo/ZdFP+yE2h8B8kwS08iUilXNgBT2F5Si7/dc=";
+ vendorHash = "sha256-YOShgZv0zdfXgKi//IENt6wE2m0S1Kqa+2ndvCwKDLQ=";
postInstall = ''
cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 235ddbf54aed..7386a939817f 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
- version = "17.2.9";
+ version = "17.3.6";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
@@ -17,7 +17,7 @@ buildGoModule rec {
sourceRoot = "${src.name}/workhorse";
- vendorHash = "sha256-ZWpuJTlGCsjjURa8iYTaGMKulx99uyYJ+dr2cL9hiwo=";
+ vendorHash = "sha256-sLr9kFKRNYOlCj9bmP+J7/Iu/OfFTEjAm64BUni+eiY=";
buildInputs = [ git ];
ldflags = [ "-X main.Version=${version}" ];
doCheck = false;
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
index 2bb3d4092ed8..56051fbe4876 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
@@ -1,5 +1,9 @@
# frozen_string_literal: true
+def next?
+ File.basename(__FILE__) == "Gemfile.next"
+end
+
source 'https://rubygems.org'
if ENV.fetch('BUNDLER_CHECKSUM_VERIFICATION_OPT_IN', 'false') != 'false' # this verification is still experimental
@@ -24,7 +28,12 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir
# https://gitlab.com/gitlab-org/gitlab/-/issues/375713
#
# See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails
-gem 'rails', '~> 7.0.8.4' # rubocop:todo Gemfile/MissingFeatureCategory
+
+if next?
+ gem 'rails', '~> 7.1.3.4', feature_category: :shared
+else
+ gem 'rails', '~> 7.0.8.4', feature_category: :shared
+end
gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -50,7 +59,7 @@ gem 'responders', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'sprockets', '~> 3.7.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'sprockets-rails', '~> 3.5.1' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'view_component', '~> 3.12.1' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'view_component', '~> 3.13.0' # rubocop:todo Gemfile/MissingFeatureCategory
# Supported DBs
gem 'pg', '~> 1.5.6', feature_category: :database
@@ -59,7 +68,11 @@ gem 'neighbor', '~> 0.3.2', feature_category: :duo_chat
gem 'rugged', '~> 1.6' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'faraday', '~> 1.10.3' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'faraday', '~> 2', feature_category: :shared
+gem 'faraday-retry', '~> 2', feature_category: :shared
+# Logger is a dependency of Faraday, but Logger 1.6.0 does not work with Chef.
+gem 'logger', '~> 1.5.3' # rubocop:todo Gemfile/MissingFeatureCategory
+
gem 'marginalia', '~> 1.11.1' # rubocop:todo Gemfile/MissingFeatureCategory
# Authorization
@@ -75,8 +88,8 @@ gem 'bcrypt', '~> 3.1', '>= 3.1.14' # rubocop:todo Gemfile/MissingFeatureCategor
gem 'doorkeeper', '~> 5.6', '>= 5.6.6' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'doorkeeper-openid_connect', '~> 1.8', '>= 1.8.7' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'doorkeeper-device_authorization_grant', '~> 1.0.0', feature_category: :system_access
-gem 'rexml', '~> 3.2.6' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'ruby-saml', '~> 1.17.0', feature_category: :system_access
+gem 'rexml', '~> 3.3.2' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'ruby-saml', '~> 1.17.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'omniauth', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'omniauth-auth0', '~> 3.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'omniauth-azure-activedirectory-v2', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -85,16 +98,16 @@ gem 'omniauth-github', '2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md # rubocop:todo Gemfile/MissingFeatureCategory
gem 'omniauth-google-oauth2', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'omniauth-oauth2-generic', '~> 0.2.2' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'omniauth-saml', '~> 2.2.1', feature_category: :system_access
+gem 'omniauth-saml', '~> 2.2.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'omniauth_openid_connect', '~> 0.6.1' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'omniauth_openid_connect', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory
# Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem.
# See https://docs.gitlab.com/ee/development/emails.html#rationale.
-gem 'openid_connect', '= 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'openid_connect', '~> 2.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md # rubocop:todo Gemfile/MissingFeatureCategory
gem 'omniauth-atlassian-oauth2', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'rack-oauth2', '~> 1.21.3' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'rack-oauth2', '~> 2.2.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'jwt', '~> 2.5' # rubocop:todo Gemfile/MissingFeatureCategory
# Kerberos authentication. EE-only
@@ -116,7 +129,7 @@ gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted' # rubocop:t
gem 'validates_hostname', '~> 1.0.13' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'rubyzip', '~> 2.3.2', require: 'zip' # rubocop:todo Gemfile/MissingFeatureCategory
# GitLab Pages letsencrypt support
-gem 'acme-client', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'acme-client', '~> 2.0.18' # rubocop:todo Gemfile/MissingFeatureCategory
# Browser detection
gem 'browser', '~> 5.3.1' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -146,7 +159,17 @@ gem 'graphql', '~> 2.3.5', feature_category: :api
gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api
gem 'graphiql-rails', '~> 1.10', feature_category: :api
gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api
-gem 'graphlient', '~> 0.6.0', feature_category: :importers # Used by BulkImport feature (group::import)
+gem 'graphlient', '~> 0.8.0', feature_category: :importers # Used by BulkImport feature (group::import)
+
+# Cells
+gem 'gitlab-topology-service-client', '~> 0.1',
+ path: 'vendor/gems/gitlab-topology-service-client',
+ feature_category: :cell
+
+# Duo Workflow
+gem 'gitlab-duo-workflow-service-client', '~> 0.1',
+ path: 'vendor/gems/gitlab-duo-workflow-service-client',
+ feature_category: :duo_workflow
# Generate Fake data
gem 'ffaker', '~> 2.23' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -177,7 +200,7 @@ gem 'fog-local', '~> 0.8' # rubocop:todo Gemfile/MissingFeatureCategory
# We may want to update this dependency if this is ever addressed upstream, e.g. via
# https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93
gem 'fog-aliyun', '~> 0.4' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'gitlab-fog-azure-rm', '~> 1.9.1', require: 'fog/azurerm' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'gitlab-fog-azure-rm', '~> 2.0.1', require: 'fog/azurerm', feature_category: :shared
# for Google storage
@@ -205,14 +228,16 @@ gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared
gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory
# Search
-gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'aws-sdk-core', '~> 3.199.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'elasticsearch-model', '~> 7.2', feature_category: :global_search
+gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation', feature_category: :global_search
+gem 'elasticsearch-api', '7.17.11', feature_category: :global_search
+gem 'aws-sdk-core', '~> 3.201.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'aws-sdk-s3', '~> 1.154.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'aws-sdk-s3', '~> 1.157.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'faraday-typhoeus', '~> 1.1', feature_category: :global_search
+gem 'faraday_middleware-aws-sigv4', '~> 1.0.1', feature_category: :global_search
+# Used with Elasticsearch to support http keep-alive connections
+gem 'typhoeus', '~> 1.4.0', feature_category: :global_search
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.14.3', feature_category: :team_planning
@@ -253,9 +278,6 @@ end
# State machine
gem 'state_machines-activerecord', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory
-# CI domain tags
-gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Gemfile/MissingFeatureCategory
-
# Background jobs
gem 'sidekiq', '~> 7.1.6', feature_category: :scalability
gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability
@@ -331,9 +353,7 @@ gem 'loofah', '~> 2.22.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'licensee', '~> 9.16' # rubocop:todo Gemfile/MissingFeatureCategory
# Detect and convert string character encoding
-# We forked charlock_holmes at https://gitlab.com/gitlab-org/ruby/gems/charlock_holmes
-# but changed it's name to 'static_holmes' in the gemspec file.
-gem 'static_holmes', '~> 0.7.11', require: 'charlock_holmes', feature_category: :shared
+gem 'charlock_holmes', '~> 0.7.9', feature_category: :shared
# Detect mime content type from content
gem 'ruby-magic', '~> 0.6' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -347,7 +367,7 @@ gem 'gitlab_chronic_duration', '~> 0.12' # rubocop:todo Gemfile/MissingFeatureCa
gem 'rack-proxy', '~> 0.7.7' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'cssbundling-rails', '1.4.0', feature_category: :shared
+gem 'cssbundling-rails', '1.4.1', feature_category: :shared
gem 'terser', '1.0.2' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -363,9 +383,9 @@ gem 'gitlab-license', '~> 2.5', feature_category: :shared
gem 'rack-attack', '~> 6.7.0' # rubocop:todo Gemfile/MissingFeatureCategory
# Sentry integration
-gem 'sentry-ruby', '~> 5.17.3', feature_category: :error_tracking
-gem 'sentry-rails', '~> 5.17.3', feature_category: :error_tracking
-gem 'sentry-sidekiq', '~> 5.17.3', feature_category: :error_tracking
+gem 'sentry-ruby', '~> 5.18.0', feature_category: :error_tracking
+gem 'sentry-rails', '~> 5.18.0', feature_category: :error_tracking
+gem 'sentry-sidekiq', '~> 5.18.0', feature_category: :error_tracking
# PostgreSQL query parsing
#
@@ -404,7 +424,8 @@ gem 'webrick', '~> 1.8.1', require: false # rubocop:todo Gemfile/MissingFeatureC
gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory
# Event-driven reactor for Ruby
-gem 'async', '~> 2.12.1' # rubocop:disable Gemfile/MissingFeatureCategory -- This is general utility gem
+# Required manually in config/initializers/require_async_gem
+gem 'async', '~> 2.12.1', require: false # rubocop:disable Gemfile/MissingFeatureCategory -- This is general utility gem
# OpenTelemetry
group :opentelemetry do
@@ -472,7 +493,7 @@ group :development, :test do
gem 'awesome_print', require: false # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'database_cleaner-active_record', '~> 2.1.0', feature_category: :database
+ gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database
gem 'rspec-rails', '~> 6.1.1', feature_category: :shared
gem 'factory_bot_rails', '~> 6.4.3', feature_category: :tooling
@@ -494,7 +515,7 @@ group :development, :test do
# Profiling data from CI/CD pipelines
gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling
- gem 'knapsack', '~> 1.22.0', feature_category: :tooling
+ gem 'knapsack', '~> 4.0.0', feature_category: :tooling
gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling
gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling
@@ -511,7 +532,7 @@ group :development, :test do
# For now we only use vite in development / test, and not for production builds
# See: https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/106
gem 'vite_rails', '~> 3.0.17', feature_category: :shared
- gem 'vite_ruby', '~> 3.5.0', feature_category: :shared
+ gem 'vite_ruby', '~> 3.7.0', feature_category: :shared
gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling
end
@@ -524,7 +545,7 @@ group :development, :test, :coverage do
gem 'simplecov', '~> 0.22', require: false, feature_category: :tooling
gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling
gem 'simplecov-cobertura', '~> 2.1.0', require: false, feature_category: :tooling
- gem 'undercover', '~> 0.4.4', require: false, feature_category: :tooling
+ gem 'undercover', '~> 0.5.0', require: false, feature_category: :tooling
end
# Gems required in omnibus-gitlab pipeline
@@ -565,17 +586,19 @@ group :test do
# Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'gitlab_quality-test_tooling', '~> 1.31.0', require: false, feature_category: :tooling
+ gem 'gitlab_quality-test_tooling', '~> 1.33.0', require: false, feature_category: :tooling
end
gem 'octokit', '~> 9.0', feature_category: :importers
+# Needed by octokit: https://github.com/octokit/octokit.rb/pull/1688
+gem 'faraday-multipart', '~> 1.0', feature_category: :importers
gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared
gem 'email_reply_trimmer', '~> 0.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'html2text' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'stackprof', '~> 0.2.25', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'stackprof', '~> 0.2.26', require: false, feature_category: :shared
gem 'rbtrace', '~> 0.4', require: false # rubocop:todo Gemfile/MissingFeatureCategory
gem 'memory_profiler', '~> 1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
gem 'activerecord-explain-analyze', '~> 0.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
@@ -600,12 +623,16 @@ gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
# Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 17.1.0', feature_category: :gitaly
+gem 'gitaly', '~> 17.2.0', feature_category: :gitaly
# KAS GRPC protocol definitions
-gem 'kas-grpc', '~> 0.5.0', feature_category: :deployment_management
+gem 'kas-grpc', '~> 0.6.0', feature_category: :deployment_management
-gem 'grpc', '~> 1.63', feature_category: :shared
+# Lock the version before issues below are resolved:
+# https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939
+# Or we can upgrade to a more recent version as long as we can confirm
+# that it doesn't have the same issues.
+gem 'grpc', '= 1.63.0', feature_category: :shared
gem 'google-protobuf', '~> 3.25', '>= 3.25.3' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -654,7 +681,7 @@ gem 'valid_email', '~> 0.1' # rubocop:todo Gemfile/MissingFeatureCategory
# JSON
gem 'jsonb_accessor', '~> 1.3.10' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'json', '~> 2.7.2', feature_category: :shared
-gem 'json_schemer', '~> 0.2.18' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'json_schemer', '~> 2.3.0', feature_category: :shared
gem 'oj', '~> 3.13.21' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'oj-introspect', '~> 0.7' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'multi_json', '~> 1.14.1' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -702,3 +729,5 @@ gem 'net-http', '= 0.4.1', feature_category: :shared
gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation
+
+gem 'openbao_client', path: 'gems/openbao_client' # rubocop:todo Gemfile/MissingFeatureCategory
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
index 681d70b50896..034a7d66fe5c 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
@@ -27,7 +27,9 @@ PATH
remote: gems/gitlab-backup-cli
specs:
gitlab-backup-cli (0.0.1)
- activesupport (~> 7.0.8)
+ activesupport (< 7.2)
+ google-cloud-storage_transfer (~> 1.2.0)
+ googleauth (~> 1.8.1)
rainbow (~> 3.0)
thor (~> 1.3)
@@ -104,6 +106,12 @@ PATH
diffy (~> 3.4)
oj (~> 3.13.16)
+PATH
+ remote: gems/openbao_client
+ specs:
+ openbao_client (1.0.0)
+ typhoeus (~> 1.0, >= 1.0.1)
+
PATH
remote: vendor/gems/attr_encrypted
specs:
@@ -137,6 +145,18 @@ PATH
specs:
diff_match_patch (0.1.0)
+PATH
+ remote: vendor/gems/gitlab-duo-workflow-service-client
+ specs:
+ gitlab-duo-workflow-service-client (0.1)
+ grpc
+
+PATH
+ remote: vendor/gems/gitlab-topology-service-client
+ specs:
+ gitlab-topology-service-client (0.1)
+ grpc
+
PATH
remote: vendor/gems/mail-smtp_pool
specs:
@@ -186,9 +206,9 @@ GEM
CFPropertyList (3.0.5)
rexml
RedCloth (4.3.3)
- acme-client (2.0.11)
+ acme-client (2.0.18)
faraday (>= 1.0, < 3.0.0)
- faraday-retry (~> 1.0)
+ faraday-retry (>= 1.0, < 3.0.0)
actioncable (7.0.8.4)
actionpack (= 7.0.8.4)
activesupport (= 7.0.8.4)
@@ -257,8 +277,6 @@ GEM
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
- acts-as-taggable-on (10.0.0)
- activerecord (>= 6.1, < 7.2)
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
aes_key_wrap (1.1.0)
@@ -291,7 +309,7 @@ GEM
io-event (~> 1.6, >= 1.6.5)
atlassian-jwt (0.2.1)
jwt (~> 2.1)
- attr_required (1.0.1)
+ attr_required (1.0.2)
awesome_print (1.9.2)
awrence (1.2.1)
aws-eventstream (1.3.0)
@@ -299,7 +317,7 @@ GEM
aws-sdk-cloudformation (1.41.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
- aws-sdk-core (3.199.0)
+ aws-sdk-core (3.201.4)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
@@ -307,10 +325,10 @@ GEM
aws-sdk-kms (1.76.0)
aws-sdk-core (~> 3, >= 3.188.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.154.0)
- aws-sdk-core (~> 3, >= 3.199.0)
+ aws-sdk-s3 (1.157.0)
+ aws-sdk-core (~> 3, >= 3.201.0)
aws-sdk-kms (~> 1)
- aws-sigv4 (~> 1.8)
+ aws-sigv4 (~> 1.5)
aws-sigv4 (1.8.0)
aws-eventstream (~> 1, >= 1.0.2)
axe-core-api (4.9.1)
@@ -324,14 +342,6 @@ GEM
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
- azure-storage-blob (2.0.3)
- azure-storage-common (~> 2.0)
- nokogiri (~> 1, >= 1.10.8)
- azure-storage-common (2.0.4)
- faraday (~> 1.0)
- faraday_middleware (~> 1.0, >= 1.0.0.rc1)
- net-http-persistent (~> 4.0)
- nokogiri (~> 1, >= 1.10.8)
babosa (2.0.0)
backport (1.2.0)
base32 (0.3.2)
@@ -353,7 +363,7 @@ GEM
bindata (2.4.11)
binding_of_caller (1.0.0)
debug_inspector (>= 0.0.1)
- bootsnap (1.18.3)
+ bootsnap (1.18.4)
msgpack (~> 1.2)
browser (5.3.1)
builder (3.2.4)
@@ -383,6 +393,7 @@ GEM
ssrf_filter (~> 1.0, < 1.1.0)
cbor (0.5.9.8)
character_set (1.8.0)
+ charlock_holmes (0.7.9)
chef-config (18.3.0)
addressable
chef-utils (= 18.3.0)
@@ -429,7 +440,7 @@ GEM
git
css_parser (1.14.0)
addressable
- cssbundling-rails (1.4.0)
+ cssbundling-rails (1.4.1)
railties (>= 6.0.0)
cvss-suite (3.0.1)
danger (9.4.2)
@@ -448,7 +459,7 @@ GEM
danger-gitlab (8.0.0)
danger
gitlab (~> 4.2, >= 4.2.0)
- database_cleaner-active_record (2.1.0)
+ database_cleaner-active_record (2.2.0)
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
@@ -525,27 +536,28 @@ GEM
dumb_delegator (1.0.0)
duo_api (1.3.0)
e2mmap (0.1.0)
- ecma-re-validator (0.3.0)
- regexp_parser (~> 2.0)
ed25519 (1.3.0)
- elasticsearch (7.13.3)
- elasticsearch-api (= 7.13.3)
- elasticsearch-transport (= 7.13.3)
- elasticsearch-api (7.13.3)
+ elasticsearch (7.17.11)
+ elasticsearch-api (= 7.17.11)
+ elasticsearch-transport (= 7.17.11)
+ elasticsearch-api (7.17.11)
multi_json
- elasticsearch-model (7.2.0)
+ elasticsearch-model (7.2.1)
activesupport (> 3)
elasticsearch (~> 7)
hashie
elasticsearch-rails (7.2.1)
- elasticsearch-transport (7.13.3)
- faraday (~> 1)
+ elasticsearch-transport (7.17.11)
+ base64
+ faraday (>= 1, < 3)
multi_json
email_reply_trimmer (0.1.6)
email_spec (2.2.0)
htmlentities (~> 4.3.3)
launchy (~> 2.1)
mail (~> 2.7)
+ email_validator (2.2.4)
+ activemodel
encryptor (3.0.0)
erubi (1.12.0)
escape_utils (1.3.0)
@@ -565,36 +577,28 @@ GEM
factory_bot_rails (6.4.3)
factory_bot (~> 6.4)
railties (>= 5.0.0)
- faraday (1.10.3)
- faraday-em_http (~> 1.0)
- faraday-em_synchrony (~> 1.0)
- faraday-excon (~> 1.1)
- faraday-httpclient (~> 1.0)
- faraday-multipart (~> 1.0)
- faraday-net_http (~> 1.0)
- faraday-net_http_persistent (~> 1.0)
- faraday-patron (~> 1.0)
- faraday-rack (~> 1.0)
- faraday-retry (~> 1.0)
- ruby2_keywords (>= 0.0.4)
- faraday-em_http (1.0.0)
- faraday-em_synchrony (1.0.0)
- faraday-excon (1.1.0)
+ faraday (2.10.1)
+ faraday-net_http (>= 2.0, < 3.2)
+ logger
+ faraday-follow_redirects (0.3.0)
+ faraday (>= 1, < 3)
faraday-http-cache (2.5.0)
faraday (>= 0.8)
- faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
- faraday-net_http (1.0.1)
- faraday-net_http_persistent (1.2.0)
- faraday-patron (1.0.0)
- faraday-rack (1.0.0)
- faraday-retry (1.0.3)
- faraday_middleware (1.2.0)
- faraday (~> 1.0)
- faraday_middleware-aws-sigv4 (0.3.0)
+ faraday-net_http (3.1.0)
+ net-http
+ faraday-net_http_persistent (2.1.0)
+ faraday (~> 2.5)
+ net-http-persistent (~> 4.0)
+ faraday-retry (2.2.1)
+ faraday (~> 2.0)
+ faraday-typhoeus (1.1.0)
+ faraday (~> 2.0)
+ typhoeus (~> 1.4)
+ faraday_middleware-aws-sigv4 (1.0.1)
aws-sigv4 (~> 1.0)
- faraday (>= 0.15)
+ faraday (>= 2.0, < 3)
fast_blank (1.0.1)
fast_gettext (2.3.0)
ffaker (2.23.0)
@@ -688,7 +692,7 @@ GEM
git (1.18.0)
addressable (~> 2.8)
rchardet (~> 1.8)
- gitaly (17.1.2)
+ gitaly (17.2.0)
grpc (~> 1.0)
gitlab (4.19.0)
httparty (~> 0.20)
@@ -702,12 +706,15 @@ GEM
gitlab-experiment (0.9.1)
activesupport (>= 3.0)
request_store (>= 1.0)
- gitlab-fog-azure-rm (1.9.1)
- azure-storage-blob (~> 2.0)
- azure-storage-common (~> 2.0)
+ gitlab-fog-azure-rm (2.0.1)
+ faraday (~> 2.0)
+ faraday-follow_redirects (~> 0.3.0)
+ faraday-net_http_persistent (~> 2.0)
fog-core (~> 2.1)
fog-json (~> 1.2)
mime-types
+ net-http-persistent (~> 4.0)
+ nokogiri (~> 1, >= 1.10.8)
gitlab-glfm-markdown (0.0.17)
rb_sys (= 0.9.94)
gitlab-labkit (0.36.1)
@@ -745,7 +752,7 @@ GEM
omniauth (>= 1.3, < 3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
rubyntlm (~> 0.5)
- gitlab_quality-test_tooling (1.31.0)
+ gitlab_quality-test_tooling (1.33.0)
activesupport (>= 7.0, < 7.2)
amatch (~> 0.4.1)
gitlab (~> 4.19)
@@ -833,7 +840,13 @@ GEM
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
- google-protobuf (3.25.3)
+ google-cloud-storage_transfer (1.2.0)
+ google-cloud-core (~> 1.6)
+ google-cloud-storage_transfer-v1 (>= 0.5, < 2.a)
+ google-cloud-storage_transfer-v1 (0.8.0)
+ gapic-common (>= 0.20.0, < 2.a)
+ google-cloud-errors (~> 1.0)
+ google-protobuf (3.25.4)
googleapis-common-protos (1.4.0)
google-protobuf (~> 3.14)
googleapis-common-protos-types (~> 1.2)
@@ -874,9 +887,8 @@ GEM
rack
graphiql-rails (1.10.0)
railties
- graphlient (0.6.0)
- faraday (>= 1.0)
- faraday_middleware
+ graphlient (0.8.0)
+ faraday (~> 2.0)
graphql-client
graphlyte (1.0.0)
graphql (2.3.5)
@@ -985,16 +997,18 @@ GEM
regexp_parser (~> 2.5)
regexp_property_values (~> 1.0)
json (2.7.2)
- json-jwt (1.15.3)
+ json-jwt (1.16.6)
activesupport (>= 4.2)
aes_key_wrap
+ base64
bindata
- httpclient
- json_schemer (0.2.18)
- ecma-re-validator (~> 0.3)
+ faraday (~> 2.0)
+ faraday-follow_redirects
+ json_schemer (2.3.0)
+ bigdecimal
hana (~> 1.3)
regexp_parser (~> 2.0)
- uri_template (~> 0.7)
+ simpleidn (~> 0.2)
jsonb_accessor (1.3.10)
activerecord (>= 5.0)
activesupport (>= 5.0)
@@ -1014,9 +1028,9 @@ GEM
activerecord
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
- kas-grpc (0.5.0)
+ kas-grpc (0.6.0)
grpc (~> 1.0)
- knapsack (1.22.0)
+ knapsack (4.0.0)
rake
kramdown (2.3.2)
rexml
@@ -1060,7 +1074,7 @@ GEM
rake (~> 13.0)
locale (2.1.3)
lockbox (1.3.0)
- logger (1.6.0)
+ logger (1.5.3)
lograge (0.11.2)
actionpack (>= 4)
activesupport (>= 4)
@@ -1212,21 +1226,24 @@ GEM
ruby-saml (~> 1.17)
omniauth-shibboleth-redux (2.0.0)
omniauth (>= 2.0.0)
- omniauth_openid_connect (0.6.1)
+ omniauth_openid_connect (0.8.0)
omniauth (>= 1.9, < 3)
- openid_connect (~> 1.1)
+ openid_connect (~> 2.2)
open4 (1.3.4)
- openid_connect (1.3.0)
+ openid_connect (2.3.0)
activemodel
attr_required (>= 1.0.0)
- json-jwt (>= 1.5.0)
- rack-oauth2 (>= 1.6.1)
- swd (>= 1.0.0)
+ email_validator
+ faraday (~> 2.0)
+ faraday-follow_redirects
+ json-jwt (>= 1.16)
+ mail
+ rack-oauth2 (~> 2.2)
+ swd (~> 2.0)
tzinfo
- validate_email
validate_url
- webfinger (>= 1.0.1)
- openssl (3.1.0)
+ webfinger (~> 2.0)
+ openssl (3.2.0)
openssl-signature_algorithm (1.3.0)
openssl (> 2.0)
opentelemetry-api (1.2.5)
@@ -1241,6 +1258,10 @@ GEM
opentelemetry-semantic_conventions
opentelemetry-helpers-sql-obfuscation (0.1.0)
opentelemetry-common (~> 0.20)
+ opentelemetry-instrumentation-action_mailer (0.1.0)
+ opentelemetry-api (~> 1.0)
+ opentelemetry-instrumentation-active_support (~> 0.1)
+ opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-action_pack (0.9.0)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
@@ -1305,8 +1326,9 @@ GEM
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.21.0)
opentelemetry-instrumentation-base (~> 0.22.1)
- opentelemetry-instrumentation-rails (0.30.1)
+ opentelemetry-instrumentation-rails (0.30.2)
opentelemetry-api (~> 1.0)
+ opentelemetry-instrumentation-action_mailer (~> 0.1.0)
opentelemetry-instrumentation-action_pack (~> 0.9.0)
opentelemetry-instrumentation-action_view (~> 0.7.0)
opentelemetry-instrumentation-active_job (~> 0.7.0)
@@ -1419,10 +1441,11 @@ GEM
rack (>= 1.0, < 4)
rack-cors (2.0.2)
rack (>= 2.0.0)
- rack-oauth2 (1.21.3)
+ rack-oauth2 (2.2.1)
activesupport
attr_required
- httpclient
+ faraday (~> 2.0)
+ faraday-follow_redirects
json-jwt (>= 1.11.0)
rack (>= 2.1.0)
rack-protection (2.2.2)
@@ -1505,7 +1528,7 @@ GEM
redis-rack (3.0.0)
rack-session (>= 0.2.0)
redis-store (>= 1.2, < 2)
- redis-store (1.10.0)
+ redis-store (1.11.0)
redis (>= 4, < 6)
regexp_parser (2.6.0)
regexp_property_values (1.0.0)
@@ -1526,7 +1549,8 @@ GEM
retriable (3.1.2)
reverse_markdown (1.4.0)
nokogiri
- rexml (3.2.6)
+ rexml (3.3.2)
+ strscan
rinku (2.0.0)
rotp (6.3.0)
rouge (4.3.0)
@@ -1618,8 +1642,8 @@ GEM
prism (>= 0.29.0, < 0.31)
rbs (>= 3, < 4)
sorbet-runtime (>= 0.5.10782)
- ruby-lsp-rails (0.3.7)
- ruby-lsp (>= 0.17.0, < 0.18.0)
+ ruby-lsp-rails (0.3.8)
+ ruby-lsp (>= 0.17.2, < 0.18.0)
ruby-lsp-rspec (0.1.12)
ruby-lsp (~> 0.17.0)
ruby-magic (0.6.0)
@@ -1655,24 +1679,25 @@ GEM
seed-fu (2.3.7)
activerecord (>= 3.1)
activesupport (>= 3.1)
- selenium-webdriver (4.21.1)
+ selenium-webdriver (4.23.0)
base64 (~> 0.2)
+ logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
- semver_dialects (3.4.0)
+ semver_dialects (3.4.3)
deb_version (~> 1.0.1)
pastel (~> 0.8.0)
thor (~> 1.3)
tty-command (~> 0.10.1)
- sentry-rails (5.17.3)
+ sentry-rails (5.18.2)
railties (>= 5.0)
- sentry-ruby (~> 5.17.3)
- sentry-ruby (5.17.3)
+ sentry-ruby (~> 5.18.2)
+ sentry-ruby (5.18.2)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
- sentry-sidekiq (5.17.3)
- sentry-ruby (~> 5.17.3)
+ sentry-sidekiq (5.18.2)
+ sentry-ruby (~> 5.18.2)
sidekiq (>= 3.0)
sexp_processor (4.17.1)
shellany (0.0.1)
@@ -1704,6 +1729,7 @@ GEM
simplecov-html (0.12.3)
simplecov-lcov (0.8.0)
simplecov_json_formatter (0.1.4)
+ simpleidn (0.2.3)
singleton (0.1.1)
sixarm_ruby_unaccent (1.2.0)
slack-messenger (2.3.6)
@@ -1743,7 +1769,7 @@ GEM
sprockets (>= 3.0.0)
ssh_data (1.3.0)
ssrf_filter (1.0.8)
- stackprof (0.2.25)
+ stackprof (0.2.26)
state_machines (0.5.0)
state_machines-activemodel (0.8.0)
activemodel (>= 5.1)
@@ -1751,16 +1777,17 @@ GEM
state_machines-activerecord (0.8.0)
activerecord (>= 5.1)
state_machines-activemodel (>= 0.8.0)
- static_holmes (0.7.11)
strings (0.2.1)
strings-ansi (~> 0.2)
unicode-display_width (>= 1.5, < 3.0)
unicode_utils (~> 1.4)
strings-ansi (0.2.0)
- swd (1.3.0)
+ strscan (3.1.0)
+ swd (2.0.3)
activesupport (>= 3)
attr_required (>= 0.0.5)
- httpclient (>= 2.4)
+ faraday (~> 2.0)
+ faraday-follow_redirects
sync (0.5.0)
sys-filesystem (1.4.3)
ffi (~> 1.1)
@@ -1778,7 +1805,7 @@ GEM
unicode-display_width (>= 1.1.1, < 3)
terser (1.0.2)
execjs (>= 0.3.0, < 3)
- test-prof (1.3.3)
+ test-prof (1.3.3.1)
test_file_finder (0.3.1)
faraday (>= 1.0, < 3.0, != 2.0.0)
text (1.3.1)
@@ -1827,15 +1854,16 @@ GEM
tty-screen (~> 0.8)
wisper (~> 2.0)
tty-screen (0.8.1)
- typhoeus (1.4.0)
+ typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uber (0.1.0)
- undercover (0.4.6)
+ undercover (0.5.0)
+ bigdecimal
imagen (>= 0.1.8)
rainbow (>= 2.1, < 4.0)
- rugged (>= 0.27, < 1.7)
+ rugged (>= 0.27, < 1.8)
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
@@ -1848,13 +1876,9 @@ GEM
diff-lcs (~> 1.3)
parser (>= 3.2.0)
uri (0.13.0)
- uri_template (0.7.0)
valid_email (0.1.3)
activemodel
mail (>= 2.6.1)
- validate_email (0.1.6)
- activemodel (>= 3.0)
- mail (>= 2.2.5)
validate_url (1.0.15)
activemodel (>= 3.0.0)
public_suffix
@@ -1863,7 +1887,7 @@ GEM
activesupport (>= 3.0)
version_gem (1.1.0)
version_sorter (2.3.0)
- view_component (3.12.1)
+ view_component (3.13.0)
activesupport (>= 5.2.0, < 8.0)
concurrent-ruby (~> 1.0)
method_source (~> 1.0)
@@ -1874,7 +1898,7 @@ GEM
vite_rails (3.0.17)
railties (>= 5.1, < 8)
vite_ruby (~> 3.0, >= 3.2.2)
- vite_ruby (3.5.0)
+ vite_ruby (3.7.0)
dry-cli (>= 0.7, < 2)
rack-proxy (~> 0.6, >= 0.6.1)
zeitwerk (~> 2.2)
@@ -1891,9 +1915,10 @@ GEM
openssl (>= 2.2)
safety_net_attestation (~> 0.4.0)
tpm-key_attestation (~> 0.12.0)
- webfinger (1.2.0)
+ webfinger (2.1.3)
activesupport
- httpclient (>= 2.4)
+ faraday (~> 2.0)
+ faraday-follow_redirects
webmock (3.23.1)
addressable (>= 2.8.0)
crack (>= 0.3.2)
@@ -1924,10 +1949,9 @@ PLATFORMS
DEPENDENCIES
CFPropertyList (~> 3.0.0)
RedCloth (~> 4.3.3)
- acme-client (~> 2.0)
+ acme-client (~> 2.0.18)
activerecord-explain-analyze (~> 0.1)
activerecord-gitlab!
- acts-as-taggable-on (~> 10.0)
addressable (~> 2.8)
akismet (~> 3.0)
apollo_upload_server (~> 2.1.6)
@@ -1942,8 +1966,8 @@ DEPENDENCIES
attr_encrypted (~> 3.2.4)!
awesome_print
aws-sdk-cloudformation (~> 1)
- aws-sdk-core (~> 3.199.0)
- aws-sdk-s3 (~> 1.154.0)
+ aws-sdk-core (~> 3.201.0)
+ aws-sdk-s3 (~> 1.157.0)
axe-core-rspec (~> 4.9.0)
babosa (~> 2.0)
base32 (~> 0.3.0)
@@ -1960,6 +1984,7 @@ DEPENDENCIES
capybara (~> 3.40)
capybara-screenshot (~> 1.0.26)
carrierwave (~> 1.3)
+ charlock_holmes (~> 0.7.9)
circuitbox (= 2.0.0)
click_house-client!
cloud_profiler_agent (~> 0.0.0)!
@@ -1970,10 +1995,10 @@ DEPENDENCIES
coverband (= 6.1.2)
creole (~> 0.5.0)
crystalball (~> 0.7.0)
- cssbundling-rails (= 1.4.0)
+ cssbundling-rails (= 1.4.1)
csv_builder!
cvss-suite (~> 3.0.1)
- database_cleaner-active_record (~> 2.1.0)
+ database_cleaner-active_record (~> 2.2.0)
deckar01-task_list (= 2.3.4)
declarative_policy (~> 1.1.0)
deprecation_toolkit (~> 1.5.1)
@@ -1991,15 +2016,18 @@ DEPENDENCIES
doorkeeper-openid_connect (~> 1.8, >= 1.8.7)
duo_api (~> 1.3)
ed25519 (~> 1.3.0)
- elasticsearch-api (= 7.13.3)
+ elasticsearch-api (= 7.17.11)
elasticsearch-model (~> 7.2)
elasticsearch-rails (~> 7.2)
email_reply_trimmer (~> 0.1)
email_spec (~> 2.2.0)
error_tracking_open_api!
factory_bot_rails (~> 6.4.3)
- faraday (~> 1.10.3)
- faraday_middleware-aws-sigv4 (~> 0.3.0)
+ faraday (~> 2)
+ faraday-multipart (~> 1.0)
+ faraday-retry (~> 2)
+ faraday-typhoeus (~> 1.1)
+ faraday_middleware-aws-sigv4 (~> 1.0.1)
fast_blank (~> 1.0.1)
ffaker (~> 2.23)
flipper (~> 0.26.2)
@@ -2015,12 +2043,13 @@ DEPENDENCIES
gdk-toogle (~> 0.9, >= 0.9.5)
gettext (~> 3.4, >= 3.4.9)
gettext_i18n_rails (~> 1.12.0)
- gitaly (~> 17.1.0)
+ gitaly (~> 17.2.0)
gitlab-backup-cli!
gitlab-chronic (~> 0.10.5)
gitlab-dangerfiles (~> 4.8.0)
+ gitlab-duo-workflow-service-client (~> 0.1)!
gitlab-experiment (~> 0.9.1)
- gitlab-fog-azure-rm (~> 1.9.1)
+ gitlab-fog-azure-rm (~> 2.0.1)
gitlab-glfm-markdown (~> 0.0.17)
gitlab-housekeeper!
gitlab-http!
@@ -2037,10 +2066,11 @@ DEPENDENCIES
gitlab-secret_detection!
gitlab-sidekiq-fetcher!
gitlab-styles (~> 12.0.1)
+ gitlab-topology-service-client (~> 0.1)!
gitlab-utils!
gitlab_chronic_duration (~> 0.12)
gitlab_omniauth-ldap (~> 2.2.0)
- gitlab_quality-test_tooling (~> 1.31.0)
+ gitlab_quality-test_tooling (~> 1.33.0)
gon (~> 6.4.0)
google-apis-androidpublisher_v3 (~> 0.34.0)
google-apis-cloudbilling_v1 (~> 0.21.0)
@@ -2066,11 +2096,11 @@ DEPENDENCIES
grape-swagger-entity (~> 0.5.1)
grape_logging (~> 1.8, >= 1.8.4)
graphiql-rails (~> 1.10)
- graphlient (~> 0.6.0)
+ graphlient (~> 0.8.0)
graphlyte (~> 1.0.0)
graphql (~> 2.3.5)
graphql-docs (~> 5.0.0)
- grpc (~> 1.63)
+ grpc (= 1.63.0)
gssapi (~> 1.3.1)
guard-rspec
haml_lint (~> 0.58)
@@ -2089,12 +2119,12 @@ DEPENDENCIES
jira-ruby (~> 2.3.0)
js_regex (~> 3.8)
json (~> 2.7.2)
- json_schemer (~> 0.2.18)
+ json_schemer (~> 2.3.0)
jsonb_accessor (~> 1.3.10)
jwt (~> 2.5)
kaminari (~> 1.2.2)
- kas-grpc (~> 0.5.0)
- knapsack (~> 1.22.0)
+ kas-grpc (~> 0.6.0)
+ knapsack (~> 4.0.0)
kramdown (~> 2.3.1)
kubeclient (~> 4.11.0)
lefthook (~> 1.6.8)
@@ -2103,6 +2133,7 @@ DEPENDENCIES
licensee (~> 9.16)
listen (~> 3.7)
lockbox (~> 1.3.0)
+ logger (~> 1.5.3)
lograge (~> 0.5)
loofah (~> 2.22.0)
lookbook (~> 2.3)
@@ -2139,8 +2170,9 @@ DEPENDENCIES
omniauth-saml (~> 2.2.1)
omniauth-shibboleth-redux (~> 2.0)
omniauth_crowd (~> 2.4.0)!
- omniauth_openid_connect (~> 0.6.1)
- openid_connect (= 1.3.0)
+ omniauth_openid_connect (~> 0.8.0)
+ openbao_client!
+ openid_connect (~> 2.3.0)
openssl (~> 3.0)
opentelemetry-exporter-otlp
opentelemetry-instrumentation-action_pack
@@ -2184,7 +2216,7 @@ DEPENDENCIES
rack (~> 2.2.9)
rack-attack (~> 6.7.0)
rack-cors (~> 2.0.1)
- rack-oauth2 (~> 1.21.3)
+ rack-oauth2 (~> 2.2.1)
rack-proxy (~> 0.7.7)
rack-timeout (~> 0.7.0)
rails (~> 7.0.8.4)
@@ -2201,7 +2233,7 @@ DEPENDENCIES
request_store (~> 1.5.1)
responders (~> 3.0)
retriable (~> 3.1.2)
- rexml (~> 3.2.6)
+ rexml (~> 3.3.2)
rouge (~> 4.3.0)
rqrcode (~> 2.2)
rspec-benchmark (~> 0.6.0)
@@ -2226,9 +2258,9 @@ DEPENDENCIES
seed-fu (~> 2.3.7)
selenium-webdriver (~> 4.21, >= 4.21.1)
semver_dialects (~> 3.0)
- sentry-rails (~> 5.17.3)
- sentry-ruby (~> 5.17.3)
- sentry-sidekiq (~> 5.17.3)
+ sentry-rails (~> 5.18.0)
+ sentry-ruby (~> 5.18.0)
+ sentry-sidekiq (~> 5.18.0)
shoulda-matchers (~> 5.1.0)
sidekiq (~> 7.1.6)
sidekiq-cron (~> 1.12.0)
@@ -2247,9 +2279,8 @@ DEPENDENCIES
sprockets (~> 3.7.0)
sprockets-rails (~> 3.5.1)
ssh_data (~> 1.3)
- stackprof (~> 0.2.25)
+ stackprof (~> 0.2.26)
state_machines-activerecord (~> 0.8.0)
- static_holmes (~> 0.7.11)
sys-filesystem (~> 1.4.3)
tanuki_emoji (~> 0.9)
telesignenterprise (~> 2.2)
@@ -2262,14 +2293,14 @@ DEPENDENCIES
truncato (~> 0.7.12)
tty-prompt (~> 0.23)
typhoeus (~> 1.4.0)
- undercover (~> 0.4.4)
+ undercover (~> 0.5.0)
unleash (~> 3.2.2)
valid_email (~> 0.1)
validates_hostname (~> 1.0.13)
version_sorter (~> 2.3)
- view_component (~> 3.12.1)
+ view_component (~> 3.13.0)
vite_rails (~> 3.0.17)
- vite_ruby (~> 3.5.0)
+ vite_ruby (~> 3.7.0)
vmstat (~> 2.3.0)
warning (~> 1.3.0)
webauthn (~> 3.0)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
index 741336ca7211..d032f8bf0ba9 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
@@ -6,10 +6,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pl901hwqbx7sa058i006l7addvqg6wv73kkqsq3mgjx7jgxmxpd";
+ sha256 = "0xgj5r8b7q242f3p9rr17v0q10dd9nx53gmscpmidz3gj90v7siz";
type = "gem";
};
- version = "2.0.11";
+ version = "2.0.18";
};
actioncable = {
dependencies = ["actionpack" "activesupport" "nio4r" "websocket-driver"];
@@ -153,17 +153,6 @@ src:
};
version = "7.0.8.4";
};
- acts-as-taggable-on = {
- dependencies = ["activerecord"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "10yvdqrmykjpfjchnbh7q85vm5fgz20g9ip5iwphl0922rpyjq6k";
- type = "gem";
- };
- version = "10.0.0";
- };
addressable = {
dependencies = ["public_suffix"];
groups = ["danger" "default" "development" "test"];
@@ -349,10 +338,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1g22axmi2rhhy7w8c3x6gppsawxqavbrnxpnmphh22fk7cwi0kh2";
+ sha256 = "16fbwr6nmsn97n0a6k1nwbpyz08zpinhd6g7196lz1syndbgrszh";
type = "gem";
};
- version = "1.0.1";
+ version = "1.0.2";
};
awesome_print = {
groups = ["development" "test"];
@@ -411,10 +400,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1lb21zc9fax6c97dq17h7bllm2cg39ms6hi9ya9z88lsdz8sgnj6";
+ sha256 = "0b7qc3pfhiv052fgw8dj4fj7fwm9rp7mc627ax2nkq5zbbbqs6sz";
type = "gem";
};
- version = "3.199.0";
+ version = "3.201.4";
};
aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -433,10 +422,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "035d5q3csa1ac51xmxs2cqqibiifhm9sfdh71xjh0yrxnywdwqbh";
+ sha256 = "1479h0jpjfkyj26h9hv8d6q8b9iw7v1x5yd0yk6af477d2icgq71";
type = "gem";
};
- version = "1.154.0";
+ version = "1.157.0";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@@ -482,28 +471,6 @@ src:
};
version = "0.1.1";
};
- azure-storage-blob = {
- dependencies = ["azure-storage-common" "nokogiri"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0qq3knsy7nj7a0r8m19spg2bgzns9b3j5vjbs9mpg49whhc63dv1";
- type = "gem";
- };
- version = "2.0.3";
- };
- azure-storage-common = {
- dependencies = ["faraday" "faraday_middleware" "net-http-persistent" "nokogiri"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0swmsvvpmy8cdcl305p3dl2pi7m3dqjd7zywfcxmhsz0n2m4v3v0";
- type = "gem";
- };
- version = "2.0.4";
- };
babosa = {
groups = ["default"];
platforms = [];
@@ -673,10 +640,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1srlq3gqirzdkhv12ljpnp5cb0f8jfrl3n8xs9iivyz2c7khvdyp";
+ sha256 = "0mdgj9yw1hmx3xh2qxyjc31y8igmxzd9h0c245ay2zkz76pl4k5c";
type = "gem";
};
- version = "1.18.3";
+ version = "1.18.4";
};
browser = {
groups = ["default"];
@@ -808,6 +775,16 @@ src:
};
version = "1.8.0";
};
+ charlock_holmes = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1c1dws56r7p8y363dhyikg7205z59a3bn4amnv2y488rrq8qm7ml";
+ type = "gem";
+ };
+ version = "0.7.9";
+ };
chef-config = {
dependencies = ["addressable" "chef-utils" "fuzzyurl" "mixlib-config" "mixlib-shellout" "tomlrb"];
groups = ["default"];
@@ -1080,10 +1057,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nzp4j1ll6llgbrvqk81gkz6fqgk33sx4k1fcvbm7v7h79jk8808";
+ sha256 = "1qbwdksjq9lw2h4xs2lb7lvp94pwgv38hp0mm46qj8bvc8yjf8ab";
type = "gem";
};
- version = "1.4.0";
+ version = "1.4.1";
};
csv_builder = {
groups = ["default"];
@@ -1132,10 +1109,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12hdsqnws9gyc9sxiyc8pjiwr0xa7136m1qbhmd1pk3vsrrvk13k";
+ sha256 = "1iz1hv2b1z7509dxvxdwzay1hhs24glxls5ldbyh688zxkcdca1j";
type = "gem";
};
- version = "2.1.0";
+ version = "2.2.0";
};
database_cleaner-core = {
groups = ["default" "development" "test"];
@@ -1501,17 +1478,6 @@ src:
};
version = "0.1.0";
};
- ecma-re-validator = {
- dependencies = ["regexp_parser"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1mz0nsl2093jd94nygw8qs13rwfwl1ax76xz3ypinr5hqbc5pab6";
- type = "gem";
- };
- version = "0.3.0";
- };
ed25519 = {
groups = ["default"];
platforms = [];
@@ -1528,10 +1494,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0havyxmvl157a653prspnbhgdchlx44xqxl170v1im5ggxwavcaq";
+ sha256 = "11pw5x7kg6f6m8rqy2kpbzdlnvijjpmbqkj2gz8237wkbl40y27d";
type = "gem";
};
- version = "7.13.3";
+ version = "7.17.11";
};
elasticsearch-api = {
dependencies = ["multi_json"];
@@ -1539,10 +1505,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bmssarkk7lqkjdn8c9j7jvxcnn4hg1zcmhsky8bfvc99k33b3w8";
+ sha256 = "01wi43a3zylrq2vca08vir5va142g5m3jcsak3rprjck8jvggn7y";
type = "gem";
};
- version = "7.13.3";
+ version = "7.17.11";
};
elasticsearch-model = {
dependencies = ["activesupport" "elasticsearch" "hashie"];
@@ -1550,10 +1516,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ivcz5pcrp0760j26590bm3jvwc8548wcy7z7v2274k18l583h9c";
+ sha256 = "02x2wvd22wwi2v6pps7y4advzkyfbhxn0fgsai49zcjbcrblnp4b";
type = "gem";
};
- version = "7.2.0";
+ version = "7.2.1";
};
elasticsearch-rails = {
groups = ["default"];
@@ -1566,15 +1532,15 @@ src:
version = "7.2.1";
};
elasticsearch-transport = {
- dependencies = ["faraday" "multi_json"];
+ dependencies = ["base64" "faraday" "multi_json"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0blfii8qvj0m6bg9sbfynxc40in7zfmw2wpi4clv7d9gclk053db";
+ sha256 = "00qgyyvjyyv7z22qjd408pby1h7902gdwkh8h3z3jk2y57amg06i";
type = "gem";
};
- version = "7.13.3";
+ version = "7.17.11";
};
email_reply_trimmer = {
groups = ["default"];
@@ -1597,6 +1563,17 @@ src:
};
version = "2.2.0";
};
+ email_validator = {
+ dependencies = ["activemodel"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0106y8xakq6frv2xc68zz76q2l2cqvhfjc7ji69yyypcbc4kicjs";
+ type = "gem";
+ };
+ version = "2.2.4";
+ };
encryptor = {
groups = ["default"];
platforms = [];
@@ -1734,45 +1711,26 @@ src:
version = "6.4.3";
};
faraday = {
- dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
+ dependencies = ["faraday-net_http" "logger"];
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1c760q0ks4vj4wmaa7nh1dgvgqiwaw0mjr7v8cymy7i3ffgjxx90";
+ sha256 = "104s7n9505488p923cs0pl3jlgn4naam28clkm2885hrysizpjbb";
type = "gem";
};
- version = "1.10.3";
+ version = "2.10.1";
};
- faraday-em_http = {
- groups = ["danger" "default" "development" "test"];
+ faraday-follow_redirects = {
+ dependencies = ["faraday"];
+ groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs";
+ sha256 = "1y87p3yk15bjbk0z9mf01r50lzxvp7agr56lbm9gxiz26mb9fbfr";
type = "gem";
};
- version = "1.0.0";
- };
- faraday-em_synchrony = {
- groups = ["danger" "default" "development" "test"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6";
- type = "gem";
- };
- version = "1.0.0";
- };
- faraday-excon = {
- groups = ["danger" "default" "development" "test"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh";
- type = "gem";
- };
- version = "1.1.0";
+ version = "0.3.0";
};
faraday-http-cache = {
dependencies = ["faraday"];
@@ -1785,16 +1743,6 @@ src:
};
version = "2.5.0";
};
- faraday-httpclient = {
- groups = ["danger" "default" "development" "test"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc";
- type = "gem";
- };
- version = "1.0.1";
- };
faraday-multipart = {
dependencies = ["multipart-post"];
groups = ["danger" "default" "development" "test"];
@@ -1807,65 +1755,48 @@ src:
version = "1.0.4";
};
faraday-net_http = {
+ dependencies = ["net-http"];
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j";
+ sha256 = "17w51yk4rrm9rpnbc3x509s619kba0jga3qrj4b17l30950vw9qn";
type = "gem";
};
- version = "1.0.1";
+ version = "3.1.0";
};
faraday-net_http_persistent = {
- groups = ["danger" "default" "development" "test"];
+ dependencies = ["faraday" "net-http-persistent"];
+ groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b";
+ sha256 = "02yydasm9qlq59dnj3dldaqd0xidxyx59pnr2iqygnjn7yqj05xl";
type = "gem";
};
- version = "1.2.0";
- };
- faraday-patron = {
- groups = ["danger" "default" "development" "test"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w";
- type = "gem";
- };
- version = "1.0.0";
- };
- faraday-rack = {
- groups = ["danger" "default" "development" "test"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g";
- type = "gem";
- };
- version = "1.0.0";
+ version = "2.1.0";
};
faraday-retry = {
- groups = ["danger" "default" "development" "test"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd";
- type = "gem";
- };
- version = "1.0.3";
- };
- faraday_middleware = {
dependencies = ["faraday"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy";
+ sha256 = "023ncwlagnf2irx2ckyj1pg1f1x436jgr4a5y45mih298p8zwij1";
type = "gem";
};
- version = "1.2.0";
+ version = "2.2.1";
+ };
+ faraday-typhoeus = {
+ dependencies = ["faraday" "typhoeus"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1rwhd2f78vqj0wkkdah395apx6igp5xf82n5xgixs61q45y19ii4";
+ type = "gem";
+ };
+ version = "1.1.0";
};
faraday_middleware-aws-sigv4 = {
dependencies = ["aws-sigv4" "faraday"];
@@ -1873,10 +1804,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1gk2qakcvvbgfvvfd8cgf13sligv5mp816ykmra9llqmbfym8ikl";
+ sha256 = "13xym8pfjh1j2pf63r45ybdy6p4hjrqn4algml5wd8bwd17yl0d0";
type = "gem";
};
- version = "0.3.0";
+ version = "1.0.1";
};
fast_blank = {
groups = ["default"];
@@ -2225,10 +2156,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0prcxb5ahqpxdswg2957d24k6w74rlnm0x7qlv5p0dr4qzp51x6y";
+ sha256 = "0rg8rkwjbm51kvnbmkmy6dyf7krr6iaf8hxvxn7jzfs37j4fivj8";
type = "gem";
};
- version = "17.1.2";
+ version = "17.2.0";
};
gitlab = {
dependencies = ["httparty" "terminal-table"];
@@ -2242,7 +2173,7 @@ src:
version = "4.19.0";
};
gitlab-backup-cli = {
- dependencies = ["activesupport" "rainbow" "thor"];
+ dependencies = ["activesupport" "google-cloud-storage_transfer" "googleauth" "rainbow" "thor"];
groups = ["default"];
platforms = [];
source = {
@@ -2273,6 +2204,16 @@ src:
};
version = "4.8.0";
};
+ gitlab-duo-workflow-service-client = {
+ dependencies = ["grpc"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ path = "${src}/vendor/gems/gitlab-duo-workflow-service-client";
+ type = "path";
+ };
+ version = "0.1";
+ };
gitlab-experiment = {
dependencies = ["activesupport" "request_store"];
groups = ["default"];
@@ -2285,15 +2226,15 @@ src:
version = "0.9.1";
};
gitlab-fog-azure-rm = {
- dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types"];
+ dependencies = ["faraday" "faraday-follow_redirects" "faraday-net_http_persistent" "fog-core" "fog-json" "mime-types" "net-http-persistent" "nokogiri"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0dsg53f6gfhf9rs6wslragagl3ysi429p45iy4dkq664i8c8wsq2";
+ sha256 = "09brm889i4xmr2ba8jyqk91yhya13qfa0kn16p3ipilcm6gh9k31";
type = "gem";
};
- version = "1.9.1";
+ version = "2.0.1";
};
gitlab-glfm-markdown = {
dependencies = ["rb_sys"];
@@ -2460,6 +2401,16 @@ src:
};
version = "12.0.1";
};
+ gitlab-topology-service-client = {
+ dependencies = ["grpc"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ path = "${src}/vendor/gems/gitlab-topology-service-client";
+ type = "path";
+ };
+ version = "0.1";
+ };
gitlab-utils = {
dependencies = ["actionview" "activesupport" "addressable" "rake"];
groups = ["monorepo"];
@@ -2498,10 +2449,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ljg28wf9vmi6bc639fcf19abx5i4a3h04bjvdwr2ih1pbr3hgf1";
+ sha256 = "0dfsv3aqfmq318dirln6nlmxx8n1z4ncy03w2yi965nm2rwjf58y";
type = "gem";
};
- version = "1.31.0";
+ version = "1.33.0";
};
globalid = {
dependencies = ["activesupport"];
@@ -2788,15 +2739,37 @@ src:
};
version = "1.45.0";
};
+ google-cloud-storage_transfer = {
+ dependencies = ["google-cloud-core" "google-cloud-storage_transfer-v1"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0n0nxy4l2kzcmcgx7j8mppyw9gwc8331fqcf6w6jmq4913sh2a8k";
+ type = "gem";
+ };
+ version = "1.2.0";
+ };
+ google-cloud-storage_transfer-v1 = {
+ dependencies = ["gapic-common" "google-cloud-errors"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xk1i7wg5alcgd9v4f0y3mjgxbsrcp53jhdjdc26wmfvfl1giglx";
+ type = "gem";
+ };
+ version = "0.8.0";
+ };
google-protobuf = {
groups = ["default" "development" "opentelemetry" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1mnxzcq8kmyfb9bkzqnp019d1hx1vprip3yzdkkha6b3qz5rgg9r";
+ sha256 = "03pg19m15aqw33q6an777735x4x8643xg17rb3jr9j4rkp599id1";
type = "gem";
};
- version = "3.25.3";
+ version = "3.25.4";
};
googleapis-common-protos = {
dependencies = ["google-protobuf" "googleapis-common-protos-types" "grpc"];
@@ -2920,15 +2893,15 @@ src:
version = "1.10.0";
};
graphlient = {
- dependencies = ["faraday" "faraday_middleware" "graphql-client"];
+ dependencies = ["faraday" "graphql-client"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1h652p91zdbdigb155vhdlh0lnq4ia8wlg5y5h0ibhlf9i5ndn5q";
+ sha256 = "1cbwirpx8hclxyrxfbjz5c62l7i6nsqg6x72yplm8d083pd0ii4q";
type = "gem";
};
- version = "0.6.0";
+ version = "0.8.0";
};
graphlyte = {
groups = ["test"];
@@ -3416,26 +3389,26 @@ src:
version = "2.7.2";
};
json-jwt = {
- dependencies = ["activesupport" "aes_key_wrap" "bindata" "httpclient"];
+ dependencies = ["activesupport" "aes_key_wrap" "base64" "bindata" "faraday" "faraday-follow_redirects"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04315mf4p9qa97grdfqv922paghzdfrbb982ap0p99rqwla4znv6";
+ sha256 = "0v16kd05ijdmw1q8avpfsjkdiha6c2070hbz2g2fqg3lv2f1yidb";
type = "gem";
};
- version = "1.15.3";
+ version = "1.16.6";
};
json_schemer = {
- dependencies = ["ecma-re-validator" "hana" "regexp_parser" "uri_template"];
+ dependencies = ["bigdecimal" "hana" "regexp_parser" "simpleidn"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1rkb7gz819g82n3xshb5g8kgv1nvgwg1lm2fk7715pggzcgc4qik";
+ sha256 = "0dgbrps0ydiyxcgj5n4dny0cmzwj125x1s792l7m5jjrp1rs27wz";
type = "gem";
};
- version = "0.2.18";
+ version = "2.3.0";
};
jsonb_accessor = {
dependencies = ["activerecord" "activesupport" "pg"];
@@ -3518,10 +3491,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0dffbnw10hld4vpack6xw14n590b9fgqv5cxgap3f7qzzdd6yybc";
+ sha256 = "0ydgam2c0c43wpzziz3hxif2xwj8nsdniqd4dilxal2xyi63dxs3";
type = "gem";
};
- version = "0.5.0";
+ version = "0.6.0";
};
knapsack = {
dependencies = ["rake"];
@@ -3529,10 +3502,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jqs9shqg3nd6j3kzbh8gxv7ix1n877y64kdjzbrwjgz6ksqs9mx";
+ sha256 = "1f42akjbdkrg1ihwvls9pkkvz8vikaapzgxl82dd128rfn42chm9";
type = "gem";
};
- version = "1.22.0";
+ version = "4.0.0";
};
kramdown = {
dependencies = ["rexml"];
@@ -3695,14 +3668,14 @@ src:
version = "1.3.0";
};
logger = {
- groups = ["default" "development"];
+ groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0gpg8gzi0xwymw4aaq2iafcbx31i3xzkg3fb30mdxn1d4qhc3dqa";
+ sha256 = "0yyn64c92wx8c37dqh1b080rqc80idq56g2plfqls9f9q8l32i7d";
type = "gem";
};
- version = "1.6.0";
+ version = "1.5.3";
};
lograge = {
dependencies = ["actionpack" "activesupport" "railties" "request_store"];
@@ -4460,10 +4433,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08yl0x203k6nrshc70zawfqh79ap1c3fyka9zwwy61cvn7sih4sz";
+ sha256 = "099xg7s6450wlfzs77mbdx78g3dp0glx5q6f44i78akf7283hbqz";
type = "gem";
};
- version = "0.6.1";
+ version = "0.8.0";
};
open4 = {
groups = ["default" "development"];
@@ -4475,26 +4448,36 @@ src:
};
version = "1.3.4";
};
+ openbao_client = {
+ dependencies = ["typhoeus"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ path = "${src}/gems/openbao_client";
+ type = "path";
+ };
+ version = "1.0.0";
+ };
openid_connect = {
- dependencies = ["activemodel" "attr_required" "json-jwt" "rack-oauth2" "swd" "tzinfo" "validate_email" "validate_url" "webfinger"];
+ dependencies = ["activemodel" "attr_required" "email_validator" "faraday" "faraday-follow_redirects" "json-jwt" "mail" "rack-oauth2" "swd" "tzinfo" "validate_url" "webfinger"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0w474bz3s1hqhilvrddr33l2nkyikypaczp3808w0345jr88b5m7";
+ sha256 = "0k3l4ak1mawrw74qy4xfh81hdfxvamijcjb3f1gadq0ixgprrfqd";
type = "gem";
};
- version = "1.3.0";
+ version = "2.3.0";
};
openssl = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0c649921vg2l939z5cc3jwd8p1v49099pdhxfk7sb9qqx5wi5873";
+ sha256 = "054d6ybgjdzxw567m7rbnd46yp6gkdbc5ihr536vxd3p15vbhjrw";
type = "gem";
};
- version = "3.1.0";
+ version = "3.2.0";
};
openssl-signature_algorithm = {
dependencies = ["openssl"];
@@ -4550,6 +4533,17 @@ src:
};
version = "0.1.0";
};
+ opentelemetry-instrumentation-action_mailer = {
+ dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-active_support" "opentelemetry-instrumentation-base"];
+ groups = ["default" "opentelemetry"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1afibmwprdiqnkin7lb6zdxng36rqa7qbl5fl9wx0lchpc039zjj";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
opentelemetry-instrumentation-action_pack = {
dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base" "opentelemetry-instrumentation-rack"];
groups = ["opentelemetry"];
@@ -4749,15 +4743,15 @@ src:
version = "0.24.4";
};
opentelemetry-instrumentation-rails = {
- dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-action_pack" "opentelemetry-instrumentation-action_view" "opentelemetry-instrumentation-active_job" "opentelemetry-instrumentation-active_record" "opentelemetry-instrumentation-active_support" "opentelemetry-instrumentation-base"];
+ dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-action_mailer" "opentelemetry-instrumentation-action_pack" "opentelemetry-instrumentation-action_view" "opentelemetry-instrumentation-active_job" "opentelemetry-instrumentation-active_record" "opentelemetry-instrumentation-active_support" "opentelemetry-instrumentation-base"];
groups = ["opentelemetry"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0hiihby0lndwvny1alba1mvvag48z55vjjrwbjppb700prv0q1kk";
+ sha256 = "04isc412xin2xw11lccdxcg7i2yf4m8jsw9jlq7gcld5mwix1pa2";
type = "gem";
};
- version = "0.30.1";
+ version = "0.30.2";
};
opentelemetry-instrumentation-rake = {
dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"];
@@ -5218,15 +5212,15 @@ src:
version = "2.0.2";
};
rack-oauth2 = {
- dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"];
+ dependencies = ["activesupport" "attr_required" "faraday" "faraday-follow_redirects" "json-jwt" "rack"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fknwsxz4429w1hndl6y30cmm2n34wmmaaj2hhp6jrm8ssfsfwjf";
+ sha256 = "19fi42hi9l474ki89y6cs8vrpfmc1h8zpd02iwjy4hw0a1yahfn7";
type = "gem";
};
- version = "1.21.3";
+ version = "2.2.1";
};
rack-protection = {
dependencies = ["rack"];
@@ -5566,10 +5560,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17mhr1g3lmacrgjndbmrklngy32g55165n53111q70kykx7qjn7j";
+ sha256 = "197d1088jw3wl3lfcdj4w4c4da13wsqyd12mj3czvlfw77ig7i7d";
type = "gem";
};
- version = "1.10.0";
+ version = "1.11.0";
};
regexp_parser = {
groups = ["default" "development" "test"];
@@ -5657,14 +5651,15 @@ src:
version = "1.4.0";
};
rexml = {
+ dependencies = ["strscan"];
groups = ["coverage" "danger" "default" "development" "omnibus" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
+ sha256 = "0zr5qpa8lampaqzhdcjcvyqnrqcjl7439mqjlkjz43wdhmpnh4s5";
type = "gem";
};
- version = "3.2.6";
+ version = "3.3.2";
};
rinku = {
groups = ["default"];
@@ -5975,10 +5970,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1w4vvhy8nyffj7bp17842kg6szhfz27w8pni0a7haam78hb86b1r";
+ sha256 = "0xd9d1h7m0bw05jykf0sx6sds01ymf0dffpb3j1r99ril703lzc4";
type = "gem";
};
- version = "0.3.7";
+ version = "0.3.8";
};
ruby-lsp-rspec = {
dependencies = ["ruby-lsp"];
@@ -6181,15 +6176,15 @@ src:
version = "2.3.7";
};
selenium-webdriver = {
- dependencies = ["base64" "rexml" "rubyzip" "websocket"];
+ dependencies = ["base64" "logger" "rexml" "rubyzip" "websocket"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qrjr30qs01b27km6ipzc2zasdlzhdgri5q7qrb53z1j8l0n82y3";
+ sha256 = "00dq3450kadsvxh1lpndasy0bab0ilrjhrnvlicfmkvrx3gfs2j9";
type = "gem";
};
- version = "4.21.1";
+ version = "4.23.0";
};
semver_dialects = {
dependencies = ["deb_version" "pastel" "thor" "tty-command"];
@@ -6197,10 +6192,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ndbdsac42sl6ldh6jji7k0agc85v6d28wfd3jb3awyl7hsgs9cn";
+ sha256 = "10ncp5pl9jsm81kj89gwyhsilbqhgh0j2cfz66q3ls86g2gsjgmf";
type = "gem";
};
- version = "3.4.0";
+ version = "3.4.3";
};
sentry-rails = {
dependencies = ["railties" "sentry-ruby"];
@@ -6208,10 +6203,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ncl8br0k6fas4n6c4xw4wr59kq5s2liqn1s4790m73k5p272xq1";
+ sha256 = "09qfh3pgjg92cjsn83zkp1vc234gm2j66rld09lfhlviavkzdbad";
type = "gem";
};
- version = "5.17.3";
+ version = "5.18.2";
};
sentry-ruby = {
dependencies = ["bigdecimal" "concurrent-ruby"];
@@ -6219,10 +6214,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1z5v5zzasy04hbgxbj9n8bb39ayllvps3snfgbc5rydh1d5ilyb1";
+ sha256 = "168dq5i95aaps8bppc402qgd8xpxisdpx9z4cqr3zcn6s0dwn9fz";
type = "gem";
};
- version = "5.17.3";
+ version = "5.18.2";
};
sentry-sidekiq = {
dependencies = ["sentry-ruby" "sidekiq"];
@@ -6230,10 +6225,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0n1cr9g15hp08jsqabprd6q34ap61r71f33x28w1xr4ri4hllwfh";
+ sha256 = "0qajyyiwd035rwnxd2zdhh9y2rdx00812ya247nhqb6kqw1s7ml6";
type = "gem";
};
- version = "5.17.3";
+ version = "5.18.2";
};
sexp_processor = {
groups = ["default" "test"];
@@ -6371,6 +6366,16 @@ src:
};
version = "0.1.4";
};
+ simpleidn = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0a9c1mdy12y81ck7mcn9f9i2s2wwzjh1nr92ps354q517zq9dkh8";
+ type = "gem";
+ };
+ version = "0.2.3";
+ };
singleton = {
groups = ["default" "development"];
platforms = [];
@@ -6533,10 +6538,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bhdgfb0pmw9mav1kw9fn0ka012sa0i3h5ppvqssw5xq48nhxnr8";
+ sha256 = "1gdqqwnampxmc54nf6zfy9apkmkpdavzipvfssmjlhnrrjy8qh7f";
type = "gem";
};
- version = "0.2.25";
+ version = "0.2.26";
};
state_machines = {
groups = ["default"];
@@ -6570,16 +6575,6 @@ src:
};
version = "0.8.0";
};
- static_holmes = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1frj0w4bmqpih40sxxig3055rm2ijnw6jkdvnbh5crlq6pnv6p63";
- type = "gem";
- };
- version = "0.7.11";
- };
strings = {
dependencies = ["strings-ansi" "unicode-display_width" "unicode_utils"];
groups = ["default" "development" "test"];
@@ -6601,16 +6596,26 @@ src:
};
version = "0.2.0";
};
+ strscan = {
+ groups = ["coverage" "danger" "default" "development" "omnibus" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01";
+ type = "gem";
+ };
+ version = "3.1.0";
+ };
swd = {
- dependencies = ["activesupport" "attr_required" "httpclient"];
+ dependencies = ["activesupport" "attr_required" "faraday" "faraday-follow_redirects"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12b3q2sw42nnilfb51nlqdv07f31vdv2j595kd99asnkw4cjlf5w";
+ sha256 = "0m86fzmwgw0vc8p6fwvnsdbldpgbqdz9cbp2zj9z06bc4jjf5nsc";
type = "gem";
};
- version = "1.3.0";
+ version = "2.0.3";
};
sync = {
groups = ["default" "development" "test"];
@@ -6733,10 +6738,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rwnq67qm2ngz066sncvg0dv65bsk29qz3xarbv8qan2hi7yw0qg";
+ sha256 = "0lxik4ngvbphivyhss9i59c67zxkc0z7k0r683qshw1gdkfxzd8f";
type = "gem";
};
- version = "1.3.3";
+ version = "1.3.3.1";
};
test_file_finder = {
dependencies = ["faraday"];
@@ -6974,10 +6979,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1m22yrkmbj81rzhlny81j427qdvz57yk5wbcf3km0nf3bl6qiygz";
+ sha256 = "0z7gamf6s83wy0yqms3bi4srirn3fc0lc7n65lqanidxcj1xn5qw";
type = "gem";
};
- version = "1.4.0";
+ version = "1.4.1";
};
tzinfo = {
dependencies = ["concurrent-ruby"];
@@ -7001,15 +7006,15 @@ src:
version = "0.1.0";
};
undercover = {
- dependencies = ["imagen" "rainbow" "rugged"];
+ dependencies = ["bigdecimal" "imagen" "rainbow" "rugged"];
groups = ["coverage" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bp644b1mxwhbkjlm8bmwv8sxkkwkpc7chqxff9a8yxy0n99ambj";
+ sha256 = "1blz21yzd3s2ax75lnhlf4gvh273k9jry6fd7yqnyip5id3si6gg";
type = "gem";
};
- version = "0.4.6";
+ version = "0.5.0";
};
unf = {
dependencies = ["unf_ext"];
@@ -7094,16 +7099,6 @@ src:
};
version = "0.13.0";
};
- uri_template = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0p8qbxlpmg3msw0ihny6a3gsn0yvydx9ksh5knn8dnq06zhqyb1i";
- type = "gem";
- };
- version = "0.7.0";
- };
valid_email = {
dependencies = ["activemodel" "mail"];
groups = ["default"];
@@ -7115,17 +7110,6 @@ src:
};
version = "0.1.3";
};
- validate_email = {
- dependencies = ["activemodel" "mail"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1r1fz29l699arka177c9xw7409d1a3ff95bf7a6pmc97slb91zlx";
- type = "gem";
- };
- version = "0.1.6";
- };
validate_url = {
dependencies = ["activemodel" "public_suffix"];
groups = ["default"];
@@ -7174,10 +7158,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12xi88jvx49p15nx2168wm0r00g90mb4cxzzsjxz92akjk92mkpj";
+ sha256 = "0yqq8srliv2w960gxnfr5sn8dmcppcyd6wmkgq71d1qkymwn8vii";
type = "gem";
};
- version = "3.12.1";
+ version = "3.13.0";
};
virtus = {
dependencies = ["axiom-types" "coercible" "descendants_tracker"];
@@ -7207,10 +7191,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wza7pnwz8ym92gw0x4zr1icialhlw0l032kn4f86vw1vlzxmrd3";
+ sha256 = "0fgpwlvmasj10kx5929xyb4fysqlfb3iixbci68170k6bslssd2a";
type = "gem";
};
- version = "3.5.0";
+ version = "3.7.0";
};
vmstat = {
groups = ["default"];
@@ -7255,15 +7239,15 @@ src:
version = "3.0.0";
};
webfinger = {
- dependencies = ["activesupport" "httpclient"];
+ dependencies = ["activesupport" "faraday" "faraday-follow_redirects"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "18jj50b44a471ig7hw1ax90wxaaz40acmrf6cm7m2iyshlffy53q";
+ sha256 = "0p39802sfnm62r4x5hai8vn6d1wqbxsxnmbynsk8rcvzwyym4yjn";
type = "gem";
};
- version = "1.2.0";
+ version = "2.1.3";
};
webmock = {
dependencies = ["addressable" "crack" "hashdiff"];
diff --git a/pkgs/applications/version-management/gitnr/default.nix b/pkgs/applications/version-management/gitnr/default.nix
index 3e4e1c07f852..5d2813850983 100644
--- a/pkgs/applications/version-management/gitnr/default.nix
+++ b/pkgs/applications/version-management/gitnr/default.nix
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "gitnr";
- version = "0.1.3";
+ version = "0.2.2";
src = fetchFromGitHub {
owner = "reemus-dev";
repo = "gitnr";
rev = "v${version}";
- hash = "sha256-Hsro0y/avI20cFQveQF17NiR3JCNlBKqXbaIce7uxBM=";
+ hash = "sha256-9vx+bGfYuJuafZUY2ZT4SAgrNcSXuMe1kHH/lrpItvM=";
};
- cargoHash = "sha256-Ahzm23AStSwDSgks9j/J15/zo+EH/NgbfCBc3xBcTwQ=";
+ cargoHash = "sha256-ZvF8X+IT7mrKaUaNS4NhYzX9P3hkhNNH/ActxG/6YZE=";
nativeBuildInputs = [
pkg-config
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/reemus-dev/gitnr";
changelog = "https://github.com/reemus-dev/gitnr/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
- maintainers = with maintainers; [ figsoda ];
+ maintainers = with maintainers; [ figsoda matthiasbeyer ];
mainProgram = "gitnr";
};
}
diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix
index f89e80c2daa6..f78401a5220f 100644
--- a/pkgs/applications/version-management/gitoxide/default.nix
+++ b/pkgs/applications/version-management/gitoxide/default.nix
@@ -19,16 +19,16 @@ let
ein = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/ein";
in rustPlatform.buildRustPackage rec {
pname = "gitoxide";
- version = "0.37.0";
+ version = "0.38.0";
src = fetchFromGitHub {
owner = "Byron";
repo = "gitoxide";
rev = "v${version}";
- hash = "sha256-ZnfWIFphIdPHKvpzO0Cn5KCahpvKh56HZun09I1l8Vc=";
+ hash = "sha256-JqWFdZXcmL97w5CochG9kXXH7cN2KMarkNUvfQXbYU0=";
};
- cargoHash = "sha256-oKcCodoMUaduxXXgUV+z7zlg5mc783PSsgoECdW/Uug=";
+ cargoHash = "sha256-EGPx4NNvgGe+LJ8Gn0ne8O4lCA+9p+E9J7OOhLQDWX0=";
nativeBuildInputs = [ cmake pkg-config installShellFiles ];
diff --git a/pkgs/applications/version-management/gitstatus/default.nix b/pkgs/applications/version-management/gitstatus/default.nix
index 2170526c4ec5..cc6037d16c21 100644
--- a/pkgs/applications/version-management/gitstatus/default.nix
+++ b/pkgs/applications/version-management/gitstatus/default.nix
@@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
sha256 = "sha256-b+9bwJ87VV6rbOPobkwMkDXGH34STjYPlt8wCRR5tEc=";
};
+ env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+ NIX_LDFLAGS = "-liconv";
+ };
+
buildInputs = [ (callPackage ./romkatv_libgit2.nix { }) ];
postPatch = ''
diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix
index eac6a917895c..1287d5e6ad3b 100644
--- a/pkgs/applications/version-management/sublime-merge/default.nix
+++ b/pkgs/applications/version-management/sublime-merge/default.nix
@@ -5,9 +5,9 @@ let
in
{
sublime-merge = common {
- buildVersion = "2096";
- aarch64sha256 = "IHPJJ/oQ3SLemRyey5syTL0sf5GEeHSylDX+EQNNQGU=";
- x64sha256 = "41I6p5wNx2pF56np7gHqp396RHpXtQu5ruksUywF/Ug=";
+ buildVersion = "2102";
+ aarch64sha256 = "E//XrWlfvMeRWYfBXVTSSUPlDFY/rzSynJ4aP1WyZ0Y=";
+ x64sha256 = "Odb3ZvJCo4HTvJ7z31J/5wlyhSUpZRFBXP3f/Wkb7tU=";
} { };
sublime-merge-dev = common {
diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix
index ffe9beea5cd8..77959f42af41 100644
--- a/pkgs/applications/video/freetube/default.nix
+++ b/pkgs/applications/video/freetube/default.nix
@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "freetube";
- version = "0.21.3";
+ version = "0.22.0";
src = fetchurl {
url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage";
- hash = "sha256-sg/ycFo4roOJ2sW4naRCE6dwGXVQFzF8uwAZQkS2EY4=";
+ hash = "sha256-YRXKL09XXX6HxC1lsk0iQnTGmPHFwfNL5XRA+u/crus=";
};
passthru.tests = nixosTests.freetube;
@@ -55,6 +55,7 @@ stdenv.mkDerivation rec {
maintainers = with lib.maintainers; [
ryneeverett
alyaeanyx
+ ryand56
];
inherit (electron.meta) platforms;
mainProgram = "freetube";
diff --git a/pkgs/applications/video/qctools/default.nix b/pkgs/applications/video/qctools/default.nix
index cbe565fe73c8..4f19af793880 100644
--- a/pkgs/applications/video/qctools/default.nix
+++ b/pkgs/applications/video/qctools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, qmake, wrapQtAppsHook, ffmpeg, qtmultimedia, qwt }:
+{ lib, stdenv, fetchurl, qmake, wrapQtAppsHook, ffmpeg_6, qtmultimedia, qwt }:
stdenv.mkDerivation rec {
pname = "qctools";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ qmake wrapQtAppsHook ];
- buildInputs = [ ffmpeg qtmultimedia qwt ];
+ buildInputs = [ ffmpeg_6 qtmultimedia qwt ];
installPhase = ''
runHook preInstall
@@ -30,11 +30,11 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
- meta = with lib; {
+ meta = {
description = "Audiovisual analytics and filtering of video files";
homepage = "https://mediaarea.net/QCTools";
- license = licenses.gpl3Only;
- maintainers = with maintainers; [ orivej ];
- platforms = platforms.linux;
+ license = lib.licenses.gpl3Only;
+ maintainers = with lib.maintainers; [ orivej ];
+ platforms = lib.platforms.linux;
};
}
diff --git a/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock b/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock
index dbb3ee5a6b79..19095505c61d 100644
--- a/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock
+++ b/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock
@@ -5,7 +5,7 @@ version = 3
[[package]]
name = "acpi_tables"
version = "0.1.0"
-source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#925e3f8aff3551df67ec4472fc221564e30c8847"
+source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#e268627630839bd22f1c13e7e81ec70c7e9b73d6"
dependencies = [
"zerocopy",
]
@@ -36,9 +36,9 @@ dependencies = [
[[package]]
name = "anstream"
-version = "0.6.14"
+version = "0.6.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
dependencies = [
"anstyle",
"anstyle-parse",
@@ -51,9 +51,9 @@ dependencies = [
[[package]]
name = "anstyle"
-version = "1.0.7"
+version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
[[package]]
name = "anstyle-parse"
@@ -66,9 +66,9 @@ dependencies = [
[[package]]
name = "anstyle-query"
-version = "1.0.2"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
dependencies = [
"windows-sys 0.52.0",
]
@@ -85,9 +85,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.86"
+version = "1.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8"
[[package]]
name = "api_client"
@@ -129,8 +129,8 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb"
dependencies = [
- "event-listener 5.3.0",
- "event-listener-strategy 0.5.1",
+ "event-listener",
+ "event-listener-strategy",
"futures-core",
"pin-project-lite",
]
@@ -142,8 +142,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f2776ead772134d55b62dd45e59a79e21612d85d0af729b8b7d3967d601a62a"
dependencies = [
"concurrent-queue",
- "event-listener 5.3.0",
- "event-listener-strategy 0.5.1",
+ "event-listener",
+ "event-listener-strategy",
"futures-core",
"pin-project-lite",
]
@@ -193,12 +193,12 @@ dependencies = [
[[package]]
name = "async-lock"
-version = "3.3.0"
+version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
dependencies = [
- "event-listener 4.0.3",
- "event-listener-strategy 0.4.0",
+ "event-listener",
+ "event-listener-strategy",
"pin-project-lite",
]
@@ -215,7 +215,7 @@ dependencies = [
"async-task",
"blocking",
"cfg-if",
- "event-listener 5.3.0",
+ "event-listener",
"futures-lite",
"rustix",
"tracing",
@@ -230,7 +230,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn",
]
[[package]]
@@ -265,7 +265,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn",
]
[[package]]
@@ -303,7 +303,7 @@ checksum = "6c2ce686adbebce0ee484a502c440b4657739adbad65eadf06d64f5816ee9765"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn",
]
[[package]]
@@ -387,24 +387,24 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "cfg_aliases"
-version = "0.1.1"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
[[package]]
name = "clap"
-version = "4.5.4"
+version = "4.5.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
+checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc"
dependencies = [
"clap_builder",
]
[[package]]
name = "clap_builder"
-version = "4.5.2"
+version = "4.5.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99"
dependencies = [
"anstream",
"anstyle",
@@ -415,13 +415,13 @@ dependencies = [
[[package]]
name = "clap_lex"
-version = "0.7.0"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
[[package]]
name = "cloud-hypervisor"
-version = "41.0.0"
+version = "42.0.0"
dependencies = [
"anyhow",
"api_client",
@@ -456,6 +456,16 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+[[package]]
+name = "concat-idents"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d"
+dependencies = [
+ "quote",
+ "syn",
+]
+
[[package]]
name = "concurrent-queue"
version = "2.5.0"
@@ -485,9 +495,9 @@ dependencies = [
[[package]]
name = "crc32fast"
-version = "1.4.0"
+version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
dependencies = [
"cfg-if",
]
@@ -529,7 +539,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim",
- "syn 2.0.66",
+ "syn",
]
[[package]]
@@ -540,7 +550,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [
"darling_core",
"quote",
- "syn 2.0.66",
+ "syn",
]
[[package]]
@@ -549,17 +559,6 @@ version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e"
-[[package]]
-name = "derivative"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
[[package]]
name = "devices"
version = "0.1.0"
@@ -656,14 +655,14 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn",
]
[[package]]
name = "env_filter"
-version = "0.1.0"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea"
+checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
dependencies = [
"log",
"regex",
@@ -710,43 +709,22 @@ dependencies = [
[[package]]
name = "event-listener"
-version = "4.0.3"
+version = "5.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
dependencies = [
"concurrent-queue",
"parking",
"pin-project-lite",
]
-[[package]]
-name = "event-listener"
-version = "5.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
-dependencies = [
- "event-listener 4.0.3",
- "pin-project-lite",
-]
-
[[package]]
name = "event-listener-strategy"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3"
dependencies = [
- "event-listener 5.3.0",
+ "event-listener",
"pin-project-lite",
]
@@ -763,9 +741,9 @@ dependencies = [
[[package]]
name = "fastrand"
-version = "2.1.0"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
[[package]]
name = "fdt"
@@ -860,14 +838,14 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn",
]
[[package]]
name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
[[package]]
name = "futures-task"
@@ -954,9 +932,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "hashbrown"
-version = "0.14.3"
+version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
[[package]]
name = "hermit-abi"
@@ -982,6 +960,8 @@ version = "0.1.0"
dependencies = [
"anyhow",
"byteorder",
+ "cfg-if",
+ "concat-idents",
"env_logger",
"iced-x86",
"igvm",
@@ -1056,18 +1036,18 @@ dependencies = [
[[package]]
name = "instant"
-version = "0.1.12"
+version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
dependencies = [
"cfg-if",
]
[[package]]
name = "io-uring"
-version = "0.6.3"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9febecd4aebbe9c7c23c8e536e966805fdf09944c8a915e7991ee51acb67087"
+checksum = "595a0399f411a508feb2ec1e970a4a30c249351e30208960d58298de8660b0e5"
dependencies = [
"bitflags 1.3.2",
"libc",
@@ -1084,9 +1064,9 @@ dependencies = [
[[package]]
name = "is_terminal_polyfill"
-version = "1.70.0"
+version = "1.70.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
[[package]]
name = "itoa"
@@ -1105,9 +1085,9 @@ dependencies = [
[[package]]
name = "kvm-bindings"
-version = "0.8.1"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82e7e8725a39a0015e511a46cc1f7d90cecc180db1610c4d0d4339a9e48bd21"
+checksum = "2efe3f1a4437bffe000e6297a593b98184213cd27486776c335f95ab53d48e3a"
dependencies = [
"serde",
"vmm-sys-util",
@@ -1116,9 +1096,9 @@ dependencies = [
[[package]]
name = "kvm-ioctls"
-version = "0.17.0"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bedae2ca4a531bebe311abaf9691f5cc14eaa21475243caa2e39c43bb872947d"
+checksum = "92c2176b91f68903b54ac8c6185bada7d607ca6110998976ff15c032f88a7d39"
dependencies = [
"bitflags 2.6.0",
"kvm-bindings",
@@ -1139,15 +1119,15 @@ dependencies = [
[[package]]
name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "libc"
-version = "0.2.155"
+version = "0.2.158"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
[[package]]
name = "libredox"
@@ -1187,9 +1167,9 @@ dependencies = [
[[package]]
name = "linux-loader"
-version = "0.11.0"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb68dd3452f25a8defaf0ae593509cff0c777683e4d8924f59ac7c5f89267a83"
+checksum = "3d379d0089d0fbf4161c35a4fdfd76125923f1a93632c49195f5372b4c0b1472"
dependencies = [
"vm-memory",
]
@@ -1263,8 +1243,8 @@ checksum = "9bec4598fddb13cc7b528819e697852653252b760f1228b7642679bf2ff2cd07"
[[package]]
name = "mshv-bindings"
-version = "0.2.0"
-source = "git+https://github.com/rust-vmm/mshv?tag=v0.2.0#dd0a9f5ab9c32673e88d6de200af788dbfca6a72"
+version = "0.3.0"
+source = "git+https://github.com/rust-vmm/mshv?tag=v0.3.0#fda05380ea4c68b807996299d5ffb2854ca6d01d"
dependencies = [
"libc",
"num_enum",
@@ -1276,8 +1256,8 @@ dependencies = [
[[package]]
name = "mshv-ioctls"
-version = "0.2.0"
-source = "git+https://github.com/rust-vmm/mshv?tag=v0.2.0#dd0a9f5ab9c32673e88d6de200af788dbfca6a72"
+version = "0.3.0"
+source = "git+https://github.com/rust-vmm/mshv?tag=v0.3.0#fda05380ea4c68b807996299d5ffb2854ca6d01d"
dependencies = [
"libc",
"mshv-bindings",
@@ -1326,9 +1306,9 @@ dependencies = [
[[package]]
name = "nix"
-version = "0.28.0"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
dependencies = [
"bitflags 2.6.0",
"cfg-if",
@@ -1370,7 +1350,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn",
]
[[package]]
@@ -1384,9 +1364,9 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
[[package]]
name = "open-enum"
@@ -1405,14 +1385,14 @@ checksum = "8d1296fab5231654a5aec8bf9e87ba4e3938c502fc4c3c0425a00084c78944be"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn",
]
[[package]]
name = "openssl-src"
-version = "300.3.1+3.3.1"
+version = "300.3.2+3.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91"
+checksum = "a211a18d945ef7e648cc6e0058f4c548ee46aab922ea203e0d30e966ea23647b"
dependencies = [
"cc",
]
@@ -1452,9 +1432,9 @@ dependencies = [
[[package]]
name = "parking"
-version = "2.2.0"
+version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
[[package]]
name = "parking_lot"
@@ -1558,9 +1538,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "piper"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
dependencies = [
"atomic-waker",
"fastrand",
@@ -1618,7 +1598,7 @@ dependencies = [
"proc-macro2",
"quote",
"regex",
- "syn 2.0.66",
+ "syn",
]
[[package]]
@@ -1699,9 +1679,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.85"
+version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
dependencies = [
"unicode-ident",
]
@@ -1782,9 +1762,9 @@ dependencies = [
[[package]]
name = "redox_users"
-version = "0.4.5"
+version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
dependencies = [
"getrandom",
"libredox",
@@ -1828,7 +1808,7 @@ checksum = "46aef80f842736de545ada6ec65b81ee91504efd6853f4b96de7414c42ae7443"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn",
]
[[package]]
@@ -1879,22 +1859,22 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.203"
+version = "1.0.208"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.203"
+version = "1.0.208"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn",
]
[[package]]
@@ -1916,7 +1896,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn",
]
[[package]]
@@ -1939,7 +1919,7 @@ dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn",
]
[[package]]
@@ -2024,17 +2004,6 @@ version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
[[package]]
name = "syn"
version = "2.0.66"
@@ -2048,12 +2017,13 @@ dependencies = [
[[package]]
name = "tempfile"
-version = "3.10.1"
+version = "3.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53"
dependencies = [
"cfg-if",
"fastrand",
+ "once_cell",
"rustix",
"windows-sys 0.52.0",
]
@@ -2100,7 +2070,7 @@ checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn",
]
[[package]]
@@ -2169,7 +2139,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn",
]
[[package]]
@@ -2206,9 +2176,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
[[package]]
name = "utf8parse"
-version = "0.2.1"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "uuid"
@@ -2217,6 +2187,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
dependencies = [
"getrandom",
+ "rand",
+ "uuid-macro-internal",
+]
+
+[[package]]
+name = "uuid-macro-internal"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee1cd046f83ea2c4e920d6ee9f7c3537ef928d75dce5d84a87c2c5d6b3999a3a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
]
[[package]]
@@ -2234,7 +2217,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "vfio-bindings"
version = "0.4.0"
-source = "git+https://github.com/rust-vmm/vfio?branch=main#64171f3da1af7926adf162ecf545cb05fb9243c9"
+source = "git+https://github.com/rust-vmm/vfio?branch=main#a51a4746b0d317bfc21fa49d40f9287f3b8137fd"
dependencies = [
"vmm-sys-util",
]
@@ -2242,7 +2225,7 @@ dependencies = [
[[package]]
name = "vfio-ioctls"
version = "0.2.0"
-source = "git+https://github.com/rust-vmm/vfio?branch=main#64171f3da1af7926adf162ecf545cb05fb9243c9"
+source = "git+https://github.com/rust-vmm/vfio?branch=main#a51a4746b0d317bfc21fa49d40f9287f3b8137fd"
dependencies = [
"byteorder",
"kvm-bindings",
@@ -2260,7 +2243,7 @@ dependencies = [
[[package]]
name = "vfio_user"
version = "0.1.0"
-source = "git+https://github.com/rust-vmm/vfio-user?branch=main#a1f6e52829e069b6d698b2cfeecac742e4653186"
+source = "git+https://github.com/rust-vmm/vfio-user?branch=main#bf7d7e851b604d8414a7960fb9137b59fc42421d"
dependencies = [
"bitflags 1.3.2",
"libc",
@@ -2276,21 +2259,22 @@ dependencies = [
[[package]]
name = "vhost"
-version = "0.11.0"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6be08d1166d41a78861ad50212ab3f9eca0729c349ac3a7a8f557c62406b87cc"
+checksum = "7c1c4c6c9f79fbe3150d9a403008ca416d34c489897effdda28b646f09900aad"
dependencies = [
"bitflags 2.6.0",
"libc",
+ "uuid",
"vm-memory",
"vmm-sys-util",
]
[[package]]
name = "vhost-user-backend"
-version = "0.15.0"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f0ffb1dd8e00a708a0e2c32d5efec5812953819888591fff9ff68236b8a5096"
+checksum = "73768c8584e0be5ed8feb063785910cabe3f1af6661a5953fd3247fa611ddfaf"
dependencies = [
"libc",
"log",
@@ -2340,9 +2324,9 @@ dependencies = [
[[package]]
name = "virtio-bindings"
-version = "0.2.2"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "878bcb1b2812a10c30d53b0ed054999de3d98f25ece91fc173973f9c57aaae86"
+checksum = "68d0df4f5ad79b1dc81b5913ac737e24a84dcd5100f36ed953a1faec18aba241"
[[package]]
name = "virtio-devices"
@@ -2356,6 +2340,7 @@ dependencies = [
"event_monitor",
"libc",
"log",
+ "mshv-ioctls",
"net_gen",
"net_util",
"pci",
@@ -2379,9 +2364,9 @@ dependencies = [
[[package]]
name = "virtio-queue"
-version = "0.12.0"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07d8406e7250c934462de585d8f2d2781c31819bca1fbb7c5e964ca6bbaabfe8"
+checksum = "ffb1761348d3b5e82131379b9373435b48dc8333100bff3f1cdf9cc541a0ad83"
dependencies = [
"log",
"virtio-bindings",
@@ -2418,9 +2403,9 @@ source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#ef5bd734f5f66fb0772
[[package]]
name = "vm-memory"
-version = "0.14.1"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c3aba5064cc5f6f7740cddc8dae34d2d9a311cac69b60d942af7f3ab8fc49f4"
+checksum = "a320fc11792e063174402ff444aa3c80363cbf1e31c47b5ef74124406c334ce6"
dependencies = [
"arc-swap",
"libc",
@@ -2555,7 +2540,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn",
"wasm-bindgen-shared",
]
@@ -2577,7 +2562,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -2753,19 +2738,19 @@ dependencies = [
[[package]]
name = "xdg-home"
-version = "1.1.0"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e"
+checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8"
dependencies = [
"libc",
- "winapi",
+ "windows-sys 0.52.0",
]
[[package]]
name = "zbus"
-version = "4.1.2"
+version = "4.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9ff46f2a25abd690ed072054733e0bc3157e3d4c45f41bd183dce09c2ff8ab9"
+checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725"
dependencies = [
"async-broadcast",
"async-executor",
@@ -2777,9 +2762,8 @@ dependencies = [
"async-task",
"async-trait",
"blocking",
- "derivative",
"enumflags2",
- "event-listener 5.3.0",
+ "event-listener",
"futures-core",
"futures-sink",
"futures-util",
@@ -2802,16 +2786,15 @@ dependencies = [
[[package]]
name = "zbus_macros"
-version = "4.1.2"
+version = "4.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0e3852c93dcdb49c9462afe67a2a468f7bd464150d866e861eaf06208633e0"
+checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "regex",
- "syn 1.0.109",
- "zvariant_utils 1.1.0",
+ "syn",
+ "zvariant_utils",
]
[[package]]
@@ -2843,14 +2826,14 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn",
]
[[package]]
name = "zvariant"
-version = "4.1.2"
+version = "4.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9"
+checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe"
dependencies = [
"endi",
"enumflags2",
@@ -2861,35 +2844,24 @@ dependencies = [
[[package]]
name = "zvariant_derive"
-version = "4.1.2"
+version = "4.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859"
+checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.66",
- "zvariant_utils 2.0.0",
+ "syn",
+ "zvariant_utils",
]
[[package]]
name = "zvariant_utils"
-version = "1.1.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172"
+checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "zvariant_utils"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
+ "syn",
]
diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix
index 9af9b964825f..2735c7f9e800 100644
--- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix
+++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix
@@ -4,23 +4,23 @@
rustPlatform.buildRustPackage rec {
pname = "cloud-hypervisor";
- version = "41.0";
+ version = "42.0";
src = fetchFromGitHub {
owner = "cloud-hypervisor";
repo = pname;
rev = "v${version}";
- hash = "sha256-CI7hWRZUexvmBZJ8cPXxZxwmcxLnw6h9PFMhoaj9jh4=";
+ hash = "sha256-AuKUwYxAXY/rNQk5Jx4WxGj+wChRrDkw8fp3uO3KBv0=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
- "acpi_tables-0.1.0" = "sha256-a6ojB2XVeH+YzzXRle0agg+ljn0Jsgyaf6TJZAGt8sQ=";
+ "acpi_tables-0.1.0" = "sha256-ReIibUCFiLVq6AFqFupue/3BEQUJoImCLKaUBSVpdl4=";
"micro_http-0.1.0" = "sha256-yIgcoEfc7eeS1+bijzkifaBxVNHa71Y+Vn79owMaKvM=";
- "mshv-bindings-0.2.0" = "sha256-NYViItbjt1Q2G4yO3j37naHe9EJ+llkjrNt6w4zoiW8=";
- "vfio-bindings-0.4.0" = "sha256-mzdYH23CVWm7fvu4+1cFHlPhkUjh7+JlU/ScoXaDNgA=";
- "vfio_user-0.1.0" = "sha256-LJ84k9pMkSAaWkuaUd+2LnPXnNgrP5LdbPOc1Yjz5xA=";
+ "mshv-bindings-0.3.0" = "sha256-IqmFB4nyENsfEPqiSYv52sL4LDiv+rCabTiIxE1MWZ0=";
+ "vfio-bindings-0.4.0" = "sha256-ie/RcYbojLCGJkc6Yl97iUhOxnYk8/DO7JKlhMtT/6w=";
+ "vfio_user-0.1.0" = "sha256-jScCwZEqoWYGBBKjoxB6xXOltX1/5h4Jgpcy5RzzTtg=";
"vm-fdt-0.3.0" = "sha256-9PywgSnSL+8gT6lcl9t6w7X4fEINa+db+H1vWS+gDOI=";
};
};
diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix
index 5dca484e5e9e..815330b136f3 100644
--- a/pkgs/applications/virtualization/crun/default.nix
+++ b/pkgs/applications/virtualization/crun/default.nix
@@ -39,13 +39,13 @@ let
in
stdenv.mkDerivation rec {
pname = "crun";
- version = "1.17";
+ version = "1.18";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = version;
- hash = "sha256-d2YBpW8KivWYPRPpvXlT5tWPX8hvTCaSkMxdSuswYRA=";
+ hash = "sha256-t04jmLfkxZhvlfW79s8G7cc4W9ptFUQsD2a4/VODAC8=";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/virtualization/ddev/default.nix b/pkgs/applications/virtualization/ddev/default.nix
index 95aacbeb6386..e4f8f1352eb4 100644
--- a/pkgs/applications/virtualization/ddev/default.nix
+++ b/pkgs/applications/virtualization/ddev/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ddev";
- version = "1.23.4";
+ version = "1.23.5";
src = fetchFromGitHub {
owner = "ddev";
repo = "ddev";
rev = "v${version}";
- hash = "sha256-+Ou9YbFwUVu6AqR041ngnVb9TpiO1UMph2w1zsbEMEM=";
+ hash = "sha256-1zhHiVSwSsc9CFrOV1juJPiczr0e0SYkIJrLKetul/4=";
};
vendorHash = null;
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 1ffa016159aa..36afd5bedcdf 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -24,6 +24,16 @@ rec {
, knownVulnerabilities ? []
}:
let
+ docker-meta = {
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [
+ offline
+ vdemeester
+ periklis
+ teutat3s
+ ];
+ };
+
docker-runc = runc.overrideAttrs {
pname = "docker-runc";
inherit version;
@@ -160,6 +170,11 @@ rec {
++ lib.optional (!withBtrfs) "exclude_graphdriver_btrfs"
++ lib.optional (!withLvm) "exclude_graphdriver_devicemapper"
++ lib.optional withSeccomp "seccomp";
+
+ meta = docker-meta // {
+ homepage = "https://mobyproject.org/";
+ description = "A collaborative project for the container ecosystem to assemble container-based systems.";
+ };
});
plugins = lib.optional buildxSupport docker-buildx
@@ -254,10 +269,10 @@ rec {
passthru = {
# Exposed for tarsum build on non-linux systems (build-support/docker/default.nix)
inherit moby-src;
- tests = lib.optionals (!clientOnly) { inherit (nixosTests) docker; };
+ tests = lib.optionalAttrs (!clientOnly) { inherit (nixosTests) docker; };
};
- meta = with lib; {
+ meta = docker-meta // {
homepage = "https://www.docker.com/";
description = "Open source project to pack, ship and run any application as a lightweight container";
longDescription = ''
@@ -265,8 +280,6 @@ rec {
To enable the docker daemon on NixOS, set the `virtualisation.docker.enable` option to `true`.
'';
- license = licenses.asl20;
- maintainers = with maintainers; [ offline vdemeester periklis teutat3s ];
mainProgram = "docker";
inherit knownVulnerabilities;
};
diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix
index c6cbdc8e2c76..525013bf86e0 100644
--- a/pkgs/applications/virtualization/singularity/packages.nix
+++ b/pkgs/applications/virtualization/singularity/packages.nix
@@ -9,14 +9,14 @@ let
callPackage
(import ./generic.nix rec {
pname = "apptainer";
- version = "1.3.4";
+ version = "1.3.5";
projectName = "apptainer";
src = fetchFromGitHub {
owner = "apptainer";
repo = "apptainer";
rev = "refs/tags/v${version}";
- hash = "sha256-eByF0OpL1OKGq0wY7kw8Sv9sZuVE0K3TGIm4Chk9PC4=";
+ hash = "sha256-yBUCUHc9vgyKFqAOHXQjAYQnmN0yXSIvkpR/s3LNAmk=";
};
# Update by running
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 13d254699fef..b1c04d305393 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -49,9 +49,6 @@
yasm,
glslang,
nixosTests,
- # If open-watcom-bin is not passed, VirtualBox will fall back to use
- # the shipped alternative sources (assembly).
- open-watcom-bin,
makeself,
perl,
vulkan-loader,
@@ -78,8 +75,8 @@ let
buildType = "release";
# Use maintainers/scripts/update.nix to update the version and all related hashes or
# change the hashes in extpack.nix and guest-additions/default.nix as well manually.
- virtualboxVersion = "7.0.20";
- virtualboxSha256 = "5cf5979bef66ebab3fcd495796b215a940e8a07c469d4bc56d064de44222dd02";
+ virtualboxVersion = "7.0.22";
+ virtualboxSha256 = "cf3ddf633ca410f1b087b0722413e83247cda4f14d33323dc122a4a42ff61981";
kvmPatchVersion = "20240828";
kvmPatchHash = "sha256-g0esJbB1IGyLGZMLFJIY8ZYdHWuiM5IZtLMHZvCY6bs=";
@@ -295,7 +292,6 @@ stdenv.mkDerivation (finalAttrs: {
${optionalString (!enableHardening) "--disable-hardening"} \
${optionalString (!enable32bitGuests) "--disable-vmmraw"} \
${optionalString enableWebService "--enable-webservice"} \
- ${optionalString (open-watcom-bin != null) "--with-ow-dir=${open-watcom-bin}"} \
${optionalString (enableKvm) "--with-kvm"} \
${extraConfigureFlags} \
--disable-kmods
diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix
index 524077cd02fd..dfb0bd98142b 100644
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@@ -14,7 +14,7 @@ fetchurl rec {
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
# Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
let
- value = "d750fb17688d70e0cb2d7b06f1ad3a661303793f4d1ac39cfa9a54806b89da25";
+ value = "6b0c16074dde1ea273b15e091336034368217ba569e09359a63c4d32af558886";
in
assert (builtins.stringLength value) == 64;
value;
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix
index 9eda8a64da98..0aed33ced10b 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix
@@ -9,7 +9,7 @@ let
in
fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
- sha256 = "4c7523fa6d17436e3b7788f62956674270572cfefa340d03111b85f8517d5981";
+ sha256 = "486f90cbfe9ed4bf2b12d726ebf54a839758a237e967aa65fc2c92d90a963021";
meta = {
description = "Guest additions ISO for VirtualBox";
longDescription = ''
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix
index f2571d11fe15..e94206070d16 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix
@@ -28,11 +28,11 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "VirtualBox-GuestAdditions-builder-${kernel.version}";
- version = "7.0.20";
+ version = "7.0.22";
src = fetchurl {
url = "https://download.virtualbox.org/virtualbox/${finalAttrs.version}/VirtualBox-${finalAttrs.version}.tar.bz2";
- sha256 = "5cf5979bef66ebab3fcd495796b215a940e8a07c469d4bc56d064de44222dd02";
+ sha256 = "cf3ddf633ca410f1b087b0722413e83247cda4f14d33323dc122a4a42ff61981";
};
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration";
diff --git a/pkgs/build-support/build-graalvm-native-image/default.nix b/pkgs/build-support/build-graalvm-native-image/default.nix
index 0ac84b000575..d2f3aef8860c 100644
--- a/pkgs/build-support/build-graalvm-native-image/default.nix
+++ b/pkgs/build-support/build-graalvm-native-image/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation ({
buildPhase = args.buildPhase or ''
runHook preBuild
- native-image -jar "$jar" $(export -p | sed -n 's/^declare -x \([^=]\+\)=.*$/ -E\1/p' | tr -d \\n) ''${nativeImageBuildArgs[@]}
+ native-image -jar "$jar" ''${nativeImageBuildArgs[@]}
runHook postBuild
'';
diff --git a/pkgs/development/compilers/nim/build-nim-package.nix b/pkgs/build-support/build-nim-package.nix
similarity index 100%
rename from pkgs/development/compilers/nim/build-nim-package.nix
rename to pkgs/build-support/build-nim-package.nix
diff --git a/pkgs/build-support/fetchsavannah/default.nix b/pkgs/build-support/fetchsavannah/default.nix
index e75e25fc1e70..0849323d582c 100644
--- a/pkgs/build-support/fetchsavannah/default.nix
+++ b/pkgs/build-support/fetchsavannah/default.nix
@@ -8,5 +8,6 @@ lib.makeOverridable (
inherit name;
url = "https://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo}-${rev}.tar.gz";
meta.homepage = "https://git.savannah.gnu.org/cgit/${repo}.git/";
+ passthru.gitRepoUrl = "https://git.savannah.gnu.org/git/${repo}.git";
} // removeAttrs args [ "repo" "rev" ]) // { inherit rev; }
)
diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh
index 52d4155f4604..a82728ef1025 100644
--- a/pkgs/build-support/fetchurl/builder.sh
+++ b/pkgs/build-support/fetchurl/builder.sh
@@ -19,8 +19,7 @@ curl=(
--user-agent "curl/$curlVersion Nixpkgs/$nixpkgsVersion"
)
-# Default fallback value defined in pkgs/build-support/fetchurl/default.nix
-if [ "$SSL_CERT_FILE" == "/no-cert-file.crt" ]; then
+if ! [ -f "$SSL_CERT_FILE" ]; then
curl+=(--insecure)
fi
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index ccfc02d47c54..e4a70743334b 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -220,26 +220,20 @@ stdenvNoCC.mkDerivation (
# New-style output content requirements.
inherit (hash_) outputHashAlgo outputHash;
+ # Disable TLS verification only when we know the hash and no credentials are
+ # needed to access the resource
SSL_CERT_FILE =
- let
- nixSSLCertFile = builtins.getEnv "NIX_SSL_CERT_FILE";
- in
- if nixSSLCertFile != "" then
- nixSSLCertFile
- else if
+ if
(
hash_.outputHash == ""
|| hash_.outputHash == lib.fakeSha256
|| hash_.outputHash == lib.fakeSha512
|| hash_.outputHash == lib.fakeHash
- # Make sure we always enforce TLS verification when credentials
- # are needed to access the resource
|| netrcPhase != null
)
then
"${cacert}/etc/ssl/certs/ca-bundle.crt"
else
- # Fallback to stdenv default, see pkgs/stdenv/generic/setup.sh
"/no-cert-file.crt";
outputHashMode = if (recursiveHash || executable) then "recursive" else "flat";
diff --git a/pkgs/build-support/kernel/make-initrd-ng.nix b/pkgs/build-support/kernel/make-initrd-ng.nix
index b0b0143c5ca9..a7542610a72d 100644
--- a/pkgs/build-support/kernel/make-initrd-ng.nix
+++ b/pkgs/build-support/kernel/make-initrd-ng.nix
@@ -8,7 +8,7 @@ let
# compression type and filename extension.
compressorName = fullCommand: builtins.elemAt (builtins.match "([^ ]*/)?([^ ]+).*" fullCommand) 1;
in
-{ stdenvNoCC, libarchive, ubootTools, lib, pkgsBuildHost, makeInitrdNGTool, binutils, runCommand
+{ stdenvNoCC, cpio, ubootTools, lib, pkgsBuildHost, makeInitrdNGTool, binutils, runCommand
# Name of the derivation (not of the resulting file!)
, name ? "initrd"
@@ -74,7 +74,7 @@ in
passAsFile = ["contents"];
contents = builtins.toJSON contents;
- nativeBuildInputs = [makeInitrdNGTool libarchive] ++ lib.optional makeUInitrd ubootTools ++ lib.optional strip binutils;
+ nativeBuildInputs = [makeInitrdNGTool cpio] ++ lib.optional makeUInitrd ubootTools ++ lib.optional strip binutils;
STRIP = if strip then "${pkgsBuildHost.binutils.targetPrefix}strip" else null;
}) ''
@@ -85,7 +85,7 @@ in
for PREP in $prepend; do
cat $PREP >> $out/initrd
done
- (cd root && find . -print0 | sort -z | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @- | eval -- $compress >> "$out/initrd")
+ (cd root && find . -print0 | sort -z | cpio --quiet -o -H newc -R +0:+0 --reproducible --null | eval -- $compress >> "$out/initrd")
if [ -n "$makeUInitrd" ]; then
mkimage -A "$uInitrdArch" -O linux -T ramdisk -C "$uInitrdCompression" -d "$out/initrd" $out/initrd.img
diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix
index 5f8d1eee8ce4..e996094d1f8a 100644
--- a/pkgs/build-support/kernel/make-initrd.nix
+++ b/pkgs/build-support/kernel/make-initrd.nix
@@ -18,7 +18,7 @@ let
# compression type and filename extension.
compressorName = fullCommand: builtins.elemAt (builtins.match "([^ ]*/)?([^ ]+).*" fullCommand) 1;
in
-{ stdenvNoCC, perl, libarchive, ubootTools, lib, pkgsBuildHost
+{ stdenvNoCC, perl, cpio, ubootTools, lib, pkgsBuildHost
# Name of the derivation (not of the resulting file!)
, name ? "initrd"
@@ -80,7 +80,7 @@ in stdenvNoCC.mkDerivation (rec {
builder = ./make-initrd.sh;
- nativeBuildInputs = [ perl libarchive ]
+ nativeBuildInputs = [ perl cpio ]
++ lib.optional makeUInitrd ubootTools;
compress = "${_compressorExecutable} ${lib.escapeShellArgs _compressorArgsReal}";
diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh
index 8f64114d54c3..0149c5d487ac 100644
--- a/pkgs/build-support/kernel/make-initrd.sh
+++ b/pkgs/build-support/kernel/make-initrd.sh
@@ -40,7 +40,7 @@ for PREP in $prepend; do
cat $PREP >> $out/initrd
done
(cd root && find * .[^.*] -exec touch -h -d '@1' '{}' +)
-(cd root && find * .[^.*] -print0 | sort -z | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @- | eval -- $compress >> "$out/initrd")
+(cd root && find * .[^.*] -print0 | sort -z | cpio --quiet -o -H newc -R +0:+0 --reproducible --null | eval -- $compress >> "$out/initrd")
if [ -n "$makeUInitrd" ]; then
mkimage -A "$uInitrdArch" -O linux -T ramdisk -C "$uInitrdCompression" -d "$out/initrd" $out/initrd.img
diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/by-name/_1/_1password-cli/package.nix
similarity index 63%
rename from pkgs/applications/misc/1password/default.nix
rename to pkgs/by-name/_1/_1password-cli/package.nix
index 81cb76043f8e..085013667620 100644
--- a/pkgs/applications/misc/1password/default.nix
+++ b/pkgs/by-name/_1/_1password-cli/package.nix
@@ -1,8 +1,19 @@
-{ lib, stdenv, fetchurl, fetchzip, autoPatchelfHook, installShellFiles, cpio, xar, _1password, testers }:
+{
+ lib,
+ stdenv,
+ fetchurl,
+ fetchzip,
+ autoPatchelfHook,
+ installShellFiles,
+ cpio,
+ xar,
+ versionCheckHook,
+}:
let
inherit (stdenv.hostPlatform) system;
- fetch = srcPlatform: hash: extension:
+ fetch =
+ srcPlatform: hash: extension:
let
args = {
url = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_${srcPlatform}_v${version}.${extension}";
@@ -12,12 +23,14 @@ let
if extension == "zip" then fetchzip args else fetchurl args;
pname = "1password-cli";
- version = "2.29.0";
+ version = "2.30.0";
sources = rec {
- aarch64-linux = fetch "linux_arm64" "sha256-sBbdkoacGI/gawM4YH+BBCLDhC2B+cE4iKVGHBhwkic=" "zip";
- i686-linux = fetch "linux_386" "sha256-TTd5juT0Aqp1+OfunXcuk0KbL6HIHQV31+1Q1e0GYMY=" "zip";
- x86_64-linux = fetch "linux_amd64" "sha256-Bb6fNoeNxlbDfwt7Jr8BaKCmFUwSdsLQdVoCmQCNmLA=" "zip";
- aarch64-darwin = fetch "apple_universal" "sha256-/ryklZnGhrgJggDIa8HmuDsHAXkdrWeXKCQGGVwUAAo=" "pkg";
+ aarch64-linux = fetch "linux_arm64" "sha256-KNduqspTzLEHmymSefLnnhIBcIQWx2tshvOc0NwDek0=" "zip";
+ i686-linux = fetch "linux_386" "sha256-StdWtD3tz6bKqSem/GFqeRHzkbv4aP7d7dKKtgNhuY8=" "zip";
+ x86_64-linux = fetch "linux_amd64" "sha256-bzhRkpR3te1bcBEfP2BR6SECTC9sRFDshl7B+/278Kg=" "zip";
+ aarch64-darwin =
+ fetch "apple_universal" "sha256-L1SZWQWjAJDZydlAttbWLS7igZNAvOmIyaUUdVbvEa8="
+ "pkg";
x86_64-darwin = aarch64-darwin;
};
platforms = builtins.attrNames sources;
@@ -32,9 +45,15 @@ stdenv.mkDerivation {
else
throw "Source for ${pname} is not available for ${system}";
- nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
+ nativeBuildInputs = [
+ installShellFiles
+ versionCheckHook
+ ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook;
- buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ xar cpio ];
+ buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+ xar
+ cpio
+ ];
unpackPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
xar -xf $src
@@ -59,14 +78,11 @@ stdenv.mkDerivation {
doInstallCheck = true;
- installCheckPhase = ''
- $out/bin/${mainProgram} --version
- '';
+ versionCheckProgram = "${builtins.placeholder "out"}/bin/${mainProgram}";
+ versionCheckProgramArg = [ "--version" ];
- passthru.updateScript = ./update.sh;
-
- passthru.tests.version = testers.testVersion {
- package = _1password;
+ passthru = {
+ updateScript = ./update.sh;
};
meta = with lib; {
diff --git a/pkgs/applications/misc/1password/update.sh b/pkgs/by-name/_1/_1password-cli/update.sh
similarity index 97%
rename from pkgs/applications/misc/1password/update.sh
rename to pkgs/by-name/_1/_1password-cli/update.sh
index 562c1af31a25..4f04279fcea6 100755
--- a/pkgs/applications/misc/1password/update.sh
+++ b/pkgs/by-name/_1/_1password-cli/update.sh
@@ -4,7 +4,7 @@
set -eu
ROOT="$(dirname "$(readlink -f "$0")")"
-NIX_DRV="$ROOT/default.nix"
+NIX_DRV="$ROOT/package.nix"
if [ ! -f "$NIX_DRV" ]; then
echo "ERROR: cannot find default.nix in $ROOT"
exit 1
diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix
index 65ba3347eb48..dfca50eb902e 100644
--- a/pkgs/by-name/_6/_64gram/package.nix
+++ b/pkgs/by-name/_6/_64gram/package.nix
@@ -8,7 +8,7 @@
telegram-desktop.overrideAttrs (old: rec {
pname = "64gram";
- version = "1.1.39";
+ version = "1.1.43";
src = fetchFromGitHub {
owner = "TDesktop-x64";
@@ -16,7 +16,7 @@ telegram-desktop.overrideAttrs (old: rec {
rev = "v${version}";
fetchSubmodules = true;
- hash = "sha256-+slLW177PhNvMb4ARY3X95eKVZiZTxJIPuSurTiGTls=";
+ hash = "sha256-vRiAIGY3CU5+hsdn8xiNbgvSM3eGRVwnvsSmSoaDN/k=";
};
patches = (old.patches or []) ++ [
diff --git a/pkgs/by-name/ac/act/package.nix b/pkgs/by-name/ac/act/package.nix
index 621a392fe2d7..b81967bec147 100644
--- a/pkgs/by-name/ac/act/package.nix
+++ b/pkgs/by-name/ac/act/package.nix
@@ -5,7 +5,7 @@
}:
let
- version = "0.2.67";
+ version = "0.2.68";
in
buildGoModule {
pname = "act";
@@ -15,10 +15,10 @@ buildGoModule {
owner = "nektos";
repo = "act";
rev = "refs/tags/v${version}";
- hash = "sha256-yNa6o35YUP8D8K3kQLHQOG3V9mWGoxNvYgw5UQOqAtc=";
+ hash = "sha256-BON29uUruBoeBLoBdOgnonrVIyLZlvBW5UyWfxFgjPs=";
};
- vendorHash = "sha256-bkOLortxztmzAO/KCbQC4YsZ5iAero1yxblCkDZg8Ds=";
+ vendorHash = "sha256-yxuOORShJL9nFIS5srZFI31Nyz7xFxnJCmcN8UFhyr0=";
doCheck = false;
diff --git a/pkgs/by-name/ad/ad-miner/package.nix b/pkgs/by-name/ad/ad-miner/package.nix
index 3a7b3b685359..b1aaf615c6e5 100644
--- a/pkgs/by-name/ad/ad-miner/package.nix
+++ b/pkgs/by-name/ad/ad-miner/package.nix
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "ad-miner";
- version = "1.6.0";
+ version = "1.6.1";
pyproject = true;
src = fetchFromGitHub {
owner = "Mazars-Tech";
repo = "AD_Miner";
rev = "refs/tags/v${version}";
- hash = "sha256-kWIareupm0r48HGnESk5S/0IEKjDfHtXWi64ehjdAQ4=";
+ hash = "sha256-/TIG1UUfLct9MxCmahWk7F6KlypNan+zk/02zVpPV+w=";
};
# All requirements are pinned
diff --git a/pkgs/by-name/al/albert/package.nix b/pkgs/by-name/al/albert/package.nix
index 3e9196aa8df0..45de3b8dcd64 100644
--- a/pkgs/by-name/al/albert/package.nix
+++ b/pkgs/by-name/al/albert/package.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "albert";
- version = "0.26.4";
+ version = "0.26.6";
src = fetchFromGitHub {
owner = "albertlauncher";
repo = "albert";
rev = "v${finalAttrs.version}";
- hash = "sha256-MEpBZV1Fxoq24eT1hgyrp33qcaLqmQ+aAP974Yn8d2g=";
+ hash = "sha256-Z4YgqqtJPYMzpnMt74TX2Hi0AEMyhRc2QHSVuwuaxfE=";
fetchSubmodules = true;
};
diff --git a/pkgs/by-name/al/alephone-eternal/package.nix b/pkgs/by-name/al/alephone-eternal/package.nix
index 83a5cb7a5e48..d3c7c8333f54 100644
--- a/pkgs/by-name/al/alephone-eternal/package.nix
+++ b/pkgs/by-name/al/alephone-eternal/package.nix
@@ -2,15 +2,15 @@
alephone.makeWrapper rec {
pname = "marathon-eternal";
- version = "1.2.0";
+ version = "1.2.1";
desktopName = "Marathon-Eternal";
zip = fetchurl {
- url = "http://eternal.bungie.org/files/_releases/EternalXv120.zip";
- hash = "sha256-k3F2G2Jc+XhvhidqsX39UqFCfpPo+3Lv+oj1dDXoO+M=";
+ url = "https://eternal.bungie.org/files/_releases/EternalXv121.zip";
+ hash = "sha256-8smVdL7CYbrIzCqu3eqk6KQempKLWuEJ9qWStdWkYWo=";
};
- sourceRoot = "Eternal 1.2.0";
+ sourceRoot = "Eternal 1.2.1";
meta = {
description =
diff --git a/pkgs/by-name/al/alioth/package.nix b/pkgs/by-name/al/alioth/package.nix
index 02bb4f39924a..30fd5d09df9d 100644
--- a/pkgs/by-name/al/alioth/package.nix
+++ b/pkgs/by-name/al/alioth/package.nix
@@ -6,19 +6,19 @@
rustPlatform.buildRustPackage rec {
pname = "alioth";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "google";
repo = "alioth";
rev = "refs/tags/v${version}";
- hash = "sha256-K0Hx6EJYyPJZA+FLIj44BtUuZZOqWW2DUJt1QbeZyu0=";
+ hash = "sha256-CQYh/F7eGk94dsXP7j3udhhBReYBvV6D8nzK/3VicwU=";
};
# Checks use `debug_assert_eq!`
checkType = "debug";
- cargoHash = "sha256-J+1SXHQJJxT0qN/ELAvwQFnKCo13ZrQClpbfleM4PkA=";
+ cargoHash = "sha256-xxe+WZIXkEG7B+CX3WNGhPw4AmUQOY9w3DS+QP9hMX0=";
separateDebugInfo = true;
diff --git a/pkgs/by-name/am/amberol/package.nix b/pkgs/by-name/am/amberol/package.nix
index ba530618be91..3218d9624925 100644
--- a/pkgs/by-name/am/amberol/package.nix
+++ b/pkgs/by-name/am/amberol/package.nix
@@ -22,20 +22,20 @@
stdenv.mkDerivation rec {
pname = "amberol";
- version = "2024.1";
+ version = "2024.2";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "amberol";
rev = version;
- hash = "sha256-WuyvTgh9Qc5WcgEssxkytwQpSACd82l5WKeMD0NFOp8=";
+ hash = "sha256-FK0TJFjknEFraY8T+PQ/ABiid36kEYIEhekgyx0y3aI=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "amberol-${version}";
- hash = "sha256-C1ENyNUpgwGlZus/zIWD1mUrmWT9L0fH/1T4QaIxGJw=";
+ hash = "sha256-9YRd1iOh+l+Jy8eSwJP6pxonEofBkMpFqb+JAAFDbCA=";
};
postPatch = ''
diff --git a/pkgs/tools/system/amdgpu_top/Cargo.lock b/pkgs/by-name/am/amdgpu_top/Cargo.lock
similarity index 81%
rename from pkgs/tools/system/amdgpu_top/Cargo.lock
rename to pkgs/by-name/am/amdgpu_top/Cargo.lock
index 98e9ae36636b..7361220b89a2 100644
--- a/pkgs/tools/system/amdgpu_top/Cargo.lock
+++ b/pkgs/by-name/am/amdgpu_top/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
[[package]]
name = "ab_glyph"
-version = "0.2.26"
+version = "0.2.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e53b0a3d5760cd2ba9b787ae0c6440ad18ee294ff71b05e3381c900a7d16cfd"
+checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb"
dependencies = [
"ab_glyph_rasterizer",
"owned_ttf_parser",
@@ -34,6 +34,12 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
[[package]]
name = "ahash"
version = "0.8.11"
@@ -65,7 +71,7 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
[[package]]
name = "amdgpu_top"
-version = "0.8.5"
+version = "0.9.2"
dependencies = [
"amdgpu_top_gui",
"amdgpu_top_json",
@@ -77,7 +83,7 @@ dependencies = [
[[package]]
name = "amdgpu_top_gui"
-version = "0.8.5"
+version = "0.9.2"
dependencies = [
"eframe",
"egui_plot",
@@ -90,7 +96,7 @@ dependencies = [
[[package]]
name = "amdgpu_top_json"
-version = "0.8.5"
+version = "0.9.2"
dependencies = [
"libamdgpu_top",
"serde_json",
@@ -98,7 +104,7 @@ dependencies = [
[[package]]
name = "amdgpu_top_tui"
-version = "0.8.5"
+version = "0.9.2"
dependencies = [
"cursive",
"libamdgpu_top",
@@ -111,7 +117,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289"
dependencies = [
"android-properties",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"cc",
"cesu8",
"jni",
@@ -142,15 +148,15 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.86"
+version = "1.0.88"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356"
[[package]]
name = "arboard"
-version = "3.4.0"
+version = "3.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89"
+checksum = "df099ccb16cd014ff054ac1bf392c67feeef57164b05c42f037cd40f5d4357f4"
dependencies = [
"clipboard-win",
"log",
@@ -169,9 +175,9 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
[[package]]
name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
[[package]]
name = "as-raw-xcb-connection"
@@ -206,6 +212,15 @@ version = "0.21.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+[[package]]
+name = "basic-toml"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "823388e228f614e9558c6804262db37960ec8821856535f5c3f59913140558f8"
+dependencies = [
+ "serde",
+]
+
[[package]]
name = "bit-set"
version = "0.5.3"
@@ -229,9 +244,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
dependencies = [
"serde",
]
@@ -281,9 +296,9 @@ dependencies = [
[[package]]
name = "bstr"
-version = "1.9.1"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
+checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
dependencies = [
"memchr",
"regex-automata",
@@ -298,35 +313,35 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
[[package]]
name = "bytemuck"
-version = "1.16.0"
+version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5"
+checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
dependencies = [
"bytemuck_derive",
]
[[package]]
name = "bytemuck_derive"
-version = "1.7.0"
+version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b"
+checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.77",
]
[[package]]
-name = "byteorder"
-version = "1.5.0"
+name = "byteorder-lite"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
[[package]]
name = "bytes"
-version = "1.6.0"
+version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
[[package]]
name = "calloop"
@@ -334,7 +349,21 @@ version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
+ "log",
+ "polling",
+ "rustix",
+ "slab",
+ "thiserror",
+]
+
+[[package]]
+name = "calloop"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
+dependencies = [
+ "bitflags 2.6.0",
"log",
"polling",
"rustix",
@@ -348,7 +377,19 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02"
dependencies = [
- "calloop",
+ "calloop 0.12.4",
+ "rustix",
+ "wayland-backend",
+ "wayland-client",
+]
+
+[[package]]
+name = "calloop-wayland-source"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20"
+dependencies = [
+ "calloop 0.13.0",
"rustix",
"wayland-backend",
"wayland-client",
@@ -356,13 +397,13 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.98"
+version = "1.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
+checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
dependencies = [
"jobserver",
"libc",
- "once_cell",
+ "shlex",
]
[[package]]
@@ -394,9 +435,9 @@ dependencies = [
[[package]]
name = "clipboard-win"
-version = "5.3.1"
+version = "5.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad"
+checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892"
dependencies = [
"error-code",
]
@@ -407,36 +448,6 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cbd0f76e066e64fdc5631e3bb46381254deab9ef1158292f27c8c57e3bf3fe59"
-[[package]]
-name = "cocoa"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c"
-dependencies = [
- "bitflags 1.3.2",
- "block",
- "cocoa-foundation",
- "core-foundation",
- "core-graphics",
- "foreign-types",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "cocoa-foundation"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7"
-dependencies = [
- "bitflags 1.3.2",
- "block",
- "core-foundation",
- "core-graphics-types",
- "libc",
- "objc",
-]
-
[[package]]
name = "codespan-reporting"
version = "0.11.1"
@@ -447,12 +458,6 @@ dependencies = [
"unicode-width",
]
-[[package]]
-name = "color_quant"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-
[[package]]
name = "com"
version = "0.6.0"
@@ -515,9 +520,9 @@ dependencies = [
[[package]]
name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
[[package]]
name = "core-graphics"
@@ -545,9 +550,9 @@ dependencies = [
[[package]]
name = "cpufeatures"
-version = "0.2.12"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
dependencies = [
"libc",
]
@@ -658,9 +663,9 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
[[package]]
name = "darling"
-version = "0.20.9"
+version = "0.20.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
dependencies = [
"darling_core",
"darling_macro",
@@ -668,26 +673,26 @@ dependencies = [
[[package]]
name = "darling_core"
-version = "0.20.9"
+version = "0.20.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
dependencies = [
"fnv",
"ident_case",
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.77",
]
[[package]]
name = "darling_macro"
-version = "0.20.9"
+version = "0.20.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [
"darling_core",
"quote",
- "syn 2.0.66",
+ "syn 2.0.77",
]
[[package]]
@@ -723,24 +728,24 @@ dependencies = [
]
[[package]]
-name = "directories-next"
-version = "2.0.0"
+name = "directories"
+version = "5.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc"
+checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
dependencies = [
- "cfg-if",
- "dirs-sys-next",
+ "dirs-sys",
]
[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
+name = "dirs-sys"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
dependencies = [
"libc",
+ "option-ext",
"redox_users",
- "winapi",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -751,13 +756,13 @@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
[[package]]
name = "displaydoc"
-version = "0.2.4"
+version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.77",
]
[[package]]
@@ -766,14 +771,14 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
dependencies = [
- "libloading 0.8.3",
+ "libloading 0.8.5",
]
[[package]]
name = "document-features"
-version = "0.2.8"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95"
+checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0"
dependencies = [
"litrs",
]
@@ -786,29 +791,30 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
[[package]]
name = "dunce"
-version = "1.0.4"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
[[package]]
name = "ecolor"
-version = "0.27.2"
+version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20930a432bbd57a6d55e07976089708d4893f3d556cf42a0d79e9e321fa73b10"
+checksum = "2e6b451ff1143f6de0f33fc7f1b68fecfd2c7de06e104de96c4514de3f5396f8"
dependencies = [
"bytemuck",
+ "emath",
"serde",
]
[[package]]
name = "eframe"
-version = "0.27.2"
+version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020e2ccef6bbcec71dbc542f7eed64a5846fc3076727f5746da8fd307c91bab2"
+checksum = "6490ef800b2e41ee129b1f32f9ac15f713233fe3bc18e241a1afe1e4fb6811e0"
dependencies = [
+ "ahash",
"bytemuck",
- "cocoa",
- "directories-next",
+ "directories",
"document-features",
"egui",
"egui-wgpu",
@@ -820,7 +826,9 @@ dependencies = [
"image",
"js-sys",
"log",
- "objc",
+ "objc2 0.5.2",
+ "objc2-app-kit",
+ "objc2-foundation",
"parking_lot",
"percent-encoding",
"raw-window-handle 0.5.2",
@@ -828,7 +836,6 @@ dependencies = [
"ron",
"serde",
"static_assertions",
- "thiserror",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
@@ -839,12 +846,13 @@ dependencies = [
[[package]]
name = "egui"
-version = "0.27.2"
+version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "584c5d1bf9a67b25778a3323af222dbe1a1feb532190e103901187f92c7fe29a"
+checksum = "20c97e70a2768de630f161bb5392cbd3874fcf72868f14df0e002e82e06cb798"
dependencies = [
"accesskit",
"ahash",
+ "emath",
"epaint",
"log",
"nohash-hasher",
@@ -854,10 +862,11 @@ dependencies = [
[[package]]
name = "egui-wgpu"
-version = "0.27.2"
+version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469ff65843f88a702b731a1532b7d03b0e8e96d283e70f3a22b0e06c46cb9b37"
+checksum = "47c7a7c707877c3362a321ebb4f32be811c0b91f7aebf345fb162405c0218b4c"
dependencies = [
+ "ahash",
"bytemuck",
"document-features",
"egui",
@@ -872,10 +881,11 @@ dependencies = [
[[package]]
name = "egui-winit"
-version = "0.27.2"
+version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e3da0cbe020f341450c599b35b92de4af7b00abde85624fd16f09c885573609"
+checksum = "fac4e066af341bf92559f60dbdf2020b2a03c963415349af5f3f8d79ff7a4926"
dependencies = [
+ "ahash",
"arboard",
"egui",
"log",
@@ -889,10 +899,11 @@ dependencies = [
[[package]]
name = "egui_glow"
-version = "0.27.2"
+version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0e5d975f3c86edc3d35b1db88bb27c15dde7c55d3b5af164968ab5ede3f44ca"
+checksum = "4e2bdc8b38cfa17cc712c4ae079e30c71c00cd4c2763c9e16dc7860a02769103"
dependencies = [
+ "ahash",
"bytemuck",
"egui",
"glow",
@@ -905,18 +916,20 @@ dependencies = [
[[package]]
name = "egui_plot"
-version = "0.27.2"
+version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7854b86dc1c2d352c5270db3d600011daa913d6b554141a03939761323288a1"
+checksum = "c7acc4fe778c41b91d57e04c1a2cf5765b3dc977f9f8384d2bb2eb4254855365"
dependencies = [
+ "ahash",
"egui",
+ "emath",
]
[[package]]
name = "emath"
-version = "0.27.2"
+version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4c3a552cfca14630702449d35f41c84a0d15963273771c6059175a803620f3f"
+checksum = "0a6a21708405ea88f63d8309650b4d77431f4bc28fb9d8e6f77d3963b51249e6"
dependencies = [
"bytemuck",
"serde",
@@ -939,46 +952,46 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.77",
]
[[package]]
name = "enumn"
-version = "0.1.13"
+version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42"
+checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.77",
]
[[package]]
name = "enumset"
-version = "1.1.3"
+version = "1.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d"
+checksum = "d07a4b049558765cef5f0c1a273c3fc57084d768b44d2f98127aef4cceb17293"
dependencies = [
"enumset_derive",
]
[[package]]
name = "enumset_derive"
-version = "0.8.1"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af"
+checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242"
dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.77",
]
[[package]]
name = "epaint"
-version = "0.27.2"
+version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b381f8b149657a4acf837095351839f32cd5c4aec1817fc4df84e18d76334176"
+checksum = "3f0dcc0a0771e7500e94cd1cb797bd13c9f23b9409bdc3c824e2cbc562b7fa01"
dependencies = [
"ab_glyph",
"ahash",
@@ -1009,9 +1022,9 @@ dependencies = [
[[package]]
name = "error-code"
-version = "3.2.0"
+version = "3.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b"
+checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f"
[[package]]
name = "faster-hex"
@@ -1021,9 +1034,9 @@ checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183"
[[package]]
name = "fastrand"
-version = "2.1.0"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
[[package]]
name = "fdeflate"
@@ -1040,17 +1053,17 @@ version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2"
dependencies = [
- "toml 0.5.11",
+ "toml",
]
[[package]]
name = "flate2"
-version = "1.0.30"
+version = "1.0.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
dependencies = [
"crc32fast",
- "miniz_oxide",
+ "miniz_oxide 0.8.0",
]
[[package]]
@@ -1121,7 +1134,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.77",
]
[[package]]
@@ -1172,9 +1185,9 @@ dependencies = [
[[package]]
name = "gix"
-version = "0.61.0"
+version = "0.64.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4e0e59a44bf00de058ee98d6ecf3c9ed8f8842c1da642258ae4120d41ded8f7"
+checksum = "d78414d29fcc82329080166077e0f7689f4016551fdb334d787c3d040fe2634f"
dependencies = [
"gix-actor",
"gix-commitgraph",
@@ -1205,23 +1218,22 @@ dependencies = [
"gix-utils",
"gix-validate",
"once_cell",
- "parking_lot",
"smallvec",
"thiserror",
]
[[package]]
name = "gix-actor"
-version = "0.31.2"
+version = "0.31.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d69c59d392c7e6c94385b6fd6089d6df0fe945f32b4357687989f3aee253cd7f"
+checksum = "a0e454357e34b833cc3a00b6efbbd3dd4d18b24b9fb0c023876ec2645e8aa3f2"
dependencies = [
"bstr",
"gix-date",
"gix-utils",
"itoa",
"thiserror",
- "winnow 0.6.9",
+ "winnow",
]
[[package]]
@@ -1235,9 +1247,9 @@ dependencies = [
[[package]]
name = "gix-commitgraph"
-version = "0.24.2"
+version = "0.24.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7b102311085da4af18823413b5176d7c500fb2272eaf391cfa8635d8bcb12c4"
+checksum = "133b06f67f565836ec0c473e2116a60fb74f80b6435e21d88013ac0e3c60fc78"
dependencies = [
"bstr",
"gix-chunk",
@@ -1249,9 +1261,9 @@ dependencies = [
[[package]]
name = "gix-config"
-version = "0.36.1"
+version = "0.38.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7580e05996e893347ad04e1eaceb92e1c0e6a3ffe517171af99bf6b6df0ca6e5"
+checksum = "28f53fd03d1bf09ebcc2c8654f08969439c4556e644ca925f27cf033bc43e658"
dependencies = [
"bstr",
"gix-config-value",
@@ -1265,16 +1277,16 @@ dependencies = [
"smallvec",
"thiserror",
"unicode-bom",
- "winnow 0.6.9",
+ "winnow",
]
[[package]]
name = "gix-config-value"
-version = "0.14.6"
+version = "0.14.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbd06203b1a9b33a78c88252a625031b094d9e1b647260070c25b09910c0a804"
+checksum = "03f76169faa0dec598eac60f83d7fcdd739ec16596eca8fb144c88973dbe6f8c"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"bstr",
"gix-path",
"libc",
@@ -1283,9 +1295,9 @@ dependencies = [
[[package]]
name = "gix-date"
-version = "0.8.6"
+version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "367ee9093b0c2b04fd04c5c7c8b6a1082713534eab537597ae343663a518fa99"
+checksum = "9eed6931f21491ee0aeb922751bd7ec97b4b2fe8fbfedcb678e2a2dce5f3b8c0"
dependencies = [
"bstr",
"itoa",
@@ -1295,9 +1307,9 @@ dependencies = [
[[package]]
name = "gix-diff"
-version = "0.42.0"
+version = "0.44.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78e605593c2ef74980a534ade0909c7dc57cca72baa30cbb67d2dda621f99ac4"
+checksum = "1996d5c8a305b59709467d80617c9fde48d9d75fd1f4179ea970912630886c9d"
dependencies = [
"bstr",
"gix-hash",
@@ -1307,9 +1319,9 @@ dependencies = [
[[package]]
name = "gix-discover"
-version = "0.31.0"
+version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64bab49087ed3710caf77e473dc0efc54ca33d8ccc6441359725f121211482b1"
+checksum = "67662731cec3cb31ba3ed2463809493f76d8e5d6c6d245de8b0560438c13450e"
dependencies = [
"bstr",
"dunce",
@@ -1342,21 +1354,22 @@ dependencies = [
[[package]]
name = "gix-fs"
-version = "0.10.2"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2184c40e7910529677831c8b481acf788ffd92427ed21fad65b6aa637e631b8"
+checksum = "f2bfe6249cfea6d0c0e0990d5226a4cb36f030444ba9e35e0639275db8f98575"
dependencies = [
+ "fastrand",
"gix-features",
"gix-utils",
]
[[package]]
name = "gix-glob"
-version = "0.16.3"
+version = "0.16.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2a29ad0990cf02c48a7aac76ed0dbddeb5a0d070034b83675cc3bbf937eace4"
+checksum = "74908b4bbc0a0a40852737e5d7889f676f081e340d5451a16e5b4c50d592f111"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"bstr",
"gix-features",
"gix-path",
@@ -1385,9 +1398,9 @@ dependencies = [
[[package]]
name = "gix-lock"
-version = "13.1.1"
+version = "14.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7c359f81f01b8352063319bcb39789b7ea0887b406406381106e38c4a34d049"
+checksum = "e3bc7fe297f1f4614774989c00ec8b1add59571dc9b024b4c00acb7dedd4e19d"
dependencies = [
"gix-tempfile",
"gix-utils",
@@ -1402,14 +1415,14 @@ checksum = "999ce923619f88194171a67fb3e6d613653b8d4d6078b529b15a765da0edcc17"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.77",
]
[[package]]
name = "gix-object"
-version = "0.42.2"
+version = "0.42.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fe2dc4a41191c680c942e6ebd630c8107005983c4679214fdb1007dcf5ae1df"
+checksum = "25da2f46b4e7c2fa7b413ce4dffb87f69eaf89c2057e386491f4c55cadbfe386"
dependencies = [
"bstr",
"gix-actor",
@@ -1421,14 +1434,14 @@ dependencies = [
"itoa",
"smallvec",
"thiserror",
- "winnow 0.6.9",
+ "winnow",
]
[[package]]
name = "gix-odb"
-version = "0.59.0"
+version = "0.61.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81b55378c719693380f66d9dd21ce46721eed2981d8789fc698ec1ada6fa176e"
+checksum = "20d384fe541d93d8a3bb7d5d5ef210780d6df4f50c4e684ccba32665a5e3bc9b"
dependencies = [
"arc-swap",
"gix-date",
@@ -1446,9 +1459,9 @@ dependencies = [
[[package]]
name = "gix-pack"
-version = "0.49.0"
+version = "0.51.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6391aeaa030ad64aba346a9f5c69bb1c4e5c6fb4411705b03b40b49d8614ec30"
+checksum = "3e0594491fffe55df94ba1c111a6566b7f56b3f8d2e1efc750e77d572f5f5229"
dependencies = [
"clru",
"gix-chunk",
@@ -1457,18 +1470,16 @@ dependencies = [
"gix-hashtable",
"gix-object",
"gix-path",
- "gix-tempfile",
"memmap2",
- "parking_lot",
"smallvec",
"thiserror",
]
[[package]]
name = "gix-path"
-version = "0.10.7"
+version = "0.10.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23623cf0f475691a6d943f898c4d0b89f5c1a2a64d0f92bce0e0322ee6528783"
+checksum = "ebfc4febd088abdcbc9f1246896e57e37b7a34f6909840045a1767c6dafac7af"
dependencies = [
"bstr",
"gix-trace",
@@ -1490,12 +1501,11 @@ dependencies = [
[[package]]
name = "gix-ref"
-version = "0.43.0"
+version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd4aba68b925101cb45d6df328979af0681364579db889098a0de75b36c77b65"
+checksum = "636e96a0a5562715153fee098c217110c33a6f8218f08f4687ff99afde159bb5"
dependencies = [
"gix-actor",
- "gix-date",
"gix-features",
"gix-fs",
"gix-hash",
@@ -1507,14 +1517,14 @@ dependencies = [
"gix-validate",
"memmap2",
"thiserror",
- "winnow 0.6.9",
+ "winnow",
]
[[package]]
name = "gix-refspec"
-version = "0.23.0"
+version = "0.23.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dde848865834a54fe4d9b4573f15d0e9a68eaf3d061b42d3ed52b4b8acf880b2"
+checksum = "6868f8cd2e62555d1f7c78b784bece43ace40dd2a462daf3b588d5416e603f37"
dependencies = [
"bstr",
"gix-hash",
@@ -1526,25 +1536,23 @@ dependencies = [
[[package]]
name = "gix-revision"
-version = "0.27.1"
+version = "0.27.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63e08f8107ed1f93a83bcfbb4c38084c7cb3f6cd849793f1d5eec235f9b13b2b"
+checksum = "01b13e43c2118c4b0537ddac7d0821ae0dfa90b7b8dbf20c711e153fb749adce"
dependencies = [
"bstr",
"gix-date",
"gix-hash",
- "gix-hashtable",
"gix-object",
"gix-revwalk",
- "gix-trace",
"thiserror",
]
[[package]]
name = "gix-revwalk"
-version = "0.13.1"
+version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4181db9cfcd6d1d0fd258e91569dbb61f94cb788b441b5294dd7f1167a3e788f"
+checksum = "1b030ccaab71af141f537e0225f19b9e74f25fefdba0372246b844491cab43e0"
dependencies = [
"gix-commitgraph",
"gix-date",
@@ -1557,11 +1565,11 @@ dependencies = [
[[package]]
name = "gix-sec"
-version = "0.10.6"
+version = "0.10.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fddc27984a643b20dd03e97790555804f98cf07404e0e552c0ad8133266a79a1"
+checksum = "0fe4d52f30a737bbece5276fab5d3a8b276dc2650df963e293d0673be34e7a5f"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"gix-path",
"libc",
"windows-sys 0.52.0",
@@ -1569,9 +1577,9 @@ dependencies = [
[[package]]
name = "gix-tempfile"
-version = "13.1.1"
+version = "14.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a761d76594f4443b675e85928e4902dec333273836bd386906f01e7e346a0d11"
+checksum = "046b4927969fa816a150a0cda2e62c80016fe11fb3c3184e4dddf4e542f108aa"
dependencies = [
"gix-fs",
"libc",
@@ -1582,16 +1590,17 @@ dependencies = [
[[package]]
name = "gix-trace"
-version = "0.1.9"
+version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f924267408915fddcd558e3f37295cc7d6a3e50f8bd8b606cee0808c3915157e"
+checksum = "6cae0e8661c3ff92688ce1c8b8058b3efb312aba9492bbe93661a21705ab431b"
[[package]]
name = "gix-traverse"
-version = "0.38.0"
+version = "0.39.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95aef84bc777025403a09788b1e4815c06a19332e9e5d87a955e1ed7da9bf0cf"
+checksum = "e499a18c511e71cf4a20413b743b9f5bcf64b3d9e81e9c3c6cd399eae55a8840"
dependencies = [
+ "bitflags 2.6.0",
"gix-commitgraph",
"gix-date",
"gix-hash",
@@ -1604,9 +1613,9 @@ dependencies = [
[[package]]
name = "gix-url"
-version = "0.27.3"
+version = "0.27.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0db829ebdca6180fbe32be7aed393591df6db4a72dbbc0b8369162390954d1cf"
+checksum = "fd280c5e84fb22e128ed2a053a0daeacb6379469be6a85e3d518a0636e160c89"
dependencies = [
"bstr",
"gix-features",
@@ -1665,7 +1674,7 @@ version = "0.31.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18fcd4ae4e86d991ad1300b8f57166e5be0c95ef1f63f3f5b827f8a164548746"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"cfg_aliases",
"cgl",
"core-foundation",
@@ -1674,7 +1683,7 @@ dependencies = [
"glutin_glx_sys",
"glutin_wgl_sys",
"icrate",
- "libloading 0.8.3",
+ "libloading 0.8.5",
"objc2 0.4.1",
"once_cell",
"raw-window-handle 0.5.2",
@@ -1730,7 +1739,7 @@ version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"gpu-alloc-types",
]
@@ -1740,7 +1749,7 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
]
[[package]]
@@ -1758,22 +1767,22 @@ dependencies = [
[[package]]
name = "gpu-descriptor"
-version = "0.2.4"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c"
+checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"gpu-descriptor-types",
"hashbrown",
]
[[package]]
name = "gpu-descriptor-types"
-version = "0.1.2"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c"
+checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
]
[[package]]
@@ -1792,10 +1801,10 @@ version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"com",
"libc",
- "libloading 0.8.3",
+ "libloading 0.8.5",
"thiserror",
"widestring",
"winapi",
@@ -1803,9 +1812,9 @@ dependencies = [
[[package]]
name = "hermit-abi"
-version = "0.3.9"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
[[package]]
name = "hexf-parse"
@@ -1824,15 +1833,15 @@ dependencies = [
[[package]]
name = "i18n-config"
-version = "0.4.6"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c9ce3c48cbc21fd5b22b9331f32b5b51f6ad85d969b99e793427332e76e7640"
+checksum = "8e88074831c0be5b89181b05e6748c4915f77769ecc9a4c372f88b169a8509c9"
dependencies = [
+ "basic-toml",
"log",
"serde",
"serde_derive",
"thiserror",
- "toml 0.8.13",
"unic-langid",
]
@@ -1875,7 +1884,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim",
- "syn 2.0.66",
+ "syn 2.0.77",
"unic-langid",
]
@@ -1889,7 +1898,7 @@ dependencies = [
"i18n-config",
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.77",
]
[[package]]
@@ -1921,22 +1930,21 @@ dependencies = [
[[package]]
name = "image"
-version = "0.24.9"
+version = "0.25.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
+checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
dependencies = [
"bytemuck",
- "byteorder",
- "color_quant",
+ "byteorder-lite",
"num-traits",
"png",
]
[[package]]
name = "indexmap"
-version = "2.2.6"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
dependencies = [
"equivalent",
"hashbrown",
@@ -1991,18 +1999,18 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
[[package]]
name = "jobserver"
-version = "0.1.31"
+version = "0.1.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
dependencies = [
"libc",
]
[[package]]
name = "js-sys"
-version = "0.3.69"
+version = "0.3.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
dependencies = [
"wasm-bindgen",
]
@@ -2014,7 +2022,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76"
dependencies = [
"libc",
- "libloading 0.8.3",
+ "libloading 0.8.5",
"pkg-config",
]
@@ -2026,13 +2034,13 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
[[package]]
name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "libamdgpu_top"
-version = "0.8.5"
+version = "0.9.2"
dependencies = [
"anyhow",
"libdrm_amdgpu_sys",
@@ -2040,14 +2048,14 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.155"
+version = "0.2.158"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
[[package]]
name = "libdrm_amdgpu_sys"
-version = "0.7.3"
-source = "git+https://github.com/Umio-Yasuno/libdrm-amdgpu-sys-rs#b5e281176c6ba5c15379b2bb832d1b37e83e673f"
+version = "0.7.5"
+source = "git+https://github.com/Umio-Yasuno/libdrm-amdgpu-sys-rs#c10593dd00ad822d71e284424455023a3ad6a20c"
dependencies = [
"libc",
]
@@ -2064,12 +2072,12 @@ dependencies = [
[[package]]
name = "libloading"
-version = "0.8.3"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
dependencies = [
"cfg-if",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -2078,7 +2086,7 @@ version = "0.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"libc",
"redox_syscall 0.4.1",
]
@@ -2089,7 +2097,7 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"libc",
]
@@ -2130,9 +2138,9 @@ dependencies = [
[[package]]
name = "log"
-version = "0.4.21"
+version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
[[package]]
name = "malloc_buf"
@@ -2145,15 +2153,15 @@ dependencies = [
[[package]]
name = "memchr"
-version = "2.7.2"
+version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "memmap2"
-version = "0.9.4"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
dependencies = [
"libc",
]
@@ -2169,11 +2177,11 @@ dependencies = [
[[package]]
name = "metal"
-version = "0.27.0"
+version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25"
+checksum = "5637e166ea14be6063a3f8ba5ccb9a4159df7d8f6d61c02fc3d480b1f90dcfcb"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"block",
"core-graphics-types",
"foreign-types",
@@ -2184,14 +2192,23 @@ dependencies = [
[[package]]
name = "miniz_oxide"
-version = "0.7.3"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
dependencies = [
"adler",
"simd-adler32",
]
+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+dependencies = [
+ "adler2",
+]
+
[[package]]
name = "mio"
version = "0.8.11"
@@ -2206,12 +2223,13 @@ dependencies = [
[[package]]
name = "naga"
-version = "0.19.2"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843"
+checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231"
dependencies = [
+ "arrayvec",
"bit-set",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"codespan-reporting",
"hexf-parse",
"indexmap",
@@ -2230,7 +2248,7 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"jni-sys",
"log",
"ndk-sys",
@@ -2330,23 +2348,23 @@ dependencies = [
[[package]]
name = "num_enum"
-version = "0.7.2"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
+checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
dependencies = [
"num_enum_derive",
]
[[package]]
name = "num_enum_derive"
-version = "0.7.2"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
+checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.77",
]
[[package]]
@@ -2365,7 +2383,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
dependencies = [
"malloc_buf",
- "objc_exception",
]
[[package]]
@@ -2411,7 +2428,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"block2 0.5.1",
"libc",
"objc2 0.5.2",
@@ -2427,7 +2444,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"block2 0.5.1",
"objc2 0.5.2",
"objc2-foundation",
@@ -2463,7 +2480,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"block2 0.5.1",
"libc",
"objc2 0.5.2",
@@ -2475,7 +2492,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"block2 0.5.1",
"objc2 0.5.2",
"objc2-foundation",
@@ -2487,22 +2504,13 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"block2 0.5.1",
"objc2 0.5.2",
"objc2-foundation",
"objc2-metal",
]
-[[package]]
-name = "objc_exception"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
-dependencies = [
- "cc",
-]
-
[[package]]
name = "objc_id"
version = "0.1.1"
@@ -2518,6 +2526,12 @@ version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
[[package]]
name = "orbclient"
version = "0.3.47"
@@ -2529,9 +2543,9 @@ dependencies = [
[[package]]
name = "owned_ttf_parser"
-version = "0.21.0"
+version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b41438d2fc63c46c74a2203bf5ccd82c41ba04347b2fcf5754f230b167067d5"
+checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90"
dependencies = [
"ttf-parser",
]
@@ -2563,9 +2577,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall 0.5.1",
+ "redox_syscall 0.5.4",
"smallvec",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -2602,14 +2616,14 @@ dependencies = [
"crc32fast",
"fdeflate",
"flate2",
- "miniz_oxide",
+ "miniz_oxide 0.7.4",
]
[[package]]
name = "polling"
-version = "3.7.0"
+version = "3.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3"
+checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511"
dependencies = [
"cfg-if",
"concurrent-queue",
@@ -2617,7 +2631,7 @@ dependencies = [
"pin-project-lite",
"rustix",
"tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -2634,11 +2648,11 @@ checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
[[package]]
name = "proc-macro-crate"
-version = "3.1.0"
+version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
dependencies = [
- "toml_edit 0.21.1",
+ "toml_edit",
]
[[package]]
@@ -2667,9 +2681,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.84"
+version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
dependencies = [
"unicode-ident",
]
@@ -2688,18 +2702,18 @@ checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58"
[[package]]
name = "quick-xml"
-version = "0.31.0"
+version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
+checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc"
dependencies = [
"memchr",
]
[[package]]
name = "quote"
-version = "1.0.36"
+version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2",
]
@@ -2736,18 +2750,18 @@ dependencies = [
[[package]]
name = "redox_syscall"
-version = "0.5.1"
+version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
]
[[package]]
name = "redox_users"
-version = "0.4.5"
+version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
dependencies = [
"getrandom",
"libredox 0.1.3",
@@ -2756,9 +2770,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.10.4"
+version = "1.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
dependencies = [
"aho-corasick",
"memchr",
@@ -2768,9 +2782,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.6"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
dependencies = [
"aho-corasick",
"memchr",
@@ -2779,9 +2793,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
[[package]]
name = "renderdoc-sys"
@@ -2796,16 +2810,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
dependencies = [
"base64",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"serde",
"serde_derive",
]
[[package]]
name = "rust-embed"
-version = "8.4.0"
+version = "8.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a"
+checksum = "fa66af4a4fdd5e7ebc276f115e895611a34739a9c1c01028383d612d550953c0"
dependencies = [
"rust-embed-impl",
"rust-embed-utils",
@@ -2814,22 +2828,22 @@ dependencies = [
[[package]]
name = "rust-embed-impl"
-version = "8.4.0"
+version = "8.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4"
+checksum = "6125dbc8867951125eec87294137f4e9c2c96566e61bf72c45095a7c77761478"
dependencies = [
"proc-macro2",
"quote",
"rust-embed-utils",
- "syn 2.0.66",
+ "syn 2.0.77",
"walkdir",
]
[[package]]
name = "rust-embed-utils"
-version = "8.4.0"
+version = "8.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32"
+checksum = "2e5347777e9aacb56039b0e1f28785929a8a3b709e87482e7442c72e7c12529d"
dependencies = [
"sha2",
"walkdir",
@@ -2843,11 +2857,11 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "rustix"
-version = "0.38.34"
+version = "0.38.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"errno",
"libc",
"linux-raw-sys",
@@ -2898,49 +2912,41 @@ checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a"
[[package]]
name = "serde"
-version = "1.0.203"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.203"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.77",
]
[[package]]
name = "serde_json"
-version = "1.0.117"
+version = "1.0.128"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
dependencies = [
"itoa",
+ "memchr",
"ryu",
"serde",
]
-[[package]]
-name = "serde_spanned"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
-dependencies = [
- "serde",
-]
-
[[package]]
name = "sha1_smol"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
+checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d"
[[package]]
name = "sha2"
@@ -2953,6 +2959,12 @@ dependencies = [
"digest",
]
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
[[package]]
name = "signal-hook"
version = "0.3.17"
@@ -2965,9 +2977,9 @@ dependencies = [
[[package]]
name = "signal-hook-mio"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
+checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
dependencies = [
"libc",
"mio",
@@ -3019,9 +3031,9 @@ version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a"
dependencies = [
- "bitflags 2.5.0",
- "calloop",
- "calloop-wayland-source",
+ "bitflags 2.6.0",
+ "calloop 0.12.4",
+ "calloop-wayland-source 0.2.0",
"cursor-icon",
"libc",
"log",
@@ -3032,20 +3044,45 @@ dependencies = [
"wayland-client",
"wayland-csd-frame",
"wayland-cursor",
- "wayland-protocols",
- "wayland-protocols-wlr",
+ "wayland-protocols 0.31.2",
+ "wayland-protocols-wlr 0.2.0",
+ "wayland-scanner",
+ "xkeysym",
+]
+
+[[package]]
+name = "smithay-client-toolkit"
+version = "0.19.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
+dependencies = [
+ "bitflags 2.6.0",
+ "calloop 0.13.0",
+ "calloop-wayland-source 0.3.0",
+ "cursor-icon",
+ "libc",
+ "log",
+ "memmap2",
+ "rustix",
+ "thiserror",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-csd-frame",
+ "wayland-cursor",
+ "wayland-protocols 0.32.4",
+ "wayland-protocols-wlr 0.3.4",
"wayland-scanner",
"xkeysym",
]
[[package]]
name = "smithay-clipboard"
-version = "0.7.1"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c091e7354ea8059d6ad99eace06dd13ddeedbb0ac72d40a9a6e7ff790525882d"
+checksum = "cc8216eec463674a0e90f29e0ae41a4db573ec5b56b1c6c1c71615d249b6d846"
dependencies = [
"libc",
- "smithay-client-toolkit",
+ "smithay-client-toolkit 0.19.2",
"wayland-backend",
]
@@ -3064,7 +3101,7 @@ version = "0.3.0+sdk-1.3.268.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
]
[[package]]
@@ -3098,9 +3135,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.66"
+version = "2.0.77"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
dependencies = [
"proc-macro2",
"quote",
@@ -3109,14 +3146,15 @@ dependencies = [
[[package]]
name = "tempfile"
-version = "3.10.1"
+version = "3.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
dependencies = [
"cfg-if",
"fastrand",
+ "once_cell",
"rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -3130,22 +3168,22 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.61"
+version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.61"
+version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.77",
]
[[package]]
@@ -3192,9 +3230,9 @@ dependencies = [
[[package]]
name = "tinyvec"
-version = "1.6.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
dependencies = [
"tinyvec_macros",
]
@@ -3214,49 +3252,21 @@ dependencies = [
"serde",
]
-[[package]]
-name = "toml"
-version = "0.8.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit 0.22.13",
-]
-
[[package]]
name = "toml_datetime"
-version = "0.6.6"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
-dependencies = [
- "serde",
-]
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
[[package]]
name = "toml_edit"
-version = "0.21.1"
+version = "0.22.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
dependencies = [
"indexmap",
"toml_datetime",
- "winnow 0.5.40",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow 0.6.9",
+ "winnow",
]
[[package]]
@@ -3277,9 +3287,9 @@ checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
[[package]]
name = "ttf-parser"
-version = "0.21.1"
+version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8"
+checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a"
[[package]]
name = "type-map"
@@ -3329,9 +3339,9 @@ checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217"
[[package]]
name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
[[package]]
name = "unicode-normalization"
@@ -3344,27 +3354,27 @@ dependencies = [
[[package]]
name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
[[package]]
name = "unicode-width"
-version = "0.1.12"
+version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
[[package]]
name = "unicode-xid"
-version = "0.2.4"
+version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
[[package]]
name = "url"
-version = "2.5.0"
+version = "2.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
dependencies = [
"form_urlencoded",
"idna",
@@ -3373,9 +3383,9 @@ dependencies = [
[[package]]
name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]]
name = "walkdir"
@@ -3395,34 +3405,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
dependencies = [
"cfg-if",
+ "once_cell",
"wasm-bindgen-macro",
]
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.77",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.42"
+version = "0.4.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
dependencies = [
"cfg-if",
"js-sys",
@@ -3432,9 +3443,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -3442,28 +3453,28 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.77",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
[[package]]
name = "wayland-backend"
-version = "0.3.3"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40"
+checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6"
dependencies = [
"cc",
"downcast-rs",
@@ -3475,11 +3486,11 @@ dependencies = [
[[package]]
name = "wayland-client"
-version = "0.31.2"
+version = "0.31.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f"
+checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"rustix",
"wayland-backend",
"wayland-scanner",
@@ -3491,16 +3502,16 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"cursor-icon",
"wayland-backend",
]
[[package]]
name = "wayland-cursor"
-version = "0.31.1"
+version = "0.31.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba"
+checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb"
dependencies = [
"rustix",
"wayland-client",
@@ -3513,7 +3524,19 @@ version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols"
+version = "0.32.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0"
+dependencies = [
+ "bitflags 2.6.0",
"wayland-backend",
"wayland-client",
"wayland-scanner",
@@ -3525,10 +3548,10 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"wayland-backend",
"wayland-client",
- "wayland-protocols",
+ "wayland-protocols 0.31.2",
"wayland-scanner",
]
@@ -3538,18 +3561,31 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"wayland-backend",
"wayland-client",
- "wayland-protocols",
+ "wayland-protocols 0.31.2",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-protocols-wlr"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109"
+dependencies = [
+ "bitflags 2.6.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols 0.32.4",
"wayland-scanner",
]
[[package]]
name = "wayland-scanner"
-version = "0.31.1"
+version = "0.31.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283"
+checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3"
dependencies = [
"proc-macro2",
"quick-xml",
@@ -3558,9 +3594,9 @@ dependencies = [
[[package]]
name = "wayland-sys"
-version = "0.31.1"
+version = "0.31.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af"
+checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09"
dependencies = [
"dlib",
"log",
@@ -3570,9 +3606,9 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.69"
+version = "0.3.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -3590,30 +3626,32 @@ dependencies = [
[[package]]
name = "webbrowser"
-version = "0.8.15"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db67ae75a9405634f5882791678772c94ff5f16a66535aae186e26aa0841fc8b"
+checksum = "425ba64c1e13b1c6e8c5d2541c8fac10022ca584f33da781db01b5756aef1f4e"
dependencies = [
+ "block2 0.5.1",
"core-foundation",
"home",
"jni",
"log",
"ndk-context",
- "objc",
- "raw-window-handle 0.5.2",
+ "objc2 0.5.2",
+ "objc2-foundation",
"url",
"web-sys",
]
[[package]]
name = "wgpu"
-version = "0.19.4"
+version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbd7311dbd2abcfebaabf1841a2824ed7c8be443a0f29166e5d3c6a53a762c01"
+checksum = "90e37c7b9921b75dfd26dd973fdcbce36f13dfa6e2dc82aece584e0ed48c355c"
dependencies = [
"arrayvec",
"cfg-if",
"cfg_aliases",
+ "document-features",
"js-sys",
"log",
"parking_lot",
@@ -3631,15 +3669,16 @@ dependencies = [
[[package]]
name = "wgpu-core"
-version = "0.19.4"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b94525fc99ba9e5c9a9e24764f2bc29bad0911a7446c12f446a8277369bf3a"
+checksum = "d50819ab545b867d8a454d1d756b90cd5f15da1f2943334ca314af10583c9d39"
dependencies = [
"arrayvec",
"bit-vec",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"cfg_aliases",
"codespan-reporting",
+ "document-features",
"indexmap",
"log",
"naga",
@@ -3657,14 +3696,14 @@ dependencies = [
[[package]]
name = "wgpu-hal"
-version = "0.19.4"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc1a4924366df7ab41a5d8546d6534f1f33231aa5b3f72b9930e300f254e39c3"
+checksum = "172e490a87295564f3fcc0f165798d87386f6231b04d4548bca458cbbfd63222"
dependencies = [
"android_system_properties",
"arrayvec",
"ash",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"cfg_aliases",
"core-graphics-types",
"glow",
@@ -3676,7 +3715,7 @@ dependencies = [
"js-sys",
"khronos-egl",
"libc",
- "libloading 0.8.3",
+ "libloading 0.8.5",
"log",
"metal",
"naga",
@@ -3698,11 +3737,11 @@ dependencies = [
[[package]]
name = "wgpu-types"
-version = "0.19.2"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805"
+checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"js-sys",
"web-sys",
]
@@ -3731,11 +3770,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-util"
-version = "0.1.8"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -3751,7 +3790,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
dependencies = [
"windows-core",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -3760,7 +3799,7 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -3787,7 +3826,16 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
]
[[package]]
@@ -3822,18 +3870,18 @@ dependencies = [
[[package]]
name = "windows-targets"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
"windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
]
[[package]]
@@ -3850,9 +3898,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_msvc"
@@ -3868,9 +3916,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_i686_gnu"
@@ -3886,15 +3934,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
[[package]]
name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
[[package]]
name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_msvc"
@@ -3910,9 +3958,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
[[package]]
name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_x86_64_gnu"
@@ -3928,9 +3976,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnullvm"
@@ -3946,9 +3994,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_msvc"
@@ -3964,9 +4012,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winit"
@@ -3977,9 +4025,9 @@ dependencies = [
"ahash",
"android-activity",
"atomic-waker",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"bytemuck",
- "calloop",
+ "calloop 0.12.4",
"cfg_aliases",
"core-foundation",
"core-graphics",
@@ -3999,14 +4047,14 @@ dependencies = [
"raw-window-handle 0.6.2",
"redox_syscall 0.3.5",
"rustix",
- "smithay-client-toolkit",
+ "smithay-client-toolkit 0.18.1",
"smol_str",
"unicode-segmentation",
"wasm-bindgen",
"wasm-bindgen-futures",
"wayland-backend",
"wayland-client",
- "wayland-protocols",
+ "wayland-protocols 0.31.2",
"wayland-protocols-plasma",
"web-sys",
"web-time",
@@ -4018,18 +4066,9 @@ dependencies = [
[[package]]
name = "winnow"
-version = "0.5.40"
+version = "0.6.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winnow"
-version = "0.6.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
dependencies = [
"memchr",
]
@@ -4054,7 +4093,7 @@ dependencies = [
"as-raw-xcb-connection",
"gethostname",
"libc",
- "libloading 0.8.3",
+ "libloading 0.8.5",
"once_cell",
"rustix",
"x11rb-protocol",
@@ -4068,9 +4107,9 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
[[package]]
name = "xcursor"
-version = "0.3.5"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911"
+checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61"
[[package]]
name = "xi-unicode"
@@ -4084,7 +4123,7 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"dlib",
"log",
"once_cell",
@@ -4093,32 +4132,32 @@ dependencies = [
[[package]]
name = "xkeysym"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621"
+checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
[[package]]
name = "xml-rs"
-version = "0.8.20"
+version = "0.8.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193"
+checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26"
[[package]]
name = "zerocopy"
-version = "0.7.34"
+version = "0.7.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
-version = "0.7.34"
+version = "0.7.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.66",
+ "syn 2.0.77",
]
diff --git a/pkgs/tools/system/amdgpu_top/default.nix b/pkgs/by-name/am/amdgpu_top/package.nix
similarity index 60%
rename from pkgs/tools/system/amdgpu_top/default.nix
rename to pkgs/by-name/am/amdgpu_top/package.nix
index 5e69c03248c8..939280d11a9b 100644
--- a/pkgs/tools/system/amdgpu_top/default.nix
+++ b/pkgs/by-name/am/amdgpu_top/package.nix
@@ -1,33 +1,35 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, libdrm
-, libX11
-, libGL
-, wayland
-, wayland-protocols
-, libxkbcommon
-, libXrandr
-, libXi
-, libXcursor
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+ libdrm,
+ libX11,
+ libGL,
+ wayland,
+ wayland-protocols,
+ libxkbcommon,
+ libXrandr,
+ libXi,
+ libXcursor,
+ nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "amdgpu_top";
- version = "0.8.5";
+ version = "0.9.2";
src = fetchFromGitHub {
owner = "Umio-Yasuno";
repo = pname;
rev = "v${version}";
- hash = "sha256-n1nOlFXI8UCJxEgbuSbmMUhkZaLS3D4jGQdKH82WGc8=";
+ hash = "sha256-eXUeXBFW2ejkOeMUujMwY0gidzdaX9yWWOfx1ZwA3lk=";
};
cargoLock = {
- outputHashes = {
- "libdrm_amdgpu_sys-0.7.3" = "sha256-4bwbwVoNV2yroh6OLNxBq8gKaFJtoin/b9xaRdh9QOk=";
- };
lockFile = ./Cargo.lock;
+ outputHashes = {
+ "libdrm_amdgpu_sys-0.7.5" = "sha256-IkA1kJggkaSWzdDBHpNjU8WZr6wpSQWohERiHWQS2UY=";
+ };
};
buildInputs = [
@@ -50,13 +52,15 @@ rustPlatform.buildRustPackage rec {
patchelf --set-rpath "${lib.makeLibraryPath buildInputs}" $out/bin/${pname}
'';
- meta = with lib; {
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
description = "Tool to display AMDGPU usage";
homepage = "https://github.com/Umio-Yasuno/amdgpu_top";
changelog = "https://github.com/Umio-Yasuno/amdgpu_top/releases";
- license = licenses.mit;
- maintainers = with maintainers; [ geri1701 ];
- platforms = platforms.linux;
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ geri1701 ];
+ platforms = lib.platforms.linux;
mainProgram = "amdgpu_top";
};
}
diff --git a/pkgs/by-name/am/amneziawg-go/package.nix b/pkgs/by-name/am/amneziawg-go/package.nix
new file mode 100644
index 000000000000..fa5f47cffa81
--- /dev/null
+++ b/pkgs/by-name/am/amneziawg-go/package.nix
@@ -0,0 +1,44 @@
+{
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+ nix-update-script,
+}:
+
+buildGoModule rec {
+ pname = "amneziawg-go";
+ version = "0.2.12";
+
+ src = fetchFromGitHub {
+ owner = "amnezia-vpn";
+ repo = "amneziawg-go";
+ rev = "v${version}";
+ hash = "sha256-Xw2maGmNnx0+GO3OWS1Gu77oB9wh2dv+WobypQotUMA=";
+ };
+
+ postPatch = ''
+ # Skip formatting tests
+ rm -f format_test.go
+ '';
+
+ vendorHash = "sha256-zXd9PK3fpOx/YjCNs2auZWhbLUk2fO6tyLV5FxAH0us=";
+
+ subPackages = [ "." ];
+
+ ldflags = [
+ "-s"
+ "-w"
+ ];
+
+ strictDeps = true;
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ description = "Userspace Go implementation of AmneziaWG";
+ homepage = "https://github.com/amnezia-vpn/amneziawg-go";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ averyanalex ];
+ mainProgram = "amneziawg-go";
+ };
+}
diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
index c282aff0c4d7..c3573c4d30fb 100644
--- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
+++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
@@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation {
pname = "ananicy-rules-cachyos";
- version = "0-unstable-2024-09-18";
+ version = "0-unstable-2024-10-25";
src = fetchFromGitHub {
owner = "CachyOS";
repo = "ananicy-rules";
- rev = "1da705ebab9ab44bb933c1275961f963cc4440eb";
- hash = "sha256-6dVY0sZ09H5vdhfk5nGNjt+KG+Qw62b2YbJQCprXBPQ=";
+ rev = "707b16506be2c54028546181461ebf47cfe72d83";
+ hash = "sha256-189eHlSLGgSgT2KIkj+c5pKpPZ34vacZzlYOFGfwEFM=";
};
dontConfigure = true;
diff --git a/pkgs/by-name/an/antares/package.nix b/pkgs/by-name/an/antares/package.nix
index e5cc1e500a47..5c23c18588a8 100644
--- a/pkgs/by-name/an/antares/package.nix
+++ b/pkgs/by-name/an/antares/package.nix
@@ -6,6 +6,7 @@
nodejs,
makeDesktopItem,
copyDesktopItems,
+ icoutils,
}:
buildNpmPackage rec {
@@ -15,7 +16,7 @@ buildNpmPackage rec {
src = fetchFromGitHub {
owner = "antares-sql";
repo = "antares";
- rev = "v${version}";
+ rev = "refs/tags/v${version}";
hash = "sha256-3zgr3Eefx3WDUW9/1NOaneUbFy3GTnJ3tGgivtW1K/g=";
};
@@ -30,7 +31,10 @@ buildNpmPackage rec {
buildInputs = [ nodejs ];
- nativeBuildInputs = [ copyDesktopItems ];
+ nativeBuildInputs = [
+ copyDesktopItems
+ icoutils
+ ];
npmBuildScript = "compile";
@@ -45,7 +49,8 @@ buildNpmPackage rec {
# Install icon files
mkdir -pv $out/share/icon/
- cp assets/icon.ico $out/share/icon/antares.ico
+ icotool -x assets/icon.ico
+ cp icon_1_256x256x32.png $out/share/icon/antares.png
'';
npmFlags = [ "--legacy-peer-deps" ];
@@ -66,10 +71,11 @@ buildNpmPackage rec {
})
];
- meta = with lib; {
+ meta = {
description = "Modern, fast and productivity driven SQL client with a focus in UX";
homepage = "https://github.com/antares-sql/antares";
- license = licenses.mit;
- maintainers = with maintainers; [ eymeric ];
+ changelog = "https://github.com/antares-sql/antares/blob/v${version}/CHANGELOG.md";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ eymeric ];
};
}
diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix
index af5ee3c7277c..cd9f7d15438d 100644
--- a/pkgs/by-name/an/anytype/package.nix
+++ b/pkgs/by-name/an/anytype/package.nix
@@ -2,11 +2,11 @@
let
pname = "anytype";
- version = "0.42.8";
+ version = "0.43.1";
name = "Anytype-${version}";
src = fetchurl {
url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage";
- hash = "sha256-MIPKfwIZQah6K+WOQZsTpVcOrws+f4oVa7BoW29K5BA=";
+ hash = "sha256-9CjzFJcMiEGods2Ulm4Ow3lIBXc7HPcWMUFM4cG7GuM=";
};
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in appimageTools.wrapType2 {
diff --git a/pkgs/by-name/ap/apt-mirror/package.nix b/pkgs/by-name/ap/apt-mirror/package.nix
index 3fbc22451ec6..0735293986de 100644
--- a/pkgs/by-name/ap/apt-mirror/package.nix
+++ b/pkgs/by-name/ap/apt-mirror/package.nix
@@ -18,7 +18,12 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-GNsyXP/O56Y+8QhoSfMm+ig5lK/K3Cm085jxRt9ZRmI=";
};
- nativeBuildInputs = [ makeWrapper ];
+ strictDeps = true;
+
+ nativeBuildInputs = [
+ makeWrapper
+ perl # pod2man
+ ];
buildInputs = [ perl ];
diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix
index 00e3e6757d83..8a45049cbf09 100644
--- a/pkgs/by-name/ar/arc-browser/package.nix
+++ b/pkgs/by-name/ar/arc-browser/package.nix
@@ -10,11 +10,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "arc-browser";
- version = "1.65.0-54911";
+ version = "1.66.0-55166";
src = fetchurl {
url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";
- hash = "sha256-7p1FizITL4GVvlDTV91nwYQZ7LKEd4snJQX0NvB81Qo=";
+ hash = "sha256-up+ScCjFgxlATUbCeWZcVF2jZGfCw018MfT6kAqAHO4=";
};
nativeBuildInputs = [ undmg ];
diff --git a/pkgs/by-name/ar/armitage/gradle-8.patch b/pkgs/by-name/ar/armitage/gradle-8.patch
new file mode 100644
index 000000000000..43dcc358f9a9
--- /dev/null
+++ b/pkgs/by-name/ar/armitage/gradle-8.patch
@@ -0,0 +1,28 @@
+Upstream PR: https://github.com/r00t0v3rr1d3/armitage/pull/1
+diff --git a/armitage/build.gradle b/armitage/build.gradle
+index 43a5d08..50ae084 100644
+--- a/armitage/build.gradle
++++ b/armitage/build.gradle
+@@ -19,7 +19,7 @@ jar {
+ from {
+ configurations.compileClasspath.filter { it.exists() }.collect { it.isDirectory() ? it : zipTree(it) }
+ }
+- archiveName 'armitage.jar'
++ archiveFileName.set 'armitage.jar'
+ }
+
+ dependencies {
+diff --git a/cortana/build.gradle b/cortana/build.gradle
+index c7d08bb..aa54635 100644
+--- a/cortana/build.gradle
++++ b/cortana/build.gradle
+@@ -19,7 +19,8 @@ jar {
+ from {
+ configurations.compileClasspath.filter { it.exists() }.collect { it.isDirectory() ? it : zipTree(it) }
+ }
+- archiveName 'cortana.jar'
++ duplicatesStrategy DuplicatesStrategy.INCLUDE
++ archiveFileName.set 'cortana.jar'
+ }
+
+ dependencies {
diff --git a/pkgs/by-name/ar/armitage/package.nix b/pkgs/by-name/ar/armitage/package.nix
index 7d704633a360..0fc8455b4f87 100644
--- a/pkgs/by-name/ar/armitage/package.nix
+++ b/pkgs/by-name/ar/armitage/package.nix
@@ -3,7 +3,7 @@
, fetchurl
, fetchFromGitHub
, jdk11
-, gradle_6
+, gradle
, metasploit
, makeWrapper
, makeDesktopItem
@@ -15,8 +15,6 @@ let
pname = "armitage";
version = "unstable-2022-12-05";
- gradle = gradle_6;
-
src = fetchFromGitHub {
owner = "r00t0v3rr1d3";
repo = "armitage";
@@ -45,6 +43,8 @@ let
url = "https://gitlab.com/kalilinux/packages/armitage/-/raw/042beb7494a10227761ecb3ddabf4019bbb78681/debian/patches/fix-meterpreter.patch";
hash = "sha256-p4fs5xFdC2apW0U8x8u9S4p5gq3Eiv+0E4CGccQZYKY=";
})
+ # Update for Gradle 8 (https://github.com/r00t0v3rr1d3/armitage/pull/1)
+ ./gradle-8.patch
];
in
diff --git a/pkgs/by-name/ar/artalk/package.nix b/pkgs/by-name/ar/artalk/package.nix
index c56c066e2acf..96de91650e7b 100644
--- a/pkgs/by-name/ar/artalk/package.nix
+++ b/pkgs/by-name/ar/artalk/package.nix
@@ -5,34 +5,31 @@
artalk,
fetchurl,
installShellFiles,
+ versionCheckHook,
stdenv,
testers,
nixosTests,
}:
buildGoModule rec {
pname = "artalk";
- version = "2.9.0";
+ version = "2.9.1";
src = fetchFromGitHub {
owner = "ArtalkJS";
repo = "artalk";
rev = "refs/tags/v${version}";
- hash = "sha256-5tUUlkGeT4kY/81EQ29M6z+JnBT4YCa8gecbV9WMuDo=";
+ hash = "sha256-gzagE3muNpX/dwF45p11JAN9ElsGXNFQ3fCvF1QhvdU=";
};
web = fetchurl {
url = "https://github.com/${src.owner}/${src.repo}/releases/download/v${version}/artalk_ui.tar.gz";
- hash = "sha256-Cx3fDpnl52kwILzH9BBLfsWe5qEbIl/ecJd1wJEB/Hc=";
+ hash = "sha256-ckKC4lErKVdJuJ+pGysmMR96a9LkrCYnWB4j6VPP8OY=";
};
- CGO_ENABLED = 1;
-
- vendorHash = "sha256-edqmv/Q99pgnScJqCmLwjHd7uKMNPGfCSujNTUQtpLc=";
+ vendorHash = "sha256-oAqYQzOUjly97H5L5PQ9I2SO2KqiUVxdJA+eoPrHD6Q=";
ldflags = [
"-s"
"-w"
- "-X github.com/ArtalkJS/Artalk/internal/config.Version=${version}"
- "-X github.com/ArtalkJS/Artalk/internal/config.CommitHash=${version}"
];
preBuild = ''
@@ -42,21 +39,22 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
- postInstall =
- ''
- # work around case insensitive file systems
- mv $out/bin/Artalk $out/bin/artalk.tmp
- mv $out/bin/artalk.tmp $out/bin/artalk
- ''
- + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
- installShellCompletion --cmd artalk \
- --bash <($out/bin/artalk completion bash) \
- --fish <($out/bin/artalk completion fish) \
- --zsh <($out/bin/artalk completion zsh)
- '';
+ postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+ installShellCompletion --cmd artalk \
+ --bash <($out/bin/artalk completion bash) \
+ --fish <($out/bin/artalk completion fish) \
+ --zsh <($out/bin/artalk completion zsh)
+ '';
+
+ doInstallCheck = true;
+
+ versionCheckProgramArg = "-v";
+
+ nativeInstallCheckInputs = [
+ versionCheckHook
+ ];
passthru.tests = {
- version = testers.testVersion { package = artalk; };
inherit (nixosTests) artalk;
};
@@ -65,6 +63,10 @@ buildGoModule rec {
homepage = "https://github.com/ArtalkJS/Artalk";
changelog = "https://github.com/ArtalkJS/Artalk/releases/tag/v${version}";
license = lib.licenses.mit;
+ sourceProvenance = with lib.sourceTypes; [
+ fromSource
+ binaryBytecode
+ ];
maintainers = with lib.maintainers; [ moraxyc ];
mainProgram = "artalk";
};
diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix
index 0c13cc8cf57e..01bcfd5dd930 100644
--- a/pkgs/by-name/as/ast-grep/package.nix
+++ b/pkgs/by-name/as/ast-grep/package.nix
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "ast-grep";
- version = "0.28.0";
+ version = "0.28.1";
src = fetchFromGitHub {
owner = "ast-grep";
repo = "ast-grep";
rev = version;
- hash = "sha256-L0SWDnMMu9OZbgXRuEpVDDamb/hMHVIwLNqog5z26JY=";
+ hash = "sha256-nMOj/oMJsBB0bI2RzxEytvEr0v+VmGIMY0uiK7ALEHM=";
};
- cargoHash = "sha256-gl3GMnWyW3l9tzKaI6xUd6FgCj8u2gtHL9LKgkJLJT4=";
+ cargoHash = "sha256-alOLdkgyrJQNg/JACredGmfs/dKxnOm9cSahvVBHzTM=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix
index 23c06cfe5062..4efdc6e54719 100644
--- a/pkgs/by-name/as/astro-language-server/package.nix
+++ b/pkgs/by-name/as/astro-language-server/package.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "astro-language-server";
- version = "2.15.3";
+ version = "2.15.4";
src = fetchFromGitHub {
owner = "withastro";
repo = "language-tools";
rev = "@astrojs/language-server@${finalAttrs.version}";
- hash = "sha256-PJTcr/FIA0haatLFNHMJV24j6eK+c2DR9zpnR8aReHo=";
+ hash = "sha256-NBLUeg1WqxTXtu8eg1fihQSfm8koYAEWhfXAj/fIdC8=";
};
pnpmDeps = pnpm.fetchDeps {
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
pnpmWorkspaces
prePnpmInstall
;
- hash = "sha256-/X8ZoWK5kBPm/8clBDP+B9A5ofXnH2svmy4kMc2t5iA=";
+ hash = "sha256-tlpk+wbLjJqt37lu67p2A2RZAR1ZfnZFiYoqIQwvWPQ=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/at/athens/package.nix b/pkgs/by-name/at/athens/package.nix
index 4b4958c643b7..21acfc9f37d6 100644
--- a/pkgs/by-name/at/athens/package.nix
+++ b/pkgs/by-name/at/athens/package.nix
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "athens";
- version = "0.15.3";
+ version = "0.15.4";
src = fetchFromGitHub {
owner = "gomods";
repo = "athens";
rev = "v${version}";
- hash = "sha256-iRuy3z5GCsuTnIQuPkzyTvMSMlYTqf3Do7uqgERTXn0=";
+ hash = "sha256-6NBdif8rQ1aj4nTYXhrWyErzRv0q8WpIheRnb2FCnkU=";
};
- vendorHash = "sha256-cK23BIGh/BK1OHHrI++PD1h7lCN7NZfV1Yfirs8vC5A=";
+ vendorHash = "sha256-W65lQYGrRg8LwFERj5MBOPFAn2j+FE7ep4ANuAGmfgM=";
CGO_ENABLED = "0";
ldflags = [
diff --git a/pkgs/by-name/at/atproto-goat/package.nix b/pkgs/by-name/at/atproto-goat/package.nix
new file mode 100644
index 000000000000..b2ba3474d212
--- /dev/null
+++ b/pkgs/by-name/at/atproto-goat/package.nix
@@ -0,0 +1,43 @@
+{
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+ unstableGitUpdater,
+}:
+
+buildGoModule rec {
+ pname = "atproto-goat";
+ version = "0-unstable-2024-10-29";
+
+ src = fetchFromGitHub {
+ owner = "bluesky-social";
+ repo = "indigo";
+ rev = "983ce4a481a32a3eb2944c4c76e885d0f6006f83";
+ hash = "sha256-Jo3pI4uRyKh3yV03ijOcg+Uyu75Spmy/VS116MVgleU=";
+ };
+
+ postPatch = ''
+ substituteInPlace cmd/goat/main.go \
+ --replace-fail "versioninfo.Short()" '"${version}"' \
+ --replace-fail '"github.com/carlmjohnson/versioninfo"' ""
+ '';
+
+ vendorHash = "sha256-T+jtxubVKskrLGTUa4RI24o/WTSFCBk60HhyCFujPOI=";
+
+ subPackages = [ "cmd/goat" ];
+
+ passthru.updateScript = unstableGitUpdater {
+ hardcodeZeroVersion = true;
+ };
+
+ meta = {
+ description = "Go AT protocol CLI tool";
+ homepage = "https://github.com/bluesky-social/indigo/blob/main/cmd/goat/README.md";
+ license = with lib.licenses; [
+ mit
+ asl20
+ ];
+ maintainers = with lib.maintainers; [ pyrox0 ];
+ mainProgram = "goat";
+ };
+}
diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix
index cbd16b123405..050ace8c708a 100644
--- a/pkgs/by-name/au/audacity/package.nix
+++ b/pkgs/by-name/au/audacity/package.nix
@@ -52,9 +52,9 @@
wavpack,
wxGTK32,
gtk3,
+ apple-sdk_11,
libpng,
libjpeg,
- darwin,
}:
# TODO
@@ -62,31 +62,25 @@
stdenv.mkDerivation (finalAttrs: {
pname = "audacity";
- version = "3.6.4";
+ version = "3.7.0";
src = fetchFromGitHub {
owner = "audacity";
repo = "audacity";
rev = "Audacity-${finalAttrs.version}";
- hash = "sha256-72k79UFxhk8JUCnMzbU9lZ0Ua3Ui41EkhPGSnGkf9mE=";
+ hash = "sha256-jwsn/L9e1ViWLOh8Xc4lTS9FhanD4GK0BllCwtPamZc=";
};
postPatch =
''
mkdir src/private
substituteInPlace scripts/build/macOS/fix_bundle.py \
- --replace "path.startswith('/usr/lib/')" "path.startswith('${builtins.storeDir}')"
+ --replace-fail "path.startswith('/usr/lib/')" "path.startswith('${builtins.storeDir}')"
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace libraries/lib-files/FileNames.cpp \
- --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h
- ''
- +
- lib.optionalString
- (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0")
- ''
- sed -z -i "s/NSAppearanceName.*systemAppearance//" src/AudacityApp.mm
- '';
+ --replace-fail /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h
+ '';
nativeBuildInputs =
[
@@ -150,8 +144,7 @@ stdenv.mkDerivation (finalAttrs: {
util-linux
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
- darwin.apple_sdk.frameworks.AppKit
- darwin.apple_sdk.frameworks.CoreAudioKit # for portaudio
+ apple-sdk_11
libpng
libjpeg
];
diff --git a/pkgs/by-name/au/audible-cli/package.nix b/pkgs/by-name/au/audible-cli/package.nix
index b0026fef4641..682be8b6c270 100644
--- a/pkgs/by-name/au/audible-cli/package.nix
+++ b/pkgs/by-name/au/audible-cli/package.nix
@@ -51,7 +51,9 @@ python3Packages.buildPythonApplication rec {
"audible_cli"
];
- passthru.updateScript = nix-update-script { };
+ passthru.updateScript = nix-update-script {
+ extraArgs = [ "--version-regex" "[0-9.]+" ];
+ };
meta = with lib; {
description = "Command line interface for audible package. With the cli you can download your Audible books, cover, chapter files";
diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json
index 0699cd2dde08..9fd9317d4640 100644
--- a/pkgs/by-name/au/audiobookshelf/source.json
+++ b/pkgs/by-name/au/audiobookshelf/source.json
@@ -1,9 +1,9 @@
{
"owner": "advplyr",
"repo": "audiobookshelf",
- "rev": "d80752cc9d7ace01fee57a627b7745adedc08589",
- "hash": "sha256-iT2Ww+iRyGS5qBT3QcM7weiYq/6c408jTSPuZinNXgs=",
- "version": "2.15.1",
- "depsHash": "sha256-km/cx2IaJ2/1UxZk2uXHE46VF3MiR6hasYRuKKBitY4=",
- "clientDepsHash": "sha256-3XsXCZrDMtZFs8xwqydfVouAuxarQl/KdMdHkq+Vp9A="
+ "rev": "50fd659749128a321ecc3284e128d014433145a9",
+ "hash": "sha256-lYzzzH2heSj0doPfAEWL+pTP9wTsTzLb3+Fu0DHD1w0=",
+ "version": "2.16.1",
+ "depsHash": "sha256-7kA1AusnF7iDMACd9lQ8wbdbtjtouh9qu1J8EzzYUrQ=",
+ "clientDepsHash": "sha256-NwOkMdlmh+tQCWKrbKBbf9XPA3mtz7S3VrGwvpBS0Rc="
}
diff --git a/pkgs/by-name/au/auto-cpufreq/package.nix b/pkgs/by-name/au/auto-cpufreq/package.nix
index 3a87f2ac0cbe..15db7faa4089 100644
--- a/pkgs/by-name/au/auto-cpufreq/package.nix
+++ b/pkgs/by-name/au/auto-cpufreq/package.nix
@@ -6,6 +6,7 @@
gobject-introspection,
wrapGAppsHook3,
gtk3,
+ getent,
}:
python3Packages.buildPythonPackage rec {
pname = "auto-cpufreq";
@@ -29,15 +30,18 @@ python3Packages.buildPythonPackage rec {
python3Packages.poetry-core
];
- propagatedBuildInputs = with python3Packages; [
- click
- distro
- psutil
- pygobject3
- poetry-dynamic-versioning
- setuptools
- pyinotify
- ];
+ propagatedBuildInputs =
+ with python3Packages;
+ [
+ click
+ distro
+ psutil
+ pygobject3
+ poetry-dynamic-versioning
+ setuptools
+ pyinotify
+ ]
+ ++ [ getent ];
doCheck = false;
pythonImportsCheck = [ "auto_cpufreq" ];
diff --git a/pkgs/by-name/au/auto-patchelf/package.nix b/pkgs/by-name/au/auto-patchelf/package.nix
index 1e1880560adf..5096c4fcf56a 100644
--- a/pkgs/by-name/au/auto-patchelf/package.nix
+++ b/pkgs/by-name/au/auto-patchelf/package.nix
@@ -8,12 +8,7 @@ python3Packages.buildPythonApplication {
version = "0-unstable-2024-08-14";
pyproject = false;
- src = lib.fileset.toSource {
- root = ./.;
- fileset = lib.fileset.unions [
- ./auto-patchelf.py
- ];
- };
+ src = ./source;
dependencies = with python3Packages; [
pyelftools
diff --git a/pkgs/by-name/au/auto-patchelf/auto-patchelf.py b/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py
similarity index 100%
rename from pkgs/by-name/au/auto-patchelf/auto-patchelf.py
rename to pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py
diff --git a/pkgs/by-name/au/autoraise/package.nix b/pkgs/by-name/au/autoraise/package.nix
new file mode 100644
index 000000000000..4a1b0623cb3b
--- /dev/null
+++ b/pkgs/by-name/au/autoraise/package.nix
@@ -0,0 +1,49 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ darwin,
+}:
+
+stdenv.mkDerivation rec {
+ pname = "autoraise";
+ version = "5.3";
+
+ src = fetchFromGitHub {
+ owner = "sbmpost";
+ repo = "AutoRaise";
+ rev = "v${version}";
+ hash = "sha256-OsvmNHpQ46+cWkR4Nz/9oIgSFSWLfCwZnAnRKRiNm5E=";
+ };
+
+ buildInputs = with darwin.apple_sdk.frameworks; [
+ AppKit
+ SkyLight
+ ];
+
+ dontConfigure = true;
+
+ buildPhase = ''
+ runHook preBuild
+ $CXX -std=c++03 -fobjc-arc -D"NS_FORMAT_ARGUMENT(A)=" -D"SKYLIGHT_AVAILABLE=1" -o AutoRaise AutoRaise.mm -framework AppKit -framework SkyLight
+ bash create-app-bundle.sh
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/Applications $out/bin
+ mv AutoRaise.app $out/Applications/AutoRaise.app
+ ln -s $out/Applications/AutoRaise.app/Contents/MacOS/AutoRaise $out/bin/autoraise
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "AutoRaise (and focus) a window when hovering over it with the mouse";
+ homepage = "https://github.com/sbmpost/AutoRaise";
+ license = lib.licenses.gpl3Only;
+ maintainers = with lib.maintainers; [ nickhu ];
+ mainProgram = "autoraise";
+ platforms = lib.platforms.darwin;
+ };
+}
diff --git a/pkgs/by-name/av/avro-tools/package.nix b/pkgs/by-name/av/avro-tools/package.nix
index 730a05a259e8..b4d831af3bf4 100644
--- a/pkgs/by-name/av/avro-tools/package.nix
+++ b/pkgs/by-name/av/avro-tools/package.nix
@@ -7,14 +7,14 @@
}:
let
pname = "avro-tools";
- version = "1.11.3";
+ version = "1.12.0";
in
stdenv.mkDerivation {
inherit pname version;
src = fetchurl {
url = "mirror://maven/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar";
- sha256 = "sha256-dPaV1rZxxE+G/gB7hEDyiMI7ZbzkTpNEtexp/Y6hrPI=";
+ sha256 = "sha256-+OTQ2UWFLcL5HDv4j33LjKvADg/ClbuS6JPlSUXggIU=";
};
dontUnpack = true;
diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix
index 0a9958e92d2f..a42799386ce5 100644
--- a/pkgs/by-name/aw/awscli2/package.nix
+++ b/pkgs/by-name/aw/awscli2/package.nix
@@ -62,22 +62,20 @@ let
in
py.pkgs.buildPythonApplication rec {
pname = "awscli2";
- version = "2.17.64"; # N.B: if you change this, check if overrides are still up-to-date
+ version = "2.18.15"; # N.B: if you change this, check if overrides are still up-to-date
pyproject = true;
src = fetchFromGitHub {
owner = "aws";
repo = "aws-cli";
rev = "refs/tags/${version}";
- hash = "sha256-Hq86KhAIATSz3dF1zO6aSdZQAfLs4EcRqWglAOJUVGk=";
+ hash = "sha256-dm4Z3WsFq5GQN6gvi5OS9J96PqhGx8Qz2OsHwUBrsAs=";
};
- patches = [ ];
-
postPatch = ''
substituteInPlace pyproject.toml \
- --replace-fail 'awscrt>=0.19.18,<=0.21.2' 'awscrt>=0.19.18' \
- --replace-fail 'cryptography>=40.0.0,<40.0.2' 'cryptography>=43.0.0' \
+ --replace-fail 'awscrt>=0.19.18,<=0.22.0' 'awscrt>=0.22.0' \
+ --replace-fail 'cryptography>=40.0.0,<43.0.2' 'cryptography>=43.0.0' \
--replace-fail 'distro>=1.5.0,<1.9.0' 'distro>=1.5.0' \
--replace-fail 'docutils>=0.10,<0.20' 'docutils>=0.10' \
--replace-fail 'prompt-toolkit>=3.0.24,<3.0.39' 'prompt-toolkit>=3.0.24'
diff --git a/pkgs/by-name/ax/axis2/package.nix b/pkgs/by-name/ax/axis2/package.nix
index adb305f3100e..378656e036e3 100644
--- a/pkgs/by-name/ax/axis2/package.nix
+++ b/pkgs/by-name/ax/axis2/package.nix
@@ -34,6 +34,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
installPhase = ''
runHook preInstall
+ install -Dm644 lib/* -t $out/lib
install -Dm644 dist/axis2.war -t $out/webapps
unzip $out/webapps/axis2.war -d $out/webapps/axis2
diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix
index 9f80146842de..9dbfdb00dc95 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.nix
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.nix
@@ -59,9 +59,9 @@
};
aks-preview = mkAzExtension rec {
pname = "aks-preview";
- version = "8.0.0b1";
+ version = "9.0.0b6";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-${version}-py2.py3-none-any.whl";
- sha256 = "500a670e0f4cd8ef9399a0928fbcef6440a68cdc2978c62db911d1585f351b75";
+ sha256 = "36a215d3a2fdb54b8a977ecab330c3f73c32746368c977364e11fd5cb8e089a4";
description = "Provides a preview for upcoming AKS features";
};
akshybrid = mkAzExtension rec {
@@ -80,16 +80,16 @@
};
alertsmanagement = mkAzExtension rec {
pname = "alertsmanagement";
- version = "0.2.3";
+ version = "1.0.0b1";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/alertsmanagement-${version}-py3-none-any.whl";
- sha256 = "b45a5752924ab1205ff5862f03a4a465eccb4dd8e79900023498d674aa68665b";
+ sha256 = "e1e15aeff1ab9b25fb820b914e602ce84a7d00e5382eb07d413f1492d90b09d1";
description = "Microsoft Azure Command-Line Tools AlertsManagementClient Extension";
};
amg = mkAzExtension rec {
pname = "amg";
- version = "2.2.0";
+ version = "2.4.0";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/amg-${version}-py3-none-any.whl";
- sha256 = "8d832463a35329e61840bce5fe2c3ba214f8e800cc38140fe58dc2bf13ffeb90";
+ sha256 = "624ca8c847ce93ecc839ee428115d09b263c4ece7c52da0abef38893645111d6";
description = "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension";
};
amlfs = mkAzExtension rec {
@@ -150,9 +150,9 @@
};
azurelargeinstance = mkAzExtension rec {
pname = "azurelargeinstance";
- version = "1.0.0b3";
+ version = "1.0.0b4";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/azurelargeinstance-${version}-py3-none-any.whl";
- sha256 = "093a2fa900e3df53f8bf15b335156058333efe0eff9584a11db4bac0bccc7b1d";
+ sha256 = "6fee478bd919922a0532573fdea3b5422925d374ba6649ea015d4d33941e819a";
description = "Microsoft Azure Command-Line Tools Azurelargeinstance Extension";
};
azurestackhci = mkAzExtension rec {
@@ -164,16 +164,16 @@
};
baremetal-infrastructure = mkAzExtension rec {
pname = "baremetal-infrastructure";
- version = "3.0.0b1";
+ version = "3.0.0b2";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/baremetal_infrastructure-${version}-py3-none-any.whl";
- sha256 = "83ff3e4540f522a5f3578a923155715160e90a15a8d919a2e5569c08f1295a2f";
+ sha256 = "0e5843e295a27058262e945febc43179ce173ac27ebcfe4456b466b7acb9c220";
description = "Microsoft Azure Command-Line Tools BaremetalInfrastructure Extension";
};
bastion = mkAzExtension rec {
pname = "bastion";
- version = "1.1.0";
+ version = "1.3.0";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-${version}-py3-none-any.whl";
- sha256 = "d90bc404d2f9d22435a2bd34bd1fd6094d71d6f1719763c72ee6e4835ec8a99d";
+ sha256 = "151ab25d4dcde10b46c4693cefdaf1d0d5841e15cfe3ec64c089aaaf55e6c8c0";
description = "Microsoft Azure Command-Line Tools Bastion Extension";
};
billing-benefits = mkAzExtension rec {
@@ -234,9 +234,9 @@
};
connectedvmware = mkAzExtension rec {
pname = "connectedvmware";
- version = "1.1.1";
+ version = "1.2.0";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/connectedvmware-${version}-py2.py3-none-any.whl";
- sha256 = "28ef4a31c805d52aa16e749ec1382591b3089e970d8741deaf401a86c4e5e6ad";
+ sha256 = "b731a821c609aae8bfab7e0470b342b9179e7e0c65482f4a432a60d87a4c395f";
description = "Microsoft Azure Command-Line Tools Connectedvmware Extension";
};
connection-monitor-preview = mkAzExtension rec {
@@ -255,9 +255,9 @@
};
costmanagement = mkAzExtension rec {
pname = "costmanagement";
- version = "0.3.0";
+ version = "1.0.0";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/costmanagement-${version}-py3-none-any.whl";
- sha256 = "5661a2082ecca000b0c764dc92585e2aa601ccd5eeeb296397533cf4da814cf6";
+ sha256 = "6e5e053d05bad6ad6305bd024f51e355e60fde8bb6a03350dfd81c25437d2e45";
description = "Microsoft Azure Command-Line Tools CostManagementClient Extension";
};
csvmware = mkAzExtension rec {
@@ -290,9 +290,9 @@
};
databricks = mkAzExtension rec {
pname = "databricks";
- version = "1.0.0";
+ version = "1.0.1";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/databricks-${version}-py3-none-any.whl";
- sha256 = "a23ded367e80240eea828a3234801d4d989539ae4a5ecf246bfc6acb054a2544";
+ sha256 = "55165d7435cd7a0dc87587e82fc202d792a5f28c9c44398655b0a4770d038c30";
description = "Microsoft Azure Command-Line Tools DatabricksClient Extension";
};
datadog = mkAzExtension rec {
@@ -311,9 +311,9 @@
};
datamigration = mkAzExtension rec {
pname = "datamigration";
- version = "1.0.0b1";
+ version = "1.0.0b2";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/datamigration-${version}-py3-none-any.whl";
- sha256 = "9d1ac8c7046e23387696561747be2e8f62e879a4a305f8b20ccd19460a29db0d";
+ sha256 = "8901b5664a95e665781698bc02ee94b4297c82ac9fdfab99dd4f13bac1c0923e";
description = "Microsoft Azure Command-Line Tools DataMigrationManagementClient Extension";
};
dataprotection = mkAzExtension rec {
@@ -386,6 +386,13 @@
sha256 = "1c4bb8216e509c2f08fa75c45930ec377768326f30cb9ab125842aa9352c6e2e";
description = "Microsoft Azure Command-Line Tools DnsResolverManagementClient Extension";
};
+ durabletask = mkAzExtension rec {
+ pname = "durabletask";
+ version = "1.0.0b1";
+ url = "https://azcliprod.blob.core.windows.net/cli-extensions/durabletask-${version}-py3-none-any.whl";
+ sha256 = "d7a929b294928df79d8312fbf6af72c5d928e304c4a7b37daf3ff772667dfb25";
+ description = "Microsoft Azure Command-Line Tools Durabletask Extension";
+ };
dynatrace = mkAzExtension rec {
pname = "dynatrace";
version = "0.1.0";
@@ -409,9 +416,9 @@
};
elastic = mkAzExtension rec {
pname = "elastic";
- version = "1.0.0b2";
+ version = "1.0.0b3";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/elastic-${version}-py3-none-any.whl";
- sha256 = "1d99dbcc10b99185b4cd9b64a8835d80b424226e5cf5d40b3e3ae1d435532657";
+ sha256 = "2f3ae430d3c34dd4007c8c5a8374963568cc23558872464242811cc5a26e2de7";
description = "Microsoft Azure Command-Line Tools MicrosoftElastic Extension";
};
elastic-san = mkAzExtension rec {
@@ -444,9 +451,9 @@
};
fleet = mkAzExtension rec {
pname = "fleet";
- version = "1.2.1";
+ version = "1.4.0";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-${version}-py3-none-any.whl";
- sha256 = "d7e3525249c0c4e5ae0988500e36847b4363d734f7b16e7a0f9a9e54623081ae";
+ sha256 = "1d83a9000c879ff1a9a2bff2ea23183ab61e342713dfedb662345593b1658438";
description = "Microsoft Azure Command-Line Tools Fleet Extension";
};
fluid-relay = mkAzExtension rec {
@@ -556,9 +563,9 @@
};
import-export = mkAzExtension rec {
pname = "import-export";
- version = "0.1.1";
- url = "https://azurecliprod.blob.core.windows.net/cli-extensions/import_export-${version}-py3-none-any.whl";
- sha256 = "0680948362e12138c9582e68e471533482749bd660bfe3c8c2a4d856e90927b0";
+ version = "1.0.0b1";
+ url = "https://azcliprod.blob.core.windows.net/cli-extensions/import_export-${version}-py3-none-any.whl";
+ sha256 = "c4e36f1003031a67615a45cd12592bf5c11c54b7bd957f6c2af90efcb5c517b2";
description = "Microsoft Azure Command-Line Tools StorageImportExport Extension";
};
informatica = mkAzExtension rec {
@@ -577,9 +584,9 @@
};
internet-analyzer = mkAzExtension rec {
pname = "internet-analyzer";
- version = "0.1.0rc6";
+ version = "1.0.0b1";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/internet_analyzer-${version}-py2.py3-none-any.whl";
- sha256 = "0708d9f598d1618d138eebcf18354d97c7b3a2c90570959df077e04d419d32c3";
+ sha256 = "4564881a7c90bacfd881c629a4182398007c886d099ea88db97e1ff10053a5c4";
description = "Microsoft Azure Command-Line Tools Internet Analyzer Extension";
};
ip-group = mkAzExtension rec {
@@ -598,9 +605,9 @@
};
k8s-runtime = mkAzExtension rec {
pname = "k8s-runtime";
- version = "1.0.3";
+ version = "1.0.4";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_runtime-${version}-py3-none-any.whl";
- sha256 = "133dd153979c74d37aa25956ed8a9aa741c334929848cd67c26f268332759d40";
+ sha256 = "aee2d3008d818d78342149e6f1d2c7922abbbe43f323d51e6cd58c73b1c67b3a";
description = "Microsoft Azure Command-Line Tools K8sRuntime Extension";
};
kusto = mkAzExtension rec {
@@ -612,16 +619,16 @@
};
log-analytics = mkAzExtension rec {
pname = "log-analytics";
- version = "0.2.2";
- url = "https://azurecliprod.blob.core.windows.net/cli-extensions/log_analytics-${version}-py2.py3-none-any.whl";
- sha256 = "c04c42a26d50db82d14f76e209184b18d4cce17b458817ac607e3ff975641eb2";
+ version = "1.0.0b1";
+ url = "https://azcliprod.blob.core.windows.net/cli-extensions/log_analytics-${version}-py2.py3-none-any.whl";
+ sha256 = "ccd36a8ca6979c549db7d7fd78009907e9e7bc2b09437885dbdd8b107cb15b66";
description = "Support for Azure Log Analytics query capabilities";
};
log-analytics-solution = mkAzExtension rec {
pname = "log-analytics-solution";
- version = "1.0.0";
+ version = "1.0.1";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/log_analytics_solution-${version}-py2.py3-none-any.whl";
- sha256 = "c0a4252da4c29032c4e956b768860529509e88a1ecef7f3a3189cb701a305c6b";
+ sha256 = "7e10443de862cd0c19090b0a0dae5e9942e8b48c20e3a9c3305778daa756ea96";
description = "Support for Azure Log Analytics Solution";
};
logic = mkAzExtension rec {
@@ -673,6 +680,13 @@
sha256 = "062ad026d9eaf791b5928c4fb793148d40c6c297cee32f175cd3a155eb24d93f";
description = "Microsoft Azure Command-Line Tools Mdp Extension";
};
+ microsoft-fabric = mkAzExtension rec {
+ pname = "microsoft-fabric";
+ version = "1.0.0b1";
+ url = "https://azcliprod.blob.core.windows.net/cli-extensions/microsoft_fabric-${version}-py3-none-any.whl";
+ sha256 = "8ba450a5a3daafa8b9b6b6e9ee8224f468fd972332e905000f2acc7ff00cd9bb";
+ description = "Microsoft Azure Command-Line Tools Microsoft Fabric Extension";
+ };
mixed-reality = mkAzExtension rec {
pname = "mixed-reality";
version = "0.0.5";
@@ -694,6 +708,20 @@
sha256 = "3151a341845d053a4be45d9b7c04e1e15b88503ab6b110163a12b9aee6fd3cd9";
description = "Microsoft Azure Command-Line Tools MonitorClient Extension";
};
+ monitor-pipeline-group = mkAzExtension rec {
+ pname = "monitor-pipeline-group";
+ version = "1.0.0b1";
+ url = "https://azcliprod.blob.core.windows.net/cli-extensions/monitor_pipeline_group-${version}-py3-none-any.whl";
+ sha256 = "cf31f9e3fa9458716f0c3d1c15698ef79b707c5bd7d146773d2b2afe42e64c29";
+ description = "Microsoft Azure Command-Line Tools MonitorPipelineGroup Extension";
+ };
+ multicloud-connector = mkAzExtension rec {
+ pname = "multicloud-connector";
+ version = "1.0.0b1";
+ url = "https://azcliprod.blob.core.windows.net/cli-extensions/multicloud_connector-${version}-py3-none-any.whl";
+ sha256 = "ad84350162ae877287f8a151920b3c4bdc6375dd419dd6101c2702db606a5d19";
+ description = "Microsoft Azure Command-Line Tools MulticloudConnector Extension";
+ };
network-analytics = mkAzExtension rec {
pname = "network-analytics";
version = "1.0.0b1";
@@ -703,10 +731,10 @@
};
networkcloud = mkAzExtension rec {
pname = "networkcloud";
- version = "2.0.0b2";
+ version = "2.0.0b4";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-${version}-py3-none-any.whl";
- sha256 = "28c43560516e254ab60708c0ac8cf868795ce76e4aa9da1548584b22331af467";
- description = "Support for Azure Operator Nexus network cloud commands based on 2023-10-01-preview API version";
+ sha256 = "06707a008405739a5639230f3fd094031084a69f867648503aed4039d118ad9f";
+ description = "Support for Azure Operator Nexus network cloud commands based on 2024-07-01 API version";
};
new-relic = mkAzExtension rec {
pname = "new-relic";
@@ -724,9 +752,9 @@
};
nginx = mkAzExtension rec {
pname = "nginx";
- version = "2.0.0b5";
+ version = "2.0.0b6";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/nginx-${version}-py2.py3-none-any.whl";
- sha256 = "92e0b817bb863173da129abd3c326e058df3afce0fbb9851e6ff8ccea3c04773";
+ sha256 = "d94f77c12ce6945c823f7efa84238e398b5aec878156bbdf3112f0def1eb8960";
description = "Microsoft Azure Command-Line Tools Nginx Extension";
};
notification-hub = mkAzExtension rec {
@@ -773,9 +801,9 @@
};
peering = mkAzExtension rec {
pname = "peering";
- version = "0.2.1";
+ version = "1.0.0";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/peering-${version}-py3-none-any.whl";
- sha256 = "b068c12b47f17304af51431a2ae975339b7d4601a180e83916efae73d7c42600";
+ sha256 = "fe4e3ba85c1f65966a059291e46ebeb7c956f28da2b15b541b0492765b623992";
description = "Microsoft Azure Command-Line Tools PeeringManagementClient Extension";
};
portal = mkAzExtension rec {
@@ -822,9 +850,9 @@
};
redisenterprise = mkAzExtension rec {
pname = "redisenterprise";
- version = "1.0.0";
+ version = "1.2.0";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/redisenterprise-${version}-py3-none-any.whl";
- sha256 = "e43737fefbb1205970254f369b0f0c33fbfd5b82d64eb2025228eb3a07bed3e7";
+ sha256 = "6e776d464afaaf66456d7b8e6d36ab1a12f19054617479ea8f13633d3a49ffac";
description = "Microsoft Azure Command-Line Tools RedisEnterprise Extension";
};
reservation = mkAzExtension rec {
@@ -899,9 +927,9 @@
};
spring = mkAzExtension rec {
pname = "spring";
- version = "1.25.0";
+ version = "1.25.1";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/spring-${version}-py3-none-any.whl";
- sha256 = "2b9cf4ae2fd52b5f644bfefba69ed5e574404597e3cab0e3a9b8e44e7b03363f";
+ sha256 = "9eb8a6f2f77b19c9f9809526bb701076590ddb35f6b2ec431ce318b96cc40733";
description = "Microsoft Azure Command-Line Tools spring Extension";
};
spring-cloud = mkAzExtension rec {
@@ -920,9 +948,9 @@
};
stack-hci-vm = mkAzExtension rec {
pname = "stack-hci-vm";
- version = "1.1.20";
+ version = "1.3.0";
url = "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-${version}-py3-none-any.whl";
- sha256 = "7de544b8058ab11d9713b551db65aeaec6b8e5832cdadbbf26ccb7a4a282db6b";
+ sha256 = "19553e50d59cafcc19166be7e91be43c725f7abae1d8338914f8e6043853fc09";
description = "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension";
};
standbypool = mkAzExtension rec {
@@ -948,9 +976,9 @@
};
storage-blob-preview = mkAzExtension rec {
pname = "storage-blob-preview";
- version = "0.7.2";
+ version = "1.0.0b1";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/storage_blob_preview-${version}-py2.py3-none-any.whl";
- sha256 = "002b7779f4c6531fdb714f77bcea5d3d96007a7ff5b86869f8e56aad98298b23";
+ sha256 = "1ffe451e41657c8f28a22abee387371d11cedd80d2e52cfcbed0adac0a917b41";
description = "Microsoft Azure Command-Line Tools Storage-blob-preview Extension";
};
storage-mover = mkAzExtension rec {
@@ -962,9 +990,9 @@
};
storagesync = mkAzExtension rec {
pname = "storagesync";
- version = "1.0.0";
+ version = "1.0.1";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/storagesync-${version}-py2.py3-none-any.whl";
- sha256 = "1f6997e186199058e60d8fdc020c407d4f92d8e78286189c1887e57a371b43c1";
+ sha256 = "7f2ba91a7a44741f4384b44ba7cea73a8a03b5d385b43404cb4951dd2ea5dc5a";
description = "Microsoft Azure Command-Line Tools MicrosoftStorageSync Extension";
};
stream-analytics = mkAzExtension rec {
@@ -988,6 +1016,13 @@
sha256 = "5dde97f8fb12eaa258530f68ec2cae00a957f30479835e9f5ed057940312741a";
description = "Microsoft Azure Command-Line Tools Support Extension";
};
+ terraform = mkAzExtension rec {
+ pname = "terraform";
+ version = "1.0.0b1";
+ url = "https://azcliprod.blob.core.windows.net/cli-extensions/terraform-${version}-py3-none-any.whl";
+ sha256 = "80fde2b896b707fd83f83821809682079bd3bb032aa9cb04ba0d2595b3673f27";
+ description = "Microsoft Azure Command-Line Tools Terraform Extension";
+ };
timeseriesinsights = mkAzExtension rec {
pname = "timeseriesinsights";
version = "1.0.0b1";
@@ -1011,30 +1046,30 @@
};
virtual-network-manager = mkAzExtension rec {
pname = "virtual-network-manager";
- version = "1.2.0";
+ version = "1.3.0";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_manager-${version}-py3-none-any.whl";
- sha256 = "7f9f239fd7904645beacc2b738dd4660fb36779966e9b2331c43826e37564793";
+ sha256 = "f16f992f98fd03c01dcef8a40f9b84de2367ff9e8850b48663a9bb1cb55b7bd4";
description = "Microsoft Azure Command-Line Tools NetworkManagementClient Extension";
};
virtual-network-tap = mkAzExtension rec {
pname = "virtual-network-tap";
- version = "0.1.0";
- url = "https://azurecliprod.blob.core.windows.net/cli-extensions/virtual_network_tap-${version}-py2.py3-none-any.whl";
- sha256 = "7e3f634f8eb701cf6fef504159785bc90e6f5bd2482e459469dd9ab30601aa35";
+ version = "1.0.0b1";
+ url = "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_tap-${version}-py2.py3-none-any.whl";
+ sha256 = "ee5f6dcfc09fc09e0c3bbd386b4d3bc6cc1f8a3dde8ed550804f43ed4c3cb7ba";
description = "Manage virtual network taps (VTAP)";
};
virtual-wan = mkAzExtension rec {
pname = "virtual-wan";
- version = "1.0.0";
+ version = "1.0.1";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_wan-${version}-py2.py3-none-any.whl";
- sha256 = "0ef7b4bf9ffd0aa1ad5c50e15a343276636bcfe0296e52d2ee5f0b75ce70633d";
+ sha256 = "2db6c253d43862d06a4525073d67b61f1d34b7c8832162bd3b0bfffd24b9ada6";
description = "Manage virtual WAN, hubs, VPN gateways and VPN sites";
};
vmware = mkAzExtension rec {
pname = "vmware";
- version = "7.0.0";
+ version = "7.1.0";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/vmware-${version}-py2.py3-none-any.whl";
- sha256 = "e0fadce4fc02996443a8e1673d19ebd24383c584ca89bd396ce963e85865ac0d";
+ sha256 = "53dc8b1d803cd784e668c4d4d630dec20390406af46266df0860f548a5c21f9d";
description = "Azure VMware Solution commands";
};
webapp = mkAzExtension rec {
@@ -1046,9 +1081,9 @@
};
workloads = mkAzExtension rec {
pname = "workloads";
- version = "1.1.0b2";
+ version = "1.1.0b3";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/workloads-${version}-py3-none-any.whl";
- sha256 = "716ec3db6d1d637da3d0255e83406aed3acd26b83405bbcadc4d30e1110beea3";
+ sha256 = "a7373b2d3766c43b3caeafc0eddbb492429750b62c78f767760b9b0b42363206";
description = "Microsoft Azure Command-Line Tools Workloads Extension";
};
diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix
index 5a4c2363c788..a9167380ccaf 100644
--- a/pkgs/by-name/az/azure-cli/package.nix
+++ b/pkgs/by-name/az/azure-cli/package.nix
@@ -21,14 +21,14 @@
}:
let
- version = "2.64.0";
+ version = "2.65.0";
src = fetchFromGitHub {
name = "azure-cli-${version}-src";
owner = "Azure";
repo = "azure-cli";
rev = "azure-cli-${version}";
- hash = "sha256-1FnrUvRpAkZ0nAxen3seam2S49tBkK5N37ZD99OkvB0=";
+ hash = "sha256-IeiAB0AI6KNpXwx2Iv55LBARcwemakbblFlbfLheuGE=";
};
# put packages that needs to be overridden in the py package scope
diff --git a/pkgs/by-name/az/azure-cli/python-packages.nix b/pkgs/by-name/az/azure-cli/python-packages.nix
index 0b09811647bc..68d452e58046 100644
--- a/pkgs/by-name/az/azure-cli/python-packages.nix
+++ b/pkgs/by-name/az/azure-cli/python-packages.nix
@@ -54,6 +54,7 @@ let
humanfriendly
jmespath
knack
+ microsoft-security-utilities-secret-masker
msal-extensions
msal
msrestazure
diff --git a/pkgs/by-name/ba/bant/package.nix b/pkgs/by-name/ba/bant/package.nix
index 3fc5138912a2..c0f181dd41db 100644
--- a/pkgs/by-name/ba/bant/package.nix
+++ b/pkgs/by-name/ba/bant/package.nix
@@ -15,7 +15,8 @@ let
rev = "40bc9ad53e5a59d596935839e7c072679e706266";
hash = "sha256-CL0YMQd1ck6/dlvJCLxt9jYyqDuk+iAWfdBOMj864u8=";
};
-in buildBazelPackage rec {
+in
+buildBazelPackage rec {
pname = "bant";
version = "0.1.7";
@@ -26,17 +27,22 @@ in buildBazelPackage rec {
hash = "sha256-QbxPosjlrpxbz6gQKUKccF2Gu/i5xvqh2gwfABYE8kE=";
};
- bazelFlags = ["--registry" "file://${registry}"];
+ bazelFlags = [
+ "--registry"
+ "file://${registry}"
+ ];
postPatch = ''
patchShebangs scripts/create-workspace-status.sh
'';
fetchAttrs = {
- sha256 = {
- aarch64-linux = "sha256-09RL0tj6xsGEmuv11V81eAtqLc9nAaE8Il3d6ueS0UQ=";
- x86_64-linux = "sha256-6mlaJ/kT14vKvlJjxqBK/lESjjxbcYxApi7+eiiI37M=";
- }.${system} or (throw "No hash for system: ${system}");
+ hash =
+ {
+ aarch64-linux = "sha256-LNca4h4yceSgve9GYUoXqlODKPjLAa71kh1BWXqRYtk=";
+ x86_64-linux = "sha256-bRFIfaVbsU2WroXR/i0E7J4rWeaNEoum93r8qOMXXvc=";
+ }
+ .${system} or (throw "No hash for system: ${system}");
};
nativeBuildInputs = [
@@ -58,7 +64,10 @@ in buildBazelPackage rec {
description = "Bazel/Build Analysis and Navigation Tool";
homepage = "http://bant.build/";
license = licenses.gpl2Only;
- maintainers = with maintainers; [ hzeller lromor ];
+ maintainers = with maintainers; [
+ hzeller
+ lromor
+ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/by-name/ba/bark-server/package.nix b/pkgs/by-name/ba/bark-server/package.nix
new file mode 100644
index 000000000000..daf2843178ac
--- /dev/null
+++ b/pkgs/by-name/ba/bark-server/package.nix
@@ -0,0 +1,58 @@
+{
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+ versionCheckHook,
+}:
+
+buildGoModule rec {
+ pname = "bark-server";
+ version = "2.1.5";
+
+ src = fetchFromGitHub {
+ owner = "Finb";
+ repo = "bark-server";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-lPhRWMR+gConFOxiSONBRrwPoARaGqzaIU3hd3wSO8E=";
+ # populate values that require us to use git. By doing this in postFetch we
+ # can delete .git afterwards and maintain better reproducibility of the src.
+ leaveDotGit = true;
+ postFetch = ''
+ cd "$out"
+ git rev-parse HEAD > $out/COMMIT
+ # '0000-00-00T00:00:00Z'
+ date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH
+ find "$out" -name .git -print0 | xargs -0 rm -rf
+ '';
+ };
+
+ vendorHash = "sha256-GemXcU5nmMkZSNpuXoRt9EH5PrxMHWLJ56bNYHXOB9I=";
+
+ ldflags = [
+ "-s"
+ "-w"
+ "-X main.version=${version}"
+ ];
+
+ preBuild = ''
+ ldflags+=" -X \"main.buildDate=$(cat SOURCE_DATE_EPOCH)\""
+ ldflags+=" -X main.commitID==$(cat COMMIT)"
+ '';
+
+ doInstallCheck = true;
+
+ versionCheckProgramArg = "-v";
+
+ nativeInstallCheckInputs = [
+ versionCheckHook
+ ];
+
+ meta = {
+ description = "Backend of Bark, an iOS App which allows you to push customed notifications to your iPhone";
+ homepage = "https://github.com/Finb/bark-server";
+ changelog = "https://github.com/Finb/bark-server/releases/tag/v${version}";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ moraxyc ];
+ mainProgram = "bark-server";
+ };
+}
diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix
index e899d7dbf187..0c058fa73705 100644
--- a/pkgs/by-name/ba/basedpyright/package.nix
+++ b/pkgs/by-name/ba/basedpyright/package.nix
@@ -13,13 +13,13 @@
}:
let
- version = "1.18.2";
+ version = "1.19.0";
src = fetchFromGitHub {
owner = "detachhead";
repo = "basedpyright";
rev = "refs/tags/v${version}";
- hash = "sha256-nYbxgrNFhQ576rN8W+Hf/Keohy1N8tihOeTQHItKPRc=";
+ hash = "sha256-R8QEINTlO84YrnfRsZU5vNEwYcy5uZEKmmTPJ4qxYk8=";
};
# To regenerate the patched package-lock.json, copy the patched package.json
@@ -51,7 +51,7 @@ let
pname = "pyright-internal";
inherit version src;
sourceRoot = "${src.name}/packages/pyright-internal";
- npmDepsHash = "sha256-Md17EF3a1GBfnHD2fnLGS76r0xiWYJmBBTzZWRc0j5c=";
+ npmDepsHash = "sha256-Xswt1kH9Iet6DSAlZctEV3qCpn+IWwceQgldyFzsaRk=";
dontNpmBuild = true;
# Uncomment this flag when using unreleased peer dependencies
# npmFlags = [ "--legacy-peer-deps" ];
@@ -81,7 +81,7 @@ buildNpmPackage rec {
inherit version src;
sourceRoot = "${src.name}/packages/pyright";
- npmDepsHash = "sha256-6/OhBbIuFjXTN8N/PitaQ57aYZmpwcUOJ/vlLbhiXAU=";
+ npmDepsHash = "sha256-YhXVoh5sAnUkuc4iDMd/N15y92vMhUwT7PlLn2pzb20=";
postPatch = ''
chmod +w ../../
diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix
index a1250b34e98c..6fe531b2df0d 100644
--- a/pkgs/by-name/bi/biome/package.nix
+++ b/pkgs/by-name/bi/biome/package.nix
@@ -12,16 +12,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "biome";
- version = "1.9.3";
+ version = "1.9.4";
src = fetchFromGitHub {
owner = "biomejs";
repo = "biome";
rev = "cli/v${version}";
- hash = "sha256-GZV8M/yUDMom6xvSvSfDRjcMGm+thiaTR3fggkBLmRE=";
+ hash = "sha256-oK1tCPoTeUHvVdi+ym4J5xEj2NIi2zHQpNU1KUchQfY=";
};
- cargoHash = "sha256-5VZGyOQAz/p4r4v8CHOTcdgolw44HtZM0NuhTw4Wx3A=";
+ cargoHash = "sha256-4vITbsXfgNFoeWMHz7a9Rk7FrsEZRe75nHiyHSMujEQ=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/by-name/bi/bitbake-language-server/package.nix b/pkgs/by-name/bi/bitbake-language-server/package.nix
index 3789d3bd9ba2..fe19310ab29d 100644
--- a/pkgs/by-name/bi/bitbake-language-server/package.nix
+++ b/pkgs/by-name/bi/bitbake-language-server/package.nix
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "bitbake-language-server";
- version = "0.0.14";
+ version = "0.0.15";
format = "pyproject";
src = fetchFromGitHub {
owner = "Freed-Wu";
repo = pname;
rev = version;
- hash = "sha256-aGj9lW420A+iTQWSCdIITAJj3p89VUkPvdhQ/0M6uXo=";
+ hash = "sha256-NLDQ2P5peweugkoNYskpCyCEgBwVFA7RTs8+NvH8fj8=";
};
nativeBuildInputs = with python3.pkgs; [
diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index edd016c15139..bd023bcb76c8 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -20,12 +20,19 @@
, runCommand
, rustc
, rustPlatform
+, stdenv
}:
let
description = "Secure and free password manager for all of your devices";
icon = "bitwarden";
electron = electron_32;
+
+ bitwardenDesktopNativeArch = {
+ aarch64 = "arm64";
+ x86_64 = "x64";
+ }.${stdenv.hostPlatform.parsed.cpu.name} or (throw "bitwarden-desktop: unsupported CPU family ${stdenv.hostPlatform.parsed.cpu.name}");
+
in buildNpmPackage rec {
pname = "bitwarden-desktop";
version = "2024.9.0";
@@ -121,7 +128,7 @@ in buildNpmPackage rec {
pushd apps/desktop
# desktop_native/index.js loads a file of that name regarldess of the libc being used
- mv desktop_native/napi/desktop_napi.* desktop_native/napi/desktop_napi.linux-x64-musl.node
+ mv desktop_native/napi/desktop_napi.* desktop_native/napi/desktop_napi.linux-${bitwardenDesktopNativeArch}-musl.node
npm exec electron-builder -- \
--dir \
@@ -159,7 +166,7 @@ in buildNpmPackage rec {
mkdir $out
- pushd apps/desktop/dist/linux-unpacked
+ pushd apps/desktop/dist/linux-${lib.optionalString stdenv.isAarch64 "arm64-"}unpacked
mkdir -p $out/opt/Bitwarden
cp -r locales resources{,.pak} $out/opt/Bitwarden
popd
@@ -205,7 +212,7 @@ in buildNpmPackage rec {
homepage = "https://bitwarden.com";
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ amarshall ];
- platforms = [ "x86_64-linux" ];
+ platforms = [ "x86_64-linux" "aarch64-linux" ];
mainProgram = "bitwarden";
};
}
diff --git a/pkgs/by-name/bl/blobdrop/package.nix b/pkgs/by-name/bl/blobdrop/package.nix
new file mode 100644
index 000000000000..4725edc5f327
--- /dev/null
+++ b/pkgs/by-name/bl/blobdrop/package.nix
@@ -0,0 +1,61 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ cmake,
+ pkg-config,
+ qt6,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "blobdrop";
+ version = "2.1";
+
+ src = fetchFromGitHub {
+ owner = "vimpostor";
+ repo = "blobdrop";
+ rev = "refs/tags/v${finalAttrs.version}";
+ hash = "sha256-o2+qtkyu2qcwXpum3KiogyO8D6aY7bRJ6y4FWQKQY/o=";
+ };
+
+ strictDeps = true;
+
+ nativeBuildInputs =
+ [
+ cmake
+ qt6.wrapQtAppsHook
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isLinux [
+ pkg-config
+ ];
+
+ buildInputs =
+ [
+ qt6.qtdeclarative
+ qt6.qtsvg
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isLinux [
+ qt6.qtwayland
+ ];
+
+ cmakeFlags = [
+ (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck)
+ ];
+
+ doCheck = true;
+
+ preCheck = ''
+ export QT_QPA_PLATFORM=offscreen
+ '';
+
+ meta = {
+ broken = stdenv.hostPlatform.isDarwin;
+ changelog = "https://github.com/vimpostor/blobdrop/releases/tag/v${finalAttrs.version}";
+ description = "Drag and drop files directly out of the terminal";
+ homepage = "https://github.com/vimpostor/blobdrop";
+ license = lib.licenses.gpl3Only;
+ mainProgram = "blobdrop";
+ maintainers = with lib.maintainers; [ tomasajt ];
+ platforms = lib.platforms.all;
+ };
+})
diff --git a/pkgs/applications/networking/browsers/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/brave/make-brave.nix
rename to pkgs/by-name/br/brave/make-brave.nix
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/by-name/br/brave/package.nix
similarity index 77%
rename from pkgs/applications/networking/browsers/brave/default.nix
rename to pkgs/by-name/br/brave/package.nix
index 65d064459e61..50a33da09848 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
if stdenv.hostPlatform.isAarch64 then
rec {
pname = "brave";
- version = "1.70.123";
+ version = "1.71.118";
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
- hash = "sha256-YqSZYQinNyQQQds5ACyDCeZA+D4sBxyMvMiOvD6CVeU=";
+ hash = "sha256-6ERUWUb4GL+kuI0j8VI3vERR3HFfb1gYL4d+hBTcw5w=";
platform = "aarch64-linux";
}
else if stdenv.hostPlatform.isx86_64 then
rec {
pname = "brave";
- version = "1.70.123";
+ version = "1.71.118";
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- hash = "sha256-Hr7/Yry7fhSDe1gzpZqtjuIDrbB6HuC1PSeBQ3HlAdE=";
+ hash = "sha256-SnpYAJmqBRfECQrlOvgxwQI1k7j0tfctJG7Tt93afe8=";
platform = "x86_64-linux";
}
else
diff --git a/pkgs/applications/networking/browsers/brave/update.sh b/pkgs/by-name/br/brave/update.sh
similarity index 97%
rename from pkgs/applications/networking/browsers/brave/update.sh
rename to pkgs/by-name/br/brave/update.sh
index d08c1559d0a4..aff0dd552102 100755
--- a/pkgs/applications/networking/browsers/brave/update.sh
+++ b/pkgs/by-name/br/brave/update.sh
@@ -17,7 +17,7 @@ hashAmd64="$(nix hash to-sri --type sha256 \
| sed -r -n 's/^SHA256: (.*)/\1/p' | head -n1)
)"
-cat > $SCRIPT_DIR/default.nix << EOF
+cat > $SCRIPT_DIR/package.nix << EOF
# Expression generated by update.sh; do not edit it by hand!
{ stdenv, callPackage, ... }@args:
diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index c9eec26b1558..5fab6f71d493 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -26,20 +26,20 @@ let
in
buildNpmPackage' rec {
pname = "bruno";
- version = "1.32.1";
+ version = "1.34.0";
src = fetchFromGitHub {
owner = "usebruno";
repo = "bruno";
rev = "v${version}";
- hash = "sha256-n/3zNS3aME7ZSoJ7TQ7gqVod469g7PGTsLcdNIwB09Y=";
+ hash = "sha256-6UcByIiKBAIicH3dNF+6byuj/WsEb4Xi+iPvfjPsQkA=";
postFetch = ''
${lib.getExe npm-lockfile-fix} $out/package-lock.json
'';
};
- npmDepsHash = "sha256-p3kdYuDiPZ9SmtrFajXd76Ohd+VUqn/Y8SpAPFrTBZA=";
+ npmDepsHash = "sha256-z8d1paC5VQ/XsXJuQ6Z7PjSwC6abN6kRmG0sfI9aCqw=";
npmFlags = [ "--legacy-peer-deps" ];
nativeBuildInputs =
diff --git a/pkgs/by-name/bu/bunbun/package.nix b/pkgs/by-name/bu/bunbun/package.nix
index 2d042f08d8f9..4bb2f8b0df0b 100644
--- a/pkgs/by-name/bu/bunbun/package.nix
+++ b/pkgs/by-name/bu/bunbun/package.nix
@@ -4,24 +4,22 @@
fetchFromGitHub,
stdenv,
darwin,
+ versionCheckHook,
nix-update-script,
- testers,
- bunbun,
}:
rustPlatform.buildRustPackage rec {
pname = "bunbun";
- version = "1.4.0";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "devraza";
repo = "bunbun";
- # TODO: remove '-bump' at next release
- rev = "refs/tags/v${version}-bump";
- hash = "sha256-r4xBUfNY+Q3uAC919ZQbIDgiF981FVqZCOT8XNojZP4=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-3f/G0Vx1uXeH3QMDVUAHWi4Pf/B88/4F+4XywVsp3/4=";
};
- cargoHash = "sha256-CcGfaSyCMv0Wm4QsYASBwEnpX8fKbLHRqyEcUmj2w2o=";
+ cargoHash = "sha256-UEUK8GBkyzUv2J6uTjRdyoIiHVKLDYYj1aOnl+rgzmk=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk.frameworks;
@@ -32,9 +30,14 @@ rustPlatform.buildRustPackage rec {
]
);
+ nativeInstallCheckInputs = [
+ versionCheckHook
+ ];
+ versionCheckProgramArg = [ "--version" ];
+ doInstallCheck = true;
+
passthru = {
updateScript = nix-update-script { };
- tests.version = testers.testVersion { package = bunbun; };
};
meta = {
diff --git a/pkgs/by-name/c-/c-intro-and-ref/package.nix b/pkgs/by-name/c-/c-intro-and-ref/package.nix
new file mode 100644
index 000000000000..b1b212e1c765
--- /dev/null
+++ b/pkgs/by-name/c-/c-intro-and-ref/package.nix
@@ -0,0 +1,71 @@
+{
+ lib,
+ stdenv,
+ fetchFromSavannah,
+ texinfo,
+ texliveBasic,
+ ghostscript,
+ unstableGitUpdater,
+}:
+stdenv.mkDerivation (finalAttrs: {
+ pname = "c-intro-and-ref";
+ version = "0.0-unstable-2024-08-31";
+
+ src = fetchFromSavannah {
+ repo = "c-intro-and-ref";
+ rev = "62962013107481127176ef04d69826e41f51313c";
+ hash = "sha256-Fmli3x8zvPntvCvV/wbEkxWzW9uDMZgCElPkKo9TS6Y=";
+ };
+
+ nativeBuildInputs = [
+ texinfo
+ ghostscript
+ texliveBasic
+ ];
+
+ buildFlags = [
+ "c.info"
+ "c.dvi"
+ "c.pdf"
+ # FIXME: Not a HASH reference at (texinfo)/share/texinfo/Texinfo/Convert/DocBook.pm
+ # "c.doc"
+ "c.html"
+ "c.html.d"
+ "c.txt"
+ ];
+
+ installPhase = ''
+ runHook preInstall
+ dst_info=$out/share/info
+ dst_doc=$out/share/doc/c-intro-and-ref
+ mkdir -p $dst_info
+ mkdir -p $dst_doc
+
+ cp -prv -t $dst_info \
+ c.info c.info-*
+ cp -prv -t $dst_doc \
+ c.dvi \
+ c.pdf \
+ c.html \
+ c.html.d \
+ c.txt
+ runHook postInstall
+ '';
+
+ passthru.updateScript = unstableGitUpdater { };
+
+ meta = {
+ description = "GNU C Language Intro and Reference Manual";
+ longDescription = ''
+ This manual explains the C language for use with the GNU Compiler
+ Collection (GCC) on the GNU/Linux operating system and other systems. We
+ refer to this dialect as GNU C. If you already know C, you can use this as
+ a reference manual.
+ '';
+ homepage = "https://www.gnu.org/software/c-intro-and-ref/";
+ changelog = "https://git.savannah.nongnu.org/cgit/c-intro-and-ref.git/plain/ChangeLog?id=${finalAttrs.src.rev}";
+ license = lib.licenses.fdl13Plus;
+ maintainers = with lib.maintainers; [ rc-zb ];
+ platforms = lib.platforms.all;
+ };
+})
diff --git a/pkgs/by-name/ca/candy-icons/package.nix b/pkgs/by-name/ca/candy-icons/package.nix
index fb926197fa99..ab9bbd8a9244 100644
--- a/pkgs/by-name/ca/candy-icons/package.nix
+++ b/pkgs/by-name/ca/candy-icons/package.nix
@@ -1,23 +1,22 @@
-{ lib
-, stdenvNoCC
-, fetchFromGitHub
-, gtk3
+{
+ lib,
+ stdenvNoCC,
+ fetchFromGitHub,
+ gtk3,
}:
stdenvNoCC.mkDerivation {
pname = "candy-icons";
- version = "unstable-2023-12-31";
+ version = "0-unstable-2024-10-22";
src = fetchFromGitHub {
owner = "EliverLara";
repo = "candy-icons";
- rev = "e4464d7b4d8e1821025447b2064b6a8f5c4c8c89";
- hash = "sha256-XdYjxWf8R4b1GK2iFQnoEOWykc19ZT37ki83WeESQBM=";
+ rev = "f8a4125d338d86a58723ab36f9f827248d07c85c";
+ hash = "sha256-Bv91a5NglKWwddqx0kPgdCrik9SOPtcfQFJDWOdcQG4=";
};
- nativeBuildInputs = [
- gtk3
- ];
+ nativeBuildInputs = [ gtk3 ];
dontDropIconThemeCache = true;
@@ -36,6 +35,9 @@ stdenvNoCC.mkDerivation {
description = "Icon theme colored with sweet gradients";
license = licenses.gpl3Plus;
platforms = platforms.linux;
- maintainers = with maintainers; [ clr-cera ];
+ maintainers = with maintainers; [
+ clr-cera
+ arunoruto
+ ];
};
}
diff --git a/pkgs/by-name/ca/cargo-features-manager/package.nix b/pkgs/by-name/ca/cargo-features-manager/package.nix
index 6fd31c30b06d..4ca4ebf16a79 100644
--- a/pkgs/by-name/ca/cargo-features-manager/package.nix
+++ b/pkgs/by-name/ca/cargo-features-manager/package.nix
@@ -5,16 +5,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-features-manager";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchFromGitHub {
owner = "ToBinio";
repo = "cargo-features-manager";
rev = "v${version}";
- hash = "sha256-ez8WIDHV6/f0Kk6cvzB25LoYBPT+JTzmOWrSxXXzpBc=";
+ hash = "sha256-g4iJ9iZp7vmnSE/P76ocDu/XKeSbPjosB97ojLI30oE=";
};
- cargoHash = "sha256-G1MBH4c9b/h87QgCleTMnndjWc70KZI+6W4KWaxk28o=";
+ cargoHash = "sha256-O0MQAgOZdiVW6GU69BAn2beDDqNNwijLlmfC7I3Qd0A=";
meta = {
description = "Command-line tool for managing Architectural Decision Records";
diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/by-name/ca/cargo-modules/package.nix
similarity index 71%
rename from pkgs/development/tools/rust/cargo-modules/default.nix
rename to pkgs/by-name/ca/cargo-modules/package.nix
index da236481f45d..13625dae781d 100644
--- a/pkgs/development/tools/rust/cargo-modules/default.nix
+++ b/pkgs/by-name/ca/cargo-modules/package.nix
@@ -1,27 +1,38 @@
-{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }:
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+ stdenv,
+ darwin,
+}:
rustPlatform.buildRustPackage rec {
pname = "cargo-modules";
- version = "0.16.8";
+ version = "0.19.1";
src = fetchFromGitHub {
owner = "regexident";
- repo = pname;
- rev = "v${version}";
- hash = "sha256-F1hVKktU9zhdxXWhpLgymehJQlOX6WbXL2cqQGB+Y5k=";
+ repo = "cargo-modules";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-2wA34rQHHAvx+5NhmtugnGTMZ2Sj8MNpdkkIJhDK1HM=";
};
- cargoHash = "sha256-j3AYWKq7SrlNlsY7A80iwcWKW8wi6hx0U9UwDIQkXZs=";
+ cargoHash = "sha256-3R7rFkA2tObJZk5ypWPpMojEZvrDgKZsc1dN1wBJ63A=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.CoreServices
];
checkFlags = [
- "--skip=cfg_test::smoke"
+ "--skip=cfg_test::with_tests::smoke"
+ "--skip=cfg_test::without_tests::smoke"
"--skip=colors::ansi::smoke"
"--skip=colors::plain::smoke"
"--skip=colors::truecolor::smoke"
+ "--skip=fields::enum_fields"
+ "--skip=fields::struct_fields"
+ "--skip=fields::tuple_fields"
+ "--skip=fields::union_fields"
"--skip=focus_on::glob_path::smoke"
"--skip=focus_on::self_path::smoke"
"--skip=focus_on::simple_path::smoke"
@@ -34,18 +45,18 @@ rustPlatform.buildRustPackage rec {
"--skip=selection::no_modules::smoke"
"--skip=selection::no_traits::smoke"
"--skip=selection::no_types::smoke"
- "--skip=fields::enum_fields"
- "--skip=fields::struct_fields"
- "--skip=fields::tuple_fields"
- "--skip=fields::union_fields"
];
- meta = with lib; {
+ meta = {
description = "Cargo plugin for showing a tree-like overview of a crate's modules";
- mainProgram = "cargo-modules";
homepage = "https://github.com/regexident/cargo-modules";
changelog = "https://github.com/regexident/cargo-modules/blob/${version}/CHANGELOG.md";
- license = with licenses; [ mpl20 ];
- maintainers = with maintainers; [ figsoda rvarago matthiasbeyer ];
+ license = lib.licenses.mpl20;
+ maintainers = with lib.maintainers; [
+ figsoda
+ rvarago
+ matthiasbeyer
+ ];
+ mainProgram = "cargo-modules";
};
}
diff --git a/pkgs/by-name/ca/cargo-pio/package.nix b/pkgs/by-name/ca/cargo-pio/package.nix
new file mode 100644
index 000000000000..5942627f4aec
--- /dev/null
+++ b/pkgs/by-name/ca/cargo-pio/package.nix
@@ -0,0 +1,27 @@
+{ lib
+, fetchFromGitHub
+, rustPlatform
+}:
+rustPlatform.buildRustPackage rec {
+ pname = "cargo-pio";
+ version = "0.25.6";
+
+ src = fetchFromGitHub {
+ owner = "esp-rs";
+ repo = "embuild";
+ rev = "cargo-pio-v${version}";
+ hash = "sha256-YH2CPb3uBlPncd+KkP25xhCVvDB7HDxJuSqWOJ1LT3k=";
+ };
+
+ cargoHash = "sha256-41ZDe7yP4C9JcX5trcDxcqdgZ+SnhDIIq51hM0Viv9w=";
+
+ buildAndTestSubdir = "cargo-pio";
+
+ meta = with lib; {
+ description = "Build Rust embedded projects with PlatformIO";
+ homepage = "https://github.com/esp-rs/embuild/tree/master/cargo-pio";
+ license = with lib.licenses; [ asl20 mit ];
+ maintainers = with maintainers; [ dannixon ];
+ mainProgram = "cargo-pio";
+ };
+}
diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix
index 0f1f3e3d7a00..891b423d9e7a 100644
--- a/pkgs/by-name/ca/casadi/package.nix
+++ b/pkgs/by-name/ca/casadi/package.nix
@@ -37,45 +37,35 @@
stdenv.mkDerivation (finalAttrs: {
pname = "casadi";
- version = "3.6.6";
+ version = "3.6.7";
src = fetchFromGitHub {
owner = "casadi";
repo = "casadi";
rev = finalAttrs.version;
- hash = "sha256-T4aaBS918NbUEwWkSx0URi0W9uhCB8IFmzRcOR7T8Og=";
+ hash = "sha256-Mft0qhjdAbU82RgjYuKue5p7EqbTbt3ii5yXSsCFHrQ=";
};
patches = [
(fetchpatch {
- name = "add-FindSPRAL.cmake.patch";
- url = "https://github.com/casadi/casadi/pull/3792/commits/28bc1b03e67ae06dea0c8557057020f5651be7ad.patch";
- hash = "sha256-t0+RnXoFakmoX93MhN08RWAbCg6Nerh42LicBBgAkRQ=";
+ name = "fix-FindMUMPS.cmake.patch";
+ url = "https://github.com/casadi/casadi/pull/3899/commits/274f4b23f73e60c5302bec0479fe1e92682b63d2.patch";
+ hash = "sha256-3GWEWlN8dKLD6htpnOQLChldcT3hE09JWLeuCfAhY+4=";
})
];
postPatch =
''
- # fix case of fatropConfig.cmake & hpipmConfig.cmake
+ # fix case of hpipmConfig.cmake
substituteInPlace CMakeLists.txt --replace-fail \
"FATROP HPIPM" \
- "fatrop hpipm"
+ "FATROP hpipm"
# nix provide lib/clang headers in libclang, not in llvm.
substituteInPlace casadi/interfaces/clang/CMakeLists.txt --replace-fail \
'$'{CLANG_LLVM_LIB_DIR} \
${llvmPackages_17.libclang.lib}/lib
- # fix fatrop includes
- substituteInPlace casadi/interfaces/fatrop/fatrop_conic_interface.hpp --replace-fail \
- " search_paths;" \
@@ -173,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "WITH_CSPARSE" true)
(lib.cmakeBool "WITH_BLASFEO" true)
(lib.cmakeBool "WITH_HPIPM" true)
- (lib.cmakeBool "WITH_FATROP" false) # invalid new-expression of abstract class type 'casadi::CasadiStructuredQP'
+ (lib.cmakeBool "WITH_FATROP" true)
(lib.cmakeBool "WITH_BUILD_FATROP" false)
(lib.cmakeBool "WITH_SUPERSCS" false) # packaging too chaotic
(lib.cmakeBool "WITH_BUILD_OSQP" false)
diff --git a/pkgs/by-name/ca/catppuccin-cursors/package.nix b/pkgs/by-name/ca/catppuccin-cursors/package.nix
index 95531507df76..57357ea47c2b 100644
--- a/pkgs/by-name/ca/catppuccin-cursors/package.nix
+++ b/pkgs/by-name/ca/catppuccin-cursors/package.nix
@@ -1,21 +1,46 @@
-{ lib
-, stdenvNoCC
-, fetchFromGitHub
-, inkscape
-, just
-, xcursorgen
-, hyprcursor
-, xcur2png
+{
+ lib,
+ stdenvNoCC,
+ fetchFromGitHub,
+ inkscape,
+ just,
+ xcursorgen,
+ hyprcursor,
+ xcur2png,
+ catppuccin-whiskers,
+ python3,
+ python3Packages,
}:
-
let
dimensions = {
- palette = [ "frappe" "latte" "macchiato" "mocha" ];
- color = [ "Blue" "Dark" "Flamingo" "Green" "Lavender" "Light" "Maroon" "Mauve" "Peach" "Pink" "Red" "Rosewater" "Sapphire" "Sky" "Teal" "Yellow" ];
+ palette = [
+ "frappe"
+ "latte"
+ "macchiato"
+ "mocha"
+ ];
+ color = [
+ "Blue"
+ "Dark"
+ "Flamingo"
+ "Green"
+ "Lavender"
+ "Light"
+ "Maroon"
+ "Mauve"
+ "Peach"
+ "Pink"
+ "Red"
+ "Rosewater"
+ "Sapphire"
+ "Sky"
+ "Teal"
+ "Yellow"
+ ];
};
variantName = { palette, color }: palette + color;
variants = lib.mapCartesianProduct variantName dimensions;
- version = "0.4.0";
+ version = "1.0.0";
in
stdenvNoCC.mkDerivation {
pname = "catppuccin-cursors";
@@ -25,14 +50,23 @@ stdenvNoCC.mkDerivation {
owner = "catppuccin";
repo = "cursors";
rev = "v${version}";
- hash = "sha256-VxLwZkZdV1xH4jeqtszqSnhNrgF3uamEXBLPKIc4lXE=";
+ hash = "sha256-LZ2k8i4w68VW4YFmC659iMQsQyduHJOfyL8cLlXhUHo=";
};
- nativeBuildInputs = [ just inkscape xcursorgen hyprcursor xcur2png ];
+ nativeBuildInputs = [
+ just
+ inkscape
+ xcursorgen
+ hyprcursor
+ xcur2png
+ catppuccin-whiskers
+ python3
+ python3Packages.pyside6
+ ];
outputs = variants ++ [ "out" ]; # dummy "out" output to prevent breakage
- outputsToInstall = [];
+ outputsToInstall = [ ];
buildPhase = ''
runHook preBuild
diff --git a/pkgs/by-name/ce/certdump/deps.nix b/pkgs/by-name/ce/certdump/deps.nix
new file mode 100644
index 000000000000..491646ec2925
--- /dev/null
+++ b/pkgs/by-name/ce/certdump/deps.nix
@@ -0,0 +1,126 @@
+# This file was automatically generated by passthru.fetch-deps.
+# Please dont edit it manually, your changes might get overwritten!
+
+{ fetchNuGet }:
+[
+ (fetchNuGet {
+ pname = "CommandLineParser";
+ version = "2.9.1";
+ hash = "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.AspNetCore.App.Ref";
+ version = "5.0.0";
+ hash = "sha256-z22ZDldoIlDUYeF9Rje0aVPlYAGKIpdj5wDzn1CW+jQ=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
+ version = "5.0.17";
+ hash = "sha256-ELWBHK+1ijGTvq1BsK/vJx/MNqKS8daZgrQ0Tj9+faA=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
+ version = "5.0.17";
+ hash = "sha256-iHn2yGpaL5EM8L7nJJ2aRCIZ+kE98NS+KWUvrWnjzhg=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
+ version = "5.0.17";
+ hash = "sha256-TdhOyPN+WA27WFd3PLKdsC+bbyNidOiOOuz/WpHDe+M=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.DotNet.ILCompiler";
+ version = "8.0.0";
+ hash = "sha256-GquIuTqNcQfciyhmtzWUgyedHSm+Bhultnt/ai7ODt0=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.NETCore.App.Host.linux-arm64";
+ version = "5.0.17";
+ hash = "sha256-a8FLTWaNL6TknXDx+YFwLzcDn7nuq3l9yN2UUrHfZx8=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.NETCore.App.Host.linux-x64";
+ version = "5.0.17";
+ hash = "sha256-exMpVamk8ZzfCQDQcDmQDYJplDcOOU99ic7NSDKUgtE=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.NETCore.App.Host.osx-x64";
+ version = "5.0.17";
+ hash = "sha256-bDgVacWuwDTJqEL/RbZ2gS9EGexx0OGZsYPnHQPh5Qk=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.NETCore.App.Ref";
+ version = "5.0.0";
+ hash = "sha256-kQ8wpR4crWoqy/jrskat34Y3Nr3nbxoSpEPMnxycwtw=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
+ version = "5.0.17";
+ hash = "sha256-2KU5RRHGbkCA+lCEH5QaBHma1AZqVLWBws7IKxBWkJs=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.NETCore.App.Runtime.linux-x64";
+ version = "5.0.17";
+ hash = "sha256-2NpVvrbqct3M1fKiSe/zyt41mf1aV6WUdxIlJod27Ek=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.NETCore.App.Runtime.osx-x64";
+ version = "5.0.17";
+ hash = "sha256-V1arT33a215ZP+Jo/vkrhko78FsA8X8XujZ6jUKfBd4=";
+ })
+ (fetchNuGet {
+ pname = "PeNet";
+ version = "4.0.4";
+ hash = "sha256-gB2UeQG98bPThdkRbCFvsUCZ5sV1nttekzwRncH8LzY=";
+ })
+ (fetchNuGet {
+ pname = "PeNet.Asn1";
+ version = "2.0.1";
+ hash = "sha256-ypIptb5VOAa4GHvVdd1no1CoyiOKOegFs52tZHj435I=";
+ })
+ (fetchNuGet {
+ pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
+ version = "8.0.0";
+ hash = "sha256-FAUyhIBscbLUBl4cjSOwRg1hjkCv2BnzuHo0mMx6gWw=";
+ })
+ (fetchNuGet {
+ pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
+ version = "8.0.0";
+ hash = "sha256-U8eg1gToprOmFmZ+Gqb+nTgnKpMjxMDFnokuRDISp0k=";
+ })
+ (fetchNuGet {
+ pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
+ version = "8.0.0";
+ hash = "sha256-QWWThct6kebcbzaOKbeIULJ6CnWTf6fupPGSFYDU760=";
+ })
+ (fetchNuGet {
+ pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
+ version = "8.0.0";
+ hash = "sha256-eeKWNQpYFc261S7mS34JXvHY+XOhhhl793XkUdFUUpo=";
+ })
+ (fetchNuGet {
+ pname = "System.Buffers";
+ version = "4.5.1";
+ hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=";
+ })
+ (fetchNuGet {
+ pname = "System.Formats.Asn1";
+ version = "8.0.0";
+ hash = "sha256-AVMl6N3SG2AqAcQHFruf2QDQeQIC3CICxID+Sh0vBxI=";
+ })
+ (fetchNuGet {
+ pname = "System.Memory";
+ version = "4.5.5";
+ hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI=";
+ })
+ (fetchNuGet {
+ pname = "System.Security.Cryptography.Cng";
+ version = "5.0.0";
+ hash = "sha256-nOJP3vdmQaYA07TI373OvZX6uWshETipvi5KpL7oExo=";
+ })
+ (fetchNuGet {
+ pname = "System.Security.Cryptography.Pkcs";
+ version = "8.0.0";
+ hash = "sha256-yqfIIeZchsII2KdcxJyApZNzxM/VKknjs25gDWlweBI=";
+ })
+]
diff --git a/pkgs/by-name/ce/certdump/package.nix b/pkgs/by-name/ce/certdump/package.nix
new file mode 100644
index 000000000000..8ca524a684fe
--- /dev/null
+++ b/pkgs/by-name/ce/certdump/package.nix
@@ -0,0 +1,39 @@
+{
+ lib,
+ buildDotnetModule,
+ fetchFromGitHub,
+ stdenv,
+}:
+
+buildDotnetModule rec {
+ pname = "certdump";
+ version = "0-unstable-2023-12-25";
+
+ src = fetchFromGitHub {
+ owner = "secana";
+ repo = "CertDump";
+ rev = "a834da24ee18503109631d836540a2b0cb481517";
+ hash = "sha256-86s6KLP0DliKOr0fVId7SGN333b7HkiL5p/q0vazwMc=";
+ };
+
+ projectFile = [ "CertDump.sln" ];
+ nugetDeps = ./deps.nix;
+
+ selfContainedBuild = true;
+ executables = [ "CertDump" ];
+
+ dotnetFlags = [
+ "-property:ImportByWildcardBeforeSolution=false"
+ ];
+
+ meta = {
+ description = "Dump certificates from PE files in different formats";
+ mainProgram = "CertDump";
+ homepage = "https://github.com/secana/CertDump";
+ longDescription = ''
+ Cross-Platform tool to dump the signing certificate from a Portable Executable (PE) file.
+ '';
+ license = lib.licenses.asl20;
+ maintainers = [ lib.maintainers.baloo ];
+ };
+}
diff --git a/pkgs/applications/blockchains/charge-lnd/default.nix b/pkgs/by-name/ch/charge-lnd/package.nix
similarity index 58%
rename from pkgs/applications/blockchains/charge-lnd/default.nix
rename to pkgs/by-name/ch/charge-lnd/package.nix
index 1ea8912a7535..88817c6e4b02 100644
--- a/pkgs/applications/blockchains/charge-lnd/default.nix
+++ b/pkgs/by-name/ch/charge-lnd/package.nix
@@ -1,4 +1,9 @@
-{ lib, fetchFromGitHub, python3Packages }:
+{
+ lib,
+ fetchFromGitHub,
+ python3Packages,
+ makeWrapper,
+}:
python3Packages.buildPythonApplication rec {
pname = "charge-lnd";
@@ -6,9 +11,9 @@ python3Packages.buildPythonApplication rec {
src = fetchFromGitHub {
owner = "accumulator";
- repo = pname;
+ repo = "charge-lnd";
rev = "refs/tags/v${version}";
- sha256 = "sha256-mNU8bhiZqvYbNUU8vJNk9WbpAVrCTi9Fy3hlIpb06ac=";
+ hash = "sha256-mNU8bhiZqvYbNUU8vJNk9WbpAVrCTi9Fy3hlIpb06ac=";
};
propagatedBuildInputs = with python3Packages; [
@@ -21,20 +26,35 @@ python3Packages.buildPythonApplication rec {
termcolor
];
+ nativeBuildInputs = [
+ makeWrapper
+ ];
+
postInstall = ''
install README.md -Dt $out/share/doc/charge-lnd
+
+ wrapProgram $out/bin/charge-lnd \
+ --set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION "python"
'';
doInstallCheck = true;
+
installCheckPhase = ''
$out/bin/charge-lnd --help > /dev/null
'';
- meta = with lib; {
+ env = {
+ PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+ };
+
+ meta = {
description = "Simple policy-based fee manager for lightning network daemon";
homepage = "https://github.com/accumulator/charge-lnd";
- license = licenses.gpl2Plus;
- maintainers = with maintainers; [ mmilata mariaa144 ];
+ license = lib.licenses.gpl2Plus;
+ maintainers = with lib.maintainers; [
+ mmilata
+ mariaa144
+ ];
mainProgram = "charge-lnd";
};
}
diff --git a/pkgs/applications/graphics/ciano/default.nix b/pkgs/by-name/ci/ciano/package.nix
similarity index 57%
rename from pkgs/applications/graphics/ciano/default.nix
rename to pkgs/by-name/ci/ciano/package.nix
index 1106bd958194..b223970625a9 100644
--- a/pkgs/applications/graphics/ciano/default.nix
+++ b/pkgs/by-name/ci/ciano/package.nix
@@ -1,27 +1,31 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, desktop-file-utils
-, ffmpeg
-, granite
-, gtk
-, imagemagick
-, meson
-, ninja
-, pkg-config
-, python
-, vala
-, wrapGAppsHook3
+{
+ lib,
+ desktop-file-utils,
+ fetchFromGitHub,
+ ffmpeg,
+ gtk3,
+ imagemagick,
+ meson,
+ ninja,
+ pantheon,
+ pkg-config,
+ python3,
+ stdenv,
+ vala,
+ wrapGAppsHook3,
}:
-stdenv.mkDerivation rec {
+let
+ inherit (pantheon) granite;
+in
+stdenv.mkDerivation (finalAttrs: {
pname = "ciano";
version = "0.2.4";
src = fetchFromGitHub {
owner = "robertsanseries";
- repo = pname;
- rev = version;
+ repo = "ciano";
+ rev = finalAttrs.version;
hash = "sha256-nubm6vBWwsHrrmvFAL/cIzYPxg9B1EhnpC79IJMNuFY=";
};
@@ -30,7 +34,7 @@ stdenv.mkDerivation rec {
meson
ninja
pkg-config
- python
+ python3
vala
wrapGAppsHook3
];
@@ -39,33 +43,36 @@ stdenv.mkDerivation rec {
ffmpeg
imagemagick
granite
- gtk
+ gtk3
];
+ dontWrapGApps = true;
+
+ strictDeps = true;
+
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
- dontWrapGApps = true;
-
- postFixup = let
- binPath = lib.makeBinPath [
- ffmpeg
- imagemagick
- ];
- in
+ postFixup =
+ let
+ binPath = lib.makeBinPath [
+ ffmpeg
+ imagemagick
+ ];
+ in
''
wrapProgram $out/bin/com.github.robertsanseries.ciano \
--prefix PATH : ${binPath} "''${gappsWrapperArgs[@]}"
ln -s $out/bin/com.github.robertsanseries.ciano $out/bin/ciano
'';
- meta = with lib; {
+ meta = {
homepage = "https://github.com/robertsanseries/ciano";
description = "Multimedia file converter focused on simplicity";
- license = licenses.gpl3Plus;
- maintainers = with maintainers; [ AndersonTorres ];
- platforms = platforms.linux;
+ license = lib.licenses.gpl3Plus;
+ maintainers = with lib.maintainers; [ AndersonTorres ];
+ platforms = lib.platforms.linux;
};
-}
+})
diff --git a/pkgs/by-name/ci/cider-2/package.nix b/pkgs/by-name/ci/cider-2/package.nix
new file mode 100644
index 000000000000..8cffc3a34ef9
--- /dev/null
+++ b/pkgs/by-name/ci/cider-2/package.nix
@@ -0,0 +1,47 @@
+{
+ appimageTools,
+ lib,
+ requireFile,
+ makeWrapper,
+}:
+
+appimageTools.wrapType2 rec {
+ pname = "cider-2";
+ version = "2.5.0";
+
+ src = requireFile {
+ name = "Cider-linux-appimage-x64.AppImage";
+ url = "https://cidercollective.itch.io/cider";
+ sha256 = "1nm35psq9ddii2c15kb03ifcn43fimvc4yzb4cpm1gqsiz4w21qz";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ extraInstallCommands =
+ let
+ contents = appimageTools.extract {
+ inherit version src;
+ # HACK: this looks for a ${pname}.desktop, where `cider-2.desktop` doesn't exist
+ pname = "cider";
+ };
+ in
+ ''
+ wrapProgram $out/bin/${pname} \
+ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
+ --add-flags "--no-sandbox --disable-gpu-sandbox" # Cider 2 does not start up properly without these from my preliminary testing
+
+ install -m 444 -D ${contents}/cider.desktop $out/share/applications/${pname}.desktop
+ substituteInPlace $out/share/applications/${pname}.desktop \
+ --replace-warn 'Exec=AppRun --no-sandbox' 'Exec=${pname}'
+ cp -r ${contents}/usr/share/icons $out/share
+ '';
+
+ meta = {
+ description = "Powerful music player that allows you listen to your favorite tracks with style";
+ homepage = "https://cider.sh";
+ license = lib.licenses.unfree;
+ mainProgram = "cider-2";
+ maintainers = with lib.maintainers; [ itsvic-dev ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/by-name/ci/cirrus-cli/package.nix b/pkgs/by-name/ci/cirrus-cli/package.nix
index a77ea92b6521..cf6a6ea031ca 100644
--- a/pkgs/by-name/ci/cirrus-cli/package.nix
+++ b/pkgs/by-name/ci/cirrus-cli/package.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "cirrus-cli";
- version = "0.126.1";
+ version = "0.131.2";
src = fetchFromGitHub {
owner = "cirruslabs";
- repo = pname;
+ repo = "cirrus-cli";
rev = "v${version}";
- hash = "sha256-A894AUmsJjCCvN6cI2qoTPyOeQx6h2uukzxtlvWZVn8=";
+ hash = "sha256-PxJYKn97gsqozofeU2IzOk0sMupt+fNpggQ00tZ12pk=";
};
- vendorHash = "sha256-PecNBlSoo8WN2FKXN/UpkqpqbsJkOPHKILy76YWgNlw=";
+ vendorHash = "sha256-rYg0cmW63IolYQ79R9pFiFXD6UfESv4jq9kn1EGJmgw=";
ldflags = [
"-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"
diff --git a/pkgs/by-name/cl/clipcat/0001-fix-build.patch b/pkgs/by-name/cl/clipcat/0001-fix-build.patch
deleted file mode 100644
index e92bb6c7a850..000000000000
--- a/pkgs/by-name/cl/clipcat/0001-fix-build.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 9ba11f90c4364529f220c44a3266926bf8f6a4b4 Mon Sep 17 00:00:00 2001
-From: wxt <3264117476@qq.com>
-Date: Tue, 22 Oct 2024 18:43:20 +0800
-Subject: [PATCH] fix build
-
----
- Cargo.toml | 1 -
- crates/proto/build.rs | 1 -
- crates/proto/src/lib.rs | 1 -
- 3 files changed, 3 deletions(-)
-
-diff --git a/Cargo.toml b/Cargo.toml
-index 8deae48..214a0e3 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -122,7 +122,6 @@ clipcat-server = { path = "./crates/server" }
-
- [workspace.lints.rust]
- async_fn_in_trait = "allow"
--box_pointers = "allow"
-
- # TODO: deny `unused_crate_dependencies` after https://github.com/rust-lang/rust/issues/95513 being solved
- unused_crate_dependencies = "allow"
-diff --git a/crates/proto/build.rs b/crates/proto/build.rs
-index 5e38f62..d6ba4be 100644
---- a/crates/proto/build.rs
-+++ b/crates/proto/build.rs
-@@ -6,7 +6,6 @@ fn prost_config() -> Config {
- config
- }
-
--#[allow(box_pointers)]
- fn main() -> Result<(), Box> {
- tonic_build::configure().compile_with_config(
- prost_config(),
-diff --git a/crates/proto/src/lib.rs b/crates/proto/src/lib.rs
-index a7205ab..e4dcd02 100644
---- a/crates/proto/src/lib.rs
-+++ b/crates/proto/src/lib.rs
-@@ -2,7 +2,6 @@ mod utils;
- mod proto {
- // SAFETY: allow: prost
- #![allow(
-- box_pointers,
- unreachable_pub,
- unused_qualifications,
- unused_results,
---
-2.46.1
-
diff --git a/pkgs/by-name/cl/clipcat/package.nix b/pkgs/by-name/cl/clipcat/package.nix
index f62b214f9de3..1630253966e4 100644
--- a/pkgs/by-name/cl/clipcat/package.nix
+++ b/pkgs/by-name/cl/clipcat/package.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "clipcat";
- version = "0.18.3";
+ version = "0.19.0";
src = fetchFromGitHub {
owner = "xrelkd";
repo = "clipcat";
rev = "refs/tags/v${version}";
- hash = "sha256-95y/HiLmhqt1DFmAxLg/W7lr/9dfVtce4+tx+vG2Nuw=";
+ hash = "sha256-94xw/E1Jp+bctVNzRZDdVaxxSMF/R87DNlRAzRT3Uvg=";
};
- cargoHash = "sha256-z2t7kq2ogMHJGF7xQnzc11B42gUZFTVokVkbw35CeY0=";
+ cargoHash = "sha256-qDcUEJSBd8c/ept/Y+GQCrp5b7xkSdX6ktdO9/c3k8o=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Cocoa
@@ -32,10 +32,6 @@ rustPlatform.buildRustPackage rec {
installShellFiles
];
- patches = [
- ./0001-fix-build.patch
- ];
-
checkFlags = [
# Some test cases interact with X11, skip them
"--skip=test_x11_clipboard"
diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix
new file mode 100644
index 000000000000..c15a390b2a3a
--- /dev/null
+++ b/pkgs/by-name/cl/clouddrive2/package.nix
@@ -0,0 +1,68 @@
+{
+ lib,
+ stdenv,
+ fetchurl,
+ makeWrapper,
+ versionCheckHook,
+}:
+let
+ os = if stdenv.hostPlatform.isDarwin then "macos" else "linux";
+ arch = if stdenv.hostPlatform.isAarch64 then "aarch64" else "x86_64";
+in
+stdenv.mkDerivation (finalAttrs: {
+ pname = "clouddrive2";
+ version = "0.7.21";
+
+ src = fetchurl {
+ url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz";
+ hash =
+ {
+ x86_64-linux = "sha256-U8th7cEAFDBg+CV6DEX0YnqaM2+NJNKmyA/IRtnWESo=";
+ aarch64-linux = "sha256-LaAVO4p0sSfsGmFPSzly1Hzo+t4oY6mgaTdnHrhu0vI=";
+ x86_64-darwin = "sha256-/cyLcX7A+WpuS6yciqAz3jvDIJvXEoyQyX+xe6+eRmE=";
+ aarch64-darwin = "sha256-Y5cKIHVzX0TjMNZGW3YvU8MNpuGsIjp4qNlB+b2BRJM=";
+ }
+ .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin
+ mkdir -p $out/opt/clouddrive2
+ cp -r wwwroot "$out/opt/clouddrive2/wwwroot"
+ cp -r clouddrive "$out/opt/clouddrive2/clouddrive"
+ makeWrapper $out/opt/clouddrive2/clouddrive $out/bin/clouddrive
+
+ runHook postInstall
+ '';
+
+ nativeInstallCheckPhaseInputs = [ versionCheckHook ];
+ versionCheckProgramArg = [ "--version" ];
+ doInstallCheck = true;
+
+ passthru.updateScript = ./update.sh;
+
+ meta = {
+ homepage = "https://www.clouddrive2.com";
+ changelog = "https://github.com/cloud-fs/cloud-fs.github.io/releases/tag/v${finalAttrs.version}";
+ description = "Multi-cloud drives management tool supporting mounting cloud drives locally";
+ longDescription = ''
+ CloudDrive is a powerful multi-cloud drive management tool that provides a multi-cloud
+ drive solution that includes local mounting of cloud drives. It supports lots of cloud
+ drives in China.
+ '';
+ mainProgram = "clouddrive";
+ license = lib.licenses.unfree;
+ platforms = [
+ "x86_64-linux"
+ "aarch64-linux"
+ "x86_64-darwin"
+ "aarch64-darwin"
+ ];
+ sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+ maintainers = with lib.maintainers; [ ltrump ];
+ };
+})
diff --git a/pkgs/by-name/cl/clouddrive2/update.sh b/pkgs/by-name/cl/clouddrive2/update.sh
new file mode 100755
index 000000000000..200bb47700fe
--- /dev/null
+++ b/pkgs/by-name/cl/clouddrive2/update.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash curl coreutils jq common-updater-scripts
+
+latestTag=$(curl -sSfL ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} https://api.github.com/repos/cloud-fs/cloud-fs.github.io/releases/latest | jq -r ".tag_name")
+latestVersion="$(expr "$latestTag" : 'v\(.*\)')"
+currentVersion=$(nix-instantiate --eval -E "with import ./. {}; clouddrive2.version" | tr -d '"')
+
+echo "latest version: $latestVersion"
+echo "current version: $currentVersion"
+
+if [[ "$latestVersion" == "$currentVersion" ]]; then
+ echo "package is up-to-date"
+ exit 0
+fi
+for i in \
+ "x86_64-linux linux-x86_64" \
+ "aarch64-linux linux-aarch64" \
+ "x86_64-darwin macos-x86_64" \
+ "aarch64-darwin macos-aarch64"; do
+ set -- $i
+ prefetch=$(nix-prefetch-url "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v$latestVersion/clouddrive-2-$2-$latestVersion.tgz")
+ hash=$(nix-hash --type sha256 --to-sri $prefetch)
+
+ update-source-version clouddrive2 $latestVersion $hash --system=$1 --ignore-same-version
+done
diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix
index 2d89eaed9189..ccf0d49d0cff 100644
--- a/pkgs/by-name/co/codeberg-cli/package.nix
+++ b/pkgs/by-name/co/codeberg-cli/package.nix
@@ -10,17 +10,17 @@
}:
rustPlatform.buildRustPackage rec {
pname = "codeberg-cli";
- version = "0.4.2";
+ version = "0.4.3";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "Aviac";
repo = "codeberg-cli";
rev = "v${version}";
- hash = "sha256-SUKV7tH7tvSPtlMcRlOgjvAEqPoBi4J41Ak5k4h4Qj0=";
+ hash = "sha256-95vjfjXKLXyg0d8FNAszBKwNVm9g8wRKzzHzxhTS8Bs=";
};
- cargoHash = "sha256-FlW0Q2UUt6AX/A0MznGpJY8+yoMs70N58Ow05ly9YyE=";
+ cargoHash = "sha256-IQTT7YylByGJhFV6sLSDmVhFahkByY2S4+IE7cNxLjg=";
nativeBuildInputs = [
pkg-config
installShellFiles
diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix
index dc8c9c2eea68..0338be017d7f 100644
--- a/pkgs/by-name/co/codeium/package.nix
+++ b/pkgs/by-name/co/codeium/package.nix
@@ -13,10 +13,10 @@ let
}.${system} or throwSystem;
hash = {
- x86_64-linux = "sha256-CQQ2GFy8eEaZkbnuCvBgSRMlwrEfqvM+dF1jlr6b7hk=";
- aarch64-linux = "sha256-LGGZZmVVO1ZhKXfU1F9SC2pGEZOqbf/hxmBMex4ll1o=";
- x86_64-darwin = "sha256-+pReEaZyi3o/ftaglOUNHoal9PShfj0gSJ2B3cg2Pa0=";
- aarch64-darwin = "sha256-0l6YlL9CSypRCzbxTOpC9fx2blgu5uelYCo85koJUdA=";
+ x86_64-linux = "sha256-fxwFomtgkOCtZCmXjxlCqa+9hxBiVNbM2IFdAGQ8Nlw=";
+ aarch64-linux = "sha256-hTxpszPXVU2FpB690tfZzrV9tUH/EqfjyEZQ8gPFmas=";
+ x86_64-darwin = "sha256-RiSCz4xNMFDdsAttovjXys7MeXRQgmi6YOi2LwvRoGE=";
+ aarch64-darwin = "sha256-G3j3Ds5ycGs0n5+KcaRa2MG86/1LdcZhgNdgeRIyfa4=";
}.${system} or throwSystem;
bin = "$out/bin/codeium_language_server";
@@ -24,7 +24,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "codeium";
- version = "1.20.4";
+ version = "1.24.2";
src = fetchurl {
name = "${finalAttrs.pname}-${finalAttrs.version}.gz";
url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz";
diff --git a/pkgs/by-name/co/collada2gltf/package.nix b/pkgs/by-name/co/collada2gltf/package.nix
new file mode 100644
index 000000000000..7b32f6781c5b
--- /dev/null
+++ b/pkgs/by-name/co/collada2gltf/package.nix
@@ -0,0 +1,39 @@
+{
+ fetchFromGitHub,
+ gcc10Stdenv,
+ lib,
+ cmake,
+}:
+gcc10Stdenv.mkDerivation rec {
+ pname = "COLLADA2GLTF";
+ version = "2.1.5";
+
+ src = fetchFromGitHub {
+ owner = "KhronosGroup";
+ repo = "COLLADA2GLTF";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-3Eo1qS6S5vlc/d2WB4iDJTjUnwMUrx9+Ln6n8PYU5qA=";
+ fetchSubmodules = true;
+ };
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm755 COLLADA2GLTF-bin $out/bin/COLLADA2GLTF
+
+ runHook postInstall
+ '';
+
+ nativeBuildInputs = [
+ cmake
+ ];
+
+ meta = {
+ description = "Command-line tool to convert COLLADA (.dae) files to glTF";
+ homepage = "https://github.com/KhronosGroup/COLLADA2GLTF";
+ license = lib.licenses.bsd3;
+ mainProgram = "COLLADA2GLTF";
+ maintainers = with lib.maintainers; [ shaddydc ];
+ platforms = with lib.platforms; unix ++ windows;
+ };
+}
diff --git a/pkgs/by-name/co/commitlint-rs/package.nix b/pkgs/by-name/co/commitlint-rs/package.nix
index 9b31e6cfd309..c69ace68ee52 100644
--- a/pkgs/by-name/co/commitlint-rs/package.nix
+++ b/pkgs/by-name/co/commitlint-rs/package.nix
@@ -8,15 +8,15 @@
}:
rustPlatform.buildRustPackage rec {
pname = "commitlint-rs";
- version = "0.1.11";
+ version = "0.1.12";
src = fetchFromGitHub {
owner = "KeisukeYamashita";
repo = "commitlint-rs";
rev = "v${version}";
- hash = "sha256-FrYXEh75H0u1rE1YNDL/B1gMYMG43jPDJGUMv9y5/3g=";
+ hash = "sha256-xDEd3jNmqur+ULjXOReolIDiqvpT2tAHj/IbH2op5Po=";
};
- cargoHash = "sha256-W6HkLCUoylgQQc2fFprmJeLH8KtpVUD4+BXWbNECVZ4=";
+ cargoHash = "sha256-SNOy0B1QARfoueMsCjLZhJsGQy2jTSeFC/D1+R/FH4Y=";
passthru = {
updateScript = nix-update-script { };
diff --git a/pkgs/by-name/co/composer-require-checker/package.nix b/pkgs/by-name/co/composer-require-checker/package.nix
index 1a42cbd200e5..4e83f0fc8d9f 100644
--- a/pkgs/by-name/co/composer-require-checker/package.nix
+++ b/pkgs/by-name/co/composer-require-checker/package.nix
@@ -1,20 +1,20 @@
{ lib
-, fetchFromGitHub
+, fetchgit
, php
}:
-php.buildComposerProject (finalAttrs: {
+php.buildComposerProject2 (finalAttrs: {
pname = "composer-require-checker";
- version = "4.8.0";
+ version = "4.13.0";
- src = fetchFromGitHub {
- owner = "maglnet";
- repo = "ComposerRequireChecker";
- rev = finalAttrs.version;
- hash = "sha256-qCHUNaPunCPuWax/YUbYXaVh1JlJEwYvG/NmaSc1VpA=";
+ # Upstream no longer provides the composer.lock in their release artifact
+ src = fetchgit {
+ url = "https://github.com/maglnet/ComposerRequireChecker";
+ rev = "refs/tags/${finalAttrs.version}";
+ hash = "sha256-xq8W5SXwtmJ3uu5g26/rxL02jqBuxvEEQpwazPdCE5Y=";
};
- vendorHash = "sha256-B5w5n2S/mTF7vpsLuHtf2DGR5aPBfO9QGmodYGXE+Cg=";
+ vendorHash = "sha256-GGT/9kBpd7PU/pMJFWw1rrEW2QFUlrp3lljUCyo+/bw=";
meta = {
description = "CLI tool to check whether a specific composer package uses imported symbols that aren't part of its direct composer dependencies";
diff --git a/pkgs/by-name/co/consul/package.nix b/pkgs/by-name/co/consul/package.nix
index 882b16248adb..b3e36fda0517 100644
--- a/pkgs/by-name/co/consul/package.nix
+++ b/pkgs/by-name/co/consul/package.nix
@@ -8,7 +8,7 @@
buildGoModule rec {
pname = "consul";
- version = "1.20.0";
+ version = "1.20.1";
# Note: Currently only release tags are supported, because they have the Consul UI
# vendored. See
@@ -22,7 +22,7 @@ buildGoModule rec {
owner = "hashicorp";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-yHhaaZZ/KxQk8RVkqNfyfWTPS5K+BhckcxqdC5gN+ko=";
+ hash = "sha256-nYWrJB98S2zPSBu8ZIHejnLP5OQyPxpJGLdLenGHzHM=";
};
# This corresponds to paths with package main - normally unneeded but consul
@@ -32,7 +32,7 @@ buildGoModule rec {
"connect/certgen"
];
- vendorHash = "sha256-7Nw2zuTyAR7mzxFkeOuhbh9OAlshZA0JKOVQdckIF90=";
+ vendorHash = "sha256-SkDvac2mZOB6RMETv/qhjHyaCjjIYmlON42+ZZ6FTlI=";
doCheck = false;
diff --git a/pkgs/by-name/co/convco/package.nix b/pkgs/by-name/co/convco/package.nix
index 0f08aba98ae8..c0f780b5bb3c 100644
--- a/pkgs/by-name/co/convco/package.nix
+++ b/pkgs/by-name/co/convco/package.nix
@@ -11,21 +11,26 @@
rustPlatform.buildRustPackage rec {
pname = "convco";
- version = "0.6.0";
+ version = "0.6.1";
src = fetchFromGitHub {
owner = "convco";
repo = pname;
rev = "v${version}";
- hash = "sha256-TRuzHcGnvxDMd/XtbSXj4P+72ZL86Z2FgsqmYrKg/Ys=";
+ hash = "sha256-s0rcSekJLe99oxi6JD8VL1S6nqQTUFTn5pdgxnknbaY=";
};
- cargoHash = "sha256-mT1bwCp/MdYbyc9IrC9WDmKfD6lfiqVL7TlenddTXt8=";
+ cargoHash = "sha256-oQBCPfwlMJ0hLZskv+KUNVBHH550yAUI1jY40Eah3Bc=";
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
+ checkFlags = [
+ # disable test requiring networking
+ "--skip=git::tests::test_find_last_unordered_prerelease"
+ ];
+
meta = with lib; {
description = "Conventional commit cli";
mainProgram = "convco";
diff --git a/pkgs/by-name/co/copycat/package.nix b/pkgs/by-name/co/copycat/package.nix
index 125a49f42836..2fc4fb8fd31b 100644
--- a/pkgs/by-name/co/copycat/package.nix
+++ b/pkgs/by-name/co/copycat/package.nix
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "ccat";
- version = "001";
+ version = "002";
src = fetchFromGitHub {
owner = "DeeKahy";
repo = "CopyCat";
rev = "refs/tags/${version}";
- hash = "sha256-zllxQifRMNEMa3RO5WKrwGAUf1xQg6YrQBzIHzy43F0=";
+ hash = "sha256-0pqC6fxuvqOPuO10Em63tFguc3VJNnniPCHM6TcFDN0=";
};
- cargoHash = "sha256-LYVhvq5l+PCZXW+elWi3zZFxLekgPn+plo4dybbLK9g=";
+ cargoHash = "sha256-oNX1MUpOjRG02FHOU7zpktLAYKu/1+R2d96jC/VA0co=";
buildInputs = lib.optionals (stdenv.isDarwin) [
darwin.apple_sdk_11_0.frameworks.AppKit
diff --git a/pkgs/by-name/co/coyim/package.nix b/pkgs/by-name/co/coyim/package.nix
index b45522006890..182aef00b98e 100644
--- a/pkgs/by-name/co/coyim/package.nix
+++ b/pkgs/by-name/co/coyim/package.nix
@@ -1,14 +1,15 @@
-{ lib
-, stdenv
-, buildGoModule
-, fetchFromGitHub
-, pkg-config
-, cairo
-, gdk-pixbuf
-, glib
-, adwaita-icon-theme
-, wrapGAppsHook3
-, gtk3
+{
+ lib,
+ stdenv,
+ buildGoModule,
+ fetchFromGitHub,
+ pkg-config,
+ cairo,
+ gdk-pixbuf,
+ glib,
+ adwaita-icon-theme,
+ wrapGAppsHook3,
+ gtk3,
}:
buildGoModule {
@@ -24,16 +25,30 @@ buildGoModule {
vendorHash = "sha256-zG7r/Db6XiwKoHRduGj3tEh/KT1hsuBoSGLYaZ+qO0Y=";
- nativeBuildInputs = [ pkg-config wrapGAppsHook3 ];
+ nativeBuildInputs = [
+ pkg-config
+ wrapGAppsHook3
+ ];
- buildInputs = [ glib cairo gdk-pixbuf gtk3 adwaita-icon-theme ];
+ buildInputs = [
+ glib
+ cairo
+ gdk-pixbuf
+ gtk3
+ adwaita-icon-theme
+ ];
+
+ postPatch = ''
+ # fixes build on aarch64
+ rm -v windows_amd64_icon.syso
+ '';
meta = {
description = "Safe and secure chat client";
mainProgram = "coyim";
homepage = "https://coy.im/";
license = lib.licenses.gpl3;
- platforms = [ "x86_64-linux" "x86_64-darwin" ];
broken = stdenv.hostPlatform.isDarwin;
+ maintainers = with lib.maintainers; [ PapayaJackal ];
};
}
diff --git a/pkgs/by-name/cp/cppcheck/package.nix b/pkgs/by-name/cp/cppcheck/package.nix
index d7ed4fb99c47..fa4c923041e7 100644
--- a/pkgs/by-name/cp/cppcheck/package.nix
+++ b/pkgs/by-name/cp/cppcheck/package.nix
@@ -15,7 +15,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cppcheck";
- version = "2.15.0";
+ version = "2.16.0";
outputs = [
"out"
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "danmar";
repo = "cppcheck";
rev = finalAttrs.version;
- hash = "sha256-6AI3sy4D+YhUOpy02UHJWyhelbqcoEW+Tw/ADCPEbuM=";
+ hash = "sha256-u+/rlQksCyNjLOkLHiRfLKWfVSEU+LerYuT6lAp/Wrs=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/by-name/cr/crow-translate/package.nix
similarity index 81%
rename from pkgs/applications/misc/crow-translate/default.nix
rename to pkgs/by-name/cr/crow-translate/package.nix
index 84263380f11a..304a4dbac53a 100644
--- a/pkgs/applications/misc/crow-translate/default.nix
+++ b/pkgs/by-name/cr/crow-translate/package.nix
@@ -3,48 +3,45 @@
, fetchFromGitLab
, cmake
, extra-cmake-modules
-, qttools
-, kwayland
, leptonica
+, libsForQt5
+, qt5
, tesseract4
-, qtmultimedia
-, qtx11extras
-, wrapQtAppsHook
, gst_all_1
, testers
}:
stdenv.mkDerivation (finalAttrs: {
pname = "crow-translate";
- version = "3.0.0";
+ version = "3.1.0";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "office";
repo = "crow-translate";
rev = "v${finalAttrs.version}";
- hash = "sha256-hdrhxbv44DlxoF1JU1d2auP/vR8a3IJI+hN7PhdPMaY=";
+ hash = "sha256-zL+Ucw6rzIoEaBHi/uqKQB0cnR6aAcF8MPOG3hwK3iA=";
fetchSubmodules = true;
};
postPatch = ''
substituteInPlace data/org.kde.CrowTranslate.desktop.in \
- --subst-var-by QT_BIN_DIR ${lib.getBin qttools}/bin
+ --subst-var-by QT_BIN_DIR ${lib.getBin qt5.qttools}/bin
'';
nativeBuildInputs = [
cmake
extra-cmake-modules
- qttools
- wrapQtAppsHook
+ qt5.qttools
+ qt5.wrapQtAppsHook
];
buildInputs = [
- kwayland
+ libsForQt5.kwayland
leptonica
tesseract4
- qtmultimedia
- qtx11extras
+ qt5.qtmultimedia
+ qt5.qtx11extras
] ++ (with gst_all_1; [
gstreamer
gst-plugins-base
diff --git a/pkgs/by-name/cr/crystal-dock/package.nix b/pkgs/by-name/cr/crystal-dock/package.nix
index fe1f4eaf11c9..dfd059d6d7e0 100644
--- a/pkgs/by-name/cr/crystal-dock/package.nix
+++ b/pkgs/by-name/cr/crystal-dock/package.nix
@@ -8,13 +8,13 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "crystal-dock";
- version = "2.5";
+ version = "2.7";
src = fetchFromGitHub {
owner = "dangvd";
repo = "crystal-dock";
rev = "v${finalAttrs.version}";
- hash = "sha256-y7Wt0o57z8NaAcYoaigWtI7twx8UAUgSIEWz86LcNKM=";
+ hash = "sha256-VxdVB/DLVvmHGvZ2JI/mZCCWIdopYhObJuN4MKh+l4A=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/ct/ctune/cmake_disable_git_clone.patch b/pkgs/by-name/ct/ctune/cmake_disable_git_clone.patch
new file mode 100644
index 000000000000..2aafd621c278
--- /dev/null
+++ b/pkgs/by-name/ct/ctune/cmake_disable_git_clone.patch
@@ -0,0 +1,59 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1a30d61..bea8d7c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -50,13 +50,6 @@ include(FetchContent)
+
+ set(CMAKE_VERBOSE_MAKEFILE ON)
+
+-#========================================== PRE-CHECKS ============================================#
+-include(FindGit)
+-find_package(Git)
+-
+-if (NOT Git_FOUND)
+- message(FATAL_ERROR "Required package 'Git' not found on system.")
+-endif ()
+
+ #======================================== LIB IMPORTS =============================================#
+ # ======= #
+@@ -68,28 +61,9 @@ include_directories(${OPENSSL_INCLUDE_DIR})
+ # ============== #
+ # JSON-C library #
+ # ============== #
+-set(JSONC_DOWNLOAD_PATH "${TEMP_DIR_PATH}/libjsonc")
+-set(JSONC_INSTALL_PATH "${CMAKE_EXTERNAL_OUTPUT_DIRECTORY}")
+-
+-add_custom_target(make-jsonc-install-dir ALL
+- COMMAND ${CMAKE_COMMAND} -E make_directory ${JSONC_INSTALL_PATH}
+-)
+-
+-ExternalProject_Add(libjsonc
+- PREFIX "${JSONC_DOWNLOAD_PATH}"
+- SOURCE_DIR "${JSONC_DOWNLOAD_PATH}/src/libjsonc-build"
+- GIT_REPOSITORY "https://github.com/json-c/json-c.git"
+- CMAKE_ARGS "-DBUILD_STATIC_LIBS=ON"
+- "-DBUILD_SHARED_LIBS=OFF"
+- "-DCMAKE_INSTALL_PREFIX:PATH=${JSONC_INSTALL_PATH}"
+- "-DHAVE_ARC4RANDOM=OFF"
+- "-DCMAKE_BUILD_TYPE=release"
+-)
+-
+-set(JSONC_LIBRARIES
+- ${CMAKE_EXTERNAL_OUTPUT_DIRECTORY}/lib/libjson-c.a
+- bsd
+-)
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(JSONC REQUIRED json-c)
++include_directories(${JSONC_INCLUDE_DIRS})
+
+ # ============ #
+ # Curl library #
+@@ -408,7 +382,7 @@ add_subdirectory(docs)
+ #endforeach()
+
+ add_executable(ctune ${SOURCE_FILES})
+-add_dependencies(ctune ctune_logger libjsonc)
++add_dependencies(ctune ctune_logger)
+ include_directories(${CMAKE_EXTERNAL_OUTPUT_DIRECTORY}/include)
+
+ add_dependencies(ctune ${CTUNE_PLUGIN_LIST_AUDIO_PLAYER})
diff --git a/pkgs/by-name/ct/ctune/package.nix b/pkgs/by-name/ct/ctune/package.nix
new file mode 100644
index 000000000000..c9e38fba90ab
--- /dev/null
+++ b/pkgs/by-name/ct/ctune/package.nix
@@ -0,0 +1,66 @@
+{
+ stdenv,
+ lib,
+ fetchFromGitHub,
+ openssl,
+ curl,
+ ffmpeg,
+ vlc,
+ SDL2,
+ lame,
+ json_c,
+ cmake,
+ pkg-config,
+ ncurses,
+ libuuid,
+ pandoc,
+}:
+stdenv.mkDerivation (finalAttrs: {
+ pname = "ctune";
+ version = "1.3.2";
+
+ src = fetchFromGitHub {
+ owner = "An7ar35";
+ repo = "ctune";
+ rev = "refs/tags/v${finalAttrs.version}";
+ hash = "sha256-fy7Wb4R6HDa+cLxI5YWq67gxw1XS/iDDN4M3Rn7GYeI=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ pandoc
+ ];
+
+ buildInputs = [
+ openssl
+ curl
+ ffmpeg
+ vlc
+ SDL2
+ lame
+ json_c
+ ncurses
+ libuuid
+ ];
+
+ strictDeps = true;
+
+ cmakeFlags = [
+ # Avoid a wrong nested install path location
+ # Set to "$out" instead of "$out/$out"
+ "-DCMAKE_INSTALL_PREFIX=''"
+ ];
+
+ patches = [ ./cmake_disable_git_clone.patch ];
+
+ meta = {
+ description = "A nice terminal nCurses (tui) internet radio player for Linux, browse and search from api.radio-browser.info";
+ homepage = " https://github.com/An7ar35/ctune";
+ changelog = "https://github.com/An7ar35/ctune/blob/master/CHANGELOG.md";
+ license = lib.licenses.agpl3Plus;
+ maintainers = with lib.maintainers; [ theobori ];
+ mainProgram = "ctune";
+ platforms = lib.platforms.linux;
+ };
+})
diff --git a/pkgs/by-name/da/daed/package.nix b/pkgs/by-name/da/daed/package.nix
new file mode 100644
index 000000000000..8618a3212fb2
--- /dev/null
+++ b/pkgs/by-name/da/daed/package.nix
@@ -0,0 +1,92 @@
+{
+ pnpm,
+ nodejs,
+ stdenv,
+ clang,
+ buildGoModule,
+ fetchFromGitHub,
+ lib,
+}:
+
+let
+ pname = "daed";
+ version = "0.8.0";
+ src = fetchFromGitHub {
+ owner = "daeuniverse";
+ repo = "daed";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-h1j91XIumuzuJnMxgkCjhuXYPLXoDuFFsfmDwmzlTEI=";
+ fetchSubmodules = true;
+ };
+
+ web = stdenv.mkDerivation {
+ inherit pname version src;
+
+ pnpmDeps = pnpm.fetchDeps {
+ inherit pname version src;
+ hash = "sha256-vqkiZzd5WOeJem0zUyMsJd6/aHHAjlsIQMkNf+SUvHY=";
+ };
+
+ nativeBuildInputs = [
+ nodejs
+ pnpm.configHook
+ ];
+
+ buildPhase = ''
+ runHook preBuild
+ pnpm build
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out
+ cp -R dist/* $out/
+ runHook postInstall
+ '';
+ };
+in
+buildGoModule rec {
+ inherit pname version src;
+ sourceRoot = "${src.name}/wing";
+
+ vendorHash = "sha256-TBR3MmpTdwIwyekU+nrHhzsN31E30+Rqd3FoBL3dl4U=";
+ proxyVendor = true;
+
+ nativeBuildInputs = [ clang ];
+
+ hardeningDisable = [ "zerocallusedregs" ];
+
+ prePatch = ''
+ substituteInPlace Makefile \
+ --replace-fail /bin/bash /bin/sh
+
+ # ${web} does not have write permission
+ mkdir dist
+ cp -r ${web}/* dist
+ chmod -R 755 dist
+ '';
+
+ buildPhase = ''
+ runHook preBuild
+
+ make CFLAGS="-D__REMOVE_BPF_PRINTK -fno-stack-protector -Wno-unused-command-line-argument" \
+ NOSTRIP=y \
+ WEB_DIST=dist \
+ AppName=${pname} \
+ VERSION=${version} \
+ OUTPUT=$out/bin/daed \
+ bundle
+
+ runHook postBuild
+ '';
+
+ meta = {
+ description = "Modern dashboard with dae";
+ homepage = "https://github.com/daeuniverse/daed";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ oluceps ];
+ platforms = lib.platforms.linux;
+ mainProgram = "daed";
+ };
+}
diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix
index 579f96ce9b0f..4e3b1dd9165d 100644
--- a/pkgs/by-name/da/dart-sass/package.nix
+++ b/pkgs/by-name/da/dart-sass/package.nix
@@ -11,24 +11,24 @@
}:
let
- embedded-protocol-version = "2.7.1";
+ embedded-protocol-version = "3.1.0";
embedded-protocol = fetchFromGitHub {
owner = "sass";
repo = "sass";
rev = "refs/tags/embedded-protocol-${embedded-protocol-version}";
- hash = "sha256-6bGH/klCYxuq7CrOJVF8ySafhLJwet5ppBcpI8dzeCQ=";
+ hash = "sha256-DBoGACNhc9JMT8D+dO50aKUitY8xx/3IGj/XntFts1w=";
};
in
buildDartApplication rec {
pname = "dart-sass";
- version = "1.77.6";
+ version = "1.80.5";
src = fetchFromGitHub {
owner = "sass";
repo = pname;
rev = version;
- hash = "sha256-GiZbx60HtyFTsargh0UVhjzOwlw3VWkhUEaX0s2ehos=";
+ hash = "sha256-A9e3GxOg1xkmOXjNyhg2ihnxKiMb2vORpwvAy+JWFZY=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/by-name/da/dart-sass/pubspec.lock.json b/pkgs/by-name/da/dart-sass/pubspec.lock.json
index 8c3f3c83dce3..d22c50acf15f 100644
--- a/pkgs/by-name/da/dart-sass/pubspec.lock.json
+++ b/pkgs/by-name/da/dart-sass/pubspec.lock.json
@@ -4,21 +4,27 @@
"dependency": "transitive",
"description": {
"name": "_fe_analyzer_shared",
- "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7",
+ "sha256": "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "67.0.0"
+ "version": "73.0.0"
+ },
+ "_macros": {
+ "dependency": "transitive",
+ "description": "dart",
+ "source": "sdk",
+ "version": "0.3.2"
},
"analyzer": {
"dependency": "direct dev",
"description": {
"name": "analyzer",
- "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d",
+ "sha256": "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "6.4.1"
+ "version": "6.8.0"
},
"archive": {
"dependency": "direct dev",
@@ -34,31 +40,31 @@
"dependency": "direct main",
"description": {
"name": "args",
- "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a",
+ "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.5.0"
+ "version": "2.6.0"
},
"async": {
"dependency": "direct main",
"description": {
"name": "async",
- "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
+ "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.11.0"
+ "version": "2.12.0"
},
"boolean_selector": {
"dependency": "transitive",
"description": {
"name": "boolean_selector",
- "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
+ "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.1.1"
+ "version": "2.1.2"
},
"charcode": {
"dependency": "direct main",
@@ -104,121 +110,121 @@
"dependency": "direct dev",
"description": {
"name": "cli_util",
- "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19",
+ "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.4.1"
+ "version": "0.4.2"
},
"collection": {
"dependency": "direct main",
"description": {
"name": "collection",
- "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
+ "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.18.0"
+ "version": "1.19.1"
},
"convert": {
"dependency": "transitive",
"description": {
"name": "convert",
- "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592",
+ "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "3.1.1"
+ "version": "3.1.2"
},
"coverage": {
"dependency": "transitive",
"description": {
"name": "coverage",
- "sha256": "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e",
+ "sha256": "88b0fddbe4c92910fefc09cc0248f5e7f0cd23e450ded4c28f16ab8ee8f83268",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.8.0"
+ "version": "1.10.0"
},
"crypto": {
"dependency": "direct dev",
"description": {
"name": "crypto",
- "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab",
+ "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "3.0.3"
+ "version": "3.0.6"
},
"csslib": {
"dependency": "transitive",
"description": {
"name": "csslib",
- "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb",
+ "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.0.0"
+ "version": "1.0.2"
},
"dart_mappable": {
"dependency": "transitive",
"description": {
"name": "dart_mappable",
- "sha256": "47269caf2060533c29b823ff7fa9706502355ffcb61e7f2a374e3a0fb2f2c3f0",
+ "sha256": "f69a961ae8589724ebb542e588f228ae844c5f78028899cbe2cc718977c1b382",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "4.2.2"
+ "version": "4.3.0"
},
"dart_style": {
"dependency": "direct dev",
"description": {
"name": "dart_style",
- "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9",
+ "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.3.6"
+ "version": "2.3.7"
},
"dartdoc": {
"dependency": "direct dev",
"description": {
"name": "dartdoc",
- "sha256": "76de402781a647e55f356f1ae4446a400a573421f84c95da13dda4754cdbcceb",
+ "sha256": "818bf58bd0325cb574df31e5c08969f0e690a9cb13826eaac2efc02c7e41655a",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "8.0.8"
+ "version": "8.1.0"
},
"ffi": {
"dependency": "transitive",
"description": {
"name": "ffi",
- "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21",
+ "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.1.2"
+ "version": "2.1.3"
},
"file": {
"dependency": "transitive",
"description": {
"name": "file",
- "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c",
+ "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "7.0.0"
+ "version": "7.0.1"
},
"fixnum": {
"dependency": "transitive",
"description": {
"name": "fixnum",
- "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1",
+ "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.1.0"
+ "version": "1.1.1"
},
"frontend_server_client": {
"dependency": "transitive",
@@ -254,21 +260,21 @@
"dependency": "transitive",
"description": {
"name": "html",
- "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a",
+ "sha256": "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.15.4"
+ "version": "0.15.5"
},
"http": {
"dependency": "direct main",
"description": {
"name": "http",
- "sha256": "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938",
+ "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.2.1"
+ "version": "1.2.2"
},
"http_multi_server": {
"dependency": "transitive",
@@ -284,11 +290,11 @@
"dependency": "transitive",
"description": {
"name": "http_parser",
- "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
+ "sha256": "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "4.0.2"
+ "version": "4.1.1"
},
"io": {
"dependency": "transitive",
@@ -334,11 +340,21 @@
"dependency": "transitive",
"description": {
"name": "logging",
- "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340",
+ "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.2.0"
+ "version": "1.3.0"
+ },
+ "macros": {
+ "dependency": "transitive",
+ "description": {
+ "name": "macros",
+ "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.1.2-main.4"
},
"markdown": {
"dependency": "transitive",
@@ -364,21 +380,21 @@
"dependency": "direct main",
"description": {
"name": "meta",
- "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
+ "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.15.0"
+ "version": "1.16.0"
},
"mime": {
"dependency": "transitive",
"description": {
"name": "mime",
- "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2",
+ "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.0.5"
+ "version": "2.0.0"
},
"native_stack_traces": {
"dependency": "transitive",
@@ -394,11 +410,11 @@
"dependency": "direct main",
"description": {
"name": "native_synchronization",
- "sha256": "ff200fe0a64d733ff7d4dde2005271c297db81007604c8cd21037959858133ab",
+ "sha256": "047fa3665d611e178edc167e56166714f125750f064d20216892f1cca69d9d1d",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.2.0"
+ "version": "0.3.1"
},
"node_interop": {
"dependency": "direct main",
@@ -424,11 +440,11 @@
"dependency": "transitive",
"description": {
"name": "oauth2",
- "sha256": "c4013ef62be37744efdc0861878fd9e9285f34db1f9e331cc34100d7674feb42",
+ "sha256": "c84470642cbb2bec450ccab2f8520c079cd1ca546a76ffd5c40589e07f4e8bf4",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.0.2"
+ "version": "2.0.3"
},
"package_config": {
"dependency": "direct main",
@@ -444,11 +460,11 @@
"dependency": "direct main",
"description": {
"name": "path",
- "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
+ "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.9.0"
+ "version": "1.9.1"
},
"petitparser": {
"dependency": "transitive",
@@ -494,11 +510,11 @@
"dependency": "direct dev",
"description": {
"name": "pub_api_client",
- "sha256": "cc3d2c93df3823553de6a3e7d3ac09a3f43f8c271af4f43c2795266090ac9625",
+ "sha256": "06321793e558b2dfac3a11098a530b816a8f752a5cf9208a382be9a418e3f5fc",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.7.0"
+ "version": "2.7.1"
},
"pub_semver": {
"dependency": "direct main",
@@ -534,11 +550,11 @@
"dependency": "transitive",
"description": {
"name": "quiver",
- "sha256": "b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47",
+ "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "3.2.1"
+ "version": "3.2.2"
},
"retry": {
"dependency": "transitive",
@@ -554,11 +570,11 @@
"dependency": "transitive",
"description": {
"name": "shelf",
- "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4",
+ "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.4.1"
+ "version": "1.4.2"
},
"shelf_packages_handler": {
"dependency": "transitive",
@@ -574,11 +590,11 @@
"dependency": "transitive",
"description": {
"name": "shelf_static",
- "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e",
+ "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.1.2"
+ "version": "1.1.3"
},
"shelf_web_socket": {
"dependency": "transitive",
@@ -594,11 +610,11 @@
"dependency": "transitive",
"description": {
"name": "source_map_stack_trace",
- "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae",
+ "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.1.1"
+ "version": "2.1.2"
},
"source_maps": {
"dependency": "direct main",
@@ -624,11 +640,11 @@
"dependency": "direct main",
"description": {
"name": "stack_trace",
- "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
+ "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.11.1"
+ "version": "1.12.0"
},
"stream_channel": {
"dependency": "direct main",
@@ -654,11 +670,11 @@
"dependency": "direct main",
"description": {
"name": "string_scanner",
- "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
+ "sha256": "0bd04f5bb74fcd6ff0606a888a30e917af9bd52820b178eaa464beb11dca84b6",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.2.0"
+ "version": "1.4.0"
},
"term_glyph": {
"dependency": "direct main",
@@ -674,31 +690,31 @@
"dependency": "direct dev",
"description": {
"name": "test",
- "sha256": "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e",
+ "sha256": "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.25.7"
+ "version": "1.25.8"
},
"test_api": {
"dependency": "transitive",
"description": {
"name": "test_api",
- "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
+ "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.7.2"
+ "version": "0.7.3"
},
"test_core": {
"dependency": "transitive",
"description": {
"name": "test_core",
- "sha256": "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696",
+ "sha256": "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.6.4"
+ "version": "0.6.5"
},
"test_descriptor": {
"dependency": "direct dev",
@@ -734,11 +750,11 @@
"dependency": "direct main",
"description": {
"name": "typed_data",
- "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
+ "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.3.2"
+ "version": "1.4.0"
},
"uri": {
"dependency": "transitive",
@@ -754,11 +770,11 @@
"dependency": "transitive",
"description": {
"name": "vm_service",
- "sha256": "f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc",
+ "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "14.2.4"
+ "version": "14.3.1"
},
"watcher": {
"dependency": "direct main",
@@ -774,31 +790,31 @@
"dependency": "transitive",
"description": {
"name": "web",
- "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27",
+ "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.5.1"
+ "version": "1.1.0"
},
"web_socket": {
"dependency": "transitive",
"description": {
"name": "web_socket",
- "sha256": "24301d8c293ce6fe327ffe6f59d8fd8834735f0ec36e4fd383ec7ff8a64aa078",
+ "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.1.5"
+ "version": "0.1.6"
},
"web_socket_channel": {
"dependency": "transitive",
"description": {
"name": "web_socket_channel",
- "sha256": "a2d56211ee4d35d9b344d9d4ce60f362e4f5d1aafb988302906bd732bc731276",
+ "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "3.0.0"
+ "version": "3.0.1"
},
"webkit_inspection_protocol": {
"dependency": "transitive",
@@ -832,6 +848,6 @@
}
},
"sdks": {
- "dart": ">=3.3.0 <4.0.0"
+ "dart": ">=3.5.0 <4.0.0"
}
}
diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix
index ef29c8a67548..8e62a026ba00 100644
--- a/pkgs/by-name/db/dbeaver-bin/package.nix
+++ b/pkgs/by-name/db/dbeaver-bin/package.nix
@@ -16,7 +16,7 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "dbeaver-bin";
- version = "24.2.1";
+ version = "24.2.3";
src =
let
@@ -29,10 +29,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
aarch64-darwin = "macos-aarch64.dmg";
};
hash = selectSystem {
- x86_64-linux = "sha256-U1KJxE1PzRRMvYw3jSYV2n6JuhzyL30le1HeY0kft1k=";
- aarch64-linux = "sha256-AT/Xx+Hwu64sUfR1fS9nI+RTsIfdi9udF9TR9hbjnxg=";
- x86_64-darwin = "sha256-hCIfBv6FaNoZiTvpx1UCdwBg15vq+ZsTG5upmbWXN0M=";
- aarch64-darwin = "sha256-g0G6fqR75AoOEzlYr6MbTBL8aQ/hWQuFyw1G2w9/JlU=";
+ x86_64-linux = "sha256-TvDpoEcnZBS8ORggFwLM80FXsJ8EXKvRSPUn+VtNTk8=";
+ aarch64-linux = "sha256-59khU3VQzpNeZv69pbeeE4ZAFajyI5gUUw9baOWPIFM=";
+ x86_64-darwin = "sha256-/YyN5daeoxq0oii6qYRpZ8cb43u6n8HuVc2JqVOhrxs=";
+ aarch64-darwin = "sha256-Stb76QpLnpmpBYDm+6fgkcx+TlY8hVkNtvGgdMWbaHg=";
};
in
fetchurl {
diff --git a/pkgs/by-name/de/dependency-track/package.nix b/pkgs/by-name/de/dependency-track/package.nix
index ae33be78335c..02d143803b0c 100644
--- a/pkgs/by-name/de/dependency-track/package.nix
+++ b/pkgs/by-name/de/dependency-track/package.nix
@@ -11,7 +11,7 @@
nixosTests,
}:
let
- version = "4.12.0";
+ version = "4.12.1";
frontend = buildNpmPackage {
pname = "dependency-track-frontend";
@@ -21,10 +21,10 @@ let
owner = "DependencyTrack";
repo = "frontend";
rev = version;
- hash = "sha256-7omFxT3WBQp6xftgU6ttGgwIGbLXLetQz2ySvsgsQic=";
+ hash = "sha256-M7UtyhIuEi6ebkjO8OM0VVi8LQ+VqeVIzBgQwIzSAzg=";
};
- npmDepsHash = "sha256-LZg3n1+L6tvfC0gBKf8YZd/UMDz04v1V9qrJZrAr4W4=";
+ npmDepsHash = "sha256-ZU5D3ZXLaZ1m2YP6uZmpzahP2JQPL9tdOHOyN9fp/XA=";
forceGitDeps = true;
makeCacheWritable = true;
@@ -41,7 +41,7 @@ maven.buildMavenPackage rec {
owner = "DependencyTrack";
repo = "dependency-track";
rev = version;
- hash = "sha256-FJ4VNDpmVBXU1/URb/Rnu0LXAbxKw6Zd7MPbN4bs9eY=";
+ hash = "sha256-Gx7tGkibSu+v4gGKC61EFwUsdruMh0t2gTnnNazjqco=";
};
patches = [
@@ -56,7 +56,7 @@ maven.buildMavenPackage rec {
'';
mvnJdk = jre_headless;
- mvnHash = "sha256-YrlGVJ0Hp9VHfMD0+hT/9q8tskft6RvszmU4tRAXSAY=";
+ mvnHash = "sha256-4QtWvsIFiS4d55y45tj3RLE4YYdXLrqpzqS7mOqRWYw=";
manualMvnArtifacts = [ "com.coderplus.maven.plugins:copy-rename-maven-plugin:1.0.1" ];
buildOffline = true;
diff --git a/pkgs/by-name/de/desed/package.nix b/pkgs/by-name/de/desed/package.nix
index 03afc5e20090..e7d07164628b 100644
--- a/pkgs/by-name/de/desed/package.nix
+++ b/pkgs/by-name/de/desed/package.nix
@@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec {
owner = "SoptikHa2";
repo = "desed";
rev = "refs/tags/v${version}";
- hash = "sha256-FL9w+XdClLBCRp+cLqDzTVj8j9LMUp8jZ6hiG4KvIds=";
+ hash = "sha256-aKkOs8IhnHjoJkXq9ryGn9fN0AmZyVTHbD/Vano+Erw=";
};
- cargoHash = "sha256-inH8fUpUR0WXYY2JX72evZqVp3GlnGKBBlrbai/fU6U=";
+ cargoHash = "sha256-3bkNirrvBOqIOhxD5xf3XsdaUMWFVT/lnN3gmZQIB9I=";
passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/di/disko/package.nix b/pkgs/by-name/di/disko/package.nix
index 2a3818f45eb3..8e580594efec 100644
--- a/pkgs/by-name/di/disko/package.nix
+++ b/pkgs/by-name/di/disko/package.nix
@@ -11,12 +11,12 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "disko";
- version = "1.8.2";
+ version = "1.9.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = "disko";
rev = "v${finalAttrs.version}";
- hash = "sha256-O0QVhsj9I/hmcIqJ4qCqFyzvjYL+dtzJP0C5MFd8O/Y=";
+ hash = "sha256-CI27qHAbc3/tIe8sb37kiHNaeCqGxNimckCMj0lW5kg=";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ bash ];
diff --git a/pkgs/applications/misc/dmenu-rs/Cargo.lock b/pkgs/by-name/dm/dmenu-rs/Cargo.lock
similarity index 100%
rename from pkgs/applications/misc/dmenu-rs/Cargo.lock
rename to pkgs/by-name/dm/dmenu-rs/Cargo.lock
diff --git a/pkgs/by-name/dm/dmenu-rs/enablePlugins.Cargo.lock b/pkgs/by-name/dm/dmenu-rs/enablePlugins.Cargo.lock
new file mode 100644
index 000000000000..afc8157a9957
--- /dev/null
+++ b/pkgs/by-name/dm/dmenu-rs/enablePlugins.Cargo.lock
@@ -0,0 +1,2188 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "ansi_term"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "async-channel"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
+dependencies = [
+ "concurrent-queue",
+ "event-listener 2.5.3",
+ "futures-core",
+]
+
+[[package]]
+name = "async-channel"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand 2.1.0",
+ "futures-lite 2.3.0",
+ "slab",
+]
+
+[[package]]
+name = "async-global-executor"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
+dependencies = [
+ "async-channel 2.3.1",
+ "async-executor",
+ "async-io 2.3.4",
+ "async-lock 3.4.0",
+ "blocking",
+ "futures-lite 2.3.0",
+ "once_cell",
+]
+
+[[package]]
+name = "async-io"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
+dependencies = [
+ "async-lock 2.8.0",
+ "autocfg",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-lite 1.13.0",
+ "log",
+ "parking",
+ "polling 2.8.0",
+ "rustix 0.37.27",
+ "slab",
+ "socket2",
+ "waker-fn",
+]
+
+[[package]]
+name = "async-io"
+version = "2.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8"
+dependencies = [
+ "async-lock 3.4.0",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite 2.3.0",
+ "parking",
+ "polling 3.7.3",
+ "rustix 0.38.34",
+ "slab",
+ "tracing",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "async-lock"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
+dependencies = [
+ "event-listener 2.5.3",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
+dependencies = [
+ "event-listener 5.3.1",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-process"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88"
+dependencies = [
+ "async-io 1.13.0",
+ "async-lock 2.8.0",
+ "async-signal",
+ "blocking",
+ "cfg-if",
+ "event-listener 3.1.0",
+ "futures-lite 1.13.0",
+ "rustix 0.38.34",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "async-signal"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3"
+dependencies = [
+ "async-io 2.3.4",
+ "async-lock 3.4.0",
+ "atomic-waker",
+ "cfg-if",
+ "futures-core",
+ "futures-io",
+ "rustix 0.38.34",
+ "signal-hook-registry",
+ "slab",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "async-std"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
+dependencies = [
+ "async-channel 1.9.0",
+ "async-global-executor",
+ "async-io 1.13.0",
+ "async-lock 2.8.0",
+ "async-process",
+ "crossbeam-utils",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-lite 1.13.0",
+ "gloo-timers",
+ "kv-log-macro",
+ "log",
+ "memchr",
+ "once_cell",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+ "wasm-bindgen-futures",
+]
+
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi 0.1.19",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "bindgen"
+version = "0.64.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4"
+dependencies = [
+ "bitflags 1.3.2",
+ "cexpr",
+ "clang-sys",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "peeking_take_while",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn 1.0.109",
+ "which",
+]
+
+[[package]]
+name = "bitflags"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "block"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
+
+[[package]]
+name = "blocking"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
+dependencies = [
+ "async-channel 2.3.1",
+ "async-task",
+ "futures-io",
+ "futures-lite 2.3.0",
+ "piper",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "cc"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9e8aabfac534be767c909e0690571677d49f41bd8465ae876fe043d52ba5292"
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "chrono-humanize"
+version = "0.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb2ff48a655fe8d2dae9a39e66af7fd8ff32a879e8c4e27422c25596a8b5e90d"
+dependencies = [
+ "chrono",
+]
+
+[[package]]
+name = "chrono-tz"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2554a3155fec064362507487171dcc4edc3df60cb10f3a1fb10ed8094822b120"
+dependencies = [
+ "chrono",
+ "parse-zoneinfo",
+]
+
+[[package]]
+name = "clang-sys"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "clap"
+version = "2.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+dependencies = [
+ "ansi_term",
+ "atty",
+ "bitflags 1.3.2",
+ "strsim 0.8.0",
+ "textwrap",
+ "unicode-width",
+ "vec_map",
+ "yaml-rust 0.3.5",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim 0.11.1",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+
+[[package]]
+name = "clipboard"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25a904646c0340239dcf7c51677b33928bf24fdf424b79a57909c0109075b2e7"
+dependencies = [
+ "clipboard-win",
+ "objc",
+ "objc-foundation",
+ "objc_id",
+ "x11-clipboard",
+]
+
+[[package]]
+name = "clipboard-win"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3a093d6fed558e5fe24c3dfc85a68bb68f1c824f440d3ba5aca189e2998786b"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "cmake"
+version = "0.1.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "colorchoice"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "config"
+version = "0.0.0"
+dependencies = [
+ "glob",
+ "itertools 0.10.5",
+ "man_dmenu",
+ "prettytable-rs",
+ "termcolor",
+ "yaml-rust 0.4.5",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "csv"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
+dependencies = [
+ "csv-core",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "csv-core"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "dirs-next"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+dependencies = [
+ "cfg-if",
+ "dirs-sys-next",
+]
+
+[[package]]
+name = "dirs-sys-next"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
+[[package]]
+name = "dmenu-build"
+version = "0.0.0"
+dependencies = [
+ "async-std",
+ "clap 2.34.0",
+ "clipboard",
+ "fuzzy-matcher",
+ "ispell",
+ "itertools 0.9.0",
+ "lazy_static",
+ "libc",
+ "overrider",
+ "overrider_build",
+ "phf",
+ "pledge",
+ "proc_use",
+ "regex",
+ "rink-core",
+ "rustc_version_runtime",
+ "servo-fontconfig",
+ "termcolor",
+ "unicode-segmentation",
+ "x11",
+ "yaml-rust 0.3.5",
+]
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "encode_unicode"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
+
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "event-listener"
+version = "2.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+
+[[package]]
+name = "event-listener"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener"
+version = "5.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
+dependencies = [
+ "event-listener 5.3.1",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "expat-sys"
+version = "2.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa"
+dependencies = [
+ "cmake",
+ "pkg-config",
+]
+
+[[package]]
+name = "fastrand"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
+dependencies = [
+ "instant",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+
+[[package]]
+name = "freetype-sys"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a"
+dependencies = [
+ "cmake",
+ "libc",
+ "pkg-config",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+
+[[package]]
+name = "futures-io"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+
+[[package]]
+name = "futures-lite"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
+dependencies = [
+ "fastrand 1.9.0",
+ "futures-core",
+ "futures-io",
+ "memchr",
+ "parking",
+ "pin-project-lite",
+ "waker-fn",
+]
+
+[[package]]
+name = "futures-lite"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+dependencies = [
+ "fastrand 2.1.0",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "fuzzy-matcher"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94"
+dependencies = [
+ "thread_local",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "gloo-timers"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "headers"
+version = "0.1.0"
+dependencies = [
+ "bindgen",
+ "termcolor",
+]
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+
+[[package]]
+name = "home"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "io-lifetimes"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
+dependencies = [
+ "hermit-abi 0.3.9",
+ "libc",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "is-terminal"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
+dependencies = [
+ "hermit-abi 0.3.9",
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "ispell"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cbac553db0de22941d218bc20d2e121c960e6226f7a1b66ea195958db05f2da"
+
+[[package]]
+name = "itertools"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "js-sys"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "json"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3fb4510c0dbc38f7f43bdbe8b53defae0cd338b81ef416462a0ef69d600165c"
+
+[[package]]
+name = "kv-log-macro"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "libc"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "libloading"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+dependencies = [
+ "cfg-if",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+]
+
+[[package]]
+name = "linked-hash-map"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+dependencies = [
+ "value-bag",
+]
+
+[[package]]
+name = "malloc_buf"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "man_dmenu"
+version = "0.1.0"
+dependencies = [
+ "itertools 0.10.5",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b7a8e9be5e039e2ff869df49155f1c06bd01ade2117ec783e56ab0932b67a8f"
+dependencies = [
+ "num-bigint",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-complex"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-rational"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
+dependencies = [
+ "autocfg",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "objc"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
+dependencies = [
+ "malloc_buf",
+]
+
+[[package]]
+name = "objc-foundation"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
+dependencies = [
+ "block",
+ "objc",
+ "objc_id",
+]
+
+[[package]]
+name = "objc_id"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
+dependencies = [
+ "objc",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "overrider"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55b9fb8c67b6adf9fff65ad57571c42ccc80e8a9d2712e5427d00aa7fa293114"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "overrider_build"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d9709eba39b602b089deaf80b123e5c8ecfd071aab827a66c1a58412074fbcc"
+dependencies = [
+ "glob",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "parking"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+
+[[package]]
+name = "parse-zoneinfo"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24"
+dependencies = [
+ "regex",
+]
+
+[[package]]
+name = "peeking_take_while"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+
+[[package]]
+name = "phf"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+ "proc-macro-hack",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
+dependencies = [
+ "phf_shared",
+ "rand",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro-hack",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "piper"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
+dependencies = [
+ "atomic-waker",
+ "fastrand 2.1.0",
+ "futures-io",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+
+[[package]]
+name = "pledge"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "252599417b7d9a43b7fdc63dd790b0848666a8910b2ebe1a25118309c3c981e5"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "polling"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
+dependencies = [
+ "autocfg",
+ "bitflags 1.3.2",
+ "cfg-if",
+ "concurrent-queue",
+ "libc",
+ "log",
+ "pin-project-lite",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "polling"
+version = "3.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi 0.4.0",
+ "pin-project-lite",
+ "rustix 0.38.34",
+ "tracing",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "prettytable-rs"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a"
+dependencies = [
+ "csv",
+ "encode_unicode",
+ "is-terminal",
+ "lazy_static",
+ "term",
+ "unicode-width",
+]
+
+[[package]]
+name = "proc-macro-hack"
+version = "0.5.20+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "proc_use"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd16b1c456def2ad84b3574651f069541dea178ee688e882943cb21232a5cb01"
+dependencies = [
+ "glob",
+ "itertools 0.9.0",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom 0.1.16",
+ "libc",
+ "rand_chacha",
+ "rand_core",
+ "rand_hc",
+ "rand_pcg",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom 0.1.16",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "rand_pcg"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+dependencies = [
+ "getrandom 0.2.15",
+ "libredox",
+ "thiserror",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+
+[[package]]
+name = "rink-core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bc22139a03b530bf42c3e3bb673824823511cd842e0b5b5e5fa1f7b27e6864c"
+dependencies = [
+ "chrono",
+ "chrono-humanize",
+ "chrono-tz",
+ "json",
+ "num",
+ "serde",
+ "serde_derive",
+ "strsim 0.5.2",
+ "xml-rs",
+]
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc_version"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustc_version_runtime"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d31b7153270ebf48bf91c65ae5b0c00e749c4cfad505f66530ac74950249582f"
+dependencies = [
+ "rustc_version",
+ "semver",
+]
+
+[[package]]
+name = "rustix"
+version = "0.37.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
+dependencies = [
+ "bitflags 1.3.2",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys 0.3.8",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+dependencies = [
+ "bitflags 2.6.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.14",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "semver"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+dependencies = [
+ "semver-parser",
+]
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+
+[[package]]
+name = "serde"
+version = "1.0.205"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e33aedb1a7135da52b7c21791455563facbbcc43d0f0f66165b42c21b3dfb150"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.205"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "692d6f5ac90220161d6774db30c662202721e64aed9058d2c394f451261420c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+]
+
+[[package]]
+name = "servo-fontconfig"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c"
+dependencies = [
+ "libc",
+ "servo-fontconfig-sys",
+]
+
+[[package]]
+name = "servo-fontconfig-sys"
+version = "5.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388"
+dependencies = [
+ "expat-sys",
+ "freetype-sys",
+ "pkg-config",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "socket2"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "stest"
+version = "0.0.0"
+dependencies = [
+ "clap 4.5.15",
+]
+
+[[package]]
+name = "strsim"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67f84c44fbb2f91db7fef94554e6b2ac05909c9c0b0bc23bb98d3a1aebfe7f7c"
+
+[[package]]
+name = "strsim"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "term"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
+dependencies = [
+ "dirs-next",
+ "rustversion",
+ "winapi",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "value-bag"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101"
+
+[[package]]
+name = "vec_map"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+
+[[package]]
+name = "waker-fn"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
+
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+
+[[package]]
+name = "web-sys"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "which"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix 0.38.34",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "x11"
+version = "2.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e"
+dependencies = [
+ "libc",
+ "pkg-config",
+]
+
+[[package]]
+name = "x11-clipboard"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89bd49c06c9eb5d98e6ba6536cf64ac9f7ee3a009b2f53996d405b3944f6bcea"
+dependencies = [
+ "xcb",
+]
+
+[[package]]
+name = "xcb"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e917a3f24142e9ff8be2414e36c649d47d6cc2ba81f16201cdef96e533e02de"
+dependencies = [
+ "libc",
+ "log",
+]
+
+[[package]]
+name = "xml-rs"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ec6c39eaa68382c8e31e35239402c0a9489d4141a8ceb0c716099a0b515b562"
+dependencies = [
+ "bitflags 0.7.0",
+]
+
+[[package]]
+name = "yaml-rust"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992"
+
+[[package]]
+name = "yaml-rust"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
+dependencies = [
+ "linked-hash-map",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+]
diff --git a/pkgs/by-name/dm/dmenu-rs/package.nix b/pkgs/by-name/dm/dmenu-rs/package.nix
new file mode 100644
index 000000000000..d64f5a0cc8cc
--- /dev/null
+++ b/pkgs/by-name/dm/dmenu-rs/package.nix
@@ -0,0 +1,114 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+
+ # nativeBuildInputs
+ cargo,
+ m4,
+ pkg-config,
+ python3,
+ rustPlatform,
+
+ # buildInputs
+ expat,
+ fontconfig,
+ libXft,
+ libXinerama,
+ aspell,
+ xclip,
+ xdg-utils,
+
+ enablePlugins ? false,
+}:
+
+# The dmenu-rs package has extensive plugin support. However, only two
+# variants of the package are presented here: one with no plugins and one with
+# all of the plugins that have been checked into the upstream repository. This
+# is because the set of plugins is defined at compile time and the dmenu-rs
+# build uses this set to dynamically generate a corresponding Cargo.lock file.
+# To work around this dynamic generation in nixpkgs, each variant's Cargo.lock
+# file has been generated in advance and then checked in here. If you'd like
+# to further customize dmenu-rs, either disabling specific plugins or enabling
+# additional plugins from outside of the dmenu-rs repository, you'll have to
+# build it from the source.
+# See: https://github.com/Shizcow/dmenu-rs#plugins
+let
+ cargoLockFile = if enablePlugins then ./enablePlugins.Cargo.lock else ./Cargo.lock;
+in
+stdenv.mkDerivation rec {
+ pname = "dmenu-rs";
+ version = "5.5.4";
+
+ src = fetchFromGitHub {
+ owner = "Shizcow";
+ repo = "dmenu-rs";
+ rev = "refs/tags/${version}";
+ hash = "sha256-05Ia+GHeL8PzOwR7H+NEVhKJVMPhlIaQLwGfvwOAl0g=";
+ };
+
+ nativeBuildInputs = [
+ cargo
+ m4
+ pkg-config
+ python3
+ rustPlatform.bindgenHook
+ rustPlatform.cargoSetupHook
+ ];
+
+ buildInputs =
+ [
+ expat
+ fontconfig
+ libXft
+ libXinerama
+ ]
+ ++ lib.optionals enablePlugins [
+ aspell
+ xclip
+ xdg-utils
+ ];
+
+ # The dmenu-rs repository does not include a Cargo.lock because of its
+ # dynamic build and plugin support. Generating it with make and checking it
+ # in to nixpkgs here was the easiest way to supply it to rustPlatform.
+ # See: https://github.com/Shizcow/dmenu-rs/issues/34#issuecomment-757415584
+ cargoDeps = rustPlatform.importCargoLock {
+ lockFile = cargoLockFile;
+ };
+
+ # Copy the Cargo.lock stored here in nixpkgs into the build directory.
+ postPatch =
+ ''
+ cp ${cargoLockFile} src/Cargo.lock
+ ''
+ + lib.optionalString enablePlugins ''
+ chmod +w src/Cargo.lock
+ '';
+
+ # Include all plugins in the dmenu-rs repository under src/plugins.
+ # See https://github.com/Shizcow/dmenu-rs/tree/master/src/plugins
+ preBuild = lib.optionalString enablePlugins ''
+ sed -i -E "s/PLUGINS =/PLUGINS = $(find src/plugins/ -mindepth 1 -maxdepth 1 -type d -printf "%f\n" | tr "\n" " ")/" config.mk
+ '';
+
+ cargoRoot = "src";
+
+ installFlags = [ "PREFIX=$(out)" ];
+
+ # Running make test requires an X11 server. It also runs dmenu, which then
+ # hangs on user input. It was too hard to figure out how to run these tests
+ # deterministically. See the original PR for some discussion on this.
+ doCheck = false;
+
+ meta = {
+ description =
+ "Pixel perfect port of dmenu, rewritten in Rust with extensive plugin support"
+ + lib.optionalString enablePlugins ", with all upstream plugins enabled";
+ homepage = "https://github.com/Shizcow/dmenu-rs";
+ license = with lib.licenses; [ gpl3Only ];
+ maintainers = with lib.maintainers; [ benjaminedwardwebb ];
+ platforms = lib.platforms.linux;
+ broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64;
+ };
+}
diff --git a/pkgs/by-name/dm/dms/package.nix b/pkgs/by-name/dm/dms/package.nix
index 52150cf74172..eed1e01eb846 100644
--- a/pkgs/by-name/dm/dms/package.nix
+++ b/pkgs/by-name/dm/dms/package.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "dms";
- version = "1.6.0";
+ version = "1.7.1";
src = fetchFromGitHub {
owner = "anacrolix";
repo = "dms";
rev = "refs/tags/v${version}";
- hash = "sha256-QwRLNCXDu/dKh2o17AyASlVQPIEOX6e4kTINa2ZzZkU=";
+ hash = "sha256-dObY2MNrrQqn5i/y2LDlKvd9S04EArmsalIsfXsrth0=";
};
- vendorHash = "sha256-Z0DoVmL0zJ4l9hrO+zGp6FcExvhbiPu5+N3Mfyxi5DE=";
+ vendorHash = "sha256-f6Jl78ZPLD7Oq4Bq8MBQpHEKnBvpyTWZ9qHa1fGOlgA=";
meta = {
homepage = "https://github.com/anacrolix/dms";
diff --git a/pkgs/by-name/do/doctave/Cargo.lock b/pkgs/by-name/do/doctave/Cargo.lock
new file mode 100644
index 000000000000..f0c27d972e27
--- /dev/null
+++ b/pkgs/by-name/do/doctave/Cargo.lock
@@ -0,0 +1,1639 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "aho-corasick"
+version = "0.7.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "alphanumeric-sort"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0e75706f4ee4c69aaa277f73a7a6ad60222193938d4266b929aacd17ebb29b9"
+
+[[package]]
+name = "ammonia"
+version = "3.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e445c26125ff80316eaea16e812d717b147b82a68682bd4730f74d4845c8b35"
+dependencies = [
+ "html5ever",
+ "lazy_static",
+ "maplit",
+ "markup5ever_rcdom",
+ "matches",
+ "tendril",
+ "url 2.2.2",
+]
+
+[[package]]
+name = "ansi_term"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+dependencies = [
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "ascii"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14"
+
+[[package]]
+name = "atomic-option"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0db678acb667b525ac40a324fc5f7d3390e29239b31c7327bb8157f5b4fff593"
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+
+[[package]]
+name = "base64"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
+
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+
+[[package]]
+name = "block-buffer"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
+dependencies = [
+ "block-padding",
+ "byte-tools",
+ "byteorder",
+ "generic-array 0.12.3",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
+dependencies = [
+ "generic-array 0.14.4",
+]
+
+[[package]]
+name = "block-padding"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
+dependencies = [
+ "byte-tools",
+]
+
+[[package]]
+name = "bunt"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "219e88f5a1df3f5b8a471055ae5bf58d0cdb895ec212b6ef4a00a9a1495b9fb4"
+dependencies = [
+ "bunt-macros",
+ "termcolor",
+]
+
+[[package]]
+name = "bunt-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9b0d33584af687b4dfc0b9ceb1406635c4582ae126f2979f362bbe8ec11512e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "bus"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1e66e1779f5b1440f1a58220ba3b3ded4427175f0a9fb8d7066521f8b4e8f2b"
+dependencies = [
+ "atomic-option",
+ "crossbeam-channel",
+ "num_cpus",
+ "parking_lot_core 0.7.2",
+]
+
+[[package]]
+name = "byte-tools"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
+
+[[package]]
+name = "byteorder"
+version = "1.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
+
+[[package]]
+name = "bytes"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
+
+[[package]]
+name = "cfg-if"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "942f72db697d8767c22d46a598e01f2d3b475501ea43d0db4f16d90259182d0b"
+dependencies = [
+ "num-integer",
+ "num-traits",
+ "time",
+]
+
+[[package]]
+name = "chunked_transfer"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87"
+
+[[package]]
+name = "clap"
+version = "2.33.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+dependencies = [
+ "ansi_term",
+ "atty",
+ "bitflags",
+ "strsim 0.8.0",
+ "textwrap",
+ "unicode-width",
+ "vec_map",
+]
+
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "colorsys"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be475c891fad1522a7bfd1cb7204ba8e8fe48a93a0ad6992356aca07a4e0cbce"
+
+[[package]]
+name = "cpuid-bool"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
+dependencies = [
+ "crossbeam-utils",
+ "maybe-uninit",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "maybe-uninit",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
+dependencies = [
+ "autocfg",
+ "cfg-if 0.1.10",
+ "crossbeam-utils",
+ "lazy_static",
+ "maybe-uninit",
+ "memoffset",
+ "scopeguard",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
+dependencies = [
+ "autocfg",
+ "cfg-if 0.1.10",
+ "lazy_static",
+]
+
+[[package]]
+name = "digest"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
+dependencies = [
+ "generic-array 0.12.3",
+]
+
+[[package]]
+name = "digest"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
+dependencies = [
+ "generic-array 0.14.4",
+]
+
+[[package]]
+name = "doctave"
+version = "0.4.2"
+dependencies = [
+ "alphanumeric-sort",
+ "ascii",
+ "bunt",
+ "bus",
+ "clap",
+ "colorsys",
+ "crossbeam-channel",
+ "doctave-markdown",
+ "elasticlunr-rs",
+ "handlebars",
+ "http",
+ "include_dir",
+ "indoc",
+ "lazy_static",
+ "notify",
+ "rayon",
+ "scoped_threadpool",
+ "serde",
+ "serde_json",
+ "serde_yaml",
+ "tiny_http",
+ "tungstenite",
+ "walkdir",
+]
+
+[[package]]
+name = "doctave-markdown"
+version = "0.9.0"
+source = "git+https://github.com/Doctave/doctave-markdown?tag=0.9.0#82e2b99b09c95092e64629033b0ff6c2b110af47"
+dependencies = [
+ "ammonia",
+ "emojis",
+ "lazy_static",
+ "pulldown-cmark",
+ "regex",
+ "url 2.2.2",
+]
+
+[[package]]
+name = "dtoa"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b"
+
+[[package]]
+name = "either"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+
+[[package]]
+name = "elasticlunr-rs"
+version = "2.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35622eb004c8f0c5e7e2032815f3314a93df0db30a1ce5c94e62c1ecc81e22b9"
+dependencies = [
+ "lazy_static",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "strum",
+ "strum_macros",
+]
+
+[[package]]
+name = "emojis"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbf85aeacc72b7b5d9e78b39399562a2846566936e41a6f59f9d96b3fa7c4f96"
+dependencies = [
+ "strsim 0.10.0",
+]
+
+[[package]]
+name = "fake-simd"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
+
+[[package]]
+name = "filetime"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ed85775dcc68644b5c950ac06a2b23768d3bc9390464151aaf27136998dcf9e"
+dependencies = [
+ "cfg-if 0.1.10",
+ "libc",
+ "redox_syscall 0.1.57",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
+dependencies = [
+ "matches",
+ "percent-encoding 2.1.0",
+]
+
+[[package]]
+name = "fsevent"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6"
+dependencies = [
+ "bitflags",
+ "fsevent-sys",
+]
+
+[[package]]
+name = "fsevent-sys"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "fuchsia-zircon"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
+dependencies = [
+ "bitflags",
+ "fuchsia-zircon-sys",
+]
+
+[[package]]
+name = "fuchsia-zircon-sys"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
+
+[[package]]
+name = "futf"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b"
+dependencies = [
+ "mac",
+ "new_debug_unreachable",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
+dependencies = [
+ "typenum",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
+dependencies = [
+ "cfg-if 0.1.10",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "handlebars"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5deefd4816fb852b1ff3cb48f6c41da67be2d0e1d20b26a7a3b076da11f064b1"
+dependencies = [
+ "log",
+ "pest",
+ "pest_derive",
+ "quick-error",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "heck"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "html5ever"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aafcf38a1a36118242d29b92e1b08ef84e67e4a5ed06e0a80be20e6a32bfed6b"
+dependencies = [
+ "log",
+ "mac",
+ "markup5ever",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "http"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "httparse"
+version = "1.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
+
+[[package]]
+name = "idna"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
+dependencies = [
+ "matches",
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "idna"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
+dependencies = [
+ "matches",
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "include_dir"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "482a2e29200b7eed25d7fdbd14423326760b7f6658d21a4cf12d55a50713c69f"
+dependencies = [
+ "include_dir_macros",
+]
+
+[[package]]
+name = "include_dir_macros"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e074c19deab2501407c91ba1860fa3d6820bfde307db6d8cb851b55a10be89b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "indoc"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "644defcefee68d7805653a682e99a2e2a5014a1fc3cc9be7059a215844eeea6f"
+dependencies = [
+ "unindent",
+]
+
+[[package]]
+name = "inotify"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f"
+dependencies = [
+ "bitflags",
+ "inotify-sys",
+ "libc",
+]
+
+[[package]]
+name = "inotify-sys"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "input_buffer"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754"
+dependencies = [
+ "bytes",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
+[[package]]
+name = "iovec"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "itoa"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
+
+[[package]]
+name = "kernel32-sys"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
+dependencies = [
+ "winapi 0.2.8",
+ "winapi-build",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "libc"
+version = "0.2.112"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
+
+[[package]]
+name = "linked-hash-map"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
+
+[[package]]
+name = "lock_api"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"
+dependencies = [
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+dependencies = [
+ "cfg-if 0.1.10",
+]
+
+[[package]]
+name = "mac"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
+
+[[package]]
+name = "maplit"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
+
+[[package]]
+name = "markup5ever"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd"
+dependencies = [
+ "log",
+ "phf",
+ "phf_codegen",
+ "string_cache",
+ "string_cache_codegen",
+ "tendril",
+]
+
+[[package]]
+name = "markup5ever_rcdom"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f015da43bcd8d4f144559a3423f4591d69b8ce0652c905374da7205df336ae2b"
+dependencies = [
+ "html5ever",
+ "markup5ever",
+ "tendril",
+ "xml5ever",
+]
+
+[[package]]
+name = "matches"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
+
+[[package]]
+name = "maybe-uninit"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
+
+[[package]]
+name = "memchr"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
+
+[[package]]
+name = "memoffset"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "mio"
+version = "0.6.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"
+dependencies = [
+ "cfg-if 0.1.10",
+ "fuchsia-zircon",
+ "fuchsia-zircon-sys",
+ "iovec",
+ "kernel32-sys",
+ "libc",
+ "log",
+ "miow",
+ "net2",
+ "slab",
+ "winapi 0.2.8",
+]
+
+[[package]]
+name = "mio-extras"
+version = "2.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
+dependencies = [
+ "lazycell",
+ "log",
+ "mio",
+ "slab",
+]
+
+[[package]]
+name = "miow"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
+dependencies = [
+ "kernel32-sys",
+ "net2",
+ "winapi 0.2.8",
+ "ws2_32-sys",
+]
+
+[[package]]
+name = "net2"
+version = "0.2.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ebc3ec692ed7c9a255596c67808dee269f64655d8baf7b4f0638e51ba1d6853"
+dependencies = [
+ "cfg-if 0.1.10",
+ "libc",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
+
+[[package]]
+name = "notify"
+version = "4.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80ae4a7688d1fab81c5bf19c64fc8db920be8d519ce6336ed4e7efe024724dbd"
+dependencies = [
+ "bitflags",
+ "filetime",
+ "fsevent",
+ "fsevent-sys",
+ "inotify",
+ "libc",
+ "mio",
+ "mio-extras",
+ "walkdir",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "opaque-debug"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
+
+[[package]]
+name = "opaque-debug"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.5",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
+dependencies = [
+ "cfg-if 0.1.10",
+ "cloudabi",
+ "libc",
+ "redox_syscall 0.1.57",
+ "smallvec",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
+dependencies = [
+ "cfg-if 1.0.0",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.10",
+ "smallvec",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
+
+[[package]]
+name = "percent-encoding"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
+
+[[package]]
+name = "pest"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
+dependencies = [
+ "ucd-trie",
+]
+
+[[package]]
+name = "pest_derive"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
+dependencies = [
+ "pest",
+ "pest_generator",
+]
+
+[[package]]
+name = "pest_generator"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
+dependencies = [
+ "pest",
+ "pest_meta",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pest_meta"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
+dependencies = [
+ "maplit",
+ "pest",
+ "sha-1 0.8.2",
+]
+
+[[package]]
+name = "phf"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
+dependencies = [
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
+dependencies = [
+ "phf_shared",
+ "rand",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20"
+
+[[package]]
+name = "precomputed-hash"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "175c513d55719db99da20232b06cda8bab6b83ec2d04e3283edf0213c37c1a29"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "pulldown-cmark"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8"
+dependencies = [
+ "bitflags",
+ "memchr",
+ "unicase",
+]
+
+[[package]]
+name = "quick-error"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ac73b1112776fc109b2e61909bc46c7e1bf0d7f690ffb1676553acce16d5cda"
+
+[[package]]
+name = "quote"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom",
+ "libc",
+ "rand_chacha",
+ "rand_core",
+ "rand_hc",
+ "rand_pcg",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "rand_pcg"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "rayon"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfd016f0c045ad38b5251be2c9c0ab806917f82da4d36b2a327e5166adad9270"
+dependencies = [
+ "autocfg",
+ "crossbeam-deque",
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-utils",
+ "lazy_static",
+ "num_cpus",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "regex"
+version = "1.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+ "thread_local",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
+
+[[package]]
+name = "ryu"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scoped_threadpool"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
+
+[[package]]
+name = "scopeguard"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
+[[package]]
+name = "serde"
+version = "1.0.115"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.115"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_yaml"
+version = "0.8.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5"
+dependencies = [
+ "dtoa",
+ "linked-hash-map",
+ "serde",
+ "yaml-rust",
+]
+
+[[package]]
+name = "sha-1"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
+dependencies = [
+ "block-buffer 0.7.3",
+ "digest 0.8.1",
+ "fake-simd",
+ "opaque-debug 0.2.3",
+]
+
+[[package]]
+name = "sha-1"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "170a36ea86c864a3f16dd2687712dd6646f7019f301e57537c7f4dc9f5916770"
+dependencies = [
+ "block-buffer 0.9.0",
+ "cfg-if 0.1.10",
+ "cpuid-bool",
+ "digest 0.9.0",
+ "opaque-debug 0.3.0",
+]
+
+[[package]]
+name = "siphasher"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b"
+
+[[package]]
+name = "slab"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+
+[[package]]
+name = "smallvec"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
+
+[[package]]
+name = "string_cache"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "923f0f39b6267d37d23ce71ae7235602134b250ace715dd2c90421998ddac0c6"
+dependencies = [
+ "lazy_static",
+ "new_debug_unreachable",
+ "parking_lot",
+ "phf_shared",
+ "precomputed-hash",
+ "serde",
+]
+
+[[package]]
+name = "string_cache_codegen"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "strsim"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "strum"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b"
+
+[[package]]
+name = "strum_macros"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "tendril"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9ef557cb397a4f0a5a3a628f06515f78563f2209e64d47055d9dc6052bf5e33"
+dependencies = [
+ "futf",
+ "mac",
+ "utf-8",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "time"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+dependencies = [
+ "libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "tiny_http"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951"
+dependencies = [
+ "ascii",
+ "chrono",
+ "chunked_transfer",
+ "log",
+ "url 1.7.2",
+]
+
+[[package]]
+name = "tinyvec"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117"
+
+[[package]]
+name = "tungstenite"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23"
+dependencies = [
+ "base64",
+ "byteorder",
+ "bytes",
+ "http",
+ "httparse",
+ "input_buffer",
+ "log",
+ "rand",
+ "sha-1 0.9.1",
+ "url 2.2.2",
+ "utf-8",
+]
+
+[[package]]
+name = "typenum"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
+
+[[package]]
+name = "ucd-trie"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
+
+[[package]]
+name = "unicase"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
+dependencies = [
+ "matches",
+]
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
+
+[[package]]
+name = "unindent"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af41d708427f8fd0e915dcebb2cae0f0e6acb2a939b2d399c265c39a38a18942"
+
+[[package]]
+name = "url"
+version = "1.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
+dependencies = [
+ "idna 0.1.5",
+ "matches",
+ "percent-encoding 1.0.1",
+]
+
+[[package]]
+name = "url"
+version = "2.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
+dependencies = [
+ "form_urlencoded",
+ "idna 0.2.0",
+ "matches",
+ "percent-encoding 2.1.0",
+]
+
+[[package]]
+name = "utf-8"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7"
+
+[[package]]
+name = "vec_map"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+
+[[package]]
+name = "version_check"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
+
+[[package]]
+name = "walkdir"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
+dependencies = [
+ "same-file",
+ "winapi 0.3.9",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
+[[package]]
+name = "winapi"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-build"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "ws2_32-sys"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
+dependencies = [
+ "winapi 0.2.8",
+ "winapi-build",
+]
+
+[[package]]
+name = "xml5ever"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9234163818fd8e2418fcde330655e757900d4236acd8cc70fef345ef91f6d865"
+dependencies = [
+ "log",
+ "mac",
+ "markup5ever",
+ "time",
+]
+
+[[package]]
+name = "yaml-rust"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d"
+dependencies = [
+ "linked-hash-map",
+]
diff --git a/pkgs/by-name/do/doctave/package.nix b/pkgs/by-name/do/doctave/package.nix
new file mode 100644
index 000000000000..854a56de0709
--- /dev/null
+++ b/pkgs/by-name/do/doctave/package.nix
@@ -0,0 +1,43 @@
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+ stdenv,
+ darwin,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "doctave";
+ version = "0.4.2";
+
+ src = fetchFromGitHub {
+ owner = "doctave";
+ repo = "doctave";
+ rev = version;
+ hash = "sha256-8mGSFQozyLoGua9mwyqfDcYNMtbeWp9Phb0vaje+AJ0=";
+ };
+
+ postPatch = ''
+ ln -sf ${./Cargo.lock} Cargo.lock
+ '';
+
+ cargoLock = {
+ lockFile = ./Cargo.lock;
+ outputHashes = {
+ "doctave-markdown-0.9.0" = "sha256-DDeb91DgLx7vOYHwoDy6+/532q/3/myJUZDqjq7ejJ0=";
+ };
+ };
+
+ buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+ darwin.apple_sdk.frameworks.CoreServices
+ ];
+
+ meta = {
+ description = "Batteries-included developer documentation site generator";
+ homepage = "https://github.com/doctave/doctave";
+ changelog = "https://github.com/doctave/doctave/blob/${version}/CHANGELOG.md";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ figsoda ];
+ mainProgram = "doctave";
+ };
+}
diff --git a/pkgs/by-name/do/dopamine/package.nix b/pkgs/by-name/do/dopamine/package.nix
index 10a45cbb2b42..260f00b262e7 100644
--- a/pkgs/by-name/do/dopamine/package.nix
+++ b/pkgs/by-name/do/dopamine/package.nix
@@ -6,11 +6,11 @@
}:
appimageTools.wrapType2 rec {
pname = "dopamine";
- version = "3.0.0-preview.34";
+ version = "3.0.0-preview.35";
src = fetchurl {
url = "https://github.com/digimezzo/dopamine/releases/download/v${version}/Dopamine-${version}.AppImage";
- hash = "sha256-K4dDYYzo2oMAZvlb25cQuh1G187efSyJfAA6jdCKaT0=";
+ hash = "sha256-7cwT0gyh8q185zpGQLsBDpDSAA0z+I1pLVTBKuyYH+0=";
};
extraInstallCommands =
diff --git a/pkgs/by-name/do/dotnet-repl/package.nix b/pkgs/by-name/do/dotnet-repl/package.nix
new file mode 100644
index 000000000000..be1790159839
--- /dev/null
+++ b/pkgs/by-name/do/dotnet-repl/package.nix
@@ -0,0 +1,23 @@
+{
+ lib,
+ buildDotnetGlobalTool,
+ dotnetCorePackages,
+}:
+
+buildDotnetGlobalTool {
+ pname = "dotnet-repl";
+ version = "0.1.216";
+
+ dotnet-sdk = dotnetCorePackages.sdk_8_0;
+ dotnet-runtime = dotnetCorePackages.runtime_8_0;
+
+ nugetHash = "sha256-JHatCW+hl2792S+HYeEbbYbCIS+N4DmOctqXB/56/HU=";
+
+ meta = {
+ description = "A polyglot REPL built on .NET Interactive";
+ homepage = "https://github.com/jonsequitur/dotnet-repl";
+ license = lib.licenses.mit;
+ mainProgram = "dotnet-repl";
+ maintainers = with lib.maintainers; [ tomasajt ];
+ };
+}
diff --git a/pkgs/by-name/dr/drone-scp/package.nix b/pkgs/by-name/dr/drone-scp/package.nix
index 21ce45013e4a..976d5f6f124b 100644
--- a/pkgs/by-name/dr/drone-scp/package.nix
+++ b/pkgs/by-name/dr/drone-scp/package.nix
@@ -4,16 +4,16 @@
}:
buildGoModule rec {
pname = "drone-scp";
- version = "1.6.14";
+ version = "1.7.0";
src = fetchFromGitHub {
owner = "appleboy";
repo = "drone-scp";
rev = "v${version}";
- hash = "sha256-RxpDlQ6lYT6XH5zrYZaRO5YsB++7Ujr7dvgsTtXIBfc=";
+ hash = "sha256-cVgKWdhmCdjEHGazZ1FMAOJMVyU5pl8aIgwFMhxlhzg=";
};
- vendorHash = "sha256-0/RGPvafOLT/O0l9ENoiHLmtOaP3DpjmXjmotuxF944=";
+ vendorHash = "sha256-2FEHklEa6TIB3jhmxR2yosPbtqMJcxeIDDnT2X2Xm+U=";
# Needs a specific user...
doCheck = false;
diff --git a/pkgs/by-name/dr/dry/package.nix b/pkgs/by-name/dr/dry/package.nix
new file mode 100644
index 000000000000..d92189012dc1
--- /dev/null
+++ b/pkgs/by-name/dr/dry/package.nix
@@ -0,0 +1,29 @@
+{
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+}:
+
+buildGoModule rec {
+ pname = "dry";
+ version = "0.11.2";
+
+ src = fetchFromGitHub {
+ owner = "moncho";
+ repo = "dry";
+ rev = "v${version}";
+ hash = "sha256-JGtPX6BrB3q2EQyF6x2A5Wsn5DudOSVt3IxBAjjwlC8=";
+ };
+
+ proxyVendor = true;
+ vendorHash = "sha256-AduDbBpCoW7GmYrBPpL7wyLvwoez81qP/+mllgoHInY=";
+
+ meta = {
+ description = "Terminal application to manage Docker and Docker Swarm";
+ homepage = "https://moncho.github.io/dry/";
+ changelog = "https://github.com/moncho/dry/releases/tag/v${version}";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.dump_stack ];
+ mainProgram = "dry";
+ };
+}
diff --git a/pkgs/by-name/ds/dsda-doom/package.nix b/pkgs/by-name/ds/dsda-doom/package.nix
index a4f7384637fe..1adb934969a2 100644
--- a/pkgs/by-name/ds/dsda-doom/package.nix
+++ b/pkgs/by-name/ds/dsda-doom/package.nix
@@ -14,17 +14,18 @@
libGLU,
libzip,
alsa-lib,
+ nix-update-script,
}:
stdenv.mkDerivation rec {
pname = "dsda-doom";
- version = "0.28.1";
+ version = "0.28.2";
src = fetchFromGitHub {
owner = "kraflab";
repo = "dsda-doom";
rev = "v${version}";
- hash = "sha256-X2v9eKiIYX4Zi3C1hbUoW4mceRVa6sxpBsP4Npyo4hM=";
+ hash = "sha256-TuDiClIq8GLY/3qGildlPpwUUHmpFNATRz5CNTLpfeM=";
};
sourceRoot = "${src.name}/prboom2";
@@ -45,8 +46,11 @@ stdenv.mkDerivation rec {
SDL2_mixer
];
+ passthru.updateScript = nix-update-script { };
+
meta = {
homepage = "https://github.com/kraflab/dsda-doom";
+ changelog = "https://github.com/kraflab/dsda-doom/releases/tag/v${version}";
description = "Advanced Doom source port with a focus on speedrunning, successor of PrBoom+";
mainProgram = "dsda-doom";
license = lib.licenses.gpl2Plus;
diff --git a/pkgs/by-name/du/duckstation-bin/package.nix b/pkgs/by-name/du/duckstation-bin/package.nix
new file mode 100644
index 000000000000..2deddb86cbe0
--- /dev/null
+++ b/pkgs/by-name/du/duckstation-bin/package.nix
@@ -0,0 +1,45 @@
+{
+ lib,
+ stdenvNoCC,
+ fetchurl,
+ unzip,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+ pname = "duckstation-bin";
+ version = "0.1-7294";
+
+ src = fetchurl {
+ url = "https://github.com/stenzek/duckstation/releases/download/v${finalAttrs.version}/duckstation-mac-release.zip";
+ hash = "sha256-33aipZjYJOquQBbe8Ve9KRfLGW29v9xoztUsaY8LAjw=";
+ };
+
+ nativeBuildInputs = [ unzip ];
+
+ dontPatch = true;
+ dontConfigure = true;
+ dontBuild = true;
+
+ sourceRoot = ".";
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/Applications
+ cp -r DuckStation.app $out/Applications/DuckStation.app
+ runHook postInstall
+ '';
+
+ passthru = {
+ updateScript = ./update.sh;
+ };
+
+ meta = {
+ homepage = "https://github.com/stenzek/duckstation";
+ description = "Fast PlayStation 1 emulator for x86-64/AArch32/AArch64";
+ changelog = "https://github.com/stenzek/duckstation/releases/tag/v${finalAttrs.version}";
+ license = lib.licenses.gpl3Only;
+ maintainers = with lib.maintainers; [ matteopacini ];
+ platforms = lib.platforms.darwin;
+ sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+ };
+})
diff --git a/pkgs/by-name/du/duckstation-bin/update.sh b/pkgs/by-name/du/duckstation-bin/update.sh
new file mode 100755
index 000000000000..50d6017f7ccc
--- /dev/null
+++ b/pkgs/by-name/du/duckstation-bin/update.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq gnused
+
+set -euo pipefail
+
+cd "$(dirname "$0")" || exit 1
+
+# Grab latest version, ignoring "latest" and "preview" tags
+LATEST_VER="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/stenzek/duckstation/releases" | jq -r '.[].tag_name' | grep '^v' | head -n 1 | sed 's/^v//')"
+CURRENT_VER="$(grep -oP 'version = "\K[^"]+' package.nix)"
+
+if [[ "$LATEST_VER" == "$CURRENT_VER" ]]; then
+ echo "duckstation-bin is up-to-date"
+ exit 0
+fi
+
+HASH="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/stenzek/duckstation/releases/download/v${LATEST_VER}/duckstation-mac-release.zip")")"
+
+sed -i "s#hash = \".*\"#hash = \"$HASH\"#g" package.nix
+sed -i "s#version = \".*\";#version = \"$LATEST_VER\";#g" package.nix
diff --git a/pkgs/by-name/dw/dwlb/package.nix b/pkgs/by-name/dw/dwlb/package.nix
index c01e1f5dad41..1c3354d54f02 100644
--- a/pkgs/by-name/dw/dwlb/package.nix
+++ b/pkgs/by-name/dw/dwlb/package.nix
@@ -3,12 +3,17 @@
lib,
fetchFromGitHub,
pkg-config,
+ wayland,
wayland-scanner,
wayland-protocols,
unstableGitUpdater,
pixman,
fcft,
- wayland,
+ writeText,
+ # Boolean flags
+ withCustomConfigH ? (configH != null),
+ # Configurable options
+ configH ? null,
}:
stdenv.mkDerivation {
@@ -26,10 +31,6 @@ stdenv.mkDerivation {
pkg-config
];
- env = {
- PREFIX = placeholder "out";
- };
-
buildInputs = [
wayland-scanner
wayland-protocols
@@ -38,6 +39,26 @@ stdenv.mkDerivation {
wayland
];
+ # Allow alternative config.def.h usage. Taken from dwl.nix.
+ postPatch =
+ let
+ configFile =
+ if lib.isDerivation configH || builtins.isPath configH then
+ configH
+ else
+ writeText "config.h" configH;
+ in
+ lib.optionalString withCustomConfigH "cp ${configFile} config.h";
+
+ env = {
+ PREFIX = placeholder "out";
+ };
+
+ outputs = [
+ "out"
+ "man"
+ ];
+
passthru.updateScript = unstableGitUpdater { };
meta = {
@@ -45,7 +66,10 @@ stdenv.mkDerivation {
homepage = "https://github.com/kolunmi/dwlb";
license = lib.licenses.gpl3Plus;
mainProgram = "dwlb";
- maintainers = with lib.maintainers; [ bot-wxt1221 ];
+ maintainers = with lib.maintainers; [
+ bot-wxt1221
+ lonyelon
+ ];
platforms = wayland.meta.platforms;
};
}
diff --git a/pkgs/by-name/ea/earthlyls/package.nix b/pkgs/by-name/ea/earthlyls/package.nix
new file mode 100644
index 000000000000..07bb178a341e
--- /dev/null
+++ b/pkgs/by-name/ea/earthlyls/package.nix
@@ -0,0 +1,38 @@
+{
+ lib,
+ fetchFromGitHub,
+ rustPlatform,
+
+ earthlyls,
+ nix-update-script,
+ testers,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "earthlyls";
+ version = "0.5.3";
+
+ src = fetchFromGitHub {
+ owner = "glehmann";
+ repo = "earthlyls";
+ rev = version;
+ hash = "sha256-wn+6Aa4xTC5o4S+N7snB/vlyw0i23XkmaXUmrhfXuaA=";
+ };
+
+ cargoHash = "sha256-eKBNZiFvIBuNPqDzMOa6J0UR4CIgi9OUowRaFSgi7Fg=";
+
+ passthru = {
+ updateScript = nix-update-script { };
+ tests.version = testers.testVersion { package = earthlyls; };
+ };
+
+ meta = {
+ description = "Earthly language server";
+ homepage = "https://github.com/glehmann/earthlyls";
+ changelog = "https://github.com/glehmann/earthlyls/releases/tag/${version}";
+ license = lib.licenses.mit;
+ mainProgram = "earthlyls";
+ maintainers = with lib.maintainers; [ paveloom ];
+ platforms = lib.platforms.linux ++ lib.platforms.darwin;
+ };
+}
diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix
index 25150c2e4310..c2a10feb55ac 100644
--- a/pkgs/by-name/ec/ecapture/package.nix
+++ b/pkgs/by-name/ec/ecapture/package.nix
@@ -16,17 +16,18 @@
mariadb,
openssl,
bash,
+ nix-update-script,
}:
buildGoModule rec {
pname = "ecapture";
- version = "0.8.7";
+ version = "0.8.8";
src = fetchFromGitHub {
owner = "gojue";
repo = "ecapture";
rev = "refs/tags/v${version}";
- hash = "sha256-tkWbX/RGx+SbJn+vqPTgyStBwdhldd5hGuRj8wTwY9M=";
+ hash = "sha256-pw/qlYVw1ofYDrTWTQVdx/N9U2JjkB05c7IUXURd4B8=";
fetchSubmodules = true;
};
@@ -103,6 +104,8 @@ buildGoModule rec {
vendorHash = "sha256-j5AXZqup0nPUlGWvb4PCLKJFoQx/c4I3PxZB99TTTWA=";
+ passthru.updateScript = nix-update-script { };
+
meta = {
description = "Capture SSL/TLS text content without CA certificate Using eBPF";
changelog = "https://github.com/gojue/ecapture/releases/tag/v${version}";
diff --git a/pkgs/by-name/ei/eigenlayer/package.nix b/pkgs/by-name/ei/eigenlayer/package.nix
index 7f7a2e1bada3..1af3e0be6bdf 100644
--- a/pkgs/by-name/ei/eigenlayer/package.nix
+++ b/pkgs/by-name/ei/eigenlayer/package.nix
@@ -6,13 +6,13 @@
}:
buildGoModule rec {
pname = "eigenlayer";
- version = "0.10.6";
+ version = "0.10.8";
src = fetchFromGitHub {
owner = "Layr-Labs";
repo = "eigenlayer-cli";
rev = "v${version}";
- hash = "sha256-FvmS9rWmf6bzY5QjVS3otylHYPyQ7KqXVJ0m28/zEi8=";
+ hash = "sha256-/8fLIdD14k8KgUdlfEHU+xSovFj6f0FfaweZKegihyQ=";
};
vendorHash = "sha256-7KC99PqAPfGnm7yA4nfAlC7V4NhCEYDyPxY7CdOdwno=";
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/by-name/ej/ejabberd/package.nix
similarity index 67%
rename from pkgs/servers/xmpp/ejabberd/default.nix
rename to pkgs/by-name/ej/ejabberd/package.nix
index d6dab1fef44b..cee3ef9d13fc 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/by-name/ej/ejabberd/package.nix
@@ -1,27 +1,55 @@
-{ stdenv, makeWrapper, lib, fetchurl, libpng, libjpeg, libwebp
-, erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, util-linux, procps, gd
-, autoreconfHook
-, gawk
-, rebar3WithPlugins
-, fetchFromGitHub
-, fetchgit
-, fetchHex
-, beamPackages
-, nixosTests
-, withMysql ? false
-, withPgsql ? false
-, withSqlite ? false, sqlite
-, withPam ? false, pam
-, withZlib ? true, zlib
-, withSip ? false
-, withLua ? false
-, withTools ? false
-, withRedis ? false
-, withImagemagick ? false, imagemagick
+{
+ stdenv,
+ makeWrapper,
+ lib,
+ libpng,
+ libjpeg,
+ libwebp,
+ erlang,
+ openssl,
+ expat,
+ libyaml,
+ bash,
+ gnused,
+ gnugrep,
+ coreutils,
+ util-linux,
+ procps,
+ gd,
+ autoreconfHook,
+ gawk,
+ rebar3WithPlugins,
+ fetchFromGitHub,
+ fetchgit,
+ fetchHex,
+ beamPackages,
+ nixosTests,
+ withMysql ? false,
+ withPgsql ? false,
+ withSqlite ? false,
+ sqlite,
+ withPam ? false,
+ pam,
+ withZlib ? true,
+ zlib,
+ withSip ? false,
+ withLua ? false,
+ withTools ? false,
+ withRedis ? false,
+ withImagemagick ? false,
+ imagemagick,
}:
let
- ctlpath = lib.makeBinPath [ bash gnused gnugrep gawk coreutils util-linux procps ];
+ ctlpath = lib.makeBinPath [
+ bash
+ gnused
+ gnugrep
+ gawk
+ coreutils
+ util-linux
+ procps
+ ];
provider_asn1 = beamPackages.buildRebar3 {
name = "provider_asn1";
@@ -44,7 +72,8 @@ let
beamDeps = [ ];
};
- allBeamDeps = import ./rebar-deps.nix { # TODO(@chuangzhu) add updateScript
+ allBeamDeps = import ./rebar-deps.nix {
+ # TODO(@chuangzhu) add updateScript
inherit fetchHex fetchgit fetchFromGitHub;
builder = lib.makeOverridable beamPackages.buildRebar3;
@@ -55,7 +84,12 @@ let
stringprep = prev.stringprep.override { buildPlugins = [ beamPackages.pc ]; };
p1_acme = prev.p1_acme.override { buildPlugins = [ beamPackages.pc ]; };
eimp = prev.eimp.override {
- buildInputs = [ gd libwebp libpng libjpeg ];
+ buildInputs = [
+ gd
+ libwebp
+ libpng
+ libjpeg
+ ];
buildPlugins = [ beamPackages.pc ];
};
fast_tls = prev.fast_tls.override {
@@ -71,7 +105,10 @@ let
buildPlugins = [ beamPackages.pc ];
};
xmpp = prev.xmpp.override {
- buildPlugins = [ beamPackages.pc provider_asn1 ];
+ buildPlugins = [
+ beamPackages.pc
+ provider_asn1
+ ];
};
# Optional deps
sqlite3 = prev.sqlite3.override {
@@ -91,19 +128,35 @@ let
};
};
- beamDeps = builtins.removeAttrs allBeamDeps [ "sqlite3" "p1_pgsql" "p1_mysql" "luerl" "esip" "eredis" "epam" "ezlib" ];
+ beamDeps = builtins.removeAttrs allBeamDeps [
+ "sqlite3"
+ "p1_pgsql"
+ "p1_mysql"
+ "luerl"
+ "esip"
+ "eredis"
+ "epam"
+ "ezlib"
+ ];
-in stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation (finalAttrs:{
pname = "ejabberd";
version = "24.07";
nativeBuildInputs = [
makeWrapper
autoreconfHook
- (rebar3WithPlugins { plugins = [ provider_asn1 rebar3_hex ]; })
+ (rebar3WithPlugins {
+ plugins = [
+ provider_asn1
+ rebar3_hex
+ ];
+ })
];
- buildInputs = [ erlang ]
+ buildInputs =
+ [ erlang ]
++ builtins.attrValues beamDeps
++ lib.optional withMysql allBeamDeps.p1_mysql
++ lib.optional withPgsql allBeamDeps.p1_pgsql
@@ -112,13 +165,13 @@ in stdenv.mkDerivation rec {
++ lib.optional withZlib allBeamDeps.ezlib
++ lib.optional withSip allBeamDeps.esip
++ lib.optional withLua allBeamDeps.luerl
- ++ lib.optional withRedis allBeamDeps.eredis
- ;
+ ++ lib.optional withRedis allBeamDeps.eredis;
- src = fetchurl {
- url = "https://www.process-one.net/downloads/downloads-action.php?file=/${version}/ejabberd-${version}.tar.gz";
- hash = "sha256-wPt0asuoGl20Hel8A5aMH2gaE7G2waiVtxguM4IMGNk=";
- # remember to update rebar-deps.nix
+ src = fetchFromGitHub {
+ owner = "processone";
+ repo = "ejabberd";
+ rev = "refs/tags/${finalAttrs.version}";
+ hash = "sha256-4wEQBumWrHqN2uNrDxAJhgv2ok7pgQlAEPpL96ZOsTQ=";
};
passthru.tests = {
@@ -153,15 +206,21 @@ in stdenv.mkDerivation rec {
-e '2iexport PATH=${ctlpath}:$PATH' \
-e "s,\(^ *ERL_LIBS=.*\),\1:$ERL_LIBS," \
$out/sbin/ejabberdctl
- ${lib.optionalString withImagemagick ''wrapProgram $out/lib/ejabberd-*/priv/bin/captcha.sh --prefix PATH : "${lib.makeBinPath [ imagemagick ]}"''}
+ ${lib.optionalString withImagemagick ''wrapProgram $out/lib/ejabberd-*/priv/bin/captcha.sh --prefix PATH : "${
+ lib.makeBinPath [ imagemagick ]
+ }"''}
'';
- meta = with lib; {
+ meta = {
description = "Open-source XMPP application server written in Erlang";
mainProgram = "ejabberdctl";
- license = licenses.gpl2Plus;
+ license = lib.licenses.gpl2Plus;
homepage = "https://www.ejabberd.im";
- platforms = platforms.linux;
- maintainers = with maintainers; [ sander abbradar chuangzhu ];
+ platforms = lib.platforms.linux;
+ maintainers = with lib.maintainers; [
+ sander
+ abbradar
+ chuangzhu
+ ];
};
-}
+})
diff --git a/pkgs/servers/xmpp/ejabberd/rebar-deps.nix b/pkgs/by-name/ej/ejabberd/rebar-deps.nix
similarity index 93%
rename from pkgs/servers/xmpp/ejabberd/rebar-deps.nix
rename to pkgs/by-name/ej/ejabberd/rebar-deps.nix
index db5899e27115..423dd5592639 100644
--- a/pkgs/servers/xmpp/ejabberd/rebar-deps.nix
+++ b/pkgs/by-name/ej/ejabberd/rebar-deps.nix
@@ -1,6 +1,14 @@
# Generated by rebar3_nix
-let fetchOnly = { src, ... }: src;
-in { builder ? fetchOnly, fetchHex, fetchgit, fetchFromGitHub, overrides ? (x: y: { }) }:
+let
+ fetchOnly = { src, ... }: src;
+in
+{
+ builder ? fetchOnly,
+ fetchHex,
+ fetchgit,
+ fetchFromGitHub,
+ overrides ? (x: y: { }),
+}:
let
self = packages // (overrides self packages);
packages = with self; {
@@ -52,7 +60,14 @@ let
version = "1.8.3";
sha256 = "sha256-7XAGX5qJqBjc/0O3TAgMnn9PFBThBRvt23KA24Ca9xE=";
};
- beamDeps = [ ezlib fast_tls fast_xml idna p1_utils stringprep ];
+ beamDeps = [
+ ezlib
+ fast_tls
+ fast_xml
+ idna
+ p1_utils
+ stringprep
+ ];
};
stun = builder {
name = "stun";
@@ -62,7 +77,10 @@ let
version = "1.2.14";
sha256 = "sha256-4TSAext6jf/ZTmTu/uAOZce0BC89FOFvj0NWbSA3FYM=";
};
- beamDeps = [ fast_tls p1_utils ];
+ beamDeps = [
+ fast_tls
+ p1_utils
+ ];
};
stringprep = builder {
name = "stringprep";
@@ -142,7 +160,13 @@ let
version = "1.0.23";
sha256 = "sha256-jOGW8m49IuoQt4CRIpUEZYeMEn+Adn4yUgeu1+jQ3Vk=";
};
- beamDeps = [ base64url idna jiffy jose yconf ];
+ beamDeps = [
+ base64url
+ idna
+ jiffy
+ jose
+ yconf
+ ];
};
mqtree = builder {
name = "mqtree";
@@ -232,7 +256,11 @@ let
version = "1.0.54";
sha256 = "sha256-gYevgZ1yWc2t2vaXJsI572BMmwsCmKXy0+aHv14iN+4=";
};
- beamDeps = [ fast_tls p1_utils stun ];
+ beamDeps = [
+ fast_tls
+ p1_utils
+ stun
+ ];
};
eredis = builder {
name = "eredis";
@@ -275,4 +303,5 @@ let
beamDeps = [ p1_utils ];
};
};
-in self
+in
+self
diff --git a/pkgs/by-name/em/emacspeak/package.nix b/pkgs/by-name/em/emacspeak/package.nix
index 6c18af7807ea..3e9b753be964 100644
--- a/pkgs/by-name/em/emacspeak/package.nix
+++ b/pkgs/by-name/em/emacspeak/package.nix
@@ -5,7 +5,7 @@
, makeWrapper
, stdenv
, tcl
-, tclx
+, tclPackages
}:
stdenv.mkDerivation (finalAttrs: {
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
espeak-ng
tcl
- tclx
+ tclPackages.tclx
];
strictDeps = true;
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
find "$d" -type f -not -executable -execdir chmod 644 {} +
makeWrapper ${lib.getExe emacs} $out/bin/emacspeak \
--set DTK_PROGRAM "${placeholder "out"}/share/emacs/site-lisp/emacspeak/servers/espeak" \
- --set TCLLIBPATH "${tclx}/lib" \
+ --set TCLLIBPATH "${tclPackages.tclx}/lib" \
--add-flags '-l "${placeholder "out"}/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.elc"'
'';
diff --git a/pkgs/by-name/ep/epic5/package.nix b/pkgs/by-name/ep/epic5/package.nix
index a73b64043b5c..f4f2ca6b2ac2 100644
--- a/pkgs/by-name/ep/epic5/package.nix
+++ b/pkgs/by-name/ep/epic5/package.nix
@@ -13,11 +13,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "epic5";
- version = "3.0";
+ version = "3.0.1";
src = fetchurl {
url = "https://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-${finalAttrs.version}.tar.xz";
- hash = "sha256-ltRzUME6PZkBnaDmoEsMf4Datt26WQvMZ527iswXeaE=";
+ hash = "sha256-F7lnxh5Yh08HdeH9CwYH+FxktjJYwaxNQInoETUqOUU=";
};
buildInputs =
diff --git a/pkgs/by-name/er/eris-go/package.nix b/pkgs/by-name/er/eris-go/package.nix
index 3e05cc65d351..496572f9d7aa 100644
--- a/pkgs/by-name/er/eris-go/package.nix
+++ b/pkgs/by-name/er/eris-go/package.nix
@@ -1,8 +1,8 @@
-{ lib, stdenv, buildGoModule, fetchFromGitea, nixosTests }:
+{ lib, stdenv, buildGoModule, fetchFromGitea, nixosTests, installShellFiles }:
buildGoModule rec {
pname = "eris-go";
- version = "20240920";
+ version = "20241028";
outputs = [ "out" "man" ];
src = fetchFromGitea {
@@ -10,13 +10,17 @@ buildGoModule rec {
owner = "eris";
repo = "eris-go";
rev = version;
- hash = "sha256-ZC4MBt1ucbZOn3sgs2xEiLLSDq7mz5Nj/in/TzydAbk=";
+ hash = "sha256-v4pN+fVwYoir3GLneWhg/azsg7ifvcKAksoqDkkQGwk=";
};
- vendorHash = "sha256-TnB4BSO2Yb9AtcHgdEgNrFHAQJ7u4IzmhLdcSjbZ7SA=";
+ vendorHash = "sha256-0BI4U9p4R7umyXtHAQBLa5t5+ni4dDndLNXgTIAMsqw=";
+
+ nativeBuildInputs = [ installShellFiles ];
postInstall = ''
install -D *.1.gz -t $man/share/man/man1
+ installShellCompletion --cmd eris-go \
+ --fish completions/eris-go.fish
'';
env.skipNetworkTests = true;
diff --git a/pkgs/by-name/ex/exo/package.nix b/pkgs/by-name/ex/exo/package.nix
index a346ef87102f..c1e03405b4fa 100644
--- a/pkgs/by-name/ex/exo/package.nix
+++ b/pkgs/by-name/ex/exo/package.nix
@@ -6,14 +6,14 @@
}:
python3Packages.buildPythonApplication {
pname = "exo";
- version = "0-unstable-2024-10-21";
+ version = "0-unstable-2024-10-29";
pyproject = true;
src = fetchFromGitHub {
owner = "exo-explore";
repo = "exo";
- rev = "82a708f974b9a720e127c38a383f22e129be6373";
- hash = "sha256-BhhcYOipdLAviTzWRdNLMMPiND4mYv9Mkn8/yxo0vXY=";
+ rev = "50a1b171f64a75594793147aa39db933ef38aed9";
+ hash = "sha256-hzguPEQDTKBWe8Um+pwJpsctPbQqA6QW5LGknKWFaKo=";
};
build-system = with python3Packages; [ setuptools ];
@@ -29,8 +29,6 @@ python3Packages.buildPythonApplication {
blobfile
grpcio
grpcio-tools
- hf-transfer
- huggingface-hub
jinja2
netifaces
numpy
@@ -39,13 +37,11 @@ python3Packages.buildPythonApplication {
prometheus-client
protobuf
psutil
+ pydantic
requests
rich
safetensors
- tailscale
tenacity
- tiktoken
- tokenizers
tqdm
transformers
tinygrad
diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/by-name/ex/exodus/package.nix
similarity index 82%
rename from pkgs/applications/blockchains/exodus/default.nix
rename to pkgs/by-name/ex/exodus/package.nix
index 5e13ece9a51e..b301e4e26cd8 100644
--- a/pkgs/applications/blockchains/exodus/default.nix
+++ b/pkgs/by-name/ex/exodus/package.nix
@@ -1,38 +1,38 @@
-{ stdenv
-, lib
-, fetchurl
-, unzip
-, glib
-, systemd
-, nss
-, nspr
-, gtk3-x11
-, pango
-, atk
-, cairo
-, gdk-pixbuf
-, xorg
-, xorg_sys_opengl
-, util-linux
-, alsa-lib
-, dbus
-, at-spi2-atk
-, cups
-, vivaldi-ffmpeg-codecs
-, libpulseaudio
-, at-spi2-core
-, libxkbcommon
-, mesa
+{
+ stdenv,
+ lib,
+ requireFile,
+ unzip,
+ glib,
+ systemd,
+ nss,
+ nspr,
+ gtk3-x11,
+ pango,
+ atk,
+ cairo,
+ gdk-pixbuf,
+ xorg,
+ xorg_sys_opengl,
+ util-linux,
+ alsa-lib,
+ dbus,
+ at-spi2-atk,
+ cups,
+ vivaldi-ffmpeg-codecs,
+ libpulseaudio,
+ at-spi2-core,
+ libxkbcommon,
+ mesa,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "exodus";
version = "24.19.4";
- src = fetchurl {
+ src = requireFile {
name = "exodus-linux-x64-${finalAttrs.version}.zip";
url = "https://downloads.exodus.com/releases/exodus-linux-x64-${finalAttrs.version}.zip";
- curlOptsList = [ "--user-agent" "Mozilla/5.0" ];
hash = "sha256-+g7DdDrSVmBl1wCSCoJcO2gmbWQBnJUYqjT+GuDlCYw=";
};
@@ -102,6 +102,10 @@ stdenv.mkDerivation (finalAttrs: {
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = platforms.linux;
- maintainers = with maintainers; [ mmahut rople380 Crafter ];
+ maintainers = with maintainers; [
+ mmahut
+ rople380
+ Crafter
+ ];
};
})
diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix
index d94f62a63469..be058ca16f25 100644
--- a/pkgs/by-name/ez/eza/package.nix
+++ b/pkgs/by-name/ez/eza/package.nix
@@ -17,16 +17,16 @@
rustPlatform.buildRustPackage rec {
pname = "eza";
- version = "0.20.4";
+ version = "0.20.6";
src = fetchFromGitHub {
owner = "eza-community";
repo = "eza";
rev = "v${version}";
- hash = "sha256-0wkFVExa8HCe3UBDMWjq2UAtrW1zmUQHAcVgWgmPPWM=";
+ hash = "sha256-uck/FwVwl9CEqy7zuKgzAahNqNc3DiGSVAsr7rDuk9Y=";
};
- cargoHash = "sha256-GWrhW9+bX0pc78Seb6WHvWjCSe8XWKiHYUXRMFq+LbY=";
+ cargoHash = "sha256-lhVkmSTmFhmg2Pqju79ghooyzjd7b2AJrGaHtATHJcI=";
nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
buildInputs = [ zlib ]
diff --git a/pkgs/by-name/fa/facter/Gemfile.lock b/pkgs/by-name/fa/facter/Gemfile.lock
index 2e80bd9192b4..1af6d837a747 100644
--- a/pkgs/by-name/fa/facter/Gemfile.lock
+++ b/pkgs/by-name/fa/facter/Gemfile.lock
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
- facter (4.8.0)
+ facter (4.10.0)
hocon (~> 1.3)
thor (>= 1.0.1, < 1.3)
hocon (1.4.0)
diff --git a/pkgs/by-name/fa/facter/gemset.nix b/pkgs/by-name/fa/facter/gemset.nix
index 2f70d6047e01..92a024a62211 100644
--- a/pkgs/by-name/fa/facter/gemset.nix
+++ b/pkgs/by-name/fa/facter/gemset.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1130mzk90pi0y9fnraqqak7gcfg61dhx92axwnhchbpw09akfl09";
+ sha256 = "17d561xf4s5016fm9jkfkkafn6660g04fz1yp5xfvkb0j4xj32mp";
type = "gem";
};
- version = "4.8.0";
+ version = "4.10.0";
};
hocon = {
groups = ["default"];
diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json
index 12c9da35eecb..182570993845 100644
--- a/pkgs/by-name/fa/factorio/versions.json
+++ b/pkgs/by-name/fa/factorio/versions.json
@@ -3,25 +3,25 @@
"alpha": {
"experimental": {
"candidateHashFilenames": [
- "factorio_linux_2.0.10.tar.xz"
+ "factorio_linux_2.0.11.tar.xz"
],
- "name": "factorio_alpha_x64-2.0.10.tar.xz",
+ "name": "factorio_alpha_x64-2.0.11.tar.xz",
"needsAuth": true,
- "sha256": "07508fc5112f95ef5d5afedea66863ea326e039bd872b772b934ed08545c399b",
+ "sha256": "84cc76d9197c274ee73f05f1ceb1895c7c2423ccc3452ac0bdf73cdbfcd4f44e",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.10/alpha/linux64",
- "version": "2.0.10"
+ "url": "https://factorio.com/get-download/2.0.11/alpha/linux64",
+ "version": "2.0.11"
},
"stable": {
"candidateHashFilenames": [
- "factorio_linux_2.0.10.tar.xz"
+ "factorio_linux_2.0.11.tar.xz"
],
- "name": "factorio_alpha_x64-2.0.10.tar.xz",
+ "name": "factorio_alpha_x64-2.0.11.tar.xz",
"needsAuth": true,
- "sha256": "07508fc5112f95ef5d5afedea66863ea326e039bd872b772b934ed08545c399b",
+ "sha256": "84cc76d9197c274ee73f05f1ceb1895c7c2423ccc3452ac0bdf73cdbfcd4f44e",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.10/alpha/linux64",
- "version": "2.0.10"
+ "url": "https://factorio.com/get-download/2.0.11/alpha/linux64",
+ "version": "2.0.11"
}
},
"demo": {
@@ -51,51 +51,51 @@
"expansion": {
"experimental": {
"candidateHashFilenames": [
- "factorio-space-age_linux_2.0.10.tar.xz"
+ "factorio-space-age_linux_2.0.11.tar.xz"
],
- "name": "factorio_expansion_x64-2.0.10.tar.xz",
+ "name": "factorio_expansion_x64-2.0.11.tar.xz",
"needsAuth": true,
- "sha256": "f7d346578c812314be8b72fbf6fd291c53d23ecc2dc6556a8948d26b3b95d71e",
+ "sha256": "6d7754718bd980b27469e2298655abfe3d6ad7d6bd22b765f75bbf23770ab179",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.10/expansion/linux64",
- "version": "2.0.10"
+ "url": "https://factorio.com/get-download/2.0.11/expansion/linux64",
+ "version": "2.0.11"
},
"stable": {
"candidateHashFilenames": [
- "factorio-space-age_linux_2.0.10.tar.xz"
+ "factorio-space-age_linux_2.0.11.tar.xz"
],
- "name": "factorio_expansion_x64-2.0.10.tar.xz",
+ "name": "factorio_expansion_x64-2.0.11.tar.xz",
"needsAuth": true,
- "sha256": "f7d346578c812314be8b72fbf6fd291c53d23ecc2dc6556a8948d26b3b95d71e",
+ "sha256": "6d7754718bd980b27469e2298655abfe3d6ad7d6bd22b765f75bbf23770ab179",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.10/expansion/linux64",
- "version": "2.0.10"
+ "url": "https://factorio.com/get-download/2.0.11/expansion/linux64",
+ "version": "2.0.11"
}
},
"headless": {
"experimental": {
"candidateHashFilenames": [
- "factorio-headless_linux_2.0.10.tar.xz",
- "factorio_headless_x64_2.0.10.tar.xz"
+ "factorio-headless_linux_2.0.11.tar.xz",
+ "factorio_headless_x64_2.0.11.tar.xz"
],
- "name": "factorio_headless_x64-2.0.10.tar.xz",
+ "name": "factorio_headless_x64-2.0.11.tar.xz",
"needsAuth": false,
- "sha256": "2d7dd212fa6f715218a5e33bad7d593af8998fa7bf7ce727343159ee1f8c23f4",
+ "sha256": "7848f2d8b2b32a0efeb8a401657459486eda9b8072c221d0f9c0b450290da0d6",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.10/headless/linux64",
- "version": "2.0.10"
+ "url": "https://factorio.com/get-download/2.0.11/headless/linux64",
+ "version": "2.0.11"
},
"stable": {
"candidateHashFilenames": [
- "factorio-headless_linux_2.0.10.tar.xz",
- "factorio_headless_x64_2.0.10.tar.xz"
+ "factorio-headless_linux_2.0.11.tar.xz",
+ "factorio_headless_x64_2.0.11.tar.xz"
],
- "name": "factorio_headless_x64-2.0.10.tar.xz",
+ "name": "factorio_headless_x64-2.0.11.tar.xz",
"needsAuth": false,
- "sha256": "2d7dd212fa6f715218a5e33bad7d593af8998fa7bf7ce727343159ee1f8c23f4",
+ "sha256": "7848f2d8b2b32a0efeb8a401657459486eda9b8072c221d0f9c0b450290da0d6",
"tarDirectory": "x64",
- "url": "https://factorio.com/get-download/2.0.10/headless/linux64",
- "version": "2.0.10"
+ "url": "https://factorio.com/get-download/2.0.11/headless/linux64",
+ "version": "2.0.11"
}
}
}
diff --git a/pkgs/by-name/fa/fantomas/package.nix b/pkgs/by-name/fa/fantomas/package.nix
index 49536d8e39ae..050330f49fac 100644
--- a/pkgs/by-name/fa/fantomas/package.nix
+++ b/pkgs/by-name/fa/fantomas/package.nix
@@ -2,9 +2,9 @@
buildDotnetGlobalTool {
pname = "fantomas";
- version = "6.3.15";
+ version = "6.3.16";
- nugetHash = "sha256-Gjw7MxjUNckMWSfnOye4UTe5fZWnor6RHCls3PNsuG8=";
+ nugetHash = "sha256-4tRdYf+/Q1iedx+DDuIKVGlIWQdr6erM51VdKzZkhCs=";
meta = with lib; {
description = "F# source code formatter";
diff --git a/pkgs/by-name/fa/fatrop/package.nix b/pkgs/by-name/fa/fatrop/package.nix
index 87d66c67802a..f575b763d04a 100644
--- a/pkgs/by-name/fa/fatrop/package.nix
+++ b/pkgs/by-name/fa/fatrop/package.nix
@@ -11,26 +11,15 @@
stdenv.mkDerivation (finalAttrs: {
pname = "fatrop";
- version = "0.0.1";
+ version = "0.0.4";
src = fetchFromGitHub {
owner = "meco-group";
repo = "fatrop";
rev = "v${finalAttrs.version}";
- hash = "sha256-c4qYh8RutRsMIx3m0oxXy73fnLTBGVZ1QjFcLEJ413Y=";
+ hash = "sha256-XVOS9L2vQeFkPXZieX1ZJiVagR0f2BtiRmSDPB9LQeI=";
};
- postPatch = lib.optionalString pythonSupport ''
- # avoid submodule
- rmdir external/pybind11
- ln -s ${python3Packages.pybind11.src} external/pybind11
-
- # install python module
- echo "" >> fatropy/CMakeLists.txt
- echo "install(DIRECTORY fatropy DESTINATION ${python3Packages.python.sitePackages})" >> fatropy/CMakeLists.txt
- echo "install(TARGETS _fatropy DESTINATION ${python3Packages.python.sitePackages}/fatropy)" >> fatropy/CMakeLists.txt
- '';
-
nativeBuildInputs = [ cmake ];
buildInputs =
[ blasfeo ]
diff --git a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix
new file mode 100644
index 000000000000..dbd9866f58c8
--- /dev/null
+++ b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix
@@ -0,0 +1,54 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ cmake,
+ extra-cmake-modules,
+ gettext,
+ json_c,
+ icu,
+ fmt,
+ gtest,
+ fcitx5,
+ nix-update-script,
+}:
+
+stdenv.mkDerivation rec {
+ pname = "fcitx5-mcbopomofo";
+ version = "2.8";
+
+ src = fetchFromGitHub {
+ owner = "openvanilla";
+ repo = "fcitx5-mcbopomofo";
+ rev = version;
+ hash = "sha256-VnAE+DIDEYAfHnHS/ufwohkUgmgjNyrCyJlA2g1p2aY=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ extra-cmake-modules
+ gettext
+ json_c
+ icu
+ fmt
+ gtest
+ ];
+
+ buildInputs = [
+ fcitx5
+ ];
+
+ cmakeFlags = [
+ "-DCMAKE_BUILD_TYPE=Release"
+ ];
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ description = "McBopomofo for fcitx5";
+ homepage = "https://github.com/openvanilla/fcitx5-mcbopomofo";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ shiphan ];
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/pkgs/by-name/fc/fcitx5-mozc-ut/package.nix b/pkgs/by-name/fc/fcitx5-mozc-ut/package.nix
new file mode 100644
index 000000000000..7580b0181e33
--- /dev/null
+++ b/pkgs/by-name/fc/fcitx5-mozc-ut/package.nix
@@ -0,0 +1,8 @@
+{
+ fcitx5-mozc,
+ mozc-ut,
+}:
+
+fcitx5-mozc.override {
+ mozc = mozc-ut;
+}
diff --git a/pkgs/by-name/fc/fcitx5-mozc/package.nix b/pkgs/by-name/fc/fcitx5-mozc/package.nix
new file mode 100644
index 000000000000..43535fd93545
--- /dev/null
+++ b/pkgs/by-name/fc/fcitx5-mozc/package.nix
@@ -0,0 +1,148 @@
+{
+ bazel_7,
+ buildBazelPackage,
+ fcitx5,
+ fetchFromGitHub,
+ gettext,
+ lib,
+ mozc,
+ nixosTests,
+ pkg-config,
+ python3,
+ stdenv,
+ unzip,
+}:
+
+buildBazelPackage {
+ pname = "fcitx5-mozc";
+ version = "2.30.5544.102";
+
+ src = fetchFromGitHub {
+ owner = "fcitx";
+ repo = "mozc";
+ fetchSubmodules = true;
+ rev = "57e67f2a25e4c0861e0e422da0c7d4c232d89fcc";
+ hash = "sha256-1EZjEbMl+LRipH5gEgFpaKP8uEKPfupHmiiTNJc/T1k=";
+ };
+
+ nativeBuildInputs = [
+ gettext
+ pkg-config
+ python3
+ unzip
+ ];
+
+ buildInputs = [
+ mozc
+ fcitx5
+ ];
+
+ postPatch = ''
+ sed -i -e 's|^\(LINUX_MOZC_SERVER_DIR = \).\+|\1"${mozc}/lib/mozc"|' src/config.bzl
+ '';
+
+ bazel = bazel_7;
+ removeRulesCC = false;
+ dontAddBazelOpts = true;
+
+ bazelFlags = [
+ "--config"
+ "oss_linux"
+ "--compilation_mode"
+ "opt"
+ ];
+
+ bazelTargets = [
+ "unix/fcitx5:fcitx5-mozc.so"
+ "unix/icons"
+ ];
+
+ fetchAttrs = {
+ preInstall = ''
+ rm -rf $bazelOut/external/fcitx5
+ '';
+
+ sha256 = "sha256-wz2lJckr7Pu4jtoejjFv8LdjVO2+ferrS473M4jc86I=";
+ };
+
+ preConfigure = ''
+ cd src
+ '';
+
+ buildAttrs = {
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm444 ../LICENSE $out/share/licenses/fcitx5-mozc/LICENSE
+ install -Dm444 data/installer/credits_en.html $out/share/licenses/fcitx5-mozc/Submodules
+
+ install -Dm555 bazel-bin/unix/fcitx5/fcitx5-mozc.so $out/lib/fcitx5/fcitx5-mozc.so
+ install -Dm444 unix/fcitx5/mozc-addon.conf $out/share/fcitx5/addon/mozc.conf
+ install -Dm444 unix/fcitx5/mozc.conf $out/share/fcitx5/inputmethod/mozc.conf
+
+ for pofile in unix/fcitx5/po/*.po; do
+ filename=$(basename $pofile)
+ lang=''${filename/.po/}
+ mofile=''${pofile/.po/.mo}
+ msgfmt $pofile -o $mofile
+ install -Dm444 $mofile $out/share/locale/$lang/LC_MESSAGES/fcitx5-mozc.mo
+ done
+
+ msgfmt --xml -d unix/fcitx5/po/ --template unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml.in -o unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml
+ install -Dm444 unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml $out/share/metainfo/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml
+
+ cd bazel-bin/unix
+
+ unzip -o icons.zip
+
+ # These are relative symlinks, they will always resolve to files within $out
+
+ install -Dm444 mozc.png $out/share/icons/hicolor/128x128/apps/org.fcitx.Fcitx5.fcitx_mozc.png
+ ln -s org.fcitx.Fcitx5.fcitx_mozc.png $out/share/icons/hicolor/128x128/apps/fcitx_mozc.png
+
+ for svg in \
+ alpha_full.svg \
+ alpha_half.svg \
+ direct.svg \
+ hiragana.svg \
+ katakana_full.svg \
+ katakana_half.svg \
+ outlined/dictionary.svg \
+ outlined/properties.svg \
+ outlined/tool.svg
+ do
+ name=$(basename -- $svg)
+ path=$out/share/icons/hicolor/scalable/apps
+ prefix=org.fcitx.Fcitx5.fcitx_mozc
+
+ install -Dm444 $svg $path/$prefix_$name
+ ln -s $prefix_$name $path/fcitx_mozc_$name
+ done
+
+ runHook postInstall
+ '';
+ };
+
+ passthru.tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
+ inherit (nixosTests) fcitx5;
+ };
+
+ meta = with lib; {
+ description = "Mozc - a Japanese Input Method Editor designed for multi-platform";
+ homepage = "https://github.com/fcitx/mozc";
+ license = with licenses; [
+ asl20 # abseil-cpp
+ bsd3 # mozc, breakpad, gtest, gyp, japanese-usage-dictionary, protobuf
+ mit # wil
+ naist-2003 # IPAdic
+ publicDomain # src/data/test/stress_test, Okinawa dictionary
+ unicode-30 # src/data/unicode, breakpad
+ ];
+ maintainers = with maintainers; [
+ berberman
+ govanify
+ musjj
+ ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/by-name/fe/fedimint/package.nix b/pkgs/by-name/fe/fedimint/package.nix
index ca91966bbefa..f55bbbf14763 100644
--- a/pkgs/by-name/fe/fedimint/package.nix
+++ b/pkgs/by-name/fe/fedimint/package.nix
@@ -24,16 +24,16 @@ let
in
buildRustPackage rec {
pname = "fedimint";
- version = "0.4.3";
+ version = "0.4.4";
src = fetchFromGitHub {
owner = "fedimint";
repo = "fedimint";
rev = "v${version}";
- hash = "sha256-NUr1ZpYJozWIej46Oqlf/7feJ4kztYYvX3TEzQ5VoWo=";
+ hash = "sha256-YyvppmKs6RCIzmn9bezNxjoCSlPY6GCWmy+bsSbCA2A=";
};
- cargoHash = "sha256-sky0Blh2fjP82UgFUfBH0vAIdBzHOfVGAfOW0rwNH00=";
+ cargoHash = "sha256-nWwAmthTOzKDLrHN0v/usC8DfmHzywNJs/6xdyCBBZY=";
nativeBuildInputs = [
protobuf
diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix
index 2a398506b3d8..b4c94e54e303 100644
--- a/pkgs/by-name/ff/fflogs/package.nix
+++ b/pkgs/by-name/ff/fflogs/package.nix
@@ -5,10 +5,10 @@
let
pname = "fflogs";
- version = "8.14.0";
+ version = "8.14.21";
src = fetchurl {
url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
- hash = "sha256-hHgPtr25X2vZY+MKQn9FgkMLrF5vgklMQHzx4ksGrDk=";
+ hash = "sha256-sBC2qvtSje2uXzSZAYXBFmycKxf0B6/JZhOvWNyMp20=";
};
extracted = appimageTools.extractType2 { inherit pname version src; };
in
diff --git a/pkgs/by-name/fi/fido2-manage/package.nix b/pkgs/by-name/fi/fido2-manage/package.nix
new file mode 100644
index 000000000000..19038a03d353
--- /dev/null
+++ b/pkgs/by-name/fi/fido2-manage/package.nix
@@ -0,0 +1,144 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ fetchurl,
+ pkg-config,
+ cmake,
+ libcbor,
+ openssl,
+ zlib,
+ gnugrep,
+ gawk,
+ # Linux only
+ pcsclite,
+ udev,
+ imagemagick,
+ # GUI
+ python3,
+ xterm,
+ makeDesktopItem,
+ copyDesktopItems,
+ # Darwin only
+ libuv,
+ libsolv,
+ libcouchbase,
+ darwin,
+}:
+let
+ pythonEnv = python3.withPackages (ps: [ ps.tkinter ]);
+in
+stdenv.mkDerivation rec {
+ pname = "fido2-manage";
+ version = "0-unstable-2024-09-24";
+
+ src = fetchFromGitHub {
+ owner = "token2";
+ repo = "fido2-manage";
+ rev = "6aef9ceccdf7bcc60a9298e51a4db633256925df";
+ hash = "sha256-rXTL6wpdvCifakmxH14wBLbhTptNYNFGEPskpUy3IjA=";
+ };
+
+ icon = fetchurl {
+ url = "https://token2.net/img/icon/logo-white.png";
+ hash = "sha256-UpxRzn24v1vigMFlofVU+YOzKrkxCu2Pk5iktqFgNO8=";
+ };
+
+ nativeBuildInputs =
+ [
+ pkg-config
+ cmake
+ ]
+ ++ lib.optionals stdenv.isLinux [
+ copyDesktopItems
+ imagemagick
+ ];
+
+ buildInputs =
+ [
+ libcbor
+ openssl
+ zlib
+ ]
+ ++ lib.optionals stdenv.isLinux [
+ xterm
+ udev
+ pcsclite
+ ]
+ ++ lib.optionals stdenv.isDarwin [
+ libuv
+ libsolv
+ libcouchbase
+ darwin.apple_sdk.frameworks.IOKit
+ darwin.apple_sdk.frameworks.PCSC
+ ];
+
+ cmakeFlags = [ "-USE_PCSC=ON" ];
+
+ postPatch =
+ ''
+ substituteInPlace ./src/libfido2.pc.in \
+ --replace-fail "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "@CMAKE_INSTALL_FULL_LIBDIR@"
+ ''
+ + lib.optionalString stdenv.isDarwin ''
+ substituteInPlace ./CMakeLists.txt \
+ --replace-fail "/\''${CMAKE_INSTALL_LIBDIR}" "/lib"
+ '';
+
+ postInstall =
+ lib.optionalString stdenv.isLinux ''
+ install $src/fido2-manage.sh $out/bin/fido2-manage
+ magick ${icon} -background none -gravity center -extent 512x512 token2.png
+ install -Dm444 token2.png $out/share/icons/hicolor/512x512/apps/token2.png
+ install $src/gui.py $out/bin/fido2-manage-gui
+ ''
+ + lib.optionalString stdenv.isDarwin ''
+ install $src/fido2-manage-mac.sh $out/bin/fido2-manage
+ '';
+
+ desktopItems = lib.optionals stdenv.isLinux [
+ (makeDesktopItem rec {
+ desktopName = "Fido2 Manager";
+ name = "fido2-manage";
+ exec = "fido2-manage-gui";
+ icon = "token2";
+ comment = meta.description;
+ categories = [
+ "Utility"
+ ];
+ })
+ ];
+
+ postFixup =
+ ''
+ substituteInPlace $out/bin/fido2-manage \
+ --replace-fail "/usr/local/bin/" "$out/bin/" \
+ --replace-fail "./fido2-manage.sh" "fido2-manage" \
+ --replace-fail "awk" "${gawk}/bin/awk"
+ ''
+ + lib.optionalString stdenv.isLinux ''
+ substituteInPlace $out/bin/fido2-manage-gui \
+ --replace-fail "./fido2-manage.sh" "$out/bin/fido2-manage" \
+ --replace-fail "x-terminal-emulator" "${xterm}/bin/xterm" \
+ --replace-fail "tk.Tk()" "tk.Tk(className='fido2-manage')" \
+ --replace-fail 'root.title("FIDO2.1 Manager - Python version 0.1 - (c) Token2")' "root.title('Fido2 Manager')"
+
+ substituteInPlace $out/bin/fido2-manage \
+ --replace-fail "grep" "${gnugrep}/bin/grep"
+
+ sed -i '1i #!${pythonEnv.interpreter}' $out/bin/fido2-manage-gui
+ ''
+ + lib.optionalString stdenv.isDarwin ''
+ substituteInPlace $out/bin/fido2-manage \
+ --replace-fail "ggrep" "${gnugrep}/bin/grep"
+ '';
+
+ meta = {
+ description = "Manage FIDO2.1 devices over USB or NFC, including Passkeys";
+ homepage = "https://github.com/token2/fido2-manage";
+ platforms = lib.platforms.all;
+ license = lib.licenses.bsd2;
+ mainProgram = "fido2-manage";
+ maintainers = with lib.maintainers; [ Srylax ];
+ };
+}
diff --git a/pkgs/by-name/fi/figma-agent/0001-update-time.patch b/pkgs/by-name/fi/figma-agent/0001-update-time.patch
new file mode 100644
index 000000000000..b136a02d49eb
--- /dev/null
+++ b/pkgs/by-name/fi/figma-agent/0001-update-time.patch
@@ -0,0 +1,59 @@
+From aaa07b6430c555a8c41f458ccf0eca2213e82317 Mon Sep 17 00:00:00 2001
+From: wxt <3264117476@qq.com>
+Date: Sat, 28 Sep 2024 11:06:40 +0800
+Subject: [PATCH] update time
+
+---
+ Cargo.lock | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index 282fe41..8b308d5 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -952,6 +952,12 @@ dependencies = [
+ "minimal-lexical",
+ ]
+
++[[package]]
++name = "num-conv"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
++
+ [[package]]
+ name = "object"
+ version = "0.32.2"
+@@ -1313,12 +1319,13 @@ dependencies = [
+
+ [[package]]
+ name = "time"
+-version = "0.3.31"
++version = "0.3.36"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+ dependencies = [
+ "deranged",
+ "itoa",
++ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+@@ -1333,10 +1340,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+ [[package]]
+ name = "time-macros"
+-version = "0.2.16"
++version = "0.2.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+ dependencies = [
++ "num-conv",
+ "time-core",
+ ]
+
+--
+2.46.0
+
diff --git a/pkgs/applications/graphics/figma-agent/default.nix b/pkgs/by-name/fi/figma-agent/package.nix
similarity index 54%
rename from pkgs/applications/graphics/figma-agent/default.nix
rename to pkgs/by-name/fi/figma-agent/package.nix
index a6bf008e8295..3d01590f725b 100644
--- a/pkgs/applications/graphics/figma-agent/default.nix
+++ b/pkgs/by-name/fi/figma-agent/package.nix
@@ -1,31 +1,31 @@
-{ lib
-, fetchFromGitHub
-, rustPlatform
-, pkg-config
-, fontconfig
-, freetype
+{
+ lib,
+ fetchFromGitHub,
+ rustPlatform,
+ pkg-config,
+ fontconfig,
+ freetype,
}:
-let
- inherit (rustPlatform) buildRustPackage bindgenHook;
-
- version = "0.3.2";
-in
-buildRustPackage {
+rustPlatform.buildRustPackage rec {
pname = "figma-agent";
- inherit version;
+ version = "0.3.2";
src = fetchFromGitHub {
owner = "neetly";
repo = "figma-agent-linux";
- rev = version;
+ rev = "refs/tags/${version}";
sha256 = "sha256-iXLQOc8gomOik+HIIoviw19II5MD6FM0W5DT3aqtIcM=";
};
- cargoHash = "sha256-ulYDKMMtKfBYur34CVhac4uaU0kfdkeBCCP/heuUZek=";
+ cargoPatches = [
+ ./0001-update-time.patch
+ ];
+
+ cargoHash = "sha256-4X1sFgvrJuBeEPbcxrAt6tClOG63kwJ6eUzIRIv8tBs=";
nativeBuildInputs = [
pkg-config
- bindgenHook
+ rustPlatform.bindgenHook
];
buildInputs = [
@@ -33,13 +33,11 @@ buildRustPackage {
freetype
];
- doCheck = true;
-
- meta = with lib; {
+ meta = {
homepage = "https://github.com/neetly/figma-agent-linux";
description = "Figma Agent for Linux (a.k.a. Font Helper)";
- license = licenses.mit;
- maintainers = with maintainers; [ ercao ];
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ ercao ];
mainProgram = "figma-agent";
};
}
diff --git a/pkgs/by-name/fi/finamp/package.nix b/pkgs/by-name/fi/finamp/package.nix
index 8795f6c066e0..b4b3668633e5 100644
--- a/pkgs/by-name/fi/finamp/package.nix
+++ b/pkgs/by-name/fi/finamp/package.nix
@@ -33,7 +33,7 @@ flutter324.buildFlutterApplication {
};
postFixup = ''
- patchelf $out/app/finamp --add-needed libisar.so --add-needed libmpv.so --add-rpath ${lib.makeLibraryPath [ mpv-unwrapped ]}
+ patchelf $out/app/$pname/finamp --add-needed libisar.so --add-needed libmpv.so --add-rpath ${lib.makeLibraryPath [ mpv-unwrapped ]}
'';
postInstall = ''
diff --git a/pkgs/by-name/fl/flarectl/package.nix b/pkgs/by-name/fl/flarectl/package.nix
index 8acf4040b44c..7a9c347c8d45 100644
--- a/pkgs/by-name/fl/flarectl/package.nix
+++ b/pkgs/by-name/fl/flarectl/package.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "flarectl";
- version = "0.105.0";
+ version = "0.108.0";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflare-go";
rev = "v${version}";
- hash = "sha256-xUITOBXBy5Jt0DFRNffX7sRhAtgUPMEJOHa2SbjM1n0=";
+ hash = "sha256-9pPDoXYZCcMnusBfQ1PQ8l/ZFvPNTOA8dRJALXY1Kho=";
};
- vendorHash = "sha256-KMCwbbDpj4QAgvKLlOPDKSlrDyf+K/tGTMM/GBlvyuc=";
+ vendorHash = "sha256-U6ogqAweU2DZb26Ct4K/1TnCGRn//p11nVkFKzC+tj0=";
subPackages = [ "cmd/flarectl" ];
diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix
index 231b682cc2cb..4eec7288bf85 100644
--- a/pkgs/by-name/fl/flatpak/package.nix
+++ b/pkgs/by-name/fl/flatpak/package.nix
@@ -74,6 +74,8 @@ stdenv.mkDerivation (finalAttrs: {
"installedTests"
];
+ separateDebugInfo = true;
+
src = fetchurl {
url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz";
hash = "sha256-a73HkIEnNQrYWkpH1wKSyi9MRul3sysf0jHCpxnYIc0=";
diff --git a/pkgs/by-name/fl/flawz/package.nix b/pkgs/by-name/fl/flawz/package.nix
index fb40c65dc218..317005c1414f 100644
--- a/pkgs/by-name/fl/flawz/package.nix
+++ b/pkgs/by-name/fl/flawz/package.nix
@@ -1,11 +1,13 @@
-{ lib
-, fetchFromGitHub
-, rustPlatform
-, pkg-config
-, openssl
-, sqlite
-, installShellFiles
-, stdenv
+{
+ lib,
+ fetchFromGitHub,
+ rustPlatform,
+ pkg-config,
+ openssl,
+ sqlite,
+ installShellFiles,
+ stdenv,
+ buildPackages,
}:
rustPlatform.buildRustPackage rec {
@@ -21,34 +23,54 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-kMiKlZj+G1vfjaEiB3rtPoJl0K3W9xRVwgVz8q2pn1s=";
- nativeBuildInputs = [ pkg-config installShellFiles ];
+ nativeBuildInputs = [
+ pkg-config
+ installShellFiles
+ ];
- buildInputs = [ openssl sqlite ];
- outputs = [ "out" "man" ];
+ buildInputs = [
+ openssl
+ sqlite
+ ];
+ outputs = [
+ "out"
+ "man"
+ ];
- postInstall = ''
- export OUT_DIR=$(mktemp -d)
+ postInstall =
+ let
+ emulator = stdenv.hostPlatform.emulator buildPackages;
+ flawz-mangen = "${emulator} $out/bin/flawz-mangen";
+ flawz-completions = "${emulator} $out/bin/flawz-completions";
+ in
+ lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ''
+ export OUT_DIR=$(mktemp -d)
- # Generate the man pages
- cargo run --bin flawz-mangen
- installManPage $OUT_DIR/flawz.1
+ # Generate the man pages
+ ${flawz-mangen}
+ installManPage $OUT_DIR/flawz.1
- # Generate shell completions
- cargo run --bin flawz-completions
- installShellCompletion \
- --bash $OUT_DIR/flawz.bash \
- --fish $OUT_DIR/flawz.fish \
- --zsh $OUT_DIR/_flawz
+ # Generate shell completions
+ ${flawz-completions}
+ installShellCompletion \
+ --bash $OUT_DIR/flawz.bash \
+ --fish $OUT_DIR/flawz.fish \
+ --zsh $OUT_DIR/_flawz
- # Clean up temporary directory
- rm -rf $OUT_DIR
- '';
+ # Clean up temporary directory
+ rm -rf $OUT_DIR
+ # No need for these binaries to end up in the output
+ rm $out/bin/flawz-{completions,mangen}
+ '';
meta = {
description = "Terminal UI for browsing CVEs";
homepage = "https://github.com/orhun/flawz";
changelog = "https://github.com/orhun/flawz/releases/tag/v${version}";
- license = with lib.licenses; [ mit asl20 ];
+ license = with lib.licenses; [
+ mit
+ asl20
+ ];
mainProgram = "flawz";
maintainers = with lib.maintainers; [ anas ];
platforms = with lib.platforms; unix ++ windows;
diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix
new file mode 100644
index 000000000000..d72a16afc6a1
--- /dev/null
+++ b/pkgs/by-name/fl/flclash/package.nix
@@ -0,0 +1,96 @@
+{
+ lib,
+ fetchFromGitHub,
+ flutter,
+ keybinder3,
+ libayatana-appindicator,
+ buildGoModule,
+ makeDesktopItem,
+ copyDesktopItems,
+}:
+let
+ pname = "flclash";
+ version = "0.8.66";
+ src =
+ (fetchFromGitHub {
+ owner = "chen08209";
+ repo = "FlClash";
+ rev = "v${version}";
+ hash = "sha256-LkaAALJcP3DGXBMZ3QWLUiyT9Kr4yTxKIRqYhrW1WOw=";
+ fetchSubmodules = true;
+ }).overrideAttrs
+ (_: {
+ GIT_CONFIG_COUNT = 1;
+ GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf";
+ GIT_CONFIG_VALUE_0 = "git@github.com:";
+ });
+ libclash = buildGoModule {
+ inherit pname version src;
+ modRoot = "./core";
+ vendorHash = "sha256-K+PrLFvDHyaxf1NKzcqf0qmfQwT8rctScv1CN+TxY0M=";
+ buildPhase = ''
+ runHook preBuild
+ mkdir -p $out/lib
+ go build -ldflags="-w -s" -tags=with_gvisor -buildmode=c-shared -o $out/lib/libclash.so
+ runHook postBuild
+ '';
+ };
+in
+flutter.buildFlutterApplication {
+ inherit pname version src;
+
+ desktopItems = [
+ (makeDesktopItem {
+ name = "FlClash";
+ exec = "FlClash %U";
+ icon = "FlClash";
+ genericName = "FlClash";
+ desktopName = "FlClash";
+ categories = [
+ "Network"
+ ];
+ keywords = [
+ "FlClash"
+ "Clash"
+ "ClashMeta"
+ "Proxy"
+ ];
+ })
+ ];
+
+ patchPhase = ''
+ runHook prePatch
+ substituteInPlace lib/clash/core.dart --replace-fail 'DynamicLibrary.open("libclash.so")' 'DynamicLibrary.open("${libclash}/lib/libclash.so")'
+ runHook postPatch
+ '';
+
+ preBuild = ''
+ mkdir -p ./libclash/linux/
+ cp ${libclash}/lib/libclash.so ./libclash/linux/libclash.so
+ '';
+
+ postInstall = ''
+ mkdir -p $out/share/pixmaps/
+ cp ./assets/images/icon.png $out/share/pixmaps/FlClash.png
+ '';
+
+ pubspecLock = lib.importJSON ./pubspec.lock.json;
+
+ nativeBuildInputs = [
+ copyDesktopItems
+ ];
+
+ buildInputs = [
+ keybinder3
+ libayatana-appindicator
+ ];
+
+ meta = {
+ description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free";
+ homepage = "https://github.com/chen08209/FlClash";
+ mainProgram = "FlClash";
+ license = with lib.licenses; [ gpl3Plus ];
+ maintainers = with lib.maintainers; [ aucub ];
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/pkgs/by-name/fl/flclash/pubspec.lock.json b/pkgs/by-name/fl/flclash/pubspec.lock.json
new file mode 100644
index 000000000000..ddbc944fe607
--- /dev/null
+++ b/pkgs/by-name/fl/flclash/pubspec.lock.json
@@ -0,0 +1,1746 @@
+{
+ "packages": {
+ "_fe_analyzer_shared": {
+ "dependency": "transitive",
+ "description": {
+ "name": "_fe_analyzer_shared",
+ "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "67.0.0"
+ },
+ "analyzer": {
+ "dependency": "transitive",
+ "description": {
+ "name": "analyzer",
+ "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.4.1"
+ },
+ "animations": {
+ "dependency": "direct main",
+ "description": {
+ "name": "animations",
+ "sha256": "d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.11"
+ },
+ "app_links": {
+ "dependency": "direct main",
+ "description": {
+ "name": "app_links",
+ "sha256": "3ced568a5d9e309e99af71285666f1f3117bddd0bd5b3317979dccc1a40cada4",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.5.1"
+ },
+ "archive": {
+ "dependency": "direct main",
+ "description": {
+ "name": "archive",
+ "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.6.1"
+ },
+ "args": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "args",
+ "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.5.0"
+ },
+ "async": {
+ "dependency": "transitive",
+ "description": {
+ "name": "async",
+ "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.11.0"
+ },
+ "boolean_selector": {
+ "dependency": "transitive",
+ "description": {
+ "name": "boolean_selector",
+ "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.1"
+ },
+ "build": {
+ "dependency": "transitive",
+ "description": {
+ "name": "build",
+ "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.4.1"
+ },
+ "build_config": {
+ "dependency": "transitive",
+ "description": {
+ "name": "build_config",
+ "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.1"
+ },
+ "build_daemon": {
+ "dependency": "transitive",
+ "description": {
+ "name": "build_daemon",
+ "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.0.2"
+ },
+ "build_resolvers": {
+ "dependency": "transitive",
+ "description": {
+ "name": "build_resolvers",
+ "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.4.2"
+ },
+ "build_runner": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "build_runner",
+ "sha256": "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.4.11"
+ },
+ "build_runner_core": {
+ "dependency": "transitive",
+ "description": {
+ "name": "build_runner_core",
+ "sha256": "e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "7.3.1"
+ },
+ "built_collection": {
+ "dependency": "transitive",
+ "description": {
+ "name": "built_collection",
+ "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "5.1.1"
+ },
+ "built_value": {
+ "dependency": "transitive",
+ "description": {
+ "name": "built_value",
+ "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "8.9.2"
+ },
+ "cached_network_image": {
+ "dependency": "direct main",
+ "description": {
+ "name": "cached_network_image",
+ "sha256": "4a5d8d2c728b0f3d0245f69f921d7be90cae4c2fd5288f773088672c0893f819",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.4.0"
+ },
+ "cached_network_image_platform_interface": {
+ "dependency": "transitive",
+ "description": {
+ "name": "cached_network_image_platform_interface",
+ "sha256": "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.1.1"
+ },
+ "cached_network_image_web": {
+ "dependency": "transitive",
+ "description": {
+ "name": "cached_network_image_web",
+ "sha256": "6322dde7a5ad92202e64df659241104a43db20ed594c41ca18de1014598d7996",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.3.0"
+ },
+ "characters": {
+ "dependency": "transitive",
+ "description": {
+ "name": "characters",
+ "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.3.0"
+ },
+ "charcode": {
+ "dependency": "transitive",
+ "description": {
+ "name": "charcode",
+ "sha256": "fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.3.1"
+ },
+ "checked_yaml": {
+ "dependency": "transitive",
+ "description": {
+ "name": "checked_yaml",
+ "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.3"
+ },
+ "cli_util": {
+ "dependency": "transitive",
+ "description": {
+ "name": "cli_util",
+ "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.4.1"
+ },
+ "clock": {
+ "dependency": "transitive",
+ "description": {
+ "name": "clock",
+ "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.1"
+ },
+ "code_builder": {
+ "dependency": "transitive",
+ "description": {
+ "name": "code_builder",
+ "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.10.0"
+ },
+ "collection": {
+ "dependency": "direct main",
+ "description": {
+ "name": "collection",
+ "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.18.0"
+ },
+ "convert": {
+ "dependency": "transitive",
+ "description": {
+ "name": "convert",
+ "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.1.1"
+ },
+ "cross_file": {
+ "dependency": "transitive",
+ "description": {
+ "name": "cross_file",
+ "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.3.4+2"
+ },
+ "crypto": {
+ "dependency": "transitive",
+ "description": {
+ "name": "crypto",
+ "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.5"
+ },
+ "dart_style": {
+ "dependency": "transitive",
+ "description": {
+ "name": "dart_style",
+ "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.3.6"
+ },
+ "device_info_plus": {
+ "dependency": "direct main",
+ "description": {
+ "name": "device_info_plus",
+ "sha256": "a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "10.1.2"
+ },
+ "device_info_plus_platform_interface": {
+ "dependency": "transitive",
+ "description": {
+ "name": "device_info_plus_platform_interface",
+ "sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "7.0.1"
+ },
+ "dio": {
+ "dependency": "direct main",
+ "description": {
+ "name": "dio",
+ "sha256": "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "5.7.0"
+ },
+ "dio_web_adapter": {
+ "dependency": "transitive",
+ "description": {
+ "name": "dio_web_adapter",
+ "sha256": "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.0"
+ },
+ "dynamic_color": {
+ "dependency": "direct main",
+ "description": {
+ "name": "dynamic_color",
+ "sha256": "eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.7.0"
+ },
+ "emoji_regex": {
+ "dependency": "direct main",
+ "description": {
+ "name": "emoji_regex",
+ "sha256": "3a25dd4d16f98b6f76dc37cc9ae49b8511891ac4b87beac9443a1e9f4634b6c7",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.0.5"
+ },
+ "fake_async": {
+ "dependency": "transitive",
+ "description": {
+ "name": "fake_async",
+ "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.3.1"
+ },
+ "ffi": {
+ "dependency": "direct main",
+ "description": {
+ "name": "ffi",
+ "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.3"
+ },
+ "ffigen": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "ffigen",
+ "sha256": "dead012f29db2be71ea152458f5eab600de98fbc244e01088ae6bf2616bceca7",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "11.0.0"
+ },
+ "file": {
+ "dependency": "transitive",
+ "description": {
+ "name": "file",
+ "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "7.0.0"
+ },
+ "file_picker": {
+ "dependency": "direct main",
+ "description": {
+ "name": "file_picker",
+ "sha256": "825aec673606875c33cd8d3c4083f1a3c3999015a84178b317b7ef396b7384f3",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "8.0.7"
+ },
+ "file_selector_linux": {
+ "dependency": "transitive",
+ "description": {
+ "name": "file_selector_linux",
+ "sha256": "712ce7fab537ba532c8febdb1a8f167b32441e74acd68c3ccb2e36dcb52c4ab2",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.9.3"
+ },
+ "file_selector_macos": {
+ "dependency": "transitive",
+ "description": {
+ "name": "file_selector_macos",
+ "sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.9.4+2"
+ },
+ "file_selector_platform_interface": {
+ "dependency": "transitive",
+ "description": {
+ "name": "file_selector_platform_interface",
+ "sha256": "a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.6.2"
+ },
+ "file_selector_windows": {
+ "dependency": "transitive",
+ "description": {
+ "name": "file_selector_windows",
+ "sha256": "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.9.3+3"
+ },
+ "fixnum": {
+ "dependency": "transitive",
+ "description": {
+ "name": "fixnum",
+ "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.0"
+ },
+ "flutter": {
+ "dependency": "direct main",
+ "description": "flutter",
+ "source": "sdk",
+ "version": "0.0.0"
+ },
+ "flutter_cache_manager": {
+ "dependency": "transitive",
+ "description": {
+ "name": "flutter_cache_manager",
+ "sha256": "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.4.1"
+ },
+ "flutter_lints": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "flutter_lints",
+ "sha256": "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.2"
+ },
+ "flutter_localizations": {
+ "dependency": "direct main",
+ "description": "flutter",
+ "source": "sdk",
+ "version": "0.0.0"
+ },
+ "flutter_plugin_android_lifecycle": {
+ "dependency": "transitive",
+ "description": {
+ "name": "flutter_plugin_android_lifecycle",
+ "sha256": "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.22"
+ },
+ "flutter_test": {
+ "dependency": "direct dev",
+ "description": "flutter",
+ "source": "sdk",
+ "version": "0.0.0"
+ },
+ "flutter_web_plugins": {
+ "dependency": "transitive",
+ "description": "flutter",
+ "source": "sdk",
+ "version": "0.0.0"
+ },
+ "freezed": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "freezed",
+ "sha256": "a434911f643466d78462625df76fd9eb13e57348ff43fe1f77bbe909522c67a1",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.5.2"
+ },
+ "freezed_annotation": {
+ "dependency": "direct main",
+ "description": {
+ "name": "freezed_annotation",
+ "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.4.4"
+ },
+ "frontend_server_client": {
+ "dependency": "transitive",
+ "description": {
+ "name": "frontend_server_client",
+ "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.0.0"
+ },
+ "glob": {
+ "dependency": "transitive",
+ "description": {
+ "name": "glob",
+ "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.2"
+ },
+ "graphs": {
+ "dependency": "transitive",
+ "description": {
+ "name": "graphs",
+ "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.3.2"
+ },
+ "gtk": {
+ "dependency": "transitive",
+ "description": {
+ "name": "gtk",
+ "sha256": "e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.0"
+ },
+ "hotkey_manager": {
+ "dependency": "direct main",
+ "description": {
+ "name": "hotkey_manager",
+ "sha256": "06f0655b76c8dd322fb7101dc615afbdbf39c3d3414df9e059c33892104479cd",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.2.3"
+ },
+ "hotkey_manager_linux": {
+ "dependency": "transitive",
+ "description": {
+ "name": "hotkey_manager_linux",
+ "sha256": "83676bda8210a3377bc6f1977f193bc1dbdd4c46f1bdd02875f44b6eff9a8473",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.2.0"
+ },
+ "hotkey_manager_macos": {
+ "dependency": "transitive",
+ "description": {
+ "name": "hotkey_manager_macos",
+ "sha256": "03b5967e64357b9ac05188ea4a5df6fe4ed4205762cb80aaccf8916ee1713c96",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.2.0"
+ },
+ "hotkey_manager_platform_interface": {
+ "dependency": "transitive",
+ "description": {
+ "name": "hotkey_manager_platform_interface",
+ "sha256": "98ffca25b8cc9081552902747b2942e3bc37855389a4218c9d50ca316b653b13",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.2.0"
+ },
+ "hotkey_manager_windows": {
+ "dependency": "transitive",
+ "description": {
+ "name": "hotkey_manager_windows",
+ "sha256": "0d03ced9fe563ed0b68f0a0e1b22c9ffe26eb8053cb960e401f68a4f070e0117",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.2.0"
+ },
+ "http": {
+ "dependency": "transitive",
+ "description": {
+ "name": "http",
+ "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.2.2"
+ },
+ "http_multi_server": {
+ "dependency": "transitive",
+ "description": {
+ "name": "http_multi_server",
+ "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.2.1"
+ },
+ "http_parser": {
+ "dependency": "transitive",
+ "description": {
+ "name": "http_parser",
+ "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.0.2"
+ },
+ "image": {
+ "dependency": "direct main",
+ "description": {
+ "name": "image",
+ "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.2.0"
+ },
+ "image_picker": {
+ "dependency": "direct main",
+ "description": {
+ "name": "image_picker",
+ "sha256": "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.2"
+ },
+ "image_picker_android": {
+ "dependency": "transitive",
+ "description": {
+ "name": "image_picker_android",
+ "sha256": "8c5abf0dcc24fe6e8e0b4a5c0b51a5cf30cefdf6407a3213dae61edc75a70f56",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.8.12+12"
+ },
+ "image_picker_for_web": {
+ "dependency": "transitive",
+ "description": {
+ "name": "image_picker_for_web",
+ "sha256": "65d94623e15372c5c51bebbcb820848d7bcb323836e12dfdba60b5d3a8b39e50",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.5"
+ },
+ "image_picker_ios": {
+ "dependency": "transitive",
+ "description": {
+ "name": "image_picker_ios",
+ "sha256": "6703696ad49f5c3c8356d576d7ace84d1faf459afb07accbb0fae780753ff447",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.8.12"
+ },
+ "image_picker_linux": {
+ "dependency": "transitive",
+ "description": {
+ "name": "image_picker_linux",
+ "sha256": "4ed1d9bb36f7cd60aa6e6cd479779cc56a4cb4e4de8f49d487b1aaad831300fa",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.2.1+1"
+ },
+ "image_picker_macos": {
+ "dependency": "transitive",
+ "description": {
+ "name": "image_picker_macos",
+ "sha256": "3f5ad1e8112a9a6111c46d0b57a7be2286a9a07fc6e1976fdf5be2bd31d4ff62",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.2.1+1"
+ },
+ "image_picker_platform_interface": {
+ "dependency": "transitive",
+ "description": {
+ "name": "image_picker_platform_interface",
+ "sha256": "9ec26d410ff46f483c5519c29c02ef0e02e13a543f882b152d4bfd2f06802f80",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.10.0"
+ },
+ "image_picker_windows": {
+ "dependency": "transitive",
+ "description": {
+ "name": "image_picker_windows",
+ "sha256": "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.2.1+1"
+ },
+ "intl": {
+ "dependency": "direct main",
+ "description": {
+ "name": "intl",
+ "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.19.0"
+ },
+ "io": {
+ "dependency": "transitive",
+ "description": {
+ "name": "io",
+ "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.4"
+ },
+ "isolate_contactor": {
+ "dependency": "transitive",
+ "description": {
+ "name": "isolate_contactor",
+ "sha256": "f1be0a90f91e4309ef37cc45280b2a84e769e848aae378318dd3dd263cfc482a",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.2.0"
+ },
+ "isolate_manager": {
+ "dependency": "transitive",
+ "description": {
+ "name": "isolate_manager",
+ "sha256": "8fb916c4444fd408f089448f904f083ac3e169ea1789fd4d987b25809af92188",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.3.1"
+ },
+ "js": {
+ "dependency": "transitive",
+ "description": {
+ "name": "js",
+ "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.7.1"
+ },
+ "json_annotation": {
+ "dependency": "direct main",
+ "description": {
+ "name": "json_annotation",
+ "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.9.0"
+ },
+ "json_serializable": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "json_serializable",
+ "sha256": "ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.8.0"
+ },
+ "launch_at_startup": {
+ "dependency": "direct main",
+ "description": {
+ "name": "launch_at_startup",
+ "sha256": "93fc5638e088290004fae358bae691486673d469957d461d9dae5b12248593eb",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.2.2"
+ },
+ "leak_tracker": {
+ "dependency": "transitive",
+ "description": {
+ "name": "leak_tracker",
+ "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "10.0.5"
+ },
+ "leak_tracker_flutter_testing": {
+ "dependency": "transitive",
+ "description": {
+ "name": "leak_tracker_flutter_testing",
+ "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.5"
+ },
+ "leak_tracker_testing": {
+ "dependency": "transitive",
+ "description": {
+ "name": "leak_tracker_testing",
+ "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.1"
+ },
+ "lints": {
+ "dependency": "transitive",
+ "description": {
+ "name": "lints",
+ "sha256": "cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.0"
+ },
+ "logging": {
+ "dependency": "transitive",
+ "description": {
+ "name": "logging",
+ "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.2.0"
+ },
+ "lpinyin": {
+ "dependency": "direct main",
+ "description": {
+ "name": "lpinyin",
+ "sha256": "0bb843363f1f65170efd09fbdfc760c7ec34fc6354f9fcb2f89e74866a0d814a",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.3"
+ },
+ "matcher": {
+ "dependency": "transitive",
+ "description": {
+ "name": "matcher",
+ "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.12.16+1"
+ },
+ "material_color_utilities": {
+ "dependency": "transitive",
+ "description": {
+ "name": "material_color_utilities",
+ "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.11.1"
+ },
+ "menu_base": {
+ "dependency": "transitive",
+ "description": {
+ "name": "menu_base",
+ "sha256": "820368014a171bd1241030278e6c2617354f492f5c703d7b7d4570a6b8b84405",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.1.1"
+ },
+ "meta": {
+ "dependency": "transitive",
+ "description": {
+ "name": "meta",
+ "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.15.0"
+ },
+ "mime": {
+ "dependency": "transitive",
+ "description": {
+ "name": "mime",
+ "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.6"
+ },
+ "mobile_scanner": {
+ "dependency": "direct main",
+ "description": {
+ "name": "mobile_scanner",
+ "sha256": "d234581c090526676fd8fab4ada92f35c6746e3fb4f05a399665d75a399fb760",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "5.2.3"
+ },
+ "nested": {
+ "dependency": "transitive",
+ "description": {
+ "name": "nested",
+ "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.0"
+ },
+ "octo_image": {
+ "dependency": "transitive",
+ "description": {
+ "name": "octo_image",
+ "sha256": "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.0"
+ },
+ "package_config": {
+ "dependency": "transitive",
+ "description": {
+ "name": "package_config",
+ "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.0"
+ },
+ "package_info_plus": {
+ "dependency": "direct main",
+ "description": {
+ "name": "package_info_plus",
+ "sha256": "2c582551839386fa7ddbc7770658be7c0f87f388a4bff72066478f597c34d17f",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "7.0.0"
+ },
+ "package_info_plus_platform_interface": {
+ "dependency": "transitive",
+ "description": {
+ "name": "package_info_plus_platform_interface",
+ "sha256": "ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.1"
+ },
+ "path": {
+ "dependency": "direct main",
+ "description": {
+ "name": "path",
+ "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.9.0"
+ },
+ "path_provider": {
+ "dependency": "direct main",
+ "description": {
+ "name": "path_provider",
+ "sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.4"
+ },
+ "path_provider_android": {
+ "dependency": "transitive",
+ "description": {
+ "name": "path_provider_android",
+ "sha256": "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.2.10"
+ },
+ "path_provider_foundation": {
+ "dependency": "transitive",
+ "description": {
+ "name": "path_provider_foundation",
+ "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.4.0"
+ },
+ "path_provider_linux": {
+ "dependency": "transitive",
+ "description": {
+ "name": "path_provider_linux",
+ "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.2.1"
+ },
+ "path_provider_platform_interface": {
+ "dependency": "transitive",
+ "description": {
+ "name": "path_provider_platform_interface",
+ "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.2"
+ },
+ "path_provider_windows": {
+ "dependency": "transitive",
+ "description": {
+ "name": "path_provider_windows",
+ "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.3.0"
+ },
+ "petitparser": {
+ "dependency": "transitive",
+ "description": {
+ "name": "petitparser",
+ "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.0.2"
+ },
+ "platform": {
+ "dependency": "transitive",
+ "description": {
+ "name": "platform",
+ "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.1.5"
+ },
+ "plugin_platform_interface": {
+ "dependency": "transitive",
+ "description": {
+ "name": "plugin_platform_interface",
+ "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.8"
+ },
+ "pool": {
+ "dependency": "transitive",
+ "description": {
+ "name": "pool",
+ "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.5.1"
+ },
+ "process_run": {
+ "dependency": "direct main",
+ "description": {
+ "name": "process_run",
+ "sha256": "c917dfb5f7afad4c7485bc00a4df038621248fce046105020cea276d1a87c820",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.0"
+ },
+ "provider": {
+ "dependency": "direct main",
+ "description": {
+ "name": "provider",
+ "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.1.2"
+ },
+ "proxy": {
+ "dependency": "direct main",
+ "description": {
+ "path": "plugins/proxy",
+ "relative": true
+ },
+ "source": "path",
+ "version": "0.0.1"
+ },
+ "pub_semver": {
+ "dependency": "transitive",
+ "description": {
+ "name": "pub_semver",
+ "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.4"
+ },
+ "pubspec_parse": {
+ "dependency": "transitive",
+ "description": {
+ "name": "pubspec_parse",
+ "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.3.0"
+ },
+ "quiver": {
+ "dependency": "transitive",
+ "description": {
+ "name": "quiver",
+ "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.2.2"
+ },
+ "re_editor": {
+ "dependency": "direct main",
+ "description": {
+ "name": "re_editor",
+ "sha256": "abae2b015799c936b9f9b68888e2c55007dd159b4654a85da22ce1af84efbd17",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.3.1"
+ },
+ "re_highlight": {
+ "dependency": "direct main",
+ "description": {
+ "name": "re_highlight",
+ "sha256": "6c4ac3f76f939fb7ca9df013df98526634e17d8f7460e028bd23a035870024f2",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.0.3"
+ },
+ "rxdart": {
+ "dependency": "transitive",
+ "description": {
+ "name": "rxdart",
+ "sha256": "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.28.0"
+ },
+ "screen_retriever": {
+ "dependency": "transitive",
+ "description": {
+ "name": "screen_retriever",
+ "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.1.9"
+ },
+ "shared_preferences": {
+ "dependency": "direct main",
+ "description": {
+ "name": "shared_preferences",
+ "sha256": "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.3.2"
+ },
+ "shared_preferences_android": {
+ "dependency": "transitive",
+ "description": {
+ "name": "shared_preferences_android",
+ "sha256": "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.3.2"
+ },
+ "shared_preferences_foundation": {
+ "dependency": "transitive",
+ "description": {
+ "name": "shared_preferences_foundation",
+ "sha256": "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.5.3"
+ },
+ "shared_preferences_linux": {
+ "dependency": "transitive",
+ "description": {
+ "name": "shared_preferences_linux",
+ "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.4.1"
+ },
+ "shared_preferences_platform_interface": {
+ "dependency": "transitive",
+ "description": {
+ "name": "shared_preferences_platform_interface",
+ "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.4.1"
+ },
+ "shared_preferences_web": {
+ "dependency": "transitive",
+ "description": {
+ "name": "shared_preferences_web",
+ "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.4.2"
+ },
+ "shared_preferences_windows": {
+ "dependency": "transitive",
+ "description": {
+ "name": "shared_preferences_windows",
+ "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.4.1"
+ },
+ "shelf": {
+ "dependency": "transitive",
+ "description": {
+ "name": "shelf",
+ "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.4.1"
+ },
+ "shelf_web_socket": {
+ "dependency": "transitive",
+ "description": {
+ "name": "shelf_web_socket",
+ "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.0"
+ },
+ "shortid": {
+ "dependency": "transitive",
+ "description": {
+ "name": "shortid",
+ "sha256": "d0b40e3dbb50497dad107e19c54ca7de0d1a274eb9b4404991e443dadb9ebedb",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.1.2"
+ },
+ "sky_engine": {
+ "dependency": "transitive",
+ "description": "flutter",
+ "source": "sdk",
+ "version": "0.0.99"
+ },
+ "source_gen": {
+ "dependency": "transitive",
+ "description": {
+ "name": "source_gen",
+ "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.5.0"
+ },
+ "source_helper": {
+ "dependency": "transitive",
+ "description": {
+ "name": "source_helper",
+ "sha256": "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.3.4"
+ },
+ "source_span": {
+ "dependency": "transitive",
+ "description": {
+ "name": "source_span",
+ "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.10.0"
+ },
+ "sprintf": {
+ "dependency": "transitive",
+ "description": {
+ "name": "sprintf",
+ "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "7.0.0"
+ },
+ "sqflite": {
+ "dependency": "transitive",
+ "description": {
+ "name": "sqflite",
+ "sha256": "a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.3.3+1"
+ },
+ "sqflite_common": {
+ "dependency": "transitive",
+ "description": {
+ "name": "sqflite_common",
+ "sha256": "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.5.4"
+ },
+ "stack_trace": {
+ "dependency": "transitive",
+ "description": {
+ "name": "stack_trace",
+ "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.11.1"
+ },
+ "stream_channel": {
+ "dependency": "transitive",
+ "description": {
+ "name": "stream_channel",
+ "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.2"
+ },
+ "stream_transform": {
+ "dependency": "transitive",
+ "description": {
+ "name": "stream_transform",
+ "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.0"
+ },
+ "string_scanner": {
+ "dependency": "transitive",
+ "description": {
+ "name": "string_scanner",
+ "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.2.0"
+ },
+ "synchronized": {
+ "dependency": "transitive",
+ "description": {
+ "name": "synchronized",
+ "sha256": "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.1.0+1"
+ },
+ "term_glyph": {
+ "dependency": "transitive",
+ "description": {
+ "name": "term_glyph",
+ "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.2.1"
+ },
+ "test_api": {
+ "dependency": "transitive",
+ "description": {
+ "name": "test_api",
+ "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.7.2"
+ },
+ "timing": {
+ "dependency": "transitive",
+ "description": {
+ "name": "timing",
+ "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.1"
+ },
+ "tray_manager": {
+ "dependency": "direct main",
+ "description": {
+ "name": "tray_manager",
+ "sha256": "bdc3ac6c36f3d12d871459e4a9822705ce5a1165a17fa837103bc842719bf3f7",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.2.4"
+ },
+ "typed_data": {
+ "dependency": "transitive",
+ "description": {
+ "name": "typed_data",
+ "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.3.2"
+ },
+ "uni_platform": {
+ "dependency": "direct main",
+ "description": {
+ "name": "uni_platform",
+ "sha256": "e02213a7ee5352212412ca026afd41d269eb00d982faa552f419ffc2debfad84",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.1.3"
+ },
+ "url_launcher": {
+ "dependency": "direct main",
+ "description": {
+ "name": "url_launcher",
+ "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.3.0"
+ },
+ "url_launcher_android": {
+ "dependency": "transitive",
+ "description": {
+ "name": "url_launcher_android",
+ "sha256": "f0c73347dfcfa5b3db8bc06e1502668265d39c08f310c29bff4e28eea9699f79",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.3.9"
+ },
+ "url_launcher_ios": {
+ "dependency": "transitive",
+ "description": {
+ "name": "url_launcher_ios",
+ "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.3.1"
+ },
+ "url_launcher_linux": {
+ "dependency": "transitive",
+ "description": {
+ "name": "url_launcher_linux",
+ "sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.2.0"
+ },
+ "url_launcher_macos": {
+ "dependency": "transitive",
+ "description": {
+ "name": "url_launcher_macos",
+ "sha256": "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.2.1"
+ },
+ "url_launcher_platform_interface": {
+ "dependency": "transitive",
+ "description": {
+ "name": "url_launcher_platform_interface",
+ "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.3.2"
+ },
+ "url_launcher_web": {
+ "dependency": "transitive",
+ "description": {
+ "name": "url_launcher_web",
+ "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.3.3"
+ },
+ "url_launcher_windows": {
+ "dependency": "transitive",
+ "description": {
+ "name": "url_launcher_windows",
+ "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.1.2"
+ },
+ "uuid": {
+ "dependency": "transitive",
+ "description": {
+ "name": "uuid",
+ "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.5.1"
+ },
+ "vector_math": {
+ "dependency": "transitive",
+ "description": {
+ "name": "vector_math",
+ "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.4"
+ },
+ "vm_service": {
+ "dependency": "transitive",
+ "description": {
+ "name": "vm_service",
+ "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "14.2.5"
+ },
+ "watcher": {
+ "dependency": "transitive",
+ "description": {
+ "name": "watcher",
+ "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.0"
+ },
+ "web": {
+ "dependency": "transitive",
+ "description": {
+ "name": "web",
+ "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.5.1"
+ },
+ "web_socket": {
+ "dependency": "transitive",
+ "description": {
+ "name": "web_socket",
+ "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.1.6"
+ },
+ "web_socket_channel": {
+ "dependency": "transitive",
+ "description": {
+ "name": "web_socket_channel",
+ "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.1"
+ },
+ "webdav_client": {
+ "dependency": "direct main",
+ "description": {
+ "name": "webdav_client",
+ "sha256": "682fffc50b61dc0e8f46717171db03bf9caaa17347be41c0c91e297553bf86b2",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.2.2"
+ },
+ "win32": {
+ "dependency": "direct main",
+ "description": {
+ "name": "win32",
+ "sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "5.5.4"
+ },
+ "win32_registry": {
+ "dependency": "direct main",
+ "description": {
+ "name": "win32_registry",
+ "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.5"
+ },
+ "window_ext": {
+ "dependency": "direct main",
+ "description": {
+ "path": "plugins/window_ext",
+ "relative": true
+ },
+ "source": "path",
+ "version": "0.0.1"
+ },
+ "window_manager": {
+ "dependency": "direct main",
+ "description": {
+ "name": "window_manager",
+ "sha256": "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.3.9"
+ },
+ "windows_single_instance": {
+ "dependency": "direct main",
+ "description": {
+ "name": "windows_single_instance",
+ "sha256": "50d5dcd6bec90b4a5ed588b1822b1aad21b39fc96da843e61c734b3caccfd2fc",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.1"
+ },
+ "xdg_directories": {
+ "dependency": "transitive",
+ "description": {
+ "name": "xdg_directories",
+ "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.0"
+ },
+ "xml": {
+ "dependency": "transitive",
+ "description": {
+ "name": "xml",
+ "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.5.0"
+ },
+ "yaml": {
+ "dependency": "transitive",
+ "description": {
+ "name": "yaml",
+ "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.1.2"
+ },
+ "yaml_edit": {
+ "dependency": "transitive",
+ "description": {
+ "name": "yaml_edit",
+ "sha256": "e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.2.1"
+ },
+ "zxing2": {
+ "dependency": "direct main",
+ "description": {
+ "name": "zxing2",
+ "sha256": "6cf995abd3c86f01ba882968dedffa7bc130185e382f2300239d2e857fc7912c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.2.3"
+ }
+ },
+ "sdks": {
+ "dart": ">=3.4.4 <4.0.0",
+ "flutter": ">=3.22.0"
+ }
+}
diff --git a/pkgs/by-name/fl/flent/package.nix b/pkgs/by-name/fl/flent/package.nix
new file mode 100644
index 000000000000..5e78f6923f30
--- /dev/null
+++ b/pkgs/by-name/fl/flent/package.nix
@@ -0,0 +1,66 @@
+{
+ lib,
+ python3Packages,
+ fetchPypi,
+ procps,
+ qt5,
+ xvfb-run,
+}:
+python3Packages.buildPythonApplication rec {
+ pname = "flent";
+ version = "2.2.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ hash = "sha256-BPwh3oWIY1YEI+ecgi9AUiX4Ka/Y5dYikwmfvvNB+eg=";
+ };
+
+ build-system = [ python3Packages.sphinx ];
+
+ nativeBuildInputs = [ qt5.wrapQtAppsHook ];
+
+ dependencies = with python3Packages; [
+ matplotlib
+ pyqt5
+ qtpy
+ ];
+
+ nativeCheckInputs = [
+ python3Packages.mock
+ xvfb-run
+ ];
+
+ checkPhase = ''
+ runHook preCheck
+
+ # we want the gui tests to always run
+ sed -i 's|self.skip|pass; #&|' unittests/test_gui.py
+
+ export XDG_RUNTIME_DIR=$(mktemp -d)
+ export HOME=$(mktemp -d)
+ cat >test-runner <&1 | grep "v${version}"
- runHook postInstallCheck
- '';
+ postInstall =
+ let
+ fulcio =
+ if stdenv.buildPlatform.canExecute stdenv.hostPlatform then
+ placeholder "out"
+ else
+ buildPackages.fulcio;
+ in
+ ''
+ installShellCompletion --cmd fulcio \
+ --bash <(${fulcio}/bin/fulcio completion bash) \
+ --fish <(${fulcio}/bin/fulcio completion fish) \
+ --zsh <(${fulcio}/bin/fulcio completion zsh)
+ '';
+
+ passthru.tests.version = testers.testVersion {
+ package = fulcio;
+ command = "fulcio version";
+ version = "v${version}";
+ };
meta = with lib; {
homepage = "https://github.com/sigstore/fulcio";
@@ -79,6 +98,9 @@ buildGoModule rec {
disconnected instance.
'';
license = licenses.asl20;
- maintainers = with maintainers; [ lesuisse jk ];
+ maintainers = with maintainers; [
+ lesuisse
+ jk
+ ];
};
}
diff --git a/pkgs/by-name/fy/fyne/package.nix b/pkgs/by-name/fy/fyne/package.nix
index fafe2a36a3be..6411c84d22b0 100644
--- a/pkgs/by-name/fy/fyne/package.nix
+++ b/pkgs/by-name/fy/fyne/package.nix
@@ -17,16 +17,16 @@
buildGoModule rec {
pname = "fyne";
- version = "2.5.1";
+ version = "2.5.2";
src = fetchFromGitHub {
owner = "fyne-io";
repo = "fyne";
rev = "refs/tags/v${version}";
- hash = "sha256-21/52Uub5+l0TcuWZ9QSyckgR1kKNfDvro1CF5QuZWA=";
+ hash = "sha256-XaD7t1hSv5plDa6QHDTyoWgzvSFMRezvHl47YphXoig=";
};
- vendorHash = "sha256-+g11BRf9xRXjtF8InzdTHGOGOf8lJgLKEdBR5DcpEmo=";
+ vendorHash = "sha256-uV+pbGxAV/uuHV0xl2vPZpgGYRj9/E0rhFtLfCV5rnE=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix
index 0dd3feaa7caf..4e0bd6de84a2 100644
--- a/pkgs/by-name/fz/fzf-make/package.nix
+++ b/pkgs/by-name/fz/fzf-make/package.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "fzf-make";
- version = "0.36.0";
+ version = "0.37.0";
src = fetchFromGitHub {
owner = "kyu08";
repo = "fzf-make";
rev = "v${version}";
- hash = "sha256-IlPkJK4pYszrJ43HSTq9Xwpz3K9XnUpoF0Ry7ox85KE=";
+ hash = "sha256-msSiVlz6Aey8Q+NjtKl58TOkYtPIzw3733kVGs9/8UQ=";
};
- cargoHash = "sha256-mMDPpiIWhGMl0a4v1msNfcQqmq5ziB+ppw7RxYNAPaI=";
+ cargoHash = "sha256-q67UAAVvc070eArfMo4r/UcUUjODuR/vMukiA4ylQ5w=";
nativeBuildInputs = [ makeBinaryWrapper ];
diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix
index f133ec7b6158..809e5133d820 100644
--- a/pkgs/by-name/fz/fzf/package.nix
+++ b/pkgs/by-name/fz/fzf/package.nix
@@ -11,16 +11,16 @@
buildGoModule rec {
pname = "fzf";
- version = "0.55.0";
+ version = "0.56.0";
src = fetchFromGitHub {
owner = "junegunn";
repo = "fzf";
rev = "v${version}";
- hash = "sha256-4ikNCepLF7odkaEO+tzgrHb4528LetPEeMStJVZyjWg=";
+ hash = "sha256-HG2GQwic1wJ0OiCinBEZ1wfjqXuq37udEpBwLt7LIA0=";
};
- vendorHash = "sha256-b7hCXDJ/EJr1sEvmS2RYaxBMkdWOo2LWe76mamD3BSY=";
+ vendorHash = "sha256-dsQyoSJQT5PwhZ/anth5YjNXf6ZubrCza6kXWZJ3DgA=";
CGO_ENABLED = 0;
diff --git a/pkgs/by-name/ga/gale/package.nix b/pkgs/by-name/ga/gale/package.nix
new file mode 100644
index 000000000000..c7863715c7ae
--- /dev/null
+++ b/pkgs/by-name/ga/gale/package.nix
@@ -0,0 +1,91 @@
+{
+ lib,
+ stdenv,
+ rustPlatform,
+ fetchFromGitHub,
+
+ fetchNpmDeps,
+ npmHooks,
+ nodejs,
+ cargo-tauri,
+ pkg-config,
+ wrapGAppsHook3,
+
+ openssl,
+ libsoup_3,
+ webkitgtk_4_1,
+}:
+
+let
+ cargo-tauri_2 =
+ let
+ pname = "cargo-tauri";
+ version = "2.0.0-rc.3";
+ src = fetchFromGitHub {
+ owner = "tauri-apps";
+ repo = "tauri";
+ rev = "tauri-v${version}";
+ hash = "sha256-PV8m/MzYgbY4Hv71dZrqVbrxmxrwFfOAraLJIaQk6FQ=";
+ };
+ in
+ cargo-tauri.overrideAttrs {
+ inherit src version;
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit pname version src;
+ sourceRoot = "${src.name}/tooling/cli";
+ hash = "sha256-JPlMaoPw6a7D20KQH7iuhHKfGT5oUKf55tMaMYEM/Z4=";
+ };
+ };
+in
+stdenv.mkDerivation (finalAttrs: {
+ pname = "gale";
+ version = "0.8.11";
+
+ src = fetchFromGitHub {
+ owner = "Kesomannen";
+ repo = "gale";
+ rev = "refs/tags/${finalAttrs.version}";
+ hash = "sha256-PXK64WD3vb3uVxBFNU+LiGOipUjIAKW9RLWr1o4RigU=";
+ };
+
+ npmDeps = fetchNpmDeps {
+ name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
+ inherit (finalAttrs) src;
+ hash = "sha256-W0ryt3WH/3SireaOHa9i1vKpuokzIsDlD8R9Fnd0s4k=";
+ };
+
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit (finalAttrs) pname version src;
+ sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";
+ hash = "sha256-zXZkjSYN6/qNwBh+xUgJPWQvduIUSMVSt/XGbocKTwg=";
+ };
+
+ cargoRoot = "src-tauri";
+
+ buildAndTestSubdir = finalAttrs.cargoRoot;
+
+ nativeBuildInputs = [
+ npmHooks.npmConfigHook
+ nodejs
+ rustPlatform.cargoSetupHook
+ (cargo-tauri.hook.override { cargo-tauri = cargo-tauri_2; })
+ rustPlatform.cargoCheckHook
+ pkg-config
+ wrapGAppsHook3
+ ];
+
+ buildInputs = [
+ libsoup_3
+ webkitgtk_4_1
+ openssl
+ ];
+
+ meta = {
+ description = "Lightweight Thunderstore client";
+ homepage = "https://github.com/Kesomannen/gale";
+ license = lib.licenses.gpl3Only;
+ mainProgram = "gale";
+ maintainers = with lib.maintainers; [ tomasajt ];
+ platforms = lib.platforms.linux;
+ };
+})
diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix
index 02451f777480..2d7850c96629 100644
--- a/pkgs/by-name/ga/gamescope/package.nix
+++ b/pkgs/by-name/ga/gamescope/package.nix
@@ -47,14 +47,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gamescope";
- version = "3.15.11";
+ version = "3.15.13";
src = fetchFromGitHub {
owner = "ValveSoftware";
repo = "gamescope";
rev = "refs/tags/${finalAttrs.version}";
fetchSubmodules = true;
- hash = "sha256-O2pxaPDwEr9ko7Zplv65qRUDzIk1Q54Q7Rgs94VkTII=";
+ hash = "sha256-AePYKdDyAtnVkL8/VeWmhJ3ATZnhyVZcU/QtVpCfTQE=";
};
patches = [
diff --git a/pkgs/by-name/ga/gate/package.nix b/pkgs/by-name/ga/gate/package.nix
index da55f8db8769..bd91e2bf7864 100644
--- a/pkgs/by-name/ga/gate/package.nix
+++ b/pkgs/by-name/ga/gate/package.nix
@@ -5,7 +5,7 @@
let
pname = "gate";
- version = "0.41.0";
+ version = "0.42.0";
in
buildGoModule {
inherit pname version;
@@ -14,10 +14,10 @@ buildGoModule {
owner = "minekube";
repo = "gate";
rev = "refs/tags/v${version}";
- hash = "sha256-tQO1ClfZasRdnazFOMOWeqnXaEda84lQMQKw5640YCI=";
+ hash = "sha256-a2rt+V6y8lyBMSG49eWLTPeLZKIjq+a5NBL+agIL1dg=";
};
- vendorHash = "sha256-Nl6NGz+sEdwcTzbL+OwHuaQzi2lHX/cN2lE6HNi1uJQ=";
+ vendorHash = "sha256-5s96L9KWeiS//21mQMn8ka82Uk4rMbq/8I+l67HTSA8=";
ldflags = [ "-s" "-w" ];
diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix
index 10ff2d736574..1dd8ecfbc823 100644
--- a/pkgs/by-name/ga/gatus/package.nix
+++ b/pkgs/by-name/ga/gatus/package.nix
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "gatus";
- version = "5.12.1";
+ version = "5.13.0";
src = fetchFromGitHub {
owner = "TwiN";
repo = "gatus";
rev = "v${version}";
- hash = "sha256-K9jEepcxfV1sAC3YKqkvDA9HHlobksJPwsAcqD3gcmQ=";
+ hash = "sha256-+wXkB6QPAXerv8WKk4f7WA44eEaiw92Z+1bqhkZk9qQ=";
};
- vendorHash = "sha256-jRRFj4NdxsjC9CM+Vm5+gV0ZMbz45YtGyE3FaGaGp28=";
+ vendorHash = "sha256-pM47Jy7WIS8+3mFEmPZdnyxcDjoxgdP46xuTmf4p2JM=";
subPackages = [ "." ];
diff --git a/pkgs/by-name/ge/gearlever/package.nix b/pkgs/by-name/ge/gearlever/package.nix
index acaa80af9693..4530bddb2e99 100644
--- a/pkgs/by-name/ge/gearlever/package.nix
+++ b/pkgs/by-name/ge/gearlever/package.nix
@@ -21,14 +21,14 @@
python3Packages.buildPythonApplication rec {
pname = "gearlever";
- version = "2.0.7";
+ version = "2.1.0";
pyproject = false; # Built with meson
src = fetchFromGitHub {
owner = "mijorus";
repo = "gearlever";
rev = "refs/tags/${version}";
- hash = "sha256-Zp0w6ZJFRV5IANF0sY/n8jqgG+3h9J2eV/dUP+we8PY=";
+ hash = "sha256-OpNzJwEjLni/vG1RtRSH29wovMRwKzJn+Vep1vZDEFM=";
};
postPatch =
diff --git a/pkgs/by-name/ge/geesefs/package.nix b/pkgs/by-name/ge/geesefs/package.nix
index 7393705254d7..e463e88c7327 100644
--- a/pkgs/by-name/ge/geesefs/package.nix
+++ b/pkgs/by-name/ge/geesefs/package.nix
@@ -3,7 +3,7 @@
, fetchFromGitHub
}:
-let version = "0.41.3";
+let version = "0.42.0";
in buildGoModule {
pname = "geesefs";
inherit version;
@@ -12,12 +12,12 @@ in buildGoModule {
owner = "yandex-cloud";
repo = "geesefs";
rev = "v${version}";
- hash = "sha256-KdxqOkz8U8ts/pU/sTMuDIBLxwvdtrkkGptYboh06Qo=";
+ hash = "sha256-bScx+4g1g4mE2l8nCWVZz/QT8jKOOpksqMmlTDp+DsA=";
};
# hashes differ per architecture otherwise.
proxyVendor = true;
- vendorHash = "sha256-pO6ZngGw9vp47cstOTpQ/lBpBQRXIUuSuhsldZPR5Sk=";
+ vendorHash = "sha256-50ND58TuEilORX24qRSfWlO2A1fkCakm16UPOCse11E=";
subPackages = [ "." ];
diff --git a/pkgs/by-name/ge/geis/package.nix b/pkgs/by-name/ge/geis/package.nix
new file mode 100644
index 000000000000..8446cb446a17
--- /dev/null
+++ b/pkgs/by-name/ge/geis/package.nix
@@ -0,0 +1,89 @@
+{
+ lib,
+ stdenv,
+ fetchurl,
+ pkg-config,
+ python3Packages,
+ wrapGAppsHook3,
+ atk,
+ dbus,
+ evemu,
+ frame,
+ gdk-pixbuf,
+ gobject-introspection,
+ grail,
+ gtk3,
+ xorg,
+ pango,
+ xorgserver,
+ testers,
+ validatePkgConfig,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "geis";
+ version = "2.2.17";
+
+ src = fetchurl {
+ url = "https://launchpad.net/geis/trunk/${finalAttrs.version}/+download/geis-${finalAttrs.version}.tar.xz";
+ hash = "sha256-imD1aDhSCUA4kE5pDSPMWpCpgPxS2mfw8oiQuqJccOs=";
+ };
+
+ env.NIX_CFLAGS_COMPILE = "-Wno-error=misleading-indentation -Wno-error=pointer-compare";
+
+ hardeningDisable = [ "format" ];
+
+ pythonPath = with python3Packages; [ pygobject3 ];
+
+ nativeBuildInputs = [
+ pkg-config
+ wrapGAppsHook3
+ python3Packages.wrapPython
+ gobject-introspection
+ validatePkgConfig
+ ];
+
+ buildInputs = [
+ atk
+ dbus
+ evemu
+ frame
+ gdk-pixbuf
+ grail
+ gtk3
+ xorg.libX11
+ xorg.libXext
+ xorg.libXi
+ xorg.libXtst
+ pango
+ python3Packages.python
+ xorgserver
+ ];
+
+ prePatch = ''
+ substituteInPlace python/geis/geis_v2.py --replace-fail \
+ "ctypes.util.find_library(\"geis\")" "'$out/lib/libgeis.so'"
+ substituteInPlace config.aux/py-compile \
+ --replace-fail "import sys, os, py_compile, imp" "import sys, os, py_compile, importlib" \
+ --replace-fail "imp." "importlib." \
+ --replace-fail "hasattr(imp" "hasattr(importlib"
+ '';
+
+ preFixup = ''
+ buildPythonPath "$out $pythonPath"
+ gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH")
+ '';
+
+ passthru.tests.pkg-config = testers.hasPkgConfigModules {
+ package = finalAttrs.finalPackage;
+ versionCheck = true;
+ };
+
+ meta = {
+ description = "Library for input gesture recognition";
+ homepage = "https://launchpad.net/geis";
+ license = lib.licenses.gpl2;
+ platforms = lib.platforms.linux;
+ pkgConfigModules = [ "libgeis" ];
+ };
+})
diff --git a/pkgs/by-name/ge/gersemi/package.nix b/pkgs/by-name/ge/gersemi/package.nix
index 0712846cc7fc..23168bead7b9 100644
--- a/pkgs/by-name/ge/gersemi/package.nix
+++ b/pkgs/by-name/ge/gersemi/package.nix
@@ -6,13 +6,13 @@
python3Packages.buildPythonApplication rec {
pname = "gersemi";
- version = "0.16.2";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "BlankSpruce";
repo = "gersemi";
- rev = version;
- hash = "sha256-B2mDtMLJTriSeeH0SLQ7qP/PyaNE5eTQ/mgm4S5B8g0=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-t9W27lwNKRFAraynAGEawFb1qCW9/b3RCm/jeb9zJXg=";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/by-name/gi/git-chain/package.nix b/pkgs/by-name/gi/git-chain/package.nix
new file mode 100644
index 000000000000..1b66e4eb5d21
--- /dev/null
+++ b/pkgs/by-name/gi/git-chain/package.nix
@@ -0,0 +1,48 @@
+{
+ lib,
+ fetchFromGitHub,
+ rustPlatform,
+ pkg-config,
+ openssl,
+ git,
+ nix-update-script,
+ stdenv,
+ darwin,
+}:
+
+rustPlatform.buildRustPackage {
+ pname = "git-chain";
+ version = "0-unstable-2024-08-09";
+
+ src = fetchFromGitHub {
+ owner = "dashed";
+ repo = "git-chain";
+ rev = "4fee033ea1ee51bbb6b7f75411f0f4f799aea1e2";
+ hash = "sha256-wQZXixg7mCBUo18z/WCkTWW3R0j2jxs8t1yaQzY3Eu4=";
+ };
+
+ cargoHash = "sha256-pRxOrlDgfSpUBY2WKfoIH9ngLzb2noiLqxA3/6s+mRw=";
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs =
+ [ openssl ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin (
+ with darwin.apple_sdk.frameworks;
+ [
+ Security
+ ]
+ );
+
+ nativeCheckInputs = [ git ];
+
+ passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+ meta = with lib; {
+ description = "Tool for rebasing a chain of local git branches";
+ homepage = "https://github.com/dashed/git-chain";
+ license = licenses.mit;
+ mainProgram = "git-chain";
+ maintainers = with maintainers; [ bcyran ];
+ };
+}
diff --git a/pkgs/by-name/gi/github-markdown-toc-go/package.nix b/pkgs/by-name/gi/github-markdown-toc-go/package.nix
new file mode 100644
index 000000000000..809664c90d1d
--- /dev/null
+++ b/pkgs/by-name/gi/github-markdown-toc-go/package.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+buildGoModule rec {
+ pname = "github-markdown-toc-go";
+ version = "1.4.0";
+
+ src = fetchFromGitHub {
+ owner = "ekalinin";
+ repo = "github-markdown-toc.go";
+ rev = "v${version}";
+ hash = "sha256-tZGAvbC9lrNhtRubCJUkQShRsfCsaAeI6XHhSp4FkS0=";
+ };
+
+ vendorHash = "sha256-K5yb7bnW6eS5UESK9wgNEUwGjB63eJk6+B0jFFiFero=";
+
+ meta = {
+ homepage = "https://github.com/ekalinin/github-markdown-toc.go";
+ description = "Easy TOC creation for GitHub README.md (in go)";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ dannixon ];
+ mainProgram = "gh-md-toc";
+ };
+}
diff --git a/pkgs/by-name/gi/gitlab-ci-ls/package.nix b/pkgs/by-name/gi/gitlab-ci-ls/package.nix
index a7a85c977fc2..ed0f4c522756 100644
--- a/pkgs/by-name/gi/gitlab-ci-ls/package.nix
+++ b/pkgs/by-name/gi/gitlab-ci-ls/package.nix
@@ -10,15 +10,15 @@
rustPlatform.buildRustPackage rec {
pname = "gitlab-ci-ls";
- version = "0.21.3";
+ version = "0.22.0";
src = fetchFromGitHub {
owner = "alesbrelih";
repo = "gitlab-ci-ls";
rev = "${version}";
- hash = "sha256-3PqGnknP5ilwPCDsD8GwIEamZC24lEnuQhipTo8RDI0=";
+ hash = "sha256-RXM581tW78YzH+NQhkpsbHz6m+PAF7NQ5p3TFugPo+M=";
};
- cargoHash = "sha256-c31madEElZpHbzyKHqUDyPW/maVrkNKlldX24Y3iFGQ=";
+ cargoHash = "sha256-PuNpkDjoJr1GttETWHA9X+LYNIJSgBXdZId5q2JSo6g=";
nativeBuildInputs = [ pkg-config ];
buildInputs =
diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix
index 33eb8d0c9bea..db382be54fe7 100644
--- a/pkgs/by-name/gi/gitu/package.nix
+++ b/pkgs/by-name/gi/gitu/package.nix
@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "gitu";
- version = "0.25.0";
+ version = "0.26.0";
src = fetchFromGitHub {
owner = "altsem";
repo = "gitu";
rev = "v${version}";
- hash = "sha256-DqJ/O87LdNXmJNmoBCdAvLod8uDRHlNuMzAv+kEew1w=";
+ hash = "sha256-rHlehYdyBYyhP/kFciFW0vmaewtXYuypaHMzqyMDXYA=";
};
- cargoHash = "sha256-rfj2rDqO/sMaghpou2TCTfqrUmPxh0qooR6hhqlS4PM=";
+ cargoHash = "sha256-b0Z1SOprsVe8Sg4X0ooOahE9yrP65CV1otZ3nXFvPHo=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/by-name/gm/gmic/package.nix b/pkgs/by-name/gm/gmic/package.nix
index 38f3f8ba2261..21ebebd8f677 100644
--- a/pkgs/by-name/gm/gmic/package.nix
+++ b/pkgs/by-name/gm/gmic/package.nix
@@ -29,7 +29,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gmic";
- version = "3.4.2";
+ version = "3.4.3";
outputs = [ "out" "lib" "dev" "man" ];
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "GreycLab";
repo = "gmic";
rev = "v.${finalAttrs.version}";
- hash = "sha256-oyhwdX/eWbb5i7j/Aw7ocJk3KrGdxfKJx+P4Hzemlw8=";
+ hash = "sha256-dYHADdt9PboUgIRU6wu5uCs2KQ88z5/FZPXvvyYct00=";
};
# TODO: build this from source
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
gmic_stdlib = fetchurl {
name = "gmic_stdlib_community.h";
url = "https://gmic.eu/gmic_stdlib_community${lib.replaceStrings ["."] [""] finalAttrs.version}.h";
- hash = "sha256-quzQ0g6kmbJFygUOlKdTn9Fe9J7jhlLOiNal1kX3iHY=";
+ hash = "sha256-M/AL1w9KGi+dIGVQ+vdWY8PSCHi+s/aZef08AxeQMJE=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/go/go-dnscollector/package.nix b/pkgs/by-name/go/go-dnscollector/package.nix
new file mode 100644
index 000000000000..ab1d4a44da5e
--- /dev/null
+++ b/pkgs/by-name/go/go-dnscollector/package.nix
@@ -0,0 +1,28 @@
+{
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+}:
+
+buildGoModule rec {
+ pname = "go-dnscollector";
+ version = "1.1.0";
+
+ src = fetchFromGitHub {
+ owner = "dmachard";
+ repo = "go-dnscollector";
+ rev = "v${version}";
+ sha256 = "sha256-+EE9miEm1sHxTHcQ+Zmnj5ljSisKtds9L+SLIvgIfb4=";
+ };
+
+ vendorHash = "sha256-Njv8EGPS45NpCs0+poBxVGWLHhH+mSZuI80kIpsijDQ=";
+
+ subPackages = [ "." ];
+
+ meta = with lib; {
+ description = "Ingesting, pipelining, and enhancing your DNS logs with usage indicators, security analysis, and additional metadata.";
+ homepage = "https://github.com/dmachard/go-dnscollector";
+ license = licenses.mit;
+ maintainers = with maintainers; [ shift ];
+ };
+}
diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index c06b8d0f746b..d491ef1ce7ac 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -166,11 +166,11 @@ let
linux = stdenv.mkDerivation (finalAttrs: {
inherit pname meta passthru;
- version = "130.0.6723.58";
+ version = "130.0.6723.69";
src = fetchurl {
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
- hash = "sha256-HWFC+9Op4ja/S3eP56N9hkOkMbCrbF+NHEcxSLb85Hg=";
+ hash = "sha256-MhLaPV2Ht4ZYsmrs4HWYtv/IFqD/mQVZwA/IVnZfND8=";
};
# With strictDeps on, some shebangs were not being patched correctly
@@ -266,11 +266,11 @@ let
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
inherit pname meta passthru;
- version = "130.0.6723.59";
+ version = "130.0.6723.70";
src = fetchurl {
- url = "http://dl.google.com/release2/chrome/oehlfkedv43jkzlol2mqd6xife_130.0.6723.59/GoogleChrome-130.0.6723.59.dmg";
- hash = "sha256-ioEWtD49XtZTItz+bCiDobV0nW82Dv6S41/oHlUsatU=";
+ url = "http://dl.google.com/release2/chrome/acl5a2wdujowx65sbvjgokb6thqq_130.0.6723.70/GoogleChrome-130.0.6723.70.dmg";
+ hash = "sha256-Ft+kBhYnnMpsRsCmmXp9rgyGuwCAb9WW6u5z6UJzh7o=";
};
dontPatch = true;
diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/by-name/go/goreleaser/package.nix
similarity index 70%
rename from pkgs/tools/misc/goreleaser/default.nix
rename to pkgs/by-name/go/goreleaser/package.nix
index eb6d6351f2e6..13742e1b8c4b 100644
--- a/pkgs/tools/misc/goreleaser/default.nix
+++ b/pkgs/by-name/go/goreleaser/package.nix
@@ -1,27 +1,32 @@
-{ stdenv
-, lib
-, buildGoModule
-, fetchFromGitHub
-, installShellFiles
-, buildPackages
-, testers
-, goreleaser
+{
+ stdenv,
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+ installShellFiles,
+ buildPackages,
+ testers,
+ goreleaser,
}:
buildGoModule rec {
pname = "goreleaser";
- version = "2.2.0";
+ version = "2.3.2";
src = fetchFromGitHub {
owner = "goreleaser";
repo = pname;
rev = "v${version}";
- hash = "sha256-E/jLCjyXId5XsIBiDUxi7w9Dybb4SZJRc5gkCwHsTww=";
+ hash = "sha256-YKcduPxcXU1Ixexr/DxeVRfLxYdHNFcGNLbBiH6cIUU=";
};
- vendorHash = "sha256-+7SWKJGJlFyYkPjU3N5bWHbIzXBzG/fc9Yhy/jXt2lc=";
+ vendorHash = "sha256-3gC2wZz3t6ObqAJ2g80kTrW2OEAyBptdqmN7cQKqZ/w=";
- ldflags =
- [ "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" ];
+ ldflags = [
+ "-s"
+ "-w"
+ "-X main.version=${version}"
+ "-X main.builtBy=nixpkgs"
+ ];
# tests expect the source files to be a build repo
doCheck = false;
@@ -29,8 +34,10 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
postInstall =
- let emulator = stdenv.hostPlatform.emulator buildPackages;
- in ''
+ let
+ emulator = stdenv.hostPlatform.emulator buildPackages;
+ in
+ ''
${emulator} $out/bin/goreleaser man > goreleaser.1
installManPage ./goreleaser.1
installShellCompletion --cmd goreleaser \
diff --git a/pkgs/by-name/go/gotestdox/package.nix b/pkgs/by-name/go/gotestdox/package.nix
new file mode 100644
index 000000000000..c9a0c55ccf92
--- /dev/null
+++ b/pkgs/by-name/go/gotestdox/package.nix
@@ -0,0 +1,35 @@
+{
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+ nix-update-script,
+}:
+
+buildGoModule rec {
+ pname = "gotestdox";
+ version = "0.2.2";
+
+ src = fetchFromGitHub {
+ owner = "bitfield";
+ repo = "gotestdox";
+ rev = "v${version}";
+ hash = "sha256-AZDXMwADOjcaMiofMWoHp+eSnD3a8iFtwpWDKl9Ess8=";
+ };
+
+ vendorHash = "sha256-kDSZ4RZTHDFmu7ernYRjg0PV7eBB2lH8q5wW3kTExDs=";
+
+ ldflags = [
+ "-s"
+ "-w"
+ ];
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ description = "Tool for formatting Go test results as readable documentation";
+ homepage = "https://github.com/bitfield/gotestdox";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ eljamm ];
+ mainProgram = "gotestdox";
+ };
+}
diff --git a/pkgs/by-name/gr/grafana-kiosk/package.nix b/pkgs/by-name/gr/grafana-kiosk/package.nix
index 3f81fe7ca501..39a26d95056a 100644
--- a/pkgs/by-name/gr/grafana-kiosk/package.nix
+++ b/pkgs/by-name/gr/grafana-kiosk/package.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "grafana-kiosk";
- version = "1.0.7";
+ version = "1.0.8";
src = fetchFromGitHub {
owner = "grafana";
repo = "grafana-kiosk";
rev = "v${version}";
- hash = "sha256-JTz3EaedJFWE3YqsBLjKH4hWI7+dNeMlp0sZ2kW8IR8=";
+ hash = "sha256-M0Gz0+MQNTIOYBxVRaxk5kYZwoJy1nPckGcYF29EzHA=";
};
- vendorHash = "sha256-8sxfbSj0Jq5f0oJoe8PtP72PDWvLzgOeRiP7I/Pfam4=";
+ vendorHash = "sha256-dnA5Z6VX7+RLpV7+PPuckH+v407dK8nbe0OVJtfG1YE=";
nativeBuildInputs = [ makeWrapper ];
postFixup = ''
diff --git a/pkgs/by-name/gr/granian/package.nix b/pkgs/by-name/gr/granian/package.nix
index ce2b033f2773..2462ba964cf6 100644
--- a/pkgs/by-name/gr/granian/package.nix
+++ b/pkgs/by-name/gr/granian/package.nix
@@ -8,21 +8,20 @@
python3Packages.buildPythonApplication rec {
pname = "granian";
- version = "1.6.0";
+ version = "1.6.1";
pyproject = true;
src = fetchFromGitHub {
owner = "emmett-framework";
repo = "granian";
rev = "v${version}";
- hash = "sha256-ZIwZrLl7goweYUj3t5e0yaOqeppFHXvK9PL3chNZZRw=";
+ hash = "sha256-Cuojg2Ko+KH/279z7HGYEthrMAqLgmnoHGjZ8HL7unw=";
};
- cargoDeps = rustPlatform.importCargoLock {
- lockFile = ./Cargo.lock;
- outputHashes = {
- "pyo3-log-0.11.0" = "sha256-UU8064vM7cf20lwfifyPC205CY4tIgif0slDz/Pjf9Q=";
- };
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ name = "${pname}-${version}";
+ hash = "sha256-dRBjN0/EmQlGtQ1iGvSPE30KOHVlkWpjpMU2lpIGUdA=";
};
nativeBuildInputs = with rustPlatform; [
diff --git a/pkgs/by-name/gr/granted/package.nix b/pkgs/by-name/gr/granted/package.nix
index 43a32eb4d180..307c245eb590 100644
--- a/pkgs/by-name/gr/granted/package.nix
+++ b/pkgs/by-name/gr/granted/package.nix
@@ -1,27 +1,30 @@
-{ bash
-, buildGoModule
-, fetchFromGitHub
+{
+ bash,
+ buildGoModule,
+ fetchFromGitHub,
+ nix-update-script,
+ versionCheckHook,
-, withFish ? false
-, fish
+ withFish ? false,
+ fish,
-, lib
-, makeWrapper
-, xdg-utils
+ lib,
+ makeWrapper,
+ xdg-utils,
}:
buildGoModule rec {
pname = "granted";
- version = "0.34.1";
+ version = "0.35.2";
src = fetchFromGitHub {
owner = "common-fate";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-iNGagF4+Lz73Ctvh8Qs90E+xvuGi7LWHV/VbjjqMqRY=";
+ sha256 = "sha256-8Ou1TkPGAsrRfV75ntPKpXTUEhVkwgtaXErrRX8hR0E=";
};
- vendorHash = "sha256-uKzs+plk1W2S7iPv2J1Mi1Ff88+82zrIXLy2eTzD/Hc=";
+ vendorHash = "sha256-XCq+hDxK7C9XYlKe+lUArQlPheWALx806o1IeCRD7vs=";
nativeBuildInputs = [ makeWrapper ];
@@ -73,18 +76,26 @@ buildGoModule rec {
# Insert below the #!/bin/sh shebang
echo "$addToPath" | sed "/#!\/bin\/sh/r /dev/stdin" $src/scripts/assume >> $out/bin/assume
- '' + lib.optionalString withFish ''
- # Install fish script
- install -Dm755 $src/scripts/assume.fish $out/share/assume.fish
- substituteInPlace $out/share/assume.fish \
- --replace /bin/fish ${fish}/bin/fish
- '';
+ ''
+ + lib.optionalString withFish ''
+ # Install fish script
+ install -Dm755 $src/scripts/assume.fish $out/share/assume.fish
+ substituteInPlace $out/share/assume.fish \
+ --replace /bin/fish ${fish}/bin/fish
+ '';
+
+ nativeInstallCheckInputs = [ versionCheckHook ];
+ doInstallCheck = true;
+
+ passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "Easiest way to access your cloud";
homepage = "https://github.com/common-fate/granted";
changelog = "https://github.com/common-fate/granted/releases/tag/${version}";
license = licenses.mit;
- maintainers = [ maintainers.ivankovnatsky ];
+ maintainers = with maintainers; [
+ jlbribeiro
+ ];
};
}
diff --git a/pkgs/by-name/gr/grap/package.nix b/pkgs/by-name/gr/grap/package.nix
new file mode 100644
index 000000000000..556857150040
--- /dev/null
+++ b/pkgs/by-name/gr/grap/package.nix
@@ -0,0 +1,83 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ boost,
+ libseccomp,
+ flex,
+ swig,
+ bison,
+ cmake,
+ python3Packages,
+ makeShellWrapper,
+}:
+
+python3Packages.buildPythonApplication rec {
+ pname = "grap";
+ version = "1.3.1";
+ pyproject = false;
+
+ src = fetchFromGitHub {
+ owner = "QuoSecGmbH";
+ repo = "grap";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-zLIKoNOdrmTyZkQGRogeKfIRk4kpG0hmeN0519SJbbo=";
+ };
+
+ dependencies = with python3Packages; [
+ setuptools
+ capstone
+ ];
+
+ nativeBuildInputs = [
+ bison
+ cmake
+ flex
+ swig
+ makeShellWrapper
+ ];
+
+ buildInputs = [
+ boost.all
+ libseccomp
+ ];
+
+ strictDeps = true;
+
+ cmakeFlags = [
+ "-DPYTHON_SITE_DIR=${placeholder "out"}/${python3Packages.python.sitePackages}"
+ "../src"
+ ];
+
+ postPatch = ''
+ substituteInPlace src/tools/grap-match/CMakeLists.txt --replace-fail "/usr/local/bin" "$out/bin"
+
+ substituteInPlace src/tools/grap/CMakeLists.txt --replace-fail "/usr/local/bin" "$out/bin"
+
+ substituteInPlace src/bindings/python/CMakeLists.txt --replace-fail "distutils" "setuptools._distutils"
+
+ substituteInPlace src/tools/setup.py --replace-fail "distutils.core" "setuptools"
+ '';
+
+ postInstall = ''
+ cd $out/${python3Packages.python.sitePackages}
+ mv pygrap.so _pygrap.so
+ substituteInPlace pygrap.py \
+ --replace-fail "import imp" "import importlib" \
+ --replace-fail "imp." "importlib."
+ '';
+
+ meta = {
+ description = "Define and match graph patterns within binaries";
+ longDescription = ''
+ grap takes patterns and binary files, uses a Casptone-based disassembler to obtain the control flow graphs from the binaries, then matches the patterns against them.
+
+ Patterns are user-defined graphs with instruction conditions ("opcode is xor and arg1 is eax") and repetition conditions (3 identical instructions, basic blocks...).
+ '';
+ homepage = "https://github.com/QuoSecGmbH/grap/";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ s1341 ];
+ platforms = lib.platforms.linux;
+ mainProgram = "grap";
+ };
+}
diff --git a/pkgs/by-name/gr/gromit-mpx/package.nix b/pkgs/by-name/gr/gromit-mpx/package.nix
new file mode 100644
index 000000000000..48c2e0aead13
--- /dev/null
+++ b/pkgs/by-name/gr/gromit-mpx/package.nix
@@ -0,0 +1,70 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ cmake,
+ pkg-config,
+ gtk3,
+ glib,
+ pcre,
+ libappindicator-gtk3,
+ libpthreadstubs,
+ xorg,
+ libxkbcommon,
+ libepoxy,
+ at-spi2-core,
+ dbus,
+ libdbusmenu,
+ lz4,
+ wrapGAppsHook3,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "gromit-mpx";
+ version = "1.7.0";
+
+ src = fetchFromGitHub {
+ owner = "bk138";
+ repo = "gromit-mpx";
+ rev = finalAttrs.version;
+ hash = "sha256-jHw4V2ZvfpT3PUihe/O+9BPsv+udFg5seMbYmxOz8Yk=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ wrapGAppsHook3
+ ];
+
+ buildInputs = [
+ gtk3
+ glib
+ pcre
+ libappindicator-gtk3
+ libpthreadstubs
+ xorg.libXdmcp
+ libxkbcommon
+ libepoxy
+ at-spi2-core
+ dbus
+ libdbusmenu
+ lz4
+ ];
+
+ meta = with lib; {
+ description = "Desktop annotation tool";
+ longDescription = ''
+ Gromit-MPX (GRaphics Over MIscellaneous Things) is a small tool
+ to make annotations on the screen.
+ '';
+ homepage = "https://github.com/bk138/gromit-mpx";
+ changelog = "https://github.com/bk138/gromit-mpx/blob/${finalAttrs.version}/NEWS.md";
+ maintainers = with maintainers; [
+ pjones
+ gepbird
+ ];
+ platforms = platforms.linux;
+ license = licenses.gpl2Plus;
+ mainProgram = "gromit-mpx";
+ };
+})
diff --git a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix
index 19f81b25989c..2605f504889d 100644
--- a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix
+++ b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix
@@ -68,13 +68,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
stdenvNoCC.mkDerivation
{
inherit pname;
- version = "0-unstable-2024-09-12";
+ version = "0-unstable-2024-10-29";
src = fetchFromGitHub {
owner = "Fausto-Korpsvart";
repo = "Gruvbox-GTK-Theme";
- rev = "48faf6afee9eea5f3b8c277c936bcb9f76bd95f7";
- hash = "sha256-LAMVTDVCxjk+reS/StsVdTlsx0DrCxNLClWk6za5D5o=";
+ rev = "eed38589ce90aaca4c278e13087c2babaccea4da";
+ hash = "sha256-FXzD7wHqh9pZgjGXFYko43yaFCn+Y317N8xRsgt6RhE=";
};
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
diff --git a/pkgs/by-name/gs/gsan/package.nix b/pkgs/by-name/gs/gsan/package.nix
new file mode 100644
index 000000000000..8217d4b1c3c2
--- /dev/null
+++ b/pkgs/by-name/gs/gsan/package.nix
@@ -0,0 +1,42 @@
+{
+ lib,
+ fetchFromGitHub,
+ python3,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "gsan";
+ version = "5.0.0";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "franccesco";
+ repo = "getaltname";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-Os/NappuvdadGqCouF5vhvPhRnu1SLpii+Esq0C1j48=";
+ };
+
+ build-system = with python3.pkgs; [ setuptools ];
+
+ dependencies = with python3.pkgs; [
+ cryptography
+ pyasn1
+ pyopenssl
+ rich
+ typer
+ ];
+
+ # Project has no tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "gsan" ];
+
+ meta = {
+ description = "Tool to extract subdomains from SSL certificates in HTTPS sites";
+ homepage = "https://github.com/franccesco/getaltname";
+ changelog = "https://github.com/franccesco/getaltname/releases/tag/v${version}";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ fab ];
+ mainProgram = "gsan";
+ };
+}
diff --git a/pkgs/by-name/gu/gui-for-clash/package.nix b/pkgs/by-name/gu/gui-for-clash/package.nix
new file mode 100644
index 000000000000..b4c5263a5d6d
--- /dev/null
+++ b/pkgs/by-name/gu/gui-for-clash/package.nix
@@ -0,0 +1,140 @@
+{
+ stdenv,
+ nodejs,
+ pnpm,
+ fetchFromGitHub,
+ buildGoModule,
+ lib,
+ wails,
+ webkitgtk_4_0,
+ pkg-config,
+ libsoup_3,
+ wrapGAppsHook3,
+ autoPatchelfHook,
+ makeDesktopItem,
+ copyDesktopItems,
+}:
+let
+ pname = "gui-for-clash";
+ version = "1.8.9";
+ src = fetchFromGitHub {
+ owner = "GUI-for-Cores";
+ repo = "GUI.for.Clash";
+ rev = "v${version}";
+ hash = "sha256-jNYMv3gPbZV2JlTV0v0NQ06HkXDzgHXuEdJrBgQ+p2g=";
+ };
+ frontend = stdenv.mkDerivation (finalAttrs: {
+ inherit pname version src;
+
+ nativeBuildInputs = [
+ nodejs
+ pnpm.configHook
+ ];
+
+ pnpmDeps = pnpm.fetchDeps {
+ inherit (finalAttrs) pname version src;
+ sourceRoot = "${finalAttrs.src.name}/frontend";
+ hash = "sha256-RQtU61H1YklCgJrlyHALxUZp8OvVs2MgFThWBsYk2cs=";
+ };
+
+ sourceRoot = "${finalAttrs.src.name}/frontend";
+
+ buildPhase = ''
+ runHook preBuild
+
+ pnpm run build
+
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir $out/
+ cp -r ./dist/* $out/
+
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "GUI program developed by vue3";
+ license = with lib.licenses; [ gpl3Plus ];
+ maintainers = with lib.maintainers; [ aucub ];
+ platforms = lib.platforms.linux;
+ };
+ });
+in
+buildGoModule {
+ inherit pname version src;
+
+ vendorHash = "sha256-rDbJOj8t/qu04Rd8J0LnXiBoIDmdzBQ9avAhImK7dFg=";
+
+ nativeBuildInputs = [
+ wails
+ pkg-config
+ wrapGAppsHook3
+ autoPatchelfHook
+ copyDesktopItems
+ ];
+
+ buildInputs = [
+ webkitgtk_4_0
+ libsoup_3
+ ];
+
+ desktopItems = [
+ (makeDesktopItem {
+ name = "GUI.for.Clash";
+ exec = "GUI.for.Clash";
+ icon = "GUI.for.Clash";
+ genericName = "GUI.for.Clash";
+ desktopName = "GUI.for.Clash";
+ categories = [
+ "Network"
+ ];
+ keywords = [
+ "Proxy"
+ ];
+ })
+ ];
+
+ postUnpack = ''
+ cp -r ${frontend} $sourceRoot/frontend/dist
+ '';
+
+ postPatch = ''
+ sed -i '/exePath, err := os.Executable()/,+3d' bridge/bridge.go
+ substituteInPlace bridge/bridge.go \
+ --replace-fail "Env.BasePath = filepath.Dir(exePath)" "" \
+ --replace-fail "Env.AppName = filepath.Base(exePath)" "Env.AppName = \"GUI.for.Clash\"
+ Env.BasePath = filepath.Join(os.Getenv(\"HOME\"), \".config\", Env.AppName)" \
+ --replace-fail 'exePath := Env.BasePath' 'exePath := "${placeholder "out"}/bin"'
+ '';
+
+ buildPhase = ''
+ runHook preBuild
+
+ wails build -m -s -trimpath -skipbindings -devtools -tags webkit2_40 -o GUI.for.Clash
+
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/share/pixmaps
+ cp -r ./build/bin $out/bin
+ cp build/appicon.png $out/share/pixmaps/GUI.for.Clash.png
+
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "Clash GUI program developed by vue3 + wails";
+ homepage = "https://github.com/GUI-for-Cores/GUI.for.Clash";
+ mainProgram = "GUI.for.Clash";
+ license = with lib.licenses; [ gpl3Plus ];
+ maintainers = with lib.maintainers; [ aucub ];
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/pkgs/by-name/gu/guile-ssh/package.nix b/pkgs/by-name/gu/guile-ssh/package.nix
index ad3a8c547442..5fca74a79462 100644
--- a/pkgs/by-name/gu/guile-ssh/package.nix
+++ b/pkgs/by-name/gu/guile-ssh/package.nix
@@ -12,13 +12,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "guile-ssh";
- version = "0.16.3";
+ # XXX: using unstable to ensure proper build with libssh 0.11.1 (https://github.com/artyom-poptsov/guile-ssh/issues/42)
+ version = "0.17.0-unstable-2024-10-15";
src = fetchFromGitHub {
owner = "artyom-poptsov";
repo = "guile-ssh";
- rev = "v${finalAttrs.version}";
- hash = "sha256-P29U88QrCjoyl/wdTPZbiMoykd/v6ul6CW/IJn9UAyw=";
+ rev = "9336580f92f83bb73041c5374b400144a56b4c35";
+ hash = "sha256-Hwg0xaNSm/SEZfzczjb7o8TJXfzT1mmOk1rJROxahLQ=";
};
patches = [
diff --git a/pkgs/by-name/gu/guix/guix-build-user-takeover-fix.patch b/pkgs/by-name/gu/guix/guix-build-user-takeover-fix.patch
new file mode 100644
index 000000000000..0e22f0f35042
--- /dev/null
+++ b/pkgs/by-name/gu/guix/guix-build-user-takeover-fix.patch
@@ -0,0 +1,42 @@
+diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
+index c5383bc..50d1abc 100644
+--- a/nix/libstore/build.cc
++++ b/nix/libstore/build.cc
+@@ -2312,15 +2312,6 @@ void DerivationGoal::registerOutputs()
+ Path actualPath = path;
+ if (useChroot) {
+ actualPath = chrootRootDir + path;
+- if (pathExists(actualPath)) {
+- /* Move output paths from the chroot to the store. */
+- if (buildMode == bmRepair)
+- replaceValidPath(path, actualPath);
+- else
+- if (buildMode != bmCheck && rename(actualPath.c_str(), path.c_str()) == -1)
+- throw SysError(format("moving build output `%1%' from the chroot to the store") % path);
+- }
+- if (buildMode != bmCheck) actualPath = path;
+ } else {
+ Path redirected = redirectedOutputs[path];
+ if (buildMode == bmRepair
+@@ -2360,6 +2351,21 @@ void DerivationGoal::registerOutputs()
+ something like that. */
+ canonicalisePathMetaData(actualPath, buildUser.enabled() ? buildUser.getUID() : -1, inodesSeen);
+
++ if (useChroot) {
++ if (pathExists(actualPath)) {
++ /* Now that output paths have been canonicalized (in particular
++ there are no setuid files left), move them outside of the
++ chroot and to the store. */
++ if (buildMode == bmRepair)
++ replaceValidPath(path, actualPath);
++ else
++ if (buildMode != bmCheck && rename(actualPath.c_str(), path.c_str()) == -1)
++ throw SysError(format("moving build output `%1%' from the chroot to the store") % path);
++ }
++ if (buildMode != bmCheck) actualPath = path;
++ }
++
++
+ /* FIXME: this is in-memory. */
+ StringSink sink;
+ dumpPath(actualPath, sink);
diff --git a/pkgs/by-name/gu/guix/package.nix b/pkgs/by-name/gu/guix/package.nix
index 90eb4dfefec4..5752a45ae635 100644
--- a/pkgs/by-name/gu/guix/package.nix
+++ b/pkgs/by-name/gu/guix/package.nix
@@ -1,39 +1,40 @@
-{ lib
-, stdenv
-, fetchurl
-, fetchpatch
-, autoreconfHook
-, disarchive
-, git
-, glibcLocales
-, guile
-, guile-avahi
-, guile-gcrypt
-, guile-git
-, guile-gnutls
-, guile-json
-, guile-lib
-, guile-lzlib
-, guile-lzma
-, guile-semver
-, guile-ssh
-, guile-sqlite3
-, guile-zlib
-, guile-zstd
-, help2man
-, makeWrapper
-, pkg-config
-, po4a
-, scheme-bytestructures
-, texinfo
-, bzip2
-, libgcrypt
-, sqlite
-, nixosTests
+{
+ lib,
+ stdenv,
+ fetchurl,
+ fetchpatch,
+ autoreconfHook,
+ disarchive,
+ git,
+ glibcLocales,
+ guile,
+ guile-avahi,
+ guile-gcrypt,
+ guile-git,
+ guile-gnutls,
+ guile-json,
+ guile-lib,
+ guile-lzlib,
+ guile-lzma,
+ guile-semver,
+ guile-ssh,
+ guile-sqlite3,
+ guile-zlib,
+ guile-zstd,
+ help2man,
+ makeWrapper,
+ pkg-config,
+ po4a,
+ scheme-bytestructures,
+ texinfo,
+ bzip2,
+ libgcrypt,
+ sqlite,
+ nixosTests,
-, stateDir ? "/var"
-, storeDir ? "/gnu/store"
-, confDir ? "/etc"
+ stateDir ? "/var",
+ storeDir ? "/gnu/store",
+ confDir ? "/etc",
}:
stdenv.mkDerivation rec {
@@ -56,6 +57,9 @@ stdenv.mkDerivation rec {
url = "https://git.savannah.gnu.org/cgit/guix.git/patch/?id=ff1251de0bc327ec478fc66a562430fbf35aef42";
hash = "sha256-f4KWDVrvO/oI+4SCUHU5GandkGtHrlaM1BWygM/Qlao=";
})
+ # manual port of build user takeover remediation commit
+ # see https://guix.gnu.org/en/blog/2024/build-user-takeover-vulnerability
+ ./guix-build-user-takeover-fix.patch
];
postPatch = ''
@@ -157,7 +161,10 @@ stdenv.mkDerivation rec {
changelog = "https://git.savannah.gnu.org/cgit/guix.git/plain/NEWS?h=v${version}";
license = licenses.gpl3Plus;
mainProgram = "guix";
- maintainers = with maintainers; [ cafkafk foo-dogsquared ];
+ maintainers = with maintainers; [
+ cafkafk
+ foo-dogsquared
+ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/by-name/ma/matrix-hebbot/package.nix b/pkgs/by-name/he/hebbot/package.nix
similarity index 100%
rename from pkgs/by-name/ma/matrix-hebbot/package.nix
rename to pkgs/by-name/he/hebbot/package.nix
diff --git a/pkgs/by-name/he/hello/package.nix b/pkgs/by-name/he/hello/package.nix
index d56423eea6cf..0590131913f4 100644
--- a/pkgs/by-name/he/hello/package.nix
+++ b/pkgs/by-name/he/hello/package.nix
@@ -1,11 +1,12 @@
-{ callPackage
-, lib
-, stdenv
-, fetchurl
-, nixos
-, testers
-, versionCheckHook
-, hello
+{
+ callPackage,
+ lib,
+ stdenv,
+ fetchurl,
+ nixos,
+ testers,
+ versionCheckHook,
+ hello,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -42,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru.tests.run = callPackage ./test.nix { hello = finalAttrs.finalPackage; };
- meta = with lib; {
+ meta = {
description = "Program that produces a familiar, friendly greeting";
longDescription = ''
GNU Hello is a program that prints "Hello, world!" when you run it.
@@ -50,9 +51,9 @@ stdenv.mkDerivation (finalAttrs: {
'';
homepage = "https://www.gnu.org/software/hello/manual/";
changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${finalAttrs.version}";
- license = licenses.gpl3Plus;
- maintainers = [ ];
+ license = lib.licenses.gpl3Plus;
+ maintainers = with lib.maintainers; [ stv0g ];
mainProgram = "hello";
- platforms = platforms.all;
+ platforms = lib.platforms.all;
};
})
diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/by-name/he/hexyl/package.nix
similarity index 58%
rename from pkgs/tools/misc/hexyl/default.nix
rename to pkgs/by-name/he/hexyl/package.nix
index 5f72c7a702f3..715d8ba6f238 100644
--- a/pkgs/tools/misc/hexyl/default.nix
+++ b/pkgs/by-name/he/hexyl/package.nix
@@ -1,19 +1,23 @@
-{ lib, rustPlatform, fetchFromGitHub }:
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+}:
rustPlatform.buildRustPackage rec {
pname = "hexyl";
- version = "0.14.0";
+ version = "0.15.0";
src = fetchFromGitHub {
owner = "sharkdp";
- repo = pname;
- rev = "v${version}";
- hash = "sha256-di7SBuB4LsnqlP3BdMcsSLj4zpyKA/ninVpRyR9AJaI=";
+ repo = "hexyl";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-v/mB0W/AyoJSoK00pqxpfMGZR/4DkkTCnPU6eorl/GI=";
};
- cargoHash = "sha256-fXrdOiCmRgMPJxZIS/SkTkZZkag8ZUhNnMlU4k1m/+0=";
+ cargoHash = "sha256-QaOp7dCXfkIpxAJ+J+Pt9op3uj+LYoYvR78BmHBgnqE=";
- meta = with lib; {
+ meta = {
description = "Command-line hex viewer";
longDescription = ''
`hexyl` is a simple hex viewer for the terminal. It uses a colored
@@ -23,8 +27,15 @@ rustPlatform.buildRustPackage rec {
'';
homepage = "https://github.com/sharkdp/hexyl";
changelog = "https://github.com/sharkdp/hexyl/blob/v${version}/CHANGELOG.md";
- license = with licenses; [ asl20 /* or */ mit ];
- maintainers = with maintainers; [ dywedir figsoda SuperSandro2000 ];
+ license = with lib.licenses; [
+ asl20
+ mit
+ ];
+ maintainers = with lib.maintainers; [
+ dywedir
+ figsoda
+ SuperSandro2000
+ ];
mainProgram = "hexyl";
};
}
diff --git a/pkgs/by-name/hi/hiddify-app/package.nix b/pkgs/by-name/hi/hiddify-app/package.nix
new file mode 100644
index 000000000000..172c4d65bc34
--- /dev/null
+++ b/pkgs/by-name/hi/hiddify-app/package.nix
@@ -0,0 +1,181 @@
+{
+ lib,
+ fetchFromGitHub,
+ pkg-config,
+ flutter,
+ buildGoModule,
+ libayatana-appindicator,
+ stdenv,
+ fetchurl,
+ makeDesktopItem,
+ copyDesktopItems,
+ wrapGAppsHook3,
+ autoPatchelfHook,
+}:
+let
+ pname = "hiddify-app";
+ version = "2.5.7-unstable-2024-10-30";
+ src = fetchFromGitHub {
+ owner = "hiddify";
+ repo = "hiddify-app";
+ rev = "0144cddf670df11d1586a0dc76483f4c4f5b4230";
+ hash = "sha256-bjZkc0H0409YxM6AGrhm6gPaKNj/9SiVs0AUPoLJX+o=";
+ fetchSubmodules = true;
+ };
+ libcore = buildGoModule rec {
+ inherit pname version src;
+
+ modRoot = "./libcore";
+
+ vendorHash = "sha256-a7NFZt4/w2+oaZG3ncaOrrhASxUptcWS/TeaIQrgLe4=";
+
+ GO_PUBLIC_FLAGS = ''
+ -tags "with_gvisor,with_quic,with_wireguard,with_ech,with_utls,with_clash_api,with_grpc" \
+ -trimpath \
+ -ldflags "-s -w" \
+ '';
+
+ postPatch = ''
+ sed -i '/import (/a\ \t"os"\n\t"path/filepath"' ./libcore/v2/db/hiddify_db.go
+ substituteInPlace ./libcore/v2/db/hiddify_db.go \
+ --replace-fail 'NewGoLevelDBWithOpts(name, "./data", ' 'NewGoLevelDBWithOpts(name, filepath.Join(os.Getenv("HOME"), ".local", "share", "app.hiddify.com", "data"), '
+ '';
+
+ buildPhase = ''
+ runHook preBuild
+
+ go build ${GO_PUBLIC_FLAGS} -buildmode=c-shared -o bin/lib/libcore.so ./custom
+ mkdir lib
+ cp bin/lib/libcore.so ./lib/libcore.so
+ CGO_LDFLAGS="./lib/libcore.so" go build ${GO_PUBLIC_FLAGS} -o bin/HiddifyCli ./cli/bydll
+
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin $out/lib
+ cp ./bin/HiddifyCli $out/bin/HiddifyCli
+ cp ./lib/libcore.so $out/lib/libcore.so
+
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "Multi-platform auto-proxy client, supporting Sing-box, X-ray, TUIC, Hysteria, Reality, Trojan, SSH etc";
+ homepage = "https://hiddify.com";
+ mainProgram = "HiddifyCli";
+ license = lib.licenses.cc-by-nc-sa-40;
+ platforms = lib.platforms.linux;
+ maintainers = with lib.maintainers; [ aucub ];
+ };
+ };
+ sqlite-autoconf = fetchurl {
+ url = "https://sqlite.org/2024/sqlite-autoconf-3460000.tar.gz";
+ hash = "sha256-b45qezNSc3SIFvmztiu9w3Koid6HgtfwSMZTpEdBen0=";
+ };
+in
+flutter.buildFlutterApplication {
+ inherit pname version src;
+
+ pubspecLock = lib.importJSON ./pubspec.lock.json;
+
+ buildInputs = [
+ libayatana-appindicator
+ ];
+
+ nativeBuildInputs = [
+ pkg-config
+ autoPatchelfHook
+ wrapGAppsHook3
+ copyDesktopItems
+ ];
+
+ customSourceBuilders = {
+ sqlite3_flutter_libs =
+ { version, src, ... }:
+ stdenv.mkDerivation rec {
+ pname = "sqlite3_flutter_libs";
+ inherit version src;
+ inherit (src) passthru;
+ postPatch = ''
+ substituteInPlace linux/CMakeLists.txt \
+ --replace-fail "https://sqlite.org/2024/sqlite-autoconf-3460000.tar.gz" "file://${sqlite-autoconf}"
+ '';
+ installPhase = ''
+ runHook preInstall
+ mkdir $out
+ cp -a ./* $out/
+ runHook postInstall
+ '';
+ };
+ };
+
+ postPatch = ''
+ substituteInPlace ./linux/my_application.cc \
+ --replace-fail "./hiddify.png" "${placeholder "out"}/share/pixmaps/hiddify.png"
+ '';
+
+ preBuild = ''
+ cp -r ${libcore}/lib libcore/bin/lib
+ cp ${libcore}/bin/HiddifyCli libcore/bin/HiddifyCli
+ packageRun build_runner build --delete-conflicting-outputs
+ packageRun slang
+ '';
+
+ postInstall = ''
+ mkdir -p $out/share/pixmaps/
+ cp ./assets/images/source/ic_launcher_border.png $out/share/pixmaps/hiddify.png
+ '';
+
+ desktopItems = [
+ (makeDesktopItem {
+ name = "hiddify";
+ exec = "hiddify";
+ icon = "hiddify";
+ genericName = "Hiddify";
+ desktopName = "Hiddify";
+ categories = [
+ "Network"
+ ];
+ keywords = [
+ "Hiddify"
+ "Proxy"
+ "VPN"
+ "V2ray"
+ "Nekoray"
+ "Xray"
+ "Psiphon"
+ "OpenVPN"
+ ];
+ })
+ ];
+
+ flutterBuildFlags = [
+ "--target lib/main_prod.dart"
+ ];
+
+ gitHashes = {
+ circle_flags = "sha256-dqORH4yj0jU8r9hP9NTjrlEO0ReHt4wds7BhgRPq57g=";
+ flutter_easy_permission = "sha256-fs2dIwFLmeDrlFIIocGw6emOW1whGi9W7nQ7mHqp8R0=";
+ humanizer = "sha256-zsDeol5l6maT8L8R6RRtHyd7CJn5908nvRXIytxiPqc=";
+ };
+
+ extraWrapProgramArgs = ''
+ --prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib"
+ '';
+
+ preFixup = ''
+ patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" $out/app/${pname}/lib/lib*.so
+ '';
+
+ meta = {
+ description = "Multi-platform auto-proxy client, supporting Sing-box, X-ray, TUIC, Hysteria, Reality, Trojan, SSH etc";
+ homepage = "https://hiddify.com";
+ mainProgram = "hiddify";
+ license = lib.licenses.cc-by-nc-sa-40;
+ platforms = lib.platforms.linux;
+ maintainers = with lib.maintainers; [ aucub ];
+ };
+}
diff --git a/pkgs/by-name/hi/hiddify-app/pubspec.lock.json b/pkgs/by-name/hi/hiddify-app/pubspec.lock.json
new file mode 100644
index 000000000000..c6093503f3f9
--- /dev/null
+++ b/pkgs/by-name/hi/hiddify-app/pubspec.lock.json
@@ -0,0 +1,2531 @@
+{
+ "packages": {
+ "_fe_analyzer_shared": {
+ "dependency": "transitive",
+ "description": {
+ "name": "_fe_analyzer_shared",
+ "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "67.0.0"
+ },
+ "accessibility_tools": {
+ "dependency": "direct main",
+ "description": {
+ "name": "accessibility_tools",
+ "sha256": "deca88d9f181ad6fdd12df9c5fa952c763264da14336ca1c0e4124525725b174",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.1"
+ },
+ "analyzer": {
+ "dependency": "transitive",
+ "description": {
+ "name": "analyzer",
+ "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.4.1"
+ },
+ "analyzer_plugin": {
+ "dependency": "transitive",
+ "description": {
+ "name": "analyzer_plugin",
+ "sha256": "9661b30b13a685efaee9f02e5d01ed9f2b423bd889d28a304d02d704aee69161",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.11.3"
+ },
+ "ansicolor": {
+ "dependency": "transitive",
+ "description": {
+ "name": "ansicolor",
+ "sha256": "8bf17a8ff6ea17499e40a2d2542c2f481cd7615760c6d34065cb22bfd22e6880",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.2"
+ },
+ "archive": {
+ "dependency": "transitive",
+ "description": {
+ "name": "archive",
+ "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.6.1"
+ },
+ "args": {
+ "dependency": "transitive",
+ "description": {
+ "name": "args",
+ "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.5.0"
+ },
+ "async": {
+ "dependency": "transitive",
+ "description": {
+ "name": "async",
+ "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.11.0"
+ },
+ "boolean_selector": {
+ "dependency": "transitive",
+ "description": {
+ "name": "boolean_selector",
+ "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.1"
+ },
+ "build": {
+ "dependency": "transitive",
+ "description": {
+ "name": "build",
+ "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.4.1"
+ },
+ "build_config": {
+ "dependency": "transitive",
+ "description": {
+ "name": "build_config",
+ "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.1"
+ },
+ "build_daemon": {
+ "dependency": "transitive",
+ "description": {
+ "name": "build_daemon",
+ "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.0.2"
+ },
+ "build_resolvers": {
+ "dependency": "transitive",
+ "description": {
+ "name": "build_resolvers",
+ "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.4.2"
+ },
+ "build_runner": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "build_runner",
+ "sha256": "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.4.11"
+ },
+ "build_runner_core": {
+ "dependency": "transitive",
+ "description": {
+ "name": "build_runner_core",
+ "sha256": "e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "7.3.1"
+ },
+ "built_collection": {
+ "dependency": "transitive",
+ "description": {
+ "name": "built_collection",
+ "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "5.1.1"
+ },
+ "built_value": {
+ "dependency": "transitive",
+ "description": {
+ "name": "built_value",
+ "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "8.9.2"
+ },
+ "characters": {
+ "dependency": "transitive",
+ "description": {
+ "name": "characters",
+ "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.3.0"
+ },
+ "charcode": {
+ "dependency": "transitive",
+ "description": {
+ "name": "charcode",
+ "sha256": "fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.3.1"
+ },
+ "checked_yaml": {
+ "dependency": "transitive",
+ "description": {
+ "name": "checked_yaml",
+ "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.3"
+ },
+ "circle_flags": {
+ "dependency": "direct main",
+ "description": {
+ "path": ".",
+ "ref": "HEAD",
+ "resolved-ref": "19d83cba60de91143491a441b5076583bf1681a8",
+ "url": "https://github.com/hiddify-com/flutter_circle_flags.git"
+ },
+ "source": "git",
+ "version": "4.1.0"
+ },
+ "cli_util": {
+ "dependency": "transitive",
+ "description": {
+ "name": "cli_util",
+ "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.4.1"
+ },
+ "clock": {
+ "dependency": "transitive",
+ "description": {
+ "name": "clock",
+ "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.1"
+ },
+ "code_builder": {
+ "dependency": "transitive",
+ "description": {
+ "name": "code_builder",
+ "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.10.0"
+ },
+ "collection": {
+ "dependency": "transitive",
+ "description": {
+ "name": "collection",
+ "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.18.0"
+ },
+ "color": {
+ "dependency": "transitive",
+ "description": {
+ "name": "color",
+ "sha256": "ddcdf1b3badd7008233f5acffaf20ca9f5dc2cd0172b75f68f24526a5f5725cb",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.0"
+ },
+ "combine": {
+ "dependency": "direct main",
+ "description": {
+ "name": "combine",
+ "sha256": "c16464b55d140871fbab5b37909e1808c2f020e46f9ba7deca59d40faabb6008",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.5.7"
+ },
+ "convert": {
+ "dependency": "transitive",
+ "description": {
+ "name": "convert",
+ "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.1.1"
+ },
+ "cross_file": {
+ "dependency": "transitive",
+ "description": {
+ "name": "cross_file",
+ "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.3.4+2"
+ },
+ "crypto": {
+ "dependency": "transitive",
+ "description": {
+ "name": "crypto",
+ "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.3"
+ },
+ "csslib": {
+ "dependency": "transitive",
+ "description": {
+ "name": "csslib",
+ "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.0"
+ },
+ "csv": {
+ "dependency": "transitive",
+ "description": {
+ "name": "csv",
+ "sha256": "c6aa2679b2a18cb57652920f674488d89712efaf4d3fdf2e537215b35fc19d6c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.0.0"
+ },
+ "cupertino_http": {
+ "dependency": "direct main",
+ "description": {
+ "name": "cupertino_http",
+ "sha256": "7e75c45a27cc13a886ab0a1e4d8570078397057bd612de9d24fe5df0d9387717",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.5.1"
+ },
+ "cupertino_icons": {
+ "dependency": "direct main",
+ "description": {
+ "name": "cupertino_icons",
+ "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.8"
+ },
+ "custom_lint_core": {
+ "dependency": "transitive",
+ "description": {
+ "name": "custom_lint_core",
+ "sha256": "a85e8f78f4c52f6c63cdaf8c872eb573db0231dcdf3c3a5906d493c1f8bc20e6",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.6.3"
+ },
+ "dart_mappable": {
+ "dependency": "direct main",
+ "description": {
+ "name": "dart_mappable",
+ "sha256": "47269caf2060533c29b823ff7fa9706502355ffcb61e7f2a374e3a0fb2f2c3f0",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.2.2"
+ },
+ "dart_mappable_builder": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "dart_mappable_builder",
+ "sha256": "ab5cf9086862d3fceb9773e945b5f95cc5471a28c782a4fc451bd400a4e0c64e",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.2.3"
+ },
+ "dart_style": {
+ "dependency": "transitive",
+ "description": {
+ "name": "dart_style",
+ "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.3.6"
+ },
+ "dartx": {
+ "dependency": "direct main",
+ "description": {
+ "name": "dartx",
+ "sha256": "8b25435617027257d43e6508b5fe061012880ddfdaa75a71d607c3de2a13d244",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.2.0"
+ },
+ "decimal": {
+ "dependency": "transitive",
+ "description": {
+ "name": "decimal",
+ "sha256": "24a261d5d5c87e86c7651c417a5dbdf8bcd7080dd592533910e8d0505a279f21",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.3.3"
+ },
+ "dependency_validator": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "dependency_validator",
+ "sha256": "f727a5627aa405965fab4aef4f468e50a9b632ba0737fd2f98c932fec6d712b9",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.2.3"
+ },
+ "device_info_plus": {
+ "dependency": "transitive",
+ "description": {
+ "name": "device_info_plus",
+ "sha256": "77f757b789ff68e4eaf9c56d1752309bd9f7ad557cb105b938a7f8eb89e59110",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "9.1.2"
+ },
+ "device_info_plus_platform_interface": {
+ "dependency": "transitive",
+ "description": {
+ "name": "device_info_plus_platform_interface",
+ "sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "7.0.1"
+ },
+ "dio": {
+ "dependency": "direct main",
+ "description": {
+ "name": "dio",
+ "sha256": "e17f6b3097b8c51b72c74c9f071a605c47bcc8893839bd66732457a5ebe73714",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "5.5.0+1"
+ },
+ "dio_smart_retry": {
+ "dependency": "direct main",
+ "description": {
+ "name": "dio_smart_retry",
+ "sha256": "3d71450c19b4d91ef4c7d726a55a284bfc11eb3634f1f25006cdfab3f8595653",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.0.0"
+ },
+ "dio_web_adapter": {
+ "dependency": "transitive",
+ "description": {
+ "name": "dio_web_adapter",
+ "sha256": "36c5b2d79eb17cdae41e974b7a8284fec631651d2a6f39a8a2ff22327e90aeac",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.1"
+ },
+ "drift": {
+ "dependency": "direct main",
+ "description": {
+ "name": "drift",
+ "sha256": "4e0ffee40d23f0b809e6cff1ad202886f51d629649073ed42d9cd1d194ea943e",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.19.1+1"
+ },
+ "drift_dev": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "drift_dev",
+ "sha256": "ac7647c6cedca99724ca300cff9181f6dd799428f8ed71f94159ed0528eaec26",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.19.1"
+ },
+ "dynamic_color": {
+ "dependency": "direct main",
+ "description": {
+ "name": "dynamic_color",
+ "sha256": "eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.7.0"
+ },
+ "equatable": {
+ "dependency": "transitive",
+ "description": {
+ "name": "equatable",
+ "sha256": "c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.5"
+ },
+ "fake_async": {
+ "dependency": "transitive",
+ "description": {
+ "name": "fake_async",
+ "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.3.1"
+ },
+ "ffi": {
+ "dependency": "direct main",
+ "description": {
+ "name": "ffi",
+ "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.2"
+ },
+ "ffigen": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "ffigen",
+ "sha256": "d3e76c2ad48a4e7f93a29a162006f00eba46ce7c08194a77bb5c5e97d1b5ff0a",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "8.0.2"
+ },
+ "file": {
+ "dependency": "transitive",
+ "description": {
+ "name": "file",
+ "sha256": "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.1.4"
+ },
+ "fixnum": {
+ "dependency": "transitive",
+ "description": {
+ "name": "fixnum",
+ "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.0"
+ },
+ "fluentui_system_icons": {
+ "dependency": "direct main",
+ "description": {
+ "name": "fluentui_system_icons",
+ "sha256": "af92e0abc8a4060ffdcae2ad31a050cd242bf9eff121769b9cfb11fe05d08d6c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.252"
+ },
+ "flutter": {
+ "dependency": "direct main",
+ "description": "flutter",
+ "source": "sdk",
+ "version": "0.0.0"
+ },
+ "flutter_adaptive_scaffold": {
+ "dependency": "direct main",
+ "description": {
+ "name": "flutter_adaptive_scaffold",
+ "sha256": "a464b74540401cade07af0ae84d19f210534cac67651a150fb413507040b74f6",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.1.12"
+ },
+ "flutter_animate": {
+ "dependency": "direct main",
+ "description": {
+ "name": "flutter_animate",
+ "sha256": "7c8a6594a9252dad30cc2ef16e33270b6248c4dedc3b3d06c86c4f3f4dc05ae5",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.5.0"
+ },
+ "flutter_displaymode": {
+ "dependency": "direct main",
+ "description": {
+ "name": "flutter_displaymode",
+ "sha256": "42c5e9abd13d28ed74f701b60529d7f8416947e58256e6659c5550db719c57ef",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.6.0"
+ },
+ "flutter_easy_permission": {
+ "dependency": "direct main",
+ "description": {
+ "path": ".",
+ "ref": "HEAD",
+ "resolved-ref": "3f6611f2a88f7ed640207c3accab9178f76da2c6",
+ "url": "https://github.com/unger1984/flutter_easy_permission.git"
+ },
+ "source": "git",
+ "version": "1.1.3"
+ },
+ "flutter_gen_core": {
+ "dependency": "transitive",
+ "description": {
+ "name": "flutter_gen_core",
+ "sha256": "d8e828ad015a8511624491b78ad8e3f86edb7993528b1613aefbb4ad95947795",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "5.6.0"
+ },
+ "flutter_gen_runner": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "flutter_gen_runner",
+ "sha256": "931b03f77c164df0a4815aac0efc619a6ac8ec4cada55025119fca4894dada90",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "5.6.0"
+ },
+ "flutter_hooks": {
+ "dependency": "direct main",
+ "description": {
+ "name": "flutter_hooks",
+ "sha256": "cde36b12f7188c85286fba9b38cc5a902e7279f36dd676967106c041dc9dde70",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.20.5"
+ },
+ "flutter_keyboard_visibility": {
+ "dependency": "transitive",
+ "description": {
+ "name": "flutter_keyboard_visibility",
+ "sha256": "98664be7be0e3ffca00de50f7f6a287ab62c763fc8c762e0a21584584a3ff4f8",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.0.0"
+ },
+ "flutter_keyboard_visibility_linux": {
+ "dependency": "transitive",
+ "description": {
+ "name": "flutter_keyboard_visibility_linux",
+ "sha256": "6fba7cd9bb033b6ddd8c2beb4c99ad02d728f1e6e6d9b9446667398b2ac39f08",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.0"
+ },
+ "flutter_keyboard_visibility_macos": {
+ "dependency": "transitive",
+ "description": {
+ "name": "flutter_keyboard_visibility_macos",
+ "sha256": "c5c49b16fff453dfdafdc16f26bdd8fb8d55812a1d50b0ce25fc8d9f2e53d086",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.0"
+ },
+ "flutter_keyboard_visibility_platform_interface": {
+ "dependency": "transitive",
+ "description": {
+ "name": "flutter_keyboard_visibility_platform_interface",
+ "sha256": "e43a89845873f7be10cb3884345ceb9aebf00a659f479d1c8f4293fcb37022a4",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.0"
+ },
+ "flutter_keyboard_visibility_web": {
+ "dependency": "transitive",
+ "description": {
+ "name": "flutter_keyboard_visibility_web",
+ "sha256": "d3771a2e752880c79203f8d80658401d0c998e4183edca05a149f5098ce6e3d1",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.0"
+ },
+ "flutter_keyboard_visibility_windows": {
+ "dependency": "transitive",
+ "description": {
+ "name": "flutter_keyboard_visibility_windows",
+ "sha256": "fc4b0f0b6be9b93ae527f3d527fb56ee2d918cd88bbca438c478af7bcfd0ef73",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.0"
+ },
+ "flutter_localizations": {
+ "dependency": "direct main",
+ "description": "flutter",
+ "source": "sdk",
+ "version": "0.0.0"
+ },
+ "flutter_loggy": {
+ "dependency": "direct main",
+ "description": {
+ "name": "flutter_loggy",
+ "sha256": "c758629403e19115af198993ff7bd3af2c5a337de16ee23acda2e6f29df1db48",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.3"
+ },
+ "flutter_loggy_dio": {
+ "dependency": "direct main",
+ "description": {
+ "name": "flutter_loggy_dio",
+ "sha256": "d17d26bb85667c14aefa6dce9b12bd2c1ae13cd75e89d25b0c799b063be55e3c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.1.0"
+ },
+ "flutter_native_splash": {
+ "dependency": "direct main",
+ "description": {
+ "name": "flutter_native_splash",
+ "sha256": "aa06fec78de2190f3db4319dd60fdc8d12b2626e93ef9828633928c2dcaea840",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.4.1"
+ },
+ "flutter_riverpod": {
+ "dependency": "transitive",
+ "description": {
+ "name": "flutter_riverpod",
+ "sha256": "0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.5.1"
+ },
+ "flutter_shaders": {
+ "dependency": "transitive",
+ "description": {
+ "name": "flutter_shaders",
+ "sha256": "02750b545c01ff4d8e9bbe8f27a7731aa3778402506c67daa1de7f5fc3f4befe",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.1.2"
+ },
+ "flutter_svg": {
+ "dependency": "direct main",
+ "description": {
+ "name": "flutter_svg",
+ "sha256": "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.10+1"
+ },
+ "flutter_test": {
+ "dependency": "direct dev",
+ "description": "flutter",
+ "source": "sdk",
+ "version": "0.0.0"
+ },
+ "flutter_timezone": {
+ "dependency": "transitive",
+ "description": {
+ "name": "flutter_timezone",
+ "sha256": "06b35132c98fa188db3c4b654b7e1af7ccd01dfe12a004d58be423357605fb24",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.8"
+ },
+ "flutter_typeahead": {
+ "dependency": "direct main",
+ "description": {
+ "name": "flutter_typeahead",
+ "sha256": "d64712c65db240b1057559b952398ebb6e498077baeebf9b0731dade62438a6d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "5.2.0"
+ },
+ "flutter_web_plugins": {
+ "dependency": "transitive",
+ "description": "flutter",
+ "source": "sdk",
+ "version": "0.0.0"
+ },
+ "fpdart": {
+ "dependency": "direct main",
+ "description": {
+ "name": "fpdart",
+ "sha256": "7413acc5a6569a3fe8277928fc7487f3198530f0c4e635d0baef199ea36e8ee9",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.0"
+ },
+ "freezed": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "freezed",
+ "sha256": "a434911f643466d78462625df76fd9eb13e57348ff43fe1f77bbe909522c67a1",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.5.2"
+ },
+ "freezed_annotation": {
+ "dependency": "direct main",
+ "description": {
+ "name": "freezed_annotation",
+ "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.4.4"
+ },
+ "frontend_server_client": {
+ "dependency": "transitive",
+ "description": {
+ "name": "frontend_server_client",
+ "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.0.0"
+ },
+ "gap": {
+ "dependency": "direct main",
+ "description": {
+ "name": "gap",
+ "sha256": "f19387d4e32f849394758b91377f9153a1b41d79513ef7668c088c77dbc6955d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.1"
+ },
+ "glob": {
+ "dependency": "transitive",
+ "description": {
+ "name": "glob",
+ "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.2"
+ },
+ "globbing": {
+ "dependency": "transitive",
+ "description": {
+ "name": "globbing",
+ "sha256": "4f89cfaf6fa74c9c1740a96259da06bd45411ede56744e28017cc534a12b6e2d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.0"
+ },
+ "go_router": {
+ "dependency": "direct main",
+ "description": {
+ "name": "go_router",
+ "sha256": "b465e99ce64ba75e61c8c0ce3d87b66d8ac07f0b35d0a7e0263fcfc10f99e836",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "13.2.5"
+ },
+ "go_router_builder": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "go_router_builder",
+ "sha256": "3425b72dea69209754ac6b71b4da34165dcd4d4a2934713029945709a246427a",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.7.1"
+ },
+ "google_identity_services_web": {
+ "dependency": "transitive",
+ "description": {
+ "name": "google_identity_services_web",
+ "sha256": "5be191523702ba8d7a01ca97c17fca096822ccf246b0a9f11923a6ded06199b6",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.3.1+4"
+ },
+ "googleapis_auth": {
+ "dependency": "transitive",
+ "description": {
+ "name": "googleapis_auth",
+ "sha256": "befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.6.0"
+ },
+ "graphs": {
+ "dependency": "transitive",
+ "description": {
+ "name": "graphs",
+ "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.3.2"
+ },
+ "grpc": {
+ "dependency": "direct main",
+ "description": {
+ "name": "grpc",
+ "sha256": "e93ee3bce45c134bf44e9728119102358c7cd69de7832d9a874e2e74eb8cab40",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.2.4"
+ },
+ "hashcodes": {
+ "dependency": "transitive",
+ "description": {
+ "name": "hashcodes",
+ "sha256": "80f9410a5b3c8e110c4b7604546034749259f5d6dcca63e0d3c17c9258f1a651",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.0"
+ },
+ "hooks_riverpod": {
+ "dependency": "direct main",
+ "description": {
+ "name": "hooks_riverpod",
+ "sha256": "45b2030a18bcd6dbd680c2c91bc3b33e3fe7c323e3acb5ecec93a613e2fbaa8a",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.5.1"
+ },
+ "html": {
+ "dependency": "transitive",
+ "description": {
+ "name": "html",
+ "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.15.4"
+ },
+ "http": {
+ "dependency": "direct main",
+ "description": {
+ "name": "http",
+ "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.2.2"
+ },
+ "http2": {
+ "dependency": "transitive",
+ "description": {
+ "name": "http2",
+ "sha256": "9ced024a160b77aba8fb8674e38f70875e321d319e6f303ec18e87bd5a4b0c1d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.3.0"
+ },
+ "http_multi_server": {
+ "dependency": "transitive",
+ "description": {
+ "name": "http_multi_server",
+ "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.2.1"
+ },
+ "http_parser": {
+ "dependency": "transitive",
+ "description": {
+ "name": "http_parser",
+ "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.0.2"
+ },
+ "http_profile": {
+ "dependency": "transitive",
+ "description": {
+ "name": "http_profile",
+ "sha256": "7e679e355b09aaee2ab5010915c932cce3f2d1c11c3b2dc177891687014ffa78",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.1.0"
+ },
+ "humanizer": {
+ "dependency": "direct main",
+ "description": {
+ "path": ".",
+ "ref": "up-version",
+ "resolved-ref": "8ae61d68357fae197be7ee71d67ccb9498b9d5c7",
+ "url": "https://github.com/alex-relov/humanizer"
+ },
+ "source": "git",
+ "version": "2.3.0"
+ },
+ "iconsax_flutter": {
+ "dependency": "transitive",
+ "description": {
+ "name": "iconsax_flutter",
+ "sha256": "95b65699da8ea98f87c5d232f06b0debaaf1ec1332b697e4d90969ec9a93037d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.0"
+ },
+ "image": {
+ "dependency": "transitive",
+ "description": {
+ "name": "image",
+ "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.2.0"
+ },
+ "image_size_getter": {
+ "dependency": "transitive",
+ "description": {
+ "name": "image_size_getter",
+ "sha256": "f98c4246144e9b968899d2dfde69091e22a539bb64bc9b0bea51505fbb490e57",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.3"
+ },
+ "in_app_review": {
+ "dependency": "direct main",
+ "description": {
+ "name": "in_app_review",
+ "sha256": "99869244d09adc76af16bf8fd731dd13cef58ecafd5917847589c49f378cbb30",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.9"
+ },
+ "in_app_review_platform_interface": {
+ "dependency": "transitive",
+ "description": {
+ "name": "in_app_review_platform_interface",
+ "sha256": "fed2c755f2125caa9ae10495a3c163aa7fab5af3585a9c62ef4a6920c5b45f10",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.5"
+ },
+ "injector": {
+ "dependency": "transitive",
+ "description": {
+ "name": "injector",
+ "sha256": "ed389bed5b48a699d5b9561c985023d0d5cc88dd5ff2237aadcce5a5ab433e4e",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.0"
+ },
+ "intl": {
+ "dependency": "direct main",
+ "description": {
+ "name": "intl",
+ "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.19.0"
+ },
+ "io": {
+ "dependency": "transitive",
+ "description": {
+ "name": "io",
+ "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.4"
+ },
+ "iregexp": {
+ "dependency": "transitive",
+ "description": {
+ "name": "iregexp",
+ "sha256": "143859dcaeecf6f683102786762d70a47ef8441a0d2287a158172d32d38799cf",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.1.2"
+ },
+ "js": {
+ "dependency": "transitive",
+ "description": {
+ "name": "js",
+ "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.7.1"
+ },
+ "json2yaml": {
+ "dependency": "transitive",
+ "description": {
+ "name": "json2yaml",
+ "sha256": "da94630fbc56079426fdd167ae58373286f603371075b69bf46d848d63ba3e51",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.1"
+ },
+ "json_annotation": {
+ "dependency": "direct main",
+ "description": {
+ "name": "json_annotation",
+ "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.9.0"
+ },
+ "json_path": {
+ "dependency": "direct main",
+ "description": {
+ "name": "json_path",
+ "sha256": "7a06bbb1cfad390b20fb7a2ca5e67d9ba59633879c6d71142b80fbf61c3b66f6",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.7.4"
+ },
+ "json_serializable": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "json_serializable",
+ "sha256": "ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.8.0"
+ },
+ "launch_at_startup": {
+ "dependency": "direct main",
+ "description": {
+ "name": "launch_at_startup",
+ "sha256": "93fc5638e088290004fae358bae691486673d469957d461d9dae5b12248593eb",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.2.2"
+ },
+ "leak_tracker": {
+ "dependency": "transitive",
+ "description": {
+ "name": "leak_tracker",
+ "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "10.0.5"
+ },
+ "leak_tracker_flutter_testing": {
+ "dependency": "transitive",
+ "description": {
+ "name": "leak_tracker_flutter_testing",
+ "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.5"
+ },
+ "leak_tracker_testing": {
+ "dependency": "transitive",
+ "description": {
+ "name": "leak_tracker_testing",
+ "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.1"
+ },
+ "lint": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "lint",
+ "sha256": "d758a5211fce7fd3f5e316f804daefecdc34c7e53559716125e6da7388ae8565",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.3.0"
+ },
+ "logging": {
+ "dependency": "transitive",
+ "description": {
+ "name": "logging",
+ "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.2.0"
+ },
+ "loggy": {
+ "dependency": "direct main",
+ "description": {
+ "name": "loggy",
+ "sha256": "981e03162bbd3a5a843026f75f73d26e4a0d8aa035ae060456ca7b30dfd1e339",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.3"
+ },
+ "matcher": {
+ "dependency": "transitive",
+ "description": {
+ "name": "matcher",
+ "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.12.16+1"
+ },
+ "material_color_utilities": {
+ "dependency": "transitive",
+ "description": {
+ "name": "material_color_utilities",
+ "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.11.1"
+ },
+ "maybe_just_nothing": {
+ "dependency": "transitive",
+ "description": {
+ "name": "maybe_just_nothing",
+ "sha256": "0c06326e26d08f6ed43247404376366dc4d756cef23a4f1db765f546224c35e0",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.5.3"
+ },
+ "menu_base": {
+ "dependency": "transitive",
+ "description": {
+ "name": "menu_base",
+ "sha256": "820368014a171bd1241030278e6c2617354f492f5c703d7b7d4570a6b8b84405",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.1.1"
+ },
+ "meta": {
+ "dependency": "direct main",
+ "description": {
+ "name": "meta",
+ "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.15.0"
+ },
+ "mime": {
+ "dependency": "transitive",
+ "description": {
+ "name": "mime",
+ "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.5"
+ },
+ "mobile_scanner": {
+ "dependency": "direct main",
+ "description": {
+ "name": "mobile_scanner",
+ "sha256": "b8c0e9afcfd52534f85ec666f3d52156f560b5e6c25b1e3d4fe2087763607926",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "5.1.1"
+ },
+ "neat_periodic_task": {
+ "dependency": "direct main",
+ "description": {
+ "name": "neat_periodic_task",
+ "sha256": "e0dda74c996781e154f6145028dbacbcd9dbef242f5a140fa774e39381c2bf97",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.1"
+ },
+ "os_detect": {
+ "dependency": "transitive",
+ "description": {
+ "name": "os_detect",
+ "sha256": "faf3bcf39515e64da8ff76b2f2805b20a6ff47ae515393e535f8579ff91d6b7f",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.1"
+ },
+ "package_config": {
+ "dependency": "transitive",
+ "description": {
+ "name": "package_config",
+ "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.0"
+ },
+ "package_info_plus": {
+ "dependency": "direct main",
+ "description": {
+ "name": "package_info_plus",
+ "sha256": "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "5.0.1"
+ },
+ "package_info_plus_platform_interface": {
+ "dependency": "transitive",
+ "description": {
+ "name": "package_info_plus_platform_interface",
+ "sha256": "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.1"
+ },
+ "path": {
+ "dependency": "direct main",
+ "description": {
+ "name": "path",
+ "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.9.0"
+ },
+ "path_parsing": {
+ "dependency": "transitive",
+ "description": {
+ "name": "path_parsing",
+ "sha256": "e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.1"
+ },
+ "path_provider": {
+ "dependency": "direct main",
+ "description": {
+ "name": "path_provider",
+ "sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.4"
+ },
+ "path_provider_android": {
+ "dependency": "transitive",
+ "description": {
+ "name": "path_provider_android",
+ "sha256": "490539678396d4c3c0b06efdaab75ae60675c3e0c66f72bc04c2e2c1e0e2abeb",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.2.9"
+ },
+ "path_provider_foundation": {
+ "dependency": "transitive",
+ "description": {
+ "name": "path_provider_foundation",
+ "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.4.0"
+ },
+ "path_provider_linux": {
+ "dependency": "transitive",
+ "description": {
+ "name": "path_provider_linux",
+ "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.2.1"
+ },
+ "path_provider_platform_interface": {
+ "dependency": "transitive",
+ "description": {
+ "name": "path_provider_platform_interface",
+ "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.2"
+ },
+ "path_provider_windows": {
+ "dependency": "transitive",
+ "description": {
+ "name": "path_provider_windows",
+ "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.3.0"
+ },
+ "pausable_timer": {
+ "dependency": "transitive",
+ "description": {
+ "name": "pausable_timer",
+ "sha256": "6ef1a95441ec3439de6fb63f39a011b67e693198e7dae14e20675c3c00e86074",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.1.0+3"
+ },
+ "percent_indicator": {
+ "dependency": "direct main",
+ "description": {
+ "name": "percent_indicator",
+ "sha256": "c37099ad833a883c9d71782321cb65c3a848c21b6939b6185f0ff6640d05814c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.2.3"
+ },
+ "petitparser": {
+ "dependency": "transitive",
+ "description": {
+ "name": "petitparser",
+ "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.0.2"
+ },
+ "platform": {
+ "dependency": "transitive",
+ "description": {
+ "name": "platform",
+ "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.1.5"
+ },
+ "plugin_platform_interface": {
+ "dependency": "transitive",
+ "description": {
+ "name": "plugin_platform_interface",
+ "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.8"
+ },
+ "pointer_interceptor": {
+ "dependency": "transitive",
+ "description": {
+ "name": "pointer_interceptor",
+ "sha256": "57210410680379aea8b1b7ed6ae0c3ad349bfd56fe845b8ea934a53344b9d523",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.10.1+2"
+ },
+ "pointer_interceptor_ios": {
+ "dependency": "transitive",
+ "description": {
+ "name": "pointer_interceptor_ios",
+ "sha256": "a6906772b3205b42c44614fcea28f818b1e5fdad73a4ca742a7bd49818d9c917",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.10.1"
+ },
+ "pointer_interceptor_platform_interface": {
+ "dependency": "transitive",
+ "description": {
+ "name": "pointer_interceptor_platform_interface",
+ "sha256": "0597b0560e14354baeb23f8375cd612e8bd4841bf8306ecb71fcd0bb78552506",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.10.0+1"
+ },
+ "pointer_interceptor_web": {
+ "dependency": "transitive",
+ "description": {
+ "name": "pointer_interceptor_web",
+ "sha256": "7a7087782110f8c1827170660b09f8aa893e0e9a61431dbbe2ac3fc482e8c044",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.10.2+1"
+ },
+ "pool": {
+ "dependency": "transitive",
+ "description": {
+ "name": "pool",
+ "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.5.1"
+ },
+ "posix": {
+ "dependency": "direct main",
+ "description": {
+ "name": "posix",
+ "sha256": "a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.0.1"
+ },
+ "process": {
+ "dependency": "transitive",
+ "description": {
+ "name": "process",
+ "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "5.0.2"
+ },
+ "properties": {
+ "dependency": "transitive",
+ "description": {
+ "name": "properties",
+ "sha256": "333f427dd4ed07bdbe8c75b9ff864a1e70b5d7a8426a2e8bdd457b65ae5ac598",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.1"
+ },
+ "protobuf": {
+ "dependency": "direct main",
+ "description": {
+ "name": "protobuf",
+ "sha256": "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.1.0"
+ },
+ "protocol_handler": {
+ "dependency": "direct main",
+ "description": {
+ "name": "protocol_handler",
+ "sha256": "dc2e2dcb1e0e313c3f43827ec3fa6d98adee6e17edc0c3923ac67efee87479a9",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.2.0"
+ },
+ "protocol_handler_android": {
+ "dependency": "transitive",
+ "description": {
+ "name": "protocol_handler_android",
+ "sha256": "82eb860ca42149e400328f54b85140329a1766d982e94705b68271f6ca73895c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.2.0"
+ },
+ "protocol_handler_ios": {
+ "dependency": "transitive",
+ "description": {
+ "name": "protocol_handler_ios",
+ "sha256": "0d3a56b8c1926002cb1e32b46b56874759f4dcc8183d389b670864ac041b6ec2",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.2.0"
+ },
+ "protocol_handler_macos": {
+ "dependency": "transitive",
+ "description": {
+ "name": "protocol_handler_macos",
+ "sha256": "6eb8687a84e7da3afbc5660ce046f29d7ecf7976db45a9dadeae6c87147dd710",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.2.0"
+ },
+ "protocol_handler_platform_interface": {
+ "dependency": "transitive",
+ "description": {
+ "name": "protocol_handler_platform_interface",
+ "sha256": "53776b10526fdc25efdf1abcf68baf57fdfdb75342f4101051db521c9e3f3e5b",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.2.0"
+ },
+ "protocol_handler_windows": {
+ "dependency": "transitive",
+ "description": {
+ "name": "protocol_handler_windows",
+ "sha256": "d8f3a58938386aca2c76292757392f4d059d09f11439d6d896d876ebe997f2c4",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.2.0"
+ },
+ "pub_semver": {
+ "dependency": "transitive",
+ "description": {
+ "name": "pub_semver",
+ "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.4"
+ },
+ "pubspec_parse": {
+ "dependency": "transitive",
+ "description": {
+ "name": "pubspec_parse",
+ "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.3.0"
+ },
+ "qr": {
+ "dependency": "transitive",
+ "description": {
+ "name": "qr",
+ "sha256": "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.2"
+ },
+ "qr_flutter": {
+ "dependency": "direct main",
+ "description": {
+ "name": "qr_flutter",
+ "sha256": "5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.1.0"
+ },
+ "quiver": {
+ "dependency": "transitive",
+ "description": {
+ "name": "quiver",
+ "sha256": "b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.2.1"
+ },
+ "rational": {
+ "dependency": "transitive",
+ "description": {
+ "name": "rational",
+ "sha256": "cb808fb6f1a839e6fc5f7d8cb3b0a10e1db48b3be102de73938c627f0b636336",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.2.3"
+ },
+ "recase": {
+ "dependency": "transitive",
+ "description": {
+ "name": "recase",
+ "sha256": "e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.1.0"
+ },
+ "retry": {
+ "dependency": "transitive",
+ "description": {
+ "name": "retry",
+ "sha256": "822e118d5b3aafed083109c72d5f484c6dc66707885e07c0fbcb8b986bba7efc",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.1.2"
+ },
+ "rfc_6901": {
+ "dependency": "transitive",
+ "description": {
+ "name": "rfc_6901",
+ "sha256": "df1bbfa3d023009598f19636d6114c6ac1e0b7bb7bf6a260f0e6e6ce91416820",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.2.0"
+ },
+ "riverpod": {
+ "dependency": "transitive",
+ "description": {
+ "name": "riverpod",
+ "sha256": "f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.5.1"
+ },
+ "riverpod_analyzer_utils": {
+ "dependency": "transitive",
+ "description": {
+ "name": "riverpod_analyzer_utils",
+ "sha256": "8b71f03fc47ae27d13769496a1746332df4cec43918aeba9aff1e232783a780f",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.5.1"
+ },
+ "riverpod_annotation": {
+ "dependency": "direct main",
+ "description": {
+ "name": "riverpod_annotation",
+ "sha256": "e5e796c0eba4030c704e9dae1b834a6541814963292839dcf9638d53eba84f5c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.3.5"
+ },
+ "riverpod_generator": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "riverpod_generator",
+ "sha256": "d451608bf17a372025fc36058863737636625dfdb7e3cbf6142e0dfeb366ab22",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.4.0"
+ },
+ "rxdart": {
+ "dependency": "direct main",
+ "description": {
+ "name": "rxdart",
+ "sha256": "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.27.7"
+ },
+ "screen_retriever": {
+ "dependency": "transitive",
+ "description": {
+ "name": "screen_retriever",
+ "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.1.9"
+ },
+ "sentry": {
+ "dependency": "transitive",
+ "description": {
+ "name": "sentry",
+ "sha256": "57514bc72d441ffdc463f498d6886aa586a2494fa467a1eb9d649c28010d7ee3",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "7.20.2"
+ },
+ "sentry_dart_plugin": {
+ "dependency": "direct main",
+ "description": {
+ "name": "sentry_dart_plugin",
+ "sha256": "e81fa3e0ffabd04fdcfbfecd6468d4a342f02ab33edca09708c61bcd2be42b7d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.7.1"
+ },
+ "sentry_flutter": {
+ "dependency": "direct main",
+ "description": {
+ "name": "sentry_flutter",
+ "sha256": "9723d58470ca43a360681ddd26abb71ca7b815f706bc8d3747afd054cf639ded",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "7.20.2"
+ },
+ "share_plus": {
+ "dependency": "direct main",
+ "description": {
+ "name": "share_plus",
+ "sha256": "3ef39599b00059db0990ca2e30fca0a29d8b37aae924d60063f8e0184cf20900",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "7.2.2"
+ },
+ "share_plus_platform_interface": {
+ "dependency": "transitive",
+ "description": {
+ "name": "share_plus_platform_interface",
+ "sha256": "251eb156a8b5fa9ce033747d73535bf53911071f8d3b6f4f0b578505ce0d4496",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.4.0"
+ },
+ "shared_preferences": {
+ "dependency": "direct main",
+ "description": {
+ "name": "shared_preferences",
+ "sha256": "c272f9cabca5a81adc9b0894381e9c1def363e980f960fa903c604c471b22f68",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.3.1"
+ },
+ "shared_preferences_android": {
+ "dependency": "transitive",
+ "description": {
+ "name": "shared_preferences_android",
+ "sha256": "a7e8467e9181cef109f601e3f65765685786c1a738a83d7fbbde377589c0d974",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.3.1"
+ },
+ "shared_preferences_foundation": {
+ "dependency": "transitive",
+ "description": {
+ "name": "shared_preferences_foundation",
+ "sha256": "776786cff96324851b656777648f36ac772d88bc4c669acff97b7fce5de3c849",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.5.1"
+ },
+ "shared_preferences_linux": {
+ "dependency": "transitive",
+ "description": {
+ "name": "shared_preferences_linux",
+ "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.4.1"
+ },
+ "shared_preferences_platform_interface": {
+ "dependency": "transitive",
+ "description": {
+ "name": "shared_preferences_platform_interface",
+ "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.4.1"
+ },
+ "shared_preferences_web": {
+ "dependency": "transitive",
+ "description": {
+ "name": "shared_preferences_web",
+ "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.4.2"
+ },
+ "shared_preferences_windows": {
+ "dependency": "transitive",
+ "description": {
+ "name": "shared_preferences_windows",
+ "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.4.1"
+ },
+ "shelf": {
+ "dependency": "transitive",
+ "description": {
+ "name": "shelf",
+ "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.4.1"
+ },
+ "shelf_web_socket": {
+ "dependency": "transitive",
+ "description": {
+ "name": "shelf_web_socket",
+ "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.0"
+ },
+ "shortid": {
+ "dependency": "transitive",
+ "description": {
+ "name": "shortid",
+ "sha256": "d0b40e3dbb50497dad107e19c54ca7de0d1a274eb9b4404991e443dadb9ebedb",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.1.2"
+ },
+ "sky_engine": {
+ "dependency": "transitive",
+ "description": "flutter",
+ "source": "sdk",
+ "version": "0.0.99"
+ },
+ "slang": {
+ "dependency": "direct main",
+ "description": {
+ "name": "slang",
+ "sha256": "f68f6d6709890f85efabfb0318e9d694be2ebdd333e57fe5cb50eee449e4e3ab",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.31.1"
+ },
+ "slang_build_runner": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "slang_build_runner",
+ "sha256": "6e60160e8000b91824c47221b20d9642e7408287a5a21837ecefc75270197586",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.31.0"
+ },
+ "slang_flutter": {
+ "dependency": "direct main",
+ "description": {
+ "name": "slang_flutter",
+ "sha256": "f8400292be49c11697d94af58d7f7d054c91af759f41ffe71e4e5413871ffc62",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.31.0"
+ },
+ "sliver_tools": {
+ "dependency": "direct main",
+ "description": {
+ "name": "sliver_tools",
+ "sha256": "eae28220badfb9d0559207badcbbc9ad5331aac829a88cb0964d330d2a4636a6",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.2.12"
+ },
+ "slugid": {
+ "dependency": "transitive",
+ "description": {
+ "name": "slugid",
+ "sha256": "e0cc54637b666c9c590f0d76df76e5e2bbf6234ae398a182aac82fd70ddd60ab",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.2"
+ },
+ "source_gen": {
+ "dependency": "transitive",
+ "description": {
+ "name": "source_gen",
+ "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.5.0"
+ },
+ "source_helper": {
+ "dependency": "transitive",
+ "description": {
+ "name": "source_helper",
+ "sha256": "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.3.4"
+ },
+ "source_span": {
+ "dependency": "transitive",
+ "description": {
+ "name": "source_span",
+ "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.10.0"
+ },
+ "sprintf": {
+ "dependency": "transitive",
+ "description": {
+ "name": "sprintf",
+ "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "7.0.0"
+ },
+ "sqlite3": {
+ "dependency": "transitive",
+ "description": {
+ "name": "sqlite3",
+ "sha256": "fde692580bee3379374af1f624eb3e113ab2865ecb161dbe2d8ac2de9735dbdb",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.4.5"
+ },
+ "sqlite3_flutter_libs": {
+ "dependency": "direct main",
+ "description": {
+ "name": "sqlite3_flutter_libs",
+ "sha256": "62bbb4073edbcdf53f40c80775f33eea01d301b7b81417e5b3fb7395416258c1",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.5.24"
+ },
+ "sqlparser": {
+ "dependency": "transitive",
+ "description": {
+ "name": "sqlparser",
+ "sha256": "3be52b4968fc2f098ba735863404756d2fe3ea0729cf006a5b5612618f74ca04",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.37.1"
+ },
+ "stack_trace": {
+ "dependency": "transitive",
+ "description": {
+ "name": "stack_trace",
+ "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.11.1"
+ },
+ "state_notifier": {
+ "dependency": "transitive",
+ "description": {
+ "name": "state_notifier",
+ "sha256": "b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.0"
+ },
+ "stream_channel": {
+ "dependency": "transitive",
+ "description": {
+ "name": "stream_channel",
+ "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.2"
+ },
+ "stream_transform": {
+ "dependency": "transitive",
+ "description": {
+ "name": "stream_transform",
+ "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.0"
+ },
+ "string_scanner": {
+ "dependency": "transitive",
+ "description": {
+ "name": "string_scanner",
+ "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.2.0"
+ },
+ "system_info2": {
+ "dependency": "transitive",
+ "description": {
+ "name": "system_info2",
+ "sha256": "65206bbef475217008b5827374767550a5420ce70a04d2d7e94d1d2253f3efc9",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.0.0"
+ },
+ "term_glyph": {
+ "dependency": "transitive",
+ "description": {
+ "name": "term_glyph",
+ "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.2.1"
+ },
+ "test_api": {
+ "dependency": "transitive",
+ "description": {
+ "name": "test_api",
+ "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.7.2"
+ },
+ "time": {
+ "dependency": "transitive",
+ "description": {
+ "name": "time",
+ "sha256": "ad8e018a6c9db36cb917a031853a1aae49467a93e0d464683e029537d848c221",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.4"
+ },
+ "timezone": {
+ "dependency": "transitive",
+ "description": {
+ "name": "timezone",
+ "sha256": "2236ec079a174ce07434e89fcd3fcda430025eb7692244139a9cf54fdcf1fc7d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.9.4"
+ },
+ "timezone_to_country": {
+ "dependency": "direct main",
+ "description": {
+ "name": "timezone_to_country",
+ "sha256": "3dc8480ff450910d97555a26a19cb278fb68b69d24246fffadbc5390165457a1",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.2.0"
+ },
+ "timing": {
+ "dependency": "transitive",
+ "description": {
+ "name": "timing",
+ "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.1"
+ },
+ "tint": {
+ "dependency": "direct main",
+ "description": {
+ "name": "tint",
+ "sha256": "9652d9a589f4536d5e392cf790263d120474f15da3cf1bee7f1fdb31b4de5f46",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.1"
+ },
+ "toastification": {
+ "dependency": "direct main",
+ "description": {
+ "name": "toastification",
+ "sha256": "1e01495fe00b8fddce8a7f1da5e4775cd003763698e8363d7122bea4168a395e",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.2.1"
+ },
+ "tray_manager": {
+ "dependency": "direct main",
+ "description": {
+ "name": "tray_manager",
+ "sha256": "c9a63fd88bd3546287a7eb8ccc978d707eef82c775397af17dda3a4f4c039e64",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.2.3"
+ },
+ "type_plus": {
+ "dependency": "transitive",
+ "description": {
+ "name": "type_plus",
+ "sha256": "d5d1019471f0d38b91603adb9b5fd4ce7ab903c879d2fbf1a3f80a630a03fcc9",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.1"
+ },
+ "typed_data": {
+ "dependency": "transitive",
+ "description": {
+ "name": "typed_data",
+ "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.3.2"
+ },
+ "universal_io": {
+ "dependency": "transitive",
+ "description": {
+ "name": "universal_io",
+ "sha256": "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.2.2"
+ },
+ "upgrader": {
+ "dependency": "direct main",
+ "description": {
+ "name": "upgrader",
+ "sha256": "0c5fe8101b9d3017aebcb5175b49c382699725ffcf477afbe93fc3351491f6e8",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "9.0.0"
+ },
+ "url_launcher": {
+ "dependency": "direct main",
+ "description": {
+ "name": "url_launcher",
+ "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.3.0"
+ },
+ "url_launcher_android": {
+ "dependency": "transitive",
+ "description": {
+ "name": "url_launcher_android",
+ "sha256": "94d8ad05f44c6d4e2ffe5567ab4d741b82d62e3c8e288cc1fcea45965edf47c9",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.3.8"
+ },
+ "url_launcher_ios": {
+ "dependency": "transitive",
+ "description": {
+ "name": "url_launcher_ios",
+ "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.3.1"
+ },
+ "url_launcher_linux": {
+ "dependency": "transitive",
+ "description": {
+ "name": "url_launcher_linux",
+ "sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.2.0"
+ },
+ "url_launcher_macos": {
+ "dependency": "transitive",
+ "description": {
+ "name": "url_launcher_macos",
+ "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.2.0"
+ },
+ "url_launcher_platform_interface": {
+ "dependency": "transitive",
+ "description": {
+ "name": "url_launcher_platform_interface",
+ "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.3.2"
+ },
+ "url_launcher_web": {
+ "dependency": "transitive",
+ "description": {
+ "name": "url_launcher_web",
+ "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.3.3"
+ },
+ "url_launcher_windows": {
+ "dependency": "transitive",
+ "description": {
+ "name": "url_launcher_windows",
+ "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.1.2"
+ },
+ "uuid": {
+ "dependency": "direct main",
+ "description": {
+ "name": "uuid",
+ "sha256": "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.4.2"
+ },
+ "vclibs": {
+ "dependency": "direct main",
+ "description": {
+ "name": "vclibs",
+ "sha256": "5dc5de54fabe27ad276898b7c04a56a4a3dd9834e479b9db5e04a9f3eb36790e",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.1.3"
+ },
+ "vector_graphics": {
+ "dependency": "transitive",
+ "description": {
+ "name": "vector_graphics",
+ "sha256": "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.11+1"
+ },
+ "vector_graphics_codec": {
+ "dependency": "transitive",
+ "description": {
+ "name": "vector_graphics_codec",
+ "sha256": "c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.11+1"
+ },
+ "vector_graphics_compiler": {
+ "dependency": "transitive",
+ "description": {
+ "name": "vector_graphics_compiler",
+ "sha256": "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.11+1"
+ },
+ "vector_math": {
+ "dependency": "transitive",
+ "description": {
+ "name": "vector_math",
+ "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.4"
+ },
+ "version": {
+ "dependency": "direct main",
+ "description": {
+ "name": "version",
+ "sha256": "3d4140128e6ea10d83da32fef2fa4003fccbf6852217bb854845802f04191f94",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.2"
+ },
+ "vm_service": {
+ "dependency": "transitive",
+ "description": {
+ "name": "vm_service",
+ "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "14.2.5"
+ },
+ "watcher": {
+ "dependency": "direct main",
+ "description": {
+ "name": "watcher",
+ "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.0"
+ },
+ "web": {
+ "dependency": "direct overridden",
+ "description": {
+ "name": "web",
+ "sha256": "d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.0"
+ },
+ "web_socket": {
+ "dependency": "transitive",
+ "description": {
+ "name": "web_socket",
+ "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.1.6"
+ },
+ "web_socket_channel": {
+ "dependency": "transitive",
+ "description": {
+ "name": "web_socket_channel",
+ "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.1"
+ },
+ "win32": {
+ "dependency": "direct main",
+ "description": {
+ "name": "win32",
+ "sha256": "015002c060f1ae9f41a818f2d5640389cc05283e368be19dc8d77cecb43c40c9",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "5.5.3"
+ },
+ "win32_registry": {
+ "dependency": "transitive",
+ "description": {
+ "name": "win32_registry",
+ "sha256": "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.4"
+ },
+ "window_manager": {
+ "dependency": "direct main",
+ "description": {
+ "name": "window_manager",
+ "sha256": "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.3.9"
+ },
+ "wolt_modal_sheet": {
+ "dependency": "direct main",
+ "description": {
+ "name": "wolt_modal_sheet",
+ "sha256": "0a04f1a11bbeeb4847bdea17707ab68fffaaa656a5ce75323939647952d696c4",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.4.1"
+ },
+ "xdg_directories": {
+ "dependency": "transitive",
+ "description": {
+ "name": "xdg_directories",
+ "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.4"
+ },
+ "xml": {
+ "dependency": "transitive",
+ "description": {
+ "name": "xml",
+ "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.5.0"
+ },
+ "yaml": {
+ "dependency": "transitive",
+ "description": {
+ "name": "yaml",
+ "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.1.2"
+ },
+ "yaml_edit": {
+ "dependency": "transitive",
+ "description": {
+ "name": "yaml_edit",
+ "sha256": "e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.2.1"
+ }
+ },
+ "sdks": {
+ "dart": ">=3.4.0 <4.0.0",
+ "flutter": ">=3.24.0"
+ }
+}
diff --git a/pkgs/by-name/ho/host-spawn/package.nix b/pkgs/by-name/ho/host-spawn/package.nix
new file mode 100644
index 000000000000..6fd12d0968e6
--- /dev/null
+++ b/pkgs/by-name/ho/host-spawn/package.nix
@@ -0,0 +1,28 @@
+{
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+}:
+
+buildGoModule rec {
+ pname = "host-spawn";
+ version = "1.6.0";
+
+ src = fetchFromGitHub {
+ owner = "1player";
+ repo = "host-spawn";
+ rev = "v${version}";
+ hash = "sha256-017o50MSSkehn4zMEdCTPW2o2IQaXbI21z8Z+jfRuDs=";
+ };
+
+ vendorHash = "sha256-Agc3hl+VDTNW7cnh/0g4G8BgzNAX11hKASYQKieBN4M=";
+
+ meta = with lib; {
+ homepage = "https://github.com/1player/host-spawn";
+ description = "Run commands on your host machine from inside your flatpak sandbox, toolbox or distrobox containers";
+ license = licenses.mit0;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ garrison ];
+ mainProgram = "host-spawn";
+ };
+}
diff --git a/pkgs/applications/networking/flent/http-getter.nix b/pkgs/by-name/ht/http-getter/package.nix
similarity index 81%
rename from pkgs/applications/networking/flent/http-getter.nix
rename to pkgs/by-name/ht/http-getter/package.nix
index 5ea07cfe4f9d..72fb7f5f52c1 100644
--- a/pkgs/applications/networking/flent/http-getter.nix
+++ b/pkgs/by-name/ht/http-getter/package.nix
@@ -1,4 +1,11 @@
-{ lib, stdenv, fetchFromGitHub, cmake, curl, pkg-config }:
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ cmake,
+ curl,
+ pkg-config,
+}:
stdenv.mkDerivation {
pname = "http-getter";
@@ -11,7 +18,10 @@ stdenv.mkDerivation {
sha256 = "0plyqqwfm9bysichda0w3akbdxf6279wd4mx8mda0c4mxd4xy9nl";
};
- nativeBuildInputs = [ cmake pkg-config ];
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ ];
buildInputs = [ curl ];
meta = with lib; {
diff --git a/pkgs/by-name/ht/httpdirfs/package.nix b/pkgs/by-name/ht/httpdirfs/package.nix
index 6b6ed108fd45..d74535bfdabd 100644
--- a/pkgs/by-name/ht/httpdirfs/package.nix
+++ b/pkgs/by-name/ht/httpdirfs/package.nix
@@ -2,11 +2,13 @@
curl,
expat,
fetchFromGitHub,
- fuse,
+ fuse3,
gumbo,
help2man,
lib,
libuuid,
+ meson,
+ ninja,
nix-update-script,
pkg-config,
stdenv,
@@ -15,46 +17,35 @@
stdenv.mkDerivation (finalAttrs: {
pname = "httpdirfs";
- version = "1.2.5";
+ version = "1.2.6";
src = fetchFromGitHub {
owner = "fangfufu";
repo = "httpdirfs";
rev = "refs/tags/${finalAttrs.version}";
- hash = "sha256-PUYsT0VDEzerPqwrLJrET4kSsWsQhtnfmLepeaqtA+I=";
+ hash = "sha256-4Tp9DTYWUHElO0YNeINgzmbI0tpXxmKfZ1Jhz5UYn5M=";
};
- postPatch = lib.optional stdenv.hostPlatform.isDarwin ''
- substituteInPlace Makefile --replace-fail '-fanalyzer' '-Xanalyzer'
- '';
-
nativeBuildInputs = [
help2man
+ meson
+ ninja
pkg-config
];
buildInputs = [
curl
expat
- fuse
+ fuse3
gumbo
libuuid
];
- makeFlags = [ "prefix=${placeholder "out"}" ];
-
- postBuild = ''
- make man
- '';
-
passthru = {
- # Disabled for Darwin because requires macFUSE installed outside NixOS
- tests.version = lib.optionalAttrs stdenv.hostPlatform.isLinux (
- testers.testVersion {
- command = "${lib.getExe finalAttrs.finalPackage} --version";
- package = finalAttrs.finalPackage;
- }
- );
+ tests.version = testers.testVersion {
+ command = "${lib.getExe finalAttrs.finalPackage} --version";
+ package = finalAttrs.finalPackage;
+ };
updateScript = nix-update-script { };
};
@@ -65,6 +56,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.gpl3Only;
mainProgram = "httpdirfs";
maintainers = with lib.maintainers; [ sbruder schnusch anthonyroussel ];
- platforms = lib.platforms.unix;
+ platforms = lib.platforms.linux;
};
})
diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix
index ffc22665098e..7a8f3f8bd214 100644
--- a/pkgs/by-name/hu/hugo/package.nix
+++ b/pkgs/by-name/hu/hugo/package.nix
@@ -1,25 +1,27 @@
-{ stdenv
-, lib
-, buildGoModule
-, fetchFromGitHub
-, installShellFiles
-, buildPackages
-, testers
-, hugo
+{
+ stdenv,
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+ installShellFiles,
+ buildPackages,
+ testers,
+ nix-update-script,
+ hugo,
}:
buildGoModule rec {
pname = "hugo";
- version = "0.135.0";
+ version = "0.136.4";
src = fetchFromGitHub {
owner = "gohugoio";
repo = "hugo";
rev = "refs/tags/v${version}";
- hash = "sha256-WCWaEVD2HON6feOev9HBfpqBWYIFmfevu6LH0OMtv2Q=";
+ hash = "sha256-wCv0lZqvJNOwL/naFuGb6k0Xyk58NpgH1mkhoNnkSno=";
};
- vendorHash = "sha256-XIFgmT0VyhRrUNfwy85Ac7YIO9fij0KqVmqb/s3IDVg=";
+ vendorHash = "sha256-KqDsa7MlSONyn7AYOepQ95q1CEM83AhWk23iYSQ4twU=";
doCheck = false;
@@ -31,16 +33,24 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
- ldflags = [ "-s" "-w" "-X github.com/gohugoio/hugo/common/hugo.vendorInfo=nixpkgs" ];
+ ldflags = [
+ "-s"
+ "-w"
+ "-X github.com/gohugoio/hugo/common/hugo.vendorInfo=nixpkgs"
+ ];
- postInstall = let emulator = stdenv.hostPlatform.emulator buildPackages; in ''
- ${emulator} $out/bin/hugo gen man
- installManPage man/*
- installShellCompletion --cmd hugo \
- --bash <(${emulator} $out/bin/hugo completion bash) \
- --fish <(${emulator} $out/bin/hugo completion fish) \
- --zsh <(${emulator} $out/bin/hugo completion zsh)
- '';
+ postInstall =
+ let
+ emulator = stdenv.hostPlatform.emulator buildPackages;
+ in
+ ''
+ ${emulator} $out/bin/hugo gen man
+ installManPage man/*
+ installShellCompletion --cmd hugo \
+ --bash <(${emulator} $out/bin/hugo completion bash) \
+ --fish <(${emulator} $out/bin/hugo completion fish) \
+ --zsh <(${emulator} $out/bin/hugo completion zsh)
+ '';
passthru.tests.version = testers.testVersion {
package = hugo;
@@ -48,12 +58,18 @@ buildGoModule rec {
version = "v${version}";
};
+ passthru.updateScript = nix-update-script { };
+
meta = {
changelog = "https://github.com/gohugoio/hugo/releases/tag/v${version}";
description = "Fast and modern static website engine";
homepage = "https://gohugo.io";
license = lib.licenses.asl20;
mainProgram = "hugo";
- maintainers = with lib.maintainers; [ schneefux Br1ght0ne Frostman ];
+ maintainers = with lib.maintainers; [
+ schneefux
+ Br1ght0ne
+ Frostman
+ ];
};
}
diff --git a/pkgs/by-name/hw/hwinfo/package.nix b/pkgs/by-name/hw/hwinfo/package.nix
index 14e922df1533..cfb940d66cd1 100644
--- a/pkgs/by-name/hw/hwinfo/package.nix
+++ b/pkgs/by-name/hw/hwinfo/package.nix
@@ -20,13 +20,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "hwinfo";
- version = "23.2";
+ version = "23.3";
src = fetchFromGitHub {
owner = "opensuse";
repo = "hwinfo";
rev = finalAttrs.version;
- hash = "sha256-YAhsnE1DJ5UlYAuhDxS/5IpfIJB6DrhCT3E0YiKENjU=";
+ hash = "sha256-TOW6jD7ZTA32H4oByaVkDAjUSwo9JSID7WSBYj7ZzBs=";
};
nativeBuildInputs = [
@@ -65,6 +65,8 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail "/usr/bin/udevinfo" "${systemdMinimal}/bin/udevinfo" \
--replace-fail "/usr/bin/udevadm" "${systemdMinimal}/bin/udevadm"
+ # Replace /usr/bin/perl
+ patchShebangs src/ids/convert_hd
'';
# The pci/usb ids in hwinfo are ancient. We can get a more up-to-date list simply by copying from systemd
diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix
index 42ebcc581caf..937165f66fc6 100644
--- a/pkgs/by-name/hy/hydra/package.nix
+++ b/pkgs/by-name/hy/hydra/package.nix
@@ -124,13 +124,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "hydra";
- version = "0-unstable-2024-10-08";
+ version = "0-unstable-2024-10-24";
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
- rev = "c69e30122bf7e7a7d3de70dc2418263c6e44159b";
- hash = "sha256-khkY1GG43/VUBt6g7Egt0Zz0V/rXxnDUpOLtanFum7Y=";
+ rev = "f974891c76e295240017dd7f04d50ecb4b70284e";
+ hash = "sha256-xVSu4ZNdlOEh2KcloDvhVeiFSYgk22W5fDvQlwn+kbE=";
};
buildInputs = [
diff --git a/pkgs/by-name/hy/hyperlink/package.nix b/pkgs/by-name/hy/hyperlink/package.nix
index 8f89a0081062..0edd68e6a82e 100644
--- a/pkgs/by-name/hy/hyperlink/package.nix
+++ b/pkgs/by-name/hy/hyperlink/package.nix
@@ -5,22 +5,22 @@
rustPlatform.buildRustPackage rec {
pname = "hyperlink";
- version = "0.1.32";
+ version = "0.1.35";
src = fetchFromGitHub {
owner = "untitaker";
repo = "hyperlink";
rev = version;
- hash = "sha256-QejpyleugPWvr4p8JOMieswVtfQMGxtH+fb46mRLlH4=";
+ hash = "sha256-sx1OW056s40uhwwgGtNKiPkKSUy7/ZzSYGnjc0UKh/E=";
};
- cargoHash = "sha256-d0JwxxI6Quyan2lgymxGpROKR757LEOUIgJcs5c9Kmc=";
+ cargoHash = "sha256-4UEq9m5SWqmnzc++DjIeSq4ckTKgoxdt+8MekxiYGPE=";
meta = with lib; {
description = "Very fast link checker for CI";
homepage = "https://github.com/untitaker/hyperlink";
license = licenses.mit;
- maintainers = [ ];
+ maintainers = with maintainers; [ samueltardieu ];
mainProgram = "hyperlink";
};
}
diff --git a/pkgs/by-name/hy/hyprcursor/package.nix b/pkgs/by-name/hy/hyprcursor/package.nix
index 5b8480dc20cd..9ef6b761f704 100644
--- a/pkgs/by-name/hy/hyprcursor/package.nix
+++ b/pkgs/by-name/hy/hyprcursor/package.nix
@@ -1,31 +1,28 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, pkg-config
-, cairo
-, hyprlang
-, librsvg
-, libzip
-, tomlplusplus
-, nix-update-script
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ cmake,
+ pkg-config,
+ cairo,
+ hyprlang,
+ librsvg,
+ libzip,
+ xcur2png,
+ tomlplusplus,
+ nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "hyprcursor";
- version = "0.1.9";
+ version = "0.1.10";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprcursor";
rev = "refs/tags/v${finalAttrs.version}";
- hash = "sha256-FIN1wMoyePBTtibCbaeJaoKNLuAYIGwLCWAYC1DJanw=";
+ hash = "sha256-NqihN/x8T4+wumSP1orwCCdEmD2xWgLR5QzfY+kAtuU=";
};
- patches = [
- # fix icon directories system search path
- "${finalAttrs.src}/nix/dirs.patch"
- ];
-
nativeBuildInputs = [
cmake
pkg-config
@@ -36,6 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
hyprlang
librsvg
libzip
+ xcur2png
tomlplusplus
];
diff --git a/pkgs/by-name/hy/hyprpolkitagent/package.nix b/pkgs/by-name/hy/hyprpolkitagent/package.nix
new file mode 100644
index 000000000000..13baecb89f84
--- /dev/null
+++ b/pkgs/by-name/hy/hyprpolkitagent/package.nix
@@ -0,0 +1,50 @@
+{
+ lib,
+ stdenv,
+ cmake,
+ pkg-config,
+ fetchFromGitHub,
+ hyprutils,
+ kdePackages,
+ polkit,
+ qt6,
+}:
+stdenv.mkDerivation (finalAttrs: {
+ pname = "hyprpolkitagent";
+ version = "0.1.1";
+
+ src = fetchFromGitHub {
+ owner = "hyprwm";
+ repo = "hyprpolkitagent";
+ rev = "refs/tags/v${finalAttrs.version}";
+ hash = "sha256-fhG6YqByDW0DAixXXX6AwTJOH3MqDlQ2XrVvpusZ3Ek=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ qt6.wrapQtAppsHook
+ ];
+
+ buildInputs = [
+ hyprutils
+ kdePackages.kirigami-addons
+ kdePackages.polkit-qt-1
+ polkit
+ qt6.qtbase
+ qt6.qtsvg
+ qt6.qtwayland
+ ];
+
+ meta = {
+ description = "Polkit authentication agent written in QT/QML";
+ homepage = "https://github.com/hyprwm/hyprpolkitagent";
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [
+ fufexan
+ johnrtitor
+ ];
+ mainProgram = "hyprpolkitagent";
+ platforms = lib.platforms.linux;
+ };
+})
diff --git a/pkgs/by-name/hy/hyprsunset/package.nix b/pkgs/by-name/hy/hyprsunset/package.nix
new file mode 100644
index 000000000000..a1b70a67bf5d
--- /dev/null
+++ b/pkgs/by-name/hy/hyprsunset/package.nix
@@ -0,0 +1,55 @@
+{
+ lib,
+ stdenv,
+ cmake,
+ fetchFromGitHub,
+ pkg-config,
+ hyprland-protocols,
+ hyprutils,
+ hyprwayland-scanner,
+ wayland,
+ wayland-protocols,
+ wayland-scanner,
+ unstableGitUpdater,
+}:
+stdenv.mkDerivation (finalAttrs: {
+ pname = "hyprsunset";
+ version = "0-unstable-2024-10-08";
+
+ src = fetchFromGitHub {
+ owner = "hyprwm";
+ repo = "hyprsunset";
+ rev = "f535c1894d71d7639d19b52f5b72e1ac840c2512";
+ hash = "sha256-SVkcePzX9PAlWsPSGBaxiNFCouiQmGOezhMo0+zhDIQ=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pkg-config
+ hyprwayland-scanner
+ ];
+
+ buildInputs = [
+ hyprland-protocols
+ hyprutils
+ wayland
+ wayland-protocols
+ wayland-scanner
+ ];
+
+ passthru = {
+ updateScript = unstableGitUpdater { };
+ };
+
+ meta = {
+ homepage = "https://github.com/hyprwm/hyprsunset";
+ description = "Application to enable a blue-light filter on Hyprland";
+ license = lib.licenses.bsd3;
+ platforms = lib.platforms.linux;
+ maintainers = with lib.maintainers; [
+ fufexan
+ johnrtitor
+ ];
+ mainProgram = "hyprsunset";
+ };
+})
diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix
index b67ef56b803b..868355dea3be 100644
--- a/pkgs/by-name/ic/icloudpd/package.nix
+++ b/pkgs/by-name/ic/icloudpd/package.nix
@@ -1,50 +1,55 @@
-{ lib
-, python3Packages
-, fetchFromGitHub
-, nix-update-script
-, testers
-, icloudpd
+{
+ lib,
+ python3Packages,
+ fetchFromGitHub,
+ nix-update-script,
+ testers,
+ icloudpd,
}:
python3Packages.buildPythonApplication rec {
pname = "icloudpd";
- version = "1.19.1";
+ version = "1.24.0";
pyproject = true;
src = fetchFromGitHub {
owner = "icloud-photos-downloader";
repo = "icloud_photos_downloader";
rev = "v${version}";
- hash = "sha256-0DbYbBs/8irj/55+WHyNj+iLWh7KqxReVWfmsWz43Xo=";
+ hash = "sha256-IP5bjRmHlVKYmcsR1g9B/p4KzVpCyBomwznPwjay4wA=";
};
pythonRelaxDeps = true;
- propagatedBuildInputs = with python3Packages; [
- wheel
- setuptools
- requests
- schema
- click
- python-dateutil
- tqdm
- piexif
- urllib3
- six
- tzlocal
- pytz
+ dependencies = with python3Packages; [
certifi
+ click
+ flask
keyring
keyrings-alt
+ piexif
+ python-dateutil
+ pytz
+ requests
+ schema
+ six
+ srp
+ tqdm
typing-extensions
+ tzlocal
+ urllib3
+ waitress
+ wheel
];
+ build-system = with python3Packages; [ setuptools ];
+
nativeCheckInputs = with python3Packages; [
- pytestCheckHook
- mock
freezegun
- vcrpy
+ mock
pytest-timeout
+ pytestCheckHook
+ vcrpy
];
disabledTests = [
@@ -57,6 +62,7 @@ python3Packages.buildPythonApplication rec {
"test_autodelete_photos_dry_run"
"test_retry_fail_delete_after_download_internal_error"
"test_autodelete_invalid_creation_date"
+ "test_folder_structure_de_posix"
];
passthru = {
@@ -75,6 +81,9 @@ python3Packages.buildPythonApplication rec {
description = "iCloud Photos Downloader";
license = licenses.mit;
mainProgram = "icloudpd";
- maintainers = with maintainers; [ anpin jnsgruk ];
+ maintainers = with maintainers; [
+ anpin
+ jnsgruk
+ ];
};
}
diff --git a/pkgs/by-name/im/immersed/linux.nix b/pkgs/by-name/im/immersed/linux.nix
index 60d19900afc9..fb989ef291c3 100644
--- a/pkgs/by-name/im/immersed/linux.nix
+++ b/pkgs/by-name/im/immersed/linux.nix
@@ -3,7 +3,42 @@
, src
, meta
, appimageTools
+, libgpg-error
}:
-appimageTools.wrapType2 {
- inherit pname version src meta;
+
+let
+ src' = appimageTools.extract {
+ inherit pname version;
+ src = src;
+
+ # Because of https://github.com/NixOS/nixpkgs/issues/267408
+ postExtract = ''
+ cp ${libgpg-error}/lib/* $out/usr/lib/
+ '';
+ };
+in
+
+appimageTools.wrapAppImage rec {
+ inherit pname version meta;
+ src = src';
+
+ extraPkgs = pkgs: with pkgs; [
+ libgpg-error
+ fontconfig
+ libGL
+ mesa
+ wayland
+ pipewire
+ fribidi
+ harfbuzz
+ freetype
+ libthai
+ e2fsprogs
+ zlib
+ libp11
+ xorg.libX11
+ xorg.libSM
+ ];
+
+ multiArch = true;
}
diff --git a/pkgs/by-name/im/immich-machine-learning/package.nix b/pkgs/by-name/im/immich-machine-learning/package.nix
index 1029055a3b0f..7d29efca5603 100644
--- a/pkgs/by-name/im/immich-machine-learning/package.nix
+++ b/pkgs/by-name/im/immich-machine-learning/package.nix
@@ -4,6 +4,7 @@
immich,
python3,
nixosTests,
+ stdenv,
}:
let
python = python3.override {
@@ -25,9 +26,7 @@ python.pkgs.buildPythonApplication rec {
pythonRelaxDeps = [
"pydantic-settings"
- "setuptools"
];
- pythonRemoveDeps = [ "opencv-python-headless" ];
build-system = with python.pkgs; [
poetry-core
@@ -38,7 +37,7 @@ python.pkgs.buildPythonApplication rec {
with python.pkgs;
[
insightface
- opencv4
+ opencv-python-headless
pillow
fastapi
uvicorn
@@ -47,7 +46,6 @@ python.pkgs.buildPythonApplication rec {
aiocache
rich
ftfy
- setuptools
python-multipart
orjson
gunicorn
@@ -56,6 +54,10 @@ python.pkgs.buildPythonApplication rec {
]
++ uvicorn.optional-dependencies.standard;
+ # aarch64-linux tries to get cpu information from /sys, which isn't available
+ # inside the nix build sandbox.
+ doCheck = stdenv.buildPlatform.system != "aarch64-linux";
+
nativeCheckInputs = with python.pkgs; [
httpx
pytest-asyncio
@@ -88,11 +90,9 @@ python.pkgs.buildPythonApplication rec {
};
meta = {
- description = "Self-hosted photo and video backup solution (machine learning component)";
- homepage = "https://immich.app/";
- license = lib.licenses.agpl3Only;
- maintainers = with lib.maintainers; [ jvanbruegge ];
+ description = "${immich.meta.description} (machine learning component)";
+ homepage = "https://github.com/immich-app/immich/tree/main/machine-learning";
mainProgram = "machine-learning";
- inherit (immich.meta) platforms;
+ inherit (immich.meta) license maintainers platforms;
};
}
diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix
index fcbfb2607f02..66213718fd23 100644
--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@@ -17,7 +17,7 @@
cacert,
unzip,
# runtime deps
- ffmpeg-headless,
+ jellyfin-ffmpeg,
imagemagick,
libraw,
libheif,
@@ -101,8 +101,8 @@ let
web = buildNpmPackage' {
pname = "immich-web";
- inherit version;
- src = "${src}/web";
+ inherit version src;
+ sourceRoot = "${src.name}/web";
inherit (sources.components.web) npmDepsHash;
preBuild = ''
@@ -155,7 +155,7 @@ buildNpmPackage' {
];
buildInputs = [
- ffmpeg-headless
+ jellyfin-ffmpeg
imagemagick
libraw
libheif
@@ -198,7 +198,7 @@ buildNpmPackage' {
--suffix PATH : "${
lib.makeBinPath [
perl
- ffmpeg-headless
+ jellyfin-ffmpeg
]
}"
diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json
index b39c08613c49..3c4bdf53f702 100644
--- a/pkgs/by-name/im/immich/sources.json
+++ b/pkgs/by-name/im/immich/sources.json
@@ -1,22 +1,22 @@
{
- "version": "1.118.2",
- "hash": "sha256-u2/Xs1SdAzmQ02pyXD9+ncamIKFcq8qMijnx7KFtrmU=",
+ "version": "1.119.1",
+ "hash": "sha256-T+bIL2LaVNgFT3xBUxiEzhyDiLpw/WU7mxttuJD39SQ=",
"components": {
"cli": {
- "npmDepsHash": "sha256-RwfGq0fDPYo+ZP2xv+sMKmr3Tf8szbB8506c1PqiMM0=",
- "version": "2.2.26"
+ "npmDepsHash": "sha256-kTBlo6eIPswZC0GQG7IoqQZ5b7wPEXFaD/SuuaEQMEg=",
+ "version": "2.2.28"
},
"server": {
- "npmDepsHash": "sha256-4jPvLCsI2gz+maBU3ZtrWZzJ6Zp2PTQwaCuCKr1hK/o=",
- "version": "1.118.2"
+ "npmDepsHash": "sha256-zgzqh3TyafPKuk5RZ2I/haYFzMVlI4jGnwD5XLqTBdg=",
+ "version": "1.119.1"
},
"web": {
- "npmDepsHash": "sha256-j6+EkcfwpaCP048v/kZv1xthp0DSylraJTeU4+LcDbw=",
- "version": "1.118.2"
+ "npmDepsHash": "sha256-LPtsMzF7yYGrrpDoYoba6OQphKY7AvGbJpPc5pS4eFU=",
+ "version": "1.119.1"
},
"open-api/typescript-sdk": {
- "npmDepsHash": "sha256-e+7BEFc46scLZDqCJNRhrczOEydSoiK9m7vSj/2ECaE=",
- "version": "1.118.2"
+ "npmDepsHash": "sha256-dyKmDez8jO6p+cmSa2KMe9zzhXn4on3aFUMdep+gjzU=",
+ "version": "1.119.1"
}
}
}
diff --git a/pkgs/by-name/in/ineffassign/0001-fix-build.patch b/pkgs/by-name/in/ineffassign/0001-fix-build.patch
new file mode 100644
index 000000000000..3b953539d852
--- /dev/null
+++ b/pkgs/by-name/in/ineffassign/0001-fix-build.patch
@@ -0,0 +1,72 @@
+From 731d5be8e39bdf28266057ef06705a1a5fd45750 Mon Sep 17 00:00:00 2001
+From: wxt <3264117476@qq.com>
+Date: Tue, 22 Oct 2024 11:46:12 +0800
+Subject: [PATCH] fix build
+
+---
+ go.mod | 11 +++++++++--
+ go.sum | 35 ++++++++---------------------------
+ 2 files changed, 17 insertions(+), 29 deletions(-)
+
+diff --git a/go.mod b/go.mod
+index b65ec67..84cc7ca 100644
+--- a/go.mod
++++ b/go.mod
+@@ -1,5 +1,12 @@
+ module github.com/gordonklaus/ineffassign
+
+-go 1.14
++go 1.22.0
+
+-require golang.org/x/tools v0.1.5
++toolchain go1.23.2
++
++require golang.org/x/tools v0.26.0
++
++require (
++ golang.org/x/mod v0.21.0 // indirect
++ golang.org/x/sync v0.8.0 // indirect
++)
+diff --git a/go.sum b/go.sum
+index 6483b19..486c8d4 100644
+--- a/go.sum
++++ b/go.sum
+@@ -1,27 +1,8 @@
+-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+-golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
+-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+-golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE=
+-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+-golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA=
+-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
++github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
++github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
++golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
++golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
++golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
++golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
++golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
++golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
+--
+2.46.1
+
diff --git a/pkgs/by-name/in/ineffassign/package.nix b/pkgs/by-name/in/ineffassign/package.nix
new file mode 100644
index 000000000000..f88b72527c27
--- /dev/null
+++ b/pkgs/by-name/in/ineffassign/package.nix
@@ -0,0 +1,39 @@
+{
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+ nix-update-script,
+}:
+
+buildGoModule rec {
+ pname = "ineffassign";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "gordonklaus";
+ repo = "ineffassign";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-JVrAIspRL6XvDd/AnPFt9IJPQ0hY1KPwXvldAfwYkzU=";
+ };
+
+ patches = [
+ ./0001-fix-build.patch # run go get -u. Old dependency can't run correctly on go 1.23
+ ];
+
+ vendorHash = "sha256-WpX5I9PK7xuln6BkIEW2qIF1K/BgaEu/gkJsz+ThVk0=";
+
+ passthru.updateScript = nix-update-script { };
+
+ allowGoReference = true;
+
+ meta = {
+ description = "Detect ineffectual assignments in Go code";
+ mainProgram = "ineffassign";
+ homepage = "https://github.com/gordonklaus/ineffassign";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [
+ kalbasit
+ bot-wxt1221
+ ];
+ };
+}
diff --git a/pkgs/by-name/in/intiface-central/package.nix b/pkgs/by-name/in/intiface-central/package.nix
index 7353a8ed6aca..fad8b190b186 100644
--- a/pkgs/by-name/in/intiface-central/package.nix
+++ b/pkgs/by-name/in/intiface-central/package.nix
@@ -9,14 +9,14 @@
, copyDesktopItems
, makeDesktopItem
}:
-flutterPackages.v3_19.buildFlutterApplication rec {
+flutterPackages.stable.buildFlutterApplication rec {
pname = "intiface-central";
- version = "2.6.0";
+ version = "2.6.4";
src = fetchFromGitHub {
owner = "intiface";
repo = "intiface-central";
rev = "v${version}";
- hash = "sha256-7+rw0cD8MJPFOkgmfHD6y+EojTGQhb15o1mn2p14eoE=";
+ hash = "sha256-QBNEKhjBfKxArBykUq/fE4lftCYzGdAaWYD1F7rar5Y=";
};
patches = [
./corrosion.patch
@@ -28,7 +28,7 @@ flutterPackages.v3_19.buildFlutterApplication rec {
name = "${pname}-${version}-cargo-deps";
inherit src;
sourceRoot = "${src.name}/intiface-engine-flutter-bridge";
- hash = "sha256-tPkLZmHReY1TU2qcY4aGWsQPhLFowrqxTPwmTHZ5fDE=";
+ hash = "sha256-S3Yy0IIMiRUUpFNlLvS1PGwpvxePMB1sO5M6mpm1OgY=";
};
cargoRoot = "intiface-engine-flutter-bridge";
@@ -50,11 +50,13 @@ flutterPackages.v3_19.buildFlutterApplication rec {
# without this, only the splash screen will be shown and the logs will contain the
# line `Failed to load dynamic library 'lib/libintiface_engine_flutter_bridge.so'`
- extraWrapProgramArgs = "--chdir $out/app";
+ # Environmental variables don't quite eval outside of hooks so use pname and
+ # version directly.
+ extraWrapProgramArgs = "--chdir $out/app/${pname}";
postInstall = ''
mkdir -p $out/share/pixmaps
- cp $out/app/data/flutter_assets/assets/icons/intiface_central_icon.png $out/share/pixmaps/intiface-central.png
+ cp $out/app/$pname/data/flutter_assets/assets/icons/intiface_central_icon.png $out/share/pixmaps/intiface-central.png
'';
desktopItems = [
diff --git a/pkgs/by-name/in/intiface-central/pubspec.lock.json b/pkgs/by-name/in/intiface-central/pubspec.lock.json
index d3f088c6623d..7e4a916a879b 100644
--- a/pkgs/by-name/in/intiface-central/pubspec.lock.json
+++ b/pkgs/by-name/in/intiface-central/pubspec.lock.json
@@ -4,41 +4,47 @@
"dependency": "transitive",
"description": {
"name": "_fe_analyzer_shared",
- "sha256": "eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051",
+ "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "64.0.0"
+ "version": "72.0.0"
+ },
+ "_macros": {
+ "dependency": "transitive",
+ "description": "dart",
+ "source": "sdk",
+ "version": "0.3.2"
},
"analyzer": {
"dependency": "transitive",
"description": {
"name": "analyzer",
- "sha256": "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893",
+ "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "6.2.0"
+ "version": "6.7.0"
},
"archive": {
"dependency": "transitive",
"description": {
"name": "archive",
- "sha256": "7b875fd4a20b165a3084bd2d210439b22ebc653f21cea4842729c0c30c82596b",
+ "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "3.4.9"
+ "version": "3.6.1"
},
"args": {
"dependency": "transitive",
"description": {
"name": "args",
- "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596",
+ "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.4.2"
+ "version": "2.5.0"
},
"async": {
"dependency": "transitive",
@@ -54,11 +60,11 @@
"dependency": "direct main",
"description": {
"name": "bloc",
- "sha256": "f53a110e3b48dcd78136c10daa5d51512443cea5e1348c9d80a320095fa2db9e",
+ "sha256": "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "8.1.3"
+ "version": "8.1.4"
},
"boolean_selector": {
"dependency": "transitive",
@@ -104,41 +110,41 @@
"dependency": "transitive",
"description": {
"name": "build_daemon",
- "sha256": "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1",
+ "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "4.0.1"
+ "version": "4.0.2"
},
"build_resolvers": {
"dependency": "transitive",
"description": {
"name": "build_resolvers",
- "sha256": "64e12b0521812d1684b1917bc80945625391cb9bdd4312536b1d69dcb6133ed8",
+ "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.4.1"
+ "version": "2.4.2"
},
"build_runner": {
"dependency": "direct dev",
"description": {
"name": "build_runner",
- "sha256": "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b",
+ "sha256": "dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.4.6"
+ "version": "2.4.12"
},
"build_runner_core": {
"dependency": "transitive",
"description": {
"name": "build_runner_core",
- "sha256": "c9e32d21dd6626b5c163d48b037ce906bbe428bc23ab77bcd77bb21e593b6185",
+ "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "7.2.11"
+ "version": "7.3.2"
},
"built_collection": {
"dependency": "transitive",
@@ -154,11 +160,11 @@
"dependency": "transitive",
"description": {
"name": "built_value",
- "sha256": "723b4021e903217dfc445ec4cf5b42e27975aece1fc4ebbc1ca6329c2d9fb54e",
+ "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "8.7.0"
+ "version": "8.9.2"
},
"buttplug": {
"dependency": "direct main",
@@ -194,11 +200,11 @@
"dependency": "transitive",
"description": {
"name": "cli_util",
- "sha256": "b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7",
+ "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.4.0"
+ "version": "0.4.1"
},
"clock": {
"dependency": "transitive",
@@ -214,11 +220,11 @@
"dependency": "transitive",
"description": {
"name": "code_builder",
- "sha256": "1be9be30396d7e4c0db42c35ea6ccd7cc6a1e19916b5dc64d6ac216b5544d677",
+ "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "4.7.0"
+ "version": "4.10.0"
},
"collection": {
"dependency": "transitive",
@@ -264,21 +270,21 @@
"dependency": "direct main",
"description": {
"name": "cupertino_icons",
- "sha256": "d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d",
+ "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.0.6"
+ "version": "1.0.8"
},
"dart_style": {
"dependency": "transitive",
"description": {
"name": "dart_style",
- "sha256": "abd7625e16f51f554ea244d090292945ec4d4be7bfbaf2ec8cccea568919d334",
+ "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.3.3"
+ "version": "2.3.6"
},
"dbus": {
"dependency": "transitive",
@@ -294,21 +300,21 @@
"dependency": "direct main",
"description": {
"name": "device_info_plus",
- "sha256": "7035152271ff67b072a211152846e9f1259cf1be41e34cd3e0b5463d2d6b8419",
+ "sha256": "77f757b789ff68e4eaf9c56d1752309bd9f7ad557cb105b938a7f8eb89e59110",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "9.1.0"
+ "version": "9.1.2"
},
"device_info_plus_platform_interface": {
"dependency": "transitive",
"description": {
"name": "device_info_plus_platform_interface",
- "sha256": "d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64",
+ "sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "7.0.0"
+ "version": "7.0.1"
},
"easy_debounce": {
"dependency": "direct main",
@@ -344,11 +350,11 @@
"dependency": "direct main",
"description": {
"name": "ffi",
- "sha256": "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878",
+ "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.1.0"
+ "version": "2.1.2"
},
"ffigen": {
"dependency": "direct dev",
@@ -390,21 +396,21 @@
"dependency": "direct main",
"description": {
"name": "flutter_bloc",
- "sha256": "e74efb89ee6945bcbce74a5b3a5a3376b088e5f21f55c263fc38cbdc6237faae",
+ "sha256": "b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "8.1.3"
+ "version": "8.1.6"
},
"flutter_foreground_task": {
"dependency": "direct main",
"description": {
"name": "flutter_foreground_task",
- "sha256": "e48d2d810a2d643362e64de41146ed8e95d4dd282bae6abbb32309d9f0bf5d67",
+ "sha256": "4962ffefe4352435900eb25734925f1ad002abf48e13c1ca22c9c63391be4f94",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "6.1.2"
+ "version": "8.7.0"
},
"flutter_launcher_icons": {
"dependency": "direct dev",
@@ -420,61 +426,61 @@
"dependency": "direct dev",
"description": {
"name": "flutter_lints",
- "sha256": "e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7",
+ "sha256": "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "3.0.1"
+ "version": "3.0.2"
},
"flutter_local_notifications": {
"dependency": "direct main",
"description": {
"name": "flutter_local_notifications",
- "sha256": "6d11ea777496061e583623aaf31923f93a9409ef8fcaeeefdd6cd78bf4fe5bb3",
+ "sha256": "c500d5d9e7e553f06b61877ca6b9c8b92c570a4c8db371038702e8ce57f8a50f",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "16.1.0"
+ "version": "17.2.2"
},
"flutter_local_notifications_linux": {
"dependency": "transitive",
"description": {
"name": "flutter_local_notifications_linux",
- "sha256": "33f741ef47b5f63cc7f78fe75eeeac7e19f171ff3c3df054d84c1e38bedb6a03",
+ "sha256": "c49bd06165cad9beeb79090b18cd1eb0296f4bf4b23b84426e37dd7c027fc3af",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "4.0.0+1"
+ "version": "4.0.1"
},
"flutter_local_notifications_platform_interface": {
"dependency": "transitive",
"description": {
"name": "flutter_local_notifications_platform_interface",
- "sha256": "7cf643d6d5022f3baed0be777b0662cce5919c0a7b86e700299f22dc4ae660ef",
+ "sha256": "85f8d07fe708c1bdcf45037f2c0109753b26ae077e9d9e899d55971711a4ea66",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "7.0.0+1"
+ "version": "7.2.0"
},
"flutter_loggy": {
"dependency": "direct main",
"description": {
"name": "flutter_loggy",
- "sha256": "21b515977deefe37817cce35b0e420c7cde930b9dcfdcbeb05730ed24ee74e3a",
+ "sha256": "c758629403e19115af198993ff7bd3af2c5a337de16ee23acda2e6f29df1db48",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.0.2"
+ "version": "2.0.3"
},
"flutter_markdown": {
"dependency": "direct main",
"description": {
"name": "flutter_markdown",
- "sha256": "35108526a233cc0755664d445f8a6b4b61e6f8fe993b3658b80b4a26827fc196",
+ "sha256": "04c4722cc36ec5af38acc38ece70d22d3c2123c61305d555750a091517bbe504",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.6.18+2"
+ "version": "0.6.23"
},
"flutter_multi_slider": {
"dependency": "direct main",
@@ -500,11 +506,11 @@
"dependency": "direct main",
"description": {
"name": "flutter_spinkit",
- "sha256": "b39c753e909d4796906c5696a14daf33639a76e017136c8d82bf3e620ce5bb8e",
+ "sha256": "d2696eed13732831414595b98863260e33e8882fc069ee80ec35d4ac9ddb0472",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "5.2.0"
+ "version": "5.2.1"
},
"flutter_test": {
"dependency": "direct dev",
@@ -522,11 +528,11 @@
"dependency": "transitive",
"description": {
"name": "frontend_server_client",
- "sha256": "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612",
+ "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "3.2.0"
+ "version": "4.0.0"
},
"get_it": {
"dependency": "transitive",
@@ -542,11 +548,11 @@
"dependency": "direct main",
"description": {
"name": "github",
- "sha256": "45d7ffc34f4958b8f9910175e10fc00f976ad0b44ca5ee06fcfd7269a2dbb77f",
+ "sha256": "57f6ad78591f9638e903409977443093f862d25062a6b582a3c89e4ae44e4814",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "9.20.0"
+ "version": "9.24.0"
},
"glob": {
"dependency": "transitive",
@@ -562,21 +568,21 @@
"dependency": "transitive",
"description": {
"name": "graphs",
- "sha256": "aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19",
+ "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.3.1"
+ "version": "2.3.2"
},
"http": {
"dependency": "transitive",
"description": {
"name": "http",
- "sha256": "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525",
+ "sha256": "a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.1.0"
+ "version": "1.2.0"
},
"http_multi_server": {
"dependency": "transitive",
@@ -602,11 +608,11 @@
"dependency": "transitive",
"description": {
"name": "image",
- "sha256": "028f61960d56f26414eb616b48b04eb37d700cbe477b7fb09bf1d7ce57fd9271",
+ "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "4.1.3"
+ "version": "4.2.0"
},
"intl": {
"dependency": "direct main",
@@ -642,51 +648,51 @@
"dependency": "direct main",
"description": {
"name": "json_annotation",
- "sha256": "b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467",
+ "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "4.8.1"
+ "version": "4.9.0"
},
"json_serializable": {
"dependency": "direct dev",
"description": {
"name": "json_serializable",
- "sha256": "aa1f5a8912615733e0fdc7a02af03308933c93235bdc8d50d0b0c8a8ccb0b969",
+ "sha256": "ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "6.7.1"
+ "version": "6.8.0"
},
"leak_tracker": {
"dependency": "transitive",
"description": {
"name": "leak_tracker",
- "sha256": "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa",
+ "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "10.0.0"
+ "version": "10.0.5"
},
"leak_tracker_flutter_testing": {
"dependency": "transitive",
"description": {
"name": "leak_tracker_flutter_testing",
- "sha256": "b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0",
+ "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.0.1"
+ "version": "3.0.5"
},
"leak_tracker_testing": {
"dependency": "transitive",
"description": {
"name": "leak_tracker_testing",
- "sha256": "a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47",
+ "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.0.1"
+ "version": "3.0.1"
},
"lints": {
"dependency": "transitive",
@@ -718,15 +724,25 @@
"source": "hosted",
"version": "2.0.3"
},
+ "macros": {
+ "dependency": "transitive",
+ "description": {
+ "name": "macros",
+ "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.1.2-main.4"
+ },
"markdown": {
"dependency": "direct main",
"description": {
"name": "markdown",
- "sha256": "acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd",
+ "sha256": "ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "7.1.1"
+ "version": "7.2.2"
},
"matcher": {
"dependency": "transitive",
@@ -742,31 +758,31 @@
"dependency": "transitive",
"description": {
"name": "material_color_utilities",
- "sha256": "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a",
+ "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.8.0"
+ "version": "0.11.1"
},
"meta": {
"dependency": "transitive",
"description": {
"name": "meta",
- "sha256": "d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04",
+ "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.11.0"
+ "version": "1.15.0"
},
"mime": {
"dependency": "transitive",
"description": {
"name": "mime",
- "sha256": "e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e",
+ "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.0.4"
+ "version": "1.0.5"
},
"msix": {
"dependency": "direct dev",
@@ -782,11 +798,11 @@
"dependency": "direct main",
"description": {
"name": "multicast_dns",
- "sha256": "316cc47a958d4bd3c67bd238fe8b44fdfb6133bad89cb191c0c3bd3edb14e296",
+ "sha256": "982c4cc4cda5f98dd477bddfd623e8e4bd1014e7dbf9e7b05052e14a5b550b99",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.3.2+6"
+ "version": "0.3.2+7"
},
"nested": {
"dependency": "transitive",
@@ -802,11 +818,11 @@
"dependency": "direct main",
"description": {
"name": "network_info_plus",
- "sha256": "2d9e88b9a459e5d4e224f828d26cc38ea140511e89b943116939994324be5c96",
+ "sha256": "4601b815b1c6a46d84839f65cd774a7d999738471d910fae00d813e9e98b04e1",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "4.1.0"
+ "version": "4.1.0+1"
},
"network_info_plus_platform_interface": {
"dependency": "transitive",
@@ -872,31 +888,31 @@
"dependency": "direct main",
"description": {
"name": "path_provider",
- "sha256": "a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa",
+ "sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.1.1"
+ "version": "2.1.4"
},
"path_provider_android": {
"dependency": "transitive",
"description": {
"name": "path_provider_android",
- "sha256": "e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72",
+ "sha256": "490539678396d4c3c0b06efdaab75ae60675c3e0c66f72bc04c2e2c1e0e2abeb",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.2.1"
+ "version": "2.2.9"
},
"path_provider_foundation": {
"dependency": "transitive",
"description": {
"name": "path_provider_foundation",
- "sha256": "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d",
+ "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.3.1"
+ "version": "2.4.0"
},
"path_provider_linux": {
"dependency": "transitive",
@@ -912,21 +928,21 @@
"dependency": "transitive",
"description": {
"name": "path_provider_platform_interface",
- "sha256": "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c",
+ "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.1.1"
+ "version": "2.1.2"
},
"path_provider_windows": {
"dependency": "transitive",
"description": {
"name": "path_provider_windows",
- "sha256": "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170",
+ "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.2.1"
+ "version": "2.3.0"
},
"percent_indicator": {
"dependency": "direct main",
@@ -942,91 +958,91 @@
"dependency": "direct main",
"description": {
"name": "permission_handler",
- "sha256": "284a66179cabdf942f838543e10413246f06424d960c92ba95c84439154fcac8",
+ "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "11.0.1"
+ "version": "11.3.1"
},
"permission_handler_android": {
"dependency": "transitive",
"description": {
"name": "permission_handler_android",
- "sha256": "f9fddd3b46109bd69ff3f9efa5006d2d309b7aec0f3c1c5637a60a2d5659e76e",
+ "sha256": "eaf2a1ec4472775451e88ca6a7b86559ef2f1d1ed903942ed135e38ea0097dca",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "11.1.0"
+ "version": "12.0.8"
},
"permission_handler_apple": {
"dependency": "transitive",
"description": {
"name": "permission_handler_apple",
- "sha256": "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5",
+ "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "9.1.4"
+ "version": "9.4.5"
+ },
+ "permission_handler_html": {
+ "dependency": "transitive",
+ "description": {
+ "name": "permission_handler_html",
+ "sha256": "54bf176b90f6eddd4ece307e2c06cf977fb3973719c35a93b85cc7093eb6070d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.1.1"
},
"permission_handler_platform_interface": {
"dependency": "transitive",
"description": {
"name": "permission_handler_platform_interface",
- "sha256": "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4",
+ "sha256": "fe0ffe274d665be8e34f9c59705441a7d248edebbe5d9e3ec2665f88b79358ea",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "3.12.0"
+ "version": "4.2.2"
},
"permission_handler_windows": {
"dependency": "transitive",
"description": {
"name": "permission_handler_windows",
- "sha256": "cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098",
+ "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.1.3"
+ "version": "0.2.1"
},
"petitparser": {
"dependency": "transitive",
"description": {
"name": "petitparser",
- "sha256": "eeb2d1428ee7f4170e2bd498827296a18d4e7fc462b71727d111c0ac7707cfa6",
+ "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "6.0.1"
+ "version": "6.0.2"
},
"platform": {
"dependency": "transitive",
"description": {
"name": "platform",
- "sha256": "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59",
+ "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "3.1.3"
+ "version": "3.1.5"
},
"plugin_platform_interface": {
"dependency": "direct main",
"description": {
"name": "plugin_platform_interface",
- "sha256": "f4f88d4a900933e7267e2b353594774fc0d07fb072b47eedcd5b54e1ea3269f8",
+ "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.1.7"
- },
- "pointycastle": {
- "dependency": "transitive",
- "description": {
- "name": "pointycastle",
- "sha256": "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c",
- "url": "https://pub.dev"
- },
- "source": "hosted",
- "version": "3.7.3"
+ "version": "2.1.8"
},
"pool": {
"dependency": "transitive",
@@ -1042,11 +1058,11 @@
"dependency": "transitive",
"description": {
"name": "provider",
- "sha256": "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096",
+ "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "6.1.1"
+ "version": "6.1.2"
},
"pub_semver": {
"dependency": "transitive",
@@ -1062,21 +1078,21 @@
"dependency": "transitive",
"description": {
"name": "pubspec_parse",
- "sha256": "c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367",
+ "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.2.3"
+ "version": "1.3.0"
},
"puppeteer": {
"dependency": "transitive",
"description": {
"name": "puppeteer",
- "sha256": "eedeaae6ec5d2e54f9ae22ab4d6b3dda2e8791c356cc783046d06c287ffe11d8",
+ "sha256": "de3f921154e5d336b14cdc05b674ac3db5701a5338f3cb0042868a5146f16e67",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "3.6.0"
+ "version": "3.12.0"
},
"quiver": {
"dependency": "transitive",
@@ -1112,21 +1128,21 @@
"dependency": "direct main",
"description": {
"name": "sentry",
- "sha256": "a460aa48568d47140dd0557410b624d344ffb8c05555107ac65035c1097cf1ad",
+ "sha256": "57514bc72d441ffdc463f498d6886aa586a2494fa467a1eb9d649c28010d7ee3",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "7.18.0"
+ "version": "7.20.2"
},
"sentry_flutter": {
"dependency": "direct main",
"description": {
"name": "sentry_flutter",
- "sha256": "3d0d1d4e0e407d276ae8128d123263ccbc37e988bae906765efd6f37d544f4c6",
+ "sha256": "9723d58470ca43a360681ddd26abb71ca7b815f706bc8d3747afd054cf639ded",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "7.18.0"
+ "version": "7.20.2"
},
"settings_ui": {
"dependency": "direct main",
@@ -1142,51 +1158,51 @@
"dependency": "direct main",
"description": {
"name": "shared_preferences",
- "sha256": "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02",
+ "sha256": "d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.2.2"
+ "version": "2.2.3"
},
"shared_preferences_android": {
"dependency": "transitive",
"description": {
"name": "shared_preferences_android",
- "sha256": "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06",
+ "sha256": "a7e8467e9181cef109f601e3f65765685786c1a738a83d7fbbde377589c0d974",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.2.1"
+ "version": "2.3.1"
},
"shared_preferences_foundation": {
"dependency": "transitive",
"description": {
"name": "shared_preferences_foundation",
- "sha256": "7bf53a9f2d007329ee6f3df7268fd498f8373602f943c975598bbb34649b62a7",
+ "sha256": "776786cff96324851b656777648f36ac772d88bc4c669acff97b7fce5de3c849",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.3.4"
+ "version": "2.5.1"
},
"shared_preferences_linux": {
"dependency": "transitive",
"description": {
"name": "shared_preferences_linux",
- "sha256": "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa",
+ "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.3.2"
+ "version": "2.4.1"
},
"shared_preferences_platform_interface": {
"dependency": "transitive",
"description": {
"name": "shared_preferences_platform_interface",
- "sha256": "d4ec5fc9ebb2f2e056c617112aa75dcf92fc2e4faaf2ae999caa297473f75d8a",
+ "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.3.1"
+ "version": "2.4.1"
},
"shared_preferences_web": {
"dependency": "transitive",
@@ -1202,11 +1218,11 @@
"dependency": "transitive",
"description": {
"name": "shared_preferences_windows",
- "sha256": "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59",
+ "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.3.2"
+ "version": "2.4.1"
},
"shelf": {
"dependency": "transitive",
@@ -1248,11 +1264,11 @@
"dependency": "transitive",
"description": {
"name": "source_gen",
- "sha256": "fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16",
+ "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.4.0"
+ "version": "1.5.0"
},
"source_helper": {
"dependency": "transitive",
@@ -1338,21 +1354,21 @@
"dependency": "transitive",
"description": {
"name": "test_api",
- "sha256": "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b",
+ "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.6.1"
+ "version": "0.7.2"
},
"timezone": {
"dependency": "transitive",
"description": {
"name": "timezone",
- "sha256": "1cfd8ddc2d1cfd836bc93e67b9be88c3adaeca6f40a00ca999104c30693cdca0",
+ "sha256": "2236ec079a174ce07434e89fcd3fcda430025eb7692244139a9cf54fdcf1fc7d",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.9.2"
+ "version": "0.9.4"
},
"timing": {
"dependency": "transitive",
@@ -1438,41 +1454,41 @@
"dependency": "transitive",
"description": {
"name": "url_launcher_platform_interface",
- "sha256": "980e8d9af422f477be6948bdfb68df8433be71f5743a188968b0c1b887807e50",
+ "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.2.0"
+ "version": "2.3.2"
},
"url_launcher_web": {
"dependency": "transitive",
"description": {
"name": "url_launcher_web",
- "sha256": "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2",
+ "sha256": "fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.2.0"
+ "version": "2.2.3"
},
"url_launcher_windows": {
"dependency": "transitive",
"description": {
"name": "url_launcher_windows",
- "sha256": "7754a1ad30ee896b265f8d14078b0513a4dba28d358eabb9d5f339886f4a1adc",
+ "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "3.1.0"
+ "version": "3.1.2"
},
"uuid": {
"dependency": "transitive",
"description": {
"name": "uuid",
- "sha256": "cd210a09f7c18cbe5a02511718e0334de6559871052c90a90c0cca46a4aa81c8",
+ "sha256": "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "4.3.3"
+ "version": "4.4.2"
},
"vector_math": {
"dependency": "transitive",
@@ -1498,11 +1514,11 @@
"dependency": "transitive",
"description": {
"name": "vm_service",
- "sha256": "b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957",
+ "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "13.0.0"
+ "version": "14.2.5"
},
"watcher": {
"dependency": "transitive",
@@ -1518,11 +1534,11 @@
"dependency": "transitive",
"description": {
"name": "web",
- "sha256": "afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152",
+ "sha256": "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.3.0"
+ "version": "0.4.2"
},
"web_socket_channel": {
"dependency": "direct main",
@@ -1538,51 +1554,51 @@
"dependency": "transitive",
"description": {
"name": "win32",
- "sha256": "7c99c0e1e2fa190b48d25c81ca5e42036d5cac81430ef249027d97b0935c553f",
+ "sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "5.1.0"
+ "version": "5.5.4"
},
"win32_registry": {
"dependency": "transitive",
"description": {
"name": "win32_registry",
- "sha256": "41fd8a189940d8696b1b810efb9abcf60827b6cbfab90b0c43e8439e3a39d85a",
+ "sha256": "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.1.2"
+ "version": "1.1.4"
},
"window_manager": {
"dependency": "direct main",
"description": {
"name": "window_manager",
- "sha256": "dcc865277f26a7dad263a47d0e405d77e21f12cb71f30333a52710a408690bd7",
+ "sha256": "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.3.7"
+ "version": "0.3.9"
},
"xdg_directories": {
"dependency": "transitive",
"description": {
"name": "xdg_directories",
- "sha256": "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2",
+ "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.0.3"
+ "version": "1.0.4"
},
"xml": {
"dependency": "transitive",
"description": {
"name": "xml",
- "sha256": "af5e77e9b83f2f4adc5d3f0a4ece1c7f45a2467b695c2540381bac793e34e556",
+ "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "6.4.2"
+ "version": "6.5.0"
},
"yaml": {
"dependency": "transitive",
@@ -1598,15 +1614,15 @@
"dependency": "transitive",
"description": {
"name": "yaml_edit",
- "sha256": "1579d4a0340a83cf9e4d580ea51a16329c916973bffd5bd4b45e911b25d46bfd",
+ "sha256": "e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.1.1"
+ "version": "2.2.1"
}
},
"sdks": {
- "dart": ">=3.2.0 <4.0.0",
- "flutter": ">=3.16.0"
+ "dart": ">=3.5.0-259.0.dev <4.0.0",
+ "flutter": ">=3.22.0"
}
}
diff --git a/pkgs/by-name/iv/ivyterm/package.nix b/pkgs/by-name/iv/ivyterm/package.nix
new file mode 100644
index 000000000000..b5c7c26f09ce
--- /dev/null
+++ b/pkgs/by-name/iv/ivyterm/package.nix
@@ -0,0 +1,51 @@
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+ pkg-config,
+ wrapGAppsHook4,
+ cairo,
+ gdk-pixbuf,
+ glib,
+ gtk4,
+ libadwaita,
+ pango,
+ vte-gtk4,
+}:
+
+rustPlatform.buildRustPackage {
+ pname = "ivyterm";
+ version = "0-unstable-2024-10-23";
+
+ src = fetchFromGitHub {
+ owner = "Tomiyou";
+ repo = "ivyterm";
+ rev = "13ee76dfc88bc92807e328991c7a8586a5b13ac7";
+ hash = "sha256-RVHGDgaNYhR/eGTu4bhJvEfd14qFP+u8ApItVc00Bm8=";
+ };
+
+ cargoHash = "sha256-tdaI0diwRjqERmAiuKFhMw4AeqxgMq8YMsZWBjsmd0U=";
+
+ nativeBuildInputs = [
+ pkg-config
+ wrapGAppsHook4
+ ];
+
+ buildInputs = [
+ cairo
+ gdk-pixbuf
+ glib
+ gtk4
+ libadwaita
+ pango
+ vte-gtk4
+ ];
+
+ meta = {
+ description = "Terminal emulator implemented in gtk4-rs and VTE4";
+ homepage = "https://github.com/Tomiyou/ivyterm";
+ license = lib.licenses.gpl3Only;
+ maintainers = with lib.maintainers; [ genga898 ];
+ mainProgram = "ivyterm";
+ };
+}
diff --git a/pkgs/by-name/ja/jasp-desktop/package.nix b/pkgs/by-name/ja/jasp-desktop/package.nix
index a444b361127f..08fd1425fc39 100644
--- a/pkgs/by-name/ja/jasp-desktop/package.nix
+++ b/pkgs/by-name/ja/jasp-desktop/package.nix
@@ -17,13 +17,13 @@
}:
let
- version = "0.19.0";
+ version = "0.19.1";
src = fetchFromGitHub {
owner = "jasp-stats";
repo = "jasp-desktop";
rev = "v${version}";
- hash = "sha256-G84bmR+40W9RV+OIXYuMmwdEFE0iPMp/wEOcRHYUoj8=";
+ hash = "sha256-SACGyNVxa6rFjloRQrEVtUgujEEF7WYL8Qhw6ZqLwdQ=";
fetchSubmodules = true;
};
diff --git a/pkgs/by-name/ja/jazz2/package.nix b/pkgs/by-name/ja/jazz2/package.nix
index eac0fc29d1a2..72eb7786ac3e 100644
--- a/pkgs/by-name/ja/jazz2/package.nix
+++ b/pkgs/by-name/ja/jazz2/package.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "jazz2";
- version = "2.8.0";
+ version = "2.9.0";
src = fetchFromGitHub {
owner = "deathkiller";
repo = "jazz2-native";
rev = finalAttrs.version;
- hash = "sha256-qJVT7WCw3nfoLbSqLFfZCI5VLOuoD/iSVfC9B+XEhyg=";
+ hash = "sha256-qkR3j22tG8Q9WGeIFauWLibpMrF3AvU0abt/6lg763U=";
};
patches = [ ./nocontent.patch ];
diff --git a/pkgs/by-name/jo/journalist/package.nix b/pkgs/by-name/jo/journalist/package.nix
index 6e43151092a0..9c5e9a9fc42c 100644
--- a/pkgs/by-name/jo/journalist/package.nix
+++ b/pkgs/by-name/jo/journalist/package.nix
@@ -1,34 +1,21 @@
{
lib,
buildGoModule,
- fetchpatch,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "journalist";
- version = "1.0.0-unstable-2024-06-15";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "mrusme";
repo = "journalist";
- rev = "93781b1278e271995769f576b74fee794a19de14";
- hash = "sha256-RRo9AEaHJPzN9+oW5kIBUNCPVdFkY2USOIZeUts8P/M=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-3MnkndG2c4P3oprIRbzj26oAutEmAgsUx8mjlaDLrkI=";
};
- overrideModAttrs = _oldAttrs: {
- patches = [
- # fix go.sum by adding missing module
- # see https://github.com/mrusme/journalist/pull/18
- (fetchpatch {
- name = "fix-go-sum.patch";
- url = "https://github.com/mrusme/journalist/commit/546585222993586057a12ab4e9b38000c537f6cf.patch";
- hash = "sha256-+QZhP/Har5UVi1pvqB6wWY0+xKqP0B8QukCcNlGkqxQ=";
- })
- ];
- };
-
- vendorHash = "sha256-fEHVc9kRbeeXICWhJshLp9JK/ICBR/RB5SVChJzSXpI=";
+ vendorHash = "sha256-2EJ96dhhU7FZxMkHOmQo79WCHu8U1AGgFf47FIuQdek=s";
ldflags = [
"-s"
@@ -39,6 +26,7 @@ buildGoModule rec {
meta = {
description = "RSS aggregator";
homepage = "https://github.com/mrusme/journalist";
+ changelog = "https://github.com/mrusme/journalist/releases/tag/v${version}";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ moraxyc ];
mainProgram = "journalist";
diff --git a/pkgs/by-name/jt/jtbl/package.nix b/pkgs/by-name/jt/jtbl/package.nix
new file mode 100644
index 000000000000..ff5d4e1d4ad8
--- /dev/null
+++ b/pkgs/by-name/jt/jtbl/package.nix
@@ -0,0 +1,39 @@
+{
+ lib,
+ fetchFromGitHub,
+ python3Packages,
+}:
+
+python3Packages.buildPythonApplication rec {
+ pname = "jtbl";
+ version = "1.6.0";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "kellyjonbrazil";
+ repo = "jtbl";
+ rev = "v${version}";
+ hash = "sha256-ILQwUpjNueaYR5hxOWd5kZSPhVoFnnS2FcttyKSTPr8=";
+ };
+
+ build-system = with python3Packages; [
+ setuptools
+ wheel
+ ];
+
+ dependencies = with python3Packages; [
+ tabulate
+ ];
+
+ pythonImportsCheck = [ "jtbl" ];
+
+ meta = {
+ description = "CLI tool to convert JSON and JSON Lines to terminal, CSV, HTTP, and markdown tables";
+ homepage = "https://kellyjonbrazil.github.io/jtbl";
+ downloadPage = "https://github.com/kellyjonbrazil/jtbl/releases/tag/${src.rev}";
+ changelog = "https://github.com/kellyjonbrazil/jtbl/blob/${src.rev}/CHANGELOG";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ ElliottSullingeFarrall ];
+ mainProgram = "jtbl";
+ };
+}
diff --git a/pkgs/by-name/k8/k8sgpt/package.nix b/pkgs/by-name/k8/k8sgpt/package.nix
new file mode 100644
index 000000000000..ba4707ff77b5
--- /dev/null
+++ b/pkgs/by-name/k8/k8sgpt/package.nix
@@ -0,0 +1,49 @@
+{
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+}:
+
+buildGoModule rec {
+ pname = "k8sgpt";
+ version = "0.3.41";
+
+ src = fetchFromGitHub {
+ owner = "k8sgpt-ai";
+ repo = "k8sgpt";
+ rev = "v${version}";
+ hash = "sha256-p53gVpFhxr60OEZSASRU5KX7TkWzYCDAvG9aQj2NFHI=";
+ };
+
+ vendorHash = "sha256-9H6E1JUbxfcx3Baithu9Jr6MpxfuKE+XWz7HrTCdxA8=";
+
+ # https://nixos.org/manual/nixpkgs/stable/#var-go-CGO_ENABLED
+ CGO_ENABLED = 0;
+
+ # https://nixos.org/manual/nixpkgs/stable/#ssec-skip-go-tests
+ checkFlags = [
+ "-skip=TestActivate/trivy"
+ ];
+
+ # https://nixos.org/manual/nixpkgs/stable/#ssec-skip-go-tests
+ ldflags = [
+ "-s"
+ "-w"
+ "-X main.version=v${version}"
+ "-X main.commit=${src.rev}"
+ "-X main.date=1970-01-01-00:00:01"
+ ];
+
+ meta = {
+ description = "Giving Kubernetes Superpowers to everyone";
+ mainProgram = "k8sgpt";
+ homepage = "https://k8sgpt.ai";
+ changelog = "https://github.com/k8sgpt-ai/k8sgpt/releases/tag/v${version}";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [
+ developer-guy
+ kranurag7
+ mrgiles
+ ];
+ };
+}
diff --git a/pkgs/by-name/ka/kando/package.nix b/pkgs/by-name/ka/kando/package.nix
new file mode 100644
index 000000000000..5456a4bd8b46
--- /dev/null
+++ b/pkgs/by-name/ka/kando/package.nix
@@ -0,0 +1,152 @@
+{
+ lib,
+ stdenv,
+ buildNpmPackage,
+ fetchFromGitHub,
+ overrideSDK,
+
+ electron,
+ nodejs,
+
+ cmake,
+ zip,
+ makeWrapper,
+ wayland-scanner,
+ copyDesktopItems,
+ makeDesktopItem,
+
+ libxkbcommon,
+ libX11,
+ libXtst,
+ libXi,
+ wayland,
+ darwin,
+}:
+
+let
+ buildNpmPackage' = buildNpmPackage.override {
+ stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
+ };
+in
+buildNpmPackage' rec {
+ pname = "kando";
+ version = "1.4.0";
+
+ src = fetchFromGitHub {
+ owner = "kando-menu";
+ repo = "kando";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-JcPTplqrMgDsT0HDTh7liChUWvLqe9gwS51ANM3Wsds=";
+ };
+
+ npmDepsHash = "sha256-13NuhGq5Pv5GSLeXASWxbXZYaUb9KzMgR7y5I7mv+MA=";
+
+ npmFlags = [ "--ignore-scripts" ];
+
+ makeCacheWritable = true;
+
+ nativeBuildInputs =
+ [
+ cmake
+ zip
+ makeWrapper
+ ]
+ ++ lib.optionals stdenv.isLinux [
+ wayland-scanner
+ copyDesktopItems
+ ];
+
+ buildInputs =
+ lib.optionals stdenv.isLinux [
+ libxkbcommon
+ libX11
+ libXtst
+ libXi
+ wayland
+ ]
+ ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.AppKit ];
+
+ dontUseCmakeConfigure = true;
+
+ env = {
+ ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+ # use our own node headers since we skip downloading them
+ NIX_CFLAGS_COMPILE = "-I${nodejs}/include/node";
+ # disable code signing on Darwin
+ CSC_IDENTITY_AUTO_DISCOVERY = lib.optionalString stdenv.isDarwin "false";
+ };
+
+ postConfigure = ''
+ # electron files need to be writable on Darwin
+ cp -r ${electron.dist} electron-dist
+ chmod -R u+w electron-dist
+
+ pushd electron-dist
+ zip -0Xqr ../electron.zip .
+ popd
+
+ rm -r electron-dist
+
+ # force @electron/packager to use our electron instead of downloading it, even if it is a different version
+ substituteInPlace node_modules/@electron/packager/dist/packager.js \
+ --replace-fail 'await this.getElectronZipPath(downloadOpts)' '"electron.zip"'
+
+ # don't fetch node headers
+ substituteInPlace node_modules/cmake-js/lib/dist.js \
+ --replace-fail '!this.downloaded' 'false'
+ '';
+
+ # we used --ignore-scripts to have time to patch the dependencies
+ # now we'll have to call npm rebuild manually
+ preBuild = ''
+ npm rebuild --verbose
+ '';
+
+ npmBuildScript = "package";
+
+ installPhase = ''
+ runHook preInstall
+
+ ${lib.optionalString stdenv.isLinux ''
+ mkdir -p $out/share/kando
+ cp -r out/*/{locales,resources{,.pak}} $out/share/kando
+
+ install -Dm644 assets/icons/icon.svg $out/share/icons/hicolor/scalable/apps/kando.svg
+
+ makeWrapper ${lib.getExe electron} $out/bin/kando \
+ --add-flags $out/share/kando/resources/app \
+ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
+ --inherit-argv0
+ ''}
+
+ ${lib.optionalString stdenv.isDarwin ''
+ mkdir -p $out/Applications
+ cp -r out/*/Kando.app $out/Applications
+ makeWrapper $out/Applications/Kando.app/Contents/MacOS/Kando $out/bin/kando
+ ''}
+
+ runHook postInstall
+ '';
+
+ desktopItems = [
+ (makeDesktopItem {
+ name = "kando";
+ exec = "kando %U";
+ icon = "kando";
+ desktopName = "Kando";
+ genericName = "Pie Menu";
+ comment = "The Cross-Platform Pie Menu";
+ categories = [ "Utility" ];
+ })
+ ];
+
+ meta = {
+ changelog = "https://github.com/kando-menu/kando/releases/tag/v${version}";
+ description = "Cross-Platform Pie Menu";
+ homepage = "https://github.com/kando-menu/kando";
+ license = lib.licenses.mit;
+ mainProgram = "kando";
+ maintainers = with lib.maintainers; [ tomasajt ];
+ platforms = electron.meta.platforms;
+ };
+}
diff --git a/pkgs/by-name/kd/kdlfmt/package.nix b/pkgs/by-name/kd/kdlfmt/package.nix
new file mode 100644
index 000000000000..a5b5d371072e
--- /dev/null
+++ b/pkgs/by-name/kd/kdlfmt/package.nix
@@ -0,0 +1,28 @@
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "kdlfmt";
+ version = "0.0.3";
+
+ src = fetchFromGitHub {
+ owner = "hougesen";
+ repo = "kdlfmt";
+ rev = "v${version}";
+ hash = "sha256-qD1NYLHGmVRgV6pPXbvJ9NWDg/wVLWJY4hUsOLDlKh0=";
+ };
+
+ cargoHash = "sha256-7HSDz/JI5VuTdM/Hv+nq+ddpQg31Q1v7Ct5gz2PfdmE=";
+
+ meta = {
+ description = "Formatter for kdl documents";
+ homepage = "https://github.com/hougesen/kdlfmt.git";
+ changelog = "https://github.com/hougesen/kdlfmt/blob/v${version}/CHANGELOG.md";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ airrnot ];
+ mainProgram = "kdlfmt";
+ };
+}
diff --git a/pkgs/by-name/ke/keep-sorted/package.nix b/pkgs/by-name/ke/keep-sorted/package.nix
index 6b2f9760e20d..610cd3342948 100644
--- a/pkgs/by-name/ke/keep-sorted/package.nix
+++ b/pkgs/by-name/ke/keep-sorted/package.nix
@@ -7,13 +7,13 @@
buildGo123Module rec {
pname = "keep-sorted";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchFromGitHub {
owner = "google";
repo = "keep-sorted";
rev = "v${version}";
- hash = "sha256-jqSb/lcdeQMa1XpzaopDBbkKymp+HubLeAx3d6x5pns=";
+ hash = "sha256-xvSEREEOiwft3fPN+xtdMCh+z3PknjJ962Nb+pw715U=";
};
vendorHash = "sha256-HTE9vfjRmi5GpMue7lUfd0jmssPgSOljbfPbya4uGsc=";
@@ -22,10 +22,10 @@ buildGo123Module rec {
ldflags = [ "-s" ];
- checkFlags = [
- # Test tries to find files using git
- "-skip=^TestGoldens"
- ];
+ preCheck = ''
+ # Test tries to find files using git in init func.
+ rm goldens/*_test.go
+ '';
passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ke/keydb/package.nix b/pkgs/by-name/ke/keydb/package.nix
index 265f8a884fcb..ed6ba8bd518c 100644
--- a/pkgs/by-name/ke/keydb/package.nix
+++ b/pkgs/by-name/ke/keydb/package.nix
@@ -12,7 +12,7 @@
jemalloc,
which,
tcl,
- tcltls,
+ tclPackages,
ps,
getconf,
nixosTests,
@@ -60,11 +60,14 @@ stdenv.mkDerivation (finalAttrs: {
# darwin currently lacks a pure `pgrep` which is extensively used here
doCheck = !stdenv.hostPlatform.isDarwin;
- nativeCheckInputs = [
- which
- tcl
- ps
- ] ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ] ++ lib.optionals tlsSupport [ tcltls ];
+ nativeCheckInputs =
+ [
+ which
+ tcl
+ ps
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ]
+ ++ lib.optionals tlsSupport [ tclPackages.tcltls ];
checkPhase = ''
runHook preCheck
diff --git a/pkgs/by-name/ke/keyspersecond/deps.json b/pkgs/by-name/ke/keyspersecond/deps.json
new file mode 100644
index 000000000000..bfd3cf539ca1
--- /dev/null
+++ b/pkgs/by-name/ke/keyspersecond/deps.json
@@ -0,0 +1,428 @@
+{
+ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
+ "!version": 1,
+ "https://plugins.gradle.org/m2": {
+ "com/formdev#flatlaf/1.0": {
+ "jar": "sha256-E12NWsOf7CnZs/9SyzBybT+XawaYYVvjJTT9eSTynsc=",
+ "module": "sha256-dStur7AL/wRCGXCYLcqvz1l7SajJE64M73XkKHYKC68=",
+ "pom": "sha256-ylkCGnUHptHH0ZM+DN+hxKlpqgTsaMYsMdYTMtMAlpo="
+ },
+ "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/7.1.2": {
+ "pom": "sha256-lW5FCF5S6l7zLTRnHruE6xxBqDxFSa8m5oY18QYXmNM="
+ },
+ "com/github/spotbugs#com.github.spotbugs.gradle.plugin/5.0.14": {
+ "pom": "sha256-Klkwu/Y1CRjxRVMBd47nOhi3C5ZMFG25FzC3dd/M8Nw="
+ },
+ "com/github/spotbugs/snom#spotbugs-gradle-plugin/5.0.14": {
+ "jar": "sha256-Gq1P++fZeNkPYJxQe5sQYQzYiVI66xM6E+cKqKKLjh0=",
+ "module": "sha256-zk1p44LM+Ra/awSedTdrbZaKDKUgh63wvRYEPUMwk7w=",
+ "pom": "sha256-SaFhGVMRRSvY6ObRpx90ZX+Z7VHCl30EevlVvbZ5Ye4="
+ },
+ "com/thoughtworks/xstream#xstream-parent/1.4.15": {
+ "pom": "sha256-GDOZpW5OtAJkCjcZURmuZx61kW17OKX2PpTvGvkPuc4="
+ },
+ "com/thoughtworks/xstream#xstream/1.4.15": {
+ "jar": "sha256-MneEmWGqnrBV+HcYEEUAhtOMwuQH7rg0bQI56gIYpFM=",
+ "pom": "sha256-sX3W1xyyywYmTZ6q0a6Mgg5FdhTx1jRcdgmSB3Ei1EY="
+ },
+ "commons-beanutils#commons-beanutils/1.9.4": {
+ "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=",
+ "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA="
+ },
+ "commons-io#commons-io/2.11.0": {
+ "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=",
+ "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k="
+ },
+ "commons-logging#commons-logging/1.2": {
+ "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=",
+ "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA="
+ },
+ "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/2.5.1": {
+ "pom": "sha256-BXL9t5BYtmDA3AibXM4IZU3rTesGy76B8lUbagmJl9w="
+ },
+ "edu/sc/seis/launch4j#launch4j/2.5.1": {
+ "jar": "sha256-ZAsF9TFJDsHSuhEG70YEF8P5hvssv4/r8NrCSODrfiM=",
+ "module": "sha256-IfV/PFUm3NSIruWPW7E7YOv6hd5aGrV4JO24EEDO0I4=",
+ "pom": "sha256-rUzfPnkIGDfPf9ti1W0+BggTvryp2vuyIgbl6l1hiEQ="
+ },
+ "gradle/plugin/com/github/johnrengelman#shadow/7.1.2": {
+ "jar": "sha256-v3BcwupcAYCqhwoPqAs5vxOhTScSjh6zpLZ0vjT1jpA=",
+ "pom": "sha256-H6qwvkF9ezxBqXzKCsqKWwtkBvw7Etfyjiw0Ex3/k0o="
+ },
+ "net/sf/launch4j#launch4j/3.14": {
+ "pom": "sha256-xEYpdod2nJWyb2Qg9zsr0qKd90TYllTAdKhVb2Is+Vs="
+ },
+ "net/sf/launch4j#launch4j/3.14/core": {
+ "jar": "sha256-pGVAv4Nrz3s1AHM9n6f1muzYyDeUJz5zZlWrLKdXYjA="
+ },
+ "org/apache#apache/13": {
+ "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0="
+ },
+ "org/apache#apache/19": {
+ "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8="
+ },
+ "org/apache#apache/23": {
+ "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw="
+ },
+ "org/apache/ant#ant-launcher/1.10.11": {
+ "jar": "sha256-2rUw33qYC1rI/X6NIIJDrg0+vW3gmxqiznVjYMwu0lY=",
+ "pom": "sha256-7SoGiCYb624I7FSzgxLx1ILM8aO4Y8R9KNW5CkRtHB4="
+ },
+ "org/apache/ant#ant-parent/1.10.11": {
+ "pom": "sha256-V6BTJoLzD6MHQWoiWSnVcQrNpy17Je4IyvmNyCzTXbY="
+ },
+ "org/apache/ant#ant/1.10.11": {
+ "jar": "sha256-iMC4m7uq4B4Nn8rpO+eS9au+NAkQb47uhY/fNl28B1Q=",
+ "pom": "sha256-wiiU2ctGq/XOv27rK8z+TXjhju6jEaDqat3VnftLH+M="
+ },
+ "org/apache/commons#commons-parent/34": {
+ "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w="
+ },
+ "org/apache/commons#commons-parent/47": {
+ "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc="
+ },
+ "org/apache/commons#commons-parent/52": {
+ "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4="
+ },
+ "org/apache/logging#logging-parent/3": {
+ "pom": "sha256-djouwrgJTUFh3rbCZLEmIIW5vjC/OjHCzhNyQuV3Iqc="
+ },
+ "org/apache/logging/log4j#log4j-api/2.17.1": {
+ "jar": "sha256-sNikyKtPuLGIjQCVgicDsObUeTxBlVAgPanmkZYWHeQ=",
+ "pom": "sha256-HirO8yILKb4QrgmXKLFYsY2UP5Ghk8xFAbtC+SnB6Io="
+ },
+ "org/apache/logging/log4j#log4j-core/2.17.1": {
+ "jar": "sha256-yWfyI0h5gLk2TpSnx/mooB/T7nwZvb8LD5+MuFEfPUE=",
+ "pom": "sha256-C7s79tTSKhv6PDwJJ8KUEK8UoPsm47Ark3JvXH6Yqv0="
+ },
+ "org/apache/logging/log4j#log4j/2.17.1": {
+ "pom": "sha256-lnq8AkRDqcsJaTVVmvXprW8P9hN1+Esn1EDS+nCAawk="
+ },
+ "org/codehaus/plexus#plexus-utils/3.4.1": {
+ "jar": "sha256-UtheBLORhyKvEdEoVbSoJX35ag52yPTjhS5vqoUfNXs=",
+ "pom": "sha256-sUTP+bHGJZ/sT+5b38DzYNacI6vU6m5URTOpSbaeNYI="
+ },
+ "org/codehaus/plexus#plexus/8": {
+ "pom": "sha256-/6NJ2wTnq/ZYhb3FogYvQZfA/50/H04qpXILdyM/dCw="
+ },
+ "org/jdom#jdom2/2.0.6": {
+ "jar": "sha256-E0XxG6YG0VYD1nQFUajCGUfAIVZAdw7GcnH+eL6pfPU=",
+ "pom": "sha256-R7I6ef4za3QbgkNMbgSdaBZSVuQF51wQkh/XL6imXY0="
+ },
+ "org/junit#junit-bom/5.7.2": {
+ "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=",
+ "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs="
+ },
+ "org/ow2#ow2/1.5": {
+ "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs="
+ },
+ "org/ow2/asm#asm-analysis/9.2": {
+ "jar": "sha256-h4++UhcxwHLRTS1luYOxvq5q0G/aAAe2qLroH3P0M8Q=",
+ "pom": "sha256-dzzBor/BTGxKl5xRoHXAI0oL9pT8Or5PrPRU83oUXxs="
+ },
+ "org/ow2/asm#asm-commons/9.2": {
+ "jar": "sha256-vkzlMTiiOLtSLNeBz5Hzulzi9sqT7GLUahYqEnIl4KY=",
+ "pom": "sha256-AoJOg58qLw5ylZ/dMLSJckDwWvxD3kLXugsYQ3YBwHA="
+ },
+ "org/ow2/asm#asm-tree/9.2": {
+ "jar": "sha256-qr+b0jCRpOv8EJwfPufPPkuJ9rotP1HFJD8Ws8/64BE=",
+ "pom": "sha256-9h8+vqVSDd8Z9FKwPEJscjG92KgdesKHZctScSJaw3g="
+ },
+ "org/ow2/asm#asm/9.2": {
+ "jar": "sha256-udT+TXGTjfOIOfDspCqqpkz4sxPWeNoDbwyzyhmbR/U=",
+ "pom": "sha256-37EqGyJL8Bvh/WBAIEZviUJBvLZF3M45Xt2M1vilDfQ="
+ },
+ "org/vafer#jdependency/2.7.0": {
+ "jar": "sha256-1j79V0b/QIlDp91++Frp8Jqn+2O7KxaRFCfObEW1n9A=",
+ "pom": "sha256-6yRCKwo+nofVrG6oCHeG+1HEsbvg0iXvdSFSxzaiBNA="
+ },
+ "xmlpull#xmlpull/1.1.3.1": {
+ "jar": "sha256-NOCO5iEWBxy7acDtcNFaelsgjWJ5jFnyEgu4kpMky2M=",
+ "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs="
+ },
+ "xpp3#xpp3_min/1.1.4c": {
+ "jar": "sha256-v8kOnjLQ6rHzl/uXS18VCoFRiDgqxB83KnFJ1bwXgAg=",
+ "pom": "sha256-tbRqwMCdpBsE28dTRWtIkShWp/+7FJBnaRC1EMRx0T8="
+ }
+ },
+ "https://repo.maven.apache.org/maven2": {
+ "com/github/kwhat#jnativehook/2.2.2": {
+ "jar": "sha256-LHkEQjvGgK8C2eqVV64jPDUZnjAtBydzqdAwS1aKzUE=",
+ "pom": "sha256-6AZTO7P0KkjsDkTSuwBVP680IhOHKIvLUmz8BH1+ZWk="
+ },
+ "com/github/spotbugs#spotbugs-annotations/4.7.3": {
+ "jar": "sha256-wP0awuIqzdRpE6L/dFUbcfEkRXGZaIaYIEr0vz1DFl0=",
+ "module": "sha256-C85puO9wOJqNWr30ddFzAXe1CeQYZGP/2x1emmrVz/4=",
+ "pom": "sha256-NpAQoZC5Xi2aJi2OxRfexrZIeqGhuUaKKBY5SvS6J7Q="
+ },
+ "com/github/spotbugs#spotbugs/4.7.3": {
+ "jar": "sha256-3zfqshp9BKqAeAijPp98CBRRywLBS0osMxGZdr5JhSA=",
+ "module": "sha256-0xel6FE2WKCWvGxSqWnZOSrvrXjjq6o8xA9GQbXxpfA=",
+ "pom": "sha256-kiN32QwQdRhmiu93V5ysUgRYUqgNhCrUYIhvZ6yUld4="
+ },
+ "com/google/code/findbugs#jsr305/3.0.2": {
+ "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
+ "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
+ },
+ "com/google/code/gson#gson-parent/2.9.1": {
+ "pom": "sha256-fKCEXnNoVhjePka9NDTQOko3PVIPq5OmgDGK1sjLKnk="
+ },
+ "com/google/code/gson#gson/2.9.1": {
+ "jar": "sha256-N4U04znm5tULFzb7Ort28cFdG+P0wTzsbVNkEuI9pgM=",
+ "pom": "sha256-5ZZjI9cUJXCzekvpeeIbwtroSBB+TcQW2PRNmqPwKQM="
+ },
+ "commons-codec#commons-codec/1.15": {
+ "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=",
+ "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g="
+ },
+ "dev/roanh/util#util/2.5": {
+ "jar": "sha256-4wxMy4RiFjtLEUiLB/eheGgK0+hyeOTEGAzZ1Hac2Zk=",
+ "module": "sha256-9lbRJhRQb4QWIxAaudvG9T0/DRWIWW4l74ykD2uojZU=",
+ "pom": "sha256-fJTrQdIpp9LmHKOzm4Jls8BbHx+h57hmG0crJ3NBBOM="
+ },
+ "jaxen#jaxen/1.2.0": {
+ "jar": "sha256-cP7vndda0GTe8Fo86Jda66UV7n0b4UbRIZnIgopkF0w=",
+ "pom": "sha256-zEgr+qIqVQepb6WzorYVkRRDrT9zZOAgBNGQsGfzsH8="
+ },
+ "net/jcip#jcip-annotations/1.0": {
+ "jar": "sha256-vlgFOSBgxxR0v2yaZ6CZRxJ00wuD7vhL/E4IiaTx3MA=",
+ "pom": "sha256-XBnmhIzFUKlWZPsIIwS8X5/Pe2cvrwOvFjXw6TwmgXc="
+ },
+ "net/sf/launch4j#launch4j/3.14": {
+ "pom": "sha256-xEYpdod2nJWyb2Qg9zsr0qKd90TYllTAdKhVb2Is+Vs="
+ },
+ "net/sf/launch4j#launch4j/3.14/workdir-linux64": {
+ "jar": "sha256-mphFGb9E6CWlsEFZfgVPi/qy+Tpm+na30aM79JIcNUY="
+ },
+ "net/sf/saxon#Saxon-HE/11.4": {
+ "jar": "sha256-QuNUlNwua16XJWrnzfK3zjBDnDUlZvNd4CvtOgaisWk=",
+ "pom": "sha256-zE2jTuC+5MZa2118spI0H2Wb76NSiPbjH4CdxLsvxXU="
+ },
+ "org/apache#apache/21": {
+ "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A="
+ },
+ "org/apache#apache/23": {
+ "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw="
+ },
+ "org/apache#apache/24": {
+ "pom": "sha256-LpO7q+NBOviaDDv7nmv3Hbyej5+xTMux14vQJ13xxSU="
+ },
+ "org/apache#apache/27": {
+ "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk="
+ },
+ "org/apache/bcel#bcel/6.5.0": {
+ "jar": "sha256-ves4HQ0ZmZ4iHmoPjYv0T1sZwuV+q/aLcNwJhlKu+vU=",
+ "pom": "sha256-/B6eb17UvSAMsGYghsiYwAAmOGoutKY0hBH34OBotcU="
+ },
+ "org/apache/commons#commons-lang3/3.12.0": {
+ "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=",
+ "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo="
+ },
+ "org/apache/commons#commons-parent/50": {
+ "pom": "sha256-e3ots/dHB0tYZ/VT1e/IByvibt4yh50FLDR+fIERfwY="
+ },
+ "org/apache/commons#commons-parent/52": {
+ "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4="
+ },
+ "org/apache/commons#commons-parent/54": {
+ "pom": "sha256-AA2Bh5UrIjcC/eKW33mVY/Nd6CznKttOe/FXNCN4++M="
+ },
+ "org/apache/commons#commons-text/1.10.0": {
+ "jar": "sha256-dwzZA/p7YE0ffve6F/hBCGZylLK0eL6O0a87/7SuABg=",
+ "pom": "sha256-OI3VI0i6GEKqOK64l8kdJwsUZh64daIP2YAxU1qydWc="
+ },
+ "org/apache/httpcomponents#httpcomponents-parent/12": {
+ "pom": "sha256-QgnwlZMhKYfCnWgBkXMJ3V5vcbU7Kx0ODw77mErRH6E="
+ },
+ "org/apache/httpcomponents/client5#httpclient5-parent/5.1.3": {
+ "pom": "sha256-onsUE67OkqOqR3SRX3WJ4MYXnXKNKsailddY7k+iTMU="
+ },
+ "org/apache/httpcomponents/client5#httpclient5/5.1.3": {
+ "jar": "sha256-KMdZJU9ONTGeB4u2/+p1Z2YI3BLLJDsk+zyHMlIpd/4=",
+ "pom": "sha256-GYirPRva4PUfIsg9yXuI+gdWGttiRGedi49xRs3ROq8="
+ },
+ "org/apache/httpcomponents/core5#httpcore5-h2/5.1.3": {
+ "jar": "sha256-0OeLoVqo6+d5grZgrEsJqV1uA129vqdiV33ByOKTWAc=",
+ "pom": "sha256-K8AxehSO3Jrv6j7BU1OU787T0TfWL3/1ZW0LA/lMB4Y="
+ },
+ "org/apache/httpcomponents/core5#httpcore5-parent/5.1.3": {
+ "pom": "sha256-pnU4hlrg83RLIekcpH1GEFRzfFUtH/KdpxTIYMmS1bs="
+ },
+ "org/apache/httpcomponents/core5#httpcore5/5.1.3": {
+ "jar": "sha256-8r8vLHdyFpyeMGmXGWZ60w+bRsTp14QZB96y0S2ZI/4=",
+ "pom": "sha256-f8K4BFgJ8/J6ydTZ6ZudNGIbY3HPk8cxPs2Epa8Om64="
+ },
+ "org/apache/logging#logging-parent/5": {
+ "pom": "sha256-3HYwz4LLMfTUdiFgVCIa/9UldG7pZUEkD0UvcyNwMCI="
+ },
+ "org/apache/logging/log4j#log4j-api/2.19.0": {
+ "jar": "sha256-XMskrZ+S52jQvEVtMGGnN5USYt+APgBNLK0Ja3WojWA=",
+ "pom": "sha256-DKkiQ2MurHxkRF8mO+UDBLdaerv7eIXNbIH1cRJ01KU="
+ },
+ "org/apache/logging/log4j#log4j-bom/2.19.0": {
+ "pom": "sha256-jGp6wVCpGKIpBzNf1VZpFHMe14E2l3DVJfZMDQf+h+c="
+ },
+ "org/apache/logging/log4j#log4j-core/2.19.0": {
+ "jar": "sha256-tKF5b6t7/DbfAVwbQFJFkUeZfo0hWnGZ1x0F+edH5PQ=",
+ "pom": "sha256-c1r8+2E2GCqidn62RZdhr9MrgleR1OCJXqGpSyrbmzk="
+ },
+ "org/apache/logging/log4j#log4j/2.19.0": {
+ "pom": "sha256-FWJLoaVtv4ZGBgdFMlM2GPoytGQvcoUfy+kuE2vq7JQ="
+ },
+ "org/apiguardian#apiguardian-api/1.1.2": {
+ "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",
+ "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
+ "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
+ },
+ "org/dom4j#dom4j/2.1.3": {
+ "jar": "sha256-VJ8wB8YpD2qQHlfR0zG07Q5r9zhPeL8QMW/87sqDTeY=",
+ "module": "sha256-3sfF/Y1SDa+1exXi87a+LxgFYTQqP0Ub7u6QVUO8FwM=",
+ "pom": "sha256-zcnEn1nSMNQnF3G7dkqnCX1qy83CUAFJ5NLJUd9crDA="
+ },
+ "org/jacoco#org.jacoco.agent/0.8.8": {
+ "jar": "sha256-By7L1JaJZiOJmmlv/xLAHBYV9zdhbSeS5tDhDN+KYQ0=",
+ "pom": "sha256-fdE8gK/zFQMpgzV8ZQqIfW/bTIqIcLIHu0gCxJgJ57Q="
+ },
+ "org/jacoco#org.jacoco.ant/0.8.8": {
+ "jar": "sha256-AuM70sSNwL5nwv6oTUO+7Oz9QA2meXxYFTJT1MMKyhU=",
+ "pom": "sha256-+v/3WBlgkDD0YmUJMTwIYUKMLCbI026aiTgzSgRHiQk="
+ },
+ "org/jacoco#org.jacoco.build/0.8.8": {
+ "pom": "sha256-9M4LEoX9JPxsdy9ChXKYMVkE3ej9Vncmeg+tX/nOKu8="
+ },
+ "org/jacoco#org.jacoco.core/0.8.8": {
+ "jar": "sha256-R0x4L4CdiJJHE9/b8Ky3nTMPkEvldkhIA0Y9BGVhFkM=",
+ "pom": "sha256-9fq1pI34I7g8DqNQJgMjaMybgYAO+yV8x6WSgpj+4iU="
+ },
+ "org/jacoco#org.jacoco.report/0.8.8": {
+ "jar": "sha256-LBKREPPj/KofgXlXjqOJRYYZnLCCa+XHeQJ4CEyWIqk=",
+ "pom": "sha256-UhOvKRa7JpC+hxkX2CoPnCuh6It5alk0P8A9+K4ThxY="
+ },
+ "org/junit#junit-bom/5.10.0": {
+ "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=",
+ "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM="
+ },
+ "org/junit#junit-bom/5.7.0": {
+ "module": "sha256-Jd5FSzrdZ2VNZpG1PedZO1ApZ7X/VJVHsQTXlh8aUr0=",
+ "pom": "sha256-NfsV+NC+4rWQCiKDJ2I2ZVL5o0nFbO1guhI85Hc4/wA="
+ },
+ "org/junit#junit-bom/5.7.1": {
+ "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=",
+ "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q="
+ },
+ "org/junit#junit-bom/5.9.0": {
+ "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=",
+ "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU="
+ },
+ "org/junit#junit-bom/5.9.1": {
+ "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=",
+ "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw="
+ },
+ "org/junit/jupiter#junit-jupiter-api/5.10.0": {
+ "jar": "sha256-EICI/X6kao5loM5/XXWuP/eGVgZ3CgeHFfWm5XCeF9g=",
+ "module": "sha256-rlZhzTgeEJo8NXWzqy3tdHnnvdfOxKqfJtQ3iXNAl5s=",
+ "pom": "sha256-Tx3RjtVlgTdJThuDUFN5V994ExxnNYrDw/IM3vKF9xw="
+ },
+ "org/junit/jupiter#junit-jupiter-engine/5.10.0": {
+ "jar": "sha256-V+pI5veVIAeRBlu8hrcLhM0FNnxcnyrI+SaOJxVMiKg=",
+ "module": "sha256-ahCFcpBdHtGcAtzQePNMHt6zFVX1RCF24BQYJwCFYmo=",
+ "pom": "sha256-tgBsZQiRofdWh1Z2xtj+m0FqwckRfntBg0KdnxU0crU="
+ },
+ "org/junit/jupiter#junit-jupiter-params/5.10.0": {
+ "jar": "sha256-8lmnMizON1QwwiNqLcsk1KSdIgRbcjrYWviOEXBDkcI=",
+ "module": "sha256-GW9/Tv35x3OnEEwzn2AlNCuHQvz6sC+IArqAJ+0o+S4=",
+ "pom": "sha256-hJpvXnjyuDFLW10KDMymYhblwH4pWFRxJX3/CvrLELE="
+ },
+ "org/junit/jupiter#junit-jupiter/5.10.0": {
+ "jar": "sha256-jkveI+4o/EQ5dWVKeyjEEKO3jWvpa3jJmrc2lew0T3w=",
+ "module": "sha256-BXDggypUZagvBKK492Hyux4w+v4oLSowmHAV/LBQdgM=",
+ "pom": "sha256-9LAPh2BzWmAc6U0sxq0r9WpK30885g7iD1LHDa5bMxM="
+ },
+ "org/junit/platform#junit-platform-commons/1.10.0": {
+ "jar": "sha256-YIPbCMoR/KHhYJnQ3P7eAZPYCzdisnY0nYDT2lNnkbI=",
+ "module": "sha256-jLYNPfgdYG6hvj4/yuVpdlOxswPi96mCKn7RJkdF/Cc=",
+ "pom": "sha256-vkEftVMxuqETp0wRkA8HVVhasg76cMJtlQ9a4hRJALA="
+ },
+ "org/junit/platform#junit-platform-engine/1.10.0": {
+ "jar": "sha256-zTOO/QLuc5Zup1TgwMceGhH0r125wgA+S2E34RkVWr4=",
+ "module": "sha256-duCMg/k91SuD6IW5AJIMHcheNoaID2ZTrysiMX9N3jc=",
+ "pom": "sha256-+RGG4YGx4VrofVJ5uaKzDGLO1ROQE6NJoQu03hL6+YI="
+ },
+ "org/opentest4j#opentest4j/1.3.0": {
+ "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=",
+ "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=",
+ "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U="
+ },
+ "org/ow2#ow2/1.5": {
+ "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs="
+ },
+ "org/ow2#ow2/1.5.1": {
+ "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
+ },
+ "org/ow2/asm#asm-analysis/9.2": {
+ "jar": "sha256-h4++UhcxwHLRTS1luYOxvq5q0G/aAAe2qLroH3P0M8Q=",
+ "pom": "sha256-dzzBor/BTGxKl5xRoHXAI0oL9pT8Or5PrPRU83oUXxs="
+ },
+ "org/ow2/asm#asm-analysis/9.4": {
+ "jar": "sha256-e1+MXjvzQbW7Vw0m83nj/evcMnMhhxWcQkeRZAU/Nz0=",
+ "pom": "sha256-fZtgkidiP2x+9v13+gbaWG0Na6wRTPPnICDaiFPYdZw="
+ },
+ "org/ow2/asm#asm-commons/9.2": {
+ "jar": "sha256-vkzlMTiiOLtSLNeBz5Hzulzi9sqT7GLUahYqEnIl4KY=",
+ "pom": "sha256-AoJOg58qLw5ylZ/dMLSJckDwWvxD3kLXugsYQ3YBwHA="
+ },
+ "org/ow2/asm#asm-commons/9.4": {
+ "jar": "sha256-DBKKnsPzPJiVknL20WzxQke1CPWJUVdLzb0rVtYyY2Q=",
+ "pom": "sha256-tCyiq8+IEXdqXdwCkPIQbX8xP4LHiw3czVzOTGOjUXk="
+ },
+ "org/ow2/asm#asm-tree/9.2": {
+ "jar": "sha256-qr+b0jCRpOv8EJwfPufPPkuJ9rotP1HFJD8Ws8/64BE=",
+ "pom": "sha256-9h8+vqVSDd8Z9FKwPEJscjG92KgdesKHZctScSJaw3g="
+ },
+ "org/ow2/asm#asm-tree/9.4": {
+ "jar": "sha256-xC1HnPJFZqIesgr37q7vToa9tKiGMGz3L0g7ZedbKs8=",
+ "pom": "sha256-x+nvk73YqzYwMs5TgvzGTQAtbFicF1IzI2zSmOUaPBY="
+ },
+ "org/ow2/asm#asm-util/9.4": {
+ "jar": "sha256-PXkyuT/1UFZkHnz7YB+WvNXNBx4bBQPHilAUIyKXoj4=",
+ "pom": "sha256-ugQzwHsMD2mA8suPgEH/WcgemEgeEBliEFFi43IvH5I="
+ },
+ "org/ow2/asm#asm/9.2": {
+ "jar": "sha256-udT+TXGTjfOIOfDspCqqpkz4sxPWeNoDbwyzyhmbR/U=",
+ "pom": "sha256-37EqGyJL8Bvh/WBAIEZviUJBvLZF3M45Xt2M1vilDfQ="
+ },
+ "org/ow2/asm#asm/9.4": {
+ "jar": "sha256-OdDis9xFr2Wgmwl5RXUKlKEm4FLhJPk0aEQ6HQ4V84E=",
+ "pom": "sha256-SDdR5I+y0fQ8Ya06sA/6Rm7cAzPY/C/bWibpXTKYI5Q="
+ },
+ "org/slf4j#slf4j-api/2.0.0": {
+ "jar": "sha256-oiPm35G4TxnUnF68X1+Xx/RDhBn4SlL6BeHPxu7Tiqk=",
+ "pom": "sha256-Ri98K2JXw2dZ8XY0axr/ADI/W2Nhm9jxonFrLqvnxnA="
+ },
+ "org/slf4j#slf4j-parent/2.0.0": {
+ "pom": "sha256-pi0qZ9d/fLRw+siIvEIdhIjvIBTnwr+Ne0GT1fKKz7U="
+ },
+ "org/slf4j#slf4j-simple/2.0.0": {
+ "jar": "sha256-qE0IW9is0HHv9dHMGKe6bZz9CAou6IpmiUkuLEn5fpY=",
+ "pom": "sha256-9k/4Cue1R84QpIiaejqva1gjV+Xg9is7w0rYx9OtNQQ="
+ },
+ "org/sonatype/oss#oss-parent/7": {
+ "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+ },
+ "org/sonatype/oss#oss-parent/9": {
+ "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+ },
+ "org/xmlresolver#xmlresolver/4.4.3": {
+ "jar": "sha256-nWQslsP2gR4gqfbP7jyhXshOy5Ofa+Y5/uBlZwdzp9E=",
+ "module": "sha256-8GvLyo9h/M9XRtT+zEg+GgGNCYvVGRdxTH2wBCIA+Dc=",
+ "pom": "sha256-FGtXOSRyKmK1jnF2r2hgxoD4p3+XJsXiGHnJxAHtRkI="
+ },
+ "org/xmlresolver#xmlresolver/4.4.3/data": {
+ "jar": "sha256-pX2yPXXDWAyxXrbhqFRoP0V5z9Jl9c8QEaaYPZrtDx8="
+ },
+ "xml-apis#xml-apis/1.4.01": {
+ "jar": "sha256-qECWgXZkVoS7Aa7TduBnqzlhSIX57uRKvjWl8g6+f60=",
+ "pom": "sha256-Cagv8VCshr+jEUXgpq/YmgLkUEeF9doRLk+uFCUCDpI="
+ }
+ }
+}
diff --git a/pkgs/by-name/ke/keyspersecond/package.nix b/pkgs/by-name/ke/keyspersecond/package.nix
new file mode 100644
index 000000000000..c88dfa984610
--- /dev/null
+++ b/pkgs/by-name/ke/keyspersecond/package.nix
@@ -0,0 +1,103 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ gradle_7,
+ copyDesktopItems,
+ makeDesktopItem,
+ makeWrapper,
+ jre,
+ libGL,
+ libX11,
+ libXtst,
+ libxkbcommon,
+ libxcb,
+ libXt,
+ libXinerama,
+}:
+
+let
+ gradle = gradle_7;
+
+ libPath = lib.makeLibraryPath [
+ # used by the Java2D OpenGL backend
+ libGL
+ # jnativehook dependencies
+ libX11
+ libXtst
+ libxkbcommon
+ libxcb
+ libXt
+ libXinerama
+ ];
+in
+stdenv.mkDerivation (finalAttrs: {
+ pname = "keyspersecond";
+ version = "8.9";
+
+ src = fetchFromGitHub {
+ owner = "RoanH";
+ repo = "KeysPerSecond";
+ rev = "v${finalAttrs.version}";
+ hash = "sha256-DGpXbCInq+RS56Ae5Y6xzyWqwXAm26c0vOYrFqDvl+8=";
+ };
+
+ sourceRoot = "${finalAttrs.src.name}/KeysPerSecond";
+
+ nativeBuildInputs = [
+ gradle
+ copyDesktopItems
+ makeWrapper
+ ];
+
+ mitmCache = gradle.fetchDeps {
+ inherit (finalAttrs) pname;
+ data = ./deps.json;
+ };
+
+ # this is required for using mitm-cache on Darwin
+ __darwinAllowLocalNetworking = true;
+
+ gradleFlags = "-PrefName=v${finalAttrs.version}";
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm644 resources/kps.png $out/share/icons/hicolor/64x64/apps/keyspersecond.png
+ install -Dm644 build/libs/KeysPerSecond-v*.jar $out/share/keyspersecond/KeysPerSecond.jar
+
+ # Note: we need to enable the Java2D OpenGL backend for proper transparency support
+ makeWrapper ${jre}/bin/java $out/bin/KeysPerSecond \
+ --prefix LD_LIBRARY_PATH : ${libPath} \
+ --add-flags "-Dsun.java2d.opengl=True" \
+ --add-flags "-jar $out/share/keyspersecond/KeysPerSecond.jar"
+
+ runHook postInstall
+ '';
+
+ desktopItems = [
+ (makeDesktopItem {
+ name = "keyspersecond";
+ desktopName = "KeysPerSecond";
+ exec = "KeysPerSecond";
+ icon = "keyspersecond";
+ comment = finalAttrs.meta.description;
+ categories = [ "Utility" ];
+ })
+ ];
+
+ meta = {
+ changelog = "https://github.com/RoanH/KeysPerSecond/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+ description = "Keys-per-second meter and counter for rhythm games";
+ homepage = "https://github.com/RoanH/KeysPerSecond";
+ license = lib.licenses.gpl3Only;
+ mainProgram = "KeysPerSecond";
+ maintainers = with lib.maintainers; [ tomasajt ];
+ platforms = jre.meta.platforms;
+ sourceProvenance = with lib.sourceTypes; [
+ fromSource
+ binaryBytecode # deps
+ binaryNativeCode # jnativehook shared library
+ ];
+ };
+})
diff --git a/pkgs/by-name/ki/kin-openapi/package.nix b/pkgs/by-name/ki/kin-openapi/package.nix
new file mode 100644
index 000000000000..6515189f95d2
--- /dev/null
+++ b/pkgs/by-name/ki/kin-openapi/package.nix
@@ -0,0 +1,38 @@
+{
+ lib,
+ fetchFromGitHub,
+ buildGoModule,
+}:
+buildGoModule rec {
+ pname = "kin-openapi";
+ version = "0.128.0";
+ vendorHash = "sha256-yNS5Rtmxts4uOhMPTXCFRhe/dLPZZAtGKe/bNkOeIBw=";
+
+ src = fetchFromGitHub {
+ owner = "getkin";
+ repo = "kin-openapi";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-4pYrg75dFFdFS2SC1BvFoHcLFNGgBumXd3Vd7jHvUJg=";
+ };
+
+ checkFlags =
+ let
+ # Skip tests that require network access
+ skippedTests = [
+ "TestExtraSiblingsInRemoteRef"
+ "TestIssue495WithDraft04"
+ ];
+ in
+ [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
+ subPackages = [ "cmd/validate" ];
+
+ meta = {
+ mainProgram = "validate";
+ description = "Command line tool to validation openapi3 documents";
+ homepage = "https://github.com/getkin/kin-openapi";
+ changelog = "https://github.com/getkin/kin-openapi/releases/tag/v${version}";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers._6543 ];
+ };
+}
diff --git a/pkgs/by-name/ki/kitsas/package.nix b/pkgs/by-name/ki/kitsas/package.nix
new file mode 100644
index 000000000000..854c53cc5327
--- /dev/null
+++ b/pkgs/by-name/ki/kitsas/package.nix
@@ -0,0 +1,68 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ qt6,
+ poppler,
+ libzip,
+ pkg-config,
+}:
+
+stdenv.mkDerivation rec {
+ pname = "kitsas";
+ version = "5.7";
+
+ src = fetchFromGitHub {
+ owner = "artoh";
+ repo = "kitupiikki";
+ rev = "v${version}";
+ hash = "sha256-1TZFw1Q9+FsGHwitErDhwyA941rtb+h9OgJLFLyhV7k=";
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ qt6.qmake
+ qt6.wrapQtAppsHook
+ ];
+
+ buildInputs =
+ [
+ libzip
+ poppler
+ qt6.qt5compat
+ qt6.qtsvg
+ qt6.qtwebengine
+ ]
+ ++ lib.optional stdenv.hostPlatform.isLinux [
+ qt6.qtwayland
+ ];
+
+ # We use a separate build-dir as otherwise ld seems to get confused between
+ # directory and executable name on buildPhase.
+ preConfigure = ''
+ mkdir build && cd build
+ '';
+
+ qmakeFlags = [ "../kitsas/kitsas.pro" ];
+
+ installPhase =
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
+ mkdir -p $out/Applications
+ mv kitsas.app $out/Applications
+ ''
+ + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+ install -Dm755 kitsas -t $out/bin
+ install -Dm644 ../kitsas.svg -t $out/share/icons/hicolor/scalable/apps
+ install -Dm644 ../kitsas.png -t $out/share/icons/hicolor/256x256/apps
+ install -Dm644 ../kitsas.desktop -t $out/share/applications
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/artoh/kitupiikki";
+ description = "Accounting tool suitable for Finnish associations and small business";
+ mainProgram = "kitsas";
+ maintainers = with maintainers; [ gspia ];
+ license = licenses.gpl3Plus;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/by-name/kl/klog-rs/package.nix b/pkgs/by-name/kl/klog-rs/package.nix
new file mode 100644
index 000000000000..ef9f4605c544
--- /dev/null
+++ b/pkgs/by-name/kl/klog-rs/package.nix
@@ -0,0 +1,33 @@
+{
+ lib,
+ fetchFromGitHub,
+ rustPlatform,
+ stdenv,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "klog-rs";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "tobifroe";
+ repo = "klog";
+ rev = version;
+ hash = "sha256-MAHLTNKN0t0rUXd4f238/jcaUlcTdC3IvaviMRu6gKg=";
+ };
+ cargoHash = "sha256-u+kctG+38Z2xYTA9h0OY4L1zzKyAT2Wlwf08zSqxV0I=";
+ checkFlags = [
+ # this integration test depends on a running kubernetes cluster
+ "--skip=k8s::tests::test_get_pod_list"
+ ];
+
+ meta = {
+ description = "Tool to tail logs of multiple Kubernetes pods simultaneously";
+ homepage = "https://github.com/tobifroe/klog";
+ changelog = "https://github.com/tobifroe/klog/releases/tag/${version}";
+ license = lib.licenses.mit;
+ mainProgram = "klog";
+ maintainers = with lib.maintainers; [ tobifroe ];
+ broken = stdenv.hostPlatform.isDarwin;
+ };
+}
diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix
index 0891bb98450d..b93d479d3c87 100644
--- a/pkgs/by-name/ko/kor/package.nix
+++ b/pkgs/by-name/ko/kor/package.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kor";
- version = "0.5.5";
+ version = "0.5.6";
src = fetchFromGitHub {
owner = "yonahd";
repo = pname;
rev = "v${version}";
- hash = "sha256-/GXTfArNaD1Y6hpec3tNUSSNVqIq6QLpsZS7jWFi5g4=";
+ hash = "sha256-Gyz8Gjb/JGLdy9vQ7nTyRhcCa6XBPuB3va8n5qDec7s=";
};
- vendorHash = "sha256-FrO+ZyisuDLplpoKsGOwpxz+jXd36MEs5bFz3RujZDY=";
+ vendorHash = "sha256-MV3iL1a6AImOKRagUlvUJ9u5ng85SETqjaK+GUDXoxE=";
preCheck = ''
HOME=$(mktemp -d)
diff --git a/pkgs/by-name/kw/kwok/package.nix b/pkgs/by-name/kw/kwok/package.nix
index cf11b9dadb0e..140dd1d60f12 100644
--- a/pkgs/by-name/kw/kwok/package.nix
+++ b/pkgs/by-name/kw/kwok/package.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "kwok";
- version = "0.6.0";
+ version = "0.6.1";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "kwok";
rev = "refs/tags/v${version}";
- hash = "sha256-3g8enPxxh2SaxiDgDwJpAfSjv/iRoBRmTnXwDtuMdFA=";
+ hash = "sha256-RVyXGPT30Fz+K1VdMneYldXvzHyimuCX406DMKOtUq4=";
};
- vendorHash = "sha256-YVGXYN7PgGgBzxhx6piP3NHRAsR1/pCj97UWB21WNMg=";
+ vendorHash = "sha256-xzFbcsL6pz91GFwjkriTMKlX2fgm2NMO9+H3lqH/C2c=";
doCheck = false; # docker is need for test
diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix
index 8d6e2c93fad0..a5aed8158ae3 100644
--- a/pkgs/by-name/la/lazysql/package.nix
+++ b/pkgs/by-name/la/lazysql/package.nix
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "lazysql";
- version = "0.2.9";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "jorgerojas26";
repo = "lazysql";
rev = "v${version}";
- hash = "sha256-6aJrLkmebOhLrnVhl9cnbW1ZBt0vq8lR7Lhz9nPFr8Q=";
+ hash = "sha256-nDiy7LSSUp1cPgtCfLdu7LEh0A+Ga1p5eNVanbQtQ+E=";
};
- vendorHash = "sha256-celee8uyoirX+vtAww2iQJtRwJEHyfHL2mZA2muSRiQ=";
+ vendorHash = "sha256-SKNFViwoMzZ1hKKZSvTm0/kKro1IaUVsC+0Pbv7FoAU=";
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix
index fef662e3c277..9f40d09ab315 100644
--- a/pkgs/by-name/le/lefthook/package.nix
+++ b/pkgs/by-name/le/lefthook/package.nix
@@ -6,7 +6,7 @@
let
pname = "lefthook";
- version = "1.7.17";
+ version = "1.8.1";
in
buildGoModule {
inherit pname version;
@@ -15,10 +15,10 @@ buildGoModule {
owner = "evilmartians";
repo = "lefthook";
rev = "v${version}";
- hash = "sha256-r7Tss0NHdEfjfDunWSTxpaV1B5KHGYu0xj9nnyhk8tQ=";
+ hash = "sha256-a4fghI3iUPnfYSQUR5LoH0eQfSqRMTcW4umeb/PhDt4=";
};
- vendorHash = "sha256-rJdtax3r5Nwew+ptY4kIAUtxqPguwrFMMRk78zrZUcU=";
+ vendorHash = "sha256-dxL+t5tPL+vsiBk+ojtQKcNubO0A72+7DWblxXiwzPE=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/by-name/le/lenmus/package.nix
similarity index 59%
rename from pkgs/applications/misc/lenmus/default.nix
rename to pkgs/by-name/le/lenmus/package.nix
index c7a1ce9f5d2f..4a7fbb5409db 100644
--- a/pkgs/applications/misc/lenmus/default.nix
+++ b/pkgs/by-name/le/lenmus/package.nix
@@ -1,37 +1,42 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, pkg-config
-, makeWrapper
-, boost
-, portmidi
-, sqlite
-, freetype
-, libpng
-, pngpp
-, zlib
-, wxGTK32
-, wxsqlite3
-, fluidsynth
-, fontconfig
-, darwin
-, soundfont-fluid
-, openlilylib-fonts
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ cmake,
+ pkg-config,
+ makeWrapper,
+ boost,
+ portmidi,
+ sqlite,
+ freetype,
+ libpng,
+ pngpp,
+ zlib,
+ wxGTK32,
+ wxsqlite3,
+ fluidsynth,
+ fontconfig,
+ darwin,
+ soundfont-fluid,
+ openlilylib-fonts,
}:
let
inherit (darwin.apple_sdk.frameworks) Cocoa;
in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "lenmus";
version = "6.0.1";
src = fetchFromGitHub {
owner = "lenmus";
repo = "lenmus";
- rev = "Release_${version}";
- sha256 = "sha256-qegOAc6vs2+6VViDHVjv0q+qjLZyTT7yPF3hFpTt5zE=";
+ rev = "Release_${finalAttrs.version}";
+ hash = "sha256-qegOAc6vs2+6VViDHVjv0q+qjLZyTT7yPF3hFpTt5zE=";
+ };
+
+ env = {
+ NIX_CFLAGS_COMPILE = "-fpermissive";
};
postPatch = ''
@@ -40,28 +45,32 @@ stdenv.mkDerivation rec {
sed -i 's/fixup_bundle.*")/")/g' CMakeLists.txt
'';
- nativeBuildInputs = [
- cmake
- pkg-config
- ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
- makeWrapper
- ];
+ nativeBuildInputs =
+ [
+ cmake
+ pkg-config
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ makeWrapper
+ ];
- buildInputs = [
- boost
- portmidi
- sqlite
- freetype
- libpng
- pngpp
- zlib
- wxGTK32
- wxsqlite3
- fluidsynth
- fontconfig
- ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
- Cocoa
- ];
+ buildInputs =
+ [
+ boost
+ portmidi
+ sqlite
+ freetype
+ libpng
+ pngpp
+ zlib
+ wxGTK32
+ wxsqlite3
+ fluidsynth
+ fontconfig
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ Cocoa
+ ];
preConfigure = ''
mkdir res/fonts
@@ -82,7 +91,7 @@ stdenv.mkDerivation rec {
makeWrapper $out/{Applications/lenmus.app/Contents/MacOS,bin}/lenmus
'';
- meta = with lib; {
+ meta = {
description = "LenMus Phonascus is a program for learning music";
longDescription = ''
LenMus Phonascus is a free open source program (GPL v3) for learning music.
@@ -90,9 +99,9 @@ stdenv.mkDerivation rec {
The different activities can be customized to meet your needs
'';
homepage = "http://www.lenmus.org/";
- license = licenses.gpl3Plus;
- maintainers = with maintainers; [ ramkromberg ];
- platforms = with platforms; unix;
+ license = lib.licenses.gpl3Plus;
+ maintainers = with lib.maintainers; [ ramkromberg ];
+ platforms = lib.platforms.unix;
mainProgram = "lenmus";
};
-}
+})
diff --git a/pkgs/by-name/le/less/package.nix b/pkgs/by-name/le/less/package.nix
index 679bf278a6a5..ba57f5460ccd 100644
--- a/pkgs/by-name/le/less/package.nix
+++ b/pkgs/by-name/le/less/package.nix
@@ -1,17 +1,22 @@
-{ lib
-, stdenv
-, fetchurl
-, ncurses
-, pcre2
-, withSecure ? false
+{
+ lib,
+ fetchurl,
+ ncurses,
+ pcre2,
+ stdenv,
+ # Boolean options
+ withSecure ? false,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "less";
version = "668";
- # Only tarballs on the website are valid releases,
- # other versions, e.g. git tags are considered snapshots.
+ # `less` is provided by the following sources:
+ # - meta.homepage
+ # - GitHub: https://github.com/gwsw/less/
+ # The releases recommended for general consumption are only those from
+ # homepage, and only those not marked as beta.
src = fetchurl {
url = "https://www.greenwoodsoftware.com/less/less-${finalAttrs.version}.tar.gz";
hash = "sha256-KBn1VWTYbVQqu+yv2C/2HoGaPuyWf6o2zT5o8VlqRLg=";
@@ -22,13 +27,18 @@ stdenv.mkDerivation (finalAttrs: {
pcre2
];
- outputs = [ "out" "man" ];
+ outputs = [
+ "out"
+ "man"
+ ];
configureFlags = [
- # Look for 'sysless' in /etc.
- "--sysconfdir=/etc"
- "--with-regex=pcre2"
- ] ++ lib.optional withSecure "--with-secure";
+ "--sysconfdir=/etc" # Look for 'sysless' in /etc
+ (lib.withFeatureAs true "regex" "pcre2")
+ (lib.withFeature withSecure "secure")
+ ];
+
+ strictDeps = true;
meta = {
homepage = "https://www.greenwoodsoftware.com/less/";
@@ -36,7 +46,11 @@ stdenv.mkDerivation (finalAttrs: {
changelog = "https://www.greenwoodsoftware.com/less/news.${finalAttrs.version}.html";
license = lib.licenses.gpl3Plus;
mainProgram = "less";
- maintainers = with lib.maintainers; [ dtzWill ];
+ maintainers = with lib.maintainers; [
+ AndersonTorres
+ # not active
+ dtzWill
+ ];
platforms = lib.platforms.unix;
};
})
diff --git a/pkgs/by-name/li/lib60870/package.nix b/pkgs/by-name/li/lib60870/package.nix
index 4669042b7be9..5e3c0da7c42a 100644
--- a/pkgs/by-name/li/lib60870/package.nix
+++ b/pkgs/by-name/li/lib60870/package.nix
@@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
- meta = with lib; {
+ meta = {
description = "Implementation of the IEC 60870-5-101/104 protocol";
homepage = "https://libiec61850.com/";
- license = licenses.gpl3Only;
- maintainers = with maintainers; [ stv0g ];
- platforms = platforms.unix;
+ license = lib.licenses.gpl3Only;
+ maintainers = with lib.maintainers; [ stv0g ];
+ platforms = lib.platforms.unix;
};
})
diff --git a/pkgs/by-name/li/libconfig/package.nix b/pkgs/by-name/li/libconfig/package.nix
new file mode 100644
index 000000000000..f0cc94171531
--- /dev/null
+++ b/pkgs/by-name/li/libconfig/package.nix
@@ -0,0 +1,34 @@
+{
+ lib,
+ stdenv,
+ fetchurl,
+ # This also disables building tests.
+ # on static windows cross-compile they fail to build
+ doCheck ? with stdenv.hostPlatform; !(isWindows && isStatic),
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "libconfig";
+ version = "1.7.3";
+
+ src = fetchurl {
+ url = "https://hyperrealm.github.io/${finalAttrs.pname}/dist/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
+ hash = "sha256-VFFm1srAN3RDgdHpzFpUBQlOe/rRakEWmbz/QLuzHuc=";
+ };
+
+ inherit doCheck;
+
+ configureFlags =
+ lib.optional (stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isStatic) "--disable-examples"
+ ++ lib.optional (!finalAttrs.doCheck) "--disable-tests";
+
+ cmakeFlags = lib.optionals (!finalAttrs.doCheck) [ "-DBUILD_TESTS:BOOL=OFF" ];
+
+ meta = {
+ homepage = "https://hyperrealm.github.io/libconfig/";
+ description = "C/C++ library for processing configuration files";
+ license = lib.licenses.lgpl3;
+ maintainers = with lib.maintainers; [ stv0g ];
+ platforms = lib.platforms.all;
+ };
+})
diff --git a/pkgs/by-name/li/libiec61850/package.nix b/pkgs/by-name/li/libiec61850/package.nix
index 03c8037d6b33..94261d06dfdb 100644
--- a/pkgs/by-name/li/libiec61850/package.nix
+++ b/pkgs/by-name/li/libiec61850/package.nix
@@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: {
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
- meta = with lib; {
+ meta = {
description = "Open-source library for the IEC 61850 protocols";
homepage = "https://libiec61850.com/";
- license = licenses.gpl3Only;
- maintainers = with maintainers; [ stv0g ];
- platforms = platforms.unix;
+ license = lib.licenses.gpl3Only;
+ maintainers = with lib.maintainers; [ stv0g ];
+ platforms = lib.platforms.unix;
};
})
diff --git a/pkgs/by-name/li/liblsl/package.nix b/pkgs/by-name/li/liblsl/package.nix
new file mode 100644
index 000000000000..36519bd2b40f
--- /dev/null
+++ b/pkgs/by-name/li/liblsl/package.nix
@@ -0,0 +1,32 @@
+{
+ cmake,
+ stdenv,
+ lib,
+ fetchFromGitHub,
+}:
+
+stdenv.mkDerivation rec {
+ pname = "liblsl";
+ version = "1.16.2";
+
+ src = fetchFromGitHub {
+ owner = "sccn";
+ repo = "liblsl";
+ rev = "v${version}";
+ sha256 = "sha256-nmu7Kxk4U5sGO8Od9JR4id4V4mjeibj4AHjUYhpGPeo=";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ cmakeFlags = [ "-DLSL_UNIXFOLDERS=ON" ];
+
+ meta = {
+ description = "C++ lsl library for multi-modal time-synched data transmission over the local network";
+ homepage = "https://github.com/sccn/liblsl";
+ changelog = "https://github.com/sccn/liblsl/blob/${src.rev}/CHANGELOG.md";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ abcsds ];
+ mainProgram = "liblsl";
+ platforms = lib.platforms.all;
+ };
+}
diff --git a/pkgs/by-name/li/libpkgconf/package.nix b/pkgs/by-name/li/libpkgconf/package.nix
index 43373e43bbfc..34d718762cd1 100644
--- a/pkgs/by-name/li/libpkgconf/package.nix
+++ b/pkgs/by-name/li/libpkgconf/package.nix
@@ -42,12 +42,12 @@ stdenv.mkDerivation (finalAttrs: {
'';
passthru.updateScript = gitUpdater {
- url = "https://github.com/pkgconf/pkgconf.git";
+ url = "https://gitea.treehouse.systems/ariadne/pkgconf";
rev-prefix = "pkgconf-";
};
meta = {
- homepage = "https://github.com/pkgconf/pkgconf";
+ homepage = "https://gitea.treehouse.systems/ariadne/pkgconf";
description = "Package compiler and linker metadata toolkit";
longDescription = ''
pkgconf is a program which helps to configure compiler and linker flags
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
functionality, to allow other tooling such as compilers and IDEs to
discover and use libraries configured by pkgconf.
'';
- changelog = "https://github.com/pkgconf/pkgconf/blob/pkgconf-${finalAttrs.version}/NEWS";
+ changelog = "https://gitea.treehouse.systems/ariadne/pkgconf/src/tag/pkgconf-${finalAttrs.version}/NEWS";
license = lib.licenses.isc;
mainProgram = "pkgconf";
maintainers = with lib.maintainers; [ zaninime AndersonTorres ];
diff --git a/pkgs/by-name/li/libscfg/package.nix b/pkgs/by-name/li/libscfg/package.nix
index 333433d8c42c..adf08d291a73 100644
--- a/pkgs/by-name/li/libscfg/package.nix
+++ b/pkgs/by-name/li/libscfg/package.nix
@@ -1,4 +1,13 @@
-{ stdenv, lib, fetchFromSourcehut, meson, ninja, pkg-config, wayland }:
+{
+ stdenv,
+ lib,
+ fetchFromSourcehut,
+ meson,
+ ninja,
+ pkg-config,
+ wayland,
+ nix-update-script,
+}:
stdenv.mkDerivation rec {
pname = "libscfg";
@@ -11,9 +20,15 @@ stdenv.mkDerivation rec {
hash = "sha256-aTcvs7QuDOx17U/yP37LhvIGxmm2WR/6qFYRtfjRN6w=";
};
- nativeBuildInputs = [ meson ninja pkg-config ];
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkg-config
+ ];
buildInputs = [ wayland ];
+ passthru.updateScript = nix-update-script { };
+
meta = with lib; {
homepage = "https://sr.ht/~emersion/libscfg";
description = "Simple configuration file format";
diff --git a/pkgs/by-name/li/libsignal-ffi/Cargo.lock b/pkgs/by-name/li/libsignal-ffi/Cargo.lock
index 83c23c72ac97..88baee16918a 100644
--- a/pkgs/by-name/li/libsignal-ffi/Cargo.lock
+++ b/pkgs/by-name/li/libsignal-ffi/Cargo.lock
@@ -4,18 +4,18 @@ version = 3
[[package]]
name = "addr2line"
-version = "0.22.0"
+version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
dependencies = [
"gimli",
]
[[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
[[package]]
name = "aead"
@@ -100,9 +100,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
[[package]]
name = "anstream"
-version = "0.6.14"
+version = "0.6.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
dependencies = [
"anstyle",
"anstyle-parse",
@@ -115,33 +115,33 @@ dependencies = [
[[package]]
name = "anstyle"
-version = "1.0.7"
+version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
[[package]]
name = "anstyle-parse"
-version = "0.2.4"
+version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
-version = "1.1.0"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
dependencies = [
"windows-sys 0.52.0",
]
[[package]]
name = "anstyle-wincon"
-version = "3.0.3"
+version = "3.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
dependencies = [
"anstyle",
"windows-sys 0.52.0",
@@ -149,9 +149,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.86"
+version = "1.0.88"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356"
[[package]]
name = "argon2"
@@ -180,9 +180,9 @@ checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
[[package]]
name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
[[package]]
name = "asn1"
@@ -201,18 +201,19 @@ checksum = "56e6076d38cc17cc22b0f65f31170a2ee1975e6b07f0012893aefd86ce19c987"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
name = "assert_cmd"
-version = "2.0.13"
+version = "2.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00ad3f3a942eee60335ab4342358c161ee296829e0d16ff42fc1d6cb07815467"
+checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d"
dependencies = [
"anstyle",
"bstr",
"doc-comment",
+ "libc",
"predicates",
"predicates-core",
"predicates-tree",
@@ -240,13 +241,13 @@ dependencies = [
[[package]]
name = "async-trait"
-version = "0.1.81"
+version = "0.1.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
+checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -267,7 +268,7 @@ version = "0.1.0"
dependencies = [
"asn1",
"assert_matches",
- "base64 0.21.7",
+ "base64 0.22.1",
"bitflags",
"blake2",
"boring",
@@ -306,17 +307,17 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
[[package]]
name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
dependencies = [
"addr2line",
- "cc",
"cfg-if",
"libc",
"miniz_oxide",
"object",
"rustc-demangle",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -363,7 +364,7 @@ dependencies = [
"regex",
"rustc-hash",
"shlex",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -445,9 +446,9 @@ dependencies = [
[[package]]
name = "breakpad-symbols"
-version = "0.20.0"
+version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9898874a43aed8d3ee52d223ba232424e9da1f9af0e6a2cfa49b506b4ad99616"
+checksum = "b37cb0d96cbe2c0cb6c4fc8856dc38b87d61abaa220c818f162bee332d3f4193"
dependencies = [
"async-trait",
"cachemap2",
@@ -463,9 +464,9 @@ dependencies = [
[[package]]
name = "bstr"
-version = "1.9.1"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
+checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
dependencies = [
"memchr",
"regex-automata 0.4.7",
@@ -486,15 +487,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
-version = "1.6.1"
+version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
[[package]]
name = "cachemap2"
-version = "0.2.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7bba2f68a9fefca870fed897de7c655f9d5c1eaf1cd9517db96c9a3861f648b"
+checksum = "68ccbd3153aa153b2f5eff557537ffce81e4dd6c50ae0eddc41dc8d0c388436f"
[[package]]
name = "cast"
@@ -513,12 +514,13 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.1.6"
+version = "1.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f"
+checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
dependencies = [
"jobserver",
"libc",
+ "shlex",
]
[[package]]
@@ -638,9 +640,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.4.18"
+version = "4.5.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
+checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
dependencies = [
"clap_builder",
"clap_derive",
@@ -657,33 +659,33 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.4.18"
+version = "4.5.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
+checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
dependencies = [
"anstream",
"anstyle",
"clap_lex",
- "strsim",
+ "strsim 0.11.1",
]
[[package]]
name = "clap_derive"
-version = "4.4.7"
+version = "4.5.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
+checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
dependencies = [
- "heck 0.4.1",
+ "heck",
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
name = "clap_lex"
-version = "0.6.0"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
[[package]]
name = "cmake"
@@ -696,9 +698,9 @@ dependencies = [
[[package]]
name = "colorchoice"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
[[package]]
name = "colored"
@@ -750,15 +752,15 @@ dependencies = [
[[package]]
name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
[[package]]
name = "cpufeatures"
-version = "0.2.12"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
dependencies = [
"libc",
]
@@ -883,7 +885,7 @@ source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve2551
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -906,7 +908,7 @@ dependencies = [
"ident_case",
"proc-macro2",
"quote",
- "strsim",
+ "strsim 0.10.0",
"syn 1.0.109",
]
@@ -963,7 +965,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -1007,7 +1009,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustc_version",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -1071,7 +1073,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -1088,9 +1090,9 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
[[package]]
name = "dunce"
-version = "1.0.4"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
[[package]]
name = "dyn-clonable"
@@ -1160,14 +1162,14 @@ dependencies = [
[[package]]
name = "enum-as-inner"
-version = "0.6.0"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a"
+checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
dependencies = [
- "heck 0.4.1",
+ "heck",
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -1181,9 +1183,9 @@ dependencies = [
[[package]]
name = "env_filter"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6dc8c8ff84895b051f07a0e65f975cf225131742531338752abfb324e4449ff"
+checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
dependencies = [
"log",
"regex",
@@ -1191,9 +1193,9 @@ dependencies = [
[[package]]
name = "env_logger"
-version = "0.11.4"
+version = "0.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06676b12debf7bba6903559720abca942d3a66b8acb88815fd2c7c6537e9ade1"
+checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
dependencies = [
"anstream",
"anstyle",
@@ -1220,9 +1222,9 @@ dependencies = [
[[package]]
name = "fastrand"
-version = "2.1.0"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
[[package]]
name = "fiat-crypto"
@@ -1238,9 +1240,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
[[package]]
name = "flate2"
-version = "1.0.30"
+version = "1.0.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
dependencies = [
"crc32fast",
"miniz_oxide",
@@ -1270,7 +1272,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -1360,7 +1362,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -1427,9 +1429,9 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.29.0"
+version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
[[package]]
name = "glob"
@@ -1449,7 +1451,7 @@ dependencies = [
"futures-sink",
"futures-util",
"http 0.2.12",
- "indexmap 2.2.6",
+ "indexmap",
"slab",
"tokio",
"tokio-util",
@@ -1458,9 +1460,9 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.4.5"
+version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
+checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
dependencies = [
"atomic-waker",
"bytes",
@@ -1468,7 +1470,7 @@ dependencies = [
"futures-core",
"futures-sink",
"http 1.1.0",
- "indexmap 2.2.6",
+ "indexmap",
"slab",
"tokio",
"tokio-util",
@@ -1485,12 +1487,6 @@ dependencies = [
"crunchy",
]
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
[[package]]
name = "hashbrown"
version = "0.14.5"
@@ -1518,7 +1514,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -1558,12 +1554,6 @@ dependencies = [
"http 0.2.12",
]
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
[[package]]
name = "heck"
version = "0.5.0"
@@ -1576,6 +1566,12 @@ version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+
[[package]]
name = "hex"
version = "0.4.3"
@@ -1749,7 +1745,7 @@ dependencies = [
"bytes",
"futures-channel",
"futures-util",
- "h2 0.4.5",
+ "h2 0.4.6",
"http 1.1.0",
"http-body 1.0.1",
"pin-project-lite",
@@ -1760,9 +1756,9 @@ dependencies = [
[[package]]
name = "hyper-util"
-version = "0.1.6"
+version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956"
+checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba"
dependencies = [
"bytes",
"futures-util",
@@ -1824,22 +1820,12 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "1.9.3"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
dependencies = [
"equivalent",
- "hashbrown 0.14.5",
+ "hashbrown",
]
[[package]]
@@ -1854,26 +1840,26 @@ dependencies = [
[[package]]
name = "ipnet"
-version = "2.9.0"
+version = "2.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
[[package]]
name = "is-terminal"
-version = "0.4.12"
+version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
+checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
dependencies = [
- "hermit-abi",
+ "hermit-abi 0.4.0",
"libc",
"windows-sys 0.52.0",
]
[[package]]
name = "is_terminal_polyfill"
-version = "1.70.0"
+version = "1.70.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
[[package]]
name = "itertools"
@@ -1946,9 +1932,9 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.69"
+version = "0.3.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
dependencies = [
"wasm-bindgen",
]
@@ -1978,9 +1964,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "libc"
-version = "0.2.155"
+version = "0.2.158"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
[[package]]
name = "libcrux-intrinsics"
@@ -2044,7 +2030,7 @@ dependencies = [
"aes-gcm-siv",
"assert_matches",
"attest",
- "base64 0.21.7",
+ "base64 0.22.1",
"bincode",
"device-transfer",
"futures-util",
@@ -2085,10 +2071,10 @@ dependencies = [
name = "libsignal-bridge-macros"
version = "0.1.0"
dependencies = [
- "heck 0.5.0",
+ "heck",
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
"syn-mid",
]
@@ -2102,6 +2088,7 @@ dependencies = [
"jni 0.21.1",
"libsignal-bridge-macros",
"libsignal-bridge-types",
+ "libsignal-core",
"libsignal-message-backup",
"libsignal-net",
"libsignal-protocol",
@@ -2168,6 +2155,7 @@ dependencies = [
name = "libsignal-core"
version = "0.1.0"
dependencies = [
+ "assert_matches",
"hex-literal",
"num_enum",
"proptest",
@@ -2177,7 +2165,7 @@ dependencies = [
[[package]]
name = "libsignal-ffi"
-version = "0.57.1"
+version = "0.58.3"
dependencies = [
"cpufeatures",
"futures-util",
@@ -2192,7 +2180,7 @@ dependencies = [
[[package]]
name = "libsignal-jni"
-version = "0.57.1"
+version = "0.58.3"
dependencies = [
"cfg-if",
"cpufeatures",
@@ -2208,7 +2196,7 @@ dependencies = [
[[package]]
name = "libsignal-jni-testing"
-version = "0.57.1"
+version = "0.58.3"
dependencies = [
"jni 0.21.1",
"libsignal-bridge-testing",
@@ -2292,10 +2280,10 @@ dependencies = [
name = "libsignal-message-backup-macros"
version = "0.1.0"
dependencies = [
- "heck 0.5.0",
+ "heck",
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
"test-case",
]
@@ -2306,10 +2294,8 @@ dependencies = [
"assert_matches",
"async-trait",
"attest",
- "base64 0.21.7",
+ "base64 0.22.1",
"bincode",
- "bitstream-io",
- "boring",
"bytes",
"clap",
"colored",
@@ -2321,16 +2307,11 @@ dependencies = [
"futures-util",
"hex",
"hex-literal",
- "hickory-proto",
"hmac",
"http 1.1.0",
- "http-body-util",
- "hyper 1.4.1",
- "hyper-util",
- "indexmap 2.2.6",
"itertools 0.13.0",
- "lazy_static",
"libsignal-core",
+ "libsignal-net-infra",
"libsignal-protocol",
"libsignal-svr3",
"log",
@@ -2342,19 +2323,63 @@ dependencies = [
"prost-build",
"rand",
"rand_core",
- "rcgen",
- "rustls 0.23.12",
- "rustls-platform-verifier",
"serde",
"serde_json",
"sha2",
"snow",
- "socks5-server",
- "static_assertions",
"strum",
"test-case",
"test-log",
"thiserror",
+ "tokio",
+ "tokio-boring",
+ "tokio-stream",
+ "tokio-tungstenite 0.23.1",
+ "tungstenite 0.23.0",
+ "url",
+ "uuid",
+ "warp",
+ "zerocopy",
+]
+
+[[package]]
+name = "libsignal-net-infra"
+version = "0.1.0"
+dependencies = [
+ "assert_matches",
+ "async-trait",
+ "attest",
+ "base64 0.22.1",
+ "bitstream-io",
+ "boring",
+ "bytes",
+ "const-str",
+ "derive-where",
+ "displaydoc",
+ "either",
+ "env_logger",
+ "futures-util",
+ "hickory-proto",
+ "http 1.1.0",
+ "http-body-util",
+ "hyper 1.4.1",
+ "hyper-util",
+ "indexmap",
+ "itertools 0.13.0",
+ "lazy_static",
+ "log",
+ "nonzero_ext",
+ "pin-project",
+ "pretty_assertions",
+ "prost",
+ "rcgen",
+ "rustls 0.23.13",
+ "rustls-platform-verifier",
+ "snow",
+ "socks5-server",
+ "strum",
+ "test-case",
+ "thiserror",
"tls-parser",
"tokio",
"tokio-boring",
@@ -2364,14 +2389,12 @@ dependencies = [
"tokio-util",
"tungstenite 0.23.0",
"url",
- "uuid",
"warp",
- "zerocopy",
]
[[package]]
name = "libsignal-node"
-version = "0.57.1"
+version = "0.58.3"
dependencies = [
"cmake",
"futures",
@@ -2393,6 +2416,7 @@ dependencies = [
"aes",
"aes-gcm-siv",
"arrayref",
+ "assert_matches",
"async-trait",
"clap",
"criterion",
@@ -2406,7 +2430,7 @@ dependencies = [
"hex-literal",
"hkdf",
"hmac",
- "indexmap 2.2.6",
+ "indexmap",
"itertools 0.13.0",
"libsignal-core",
"log",
@@ -2455,22 +2479,22 @@ dependencies = [
[[package]]
name = "linkme"
-version = "0.3.27"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccb76662d78edc9f9bf56360d6919bdacc8b7761227727e5082f128eeb90bbf5"
+checksum = "3c943daedff228392b791b33bba32e75737756e80a613e32e246c6ce9cbab20a"
dependencies = [
"linkme-impl",
]
[[package]]
name = "linkme-impl"
-version = "0.3.27"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8dccda732e04fa3baf2e17cf835bfe2601c7c2edafd64417c627dabae3a8cda"
+checksum = "cb26336e6dc7cc76e7927d2c9e7e3bb376d7af65a6f56a0b16c47d18a9b1abc5"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -2540,9 +2564,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "memmap2"
-version = "0.9.4"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
dependencies = [
"libc",
]
@@ -2565,9 +2589,9 @@ dependencies = [
[[package]]
name = "minidump"
-version = "0.20.0"
+version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626b6878ac52f6a1e04c9e7eb42ce577dfadf7316b8d3fa5ab1c1abefc2c156b"
+checksum = "8d385b740c6b991e6eff48f26e2c6978c9e9e9e2e935f4967bcdf4c2d1d18828"
dependencies = [
"debugid",
"encoding_rs",
@@ -2585,9 +2609,9 @@ dependencies = [
[[package]]
name = "minidump-common"
-version = "0.20.0"
+version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74b1a2187f9aea1134ed3cf96b3827283aabc67dc95ed502e7072b515a1c770c"
+checksum = "5c4d14bcca0fd3ed165a03000480aaa364c6860c34e900cb2dafdf3b95340e77"
dependencies = [
"bitflags",
"debugid",
@@ -2600,9 +2624,9 @@ dependencies = [
[[package]]
name = "minidump-processor"
-version = "0.20.0"
+version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb61b2d7298004e47225563c0ede9a3ee2889351e1c931bbc42996411a9e4bc4"
+checksum = "7869a9256743611832cdf02d01ee5e2d67055a47727b21a01d47a79839876ca4"
dependencies = [
"async-trait",
"breakpad-symbols",
@@ -2620,9 +2644,9 @@ dependencies = [
[[package]]
name = "minidump-unwind"
-version = "0.20.0"
+version = "0.21.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1951b9dfa82b5e0d22a8e08bebcb8d98f85bb07851a52f18246b7d7dc9a4a53c"
+checksum = "1f4fb17e3a2508326b9547166051a979d439d883bcd1058b48a2d1181a0b37cf"
dependencies = [
"async-trait",
"breakpad-symbols",
@@ -2640,20 +2664,20 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
dependencies = [
- "adler",
+ "adler2",
]
[[package]]
name = "mio"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.9",
"libc",
"wasi",
"windows-sys 0.52.0",
@@ -2736,7 +2760,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6813fde79b646e47e7ad75f480aa80ef76a5d9599e2717407961531169ee38b"
dependencies = [
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
"syn-mid",
]
@@ -2812,7 +2836,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -2845,30 +2869,30 @@ dependencies = [
[[package]]
name = "num_enum"
-version = "0.7.2"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
+checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
dependencies = [
"num_enum_derive",
]
[[package]]
name = "num_enum_derive"
-version = "0.7.2"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
+checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
name = "object"
-version = "0.36.2"
+version = "0.36.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e"
+checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
dependencies = [
"memchr",
]
@@ -2920,7 +2944,7 @@ checksum = "7459127d7a18cb202d418e4b7df1103ffd6d82a106e9b2091c250624c2ace70d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -2964,9 +2988,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]]
name = "pest"
-version = "2.7.11"
+version = "2.7.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95"
+checksum = "9c73c26c01b8c87956cea613c907c9d6ecffd8d18a2a5908e5de0adfaa185cea"
dependencies = [
"memchr",
"thiserror",
@@ -2975,9 +2999,9 @@ dependencies = [
[[package]]
name = "pest_derive"
-version = "2.7.11"
+version = "2.7.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a"
+checksum = "664d22978e2815783adbdd2c588b455b1bd625299ce36b2a99881ac9627e6d8d"
dependencies = [
"pest",
"pest_generator",
@@ -2985,22 +3009,22 @@ dependencies = [
[[package]]
name = "pest_generator"
-version = "2.7.11"
+version = "2.7.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183"
+checksum = "a2d5487022d5d33f4c30d91c22afa240ce2a644e87fe08caad974d4eab6badbe"
dependencies = [
"pest",
"pest_meta",
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
name = "pest_meta"
-version = "2.7.11"
+version = "2.7.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f"
+checksum = "0091754bbd0ea592c4deb3a122ce8ecbb0753b738aa82bc055fcc2eccc8d8174"
dependencies = [
"once_cell",
"pest",
@@ -3014,7 +3038,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
dependencies = [
"fixedbitset",
- "indexmap 2.2.6",
+ "indexmap",
]
[[package]]
@@ -3072,7 +3096,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -3099,9 +3123,9 @@ dependencies = [
[[package]]
name = "plotters"
-version = "0.3.6"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3"
+checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
dependencies = [
"num-traits 0.2.19",
"plotters-backend",
@@ -3112,15 +3136,15 @@ dependencies = [
[[package]]
name = "plotters-backend"
-version = "0.3.6"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7"
+checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
[[package]]
name = "plotters-svg"
-version = "0.3.6"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705"
+checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
dependencies = [
"plotters-backend",
]
@@ -3168,9 +3192,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
[[package]]
name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
[[package]]
name = "pqcrypto-internals"
@@ -3218,9 +3245,9 @@ checksum = "94e851c7654eed9e68d7d27164c454961a616cf8c203d500607ef22c737b51bb"
[[package]]
name = "predicates"
-version = "3.1.0"
+version = "3.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8"
+checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97"
dependencies = [
"anstyle",
"difflib",
@@ -3229,15 +3256,15 @@ dependencies = [
[[package]]
name = "predicates-core"
-version = "1.0.6"
+version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
+checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931"
[[package]]
name = "predicates-tree"
-version = "1.0.9"
+version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
+checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13"
dependencies = [
"predicates-core",
"termtree",
@@ -3255,19 +3282,19 @@ dependencies = [
[[package]]
name = "prettyplease"
-version = "0.2.20"
+version = "0.2.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
+checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
dependencies = [
"proc-macro2",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
name = "proc-macro-crate"
-version = "3.1.0"
+version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
dependencies = [
"toml_edit",
]
@@ -3312,7 +3339,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29"
dependencies = [
"bitflags",
- "chrono",
"hex",
]
@@ -3347,9 +3373,9 @@ dependencies = [
[[package]]
name = "prost"
-version = "0.13.1"
+version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc"
+checksum = "3b2ecbe40f08db5c006b5764a2645f7f3f141ce756412ac9e1dd6087e6d32995"
dependencies = [
"bytes",
"prost-derive",
@@ -3357,12 +3383,12 @@ dependencies = [
[[package]]
name = "prost-build"
-version = "0.13.1"
+version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bb182580f71dd070f88d01ce3de9f4da5021db7115d2e1c3605a754153b77c1"
+checksum = "f8650aabb6c35b860610e9cff5dc1af886c9e25073b7b1712a68972af4281302"
dependencies = [
"bytes",
- "heck 0.5.0",
+ "heck",
"itertools 0.13.0",
"log",
"multimap",
@@ -3372,37 +3398,37 @@ dependencies = [
"prost",
"prost-types",
"regex",
- "syn 2.0.72",
+ "syn 2.0.77",
"tempfile",
]
[[package]]
name = "prost-derive"
-version = "0.13.1"
+version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca"
+checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac"
dependencies = [
"anyhow",
"itertools 0.13.0",
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
name = "prost-types"
-version = "0.13.1"
+version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2"
+checksum = "60caa6738c7369b940c3d49246a8d1749323674c65cb13010134f5c9bad5b519"
dependencies = [
"prost",
]
[[package]]
name = "protobuf"
-version = "3.4.0"
+version = "3.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58678a64de2fced2bdec6bca052a6716a0efe692d6e3f53d1bda6a1def64cfc0"
+checksum = "0bcc343da15609eaecd65f8aa76df8dc4209d325131d8219358c0aaaebab0bf6"
dependencies = [
"once_cell",
"protobuf-support",
@@ -3411,9 +3437,9 @@ dependencies = [
[[package]]
name = "protobuf-codegen"
-version = "3.4.0"
+version = "3.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32777b0b3f6538d9d2e012b3fad85c7e4b9244b5958d04a6415f4333782b7a77"
+checksum = "c4d0cde5642ea4df842b13eb9f59ea6fafa26dcb43e3e1ee49120e9757556189"
dependencies = [
"anyhow",
"once_cell",
@@ -3426,9 +3452,9 @@ dependencies = [
[[package]]
name = "protobuf-json-mapping"
-version = "3.4.0"
+version = "3.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d8440284a60d89deae81f67cc713f03f770ae51461e7613e44808910502693e"
+checksum = "b07993d14c66dfb74c639dc1b90381773b85cff66ef47bff35bad0778150a3aa"
dependencies = [
"protobuf",
"protobuf-support",
@@ -3437,12 +3463,12 @@ dependencies = [
[[package]]
name = "protobuf-parse"
-version = "3.4.0"
+version = "3.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96cb37955261126624a25b5e6bda40ae34cf3989d52a783087ca6091b29b5642"
+checksum = "1b0e9b447d099ae2c4993c0cbb03c7a9d6c937b17f2d56cfc0b1550e6fcfdb76"
dependencies = [
"anyhow",
- "indexmap 1.9.3",
+ "indexmap",
"log",
"protobuf",
"protobuf-support",
@@ -3453,9 +3479,9 @@ dependencies = [
[[package]]
name = "protobuf-support"
-version = "3.4.0"
+version = "3.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1ed294a835b0f30810e13616b1cd34943c6d1e84a8f3b0dcfe466d256c3e7e7"
+checksum = "f0766e3675a627c327e4b3964582594b0e8741305d628a98a5de75a1d15f99b9"
dependencies = [
"thiserror",
]
@@ -3468,9 +3494,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
[[package]]
name = "quote"
-version = "1.0.36"
+version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2",
]
@@ -3558,9 +3584,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.10.5"
+version = "1.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
dependencies = [
"aho-corasick",
"memchr",
@@ -3629,9 +3655,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
dependencies = [
"semver",
]
@@ -3647,9 +3673,9 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.38.34"
+version = "0.38.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
dependencies = [
"bitflags",
"errno",
@@ -3674,9 +3700,9 @@ dependencies = [
[[package]]
name = "rustls"
-version = "0.23.12"
+version = "0.23.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
dependencies = [
"once_cell",
"ring",
@@ -3688,9 +3714,9 @@ dependencies = [
[[package]]
name = "rustls-native-certs"
-version = "0.7.1"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba"
+checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
dependencies = [
"openssl-probe",
"rustls-pemfile",
@@ -3701,9 +3727,9 @@ dependencies = [
[[package]]
name = "rustls-pemfile"
-version = "2.1.2"
+version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
+checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
dependencies = [
"base64 0.22.1",
"rustls-pki-types",
@@ -3711,22 +3737,22 @@ dependencies = [
[[package]]
name = "rustls-pki-types"
-version = "1.7.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
+checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
[[package]]
name = "rustls-platform-verifier"
-version = "0.3.2"
+version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e3beb939bcd33c269f4bf946cc829fcd336370267c4a927ac0399c84a3151a1"
+checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490"
dependencies = [
"core-foundation",
"core-foundation-sys",
"jni 0.19.0",
"log",
"once_cell",
- "rustls 0.23.12",
+ "rustls 0.23.13",
"rustls-native-certs",
"rustls-platform-verifier-android",
"rustls-webpki",
@@ -3738,15 +3764,15 @@ dependencies = [
[[package]]
name = "rustls-platform-verifier-android"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad"
+checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
[[package]]
name = "rustls-webpki"
-version = "0.102.6"
+version = "0.102.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
dependencies = [
"ring",
"rustls-pki-types",
@@ -3788,11 +3814,11 @@ dependencies = [
[[package]]
name = "schannel"
-version = "0.1.23"
+version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -3824,7 +3850,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -3865,32 +3891,33 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
[[package]]
name = "serde"
-version = "1.0.204"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.204"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
name = "serde_json"
-version = "1.0.120"
+version = "1.0.128"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
dependencies = [
- "indexmap 2.2.6",
+ "indexmap",
"itoa",
+ "memchr",
"ryu",
"serde",
]
@@ -4011,6 +4038,8 @@ dependencies = [
"hex-literal",
"hkdf",
"hmac",
+ "proptest",
+ "rand",
"rand_core",
"sha2",
"static_assertions",
@@ -4055,7 +4084,7 @@ checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -4135,6 +4164,12 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
[[package]]
name = "strum"
version = "0.26.3"
@@ -4150,11 +4185,11 @@ version = "0.26.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
dependencies = [
- "heck 0.5.0",
+ "heck",
"proc-macro2",
"quote",
"rustversion",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -4176,9 +4211,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.72"
+version = "2.0.77"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
dependencies = [
"proc-macro2",
"quote",
@@ -4193,19 +4228,20 @@ checksum = "b5dc35bb08dd1ca3dfb09dce91fd2d13294d6711c88897d9a9d60acf39bce049"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
name = "tempfile"
-version = "3.10.1"
+version = "3.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
dependencies = [
"cfg-if",
"fastrand",
+ "once_cell",
"rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -4232,7 +4268,7 @@ dependencies = [
"cfg-if",
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -4243,7 +4279,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
"test-case-core",
]
@@ -4266,7 +4302,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -4295,7 +4331,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -4380,9 +4416,9 @@ dependencies = [
[[package]]
name = "tokio"
-version = "1.39.1"
+version = "1.40.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a"
+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
dependencies = [
"backtrace",
"bytes",
@@ -4413,7 +4449,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -4441,9 +4477,9 @@ dependencies = [
[[package]]
name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
dependencies = [
"futures-core",
"pin-project-lite",
@@ -4476,9 +4512,9 @@ dependencies = [
[[package]]
name = "tokio-util"
-version = "0.7.11"
+version = "0.7.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
dependencies = [
"bytes",
"futures-core",
@@ -4489,26 +4525,26 @@ dependencies = [
[[package]]
name = "toml_datetime"
-version = "0.6.6"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
[[package]]
name = "toml_edit"
-version = "0.21.1"
+version = "0.22.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
dependencies = [
- "indexmap 2.2.6",
+ "indexmap",
"toml_datetime",
"winnow",
]
[[package]]
name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
[[package]]
name = "tracing"
@@ -4530,7 +4566,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -4650,9 +4686,9 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
[[package]]
name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
[[package]]
name = "unicode-normalization"
@@ -4744,9 +4780,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
[[package]]
name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]]
name = "wait-timeout"
@@ -4815,34 +4851,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
dependencies = [
"cfg-if",
+ "once_cell",
"wasm-bindgen-macro",
]
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -4850,28 +4887,28 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
[[package]]
name = "web-sys"
-version = "0.3.69"
+version = "0.3.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -4879,9 +4916,9 @@ dependencies = [
[[package]]
name = "webpki-roots"
-version = "0.26.3"
+version = "0.26.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd"
+checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
dependencies = [
"rustls-pki-types",
]
@@ -4935,11 +4972,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-util"
-version = "0.1.8"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -4984,6 +5021,15 @@ dependencies = [
"windows-targets 0.52.6",
]
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
[[package]]
name = "windows-targets"
version = "0.42.2"
@@ -5164,9 +5210,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winnow"
-version = "0.5.40"
+version = "0.6.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
dependencies = [
"memchr",
]
@@ -5216,7 +5262,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -5236,7 +5282,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.77",
]
[[package]]
@@ -5266,7 +5312,7 @@ name = "zkgroup"
version = "0.9.0"
dependencies = [
"aes-gcm-siv",
- "base64 0.21.7",
+ "base64 0.22.1",
"bincode",
"criterion",
"curve25519-dalek",
diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix
index bee05e01bfb5..067c207a9311 100644
--- a/pkgs/by-name/li/libsignal-ffi/package.nix
+++ b/pkgs/by-name/li/libsignal-ffi/package.nix
@@ -22,14 +22,14 @@ rustPlatform.buildRustPackage rec {
pname = "libsignal-ffi";
# must match the version used in mautrix-signal
# see https://github.com/mautrix/signal/issues/401
- version = "0.57.1";
+ version = "0.58.3";
src = fetchFromGitHub {
fetchSubmodules = true;
owner = "signalapp";
repo = "libsignal";
rev = "v${version}";
- hash = "sha256-13XhblN82lbIdv9RVjrabQfCgW1hEG1B6pp3/nQcVgY=";
+ hash = "sha256-21NOPLhI7xh2A8idLxWXiZLV5l8+vfHF8/DilgWTXi4=";
};
buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
diff --git a/pkgs/by-name/li/lime3ds/package.nix b/pkgs/by-name/li/lime3ds/package.nix
index 8dae667a6b54..a9a0a4c9b794 100644
--- a/pkgs/by-name/li/lime3ds/package.nix
+++ b/pkgs/by-name/li/lime3ds/package.nix
@@ -1,45 +1,60 @@
-{ alsa-lib
-, boost
-, catch2_3
-, cmake
-, cryptopp
-, cpp-jwt
-, doxygen
-, enet
-, fetchzip
-, fmt
-, ffmpeg-headless
-, gamemode
-, httplib
-, inih
-, lib
-, libGL
-, libjack2
-, libpulseaudio
-, libunwind
-, libusb1
-, nlohmann_json
-, openal
-, openssl
-, pipewire
-, pkg-config
-, portaudio
-, sndio
-, spirv-tools
-, soundtouch
-, stdenv
-, vulkan-headers
-, vulkan-loader
-, xorg
-, zstd
-, enableSdl2Frontend ? true , SDL2
-, enableQt ? true , kdePackages
-, enableQtTranslations ? enableQt
-, enableCubeb ? true , cubeb
-, useDiscordRichPresence ? false , rapidjson
-}: let
- inherit (lib) optional optionals cmakeBool optionalString getLib makeLibraryPath;
-in stdenv.mkDerivation (finalAttrs: {
+{
+ alsa-lib,
+ boost,
+ catch2_3,
+ cmake,
+ cryptopp,
+ cpp-jwt,
+ doxygen,
+ enet,
+ fetchpatch,
+ fetchzip,
+ fmt,
+ ffmpeg_6-headless,
+ gamemode,
+ httplib,
+ inih,
+ lib,
+ libGL,
+ libjack2,
+ libpulseaudio,
+ libunwind,
+ libusb1,
+ nlohmann_json,
+ openal,
+ openssl,
+ pipewire,
+ pkg-config,
+ portaudio,
+ sndio,
+ spirv-tools,
+ soundtouch,
+ stdenv,
+ vulkan-headers,
+ vulkan-loader,
+ xorg,
+ zstd,
+ enableSdl2Frontend ? true,
+ SDL2,
+ enableQt ? true,
+ kdePackages,
+ enableQtTranslations ? enableQt,
+ enableCubeb ? true,
+ cubeb,
+ useDiscordRichPresence ? false,
+ rapidjson,
+}:
+let
+ inherit (lib)
+ optional
+ optionals
+ cmakeBool
+ optionalString
+ getLib
+ makeLibraryPath
+ ;
+in
+stdenv.mkDerivation (finalAttrs: {
pname = "lime3ds";
version = "2118.2";
@@ -52,45 +67,59 @@ in stdenv.mkDerivation (finalAttrs: {
cmake
doxygen
pkg-config
- ] ++ lib.optionals enableQt [kdePackages.wrapQtAppsHook];
+ ] ++ lib.optionals enableQt [ kdePackages.wrapQtAppsHook ];
- buildInputs = [
- alsa-lib
- boost
- catch2_3
- cryptopp
- cpp-jwt
- enet
- fmt
- ffmpeg-headless
- httplib
- inih
- libGL
- libjack2
- libpulseaudio
- libunwind
- libusb1
- nlohmann_json
- openal
- openssl
- pipewire
- portaudio
- SDL2
- soundtouch
- sndio
- spirv-tools
- vulkan-headers
- xorg.libX11
- xorg.libXext
- zstd
- ] ++ optionals enableQt (with kdePackages; [
- qtbase
- qtmultimedia
- qttools
- qtwayland
- ]) ++ optionals enableQtTranslations [kdePackages.qttools]
- ++ optionals enableCubeb [cubeb]
- ++ optional useDiscordRichPresence rapidjson;
+ buildInputs =
+ [
+ alsa-lib
+ boost
+ catch2_3
+ cryptopp
+ cpp-jwt
+ enet
+ fmt
+ ffmpeg_6-headless
+ httplib
+ inih
+ libGL
+ libjack2
+ libpulseaudio
+ libunwind
+ libusb1
+ nlohmann_json
+ openal
+ openssl
+ pipewire
+ portaudio
+ SDL2
+ soundtouch
+ sndio
+ spirv-tools
+ vulkan-headers
+ xorg.libX11
+ xorg.libXext
+ zstd
+ ]
+ ++ optionals enableQt (
+ with kdePackages;
+ [
+ qtbase
+ qtmultimedia
+ qttools
+ qtwayland
+ ]
+ )
+ ++ optionals enableQtTranslations [ kdePackages.qttools ]
+ ++ optionals enableCubeb [ cubeb ]
+ ++ optional useDiscordRichPresence rapidjson;
+
+ patches = [
+ # FIXME: this patch fixes the build with newer QT versions, remove it when the new version gets released
+ (fetchpatch {
+ url = "https://patch-diff.githubusercontent.com/raw/Lime3DS/Lime3DS/pull/441.patch";
+ hash = "sha256-NKJ3fmh5kY/DaTCVbIz1dvJrvK5IbJt1eogrbXWciCI=";
+ })
+ ];
postPatch = ''
# Fix file not found when looking in var/empty instead of opt
@@ -106,35 +135,40 @@ in stdenv.mkDerivation (finalAttrs: {
--replace-fail "libgamemode.so.0" "${getLib gamemode}/lib/libgamemode.so.0"
'';
- postInstall = let
- libs = makeLibraryPath [ vulkan-loader ];
- in optionalString enableSdl2Frontend ''
- for binfile in lime3ds lime3ds-room
- do
- wrapProgram "$out/bin/$binfile" \
- --prefix LD_LIBRARY_PATH : ${libs}
- '' + optionalString enableQt ''
- qtWrapperArgs+=(
- --prefix LD_LIBRARY_PATH : ${libs}
- )
- done
- '';
+ postInstall =
+ let
+ libs = makeLibraryPath [ vulkan-loader ];
+ in
+ optionalString enableSdl2Frontend ''
+ for binfile in lime3ds lime3ds-room
+ do
+ wrapProgram "$out/bin/$binfile" \
+ --prefix LD_LIBRARY_PATH : ${libs}
+ ''
+ + optionalString enableQt ''
+ qtWrapperArgs+=(
+ --prefix LD_LIBRARY_PATH : ${libs}
+ )
+ done
+ '';
- cmakeFlags = [
- (cmakeBool "LIME3DS_USE_PRECOMPILED_HEADERS" false)
- (cmakeBool "USE_SYSTEM_LIBS" true)
- (cmakeBool "DISABLE_SYSTEM_DYNARMIC" true)
- (cmakeBool "DISABLE_SYSTEM_GLSLANG" true)
- (cmakeBool "DISABLE_SYSTEM_LODEPNG" true)
- (cmakeBool "DISABLE_SYSTEM_VMA" true)
- (cmakeBool "DISABLE_SYSTEM_XBYAK" true)
- (cmakeBool "ENABLE_QT" enableQt)
- (cmakeBool "ENABLE_SDL2_FRONTEND" enableSdl2Frontend)
- (cmakeBool "ENABLE_CUBEB" enableCubeb)
- (cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence)
- ] ++ optionals enableQt [
- (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations)
- ];
+ cmakeFlags =
+ [
+ (cmakeBool "LIME3DS_USE_PRECOMPILED_HEADERS" false)
+ (cmakeBool "USE_SYSTEM_LIBS" true)
+ (cmakeBool "DISABLE_SYSTEM_DYNARMIC" true)
+ (cmakeBool "DISABLE_SYSTEM_GLSLANG" true)
+ (cmakeBool "DISABLE_SYSTEM_LODEPNG" true)
+ (cmakeBool "DISABLE_SYSTEM_VMA" true)
+ (cmakeBool "DISABLE_SYSTEM_XBYAK" true)
+ (cmakeBool "ENABLE_QT" enableQt)
+ (cmakeBool "ENABLE_SDL2_FRONTEND" enableSdl2Frontend)
+ (cmakeBool "ENABLE_CUBEB" enableCubeb)
+ (cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence)
+ ]
+ ++ optionals enableQt [
+ (cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations)
+ ];
meta = {
description = "A Nintendo 3DS emulator based on Citra";
diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix
index 31b4f2f65601..a477069c6e34 100644
--- a/pkgs/by-name/li/livekit/package.nix
+++ b/pkgs/by-name/li/livekit/package.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "livekit";
- version = "1.7.2";
+ version = "1.8.0";
src = fetchFromGitHub {
owner = "livekit";
repo = "livekit";
rev = "v${version}";
- hash = "sha256-z3xXvs31SMEq0Wfhm/v+7iznCsz/kNqwhQsMueQmEhw=";
+ hash = "sha256-KfUhpA5bhomPU5OC4aCQ5WQIC4ICkaLxQO0tunpkIPI=";
};
- vendorHash = "sha256-aVKCDDlCkFlFa88H1UAR98Hai5junVWVxVZPK5i+nM8=";
+ vendorHash = "sha256-z5h/r2xC/nEeHk2PLIN+oaGHa8l/xjws79OaDZh9jqE=";
subPackages = [ "cmd/server" ];
diff --git a/pkgs/by-name/lo/localsend/package.nix b/pkgs/by-name/lo/localsend/package.nix
index 2c282b62b632..d84aee26984e 100644
--- a/pkgs/by-name/lo/localsend/package.nix
+++ b/pkgs/by-name/lo/localsend/package.nix
@@ -19,13 +19,13 @@ let
linux = flutter324.buildFlutterApplication rec {
inherit pname;
- version = "1.15.4-unstable-2024-09-25";
+ version = "1.15.4-unstable-2024-10-26";
src = fetchFromGitHub {
owner = pname;
repo = pname;
- rev = "61f3ffdb8dd8b1116ced2e7b585f2f6662ce7d5f";
- hash = "sha256-s7cR5ty8bygOCzHbLwNTBNlhlQ+2y25/ijlNqWYrqVw=";
+ rev = "d0e864ddf6ebe1c55188b33f8fdccd534d203c75";
+ hash = "sha256-qaW9LoRQge4K/CAQwbjNxmlUkQmxvaZyBJdAjXbbTw4=";
};
sourceRoot = "${src.name}/app";
@@ -33,7 +33,8 @@ let
pubspecLock = lib.importJSON ./pubspec.lock.json;
gitHashes = {
- "permission_handler_windows" = "sha256-+TP3neqlQRZnW6BxHaXr2EbmdITIx1Yo7AEn5iwAhwM=";
+ permission_handler_windows = "sha256-+TP3neqlQRZnW6BxHaXr2EbmdITIx1Yo7AEn5iwAhwM=";
+ pasteboard = "sha256-lJA5OWoAHfxORqWMglKzhsL1IFr9YcdAQP/NVOLYB4o=";
};
nativeBuildInputs = [
@@ -43,16 +44,11 @@ let
buildInputs = [ libayatana-appindicator ];
- postUnpack = ''
- substituteInPlace $sourceRoot/linux/my_application.cc \
- --replace-fail "gtk_widget_realize(GTK_WIDGET(window))" "gtk_widget_show(GTK_WIDGET(window))"
- '';
-
postInstall = ''
for s in 32 128 256 512; do
d=$out/share/icons/hicolor/''${s}x''${s}/apps
mkdir -p $d
- ln -s $out/app/data/flutter_assets/assets/img/logo-''${s}.png $d/localsend.png
+ cp ./assets/img/logo-''${s}.png $d/localsend.png
done
'';
diff --git a/pkgs/by-name/lo/localsend/pubspec.lock.json b/pkgs/by-name/lo/localsend/pubspec.lock.json
index 4cc7a7fd5bc4..4d8c28b858cc 100644
--- a/pkgs/by-name/lo/localsend/pubspec.lock.json
+++ b/pkgs/by-name/lo/localsend/pubspec.lock.json
@@ -56,16 +56,6 @@
"source": "hosted",
"version": "2.0.3"
},
- "app_group_directory": {
- "dependency": "direct main",
- "description": {
- "name": "app_group_directory",
- "sha256": "ad89800fd55133b46e1f6940ac6b974562f7fb6394c662c0f4422b90167f2416",
- "url": "https://pub.dev"
- },
- "source": "hosted",
- "version": "2.0.0"
- },
"archive": {
"dependency": "transitive",
"description": {
@@ -469,11 +459,11 @@
"dependency": "transitive",
"description": {
"name": "extended_image",
- "sha256": "8ad4917eaae7271ce6d975d5c0040c7903010262908fbdb49ff2798fca754d3b",
+ "sha256": "69d4299043334ecece679996e47d0b0891cd8c29d8da0034868443506f1d9a78",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "8.3.0"
+ "version": "8.3.1"
},
"extended_image_library": {
"dependency": "transitive",
@@ -539,41 +529,41 @@
"dependency": "transitive",
"description": {
"name": "file_selector_android",
- "sha256": "b8c9717a0177ca6fa035554b82cd6c83b838ddc66b7704eb6df0f77f027ecc90",
+ "sha256": "00aafa9ae05a8663d0b4f17abd2a02316911ca0f46f9b9dacb9578b324d99590",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.5.1+7"
+ "version": "0.5.1+9"
},
"file_selector_ios": {
"dependency": "transitive",
"description": {
"name": "file_selector_ios",
- "sha256": "38ebf91ecbcfa89a9639a0854ccaed8ab370c75678938eebca7d34184296f0bb",
+ "sha256": "94b98ad950b8d40d96fee8fa88640c2e4bd8afcdd4817993bd04e20310f45420",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.5.3"
+ "version": "0.5.3+1"
},
"file_selector_linux": {
"dependency": "transitive",
"description": {
"name": "file_selector_linux",
- "sha256": "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492",
+ "sha256": "712ce7fab537ba532c8febdb1a8f167b32441e74acd68c3ccb2e36dcb52c4ab2",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.9.2+1"
+ "version": "0.9.3"
},
"file_selector_macos": {
"dependency": "transitive",
"description": {
"name": "file_selector_macos",
- "sha256": "cb284e267f8e2a45a904b5c094d2ba51d0aabfc20b1538ab786d9ef7dc2bf75c",
+ "sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.9.4+1"
+ "version": "0.9.4+2"
},
"file_selector_platform_interface": {
"dependency": "transitive",
@@ -599,11 +589,11 @@
"dependency": "transitive",
"description": {
"name": "file_selector_windows",
- "sha256": "2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69",
+ "sha256": "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.9.3+2"
+ "version": "0.9.3+3"
},
"fixnum": {
"dependency": "transitive",
@@ -681,11 +671,11 @@
"dependency": "transitive",
"description": {
"name": "flutter_plugin_android_lifecycle",
- "sha256": "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda",
+ "sha256": "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.0.22"
+ "version": "2.0.23"
},
"flutter_test": {
"dependency": "transitive",
@@ -843,11 +833,11 @@
"dependency": "transitive",
"description": {
"name": "image_picker_android",
- "sha256": "c0a6763d50b354793d0192afd0a12560b823147d3ded7c6b77daf658fa05cc85",
+ "sha256": "d3e5e00fdfeca8fd4ffb3227001264d449cc8950414c2ff70b0e06b9c628e643",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.8.12+13"
+ "version": "0.8.12+15"
},
"image_picker_for_web": {
"dependency": "transitive",
@@ -913,11 +903,11 @@
"dependency": "transitive",
"description": {
"name": "image_size_getter",
- "sha256": "f98c4246144e9b968899d2dfde69091e22a539bb64bc9b0bea51505fbb490e57",
+ "sha256": "0511799498340b70993d2dfb34b55a2247b5b801d75a6cdd4543acfcafdb12b0",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.1.3"
+ "version": "2.2.0"
},
"in_app_purchase": {
"dependency": "direct main",
@@ -933,11 +923,11 @@
"dependency": "transitive",
"description": {
"name": "in_app_purchase_android",
- "sha256": "25eb8694819caca282a527c26d5a1775164965c554ee99b9c10f3a0e44675c75",
+ "sha256": "bee60266e443d4ae0e4809bae7f9cd4d6be75ab5ec6bb3d2ca737774a274a3bd",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "0.3.6+8"
+ "version": "0.3.6+9"
},
"in_app_purchase_platform_interface": {
"dependency": "transitive",
@@ -1252,11 +1242,12 @@
"pasteboard": {
"dependency": "direct main",
"description": {
- "name": "pasteboard",
- "sha256": "7bf733f3a00c7188ec1f2c6f0612854248b302cf91ef3611a2b7bb141c0f9d55",
- "url": "https://pub.dev"
+ "path": "packages/pasteboard",
+ "ref": "58748dae405df5e68a131e4905d48e75d0624be2",
+ "resolved-ref": "58748dae405df5e68a131e4905d48e75d0624be2",
+ "url": "https://github.com/Seidko/flutter-plugins.git"
},
- "source": "hosted",
+ "source": "git",
"version": "0.3.0"
},
"path": {
@@ -1293,14 +1284,14 @@
"dependency": "transitive",
"description": {
"name": "path_provider_android",
- "sha256": "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7",
+ "sha256": "c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.2.10"
+ "version": "2.2.12"
},
"path_provider_foundation": {
- "dependency": "transitive",
+ "dependency": "direct main",
"description": {
"name": "path_provider_foundation",
"sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16",
@@ -1414,11 +1405,11 @@
"dependency": "transitive",
"description": {
"name": "photo_manager",
- "sha256": "2b5c0d02014b64b971e57aa840ae7d7ffd81b0482a082579eb17ff83e5dc408e",
+ "sha256": "32a1ce1095aeaaa792a29f28c1f74613aa75109f21c2d4ab85be3ad9964230a4",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "3.4.0"
+ "version": "3.5.0"
},
"photo_manager_image_provider": {
"dependency": "transitive",
@@ -1654,21 +1645,21 @@
"dependency": "transitive",
"description": {
"name": "shared_preferences_android",
- "sha256": "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e",
+ "sha256": "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.3.2"
+ "version": "2.3.3"
},
"shared_preferences_foundation": {
"dependency": "transitive",
"description": {
"name": "shared_preferences_foundation",
- "sha256": "c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f",
+ "sha256": "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.5.2"
+ "version": "2.5.3"
},
"shared_preferences_linux": {
"dependency": "transitive",
@@ -2030,11 +2021,11 @@
"dependency": "transitive",
"description": {
"name": "url_launcher_android",
- "sha256": "e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab",
+ "sha256": "8fc3bae0b68c02c47c5c86fa8bfa74471d42687b0eded01b78de87872db745e2",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "6.3.10"
+ "version": "6.3.12"
},
"url_launcher_ios": {
"dependency": "transitive",
@@ -2140,41 +2131,41 @@
"dependency": "transitive",
"description": {
"name": "video_player",
- "sha256": "e30df0d226c4ef82e2c150ebf6834b3522cf3f654d8e2f9419d376cdc071425d",
+ "sha256": "4a8c3492d734f7c39c2588a3206707a05ee80cef52e8c7f3b2078d430c84bc17",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.9.1"
+ "version": "2.9.2"
},
"video_player_android": {
"dependency": "transitive",
"description": {
"name": "video_player_android",
- "sha256": "38d8fe136c427abdce68b5e8c3c08ea29d7a794b453c7a51b12ecfad4aad9437",
+ "sha256": "ae5287ca367e206eb74d7b3dc1ce0b8912ab9a3fc0597b6a101a0a5239f229d3",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.7.3"
+ "version": "2.7.9"
},
"video_player_avfoundation": {
"dependency": "transitive",
"description": {
"name": "video_player_avfoundation",
- "sha256": "d1e9a824f2b324000dc8fb2dcb2a3285b6c1c7c487521c63306cc5b394f68a7c",
+ "sha256": "cd5ab8a8bc0eab65ab0cea40304097edc46da574c8c1ecdee96f28cd8ef3792f",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "2.6.1"
+ "version": "2.6.2"
},
"video_player_platform_interface": {
"dependency": "transitive",
"description": {
"name": "video_player_platform_interface",
- "sha256": "236454725fafcacf98f0f39af0d7c7ab2ce84762e3b63f2cbb3ef9a7e0550bc6",
+ "sha256": "229d7642ccd9f3dc4aba169609dd6b5f3f443bb4cc15b82f7785fcada5af9bbb",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "6.2.2"
+ "version": "6.2.3"
},
"video_player_web": {
"dependency": "transitive",
@@ -2290,11 +2281,11 @@
"dependency": "transitive",
"description": {
"name": "win32",
- "sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a",
+ "sha256": "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "5.5.4"
+ "version": "5.5.5"
},
"win32_registry": {
"dependency": "direct main",
@@ -2330,11 +2321,11 @@
"dependency": "transitive",
"description": {
"name": "xdg_directories",
- "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d",
+ "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "1.0.4"
+ "version": "1.1.0"
},
"xml": {
"dependency": "transitive",
diff --git a/pkgs/by-name/lo/lora/package.nix b/pkgs/by-name/lo/lora/package.nix
new file mode 100644
index 000000000000..a062c11e04d0
--- /dev/null
+++ b/pkgs/by-name/lo/lora/package.nix
@@ -0,0 +1,40 @@
+{
+ lib,
+ stdenvNoCC,
+ fetchFromGitHub,
+ nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation rec {
+ pname = "lora";
+ version = "v3.005";
+
+ src = fetchFromGitHub {
+ owner = "cyrealtype";
+ repo = "lora";
+ rev = version;
+ hash = "sha256-EHa8DUPFRvdYBdCY41gfjKGtTHwGIXCwD9Qc+Npmt1s=";
+ };
+
+ dontConfigure = true;
+ dontBuild = true;
+
+ passthru.updateScript = nix-update-script { };
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/share/fonts/truetype
+ cp -R $src/fonts/ttf/*.ttf $out/share/fonts/truetype
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Lora is a well-balanced contemporary serif with roots in calligraphy";
+ homepage = "https://github.com/cyrealtype/lora";
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ ofalvai ];
+ };
+}
diff --git a/pkgs/by-name/lr/lrcget/package.nix b/pkgs/by-name/lr/lrcget/package.nix
index 8ec4bfc21e21..8b293a59ddc5 100644
--- a/pkgs/by-name/lr/lrcget/package.nix
+++ b/pkgs/by-name/lr/lrcget/package.nix
@@ -17,18 +17,18 @@
}:
rustPlatform.buildRustPackage rec {
pname = "lrcget";
- version = "0.4.0";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "tranxuanthang";
repo = "lrcget";
rev = "${version}";
- hash = "sha256-OrmSaRKhGCl5sTirzICx8PBsQm23pYUBBtb07+P1ZbY=";
+ hash = "sha256-phsiVscbgQwMVWwVizb1n/6OlftQYWvkJ5+As5ITFrQ=";
};
sourceRoot = "${src.name}/src-tauri";
- cargoHash = "sha256-V9+/sfCxeZJ39nOuMBv2YlkzewoS+N3kFyBGdIqkw/A=";
+ cargoHash = "sha256-mHti3KLjKe25qPLFf0ofzcM2wU4nvhiusIC4bpUdtiY=";
frontend = buildNpmPackage {
inherit version src;
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
# To fix `npm ERR! Your cache folder contains root-owned files`
makeCacheWritable = true;
- npmDepsHash = "sha256-qQ5UMO3UuD6IvUveTRF35qTlGq5PMbxp1Q4UroDqVtk=";
+ npmDepsHash = "sha256-vjDj3b7GVZvM9ioVBp5JpRbWUa33EK6qFTDVgCZkGRA=";
postBuild = ''
cp -r dist/ $out
diff --git a/pkgs/by-name/lu/luminous-ttv/package.nix b/pkgs/by-name/lu/luminous-ttv/package.nix
new file mode 100644
index 000000000000..0dd3d97c0aba
--- /dev/null
+++ b/pkgs/by-name/lu/luminous-ttv/package.nix
@@ -0,0 +1,32 @@
+{
+ lib,
+ fetchFromGitHub,
+ rustPlatform,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "luminous-ttv";
+ version = "0.5.7";
+
+ src = fetchFromGitHub {
+ owner = "AlyoshaVasilieva";
+ repo = "luminous-ttv";
+ rev = "v${version}";
+ hash = "sha256-uaq5uiSp4lci27BxtqjdtUeiJvXhWo25lfFE+dQys6Y=";
+ };
+
+ cargoHash = "sha256-jbtHxarRQ8gpCBc/HZWSnkzMrlMMltpknUBV1SGVq/I=";
+
+ meta = {
+ description = "Rust server to retrieve and relay a playlist for Twitch livestreams/VODs";
+ homepage = "https://github.com/AlyoshaVasilieva/luminous-ttv";
+ downloadPage = "https://github.com/AlyoshaVasilieva/luminous-ttv/releases/latest";
+ changelog = "https://github.com/AlyoshaVasilieva/luminous-ttv/releases/tag/v${version}";
+ license = with lib.licenses; [
+ gpl3Only
+ mit
+ ];
+ mainProgram = "luminous-ttv";
+ maintainers = with lib.maintainers; [ alex ];
+ };
+}
diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix
index 0b5a93a1f52b..9e41b311d5e1 100644
--- a/pkgs/by-name/lu/lunar-client/package.nix
+++ b/pkgs/by-name/lu/lunar-client/package.nix
@@ -6,11 +6,11 @@
appimageTools.wrapType2 rec {
pname = "lunarclient";
- version = "3.2.19";
+ version = "3.2.24";
src = fetchurl {
url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage";
- hash = "sha512-OLXp355IxMmhLtsxNVj0/ykl2lGJtwu1Ti3TOJZ1dwTsx/Y+tdeFT+WeDAju9fMC2AssciUnAeqqdp76sHxUgw==";
+ hash = "sha512-0rTADFgOOBDuv4nk2lgP4YUFxfsasZDQkp/r26iVwSa5f1swQXALGFwLl1VdJTRQ5AlZvRm6WBbt/ML2jODTZw==";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/lx/lxgw-wenkai/package.nix b/pkgs/by-name/lx/lxgw-wenkai/package.nix
index 38fea5286a1d..adf23d18e9c6 100644
--- a/pkgs/by-name/lx/lxgw-wenkai/package.nix
+++ b/pkgs/by-name/lx/lxgw-wenkai/package.nix
@@ -6,11 +6,11 @@
stdenvNoCC.mkDerivation rec {
pname = "lxgw-wenkai";
- version = "1.500";
+ version = "1.501";
src = fetchurl {
url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/${pname}-v${version}.tar.gz";
- hash = "sha256-5cQSHrL/kllmsrOSEHDhsiIa3PXpDh5ELrCnVh/9pxI=";
+ hash = "sha256-7BBg6TGJzTVgBHPyzTYGFjXmidvAzOVCWAU11LylmBI=";
};
installPhase = ''
diff --git a/pkgs/by-name/ma/markdown-oxide/Cargo.lock b/pkgs/by-name/ma/markdown-oxide/Cargo.lock
index 8ebe7f14ce2b..999bf6c513eb 100644
--- a/pkgs/by-name/ma/markdown-oxide/Cargo.lock
+++ b/pkgs/by-name/ma/markdown-oxide/Cargo.lock
@@ -642,7 +642,7 @@ dependencies = [
[[package]]
name = "markdown-oxide"
-version = "0.23.1"
+version = "0.24.0"
dependencies = [
"anyhow",
"chrono",
diff --git a/pkgs/by-name/ma/markdown-oxide/package.nix b/pkgs/by-name/ma/markdown-oxide/package.nix
index 481dc7f402dc..0da83f316e71 100644
--- a/pkgs/by-name/ma/markdown-oxide/package.nix
+++ b/pkgs/by-name/ma/markdown-oxide/package.nix
@@ -3,16 +3,15 @@
rustPlatform,
fetchFromGitHub,
}:
-
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage rec {
pname = "markdown-oxide";
- version = "0.23.1-unstable-2024-07-20";
+ version = "0.24.2";
src = fetchFromGitHub {
owner = "Feel-ix-343";
repo = "markdown-oxide";
- rev = "0f1542a54a44de8313087f6c60e6ecd54f52ede5";
- hash = "sha256-zxJZnhN2cN3sNd+PHi2jYuHDDA4ekEVIi3X52Z/8TGM=";
+ rev = "v${version}";
+ hash = "sha256-LMDL2jLHKgPBkz7QcU4yVzR2ySaboCZ9AOKmdA/NA4c=";
};
cargoLock = {
diff --git a/pkgs/by-name/ma/marwaita-orange/package.nix b/pkgs/by-name/ma/marwaita-orange/package.nix
index 16de4362c4fd..e12c9f501076 100644
--- a/pkgs/by-name/ma/marwaita-orange/package.nix
+++ b/pkgs/by-name/ma/marwaita-orange/package.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "marwaita-orange";
- version = "21";
+ version = "22";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
- hash = "sha256-LJvlbvbgNH5nnfDAG8BpOBrO2W6VyDeH2yDcjRamUQI=";
+ hash = "sha256-hp+5UIr3uXuUay3K6HsaGs+Wh9VFx1yVNb3d0Jw2M34=";
};
buildInputs = [
diff --git a/pkgs/by-name/ma/matrix-gtk-theme/package.nix b/pkgs/by-name/ma/matrix-gtk-theme/package.nix
index 5477ad89d604..62f290fa70d1 100644
--- a/pkgs/by-name/ma/matrix-gtk-theme/package.nix
+++ b/pkgs/by-name/ma/matrix-gtk-theme/package.nix
@@ -70,13 +70,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
stdenvNoCC.mkDerivation
{
inherit pname;
- version = "0-unstable-2024-07-22";
+ version = "0-unstable-2024-10-29";
src = fetchFromGitHub {
owner = "D3vil0p3r";
repo = "Matrix-GTK-Theme";
- rev = "f453093dffa0f46596b325c6a760afd6ea6cd810";
- hash = "sha256-DfM4nsJZvcNyUUn0opu3OM46sxhsjeeyuUuliQPrU0I=";
+ rev = "15a799b6e2bd7f3ad89eaffa7d26beebf09b9e68";
+ hash = "sha256-gyKHOS3hEppOvc10u8T5wGWlVrFSC29MofMHjEcf8i4=";
};
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix
index d1d1a278ffdc..04c53fd8a1e9 100644
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -12,13 +12,13 @@ buildGoModule rec {
# See https://docs.mattermost.com/upgrade/extended-support-release.html
# When a new ESR version is available (e.g. 8.1.x -> 9.5.x), update
# the version regex in passthru.updateScript as well.
- version = "9.5.11";
+ version = "9.11.3";
src = fetchFromGitHub {
owner = "mattermost";
repo = "mattermost";
rev = "v${version}";
- hash = "sha256-kPsBQjBMHxh5EGTFPNceE51nSEKSu6ieifIAV8PjpAc=";
+ hash = "sha256-CuFkydl1ZZUAWmrDIV1Jp9S6jIKYmglAe5XW2lTRgtQ=";
};
# Needed because buildGoModule does not support go workspaces yet.
@@ -34,14 +34,14 @@ buildGoModule rec {
webapp = fetchurl {
url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
- hash = "sha256-dRB0CqUoEIkCDlH/vcn/S1TLlhz9iWp61WM2kk+ToZk=";
+ hash = "sha256-4JzhL2+G3T98pNFgKugs/eoSrbm7QSk5grVlprrIKEI=";
};
# Makes nix-update-script pick up the fetchurl for the webapp.
# https://github.com/Mic92/nix-update/blob/1.3.1/nix_update/eval.py#L179
offlineCache = webapp;
- vendorHash = "sha256-3IiW5ZAMX0bbN65iFgD2CH3BmXd1Uv2HgcCqY8VQgrA=";
+ vendorHash = "sha256-Gwv6clnq7ihoFC8ox8iEM5xp/us9jWUrcmqA9/XbxBE=";
modRoot = "./server";
preBuild = ''
@@ -73,7 +73,7 @@ buildGoModule rec {
passthru = {
updateScript = nix-update-script {
- extraArgs = [ "--version-regex" "^v(9\.5\.[0-9]+)$" ];
+ extraArgs = [ "--version-regex" "^v(9\.11\.[0-9]+)$" ];
};
tests.mattermost = nixosTests.mattermost;
};
diff --git a/pkgs/by-name/mi/microcode-intel/package.nix b/pkgs/by-name/mi/microcode-intel/package.nix
index 26916216f437..8758051500df 100644
--- a/pkgs/by-name/mi/microcode-intel/package.nix
+++ b/pkgs/by-name/mi/microcode-intel/package.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "microcode-intel";
- version = "20240910";
+ version = "20241029";
src = fetchFromGitHub {
owner = "intel";
repo = "Intel-Linux-Processor-Microcode-Data-Files";
rev = "microcode-${version}";
- hash = "sha256-cn0qK81dwbamh5PBlPuC9KtDWyT2NwSxDD0XlCRAv6s=";
+ hash = "sha256-iS7OSWjAYBRHP7X1C+DiMwX2xudA6tXX6cEv/IcICxc=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/mi/min/lock.json b/pkgs/by-name/mi/min/lock.json
index 262bfee0d538..c207506bc299 100644
--- a/pkgs/by-name/mi/min/lock.json
+++ b/pkgs/by-name/mi/min/lock.json
@@ -2,51 +2,51 @@
"depends": [
{
"method": "fetchzip",
+ "path": "/nix/store/6aph9sfwcws7pd2725fwjnibdfrv7qmw-source",
+ "rev": "f8f6bd34bfa3fe12c64b919059ad856a96efcba0",
+ "sha256": "11m1rb6rzk70kvskppf97ddzgf5fnh9crjziqc6hib0jgsm5d615",
+ "url": "https://github.com/nim-lang/checksums/archive/f8f6bd34bfa3fe12c64b919059ad856a96efcba0.tar.gz",
+ "ref": "v0.2.1",
"packages": [
"checksums"
],
- "path": "/nix/store/z6799507gzbw46lzbi1i8mwm0nbvrvnx-source",
- "ref": "v0.1.0",
- "rev": "7ff0b762332d2591bbeb65df9bb86d52ea44ec01",
- "sha256": "11612prr2wwbx414ip0zjh1fv638dgfvzxfd6v2f432n0wfwhjhj",
- "srcDir": "src",
- "url": "https://github.com/nim-lang/checksums/archive/7ff0b762332d2591bbeb65df9bb86d52ea44ec01.tar.gz"
- },
- {
- "method": "fetchzip",
- "packages": [
- "minline"
- ],
- "path": "/nix/store/rirdlc80sn6pp5vmbw32xaaj56n1zxl8-source",
- "ref": "v0.1.1",
- "rev": "a1f11470316500dceb88d7d6c30979c35aab14ff",
- "sha256": "0wy8svpw0cldh1j6g5af4pxh6d6lac79sngg0i24dplh9pli7wb3",
- "srcDir": ".",
- "url": "https://github.com/h3rald/minline/archive/a1f11470316500dceb88d7d6c30979c35aab14ff.tar.gz"
- },
- {
- "method": "fetchzip",
- "packages": [
- "nimquery"
- ],
- "path": "/nix/store/mys0888vyyd12h0qhzg709jk9jb6rmxa-source",
- "ref": "v2.0.1",
- "rev": "83e2866422788a1db1906734de056b410a49d047",
- "sha256": "0g1mcpfx42wnv2sg551gbgfralp7bf9fv83l2inbv2bhb063fx0z",
- "srcDir": "",
- "url": "https://github.com/GULPF/nimquery/archive/83e2866422788a1db1906734de056b410a49d047.tar.gz"
+ "srcDir": "src"
},
{
"method": "fetchzip",
+ "path": "/nix/store/9iz31kiizzg76vpcc5jq53rf0wzjvbh8-source",
+ "rev": "21c8e279e257b0bc2a063b34e2304ea3aade21ec",
+ "sha256": "05g7w61ql9kgrmnpm64y94lkiwj36i551c387gc71lz3dpllcn6q",
+ "url": "https://github.com/guzba/zippy/archive/21c8e279e257b0bc2a063b34e2304ea3aade21ec.tar.gz",
+ "ref": "0.5.14",
"packages": [
"zippy"
],
- "path": "/nix/store/9iz31kiizzg76vpcc5jq53rf0wzjvbh8-source",
- "ref": "0.5.14",
- "rev": "21c8e279e257b0bc2a063b34e2304ea3aade21ec",
- "sha256": "05g7w61ql9kgrmnpm64y94lkiwj36i551c387gc71lz3dpllcn6q",
- "srcDir": "src",
- "url": "https://github.com/guzba/zippy/archive/21c8e279e257b0bc2a063b34e2304ea3aade21ec.tar.gz"
+ "srcDir": "src"
+ },
+ {
+ "method": "fetchzip",
+ "path": "/nix/store/mys0888vyyd12h0qhzg709jk9jb6rmxa-source",
+ "rev": "83e2866422788a1db1906734de056b410a49d047",
+ "sha256": "0g1mcpfx42wnv2sg551gbgfralp7bf9fv83l2inbv2bhb063fx0z",
+ "url": "https://github.com/GULPF/nimquery/archive/83e2866422788a1db1906734de056b410a49d047.tar.gz",
+ "ref": "v2.0.1",
+ "packages": [
+ "nimquery"
+ ],
+ "srcDir": ""
+ },
+ {
+ "method": "fetchzip",
+ "path": "/nix/store/bn7iv51yqbqi0h8z1r9v2vmpqnz46yfr-source",
+ "rev": "c138b34bf3c5198c26ecfad5e251fa5d56e5ad48",
+ "sha256": "0wwfhjhwpmanjv4vv9yl0a0mami9x8qzzb5nialcfp9iasbwiqgj",
+ "url": "https://github.com/h3rald/minline/archive/c138b34bf3c5198c26ecfad5e251fa5d56e5ad48.tar.gz",
+ "ref": "v0.1.2",
+ "packages": [
+ "minline"
+ ],
+ "srcDir": "."
}
]
}
diff --git a/pkgs/by-name/mi/min/package.nix b/pkgs/by-name/mi/min/package.nix
index e39a82248542..9b2bfd34a749 100644
--- a/pkgs/by-name/mi/min/package.nix
+++ b/pkgs/by-name/mi/min/package.nix
@@ -2,13 +2,13 @@
buildNimPackage (finalAttrs: {
pname = "min";
- version = "0.43.0";
+ version = "0.45.0";
src = fetchFromGitHub {
owner = "h3rald";
repo = "min";
rev = "v${finalAttrs.version}";
- hash = "sha256-4coeasFZrbwYQ6FM0ENkh/pPcvN3rCuheUpmHr1f3wM=";
+ hash = "sha256-Uw03aSFn3EV3H2SkYoYzM5S/WLhEmLV8s3mRF3oT8ro=";
};
lockFile = ./lock.json;
@@ -16,15 +16,6 @@ buildNimPackage (finalAttrs: {
buildInputs = [ openssl pcre ];
prePatch = ''
- # substitude our code for their code for data
- substituteInPlace min.nimble \
- --replace-fail 'import' "" \
- --replace-warn 'minpkg/core/meta' "" \
- --replace-warn 'pkgVersion' '"${finalAttrs.version}"' \
- --replace-warn 'pkgAuthor' '""' \
- --replace-warn 'pkgDescription' '""' \
- --replace-warn 'pkgName' '"${finalAttrs.pname}"' \
-
# remove vendorabilities
find . -name '*.a' -delete
find minpkg/lib -name '*.nim' \
diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix
index f88c314b693f..7ebd3575944f 100644
--- a/pkgs/by-name/mi/minijinja/package.nix
+++ b/pkgs/by-name/mi/minijinja/package.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "minijinja";
- version = "2.3.1";
+ version = "2.4.0";
src = fetchFromGitHub {
owner = "mitsuhiko";
repo = "minijinja";
rev = version;
- hash = "sha256-fASPxNSkSQtg05hmSK48AAEd9MpcoFqCt5hkk2vIR2A=";
+ hash = "sha256-8ZAc5ALhpPyFCCsC0f22fSZKRmevFLLFFC0drUuXxg4=";
};
- cargoHash = "sha256-dPNWeuBAWV7ynh9t+DEaR0xb0cAa27Pp44Hm68mWTwI=";
+ cargoHash = "sha256-2aeRb5jNZbpzAgpne494BMr7rkDqZUJEpITtHbdmhxY=";
# The tests relies on the presence of network connection
doCheck = false;
diff --git a/pkgs/tools/misc/mise/default.nix b/pkgs/by-name/mi/mise/package.nix
similarity index 61%
rename from pkgs/tools/misc/mise/default.nix
rename to pkgs/by-name/mi/mise/package.nix
index 6964083e631c..8adb9516b089 100644
--- a/pkgs/tools/misc/mise/default.nix
+++ b/pkgs/by-name/mi/mise/package.nix
@@ -7,9 +7,10 @@
stdenv,
coreutils,
bash,
+ direnv,
+ git,
pkg-config,
openssl,
- direnv,
Security,
SystemConfiguration,
usage,
@@ -19,22 +20,16 @@
rustPlatform.buildRustPackage rec {
pname = "mise";
- version = "2024.9.0";
+ version = "2024.10.8";
src = fetchFromGitHub {
owner = "jdx";
repo = "mise";
rev = "v${version}";
- hash = "sha256-q515JEpws1UnZm1b8zgGxPvudH846XV+Ct4qKN2mNMQ=";
-
- # registry is not needed for compilation nor for tests.
- # contains files with the same name but different case, which cause problems with hash on darwin
- postFetch = ''
- rm -rf $out/registry
- '';
+ hash = "sha256-58y7jx7gmWlccezZXP5hSzrvnq8hlZ1QakF+FMgbwcc=";
};
- cargoHash = "sha256-jGqaGbue+AEK0YjhHMlm84XBgA20p8Um03TjctjXVz0=";
+ cargoHash = "sha256-m2Eiqyh/rGgwRgRArs3fPWoqzi1EidZd5i66yi4SuFo=";
nativeBuildInputs = [
installShellFiles
@@ -52,27 +47,30 @@ rustPlatform.buildRustPackage rec {
./test/data/plugins/**/bin/* \
./src/fake_asdf.rs \
./src/cli/generate/git_pre_commit.rs \
- ./src/cli/generate/snapshots/*.snap \
- ./src/cli/reshim.rs \
- ./test/cwd/.mise/tasks/filetask
+ ./src/cli/generate/snapshots/*.snap
substituteInPlace ./src/test.rs \
- --replace-fail '/usr/bin/env bash' '${bash}/bin/bash'
+ --replace-fail '/usr/bin/env bash' '${lib.getExe bash}' \
+ --replace-fail '"git"' '"${lib.getExe git}"'
+
+ substituteInPlace ./src/git.rs \
+ --replace-fail '"git"' '"${lib.getExe git}"'
substituteInPlace ./src/env_diff.rs \
- --replace-fail '"bash"' '"${bash}/bin/bash"'
+ --replace-fail '"bash"' '"${lib.getExe bash}"'
substituteInPlace ./src/cli/direnv/exec.rs \
- --replace-fail '"env"' '"${coreutils}/bin/env"' \
- --replace-fail 'cmd!("direnv"' 'cmd!("${direnv}/bin/direnv"'
+ --replace-fail '"env"' '"${lib.getExe' coreutils "env"}"' \
+ --replace-fail 'cmd!("direnv"' 'cmd!("${lib.getExe direnv}"'
'';
checkFlags = [
- # Requires .git directory to be present
- "--skip=cli::plugins::ls::tests::test_plugin_list_urls"
- "--skip=cli::generate::git_pre_commit::tests::test_git_pre_commit"
- "--skip=cli::generate::github_action::tests::test_github_action"
+ # last_modified will always be different in nix
+ "--skip=tera::tests::test_last_modified"
+ # requires https://github.com/rbenv/ruby-build
+ "--skip=plugins::core::ruby::tests::test_list_versions_matching"
];
+
cargoTestFlags = [ "--all-features" ];
# some tests access the same folders, don't test in parallel to avoid race conditions
dontUseCargoParallelTests = true;
@@ -81,8 +79,8 @@ rustPlatform.buildRustPackage rec {
installManPage ./man/man1/mise.1
substituteInPlace ./completions/{mise.bash,mise.fish,_mise} \
- --replace-fail '-v usage' '-v ${usage}/bin/usage' \
- --replace-fail 'usage complete-word' '${usage}/bin/usage complete-word'
+ --replace-fail '-v usage' '-v ${lib.getExe usage}' \
+ --replace-fail 'usage complete-word' '${lib.getExe usage} complete-word'
installShellCompletion \
--bash ./completions/mise.bash \
diff --git a/pkgs/by-name/mi/mission-center/Cargo.lock b/pkgs/by-name/mi/mission-center/Cargo.lock
index 2cf6007b7293..916ce978f88a 100644
--- a/pkgs/by-name/mi/mission-center/Cargo.lock
+++ b/pkgs/by-name/mi/mission-center/Cargo.lock
@@ -25,9 +25,9 @@ dependencies = [
[[package]]
name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "bitflags"
@@ -66,18 +66,18 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.1.18"
+version = "1.1.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
+checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1"
dependencies = [
"shlex",
]
[[package]]
name = "cfg-expr"
-version = "0.16.0"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "345c78335be0624ed29012dc10c49102196c6882c12dde65d9f35b02da2aada8"
+checksum = "d0890061c4d3223e7267f3bad2ec40b997d64faac1c2815a4a9d95018e2b9e9c"
dependencies = [
"smallvec",
"target-lexicon",
@@ -175,24 +175,24 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
dependencies = [
"futures-core",
]
[[package]]
name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
[[package]]
name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
dependencies = [
"futures-core",
"futures-task",
@@ -201,15 +201,15 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
[[package]]
name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
@@ -218,15 +218,15 @@ dependencies = [
[[package]]
name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
[[package]]
name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
dependencies = [
"futures-core",
"futures-macro",
@@ -238,9 +238,9 @@ dependencies = [
[[package]]
name = "gdk-pixbuf"
-version = "0.20.1"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8730751991b97419fc3f0c2dca2c9e45b48edf46e48e0f965964ecf33889812f"
+checksum = "c4c29071a9e92337d8270a85cb0510cda4ac478be26d09ad027cc1d081911b19"
dependencies = [
"gdk-pixbuf-sys",
"gio",
@@ -250,9 +250,9 @@ dependencies = [
[[package]]
name = "gdk-pixbuf-sys"
-version = "0.20.1"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ffbf649fd5b1c8c0f0feeb015b7533c3ef92da2887fb95ddd338bc2b1644a7c"
+checksum = "687343b059b91df5f3fbd87b4307038fa9e647fcc0461d0d3f93e94fee20bf3d"
dependencies = [
"gio-sys",
"glib-sys",
@@ -263,9 +263,9 @@ dependencies = [
[[package]]
name = "gdk4"
-version = "0.9.0"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b7d7237c1487ed4b300aac7744efcbf1319e12d60d7afcd6f505414bd5b5dea"
+checksum = "c121aeeb0cf7545877ae615dac6bfd088b739d8abee4d55e7143b06927d16a31"
dependencies = [
"cairo-rs",
"gdk-pixbuf",
@@ -278,9 +278,9 @@ dependencies = [
[[package]]
name = "gdk4-sys"
-version = "0.9.0"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a67576c8ec012156d7f680e201a807b4432a77babb3157e0555e990ab6bcd878"
+checksum = "7d3c03d1ea9d5199f14f060890fde68a3b5ec5699144773d1fa6abf337bfbc9c"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -326,9 +326,9 @@ dependencies = [
[[package]]
name = "gio"
-version = "0.20.1"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcacaa37401cad0a95aadd266bc39c72a131d454fc012f6dfd217f891d76cc52"
+checksum = "b8d999e8fb09583e96080867e364bc1e701284ad206c76a5af480d63833ad43c"
dependencies = [
"futures-channel",
"futures-core",
@@ -343,9 +343,9 @@ dependencies = [
[[package]]
name = "gio-sys"
-version = "0.20.1"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5237611e97e9b86ab5768adc3eef853ae713ea797aa3835404acdfacffc9fb38"
+checksum = "4f7efc368de04755344f0084104835b6bb71df2c1d41e37d863947392a894779"
dependencies = [
"glib-sys",
"gobject-sys",
@@ -356,9 +356,9 @@ dependencies = [
[[package]]
name = "glib"
-version = "0.20.3"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95648aac01b75503000bb3bcaa5ec7a7a2dd61e43636b8b1814854de94dd80e4"
+checksum = "adcf1ec6d3650bf9fdbc6cee242d4fcebc6f6bfd9bea5b929b6a8b7344eb85ff"
dependencies = [
"bitflags",
"futures-channel",
@@ -377,9 +377,9 @@ dependencies = [
[[package]]
name = "glib-macros"
-version = "0.20.3"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302f1d633c9cdef4350330e7b68fd8016e2834bb106c93fdf9789fcde753c1ab"
+checksum = "a6bf88f70cd5720a6197639dcabcb378dd528d0cb68cb1f45e3b358bcb841cd7"
dependencies = [
"heck",
"proc-macro-crate",
@@ -390,9 +390,9 @@ dependencies = [
[[package]]
name = "glib-sys"
-version = "0.20.2"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92eee4531c1c9abba945d19378b205031b5890e1f99c319ba0503b6e0c06a163"
+checksum = "5f9eca5d88cfa6a453b00d203287c34a2b7cac3a7831779aa2bb0b3c7233752b"
dependencies = [
"libc",
"system-deps",
@@ -400,9 +400,9 @@ dependencies = [
[[package]]
name = "gobject-sys"
-version = "0.20.1"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa3d1dcd8a1eb2e7c22be3d5e792b14b186f3524f79b25631730f9a8c169d49a"
+checksum = "a4c674d2ff8478cf0ec29d2be730ed779fef54415a2fb4b565c52def62696462"
dependencies = [
"glib-sys",
"libc",
@@ -411,9 +411,9 @@ dependencies = [
[[package]]
name = "graphene-rs"
-version = "0.20.1"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80aac87f74e81c0e13433e892a047237abdc37945c86887f5eed905038356e69"
+checksum = "1f53144c7fe78292705ff23935f1477d511366fb2f73c43d63b37be89076d2fe"
dependencies = [
"glib",
"graphene-sys",
@@ -422,9 +422,9 @@ dependencies = [
[[package]]
name = "graphene-sys"
-version = "0.20.1"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2f91ecd32989efad60326cc20a8fb252bd2852239a08e4e70cde8c100de9ca"
+checksum = "e741797dc5081e59877a4d72c442c72d61efdd99161a0b1c1b29b6b988934b99"
dependencies = [
"glib-sys",
"libc",
@@ -434,9 +434,9 @@ dependencies = [
[[package]]
name = "gsk4"
-version = "0.9.0"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3cf2091e1af185b347b3450817d93dea6fe435df7abd4c2cd7fb5bcb4cfda8"
+checksum = "aa21a2f7c51ee1c6cc1242c2faf3aae2b7566138f182696759987bde8219e922"
dependencies = [
"cairo-rs",
"gdk4",
@@ -449,9 +449,9 @@ dependencies = [
[[package]]
name = "gsk4-sys"
-version = "0.9.0"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aa69614a26d8760c186c3690f1b0fbb917572ca23ef83137445770ceddf8cde"
+checksum = "0f9fb607554f9f4e8829eb7ea301b0fde051e1dbfd5d16b143a8a9c2fac6c01b"
dependencies = [
"cairo-sys-rs",
"gdk4-sys",
@@ -465,9 +465,9 @@ dependencies = [
[[package]]
name = "gtk4"
-version = "0.9.1"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4fe572bf318e5dbc6f5a2f8a25d853f1ae3f42768c0b08af6ca20a18f4057e1"
+checksum = "31e2d105ce672f5cdcb5af2602e91c2901e91c72da15ab76f613ad57ecf04c6d"
dependencies = [
"cairo-rs",
"field-offset",
@@ -498,9 +498,9 @@ dependencies = [
[[package]]
name = "gtk4-sys"
-version = "0.9.0"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1114a207af8ada02cf4658a76692f4190f06f093380d5be07e3ca8b43aa7c666"
+checksum = "cbe4325908b1c1642dbb48e9f49c07a73185babf43e8b2065b0f881a589f55b8"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -524,13 +524,19 @@ dependencies = [
"ahash",
]
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
[[package]]
name = "hashlink"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
dependencies = [
- "hashbrown",
+ "hashbrown 0.14.5",
]
[[package]]
@@ -541,12 +547,12 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]]
name = "indexmap"
-version = "2.5.0"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
dependencies = [
"equivalent",
- "hashbrown",
+ "hashbrown 0.15.0",
]
[[package]]
@@ -594,9 +600,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.158"
+version = "0.2.159"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
[[package]]
name = "libdbus-sys"
@@ -667,7 +673,7 @@ dependencies = [
[[package]]
name = "missioncenter"
-version = "0.6.1"
+version = "0.6.2"
dependencies = [
"dbus",
"errno-sys",
@@ -717,9 +723,9 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
[[package]]
name = "ordered-multimap"
@@ -728,14 +734,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79"
dependencies = [
"dlv-list",
- "hashbrown",
+ "hashbrown 0.14.5",
]
[[package]]
name = "pango"
-version = "0.20.1"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5764e5a174a5a0ec054fe5962ce6d4fc7052e2d0dcc23bbc77202b40a4a403d3"
+checksum = "aa26aa54b11094d72141a754901cd71d9356432bb8147f9cace8d9c7ba95f356"
dependencies = [
"gio",
"glib",
@@ -745,9 +751,9 @@ dependencies = [
[[package]]
name = "pango-sys"
-version = "0.20.1"
+version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd317e1de76b14b3d3efe05518c08b360327f1ab7fec150473a89ffcad4b072d"
+checksum = "84fd65917bf12f06544ae2bbc200abf9fc0a513a5a88a0fa81013893aef2b838"
dependencies = [
"glib-sys",
"gobject-sys",
@@ -769,9 +775,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
[[package]]
name = "proc-macro-crate"
@@ -802,9 +808,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.10.6"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
dependencies = [
"aho-corasick",
"memchr",
@@ -814,9 +820,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
dependencies = [
"aho-corasick",
"memchr",
@@ -825,9 +831,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "rusqlite"
@@ -909,9 +915,9 @@ dependencies = [
[[package]]
name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
dependencies = [
"serde",
]
@@ -945,9 +951,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "syn"
-version = "2.0.77"
+version = "2.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
dependencies = [
"proc-macro2",
"quote",
@@ -956,9 +962,9 @@ dependencies = [
[[package]]
name = "system-deps"
-version = "7.0.2"
+version = "7.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "070a0a5e7da2d24be457809c4b3baa57a835fd2829ad8b86f9a049052fe71031"
+checksum = "66d23aaf9f331227789a99e8de4c91bf46703add012bdfd45fdecdfb2975a005"
dependencies = [
"cfg-expr",
"heck",
@@ -975,9 +981,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "temp-dir"
-version = "0.1.13"
+version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231"
+checksum = "bc1ee6eef34f12f765cb94725905c6312b6610ab2b0940889cfe58dae7bc3c72"
[[package]]
name = "textdistance"
@@ -1017,9 +1023,9 @@ dependencies = [
[[package]]
name = "toml_edit"
-version = "0.22.20"
+version = "0.22.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
dependencies = [
"indexmap",
"serde",
@@ -1161,9 +1167,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winnow"
-version = "0.6.18"
+version = "0.6.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
dependencies = [
"memchr",
]
diff --git a/pkgs/by-name/mi/mission-center/gatherer-Cargo.lock b/pkgs/by-name/mi/mission-center/gatherer-Cargo.lock
index 37053b5ba954..fa88391e6136 100644
--- a/pkgs/by-name/mi/mission-center/gatherer-Cargo.lock
+++ b/pkgs/by-name/mi/mission-center/gatherer-Cargo.lock
@@ -19,9 +19,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.88"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
[[package]]
name = "app-rummage"
@@ -120,7 +120,7 @@ dependencies = [
"hex",
"ignore",
"jobserver",
- "libc 0.2.158",
+ "libc 0.2.159",
"miow",
"same-file",
"sha2",
@@ -133,9 +133,9 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.1.18"
+version = "1.1.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
+checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1"
dependencies = [
"shlex",
]
@@ -188,7 +188,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
dependencies = [
"core-foundation-sys",
- "libc 0.2.158",
+ "libc 0.2.159",
]
[[package]]
@@ -203,7 +203,7 @@ version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
dependencies = [
- "libc 0.2.158",
+ "libc 0.2.159",
]
[[package]]
@@ -262,7 +262,7 @@ version = "0.9.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b"
dependencies = [
- "libc 0.2.158",
+ "libc 0.2.159",
"libdbus-sys",
"winapi",
]
@@ -297,9 +297,9 @@ dependencies = [
[[package]]
name = "drm"
-version = "0.12.0"
+version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98888c4bbd601524c11a7ed63f814b8825f420514f78e96f752c437ae9cbb5d1"
+checksum = "d000ffcf7a146ee52444a31b78ac82f981ebba5de6fb19f0b1052d98c8e5f308"
dependencies = [
"bitflags",
"bytemuck",
@@ -310,9 +310,9 @@ dependencies = [
[[package]]
name = "drm-ffi"
-version = "0.8.0"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97c98727e48b7ccb4f4aea8cfe881e5b07f702d17b7875991881b41af7278d53"
+checksum = "d8e41459d99a9b529845f6d2c909eb9adf3b6d2f82635ae40be8de0601726e8b"
dependencies = [
"drm-sys",
"rustix",
@@ -326,11 +326,11 @@ checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
[[package]]
name = "drm-sys"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd39dde40b6e196c2e8763f23d119ddb1a8714534bf7d77fa97a65b0feda3986"
+checksum = "bafb66c8dbc944d69e15cfcc661df7e703beffbaec8bd63151368b06c5f9858c"
dependencies = [
- "libc 0.2.158",
+ "libc 0.2.159",
"linux-raw-sys 0.6.5",
]
@@ -341,7 +341,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a373bc9844200b1ff15bd1b245931d1c20d09d06e4ec09f361171f29a4b0752d"
dependencies = [
"khronos",
- "libc 0.2.158",
+ "libc 0.2.159",
]
[[package]]
@@ -356,7 +356,7 @@ version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
dependencies = [
- "libc 0.2.158",
+ "libc 0.2.159",
"windows-sys 0.52.0",
]
@@ -373,16 +373,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
dependencies = [
"cfg-if",
- "libc 0.2.158",
+ "libc 0.2.159",
"libredox",
"windows-sys 0.59.0",
]
[[package]]
name = "flate2"
-version = "1.0.33"
+version = "1.0.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
+checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
dependencies = [
"crc32fast",
"miniz_oxide",
@@ -399,7 +399,7 @@ dependencies = [
[[package]]
name = "gatherer"
-version = "0.6.1"
+version = "0.6.2"
dependencies = [
"anyhow",
"app-rummage",
@@ -417,7 +417,7 @@ dependencies = [
"gbm",
"glob",
"lazy_static",
- "libc 0.2.158",
+ "libc 0.2.159",
"libloading",
"log",
"nix",
@@ -435,24 +435,24 @@ dependencies = [
[[package]]
name = "gbm"
-version = "0.15.0"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45bf55ba6dd53ad0ac115046ff999c5324c283444ee6e0be82454c4e8eb2f36a"
+checksum = "c724107aa10444b1d2709aae4727c18a33c16b3e15ea8a46cc4ae226c084c88a"
dependencies = [
"bitflags",
"drm",
"drm-fourcc",
"gbm-sys",
- "libc 0.2.158",
+ "libc 0.2.159",
]
[[package]]
name = "gbm-sys"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fd2d6bf7c0143b38beece05f9a5c4c851a49a8434f62bf58ff28da92b0ddc58"
+checksum = "a9cc2f64de9fa707b5c6b2d2f10d7a7e49e845018a9f5685891eb40d3bab2538"
dependencies = [
- "libc 0.2.158",
+ "libc 0.2.159",
]
[[package]]
@@ -472,7 +472,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
dependencies = [
"cfg-if",
- "libc 0.2.158",
+ "libc 0.2.159",
"wasi",
]
@@ -545,7 +545,7 @@ version = "0.1.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
dependencies = [
- "libc 0.2.158",
+ "libc 0.2.159",
]
[[package]]
@@ -571,9 +571,9 @@ checksum = "e32a70cf75e5846d53a673923498228bbec6a8624708a9ea5645f075d6276122"
[[package]]
name = "libc"
-version = "0.2.158"
+version = "0.2.159"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
[[package]]
name = "libdbus-sys"
@@ -602,7 +602,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
dependencies = [
"bitflags",
- "libc 0.2.158",
+ "libc 0.2.159",
"redox_syscall",
]
@@ -657,14 +657,14 @@ dependencies = [
"bitflags",
"cfg-if",
"cfg_aliases",
- "libc 0.2.158",
+ "libc 0.2.159",
]
[[package]]
name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
[[package]]
name = "ordered-multimap"
@@ -690,9 +690,9 @@ checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
[[package]]
name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
[[package]]
name = "proc-macro2"
@@ -734,18 +734,18 @@ dependencies = [
[[package]]
name = "redox_syscall"
-version = "0.5.4"
+version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
dependencies = [
"bitflags",
]
[[package]]
name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
dependencies = [
"aho-corasick",
"memchr",
@@ -754,9 +754,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "ring"
@@ -767,7 +767,7 @@ dependencies = [
"cc",
"cfg-if",
"getrandom",
- "libc 0.2.158",
+ "libc 0.2.159",
"spin",
"untrusted",
"windows-sys 0.52.0",
@@ -792,16 +792,16 @@ checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
dependencies = [
"bitflags",
"errno",
- "libc 0.2.158",
+ "libc 0.2.159",
"linux-raw-sys 0.4.14",
"windows-sys 0.52.0",
]
[[package]]
name = "rustls"
-version = "0.23.13"
+version = "0.23.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
+checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8"
dependencies = [
"log",
"once_cell",
@@ -814,9 +814,9 @@ dependencies = [
[[package]]
name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
[[package]]
name = "rustls-webpki"
@@ -919,9 +919,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "syn"
-version = "2.0.77"
+version = "2.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
dependencies = [
"proc-macro2",
"quote",
@@ -930,20 +930,20 @@ dependencies = [
[[package]]
name = "tar"
-version = "0.4.41"
+version = "0.4.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909"
+checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020"
dependencies = [
"filetime",
- "libc 0.2.158",
+ "libc 0.2.159",
"xattr",
]
[[package]]
name = "tempfile"
-version = "3.12.0"
+version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
dependencies = [
"cfg-if",
"fastrand",
@@ -954,18 +954,18 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.63"
+version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
dependencies = [
"proc-macro2",
"quote",
@@ -1029,9 +1029,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
[[package]]
name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
[[package]]
name = "unicode-ident"
@@ -1041,18 +1041,18 @@ checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
[[package]]
name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
dependencies = [
"tinyvec",
]
[[package]]
name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
[[package]]
name = "untrusted"
@@ -1111,9 +1111,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "webpki-roots"
-version = "0.26.5"
+version = "0.26.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
dependencies = [
"rustls-pki-types",
]
@@ -1303,7 +1303,7 @@ version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
dependencies = [
- "libc 0.2.158",
+ "libc 0.2.159",
"linux-raw-sys 0.4.14",
"rustix",
]
diff --git a/pkgs/by-name/mi/mission-center/package.nix b/pkgs/by-name/mi/mission-center/package.nix
index f7176e411c54..b21baead3379 100644
--- a/pkgs/by-name/mi/mission-center/package.nix
+++ b/pkgs/by-name/mi/mission-center/package.nix
@@ -62,13 +62,13 @@ let
in
stdenv.mkDerivation rec {
pname = "mission-center";
- version = "0.6.1";
+ version = "0.6.2";
src = fetchFromGitLab {
owner = "mission-center-devs";
repo = "mission-center";
rev = "v${version}";
- hash = "sha256-1/cbU5yH6VlfFXCAO3m2CCZwCrqls8WZQf2eplfS6Rs=";
+ hash = "sha256-PvHIvWyhGovlLaeHk2WMp3yRz4VxvvINzX1oqkFgVuQ=";
};
cargoDeps = symlinkJoin {
diff --git a/pkgs/by-name/mi/mistral-rs/Cargo.lock b/pkgs/by-name/mi/mistral-rs/Cargo.lock
index f2ec794e49b3..d3b1750c50b3 100644
--- a/pkgs/by-name/mi/mistral-rs/Cargo.lock
+++ b/pkgs/by-name/mi/mistral-rs/Cargo.lock
@@ -20,9 +20,9 @@ checksum = "415ed64958754dbe991900f3940677e6a7eefb4d7367afd70d642677b0c7d19d"
[[package]]
name = "addr2line"
-version = "0.24.1"
+version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
dependencies = [
"gimli",
]
@@ -89,9 +89,9 @@ dependencies = [
[[package]]
name = "anstream"
-version = "0.6.15"
+version = "0.6.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338"
dependencies = [
"anstyle",
"anstyle-parse",
@@ -104,43 +104,43 @@ dependencies = [
[[package]]
name = "anstyle"
-version = "1.0.8"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56"
[[package]]
name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
dependencies = [
"anstyle",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
name = "anyhow"
-version = "1.0.88"
+version = "1.0.91"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356"
+checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8"
dependencies = [
"backtrace",
]
@@ -168,13 +168,13 @@ checksum = "5b8a30a44e99a1c83ccb2a6298c563c888952a1c9134953db26876528f84c93a"
[[package]]
name = "async-trait"
-version = "0.1.82"
+version = "0.1.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -185,15 +185,15 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
[[package]]
name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "axum"
-version = "0.7.5"
+version = "0.7.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
+checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae"
dependencies = [
"async-trait",
"axum-core",
@@ -225,9 +225,9 @@ dependencies = [
[[package]]
name = "axum-core"
-version = "0.4.3"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3"
+checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199"
dependencies = [
"async-trait",
"bytes",
@@ -238,7 +238,7 @@ dependencies = [
"mime",
"pin-project-lite",
"rustversion",
- "sync_wrapper 0.1.2",
+ "sync_wrapper 1.0.1",
"tower-layer",
"tower-service",
"tracing",
@@ -341,7 +341,7 @@ dependencies = [
"proc-macro2",
"quote",
"str_inflector",
- "syn 2.0.77",
+ "syn 2.0.85",
"thiserror",
"try_match",
]
@@ -354,22 +354,22 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
[[package]]
name = "bytemuck"
-version = "1.18.0"
+version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
+checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
dependencies = [
"bytemuck_derive",
]
[[package]]
name = "bytemuck_derive"
-version = "1.7.1"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26"
+checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -386,26 +386,27 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
[[package]]
name = "bytes"
-version = "1.7.1"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
[[package]]
name = "candle-core"
-version = "0.6.1"
-source = "git+https://github.com/EricLBuehler/candle.git?rev=9c62368#9c62368211a29f5c2cf94deb811ecca7a9475c38"
+version = "0.7.2"
+source = "git+https://github.com/EricLBuehler/candle.git?rev=629ec72#629ec72d08953f79eae6af3f260e090397b29646"
dependencies = [
"accelerate-src",
"byteorder",
"candle-kernels",
"candle-metal-kernels",
"cudarc",
+ "float8",
"gemm",
"half",
"intel-mkl-src",
"libc",
"memmap2",
- "metal",
+ "metal 0.27.0",
"num-traits",
"num_cpus",
"rand",
@@ -413,14 +414,17 @@ dependencies = [
"rayon",
"safetensors",
"thiserror",
+ "ug",
+ "ug-cuda",
+ "ug-metal",
"yoke",
"zip",
]
[[package]]
name = "candle-flash-attn"
-version = "0.6.1"
-source = "git+https://github.com/EricLBuehler/candle.git?rev=9c62368#9c62368211a29f5c2cf94deb811ecca7a9475c38"
+version = "0.7.2"
+source = "git+https://github.com/EricLBuehler/candle.git?rev=629ec72#629ec72d08953f79eae6af3f260e090397b29646"
dependencies = [
"anyhow",
"bindgen_cuda 0.1.5",
@@ -430,18 +434,18 @@ dependencies = [
[[package]]
name = "candle-kernels"
-version = "0.6.1"
-source = "git+https://github.com/EricLBuehler/candle.git?rev=9c62368#9c62368211a29f5c2cf94deb811ecca7a9475c38"
+version = "0.7.2"
+source = "git+https://github.com/EricLBuehler/candle.git?rev=629ec72#629ec72d08953f79eae6af3f260e090397b29646"
dependencies = [
"bindgen_cuda 0.1.5",
]
[[package]]
name = "candle-metal-kernels"
-version = "0.6.1"
-source = "git+https://github.com/EricLBuehler/candle.git?rev=9c62368#9c62368211a29f5c2cf94deb811ecca7a9475c38"
+version = "0.7.2"
+source = "git+https://github.com/EricLBuehler/candle.git?rev=629ec72#629ec72d08953f79eae6af3f260e090397b29646"
dependencies = [
- "metal",
+ "metal 0.27.0",
"once_cell",
"thiserror",
"tracing",
@@ -449,15 +453,15 @@ dependencies = [
[[package]]
name = "candle-nn"
-version = "0.6.1"
-source = "git+https://github.com/EricLBuehler/candle.git?rev=9c62368#9c62368211a29f5c2cf94deb811ecca7a9475c38"
+version = "0.7.2"
+source = "git+https://github.com/EricLBuehler/candle.git?rev=629ec72#629ec72d08953f79eae6af3f260e090397b29646"
dependencies = [
"accelerate-src",
"candle-core",
"candle-metal-kernels",
"half",
"intel-mkl-src",
- "metal",
+ "metal 0.27.0",
"num-traits",
"rayon",
"safetensors",
@@ -467,9 +471,9 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.1.18"
+version = "1.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
+checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
dependencies = [
"shlex",
]
@@ -538,9 +542,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.5.17"
+version = "4.5.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
dependencies = [
"clap_builder",
"clap_derive",
@@ -548,26 +552,27 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.17"
+version = "4.5.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
dependencies = [
"anstream",
"anstyle",
"clap_lex",
"strsim 0.11.1",
+ "terminal_size",
]
[[package]]
name = "clap_derive"
-version = "4.5.13"
+version = "4.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -607,9 +612,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]]
name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
[[package]]
name = "console"
@@ -821,7 +826,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim 0.11.1",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -843,7 +848,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [
"darling_core 0.20.10",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -860,13 +865,13 @@ checksum = "aafbece59594ed57696a1a69e8bb3ca1683fbc9cdb41d5c02726070b2cd8f19d"
[[package]]
name = "derive-new"
-version = "0.6.0"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad"
+checksum = "2cdc8d50f426189eef89dac62fabfa0abb27d5cc008f25bf4156a0203325becc"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -877,38 +882,38 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
name = "derive_builder"
-version = "0.20.1"
+version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b"
+checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947"
dependencies = [
"derive_builder_macro",
]
[[package]]
name = "derive_builder_core"
-version = "0.20.1"
+version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38"
+checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8"
dependencies = [
"darling 0.20.10",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
name = "derive_builder_macro"
-version = "0.20.1"
+version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc"
+checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
dependencies = [
"derive_builder_core",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -919,7 +924,7 @@ checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -970,7 +975,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -1006,9 +1011,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
[[package]]
name = "encoding_rs"
-version = "0.8.34"
+version = "0.8.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
dependencies = [
"cfg-if",
]
@@ -1028,7 +1033,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -1090,9 +1095,9 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
[[package]]
name = "fdeflate"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
+checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab"
dependencies = [
"simd-adler32",
]
@@ -1111,19 +1116,32 @@ dependencies = [
[[package]]
name = "flate2"
-version = "1.0.33"
+version = "1.0.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
+checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
dependencies = [
"crc32fast",
"miniz_oxide 0.8.0",
]
[[package]]
-name = "flume"
-version = "0.11.0"
+name = "float8"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
+checksum = "c7c3475274d374d263c4c40c43ad854c5bdf733c7db775bbd3c1ca2ad7427978"
+dependencies = [
+ "cudarc",
+ "half",
+ "num-traits",
+ "rand",
+ "rand_distr",
+]
+
+[[package]]
+name = "flume"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095"
dependencies = [
"spin",
]
@@ -1161,7 +1179,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -1187,9 +1205,9 @@ dependencies = [
[[package]]
name = "futures"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
dependencies = [
"futures-channel",
"futures-core",
@@ -1202,9 +1220,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
dependencies = [
"futures-core",
"futures-sink",
@@ -1212,15 +1230,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
[[package]]
name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
dependencies = [
"futures-core",
"futures-task",
@@ -1229,38 +1247,38 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
[[package]]
name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
[[package]]
name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
[[package]]
name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
dependencies = [
"futures-channel",
"futures-core",
@@ -1432,7 +1450,7 @@ dependencies = [
"proc-macro-error2",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -1447,9 +1465,9 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.31.0"
+version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
[[package]]
name = "glob"
@@ -1500,6 +1518,12 @@ dependencies = [
"allocator-api2",
]
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
[[package]]
name = "heck"
version = "0.5.0"
@@ -1565,9 +1589,9 @@ dependencies = [
[[package]]
name = "httparse"
-version = "1.9.4"
+version = "1.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
[[package]]
name = "httpdate"
@@ -1577,9 +1601,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
[[package]]
name = "hyper"
-version = "1.4.1"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a"
dependencies = [
"bytes",
"futures-channel",
@@ -1632,9 +1656,9 @@ dependencies = [
[[package]]
name = "hyper-util"
-version = "0.1.8"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba"
+checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
dependencies = [
"bytes",
"futures-channel",
@@ -1645,16 +1669,15 @@ dependencies = [
"pin-project-lite",
"socket2",
"tokio",
- "tower",
"tower-service",
"tracing",
]
[[package]]
name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
dependencies = [
"android_system_properties",
"core-foundation-sys",
@@ -1691,9 +1714,9 @@ dependencies = [
[[package]]
name = "image"
-version = "0.25.2"
+version = "0.25.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
+checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae"
dependencies = [
"bytemuck",
"byteorder-lite",
@@ -1711,9 +1734,9 @@ dependencies = [
[[package]]
name = "image-webp"
-version = "0.1.3"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904"
+checksum = "e031e8e3d94711a9ccb5d6ea357439ef3dcbed361798bd4071dc4d9793fbe22f"
dependencies = [
"byteorder-lite",
"quick-error",
@@ -1727,12 +1750,12 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
[[package]]
name = "indexmap"
-version = "2.5.0"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
dependencies = [
"equivalent",
- "hashbrown",
+ "hashbrown 0.15.0",
"serde",
]
@@ -1789,9 +1812,9 @@ dependencies = [
[[package]]
name = "ipnet"
-version = "2.10.0"
+version = "2.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
[[package]]
name = "is_terminal_polyfill"
@@ -1840,9 +1863,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
[[package]]
name = "js-sys"
-version = "0.3.70"
+version = "0.3.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
dependencies = [
"wasm-bindgen",
]
@@ -1861,9 +1884,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
[[package]]
name = "libc"
-version = "0.2.158"
+version = "0.2.161"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
[[package]]
name = "libloading"
@@ -2007,6 +2030,21 @@ dependencies = [
"paste",
]
+[[package]]
+name = "metal"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21"
+dependencies = [
+ "bitflags 2.6.0",
+ "block",
+ "core-graphics-types",
+ "foreign-types 0.5.0",
+ "log",
+ "objc",
+ "paste",
+]
+
[[package]]
name = "mime"
version = "0.3.17"
@@ -2025,9 +2063,9 @@ dependencies = [
[[package]]
name = "minijinja"
-version = "2.2.0"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d7d3e3a3eece1fa4618237ad41e1de855ced47eab705cec1c9a920e1d1c5aad"
+checksum = "c9ca8daf4b0b4029777f1bc6e1aedd1aec7b74c276a43bc6f620a8e1a1c0a90e"
dependencies = [
"serde",
"serde_json",
@@ -2035,9 +2073,9 @@ dependencies = [
[[package]]
name = "minijinja-contrib"
-version = "2.2.0"
+version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "744a2b84dbd22398e347594ed2aef9d3f1b948934e3e6e94ef69ecd39d597f4b"
+checksum = "39ffd46ee854be23604a20efd6c9655374fefbe4d44b949dc0f907305d92873a"
dependencies = [
"minijinja",
"serde",
@@ -2056,7 +2094,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
dependencies = [
"adler",
- "simd-adler32",
]
[[package]]
@@ -2066,6 +2103,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
dependencies = [
"adler2",
+ "simd-adler32",
]
[[package]]
@@ -2094,7 +2132,7 @@ dependencies = [
[[package]]
name = "mistralrs"
-version = "0.3.0"
+version = "0.3.2"
dependencies = [
"anyhow",
"candle-core",
@@ -2112,7 +2150,7 @@ dependencies = [
[[package]]
name = "mistralrs-bench"
-version = "0.3.0"
+version = "0.3.2"
dependencies = [
"anyhow",
"candle-core",
@@ -2127,7 +2165,7 @@ dependencies = [
[[package]]
name = "mistralrs-core"
-version = "0.3.0"
+version = "0.3.2"
dependencies = [
"accelerate-src",
"akin",
@@ -2150,6 +2188,7 @@ dependencies = [
"derive_more",
"dirs",
"either",
+ "float8",
"futures",
"galil-seiferas",
"half",
@@ -2172,7 +2211,7 @@ dependencies = [
"rand_isaac",
"rayon",
"regex",
- "regex-automata 0.4.7",
+ "regex-automata 0.4.8",
"reqwest",
"rustc-hash",
"safetensors",
@@ -2191,24 +2230,25 @@ dependencies = [
"tqdm",
"tracing",
"tracing-subscriber",
- "uuid 1.10.0",
+ "uuid 1.11.0",
"variantly",
"vob",
]
[[package]]
name = "mistralrs-paged-attn"
-version = "0.3.0"
+version = "0.3.2"
dependencies = [
"anyhow",
"bindgen_cuda 0.1.6",
"candle-core",
+ "float8",
"half",
]
[[package]]
name = "mistralrs-pyo3"
-version = "0.3.0"
+version = "0.3.2"
dependencies = [
"accelerate-src",
"anyhow",
@@ -2232,14 +2272,16 @@ dependencies = [
[[package]]
name = "mistralrs-quant"
-version = "0.3.0"
+version = "0.3.2"
dependencies = [
"bindgen_cuda 0.1.5",
"byteorder",
"candle-core",
"candle-nn",
+ "float8",
"half",
"lazy_static",
+ "once_cell",
"paste",
"rayon",
"serde",
@@ -2248,7 +2290,7 @@ dependencies = [
[[package]]
name = "mistralrs-server"
-version = "0.3.0"
+version = "0.3.2"
dependencies = [
"accelerate-src",
"anyhow",
@@ -2277,7 +2319,7 @@ dependencies = [
[[package]]
name = "mistralrs-vision"
-version = "0.3.0"
+version = "0.3.2"
dependencies = [
"candle-core",
"image",
@@ -2301,7 +2343,7 @@ checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -2371,6 +2413,20 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "num"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
+dependencies = [
+ "num-bigint",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits",
+]
+
[[package]]
name = "num-bigint"
version = "0.4.6"
@@ -2400,6 +2456,17 @@ dependencies = [
"num-traits",
]
+[[package]]
+name = "num-iter"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
[[package]]
name = "num-rational"
version = "0.4.2"
@@ -2449,7 +2516,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -2479,23 +2546,21 @@ dependencies = [
[[package]]
name = "object"
-version = "0.36.4"
+version = "0.36.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
dependencies = [
"memchr",
]
[[package]]
name = "oci-spec"
-version = "0.6.8"
+version = "0.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f5a3fe998d50101ae009351fec56d88a69f4ed182e11000e711068c2f5abf72"
+checksum = "bdf88ddc01cc6bccbe1044adb6a29057333f523deadcb4953c011a73158cfa5e"
dependencies = [
"derive_builder",
"getset",
- "once_cell",
- "regex",
"serde",
"serde_json",
"strum",
@@ -2526,15 +2591,15 @@ dependencies = [
"toml",
"ureq",
"url",
- "uuid 1.10.0",
+ "uuid 1.11.0",
"walkdir",
]
[[package]]
name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
[[package]]
name = "onig"
@@ -2560,9 +2625,9 @@ dependencies = [
[[package]]
name = "openssl"
-version = "0.10.66"
+version = "0.10.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
dependencies = [
"bitflags 2.6.0",
"cfg-if",
@@ -2581,7 +2646,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -2592,9 +2657,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-sys"
-version = "0.9.103"
+version = "0.9.104"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
dependencies = [
"cc",
"libc",
@@ -2706,31 +2771,11 @@ dependencies = [
"siphasher",
]
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
-]
-
[[package]]
name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
[[package]]
name = "pin-utils"
@@ -2740,28 +2785,28 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
[[package]]
name = "png"
-version = "0.17.13"
+version = "0.17.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
+checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0"
dependencies = [
"bitflags 1.3.2",
"crc32fast",
"fdeflate",
"flate2",
- "miniz_oxide 0.7.4",
+ "miniz_oxide 0.8.0",
]
[[package]]
name = "portable-atomic"
-version = "1.7.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
[[package]]
name = "ppv-lite86"
@@ -2824,14 +2869,14 @@ dependencies = [
"proc-macro-error-attr2",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
dependencies = [
"unicode-ident",
]
@@ -2850,9 +2895,9 @@ dependencies = [
[[package]]
name = "pyo3"
-version = "0.22.2"
+version = "0.22.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433"
+checksum = "3d922163ba1f79c04bc49073ba7b32fd5a8d3b76a87c955921234b8e77333c51"
dependencies = [
"anyhow",
"cfg-if",
@@ -2860,7 +2905,7 @@ dependencies = [
"chrono-tz",
"either",
"eyre",
- "hashbrown",
+ "hashbrown 0.14.5",
"indexmap",
"indoc",
"libc",
@@ -2881,9 +2926,9 @@ dependencies = [
[[package]]
name = "pyo3-build-config"
-version = "0.22.2"
+version = "0.22.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8"
+checksum = "bc38c5feeb496c8321091edf3d63e9a6829eab4b863b4a6a65f26f3e9cc6b179"
dependencies = [
"once_cell",
"target-lexicon",
@@ -2891,9 +2936,9 @@ dependencies = [
[[package]]
name = "pyo3-ffi"
-version = "0.22.2"
+version = "0.22.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6"
+checksum = "94845622d88ae274d2729fcefc850e63d7a3ddff5e3ce11bd88486db9f1d357d"
dependencies = [
"libc",
"pyo3-build-config",
@@ -2901,27 +2946,27 @@ dependencies = [
[[package]]
name = "pyo3-macros"
-version = "0.22.2"
+version = "0.22.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206"
+checksum = "e655aad15e09b94ffdb3ce3d217acf652e26bbc37697ef012f5e5e348c716e5e"
dependencies = [
"proc-macro2",
"pyo3-macros-backend",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
name = "pyo3-macros-backend"
-version = "0.22.2"
+version = "0.22.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372"
+checksum = "ae1e3f09eecd94618f60a455a23def79f79eba4dc561a97324bf9ac8c6df30ce"
dependencies = [
"heck",
"proc-macro2",
"pyo3-build-config",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -3103,9 +3148,9 @@ checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430"
[[package]]
name = "redox_syscall"
-version = "0.5.4"
+version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
dependencies = [
"bitflags 2.6.0",
]
@@ -3123,14 +3168,14 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.10.6"
+version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
dependencies = [
"aho-corasick",
"memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.8",
+ "regex-syntax 0.8.5",
]
[[package]]
@@ -3144,13 +3189,13 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
dependencies = [
"aho-corasick",
"memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
]
[[package]]
@@ -3161,15 +3206,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "reqwest"
-version = "0.12.7"
+version = "0.12.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b"
dependencies = [
"base64 0.22.1",
"bytes",
@@ -3249,7 +3294,7 @@ dependencies = [
"proc-macro2",
"quote",
"rust-embed-utils",
- "syn 2.0.77",
+ "syn 2.0.85",
"walkdir",
]
@@ -3309,9 +3354,9 @@ dependencies = [
[[package]]
name = "rustls"
-version = "0.23.13"
+version = "0.23.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
+checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993"
dependencies = [
"log",
"once_cell",
@@ -3324,19 +3369,18 @@ dependencies = [
[[package]]
name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
dependencies = [
- "base64 0.22.1",
"rustls-pki-types",
]
[[package]]
name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
[[package]]
name = "rustls-webpki"
@@ -3351,9 +3395,9 @@ dependencies = [
[[package]]
name = "rustversion"
-version = "1.0.17"
+version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
[[package]]
name = "ryu"
@@ -3382,9 +3426,9 @@ dependencies = [
[[package]]
name = "schannel"
-version = "0.1.24"
+version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
dependencies = [
"windows-sys 0.59.0",
]
@@ -3410,7 +3454,7 @@ dependencies = [
"proc-macro2",
"quote",
"serde_derive_internals",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -3434,9 +3478,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
-version = "2.11.1"
+version = "2.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
dependencies = [
"core-foundation-sys",
"libc",
@@ -3456,22 +3500,22 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"
[[package]]
name = "serde"
-version = "1.0.210"
+version = "1.0.213"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.210"
+version = "1.0.213"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -3482,14 +3526,14 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
name = "serde_json"
-version = "1.0.128"
+version = "1.0.132"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
dependencies = [
"itoa",
"memchr",
@@ -3518,9 +3562,9 @@ dependencies = [
[[package]]
name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
dependencies = [
"serde",
]
@@ -3723,7 +3767,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -3745,9 +3789,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.77"
+version = "2.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
dependencies = [
"proc-macro2",
"quote",
@@ -3777,7 +3821,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -3832,9 +3876,9 @@ dependencies = [
[[package]]
name = "tar"
-version = "0.4.41"
+version = "0.4.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909"
+checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020"
dependencies = [
"filetime",
"libc",
@@ -3849,9 +3893,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "tempfile"
-version = "3.12.0"
+version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
dependencies = [
"cfg-if",
"fastrand",
@@ -3870,23 +3914,33 @@ dependencies = [
]
[[package]]
-name = "thiserror"
-version = "1.0.63"
+name = "terminal_size"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef"
+dependencies = [
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -3947,7 +4001,7 @@ dependencies = [
"rayon",
"rayon-cond",
"regex",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
"serde",
"serde_json",
"spm_precompiled",
@@ -3959,9 +4013,9 @@ dependencies = [
[[package]]
name = "tokio"
-version = "1.40.0"
+version = "1.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb"
dependencies = [
"backtrace",
"bytes",
@@ -3983,7 +4037,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -4053,9 +4107,9 @@ dependencies = [
[[package]]
name = "toml_edit"
-version = "0.22.20"
+version = "0.22.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
dependencies = [
"indexmap",
"serde",
@@ -4066,14 +4120,14 @@ dependencies = [
[[package]]
name = "tower"
-version = "0.4.13"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f"
dependencies = [
"futures-core",
"futures-util",
- "pin-project",
"pin-project-lite",
+ "sync_wrapper 0.1.2",
"tokio",
"tower-layer",
"tower-service",
@@ -4139,7 +4193,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -4204,7 +4258,7 @@ checksum = "b9c81686f7ab4065ccac3df7a910c4249f8c0f3fb70421d6ddec19b9311f63f9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -4213,6 +4267,48 @@ version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+[[package]]
+name = "ug"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4eef2ebfc18c67a6dbcacd9d8a4d85e0568cc58c82515552382312c2730ea13"
+dependencies = [
+ "half",
+ "num",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "ug-cuda"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c4dcab280ad0ef3957e153a82dcad608c954d02cf253b695322f502d1f8902e"
+dependencies = [
+ "cudarc",
+ "half",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "ug",
+]
+
+[[package]]
+name = "ug-metal"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e4ed1df2c20a1a138f993041f650cc84ff27aaefb4342b7f986e77d00e80799"
+dependencies = [
+ "half",
+ "metal 0.29.0",
+ "objc",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "ug",
+]
+
[[package]]
name = "unchecked-index"
version = "0.2.2"
@@ -4221,18 +4317,15 @@ checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c"
[[package]]
name = "unicase"
-version = "2.7.0"
+version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check",
-]
+checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
[[package]]
name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
[[package]]
name = "unicode-ident"
@@ -4242,9 +4335,9 @@ checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
[[package]]
name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
dependencies = [
"tinyvec",
]
@@ -4266,9 +4359,9 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
[[package]]
name = "unicode-width"
-version = "0.1.13"
+version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
[[package]]
name = "unicode_categories"
@@ -4344,15 +4437,15 @@ dependencies = [
[[package]]
name = "utoipa-gen"
-version = "4.3.0"
+version = "4.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bf0e16c02bc4bf5322ab65f10ab1149bdbcaa782cba66dc7057370a3f8190be"
+checksum = "20c24e8ab68ff9ee746aad22d39b5535601e6416d1b0feeabf78be986a5c4392"
dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
"regex",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -4384,9 +4477,9 @@ dependencies = [
[[package]]
name = "uuid"
-version = "1.10.0"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
dependencies = [
"getrandom",
]
@@ -4461,9 +4554,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
dependencies = [
"cfg-if",
"once_cell",
@@ -4472,24 +4565,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
dependencies = [
"cfg-if",
"js-sys",
@@ -4499,9 +4592,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -4509,28 +4602,28 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
[[package]]
name = "web-sys"
-version = "0.3.70"
+version = "0.3.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -4538,9 +4631,9 @@ dependencies = [
[[package]]
name = "webpki-roots"
-version = "0.26.5"
+version = "0.26.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
dependencies = [
"rustls-pki-types",
]
@@ -4781,9 +4874,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winnow"
-version = "0.6.18"
+version = "0.6.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
dependencies = [
"memchr",
]
@@ -4819,7 +4912,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
"synstructure",
]
@@ -4841,7 +4934,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
]
[[package]]
@@ -4861,7 +4954,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.85",
"synstructure",
]
diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix
index 1453a4c4ce8d..eb13f546c82c 100644
--- a/pkgs/by-name/mi/mistral-rs/package.nix
+++ b/pkgs/by-name/mi/mistral-rs/package.nix
@@ -17,6 +17,8 @@
# env
fetchurl,
+ versionCheckHook,
+
testers,
mistral-rs,
nix-update-script,
@@ -81,20 +83,20 @@ in
rustPlatform.buildRustPackage rec {
pname = "mistral-rs";
- version = "0.3.1";
+ version = "0.3.2";
src = fetchFromGitHub {
owner = "EricLBuehler";
repo = "mistral.rs";
rev = "refs/tags/v${version}";
- hash = "sha256-ljGr8V6WkpXPV90SiHJ0t7wzBPx0J0FOB52YdLLIeoM=";
+ hash = "sha256-aflzpJZ48AFBqNTssZl2KxkspQb662nGkEU6COIluxk=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"bindgen_cuda-0.1.6" = "sha256-OWGcQxT+x5HyIFskNVWpPr6Qfkh6Mv/g4PVSm5oA27g=";
- "candle-core-0.6.1" = "sha256-AtKjMTtbMBI2DbZXoWimhqcHmsz2DnRXJorqA0QYNHw=";
+ "candle-core-0.7.2" = "sha256-OovBzD1gEYToa3HT8oQtbY6sDy0heRwAH2cK7gz5Jm0=";
};
};
@@ -179,6 +181,13 @@ rustPlatform.buildRustPackage rec {
"--skip=util::tests::test_parse_image_url"
];
+ nativeInstallCheckInputs = [
+ versionCheckHook
+ ];
+ versionCheckProgram = "${placeholder "out"}/bin/mistralrs-server";
+ versionCheckProgramArg = [ "--version" ];
+ doInstallCheck = true;
+
passthru = {
tests = {
version = testers.testVersion { package = mistral-rs; };
diff --git a/pkgs/by-name/mm/mmdbctl/package.nix b/pkgs/by-name/mm/mmdbctl/package.nix
new file mode 100644
index 000000000000..c91b82c2644a
--- /dev/null
+++ b/pkgs/by-name/mm/mmdbctl/package.nix
@@ -0,0 +1,55 @@
+{
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+ installShellFiles,
+ stdenv,
+ runCommand,
+ mmdbctl,
+ dbip-country-lite,
+}:
+
+buildGoModule rec {
+ pname = "mmdbctl";
+ version = "1.4.6";
+
+ src = fetchFromGitHub {
+ owner = "ipinfo";
+ repo = "mmdbctl";
+ rev = "refs/tags/mmdbctl-${version}";
+ hash = "sha256-6hJ9V8fHs84Lq48l3mB9nZka4rLneyxD4HMhWQYZ0cI=";
+ };
+
+ vendorHash = "sha256-5vd39j/gpRRkUccctKGU8+QL0vANm2FMyw6jTtoqJmw=";
+
+ ldflags = [
+ "-s"
+ "-w"
+ ];
+
+ nativeBuildInputs = [ installShellFiles ];
+
+ postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+ installShellCompletion --cmd mmdbctl \
+ --bash <($out/bin/mmdbctl completion bash) \
+ --fish <($out/bin/mmdbctl completion fish) \
+ --zsh <($out/bin/mmdbctl completion zsh)
+ '';
+
+ passthru.tests = {
+ simple = runCommand "${pname}-test" { } ''
+ ${lib.getExe mmdbctl} verify ${dbip-country-lite.mmdb} | grep valid
+ ${lib.getExe mmdbctl} metadata ${dbip-country-lite.mmdb} | grep DBIP-Country-Lite
+ touch $out
+ '';
+ };
+
+ meta = {
+ description = "MMDB file management CLI supporting various operations on MMDB database files";
+ homepage = "https://github.com/ipinfo/mmdbctl";
+ changelog = "https://github.com/ipinfo/mmdbctl/blob/${src.rev}/CHANGELOG.md";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ moraxyc ];
+ mainProgram = "mmdbctl";
+ };
+}
diff --git a/pkgs/by-name/mm/mmdbinspect/package.nix b/pkgs/by-name/mm/mmdbinspect/package.nix
new file mode 100644
index 000000000000..ca0c32ad758d
--- /dev/null
+++ b/pkgs/by-name/mm/mmdbinspect/package.nix
@@ -0,0 +1,37 @@
+{
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+}:
+
+buildGoModule rec {
+ pname = "mmdbinspect";
+ version = "0.2.0";
+
+ src = fetchFromGitHub {
+ owner = "maxmind";
+ repo = "mmdbinspect";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-PYn+NgJDZBP+9nIU0kxg9KYT0EV35omagspcsCpa9DM=";
+ fetchSubmodules = true;
+ };
+
+ vendorHash = "sha256-HNgofsfMsqXttnrNDIPgLHag+2hqQTREomcesWldpMo=";
+
+ ldflags = [
+ "-s"
+ "-w"
+ ];
+
+ meta = {
+ description = "Look up records for one or more IPs/networks in one or more .mmdb databases";
+ homepage = "https://github.com/maxmind/mmdbinspect";
+ changelog = "https://github.com/maxmind/mmdbinspect/blob/${src.rev}/CHANGELOG.md";
+ license = with lib.licenses; [
+ asl20
+ mit
+ ];
+ maintainers = with lib.maintainers; [ moraxyc ];
+ mainProgram = "mmdbinspect";
+ };
+}
diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/Cargo.lock b/pkgs/by-name/mo/modrinth-app-unwrapped/Cargo.lock
index beb4423be95b..03dd9b0d5f7c 100644
--- a/pkgs/by-name/mo/modrinth-app-unwrapped/Cargo.lock
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
[[package]]
name = "addr2line"
-version = "0.21.0"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
dependencies = [
"gimli",
]
@@ -28,6 +28,19 @@ dependencies = [
"cpufeatures",
]
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "getrandom 0.2.15",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
[[package]]
name = "aho-corasick"
version = "1.1.3"
@@ -52,6 +65,12 @@ dependencies = [
"alloc-no-stdlib",
]
+[[package]]
+name = "allocator-api2"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+
[[package]]
name = "android-tzdata"
version = "0.1.1"
@@ -69,9 +88,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.82"
+version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
[[package]]
name = "async-broadcast"
@@ -85,23 +104,23 @@ dependencies = [
[[package]]
name = "async-channel"
-version = "2.2.1"
+version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
dependencies = [
"concurrent-queue",
- "event-listener 5.3.0",
- "event-listener-strategy 0.5.1",
+ "event-listener-strategy",
"futures-core",
"pin-project-lite",
]
[[package]]
name = "async-compression"
-version = "0.4.8"
+version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07dbbf24db18d609b1462965249abdf49129ccad073ec257da372adc83259c60"
+checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa"
dependencies = [
+ "brotli 6.0.0",
"bzip2",
"deflate64",
"flate2",
@@ -109,20 +128,20 @@ dependencies = [
"futures-io",
"memchr",
"pin-project-lite",
- "xz2",
- "zstd 0.13.1",
- "zstd-safe 7.1.0",
+ "tokio",
+ "zstd 0.13.2",
+ "zstd-safe 7.2.1",
]
[[package]]
name = "async-executor"
-version = "1.11.0"
+version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a"
+checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
dependencies = [
"async-task",
"concurrent-queue",
- "fastrand 2.0.2",
+ "fastrand 2.1.0",
"futures-lite 2.3.0",
"slab",
]
@@ -161,21 +180,21 @@ dependencies = [
[[package]]
name = "async-io"
-version = "2.3.2"
+version = "2.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884"
+checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8"
dependencies = [
- "async-lock 3.3.0",
+ "async-lock 3.4.0",
"cfg-if",
"concurrent-queue",
"futures-io",
"futures-lite 2.3.0",
"parking",
- "polling 3.7.0",
+ "polling 3.7.3",
"rustix 0.38.34",
"slab",
"tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -189,12 +208,12 @@ dependencies = [
[[package]]
name = "async-lock"
-version = "3.3.0"
+version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
dependencies = [
- "event-listener 4.0.3",
- "event-listener-strategy 0.4.0",
+ "event-listener 5.3.1",
+ "event-listener-strategy",
"pin-project-lite",
]
@@ -217,23 +236,23 @@ dependencies = [
[[package]]
name = "async-recursion"
-version = "1.1.0"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.74",
]
[[package]]
name = "async-signal"
-version = "0.2.6"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda"
+checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3"
dependencies = [
- "async-io 2.3.2",
- "async-lock 3.3.0",
+ "async-io 2.3.4",
+ "async-lock 3.4.0",
"atomic-waker",
"cfg-if",
"futures-core",
@@ -241,40 +260,41 @@ dependencies = [
"rustix 0.38.34",
"signal-hook-registry",
"slab",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
name = "async-task"
-version = "4.7.0"
+version = "4.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
[[package]]
name = "async-trait"
-version = "0.1.80"
+version = "0.1.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.74",
]
[[package]]
name = "async-tungstenite"
-version = "0.25.1"
+version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cca750b12e02c389c1694d35c16539f88b8bbaa5945934fdc1b41a776688589"
+checksum = "c5359381fd414fbdb272c48f2111c16cb0bb3447bfacd59311ff3736da9f6664"
dependencies = [
"futures-io",
"futures-util",
"log",
- "native-tls",
"pin-project-lite",
+ "rustls-pki-types",
"tokio",
- "tokio-native-tls",
+ "tokio-rustls",
"tungstenite",
+ "webpki-roots",
]
[[package]]
@@ -317,6 +337,15 @@ dependencies = [
"system-deps 6.2.2",
]
+[[package]]
+name = "atoi"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528"
+dependencies = [
+ "num-traits",
+]
+
[[package]]
name = "atomic-waker"
version = "1.1.2"
@@ -325,15 +354,15 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
[[package]]
name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
[[package]]
name = "backtrace"
-version = "0.3.71"
+version = "0.3.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
dependencies = [
"addr2line",
"cc",
@@ -364,9 +393,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
[[package]]
name = "base64"
-version = "0.22.0"
+version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]]
name = "base64ct"
@@ -383,25 +412,6 @@ dependencies = [
"serde",
]
-[[package]]
-name = "bincode"
-version = "2.0.0-rc.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f11ea1a0346b94ef188834a65c068a03aec181c94896d481d7a0a40d85b0ce95"
-dependencies = [
- "bincode_derive",
- "serde",
-]
-
-[[package]]
-name = "bincode_derive"
-version = "2.0.0-rc.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e30759b3b99a1b802a7a3aa21c85c3ded5c28e1c83170d82d70f08bbf7f3e4c"
-dependencies = [
- "virtue",
-]
-
[[package]]
name = "bitflags"
version = "1.3.2"
@@ -410,9 +420,12 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+dependencies = [
+ "serde",
+]
[[package]]
name = "block"
@@ -431,18 +444,15 @@ dependencies = [
[[package]]
name = "blocking"
-version = "1.5.1"
+version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118"
+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
dependencies = [
"async-channel",
- "async-lock 3.3.0",
"async-task",
- "fastrand 2.0.2",
"futures-io",
"futures-lite 2.3.0",
"piper",
- "tracing",
]
[[package]]
@@ -453,7 +463,18 @@ checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391"
dependencies = [
"alloc-no-stdlib",
"alloc-stdlib",
- "brotli-decompressor",
+ "brotli-decompressor 2.5.1",
+]
+
+[[package]]
+name = "brotli"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+ "brotli-decompressor 4.0.1",
]
[[package]]
@@ -467,12 +488,23 @@ dependencies = [
]
[[package]]
-name = "bstr"
-version = "1.9.1"
+name = "brotli-decompressor"
+version = "4.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
+checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+]
+
+[[package]]
+name = "bstr"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
dependencies = [
"memchr",
+ "regex-automata 0.4.7",
"serde",
]
@@ -484,9 +516,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
[[package]]
name = "bytemuck"
-version = "1.15.0"
+version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
+checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31"
[[package]]
name = "byteorder"
@@ -496,12 +528,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
-version = "1.6.0"
+version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
-dependencies = [
- "serde",
-]
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
[[package]]
name = "bzip2"
@@ -560,13 +589,13 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.95"
+version = "1.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b"
+checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48"
dependencies = [
"jobserver",
"libc",
- "once_cell",
+ "shlex",
]
[[package]]
@@ -583,7 +612,7 @@ checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f"
dependencies = [
"byteorder",
"fnv",
- "uuid 1.8.0",
+ "uuid 1.10.0",
]
[[package]]
@@ -611,12 +640,6 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-[[package]]
-name = "cfg_aliases"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
-
[[package]]
name = "chrono"
version = "0.4.38"
@@ -629,7 +652,7 @@ dependencies = [
"num-traits",
"serde",
"wasm-bindgen",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -706,9 +729,9 @@ dependencies = [
[[package]]
name = "concurrent-queue"
-version = "2.4.0"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
dependencies = [
"crossbeam-utils",
]
@@ -756,9 +779,9 @@ dependencies = [
[[package]]
name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
[[package]]
name = "core-graphics"
@@ -799,51 +822,42 @@ dependencies = [
[[package]]
name = "cpufeatures"
-version = "0.2.12"
+version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
dependencies = [
"libc",
]
[[package]]
-name = "crash-context"
-version = "0.6.1"
+name = "crc"
+version = "3.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b85cef661eeca0c6675116310936972c520ebb0a33ddef16fd7efc957f4c1288"
+checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
dependencies = [
- "cfg-if",
- "libc",
- "mach2",
+ "crc-catalog",
]
[[package]]
-name = "crash-handler"
-version = "0.6.1"
+name = "crc-catalog"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed56890cb467e9ff5e6fe95254571beebb301990b5c7df5e97a7b203e4f0c4f0"
-dependencies = [
- "cfg-if",
- "crash-context",
- "libc",
- "mach2",
- "parking_lot",
-]
+checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
[[package]]
name = "crc32fast"
-version = "1.4.0"
+version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
dependencies = [
"cfg-if",
]
[[package]]
name = "crossbeam-channel"
-version = "0.5.12"
+version = "0.5.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
dependencies = [
"crossbeam-utils",
]
@@ -868,10 +882,19 @@ dependencies = [
]
[[package]]
-name = "crossbeam-utils"
-version = "0.8.19"
+name = "crossbeam-queue"
+version = "0.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
[[package]]
name = "crypto-bigint"
@@ -919,7 +942,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
dependencies = [
"quote",
- "syn 2.0.60",
+ "syn 2.0.74",
]
[[package]]
@@ -929,31 +952,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f"
dependencies = [
"quote",
- "syn 2.0.60",
+ "syn 2.0.74",
]
[[package]]
name = "daedalus"
-version = "0.1.27"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b251eb4ed1dd9c417eb098492dcf17f8271ba5722387ffa3ee703bcebdb4838"
+checksum = "314dac850cbf02b728fb531c1f3b1bec5b4ccdef6564db274470363792a6d302"
dependencies = [
- "bincode 2.0.0-rc.3",
"bytes",
"chrono",
- "reqwest 0.11.27",
"serde",
"serde_json",
- "sha1 0.6.1",
"thiserror",
- "tokio",
]
[[package]]
name = "darling"
-version = "0.20.8"
+version = "0.20.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
dependencies = [
"darling_core",
"darling_macro",
@@ -961,50 +980,66 @@ dependencies = [
[[package]]
name = "darling_core"
-version = "0.20.8"
+version = "0.20.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
dependencies = [
"fnv",
"ident_case",
"proc-macro2",
"quote",
"strsim",
- "syn 2.0.60",
+ "syn 2.0.74",
]
[[package]]
name = "darling_macro"
-version = "0.20.8"
+version = "0.20.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [
"darling_core",
"quote",
- "syn 2.0.60",
+ "syn 2.0.74",
+]
+
+[[package]]
+name = "dashmap"
+version = "6.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+ "hashbrown 0.14.5",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+ "serde",
]
[[package]]
name = "data-encoding"
-version = "2.5.0"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
+checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
[[package]]
-name = "debugid"
-version = "0.8.0"
+name = "dbus"
+version = "0.9.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
+checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b"
dependencies = [
- "serde",
- "uuid 1.8.0",
+ "libc",
+ "libdbus-sys",
+ "winapi",
]
[[package]]
name = "deflate64"
-version = "0.1.8"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83ace6c86376be0b6cdcf3fb41882e81d94b31587573d1cfa9d01cd06bba210d"
+checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b"
[[package]]
name = "der"
@@ -1040,15 +1075,15 @@ dependencies = [
[[package]]
name = "derive_more"
-version = "0.99.17"
+version = "0.99.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
dependencies = [
"convert_case",
"proc-macro2",
"quote",
"rustc_version",
- "syn 1.0.109",
+ "syn 2.0.74",
]
[[package]]
@@ -1107,9 +1142,9 @@ dependencies = [
[[package]]
name = "discord-rich-presence"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47fc4beffb85ee1461588499073a4d9c20dcc7728c4b13d6b282ab6c508947e5"
+checksum = "f632a41e3e97febf8edff46b1405f9875894c29e20a25c5abe566872226b3f84"
dependencies = [
"serde",
"serde_derive",
@@ -1123,6 +1158,12 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
+[[package]]
+name = "dotenvy"
+version = "0.15.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
+
[[package]]
name = "dtoa"
version = "1.0.9"
@@ -1131,18 +1172,18 @@ checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
[[package]]
name = "dtoa-short"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74"
+checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87"
dependencies = [
"dtoa",
]
[[package]]
name = "dunce"
-version = "1.0.4"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
[[package]]
name = "ecdsa"
@@ -1160,9 +1201,12 @@ dependencies = [
[[package]]
name = "either"
-version = "1.11.0"
+version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+dependencies = [
+ "serde",
+]
[[package]]
name = "elliptic-curve"
@@ -1186,14 +1230,14 @@ dependencies = [
[[package]]
name = "embed-resource"
-version = "2.4.2"
+version = "2.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d"
+checksum = "4edcacde9351c33139a41e3c97eb2334351a81a2791bebb0b243df837128f602"
dependencies = [
"cc",
"memchr",
"rustc_version",
- "toml 0.8.12",
+ "toml 0.8.19",
"vswhom",
"winreg 0.52.0",
]
@@ -1221,9 +1265,9 @@ dependencies = [
[[package]]
name = "enumflags2"
-version = "0.7.9"
+version = "0.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d"
+checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d"
dependencies = [
"enumflags2_derive",
"serde",
@@ -1231,13 +1275,13 @@ dependencies = [
[[package]]
name = "enumflags2_derive"
-version = "0.7.9"
+version = "0.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4"
+checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.74",
]
[[package]]
@@ -1248,14 +1292,25 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "errno"
-version = "0.3.8"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
dependencies = [
"libc",
"windows-sys 0.52.0",
]
+[[package]]
+name = "etcetera"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
+dependencies = [
+ "cfg-if",
+ "home",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "event-listener"
version = "2.5.3"
@@ -1275,20 +1330,9 @@ dependencies = [
[[package]]
name = "event-listener"
-version = "4.0.3"
+version = "5.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener"
-version = "5.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
dependencies = [
"concurrent-queue",
"parking",
@@ -1297,21 +1341,11 @@ dependencies = [
[[package]]
name = "event-listener-strategy"
-version = "0.4.0"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
dependencies = [
- "event-listener 4.0.3",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3"
-dependencies = [
- "event-listener 5.3.0",
+ "event-listener 5.3.1",
"pin-project-lite",
]
@@ -1326,9 +1360,9 @@ dependencies = [
[[package]]
name = "fastrand"
-version = "2.0.2"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
[[package]]
name = "fdeflate"
@@ -1361,38 +1395,37 @@ dependencies = [
[[package]]
name = "filetime"
-version = "0.2.23"
+version = "0.2.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
+checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "findshlibs"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40b9e59cd0f7e0806cca4be089683ecb6434e602038df21fe6bf6711b2f07f64"
-dependencies = [
- "cc",
- "lazy_static",
- "libc",
- "winapi",
+ "libredox",
+ "windows-sys 0.59.0",
]
[[package]]
name = "flate2"
-version = "1.0.28"
+version = "1.0.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920"
dependencies = [
"crc32fast",
"miniz_oxide",
]
+[[package]]
+name = "flume"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+ "spin",
+]
+
[[package]]
name = "fnv"
version = "1.0.7"
@@ -1426,7 +1459,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.74",
]
[[package]]
@@ -1511,6 +1544,17 @@ dependencies = [
"futures-util",
]
+[[package]]
+name = "futures-intrusive"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f"
+dependencies = [
+ "futures-core",
+ "lock_api",
+ "parking_lot",
+]
+
[[package]]
name = "futures-io"
version = "0.3.30"
@@ -1538,7 +1582,7 @@ version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
dependencies = [
- "fastrand 2.0.2",
+ "fastrand 2.1.0",
"futures-core",
"futures-io",
"parking",
@@ -1553,7 +1597,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.74",
]
[[package]]
@@ -1718,9 +1762,9 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.14"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
dependencies = [
"cfg-if",
"libc",
@@ -1729,9 +1773,9 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.28.1"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
[[package]]
name = "gio"
@@ -1823,8 +1867,8 @@ dependencies = [
"aho-corasick",
"bstr",
"log",
- "regex-automata 0.4.6",
- "regex-syntax 0.8.3",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
]
[[package]]
@@ -1838,17 +1882,6 @@ dependencies = [
"system-deps 6.2.2",
]
-[[package]]
-name = "goblin"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb07a4ffed2093b118a525b1d8f5204ae274faed5604537caf7135d0f18d9887"
-dependencies = [
- "log",
- "plain",
- "scroll",
-]
-
[[package]]
name = "group"
version = "0.13.0"
@@ -1917,36 +1950,17 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.3.26"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
+checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
dependencies = [
+ "atomic-waker",
"bytes",
"fnv",
"futures-core",
"futures-sink",
- "futures-util",
- "http 0.2.12",
- "indexmap 2.2.6",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "h2"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
"http 1.1.0",
- "indexmap 2.2.6",
+ "indexmap 2.4.0",
"slab",
"tokio",
"tokio-util",
@@ -1961,9 +1975,22 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
[[package]]
name = "hashbrown"
-version = "0.14.3"
+version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash",
+ "allocator-api2",
+]
+
+[[package]]
+name = "hashlink"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
+dependencies = [
+ "hashbrown 0.14.5",
+]
[[package]]
name = "heck"
@@ -1979,6 +2006,9 @@ name = "heck"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+dependencies = [
+ "unicode-segmentation",
+]
[[package]]
name = "heck"
@@ -1992,12 +2022,27 @@ version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+
[[package]]
name = "hex"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+[[package]]
+name = "hkdf"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
+dependencies = [
+ "hmac",
+]
+
[[package]]
name = "hmac"
version = "0.12.1"
@@ -2016,17 +2061,6 @@ dependencies = [
"windows-sys 0.52.0",
]
-[[package]]
-name = "hostname"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba"
-dependencies = [
- "cfg-if",
- "libc",
- "windows 0.52.0",
-]
-
[[package]]
name = "html5ever"
version = "0.26.0"
@@ -2065,20 +2099,9 @@ dependencies = [
[[package]]
name = "http-body"
-version = "0.4.6"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
-dependencies = [
- "bytes",
- "http 0.2.12",
- "pin-project-lite",
-]
-
-[[package]]
-name = "http-body"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
dependencies = [
"bytes",
"http 1.1.0",
@@ -2086,14 +2109,14 @@ dependencies = [
[[package]]
name = "http-body-util"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
dependencies = [
"bytes",
- "futures-core",
+ "futures-util",
"http 1.1.0",
- "http-body 1.0.0",
+ "http-body",
"pin-project-lite",
]
@@ -2105,52 +2128,22 @@ checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"
[[package]]
name = "httparse"
-version = "1.8.0"
+version = "1.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
-
-[[package]]
-name = "httpdate"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
[[package]]
name = "hyper"
-version = "0.14.28"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2 0.3.26",
- "http 0.2.12",
- "http-body 0.4.6",
- "httparse",
- "httpdate",
- "itoa 1.0.11",
- "pin-project-lite",
- "socket2 0.5.6",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
+checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
dependencies = [
"bytes",
"futures-channel",
"futures-util",
- "h2 0.4.4",
+ "h2",
"http 1.1.0",
- "http-body 1.0.0",
+ "http-body",
"httparse",
"itoa 1.0.11",
"pin-project-lite",
@@ -2160,48 +2153,37 @@ dependencies = [
]
[[package]]
-name = "hyper-tls"
-version = "0.5.0"
+name = "hyper-rustls"
+version = "0.27.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
dependencies = [
- "bytes",
- "hyper 0.14.28",
- "native-tls",
- "tokio",
- "tokio-native-tls",
-]
-
-[[package]]
-name = "hyper-tls"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
-dependencies = [
- "bytes",
- "http-body-util",
- "hyper 1.3.1",
+ "futures-util",
+ "http 1.1.0",
+ "hyper",
"hyper-util",
- "native-tls",
+ "rustls",
+ "rustls-pki-types",
"tokio",
- "tokio-native-tls",
+ "tokio-rustls",
"tower-service",
+ "webpki-roots",
]
[[package]]
name = "hyper-util"
-version = "0.1.3"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
+checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
dependencies = [
"bytes",
"futures-channel",
"futures-util",
"http 1.1.0",
- "http-body 1.0.0",
- "hyper 1.3.1",
+ "http-body",
+ "hyper",
"pin-project-lite",
- "socket2 0.5.6",
+ "socket2 0.5.7",
"tokio",
"tower",
"tower-service",
@@ -2267,7 +2249,7 @@ dependencies = [
"globset",
"log",
"memchr",
- "regex-automata 0.4.6",
+ "regex-automata 0.4.7",
"same-file",
"walkdir",
"winapi-util",
@@ -2298,12 +2280,12 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "2.2.6"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
dependencies = [
"equivalent",
- "hashbrown 0.14.3",
+ "hashbrown 0.14.5",
"serde",
]
@@ -2360,9 +2342,9 @@ dependencies = [
[[package]]
name = "instant"
-version = "0.1.12"
+version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
dependencies = [
"cfg-if",
]
@@ -2386,7 +2368,7 @@ version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.9",
"libc",
"windows-sys 0.48.0",
]
@@ -2470,32 +2452,31 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
[[package]]
name = "jobserver"
-version = "0.1.31"
+version = "0.1.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
dependencies = [
"libc",
]
[[package]]
name = "js-sys"
-version = "0.3.69"
+version = "0.3.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
dependencies = [
"wasm-bindgen",
]
[[package]]
name = "json-patch"
-version = "1.2.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6"
+checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b"
dependencies = [
"serde",
"serde_json",
"thiserror",
- "treediff",
]
[[package]]
@@ -2533,15 +2514,34 @@ dependencies = [
[[package]]
name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+dependencies = [
+ "spin",
+]
[[package]]
name = "libc"
-version = "0.2.153"
+version = "0.2.156"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a"
+
+[[package]]
+name = "libdbus-sys"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72"
+dependencies = [
+ "cc",
+ "pkg-config",
+]
+
+[[package]]
+name = "libm"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
[[package]]
name = "libredox"
@@ -2549,15 +2549,21 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"libc",
+ "redox_syscall 0.5.3",
]
[[package]]
-name = "line-wrap"
-version = "0.2.0"
+name = "libsqlite3-sys"
+version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e"
+checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f"
+dependencies = [
+ "cc",
+ "pkg-config",
+ "vcpkg",
+]
[[package]]
name = "linux-raw-sys"
@@ -2567,15 +2573,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]]
name = "linux-raw-sys"
-version = "0.4.13"
+version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
[[package]]
name = "lock_api"
-version = "0.4.11"
+version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
dependencies = [
"autocfg",
"scopeguard",
@@ -2583,9 +2589,9 @@ dependencies = [
[[package]]
name = "log"
-version = "0.4.21"
+version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
[[package]]
name = "loom"
@@ -2602,32 +2608,12 @@ dependencies = [
"tracing-subscriber",
]
-[[package]]
-name = "lzma-sys"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
[[package]]
name = "mac"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
-[[package]]
-name = "mach2"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "malloc_buf"
version = "0.0.6"
@@ -2667,19 +2653,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
[[package]]
-name = "memchr"
-version = "2.7.2"
+name = "md-5"
+version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
+dependencies = [
+ "cfg-if",
+ "digest",
+]
[[package]]
-name = "memmap2"
-version = "0.9.4"
+name = "memchr"
+version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
-dependencies = [
- "libc",
-]
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "memoffset"
@@ -2706,85 +2693,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]]
-name = "minidump-common"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bb6eaf88cc770fa58e6ae721cf2e40c2ca6a4c942ae8c7aa324d680bd3c6717"
-dependencies = [
- "bitflags 2.5.0",
- "debugid",
- "num-derive",
- "num-traits",
- "range-map",
- "scroll",
- "smart-default",
-]
-
-[[package]]
-name = "minidump-writer"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abcd9c8a1e6e1e9d56ce3627851f39a17ea83e17c96bc510f29d7e43d78a7d"
-dependencies = [
- "bitflags 2.5.0",
- "byteorder",
- "cfg-if",
- "crash-context",
- "goblin",
- "libc",
- "log",
- "mach2",
- "memmap2",
- "memoffset 0.9.1",
- "minidump-common",
- "nix 0.28.0",
- "procfs-core",
- "scroll",
- "tempfile",
- "thiserror",
-]
-
-[[package]]
-name = "minidumper"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b99697a8483221ca2d163aedcbee44f3851c4f5916ab0e96ae6397fb6b6deb2"
-dependencies = [
- "cfg-if",
- "crash-context",
- "libc",
- "log",
- "minidump-writer",
- "parking_lot",
- "polling 3.7.0",
- "scroll",
- "thiserror",
- "uds",
-]
-
-[[package]]
-name = "minidumper-child"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c4f23f835dbe67e44ddf884d3802ff549ca5948bf60e9fd70e9a13c96324d1"
-dependencies = [
- "crash-handler",
- "minidumper",
- "thiserror",
- "uuid 1.8.0",
-]
-
-[[package]]
-name = "minisign-verify"
+name = "minimal-lexical"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
-version = "0.7.2"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
dependencies = [
"adler",
"simd-adler32",
@@ -2803,21 +2721,15 @@ dependencies = [
]
[[package]]
-name = "native-tls"
-version = "0.2.11"
+name = "mio"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
dependencies = [
- "lazy_static",
+ "hermit-abi 0.3.9",
"libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -2866,31 +2778,38 @@ dependencies = [
"memoffset 0.7.1",
]
-[[package]]
-name = "nix"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
-dependencies = [
- "bitflags 2.5.0",
- "cfg-if",
- "cfg_aliases",
- "libc",
-]
-
[[package]]
name = "nodrop"
version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "normpath"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
[[package]]
name = "notify"
version = "6.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"crossbeam-channel",
"filetime",
"fsevent-sys",
@@ -2898,7 +2817,7 @@ dependencies = [
"kqueue",
"libc",
"log",
- "mio",
+ "mio 0.8.11",
"walkdir",
"windows-sys 0.48.0",
]
@@ -2932,6 +2851,23 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "num-bigint-dig"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
+dependencies = [
+ "byteorder",
+ "lazy_static",
+ "libm",
+ "num-integer",
+ "num-iter",
+ "num-traits",
+ "rand 0.8.5",
+ "smallvec",
+ "zeroize",
+]
+
[[package]]
name = "num-conv"
version = "0.1.0"
@@ -2939,33 +2875,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
[[package]]
-name = "num-derive"
-version = "0.4.2"
+name = "num-integer"
+version = "0.1.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.60",
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
]
[[package]]
name = "num-traits"
-version = "0.2.18"
+version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
dependencies = [
"autocfg",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi",
- "libc",
+ "libm",
]
[[package]]
@@ -3018,9 +2954,9 @@ dependencies = [
[[package]]
name = "objc-sys"
-version = "0.3.3"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da284c198fb9b7b0603f8635185e85fbd5b64ee154b1ed406d489077de2d6d60"
+checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
[[package]]
name = "objc2"
@@ -3058,9 +2994,9 @@ dependencies = [
[[package]]
name = "object"
-version = "0.32.2"
+version = "0.36.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
dependencies = [
"memchr",
]
@@ -3082,47 +3018,16 @@ dependencies = [
]
[[package]]
-name = "openssl"
-version = "0.10.64"
+name = "opener"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
+checksum = "d0812e5e4df08da354c851a3376fead46db31c2214f849d3de356d774d057681"
dependencies = [
- "bitflags 2.5.0",
- "cfg-if",
- "foreign-types 0.3.2",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.60",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.102"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
+ "bstr",
+ "dbus",
+ "normpath",
+ "url",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -3203,9 +3108,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
[[package]]
name = "parking_lot"
-version = "0.12.1"
+version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
dependencies = [
"lock_api",
"parking_lot_core",
@@ -3213,15 +3118,15 @@ dependencies = [
[[package]]
name = "parking_lot_core"
-version = "0.9.9"
+version = "0.9.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall",
+ "redox_syscall 0.5.3",
"smallvec",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -3237,9 +3142,9 @@ dependencies = [
[[package]]
name = "paste"
-version = "1.0.14"
+version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
[[package]]
name = "pathdiff"
@@ -3378,7 +3283,7 @@ dependencies = [
"phf_shared 0.11.2",
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.74",
]
[[package]]
@@ -3425,7 +3330,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.74",
]
[[package]]
@@ -3442,15 +3347,26 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "piper"
-version = "0.2.1"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
dependencies = [
"atomic-waker",
- "fastrand 2.0.2",
+ "fastrand 2.1.0",
"futures-io",
]
+[[package]]
+name = "pkcs1"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
+dependencies = [
+ "der",
+ "pkcs8",
+ "spki",
+]
+
[[package]]
name = "pkcs8"
version = "0.10.2"
@@ -3467,21 +3383,14 @@ version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
-[[package]]
-name = "plain"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
-
[[package]]
name = "plist"
-version = "1.6.1"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9"
+checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"
dependencies = [
- "base64 0.21.7",
- "indexmap 2.2.6",
- "line-wrap",
+ "base64 0.22.1",
+ "indexmap 2.4.0",
"quick-xml",
"serde",
"time",
@@ -3518,24 +3427,24 @@ dependencies = [
[[package]]
name = "polling"
-version = "3.7.0"
+version = "3.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3"
+checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511"
dependencies = [
"cfg-if",
"concurrent-queue",
- "hermit-abi",
+ "hermit-abi 0.4.0",
"pin-project-lite",
"rustix 0.38.34",
"tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
name = "portable-atomic"
-version = "1.6.0"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
[[package]]
name = "powerfmt"
@@ -3545,9 +3454,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
[[package]]
name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
[[package]]
name = "precomputed-hash"
@@ -3606,30 +3518,68 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
-version = "1.0.81"
+version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
dependencies = [
"unicode-ident",
]
[[package]]
-name = "procfs-core"
-version = "0.16.0"
+name = "quick-xml"
+version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29"
+checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2"
dependencies = [
- "bitflags 2.5.0",
- "hex",
+ "memchr",
]
[[package]]
-name = "quick-xml"
-version = "0.31.0"
+name = "quinn"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
+checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
dependencies = [
- "memchr",
+ "bytes",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash",
+ "rustls",
+ "socket2 0.5.7",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd"
+dependencies = [
+ "bytes",
+ "rand 0.8.5",
+ "ring",
+ "rustc-hash",
+ "rustls",
+ "slab",
+ "thiserror",
+ "tinyvec",
+ "tracing",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
+dependencies = [
+ "libc",
+ "once_cell",
+ "socket2 0.5.7",
+ "tracing",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -3701,7 +3651,7 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
]
[[package]]
@@ -3722,15 +3672,6 @@ dependencies = [
"rand_core 0.5.1",
]
-[[package]]
-name = "range-map"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12a5a2d6c7039059af621472a4389be1215a816df61aa4d531cfe85264aee95f"
-dependencies = [
- "num-traits",
-]
-
[[package]]
name = "raw-window-handle"
version = "0.5.2"
@@ -3766,27 +3707,36 @@ dependencies = [
"bitflags 1.3.2",
]
+[[package]]
+name = "redox_syscall"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
[[package]]
name = "redox_users"
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
dependencies = [
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
"libredox",
"thiserror",
]
[[package]]
name = "regex"
-version = "1.10.4"
+version = "1.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
dependencies = [
"aho-corasick",
"memchr",
- "regex-automata 0.4.6",
- "regex-syntax 0.8.3",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
]
[[package]]
@@ -3800,13 +3750,13 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.6"
+version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
dependencies = [
"aho-corasick",
"memchr",
- "regex-syntax 0.8.3",
+ "regex-syntax 0.8.4",
]
[[package]]
@@ -3817,87 +3767,47 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
[[package]]
name = "reqwest"
-version = "0.11.27"
+version = "0.12.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
+checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
dependencies = [
- "base64 0.21.7",
+ "async-compression",
+ "base64 0.22.1",
"bytes",
"encoding_rs",
"futures-core",
"futures-util",
- "h2 0.3.26",
- "http 0.2.12",
- "http-body 0.4.6",
- "hyper 0.14.28",
- "hyper-tls 0.5.0",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "native-tls",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls-pemfile 1.0.4",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper",
- "system-configuration",
- "tokio",
- "tokio-native-tls",
- "tokio-util",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-streams",
- "web-sys",
- "winreg 0.50.0",
-]
-
-[[package]]
-name = "reqwest"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
-dependencies = [
- "base64 0.22.0",
- "bytes",
- "encoding_rs",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2 0.4.4",
+ "h2",
"http 1.1.0",
- "http-body 1.0.0",
+ "http-body",
"http-body-util",
- "hyper 1.3.1",
- "hyper-tls 0.6.0",
+ "hyper",
+ "hyper-rustls",
"hyper-util",
"ipnet",
"js-sys",
"log",
"mime",
- "native-tls",
"once_cell",
"percent-encoding",
"pin-project-lite",
- "rustls-pemfile 2.1.2",
+ "quinn",
+ "rustls",
+ "rustls-pemfile",
+ "rustls-pki-types",
"serde",
"serde_json",
"serde_urlencoded",
"sync_wrapper",
"system-configuration",
"tokio",
- "tokio-native-tls",
+ "tokio-rustls",
"tokio-util",
"tower-service",
"url",
@@ -3905,6 +3815,7 @@ dependencies = [
"wasm-bindgen-futures",
"wasm-streams",
"web-sys",
+ "webpki-roots",
"winreg 0.52.0",
]
@@ -3949,10 +3860,51 @@ dependencies = [
]
[[package]]
-name = "rustc-demangle"
-version = "0.1.23"
+name = "ring"
+version = "0.17.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.15",
+ "libc",
+ "spin",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rsa"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc"
+dependencies = [
+ "const-oid",
+ "digest",
+ "num-bigint-dig",
+ "num-integer",
+ "num-traits",
+ "pkcs1",
+ "pkcs8",
+ "rand_core 0.6.4",
+ "signature",
+ "spki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[package]]
+name = "rustc-hash"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
[[package]]
name = "rustc_version"
@@ -3983,49 +3935,65 @@ version = "0.38.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"errno",
"libc",
- "linux-raw-sys 0.4.13",
+ "linux-raw-sys 0.4.14",
"windows-sys 0.52.0",
]
[[package]]
-name = "rustls-pemfile"
-version = "1.0.4"
+name = "rustls"
+version = "0.23.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
dependencies = [
- "base64 0.21.7",
+ "once_cell",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
]
[[package]]
name = "rustls-pemfile"
-version = "2.1.2"
+version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
+checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
dependencies = [
- "base64 0.22.0",
+ "base64 0.22.1",
"rustls-pki-types",
]
[[package]]
name = "rustls-pki-types"
-version = "1.5.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54"
+checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+
+[[package]]
+name = "rustls-webpki"
+version = "0.102.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
[[package]]
name = "rustversion"
-version = "1.0.15"
+version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
[[package]]
name = "ryu"
-version = "1.0.17"
+version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
[[package]]
name = "same-file"
@@ -4036,15 +4004,6 @@ dependencies = [
"winapi-util",
]
-[[package]]
-name = "schannel"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
[[package]]
name = "scoped-tls"
version = "1.0.1"
@@ -4057,26 +4016,6 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-[[package]]
-name = "scroll"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ab8598aa408498679922eff7fa985c25d58a90771bd6be794434c5277eab1a6"
-dependencies = [
- "scroll_derive",
-]
-
-[[package]]
-name = "scroll_derive"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.60",
-]
-
[[package]]
name = "sec1"
version = "0.7.3"
@@ -4091,29 +4030,6 @@ dependencies = [
"zeroize",
]
-[[package]]
-name = "security-framework"
-version = "2.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
[[package]]
name = "selectors"
version = "0.22.0"
@@ -4136,150 +4052,31 @@ dependencies = [
[[package]]
name = "semver"
-version = "1.0.22"
+version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
dependencies = [
"serde",
]
-[[package]]
-name = "sentry"
-version = "0.32.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00421ed8fa0c995f07cde48ba6c89e80f2b312f74ff637326f392fbfd23abe02"
-dependencies = [
- "httpdate",
- "native-tls",
- "reqwest 0.12.4",
- "sentry-backtrace",
- "sentry-contexts",
- "sentry-core",
- "sentry-debug-images",
- "sentry-panic",
- "sentry-tracing",
- "tokio",
- "ureq",
-]
-
-[[package]]
-name = "sentry-backtrace"
-version = "0.32.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a79194074f34b0cbe5dd33896e5928bbc6ab63a889bd9df2264af5acb186921e"
-dependencies = [
- "backtrace",
- "once_cell",
- "regex",
- "sentry-core",
-]
-
-[[package]]
-name = "sentry-contexts"
-version = "0.32.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eba8870c5dba2bfd9db25c75574a11429f6b95957b0a78ac02e2970dd7a5249a"
-dependencies = [
- "hostname",
- "libc",
- "os_info",
- "rustc_version",
- "sentry-core",
- "uname",
-]
-
-[[package]]
-name = "sentry-core"
-version = "0.32.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46a75011ea1c0d5c46e9e57df03ce81f5c7f0a9e199086334a1f9c0a541e0826"
-dependencies = [
- "once_cell",
- "rand 0.8.5",
- "sentry-types",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "sentry-debug-images"
-version = "0.32.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ec2a486336559414ab66548da610da5e9626863c3c4ffca07d88f7dc71c8de8"
-dependencies = [
- "findshlibs",
- "once_cell",
- "sentry-core",
-]
-
-[[package]]
-name = "sentry-panic"
-version = "0.32.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eaa3ecfa3c8750c78dcfd4637cfa2598b95b52897ed184b4dc77fcf7d95060d"
-dependencies = [
- "sentry-backtrace",
- "sentry-core",
-]
-
-[[package]]
-name = "sentry-rust-minidump"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bc709f4afe117f8cc85bde49db457f8115601fa1d4b69fa35c3f44bf9ee619c"
-dependencies = [
- "minidumper-child",
- "sentry",
- "thiserror",
-]
-
-[[package]]
-name = "sentry-tracing"
-version = "0.32.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f715932bf369a61b7256687c6f0554141b7ce097287e30e3f7ed6e9de82498fe"
-dependencies = [
- "sentry-backtrace",
- "sentry-core",
- "tracing-core",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "sentry-types"
-version = "0.32.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4519c900ce734f7a0eb7aba0869dfb225a7af8820634a7dd51449e3b093cfb7c"
-dependencies = [
- "debugid",
- "hex",
- "rand 0.8.5",
- "serde",
- "serde_json",
- "thiserror",
- "time",
- "url",
- "uuid 1.8.0",
-]
-
[[package]]
name = "serde"
-version = "1.0.198"
+version = "1.0.208"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc"
+checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.198"
+version = "1.0.208"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9"
+checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.74",
]
[[package]]
@@ -4295,12 +4092,13 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.116"
+version = "1.0.125"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
+checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed"
dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.4.0",
"itoa 1.0.11",
+ "memchr",
"ryu",
"serde",
]
@@ -4313,14 +4111,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.74",
]
[[package]]
name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
dependencies = [
"serde",
]
@@ -4339,15 +4137,15 @@ dependencies = [
[[package]]
name = "serde_with"
-version = "3.7.0"
+version = "3.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a"
+checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
"chrono",
"hex",
"indexmap 1.9.3",
- "indexmap 2.2.6",
+ "indexmap 2.4.0",
"serde",
"serde_derive",
"serde_json",
@@ -4357,14 +4155,14 @@ dependencies = [
[[package]]
name = "serde_with_macros"
-version = "3.7.0"
+version = "3.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655"
+checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.74",
]
[[package]]
@@ -4399,15 +4197,6 @@ dependencies = [
"stable_deref_trait",
]
-[[package]]
-name = "sha1"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
-dependencies = [
- "sha1_smol",
-]
-
[[package]]
name = "sha1"
version = "0.10.6"
@@ -4421,9 +4210,9 @@ dependencies = [
[[package]]
name = "sha1_smol"
-version = "1.0.0"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
+checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d"
[[package]]
name = "sha2"
@@ -4445,6 +4234,12 @@ dependencies = [
"lazy_static",
]
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
[[package]]
name = "signal-hook-registry"
version = "1.4.2"
@@ -4490,16 +4285,8 @@ name = "smallvec"
version = "1.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-
-[[package]]
-name = "smart-default"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1"
dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.60",
+ "serde",
]
[[package]]
@@ -4514,9 +4301,9 @@ dependencies = [
[[package]]
name = "socket2"
-version = "0.5.6"
+version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
dependencies = [
"libc",
"windows-sys 0.52.0",
@@ -4550,6 +4337,15 @@ dependencies = [
"system-deps 5.0.0",
]
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
[[package]]
name = "spki"
version = "0.7.3"
@@ -4560,6 +4356,202 @@ dependencies = [
"der",
]
+[[package]]
+name = "sqlformat"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f"
+dependencies = [
+ "nom",
+ "unicode_categories",
+]
+
+[[package]]
+name = "sqlx"
+version = "0.8.0-alpha.0"
+source = "git+https://github.com/launchbadge/sqlx.git?rev=352b02de6af70f1ff1bfbd15329120589a0f7337#352b02de6af70f1ff1bfbd15329120589a0f7337"
+dependencies = [
+ "sqlx-core",
+ "sqlx-macros",
+ "sqlx-mysql",
+ "sqlx-postgres",
+ "sqlx-sqlite",
+]
+
+[[package]]
+name = "sqlx-core"
+version = "0.8.0-alpha.0"
+source = "git+https://github.com/launchbadge/sqlx.git?rev=352b02de6af70f1ff1bfbd15329120589a0f7337#352b02de6af70f1ff1bfbd15329120589a0f7337"
+dependencies = [
+ "ahash",
+ "atoi",
+ "byteorder",
+ "bytes",
+ "crc",
+ "crossbeam-queue",
+ "either",
+ "event-listener 2.5.3",
+ "futures-channel",
+ "futures-core",
+ "futures-intrusive",
+ "futures-io",
+ "futures-util",
+ "hashlink",
+ "hex",
+ "indexmap 2.4.0",
+ "log",
+ "memchr",
+ "once_cell",
+ "paste",
+ "percent-encoding",
+ "serde",
+ "serde_json",
+ "sha2",
+ "smallvec",
+ "sqlformat",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "sqlx-macros"
+version = "0.8.0-alpha.0"
+source = "git+https://github.com/launchbadge/sqlx.git?rev=352b02de6af70f1ff1bfbd15329120589a0f7337#352b02de6af70f1ff1bfbd15329120589a0f7337"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "sqlx-core",
+ "sqlx-macros-core",
+ "syn 2.0.74",
+]
+
+[[package]]
+name = "sqlx-macros-core"
+version = "0.8.0-alpha.0"
+source = "git+https://github.com/launchbadge/sqlx.git?rev=352b02de6af70f1ff1bfbd15329120589a0f7337#352b02de6af70f1ff1bfbd15329120589a0f7337"
+dependencies = [
+ "dotenvy",
+ "either",
+ "heck 0.4.1",
+ "hex",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "sha2",
+ "sqlx-core",
+ "sqlx-mysql",
+ "sqlx-sqlite",
+ "syn 2.0.74",
+ "tempfile",
+ "tokio",
+ "url",
+]
+
+[[package]]
+name = "sqlx-mysql"
+version = "0.8.0-alpha.0"
+source = "git+https://github.com/launchbadge/sqlx.git?rev=352b02de6af70f1ff1bfbd15329120589a0f7337#352b02de6af70f1ff1bfbd15329120589a0f7337"
+dependencies = [
+ "atoi",
+ "base64 0.21.7",
+ "bitflags 2.6.0",
+ "byteorder",
+ "bytes",
+ "crc",
+ "digest",
+ "dotenvy",
+ "either",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-util",
+ "generic-array",
+ "hex",
+ "hkdf",
+ "hmac",
+ "itoa 1.0.11",
+ "log",
+ "md-5",
+ "memchr",
+ "once_cell",
+ "percent-encoding",
+ "rand 0.8.5",
+ "rsa",
+ "serde",
+ "sha1",
+ "sha2",
+ "smallvec",
+ "sqlx-core",
+ "stringprep",
+ "thiserror",
+ "tracing",
+ "whoami",
+]
+
+[[package]]
+name = "sqlx-postgres"
+version = "0.8.0-alpha.0"
+source = "git+https://github.com/launchbadge/sqlx.git?rev=352b02de6af70f1ff1bfbd15329120589a0f7337#352b02de6af70f1ff1bfbd15329120589a0f7337"
+dependencies = [
+ "atoi",
+ "base64 0.21.7",
+ "bitflags 2.6.0",
+ "byteorder",
+ "crc",
+ "dotenvy",
+ "etcetera",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-util",
+ "hex",
+ "hkdf",
+ "hmac",
+ "home",
+ "itoa 1.0.11",
+ "log",
+ "md-5",
+ "memchr",
+ "once_cell",
+ "rand 0.8.5",
+ "serde",
+ "serde_json",
+ "sha2",
+ "smallvec",
+ "sqlx-core",
+ "stringprep",
+ "thiserror",
+ "tracing",
+ "whoami",
+]
+
+[[package]]
+name = "sqlx-sqlite"
+version = "0.8.0-alpha.0"
+source = "git+https://github.com/launchbadge/sqlx.git?rev=352b02de6af70f1ff1bfbd15329120589a0f7337#352b02de6af70f1ff1bfbd15329120589a0f7337"
+dependencies = [
+ "atoi",
+ "flume",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-intrusive",
+ "futures-util",
+ "libsqlite3-sys",
+ "log",
+ "percent-encoding",
+ "serde",
+ "sqlx-core",
+ "tracing",
+ "url",
+ "urlencoding",
+]
+
[[package]]
name = "stable_deref_trait"
version = "1.2.0"
@@ -4608,16 +4600,27 @@ dependencies = [
]
[[package]]
-name = "strsim"
-version = "0.10.0"
+name = "stringprep"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+ "unicode-properties",
+]
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
name = "subtle"
-version = "2.5.0"
+version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "syn"
@@ -4632,9 +4635,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.60"
+version = "2.0.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
+checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7"
dependencies = [
"proc-macro2",
"quote",
@@ -4643,9 +4646,9 @@ dependencies = [
[[package]]
name = "sync_wrapper"
-version = "0.1.2"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
[[package]]
name = "sys-info"
@@ -4672,9 +4675,9 @@ dependencies = [
[[package]]
name = "sysinfo"
-version = "0.30.11"
+version = "0.30.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87341a165d73787554941cd5ef55ad728011566fe714e987d1b976c15dbc3a83"
+checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3"
dependencies = [
"cfg-if",
"core-foundation-sys",
@@ -4728,7 +4731,7 @@ dependencies = [
"cfg-expr 0.15.8",
"heck 0.5.0",
"pkg-config",
- "toml 0.8.12",
+ "toml 0.8.19",
"version-compare 0.2.0",
]
@@ -4773,7 +4776,7 @@ dependencies = [
"serde",
"tao-macros",
"unicode-segmentation",
- "uuid 1.8.0",
+ "uuid 1.10.0",
"windows 0.39.0",
"windows-implement",
"x11-dl",
@@ -4792,9 +4795,9 @@ dependencies = [
[[package]]
name = "tar"
-version = "0.4.40"
+version = "0.4.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
+checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909"
dependencies = [
"filetime",
"libc",
@@ -4803,19 +4806,17 @@ dependencies = [
[[package]]
name = "target-lexicon"
-version = "0.12.14"
+version = "0.12.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "tauri"
-version = "1.6.2"
+version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "047aefcc7721bfb8024a9bc39d4719112262610502de7a224fa62c4570cd78d4"
+checksum = "336bc661a3f3250853fa83c6e5245449ed1c26dce5dcb28bdee7efedf6278806"
dependencies = [
"anyhow",
- "base64 0.21.7",
- "bytes",
"cocoa 0.24.1",
"dirs-next",
"dunce",
@@ -4823,14 +4824,13 @@ dependencies = [
"encoding_rs",
"flate2",
"futures-util",
+ "getrandom 0.2.15",
"glib",
"glob",
"gtk",
"heck 0.5.0",
"http 0.2.12",
"ignore",
- "indexmap 1.9.3",
- "minisign-verify",
"objc",
"once_cell",
"open",
@@ -4839,7 +4839,6 @@ dependencies = [
"rand 0.8.5",
"raw-window-handle",
"regex",
- "reqwest 0.11.27",
"rfd",
"semver",
"serde",
@@ -4855,26 +4854,24 @@ dependencies = [
"tauri-utils",
"tempfile",
"thiserror",
- "time",
"tokio",
"url",
- "uuid 1.8.0",
+ "uuid 1.10.0",
"webkit2gtk",
"webview2-com",
"windows 0.39.0",
- "zip",
]
[[package]]
name = "tauri-build"
-version = "1.5.1"
+version = "1.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9914a4715e0b75d9f387a285c7e26b5bbfeb1249ad9f842675a82481565c532"
+checksum = "b0c6ec7a5c3296330c7818478948b422967ce4649094696c985f61d50076d29c"
dependencies = [
"anyhow",
"cargo_toml",
"dirs-next",
- "heck 0.4.1",
+ "heck 0.5.0",
"json-patch",
"semver",
"serde",
@@ -4886,12 +4883,12 @@ dependencies = [
[[package]]
name = "tauri-codegen"
-version = "1.4.2"
+version = "1.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1554c5857f65dbc377cefb6b97c8ac77b1cb2a90d30d3448114d5d6b48a77fc"
+checksum = "c1aed706708ff1200ec12de9cfbf2582b5d8ec05f6a7293911091effbd22036b"
dependencies = [
"base64 0.21.7",
- "brotli",
+ "brotli 3.5.0",
"ico",
"json-patch",
"plist",
@@ -4906,17 +4903,17 @@ dependencies = [
"tauri-utils",
"thiserror",
"time",
- "uuid 1.8.0",
+ "uuid 1.10.0",
"walkdir",
]
[[package]]
name = "tauri-macros"
-version = "1.4.3"
+version = "1.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "277abf361a3a6993ec16bcbb179de0d6518009b851090a01adfea12ac89fa875"
+checksum = "b88f831d2973ae4f81a706a0004e67dac87f2e4439973bbe98efbd73825d8ede"
dependencies = [
- "heck 0.4.1",
+ "heck 0.5.0",
"proc-macro2",
"quote",
"syn 1.0.109",
@@ -4943,7 +4940,7 @@ dependencies = [
[[package]]
name = "tauri-plugin-single-instance"
version = "0.0.0"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5e3900e682e13f3759b439116ae2f77a6d389ca2"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#dee5649476cee7c8c2e781ff16207246b6944008"
dependencies = [
"log",
"serde",
@@ -4957,10 +4954,10 @@ dependencies = [
[[package]]
name = "tauri-plugin-window-state"
version = "0.1.1"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5e3900e682e13f3759b439116ae2f77a6d389ca2"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#dee5649476cee7c8c2e781ff16207246b6944008"
dependencies = [
- "bincode 1.3.3",
- "bitflags 2.5.0",
+ "bincode",
+ "bitflags 2.6.0",
"log",
"serde",
"serde_json",
@@ -4970,9 +4967,9 @@ dependencies = [
[[package]]
name = "tauri-runtime"
-version = "0.14.2"
+version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf2d0652aa2891ff3e9caa2401405257ea29ab8372cce01f186a5825f1bd0e76"
+checksum = "3068ed62b63dedc705558f4248c7ecbd5561f0f8050949859ea0db2326f26012"
dependencies = [
"gtk",
"http 0.2.12",
@@ -4984,16 +4981,16 @@ dependencies = [
"tauri-utils",
"thiserror",
"url",
- "uuid 1.8.0",
+ "uuid 1.10.0",
"webview2-com",
"windows 0.39.0",
]
[[package]]
name = "tauri-runtime-wry"
-version = "0.14.5"
+version = "0.14.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "067c56fc153b3caf406d7cd6de4486c80d1d66c0f414f39e94cb2f5543f6445f"
+checksum = "d4c3db170233096aa30330feadcd895bf9317be97e624458560a20e814db7955"
dependencies = [
"cocoa 0.24.1",
"gtk",
@@ -5002,7 +4999,7 @@ dependencies = [
"raw-window-handle",
"tauri-runtime",
"tauri-utils",
- "uuid 1.8.0",
+ "uuid 1.10.0",
"webkit2gtk",
"webview2-com",
"windows 0.39.0",
@@ -5011,15 +5008,15 @@ dependencies = [
[[package]]
name = "tauri-utils"
-version = "1.5.3"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75ad0bbb31fccd1f4c56275d0a5c3abdf1f59999f72cb4ef8b79b4ed42082a21"
+checksum = "2826db448309d382dac14d520f0c0a40839b87b57b977e59cf5f296b3ace6a93"
dependencies = [
- "brotli",
+ "brotli 3.5.0",
"ctor",
"dunce",
"glob",
- "heck 0.4.1",
+ "heck 0.5.0",
"html5ever",
"infer",
"json-patch",
@@ -5051,14 +5048,15 @@ dependencies = [
[[package]]
name = "tempfile"
-version = "3.10.1"
+version = "3.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
dependencies = [
"cfg-if",
- "fastrand 2.0.2",
+ "fastrand 2.1.0",
+ "once_cell",
"rustix 0.38.34",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -5074,16 +5072,17 @@ dependencies = [
[[package]]
name = "theseus"
-version = "0.7.1"
+version = "0.8.2"
dependencies = [
"async-recursion",
"async-tungstenite",
"async_zip",
- "base64 0.22.0",
+ "base64 0.22.1",
"byteorder",
"bytes",
"chrono",
"daedalus",
+ "dashmap",
"dirs",
"discord-rich-presence",
"dunce",
@@ -5097,28 +5096,27 @@ dependencies = [
"paste",
"rand 0.8.5",
"regex",
- "reqwest 0.12.4",
+ "reqwest",
"serde",
"serde_ini",
"serde_json",
"sha1_smol",
"sha2",
+ "sqlx",
"sys-info",
"sysinfo",
"tauri",
"tempfile",
- "theseus_macros",
"thiserror",
"tokio",
"tokio-stream",
- "toml 0.8.12",
+ "toml 0.8.19",
"tracing",
- "tracing-appender",
"tracing-error",
"tracing-subscriber",
"url",
"urlencoding",
- "uuid 1.8.0",
+ "uuid 1.10.0",
"whoami",
"winreg 0.52.0",
"zip",
@@ -5126,19 +5124,20 @@ dependencies = [
[[package]]
name = "theseus_gui"
-version = "0.7.1"
+version = "0.8.2"
dependencies = [
"chrono",
"cocoa 0.25.0",
"daedalus",
+ "dashmap",
"dirs",
"futures",
"lazy_static",
"objc",
"once_cell",
+ "opener",
"os_info",
- "sentry",
- "sentry-rust-minidump",
+ "paste",
"serde",
"serde_json",
"tauri",
@@ -5153,23 +5152,14 @@ dependencies = [
"tracing",
"tracing-error",
"url",
- "uuid 1.8.0",
+ "uuid 1.10.0",
"window-shadows",
]
-[[package]]
-name = "theseus_macros"
-version = "0.1.0"
-dependencies = [
- "quote",
- "syn 2.0.60",
-]
-
[[package]]
name = "theseus_playground"
version = "0.0.0"
dependencies = [
- "daedalus",
"dunce",
"futures",
"serde",
@@ -5183,7 +5173,7 @@ dependencies = [
"tracing-error",
"tracing-subscriber",
"url",
- "uuid 1.8.0",
+ "uuid 1.10.0",
"webbrowser",
]
@@ -5195,22 +5185,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"
[[package]]
name = "thiserror"
-version = "1.0.59"
+version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.59"
+version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.74",
]
[[package]]
@@ -5256,9 +5246,9 @@ dependencies = [
[[package]]
name = "tinyvec"
-version = "1.6.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
dependencies = [
"tinyvec_macros",
]
@@ -5277,41 +5267,41 @@ checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8"
[[package]]
name = "tokio"
-version = "1.37.0"
+version = "1.39.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
dependencies = [
"backtrace",
"bytes",
"libc",
- "mio",
- "num_cpus",
+ "mio 1.0.2",
"parking_lot",
"pin-project-lite",
"signal-hook-registry",
- "socket2 0.5.6",
+ "socket2 0.5.7",
"tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
]
[[package]]
name = "tokio-macros"
-version = "2.2.0"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.74",
]
[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
+name = "tokio-rustls"
+version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
dependencies = [
- "native-tls",
+ "rustls",
+ "rustls-pki-types",
"tokio",
]
@@ -5328,9 +5318,9 @@ dependencies = [
[[package]]
name = "tokio-util"
-version = "0.7.10"
+version = "0.7.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
dependencies = [
"bytes",
"futures-core",
@@ -5338,7 +5328,6 @@ dependencies = [
"futures-sink",
"pin-project-lite",
"tokio",
- "tracing",
]
[[package]]
@@ -5364,21 +5353,21 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.8.12"
+version = "0.8.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
- "toml_edit 0.22.12",
+ "toml_edit 0.22.20",
]
[[package]]
name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
dependencies = [
"serde",
]
@@ -5389,7 +5378,7 @@ version = "0.19.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.4.0",
"serde",
"serde_spanned",
"toml_datetime",
@@ -5398,15 +5387,15 @@ dependencies = [
[[package]]
name = "toml_edit"
-version = "0.22.12"
+version = "0.22.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef"
+checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.4.0",
"serde",
"serde_spanned",
"toml_datetime",
- "winnow 0.6.6",
+ "winnow 0.6.18",
]
[[package]]
@@ -5422,20 +5411,19 @@ dependencies = [
"tokio",
"tower-layer",
"tower-service",
- "tracing",
]
[[package]]
name = "tower-layer"
-version = "0.3.2"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
[[package]]
name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
[[package]]
name = "tracing"
@@ -5449,18 +5437,6 @@ dependencies = [
"tracing-core",
]
-[[package]]
-name = "tracing-appender"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf"
-dependencies = [
- "crossbeam-channel",
- "thiserror",
- "time",
- "tracing-subscriber",
-]
-
[[package]]
name = "tracing-attributes"
version = "0.1.27"
@@ -5469,7 +5445,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.74",
]
[[package]]
@@ -5522,15 +5498,6 @@ dependencies = [
"tracing-log",
]
-[[package]]
-name = "treediff"
-version = "4.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d127780145176e2b5d16611cc25a900150e86e9fd79d3bde6ff3a37359c9cb5"
-dependencies = [
- "serde_json",
-]
-
[[package]]
name = "try-lock"
version = "0.2.5"
@@ -5539,9 +5506,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]]
name = "tungstenite"
-version = "0.21.0"
+version = "0.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1"
+checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8"
dependencies = [
"byteorder",
"bytes",
@@ -5549,11 +5516,11 @@ dependencies = [
"http 1.1.0",
"httparse",
"log",
- "native-tls",
"rand 0.8.5",
- "sha1 0.10.6",
+ "rustls",
+ "rustls-pki-types",
+ "sha1",
"thiserror",
- "url",
"utf-8",
]
@@ -5563,15 +5530,6 @@ version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-[[package]]
-name = "uds"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "885c31f06fce836457fe3ef09a59f83fe8db95d270b11cd78f40a4666c4d1661"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "uds_windows"
version = "1.1.0"
@@ -5583,15 +5541,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "uname"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "unicode-bidi"
version = "0.3.15"
@@ -5613,6 +5562,12 @@ dependencies = [
"tinyvec",
]
+[[package]]
+name = "unicode-properties"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291"
+
[[package]]
name = "unicode-segmentation"
version = "1.11.0"
@@ -5621,28 +5576,27 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
[[package]]
name = "unicode-width"
-version = "0.1.11"
+version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
[[package]]
-name = "ureq"
-version = "2.9.6"
+name = "unicode_categories"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35"
-dependencies = [
- "base64 0.21.7",
- "log",
- "native-tls",
- "once_cell",
- "url",
-]
+checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
[[package]]
name = "url"
-version = "2.5.0"
+version = "2.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
dependencies = [
"form_urlencoded",
"idna",
@@ -5668,16 +5622,16 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
dependencies = [
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
]
[[package]]
name = "uuid"
-version = "1.8.0"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
dependencies = [
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
"serde",
]
@@ -5707,15 +5661,9 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
[[package]]
name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "virtue"
-version = "0.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dcc60c0624df774c82a0ef104151231d37da4962957d691c011c852b2473314"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]]
name = "void"
@@ -5745,9 +5693,9 @@ dependencies = [
[[package]]
name = "waker-fn"
-version = "1.1.1"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
+checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
[[package]]
name = "walkdir"
@@ -5788,34 +5736,35 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
[[package]]
name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
dependencies = [
"cfg-if",
+ "once_cell",
"wasm-bindgen-macro",
]
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.74",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.42"
+version = "0.4.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
dependencies = [
"cfg-if",
"js-sys",
@@ -5825,9 +5774,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -5835,22 +5784,22 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.74",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
[[package]]
name = "wasm-streams"
@@ -5867,9 +5816,9 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.69"
+version = "0.3.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -5939,6 +5888,15 @@ dependencies = [
"system-deps 6.2.2",
]
+[[package]]
+name = "webpki-roots"
+version = "0.26.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd"
+dependencies = [
+ "rustls-pki-types",
+]
+
[[package]]
name = "webview2-com"
version = "0.19.1"
@@ -5983,7 +5941,7 @@ version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9"
dependencies = [
- "redox_syscall",
+ "redox_syscall 0.4.1",
"wasite",
"web-sys",
]
@@ -6006,11 +5964,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-util"
-version = "0.1.7"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134306a13c5647ad6453e8deaec55d3a44d6021970129e6188735e74bf546697"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -6074,7 +6032,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
dependencies = [
"windows-core",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -6093,7 +6051,7 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -6151,7 +6109,16 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
]
[[package]]
@@ -6186,18 +6153,18 @@ dependencies = [
[[package]]
name = "windows-targets"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
"windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
]
[[package]]
@@ -6212,7 +6179,7 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515"
dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -6229,9 +6196,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_msvc"
@@ -6259,9 +6226,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_i686_gnu"
@@ -6289,15 +6256,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
[[package]]
name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
[[package]]
name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_msvc"
@@ -6325,9 +6292,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
[[package]]
name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_x86_64_gnu"
@@ -6355,9 +6322,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnullvm"
@@ -6373,9 +6340,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_msvc"
@@ -6403,9 +6370,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winnow"
@@ -6418,9 +6385,9 @@ dependencies = [
[[package]]
name = "winnow"
-version = "0.6.6"
+version = "0.6.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
dependencies = [
"memchr",
]
@@ -6447,9 +6414,9 @@ dependencies = [
[[package]]
name = "wry"
-version = "0.24.8"
+version = "0.24.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a04e72739ee84a218e3dbf8625888eadc874285637003ed21ab96a1bbbb538ec"
+checksum = "00711278ed357350d44c749c286786ecac644e044e4da410d466212152383b45"
dependencies = [
"base64 0.13.1",
"block",
@@ -6511,27 +6478,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
dependencies = [
"libc",
- "linux-raw-sys 0.4.13",
+ "linux-raw-sys 0.4.14",
"rustix 0.38.34",
]
[[package]]
name = "xdg-home"
-version = "1.1.0"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e"
+checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6"
dependencies = [
"libc",
- "winapi",
-]
-
-[[package]]
-name = "xz2"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2"
-dependencies = [
- "lzma-sys",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -6558,13 +6516,13 @@ dependencies = [
"futures-sink",
"futures-util",
"hex",
- "nix 0.26.4",
+ "nix",
"once_cell",
"ordered-stream",
"rand 0.8.5",
"serde",
"serde_repr",
- "sha1 0.10.6",
+ "sha1",
"static_assertions",
"tracing",
"uds_windows",
@@ -6601,10 +6559,31 @@ dependencies = [
]
[[package]]
-name = "zeroize"
-version = "1.7.0"
+name = "zerocopy"
+version = "0.7.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.74",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
[[package]]
name = "zip"
@@ -6621,7 +6600,7 @@ dependencies = [
"flate2",
"hmac",
"pbkdf2",
- "sha1 0.10.6",
+ "sha1",
"time",
"zstd 0.11.2+zstd.1.5.2",
]
@@ -6637,11 +6616,11 @@ dependencies = [
[[package]]
name = "zstd"
-version = "0.13.1"
+version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a"
+checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9"
dependencies = [
- "zstd-safe 7.1.0",
+ "zstd-safe 7.2.1",
]
[[package]]
@@ -6656,18 +6635,18 @@ dependencies = [
[[package]]
name = "zstd-safe"
-version = "7.1.0"
+version = "7.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a"
+checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059"
dependencies = [
"zstd-sys",
]
[[package]]
name = "zstd-sys"
-version = "2.0.10+zstd.1.5.6"
+version = "2.0.13+zstd.1.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa"
+checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
dependencies = [
"cc",
"pkg-config",
diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
index 3d43797b9b1b..e93e99ea610f 100644
--- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
@@ -1,86 +1,55 @@
{
lib,
stdenv,
- stdenvNoCC,
fetchFromGitHub,
rustPlatform,
- buildGoModule,
- nix-update-script,
- modrinth-app-unwrapped,
cacert,
cargo-tauri,
- desktop-file-utils,
- esbuild,
darwin,
- jq,
+ desktop-file-utils,
libsoup,
- moreutils,
- pnpm_8,
nodejs,
openssl,
pkg-config,
+ pnpm_9,
+ turbo,
webkitgtk_4_0,
}:
-rustPlatform.buildRustPackage {
+
+let
+ pnpm = pnpm_9;
+in
+rustPlatform.buildRustPackage rec {
pname = "modrinth-app-unwrapped";
- version = "0.7.1";
+ version = "0.8.2";
src = fetchFromGitHub {
owner = "modrinth";
- repo = "theseus";
- rev = "v${modrinth-app-unwrapped.version}";
- hash = "sha256-JWR0e2vOBvOLosr22Oo2mAlR0KAhL+261RRybhNctlM=";
+ repo = "code";
+ rev = "a0bd011b808cdc998ef27960f610a8d99550c914";
+ hash = "sha256-zpFJq7if5gOx7jvwpE73lqH4Vpif0MJMPIGsgtThKVk=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
- "tauri-plugin-single-instance-0.0.0" = "sha256-Mf2/cnKotd751ZcSHfiSLNe2nxBfo4dMBdoCwQhe7yI=";
+ "sqlx-0.8.0-alpha.0" = "sha256-M1bumCMTzgDcQlgSYB6ypPp794e35ZSQCLzkbrFV4qY=";
+ "tauri-plugin-single-instance-0.0.0" = "sha256-DZWTO2/LevbQJCJbeHbTc2rhesV3bNrs+BoYm2eMakA=";
};
};
- pnpm-deps = stdenvNoCC.mkDerivation (finalAttrs: {
- pname = "${modrinth-app-unwrapped.pname}-pnpm-deps";
- inherit (modrinth-app-unwrapped) version src;
- sourceRoot = "${finalAttrs.src.name}/theseus_gui";
-
- dontConfigure = true;
- dontBuild = true;
- doCheck = false;
-
- nativeBuildInputs = [
- cacert
- jq
- moreutils
- pnpm_8
- ];
-
- # https://github.com/NixOS/nixpkgs/blob/763e59ffedb5c25774387bf99bc725df5df82d10/pkgs/applications/misc/pot/default.nix#L56
- installPhase = ''
- export HOME=$(mktemp -d)
-
- pnpm config set store-dir "$out"
- pnpm install --frozen-lockfile --ignore-script --force
-
- # remove timestamp and sort json files
- rm -rf "$out"/v3/tmp
- for f in $(find "$out" -name "*.json"); do
- sed -i -E -e 's/"checkedAt":[0-9]+,//g' $f
- jq --sort-keys . "$f" | sponge "$f"
- done
- '';
-
- dontFixup = true;
- outputHashMode = "recursive";
- outputHash = "sha256-g/uUGfC9TQh0LE8ed51oFY17FySoeTvfaeEpzpNeMao=";
- });
+ pnpmDeps = pnpm.fetchDeps {
+ inherit pname version src;
+ hash = "sha256-Ye9GHvkO+xZj87NIc1JLmhIJFqdkJMg7HvfTltx9krw=";
+ };
nativeBuildInputs = [
+ cacert # required for turbo
cargo-tauri.hook
desktop-file-utils
- pnpm_8
nodejs
pkg-config
+ pnpm.configHook
];
buildInputs =
@@ -100,37 +69,12 @@ rustPlatform.buildRustPackage {
);
env = {
- ESBUILD_BINARY_PATH = lib.getExe (
- esbuild.override {
- buildGoModule = args: buildGoModule (args // rec {
- version = "0.20.2";
- src = fetchFromGitHub {
- owner = "evanw";
- repo = "esbuild";
- rev = "v${version}";
- hash = "sha256-h/Vqwax4B4nehRP9TaYbdixAZdb1hx373dNxNHvDrtY=";
- };
- vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
- });
- }
- );
+ TURBO_BINARY_PATH = lib.getExe turbo;
};
- postPatch = ''
- export HOME=$(mktemp -d)
- export STORE_PATH=$(mktemp -d)
-
- pushd theseus_gui
- cp -rT ${modrinth-app-unwrapped.pnpm-deps} "$STORE_PATH"
- chmod -R +w "$STORE_PATH"
-
- pnpm config set store-dir "$STORE_PATH"
- pnpm install --offline --frozen-lockfile --ignore-script
- popd
- '';
-
postInstall =
lib.optionalString stdenv.hostPlatform.isDarwin ''
+ mkdir -p "$out"/bin
mv "$out"/Applications/Modrinth\ App.app/Contents/MacOS/Modrinth\ App "$out"/bin/modrinth-app
ln -s "$out"/bin/modrinth-app "$out"/Applications/Modrinth\ App.app/Contents/MacOS/Modrinth\ App
''
@@ -144,26 +88,23 @@ rustPlatform.buildRustPackage {
$out/share/applications/modrinth-app.desktop
'';
- passthru = {
- updateScript = nix-update-script { };
- };
-
meta = {
description = "Modrinth's game launcher";
longDescription = ''
A unique, open source launcher that allows you to play your favorite mods,
and keep them up to date, all in one neat little package
'';
- mainProgram = "modrinth-app";
homepage = "https://modrinth.com";
- changelog = "https://github.com/modrinth/theseus/releases/tag/v${modrinth-app-unwrapped.version}";
license = with lib.licenses; [
gpl3Plus
unfreeRedistributable
];
maintainers = with lib.maintainers; [ getchoo ];
- platforms = lib.platforms.linux ++ lib.platforms.darwin;
- # this builds on architectures like aarch64, but the launcher itself does not support them yet
- broken = !stdenv.hostPlatform.isx86_64;
+ mainProgram = "modrinth-app";
+ platforms = with lib; platforms.linux ++ platforms.darwin;
+ # This builds on architectures like aarch64, but the launcher itself does not support them yet.
+ # Darwin is the only exception
+ # See https://github.com/modrinth/code/issues/776#issuecomment-1742495678
+ broken = !stdenv.hostPlatform.isx86_64 && !stdenv.hostPlatform.isDarwin;
};
}
diff --git a/pkgs/by-name/mo/modrinth-app/package.nix b/pkgs/by-name/mo/modrinth-app/package.nix
index c92b6319d5a5..8f17cd3c9e7c 100644
--- a/pkgs/by-name/mo/modrinth-app/package.nix
+++ b/pkgs/by-name/mo/modrinth-app/package.nix
@@ -3,10 +3,9 @@
stdenv,
symlinkJoin,
modrinth-app-unwrapped,
- wrapGAppsHook3,
addDriverRunpath,
+ alsa-lib,
flite,
- glib,
glib-networking,
jdk8,
jdk17,
@@ -17,10 +16,14 @@
jdk21
],
libGL,
+ libjack2,
libpulseaudio,
+ pipewire,
udev,
+ wrapGAppsHook3,
xorg,
}:
+
symlinkJoin rec {
name = "${pname}-${version}";
pname = "modrinth-app";
@@ -28,37 +31,44 @@ symlinkJoin rec {
paths = [ modrinth-app-unwrapped ];
- buildInputs = [
- glib
- glib-networking
- ];
+ nativeBuildInputs = [ wrapGAppsHook3 ];
- nativeBuildInputs = [
- wrapGAppsHook3
- ];
+ buildInputs = [ glib-networking ];
- runtimeDependencies = lib.optionalString stdenv.hostPlatform.isLinux (lib.makeLibraryPath [
- addDriverRunpath.driverLink
- flite # narrator support
+ runtimeDependencies = lib.optionalString stdenv.hostPlatform.isLinux (
+ lib.makeLibraryPath [
+ addDriverRunpath.driverLink
- udev # oshi
+ # glfw
+ libGL
+ xorg.libX11
+ xorg.libXcursor
+ xorg.libXext
+ xorg.libXrandr
+ xorg.libXxf86vm
- # lwjgl
- libGL
- libpulseaudio
- stdenv.cc.cc.lib
- xorg.libX11
- xorg.libXcursor
- xorg.libXext
- xorg.libXxf86vm
- xorg.libXrandr
- ]);
+ # lwjgl
+ stdenv.cc.cc.lib
+
+ # narrator support
+ flite
+
+ # openal
+ alsa-lib
+ libjack2
+ libpulseaudio
+ pipewire
+
+ # oshi
+ udev
+ ]
+ );
postBuild = ''
gappsWrapperArgs+=(
--prefix PATH : ${lib.makeSearchPath "bin/java" jdks}
${lib.optionalString stdenv.hostPlatform.isLinux ''
- --prefix PATH : ${lib.makeBinPath [xorg.xrandr]}
+ --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]}
--set LD_LIBRARY_PATH $runtimeDependencies
''}
)
@@ -66,5 +76,16 @@ symlinkJoin rec {
wrapGAppsHook
'';
- inherit (modrinth-app-unwrapped) meta;
+ meta = {
+ inherit (modrinth-app-unwrapped.meta)
+ description
+ longDescription
+ homepage
+ license
+ maintainers
+ mainProgram
+ platforms
+ broken
+ ;
+ };
}
diff --git a/pkgs/by-name/mo/mollysocket/package.nix b/pkgs/by-name/mo/mollysocket/package.nix
index 6c9e18cc8f15..c282bbba2630 100644
--- a/pkgs/by-name/mo/mollysocket/package.nix
+++ b/pkgs/by-name/mo/mollysocket/package.nix
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "mollysocket";
- version = "1.4.1";
+ version = "1.5.1";
src = fetchFromGitHub {
owner = "mollyim";
repo = "mollysocket";
rev = version;
- hash = "sha256-vE5J4BKYmVqtowfxDDTOwFKws7phYRm9xKFPiDNuNn4=";
+ hash = "sha256-RRnMmdyr4FZHsdLjGvTRiSw+YC+OutWqsoEId7ZlSX0=";
};
- cargoHash = "sha256-s/EhX5o6XuUqcrqhXY274MyWhRukgetfIZKQ4XNlq6Y=";
+ cargoHash = "sha256-BXllzuw01ANrk+osUsAlMyLRAptvxGO+rl0ygsCfewU=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/by-name/mo/monado-vulkan-layers/absolute-layer-path.patch b/pkgs/by-name/mo/monado-vulkan-layers/absolute-layer-path.patch
new file mode 100644
index 000000000000..60784fc7ec9d
--- /dev/null
+++ b/pkgs/by-name/mo/monado-vulkan-layers/absolute-layer-path.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d9a1b56..9a07e69 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,6 +41,7 @@ generate_vulkan_api_layer_manifest_at_install(
+ RELATIVE_LAYER_DIR ${LAYER_INSTALLDIR}
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/vulkan/implicit_layer.d
+ COMPONENT vulkan_layer
++ ABSOLUTE_LAYER_PATH
+ )
+
+ set(CPACK_COMPONENT_vulkan_layer_DISPLAY_NAME "Timeline Semaphore Vulkan Implicit Layer")
diff --git a/pkgs/by-name/mo/monado-vulkan-layers/package.nix b/pkgs/by-name/mo/monado-vulkan-layers/package.nix
new file mode 100644
index 000000000000..820a07d5d9b2
--- /dev/null
+++ b/pkgs/by-name/mo/monado-vulkan-layers/package.nix
@@ -0,0 +1,44 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitLab,
+ cmake,
+ vulkan-headers,
+ vulkan-loader,
+}:
+stdenv.mkDerivation {
+ pname = "monado-vulkan-layers";
+ version = "0-unstable-2024-02-21";
+
+ src = fetchFromGitLab {
+ domain = "gitlab.freedesktop.org";
+ owner = "monado";
+ repo = "utilities/vulkan-layers";
+ rev = "ae43cdcbd25c56e3481bbc8a0ce2bfcebba9f7c2";
+ sha256 = "sha256-QabYVKcenW+LQ+QSjUoQOLOQAVHdjE0YXd+1WsdzNPc=";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ ];
+
+ buildInputs = [
+ vulkan-headers
+ vulkan-loader
+ ];
+
+ patches = [
+ ./absolute-layer-path.patch
+ ];
+
+ meta = with lib; {
+ description = "Vulkan Layers for Monado";
+ homepage = "https://gitlab.freedesktop.org/monado/utilities/vulkan-layers";
+ platforms = platforms.linux;
+ license = licenses.boost;
+ maintainers = with maintainers; [
+ Scrumplex
+ passivelemon
+ ];
+ };
+}
diff --git a/pkgs/by-name/mo/mozc-ut/package.nix b/pkgs/by-name/mo/mozc-ut/package.nix
new file mode 100644
index 000000000000..a758f1e8d622
--- /dev/null
+++ b/pkgs/by-name/mo/mozc-ut/package.nix
@@ -0,0 +1,23 @@
+{
+ mozc,
+ mozcdic-ut-alt-cannadic,
+ mozcdic-ut-edict2,
+ mozcdic-ut-jawiki,
+ mozcdic-ut-neologd,
+ mozcdic-ut-personal-names,
+ mozcdic-ut-place-names,
+ mozcdic-ut-skk-jisyo,
+ mozcdic-ut-sudachidict,
+}:
+mozc.override {
+ dictionaries = [
+ mozcdic-ut-alt-cannadic
+ mozcdic-ut-edict2
+ mozcdic-ut-jawiki
+ mozcdic-ut-neologd
+ mozcdic-ut-personal-names
+ mozcdic-ut-place-names
+ mozcdic-ut-skk-jisyo
+ mozcdic-ut-sudachidict
+ ];
+}
diff --git a/pkgs/by-name/mo/mozc/package.nix b/pkgs/by-name/mo/mozc/package.nix
index b374329d23ff..a1b0e804f452 100644
--- a/pkgs/by-name/mo/mozc/package.nix
+++ b/pkgs/by-name/mo/mozc/package.nix
@@ -17,7 +17,7 @@ let
ut-dictionary = merge-ut-dictionaries.override { inherit dictionaries; };
in
buildBazelPackage rec {
- pname = "ibus-mozc";
+ pname = "mozc";
version = "2.30.5544.102";
src = fetchFromGitHub {
diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix
index 9bd0b1696689..dbb920db3495 100644
--- a/pkgs/by-name/mo/mozillavpn/package.nix
+++ b/pkgs/by-name/mo/mozillavpn/package.nix
@@ -32,20 +32,16 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-X2rtHAZ9vbWjuOmD3B/uPasUQ1Q+b4SkNqk4MqGMaYo=";
};
patches = [
- # Fix build errors from deprecated QByteArray::count()
+ # Fix build errors from deprecated `QByteArray::count()`, `QVariant::type()`, `QEventPoint::pos()` (#9961)
(fetchpatch {
- url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/9961/commits/1b358d27d4bf29567b5d58f3591146bf639b99e1.patch";
- hash = "sha256-LeDgwZaQDgS8HNf9k2fC0RYQy4nGEq0DMNjY7muNads=";
+ url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/b4077b9927d9208118e81694dce490dac2f0e76f.patch";
+ hash = "sha256-Vx7aHEBxubthqsmH37ZZDJDPI9jE9vS/p+JNJP6eUlI=";
})
- # Fix build errors from deprecated QVariant::type()
+ # Re:#9966 Fix Crash in MZFlickable
(fetchpatch {
- url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/9961/commits/ebdd38ce19ef6eb80f076acf93299bd7d24ae6db.patch";
- hash = "sha256-ZWl0wHH5Foxlttj/GK5phr/C6qJv39U2GWIofZR+Rto=";
- })
- # Fix build errors from deprecated QEventPoint::pos and friends
- (fetchpatch {
- url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/9961/commits/10b1c98517dac4eacffd6890c551b817aedd4a19.patch";
- hash = "sha256-DHOtvVDEdQ+k2ggg4HGpcv1EmKzlijNRTi1yJ7a1bWU=";
+ url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/9984/commits/485a2ad8feab6b1dee7c672ce03736d819fd9d37.patch";
+ includes = [ "nebula/ui/components/MZFlickable.qml" ];
+ hash = "sha256-fnOXBTsuQC3kqAvHgoJ7rRGX5ra0R/MO8M9Ysys/l7Q=";
})
];
diff --git a/pkgs/by-name/mu/mud/package.nix b/pkgs/by-name/mu/mud/package.nix
new file mode 100644
index 000000000000..6114eb39d735
--- /dev/null
+++ b/pkgs/by-name/mu/mud/package.nix
@@ -0,0 +1,48 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ python3Packages,
+ versionCheckHook,
+}:
+
+python3Packages.buildPythonApplication rec {
+ pname = "mud";
+ version = "1.0.1";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "jasursadikov";
+ repo = "mud";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-pW4B4+RN7hKtG2enJ33OHBeGsLj8w20ylvjcOL6owAk=";
+ };
+
+ build-system = with python3Packages; [
+ hatchling
+ ];
+
+ dependencies = with python3Packages; [
+ prettytable
+ ];
+
+ pythonImportsCheck = [ "mud" ];
+
+ # Version checking fails on darwin with:
+ # PermissionError: [Errno 1] Operation not permitted: '/var/empty/.mudsettings'
+ # despite adding `export HOME=$(mktemp -d)` in the `preVersionCheck` phase.
+ # The tool
+ nativeCheckInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
+ versionCheckHook
+ ];
+ versionCheckProgramArg = [ "--version" ];
+
+ meta = {
+ description = "multi-directory git runner which allows you to run git commands in a multiple repositories";
+ homepage = "https://github.com/jasursadikov/mud";
+ license = lib.licenses.mit;
+ changelog = "https://github.com/jasursadikov/mud/releases/tag/v${version}";
+ maintainers = with lib.maintainers; [ genga898 ];
+ mainProgram = "mud";
+ };
+}
diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix
index 2dd6f0463833..84b63cc542ce 100644
--- a/pkgs/by-name/mu/mullvad-browser/package.nix
+++ b/pkgs/by-name/mu/mullvad-browser/package.nix
@@ -90,7 +90,7 @@ let
++ lib.optionals mediaSupport [ ffmpeg ]
);
- version = "13.5.7";
+ version = "13.5.9";
sources = {
x86_64-linux = fetchurl {
@@ -102,7 +102,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-Te6Cw3fUs4XGz07lL54bKUU9HYC5soaKFlbWGujd/oU=";
+ hash = "sha256-hyFYI42IfFY0vqkqInkLQAWSY8flsmWGN8CaXBwXbGA=";
};
};
diff --git a/pkgs/by-name/mu/mumps/package.nix b/pkgs/by-name/mu/mumps/package.nix
index 7d0e3e154cb4..2620d5b602b5 100644
--- a/pkgs/by-name/mu/mumps/package.nix
+++ b/pkgs/by-name/mu/mumps/package.nix
@@ -6,9 +6,55 @@
lapack,
lib,
metis,
+ parmetis,
+ withParmetis ? false, # default to false due to unfree license
scotch,
+ withPtScotch ? mpiSupport,
stdenv,
+ fixDarwinDylibNames,
+ mpi,
+ mpiSupport ? false,
+ mpiCheckPhaseHook,
+ scalapack,
}:
+assert withParmetis -> mpiSupport;
+assert withPtScotch -> mpiSupport;
+let
+ profile = if mpiSupport then "debian.PAR" else "debian.SEQ";
+ metisFlags =
+ if withParmetis then
+ ''
+ IMETIS="-I${parmetis}/include -I${metis}/include" \
+ LMETIS="-L${parmetis}/lib -lparmetis -L${metis}/lib -lmetis"
+ ''
+ else
+ ''
+ IMETIS=-I${metis}/include \
+ LMETIS="-L${metis}/lib -lmetis"
+ '';
+ scotchFlags =
+ if withPtScotch then
+ ''
+ ISCOTCH=-I${scotch.dev}/include \
+ LSCOTCH="-L${scotch}/lib -lptscotch -lptesmumps -lptscotcherr"
+ ''
+ else
+ ''
+ ISCOTCH=-I${scotch.dev}/include \
+ LSCOTCH="-L${scotch}/lib -lesmumps -lscotch -lscotcherr"
+ '';
+ macroFlags =
+ "-Dmetis -Dpord -Dscotch"
+ + lib.optionalString withParmetis " -Dparmetis"
+ + lib.optionalString withPtScotch " -Dptscotch";
+ # Optimized options
+ # Disable -fopenmp in lines below to benefit from OpenMP
+ optFlags = ''
+ OPTF="-O3 -fallow-argument-mismatch" \
+ OPTL="-O3" \
+ OPTC="-O3"
+ '';
+in
stdenv.mkDerivation (finalAttrs: {
name = "mumps";
version = "5.7.3";
@@ -18,28 +64,20 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-ZnIfAuvOBJDYqCtKGlWs0r39nG6X2lAVRuUmeIJenZw=";
};
- patches = [
- # Compatibility with coin-or-mumps version
- (fetchpatch {
- url = "https://raw.githubusercontent.com/coin-or-tools/ThirdParty-Mumps/bd0bdf9baa3f3677bd34fb36ce63b2b32cc6cc7d/mumps_mpi.patch";
- hash = "sha256-70qZUKBVBpJOSRxYxng5Y6ct1fdCUQUGur3chDhGabQ=";
- })
- ];
-
- postPatch =
- ''
- # Compatibility with coin-or-mumps version
- # https://github.com/coin-or-tools/ThirdParty-Mumps/blob/stable/3.0/get.Mumps#L66
- cp libseq/mpi.h libseq/mumps_mpi.h
- ''
- + lib.optionalString stdenv.hostPlatform.isDarwin ''
- substituteInPlace src/Makefile --replace-fail \
- "-Wl,\''$(SONAME),libmumps_common" \
- "-Wl,-install_name,$out/lib/libmumps_common"
- '';
+ postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+ substituteInPlace src/Makefile --replace-fail \
+ "-Wl,\''$(SONAME),libmumps_common" \
+ "-Wl,-install_name,$out/lib/libmumps_common"
+ '';
configurePhase = ''
- cp Make.inc/Makefile.debian.SEQ ./Makefile.inc
+ cp Make.inc/Makefile.${profile} ./Makefile.inc
+ '';
+
+ enableParallelBuilding = true;
+
+ preBuild = ''
+ makeFlagsArray+=(${metisFlags} ${scotchFlags} ORDERINGSF="${macroFlags}" ${optFlags})
'';
makeFlags =
@@ -48,84 +86,74 @@ stdenv.mkDerivation (finalAttrs: {
"LIBEXT_SHARED=.dylib"
]
++ [
- "LSCOTCHDIR=${scotch}/lib"
- "ISCOTCH=-I${scotch.dev}/include"
- "LMETISDIR=${metis}/lib"
- "IMETIS=-I${metis}/include"
+ "SCALAP=-lscalapack"
"allshared"
];
- installPhase = ''
- mkdir $out
- cp -r include lib $out
+ installPhase =
+ ''
+ mkdir $out
+ cp -r include lib $out
+ ''
+ + lib.optionalString (!mpiSupport) ''
+ # Install mumps_seq headers
+ install -Dm 444 -t $out/include/mumps_seq libseq/*.h
- # Add some compatibility with coin-or-mumps
- ln -s $out/include $out/include/mumps
- cp libseq/mumps_mpi.h $out/include
+ # Add some compatibility with coin-or-mumps
+ ln -s $out/include/mumps_seq/mpi.h $out/include/mumps_mpi.h
+ '';
+
+ nativeBuildInputs = [
+ gfortran
+ ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames ++ lib.optional mpiSupport mpi;
+
+ # Parmetis should be placed before scotch to avoid conflict of header file "parmetis.h"
+ buildInputs =
+ lib.optional withParmetis parmetis
+ ++ lib.optional mpiSupport scalapack
+ ++ [
+ blas
+ lapack
+ metis
+ scotch
+ ];
+
+ doInstallCheck = true;
+ nativeInstallCheckInputs = lib.optional mpiSupport mpiCheckPhaseHook;
+ installCheckPhase = ''
+ runHook preInstallCheck
+ ${lib.optionalString stdenv.hostPlatform.isDarwin "export DYLD_LIBRARY_PATH=$out/lib\n"}
+ ${lib.optionalString mpiSupport "export MPIRUN='mpirun -n 2'\n"}
+ cd examples
+ make all
+ $MPIRUN ./ssimpletest > config/config.nims << WTF
+
+ switch("os", "${nimUnwrapped.passthru.nimTarget.os}")
+ switch("cpu", "${nimUnwrapped.passthru.nimTarget.cpu}")
+ switch("define", "nixbuild")
+
+ # Configure the compiler using the $CC set by Nix at build time
+ import strutils
+ let cc = getEnv"CC"
+ if cc.contains("gcc"):
+ switch("cc", "gcc")
+ elif cc.contains("clang"):
+ switch("cc", "clang")
+ WTF
+
+ mv config/nim.cfg config/nim.cfg.old
+ cat > config/nim.cfg << WTF
+ os = "${nimUnwrapped.passthru.nimTarget.os}"
+ cpu = "${nimUnwrapped.passthru.nimTarget.cpu}"
+ define:"nixbuild"
+ WTF
+
+ cat >> config/nim.cfg < config/nim.cfg.old
+ rm config/nim.cfg.old
+
+ cat >> config/nim.cfg << WTF
+
+ clang.cpp.exe %= "\$CXX"
+ clang.cpp.linkerexe %= "\$CXX"
+ clang.exe %= "\$CC"
+ clang.linkerexe %= "\$CC"
+ gcc.cpp.exe %= "\$CXX"
+ gcc.cpp.linkerexe %= "\$CXX"
+ gcc.exe %= "\$CC"
+ gcc.linkerexe %= "\$CC"
+ WTF
+
+ runHook postBuild
+ '';
+
+ wrapperArgs = lib.optionals (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) [
+ "--prefix PATH : ${lib.makeBinPath [ buildPackages.gdb ]}:${placeholder "out"}/bin"
+ # Used by nim-gdb
+
+ "--prefix LD_LIBRARY_PATH : ${
+ lib.makeLibraryPath [
+ openssl
+ pcre
+ ]
+ }"
+ # These libraries may be referred to by the standard library.
+ # This is broken for cross-compilation because the package
+ # set will be shifted back by nativeBuildInputs.
+
+ "--set NIM_CONFIG_PATH ${placeholder "out"}/etc/nim"
+ # Use the custom configuration
+ ];
+
+ installPhase =
+ ''
+ runHook preInstall
+
+ mkdir -p $out/bin $out/etc
+
+ cp -r config $out/etc/nim
+
+ for binpath in ${nimUnwrapped}/bin/nim?*; do
+ local binname=`basename $binpath`
+ makeWrapper \
+ $binpath $out/bin/${targetPlatformConfig}-$binname \
+ $wrapperArgs
+ ln -s $out/bin/${targetPlatformConfig}-$binname $out/bin/$binname
+ done
+
+ makeWrapper \
+ ${nimUnwrapped}/nim/bin/nim $out/bin/${targetPlatformConfig}-nim \
+ --set-default CC $(command -v $CC) \
+ --set-default CXX $(command -v $CXX) \
+ $wrapperArgs
+ ln -s $out/bin/${targetPlatformConfig}-nim $out/bin/nim
+
+ makeWrapper \
+ ${nimUnwrapped}/bin/testament $out/bin/${targetPlatformConfig}-testament \
+ $wrapperArgs
+ ln -s $out/bin/${targetPlatformConfig}-testament $out/bin/testament
+
+ ''
+ + ''
+ runHook postInstall
+ '';
+
+ passthru = nimUnwrapped.passthru // {
+ inherit wrapNim;
+ nim = nimUnwrapped;
+ };
+
+ meta = nimUnwrapped.meta // {
+ description = nimUnwrapped.meta.description + " (${targetPlatformConfig} wrapper)";
+ platforms = with lib.platforms; unix ++ genode ++ windows;
+ };
+ });
+in
+wrapNim {
+ nimUnwrapped = nim-unwrapped-2_2;
+ patches = [ ./nim2.cfg.patch ];
+}
diff --git a/pkgs/development/compilers/nim/extra-mangling.patch b/pkgs/by-name/ni/nim-unwrapped-1_0/extra-mangling.patch
similarity index 100%
rename from pkgs/development/compilers/nim/extra-mangling.patch
rename to pkgs/by-name/ni/nim-unwrapped-1_0/extra-mangling.patch
diff --git a/pkgs/by-name/ni/nim-unwrapped-1_0/package.nix b/pkgs/by-name/ni/nim-unwrapped-1_0/package.nix
new file mode 100644
index 000000000000..09b50753bcfe
--- /dev/null
+++ b/pkgs/by-name/ni/nim-unwrapped-1_0/package.nix
@@ -0,0 +1,30 @@
+{
+ lib,
+ stdenv,
+ fetchurl,
+ nim-unwrapped-2,
+}:
+
+nim-unwrapped-2.overrideAttrs (
+ finalAttrs: prevAttrs: {
+ version = "1.6.20";
+ src = fetchurl {
+ url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz";
+ hash = "sha256-/+0EdQTR/K9hDw3Xzz4Ce+kaKSsMnFEWFQTC87mE/7k=";
+ };
+
+ patches =
+ builtins.filter (
+ p:
+ builtins.elem (builtins.baseNameOf p) [
+ "NIM_CONFIG_DIR.patch"
+ "nixbuild.patch"
+ ]
+ ) nim-unwrapped-2.patches
+ ++ [
+ ./extra-mangling.patch
+ # Mangle store paths of modules to prevent runtime dependence.
+ ]
+ ++ lib.optional (!stdenv.hostPlatform.isWindows) ./toLocation.patch;
+ }
+)
diff --git a/pkgs/development/compilers/nim/toLocation.patch b/pkgs/by-name/ni/nim-unwrapped-1_0/toLocation.patch
similarity index 100%
rename from pkgs/development/compilers/nim/toLocation.patch
rename to pkgs/by-name/ni/nim-unwrapped-1_0/toLocation.patch
diff --git a/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix b/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix
new file mode 100644
index 000000000000..232d4dcbfac7
--- /dev/null
+++ b/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix
@@ -0,0 +1,27 @@
+{
+ lib,
+ fetchurl,
+ nim-unwrapped-1,
+ nim-unwrapped-2_2,
+}:
+
+nim-unwrapped-2_2.overrideAttrs (
+ finalAttrs: previousAttrs: {
+ version = "2.0.10";
+ src = fetchurl {
+ url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz";
+ hash = "sha256-8UVDwjOpLHub0np9mEx4yfnBvXMyAwrBa+fFQMdbDqA=";
+ };
+ patches = lib.lists.unique (
+ builtins.filter (
+ p:
+ builtins.elem (builtins.baseNameOf p) [
+ "NIM_CONFIG_DIR.patch"
+ "nixbuild.patch"
+ "extra-mangling.patch"
+ "openssl.patch"
+ ]
+ ) (nim-unwrapped-1.patches ++ nim-unwrapped-2_2.patches)
+ );
+ }
+)
diff --git a/pkgs/development/compilers/nim/NIM_CONFIG_DIR.patch b/pkgs/by-name/ni/nim-unwrapped-2_2/NIM_CONFIG_DIR.patch
similarity index 100%
rename from pkgs/development/compilers/nim/NIM_CONFIG_DIR.patch
rename to pkgs/by-name/ni/nim-unwrapped-2_2/NIM_CONFIG_DIR.patch
diff --git a/pkgs/development/compilers/nim/extra-mangling-2.patch b/pkgs/by-name/ni/nim-unwrapped-2_2/extra-mangling-2.patch
similarity index 100%
rename from pkgs/development/compilers/nim/extra-mangling-2.patch
rename to pkgs/by-name/ni/nim-unwrapped-2_2/extra-mangling-2.patch
diff --git a/pkgs/development/compilers/nim/nixbuild.patch b/pkgs/by-name/ni/nim-unwrapped-2_2/nixbuild.patch
similarity index 100%
rename from pkgs/development/compilers/nim/nixbuild.patch
rename to pkgs/by-name/ni/nim-unwrapped-2_2/nixbuild.patch
diff --git a/pkgs/development/compilers/nim/openssl.patch b/pkgs/by-name/ni/nim-unwrapped-2_2/openssl.patch
similarity index 100%
rename from pkgs/development/compilers/nim/openssl.patch
rename to pkgs/by-name/ni/nim-unwrapped-2_2/openssl.patch
diff --git a/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix b/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix
new file mode 100644
index 000000000000..311c0f5b9d80
--- /dev/null
+++ b/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix
@@ -0,0 +1,187 @@
+# When updating this package please check that all other versions of Nim
+# evaluate because they reuse definitions from the latest compiler.
+{
+ lib,
+ stdenv,
+ fetchurl,
+ boehmgc,
+ openssl,
+ pcre,
+ readline,
+ sqlite,
+ darwin,
+ Security ? darwin.Security,
+}:
+
+let
+ parseCpu =
+ platform:
+ with platform;
+ # Derive a Nim CPU identifier
+ if isAarch32 then
+ "arm"
+ else if isAarch64 then
+ "arm64"
+ else if isAlpha then
+ "alpha"
+ else if isAvr then
+ "avr"
+ else if isMips && is32bit then
+ "mips"
+ else if isMips && is64bit then
+ "mips64"
+ else if isMsp430 then
+ "msp430"
+ else if isPower && is32bit then
+ "powerpc"
+ else if isPower && is64bit then
+ "powerpc64"
+ else if isRiscV && is64bit then
+ "riscv64"
+ else if isSparc then
+ "sparc"
+ else if isx86_32 then
+ "i386"
+ else if isx86_64 then
+ "amd64"
+ else
+ abort "no Nim CPU support known for ${config}";
+
+ parseOs =
+ platform:
+ with platform;
+ # Derive a Nim OS identifier
+ if isAndroid then
+ "Android"
+ else if isDarwin then
+ "MacOSX"
+ else if isFreeBSD then
+ "FreeBSD"
+ else if isGenode then
+ "Genode"
+ else if isLinux then
+ "Linux"
+ else if isNetBSD then
+ "NetBSD"
+ else if isNone then
+ "Standalone"
+ else if isOpenBSD then
+ "OpenBSD"
+ else if isWindows then
+ "Windows"
+ else if isiOS then
+ "iOS"
+ else
+ abort "no Nim OS support known for ${config}";
+
+ parsePlatform = p: {
+ cpu = parseCpu p;
+ os = parseOs p;
+ };
+
+ nimHost = parsePlatform stdenv.hostPlatform;
+ nimTarget = parsePlatform stdenv.targetPlatform;
+in
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "nim-unwrapped";
+ version = "2.2.0";
+ strictDeps = true;
+
+ src = fetchurl {
+ url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz";
+ hash = "sha256-zphChJyXYOSH7N0c2t98DyhEyvrmBUAcfHKuJXZEiTw=";
+ };
+
+ buildInputs = [
+ boehmgc
+ openssl
+ pcre
+ readline
+ sqlite
+ ] ++ lib.optional stdenv.hostPlatform.isDarwin Security;
+
+ patches = [
+ ./NIM_CONFIG_DIR.patch
+ # Override compiler configuration via an environmental variable
+
+ ./nixbuild.patch
+ # Load libraries at runtime by absolute path
+
+ ./extra-mangling-2.patch
+ # Mangle store paths of modules to prevent runtime dependence.
+
+ ./openssl.patch
+ # dlopen is widely used by Python, Ruby, Perl, ... what you're really telling me here is that your OS is fundamentally broken. That might be news for you, but it isn't for me.
+ ];
+
+ configurePhase =
+ let
+ bootstrapCompiler = stdenv.mkDerivation {
+ pname = "nim-bootstrap";
+ inherit (finalAttrs) version src preBuild;
+ enableParallelBuilding = true;
+ installPhase = ''
+ runHook preInstall
+ install -Dt $out/bin bin/nim
+ runHook postInstall
+ '';
+ };
+ in
+ ''
+ runHook preConfigure
+ cp ${bootstrapCompiler}/bin/nim bin/
+ echo 'define:nixbuild' >> config/nim.cfg
+ runHook postConfigure
+ '';
+
+ kochArgs =
+ [
+ "--cpu:${nimHost.cpu}"
+ "--os:${nimHost.os}"
+ "-d:release"
+ "-d:useGnuReadline"
+ ]
+ ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) "-d:nativeStacktrace";
+
+ preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
+ substituteInPlace makefile \
+ --replace "aarch64" "arm64"
+ '';
+
+ buildPhase = ''
+ runHook preBuild
+ local HOME=$TMPDIR
+ ./bin/nim c --parallelBuild:$NIX_BUILD_CORES koch
+ ./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES
+ ./koch toolsNoExternal $kochArgs --parallelBuild:$NIX_BUILD_CORES
+ ./bin/nim js -d:release tools/dochack/dochack.nim
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ install -Dt $out/bin bin/*
+ ln -sf $out/nim/bin/nim $out/bin/nim
+ ln -sf $out/nim/lib $out/lib
+ ./install.sh $out
+ cp -a tools dist $out/nim/
+ runHook postInstall
+ '';
+
+ passthru = {
+ inherit nimHost nimTarget;
+ };
+
+ meta = with lib; {
+ description = "Statically typed, imperative programming language";
+ homepage = "https://nim-lang.org/";
+ license = licenses.mit;
+ mainProgram = "nim";
+ maintainers = with maintainers; [
+ ehmry
+ eveeifyeve
+ ];
+ };
+
+})
diff --git a/pkgs/by-name/ni/nimlsp/package.nix b/pkgs/by-name/ni/nimlsp/package.nix
index 36b9b3d3af01..d9eaa838f7f0 100644
--- a/pkgs/by-name/ni/nimlsp/package.nix
+++ b/pkgs/by-name/ni/nimlsp/package.nix
@@ -1,6 +1,12 @@
-{ lib, buildNimPackage, fetchFromGitHub, srcOnly, nim-unwrapped-2 }:
+{ lib, buildNimPackage, fetchFromGitHub, srcOnly, nim-2_0, nim-unwrapped-2_0 }:
-buildNimPackage (finalAttrs: {
+let
+ buildNimPackage' = buildNimPackage.override {
+ # Do not build with Nim-2.2.x.
+ nim2 = nim-2_0;
+ };
+in
+buildNimPackage' (finalAttrs: {
pname = "nimlsp";
version = "0.4.6";
@@ -27,7 +33,7 @@ buildNimPackage (finalAttrs: {
nimFlags = [
"--threads:on"
- "-d:explicitSourcePath=${srcOnly nim-unwrapped-2}"
+ "-d:explicitSourcePath=${srcOnly nim-unwrapped-2_0}"
"-d:tempDir=/tmp"
];
diff --git a/pkgs/by-name/ni/nixos-install/nixos-install.sh b/pkgs/by-name/ni/nixos-install/nixos-install.sh
index 6098aac7d378..b428406f95a2 100755
--- a/pkgs/by-name/ni/nixos-install/nixos-install.sh
+++ b/pkgs/by-name/ni/nixos-install/nixos-install.sh
@@ -41,7 +41,7 @@ while [ "$#" -gt 0 ]; do
;;
--flake)
flake="$1"
- flakeFlags=(--experimental-features 'nix-command flakes')
+ flakeFlags=(--extra-experimental-features 'nix-command flakes')
shift 1
;;
--file|-f)
diff --git a/pkgs/applications/networking/cluster/nomad-pack/default.nix b/pkgs/by-name/no/nomad-pack/package.nix
similarity index 75%
rename from pkgs/applications/networking/cluster/nomad-pack/default.nix
rename to pkgs/by-name/no/nomad-pack/package.nix
index c5c7cdb08efb..0e5e0c6154dc 100644
--- a/pkgs/applications/networking/cluster/nomad-pack/default.nix
+++ b/pkgs/by-name/no/nomad-pack/package.nix
@@ -1,20 +1,21 @@
-{ lib
-, fetchFromGitHub
-, buildGoModule
+{
+ lib,
+ fetchFromGitHub,
+ buildGoModule,
}:
buildGoModule rec {
pname = "nomad-pack";
- version = "0.1.2";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "hashicorp";
- repo = pname;
+ repo = "nomad-pack";
rev = "v${version}";
- sha256 = "sha256-5OTGBO2EMGPJ4J2Eu3pIlZmYGXYxgL/6uGQgdB+8nPk=";
+ sha256 = "sha256-dw6sueC1qibJYc6sbZX8HJlEf9R6O8dlE1aobw70UHw=";
};
- vendorHash = "sha256-8hWiVtya/TlVLUlYVJSjOzZUI8vsPm355ksIRPhB2rA=";
+ vendorHash = "sha256-BKYJ9FZXKpFwK3+mrZAXRkfitSY9jeOLLeC0BOsKc/A=";
# skip running go tests as they require network access
doCheck = false;
diff --git a/pkgs/by-name/no/novops/package.nix b/pkgs/by-name/no/novops/package.nix
index 44edb7f32953..23b705e59df6 100644
--- a/pkgs/by-name/no/novops/package.nix
+++ b/pkgs/by-name/no/novops/package.nix
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "novops";
- version = "0.16.0";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "PierreBeucher";
repo = pname;
rev = "v${version}";
- hash = "sha256-Hqm3bKMRUyIZ/wD+kjAhUuKcJdaA8LT7bnourda6nuw=";
+ hash = "sha256-/sb9LqBZRkJeGyWZzz3RDgWm2tEtiaEXrEX/OO5ja6o=";
};
- cargoHash = "sha256-ObbCJQw4DgUH1/XuI7ZgqFY9O9OH1uGUkfaQRjcGkAY=";
+ cargoHash = "sha256-gvM0I+om4I8Yy+m0CzD5/WpL8xdIs3ecKQgmaq9S3VI=";
buildInputs = [
openssl # required for openssl-sys
diff --git a/pkgs/by-name/nu/nufmt/package.nix b/pkgs/by-name/nu/nufmt/package.nix
index 28f16ade6679..792935e080c2 100644
--- a/pkgs/by-name/nu/nufmt/package.nix
+++ b/pkgs/by-name/nu/nufmt/package.nix
@@ -10,13 +10,13 @@
}:
rustPlatform.buildRustPackage rec {
pname = "nufmt";
- version = "0-unstable-2024-10-15";
+ version = "0-unstable-2024-10-20";
src = fetchFromGitHub {
owner = "nushell";
repo = "nufmt";
- rev = "37b473be178fd752b5bf421f8b20f48209e9c2ec";
- hash = "sha256-BrVWw6oklG70UomKDv5IBvoFIjtpajHKV37fh4fnK3E=";
+ rev = "decc88ef8e11a14081c2dd86c6ea0c94d6d2861d";
+ hash = "sha256-AurQGIZDYOkMMyAEXP01QziISQcSME3GFtvqjCDoeiw=";
};
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
env.LIBCLANG_PATH = lib.optionalString stdenv.cc.isClang "${llvmPackages.libclang.lib}/lib";
- cargoHash = "sha256-eKQJanQ9ax5thc2DuO0yIgovor+i5Soylw58I2Y5cHw=";
+ cargoHash = "sha256-5DS6pTYGOQ4qay6+YiUstInRX17n3RViNxKXtFZ6J3k=";
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix
index 075701e2983d..ccddeeb94ecc 100644
--- a/pkgs/by-name/nu/numbat/package.nix
+++ b/pkgs/by-name/nu/numbat/package.nix
@@ -1,34 +1,26 @@
-{ lib
-, stdenv
-, testers
-, fetchFromGitHub
-, fetchpatch
-, rustPlatform
-, darwin
-, numbat
-, tzdata
+{
+ lib,
+ stdenv,
+ testers,
+ fetchFromGitHub,
+ rustPlatform,
+ darwin,
+ numbat,
+ tzdata,
}:
rustPlatform.buildRustPackage rec {
pname = "numbat";
- version = "1.13.0";
+ version = "1.14.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "numbat";
rev = "v${version}";
- hash = "sha256-o3EYhMFBgs/Ni+YCM3+RdUYlwRt+nMaEP/cAkDXMVHc=";
+ hash = "sha256-TmzM541S2W5Cy8zHEWKRE2Zj2bSgrM4vbsWw3zbi3LQ=";
};
- cargoHash = "sha256-rK9RPd/hww2F87l/dd14pB4izE58NuqaewYaqMimV1M=";
-
- patches = [
- # https://github.com/sharkdp/numbat/pull/562
- (fetchpatch {
- url = "https://github.com/sharkdp/numbat/commit/4756a1989ecdab35fd05ca18c721ed15d8cde2b1.patch";
- hash = "sha256-22+yePjy+MxJQ60EdvgaTw/IVV0d/wS2Iqza1p1xmfk=";
- })
- ];
+ cargoHash = "sha256-exvJJsGIj6KhmMcwhPjXMELvisuUtl17BAO6XEJSJmI=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Security
@@ -60,9 +52,15 @@ rustPlatform.buildRustPackage rec {
'';
homepage = "https://numbat.dev";
changelog = "https://github.com/sharkdp/numbat/releases/tag/v${version}";
- license = with licenses; [ asl20 mit ];
+ license = with licenses; [
+ asl20
+ mit
+ ];
mainProgram = "numbat";
- maintainers = with maintainers; [ giomf atemu ];
+ maintainers = with maintainers; [
+ giomf
+ atemu
+ ];
# Failing tests on Darwin.
broken = stdenv.isDarwin;
};
diff --git a/pkgs/by-name/nw/nwg-panel/package.nix b/pkgs/by-name/nw/nwg-panel/package.nix
index fba077d5c556..11e886a482b7 100644
--- a/pkgs/by-name/nw/nwg-panel/package.nix
+++ b/pkgs/by-name/nw/nwg-panel/package.nix
@@ -16,13 +16,13 @@
python3Packages.buildPythonApplication rec {
pname = "nwg-panel";
- version = "0.9.40";
+ version = "0.9.48";
src = fetchFromGitHub {
owner = "nwg-piotr";
repo = "nwg-panel";
rev = "refs/tags/v${version}";
- hash = "sha256-MymxhQxPS07qZlD+TsiMyMtOrmIuqi3LAhc0Huxwxjs=";
+ hash = "sha256-/PMUkD2kr8aqmohStntlTOc5XgfR+A3LaeYsk04GvOM=";
};
# No tests
diff --git a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix
index c4b85cac55bb..58a608a33dcc 100644
--- a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix
+++ b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix
@@ -7,7 +7,7 @@
let
bits = if stdenv.hostPlatform.is64bit then "x64" else "ia32";
- version = "0.92.0";
+ version = "0.93.0";
in
stdenv.mkDerivation {
pname = "nwjs-ffmpeg-prebuilt";
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
src =
let
hashes = {
- "x64" = "sha256-0Y0m9wGZGqH78LTPSWw+OCTvxd6kmIjuYzSaepwt9/I=";
- "ia32" = "sha256-0Y0m9wGZGqH78LTPSWw+OCTvxd6kmIjuYzSaepwt9/I=";
+ "x64" = "sha256-8FcoZ9pN/FKun3QuoFSKKreKCfj8tp2IgkRiDajT5ms=";
+ "ia32" = "sha256-8FcoZ9pN/FKun3QuoFSKKreKCfj8tp2IgkRiDajT5ms=";
};
in
fetchurl {
diff --git a/pkgs/by-name/ny/nym/Cargo.lock b/pkgs/by-name/ny/nym/Cargo.lock
index 1795ec333f78..135ecf5136a3 100644
--- a/pkgs/by-name/ny/nym/Cargo.lock
+++ b/pkgs/by-name/ny/nym/Cargo.lock
@@ -45,6 +45,12 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
[[package]]
name = "aead"
version = "0.5.2"
@@ -80,6 +86,21 @@ dependencies = [
"subtle 2.5.0",
]
+[[package]]
+name = "aes-gcm-siv"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d"
+dependencies = [
+ "aead",
+ "aes",
+ "cipher",
+ "ctr",
+ "polyval",
+ "subtle 2.5.0",
+ "zeroize",
+]
+
[[package]]
name = "ahash"
version = "0.7.8"
@@ -132,14 +153,13 @@ checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937"
[[package]]
name = "android_logger"
-version = "0.13.3"
+version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c494134f746c14dc653a35a4ea5aca24ac368529da5370ecf41fe0341c35772f"
+checksum = "05b07e8e73d720a1f2e4b6014766e6039fd2e96a4fa44e2a78d0e1fa2ff49826"
dependencies = [
"android_log-sys",
- "env_logger 0.10.2",
+ "env_filter",
"log",
- "once_cell",
]
[[package]]
@@ -174,9 +194,9 @@ dependencies = [
[[package]]
name = "anstyle"
-version = "1.0.7"
+version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
[[package]]
name = "anstyle-parse"
@@ -208,9 +228,18 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.86"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+
+[[package]]
+name = "arbitrary"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
+dependencies = [
+ "derive_arbitrary",
+]
[[package]]
name = "argon2"
@@ -236,6 +265,47 @@ version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+[[package]]
+name = "askama"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b79091df18a97caea757e28cd2d5fda49c6cd4bd01ddffd7ff01ace0c0ad2c28"
+dependencies = [
+ "askama_derive",
+ "askama_escape",
+]
+
+[[package]]
+name = "askama_derive"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19fe8d6cb13c4714962c072ea496f3392015f0989b1a2847bb4b2d9effd71d83"
+dependencies = [
+ "askama_parser",
+ "basic-toml",
+ "mime",
+ "mime_guess",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "askama_escape"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341"
+
+[[package]]
+name = "askama_parser"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acb1161c6b64d1c3d83108213c2a2533a342ac225aabd0bda218278c2ddb00c0"
+dependencies = [
+ "nom",
+]
+
[[package]]
name = "async-channel"
version = "1.9.0"
@@ -271,9 +341,9 @@ dependencies = [
[[package]]
name = "async-trait"
-version = "0.1.80"
+version = "0.1.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
dependencies = [
"proc-macro2",
"quote",
@@ -379,7 +449,7 @@ dependencies = [
"http 1.1.0",
"http-body 1.0.0",
"http-body-util",
- "hyper 1.3.1",
+ "hyper 1.4.1",
"hyper-util",
"itoa",
"matchit",
@@ -471,7 +541,7 @@ dependencies = [
"cc",
"cfg-if",
"libc",
- "miniz_oxide",
+ "miniz_oxide 0.7.3",
"object",
"rustc-demangle",
]
@@ -506,6 +576,15 @@ version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+[[package]]
+name = "basic-toml"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "823388e228f614e9558c6804262db37960ec8821856535f5c3f59913140558f8"
+dependencies = [
+ "serde",
+]
+
[[package]]
name = "binascii"
version = "0.1.4"
@@ -523,11 +602,11 @@ dependencies = [
[[package]]
name = "bip32"
-version = "0.5.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e141fb0f8be1c7b45887af94c88b182472b57c96b56773250ae00cd6a14a164"
+checksum = "aa13fae8b6255872fd86f7faf4b41168661d7d78609f7bfe6771b85c6739a15b"
dependencies = [
- "bs58 0.5.1",
+ "bs58",
"hmac",
"k256",
"rand_core 0.6.4",
@@ -610,9 +689,9 @@ dependencies = [
[[package]]
name = "blake3"
-version = "1.5.1"
+version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
+checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7"
dependencies = [
"arrayref",
"arrayvec",
@@ -657,7 +736,7 @@ checksum = "bc0bdbcf2078e0ba8a74e1fe0cf36f54054a04485759b61dfd60b174658e9607"
dependencies = [
"bit-vec",
"getrandom",
- "siphasher",
+ "siphasher 1.0.1",
]
[[package]]
@@ -682,12 +761,6 @@ version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab9008b6bb9fc80b5277f2fe481c09e828743d9151203e804583eb4c9e15b31d"
-[[package]]
-name = "bs58"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
-
[[package]]
name = "bs58"
version = "0.5.1"
@@ -734,9 +807,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
-version = "1.6.0"
+version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
dependencies = [
"serde",
]
@@ -759,6 +832,20 @@ dependencies = [
"serde",
]
+[[package]]
+name = "cargo_metadata"
+version = "0.15.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver 1.0.23",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
[[package]]
name = "cargo_metadata"
version = "0.18.1"
@@ -787,9 +874,12 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6"
[[package]]
name = "cc"
-version = "1.0.99"
+version = "1.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
+checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
+dependencies = [
+ "shlex",
+]
[[package]]
name = "celes"
@@ -919,9 +1009,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.5.7"
+version = "4.5.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
+checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
dependencies = [
"clap_builder",
"clap_derive",
@@ -929,9 +1019,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.7"
+version = "4.5.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
+checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
dependencies = [
"anstream",
"anstyle",
@@ -941,28 +1031,28 @@ dependencies = [
[[package]]
name = "clap_complete"
-version = "4.5.5"
+version = "4.5.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2020fa13af48afc65a9a87335bda648309ab3d154cd03c7ff95b378c7ed39c4"
+checksum = "9b378c786d3bde9442d2c6dd7e6080b2a818db2b96e30d6e7f1b6d224eb617d3"
dependencies = [
- "clap 4.5.7",
+ "clap 4.5.17",
]
[[package]]
name = "clap_complete_fig"
-version = "4.5.1"
+version = "4.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb4bc503cddc1cd320736fb555d6598309ad07c2ddeaa23891a10ffb759ee612"
+checksum = "d494102c8ff3951810c72baf96910b980fb065ca5d3101243e6a8dc19747c86b"
dependencies = [
- "clap 4.5.7",
+ "clap 4.5.17",
"clap_complete",
]
[[package]]
name = "clap_derive"
-version = "4.5.5"
+version = "4.5.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
+checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
dependencies = [
"heck 0.5.0",
"proc-macro2",
@@ -1011,18 +1101,6 @@ dependencies = [
"memchr",
]
-[[package]]
-name = "comfy-table"
-version = "6.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e959d788268e3bf9d35ace83e81b124190378e4c91c9067524675e33394b8ba"
-dependencies = [
- "crossterm 0.26.1",
- "strum 0.24.1",
- "strum_macros 0.24.3",
- "unicode-width",
-]
-
[[package]]
name = "comfy-table"
version = "7.1.1"
@@ -1117,18 +1195,18 @@ checksum = "3618cccc083bb987a415d85c02ca6c9994ea5b44731ec28b9ecf09658655fba9"
[[package]]
name = "const_format"
-version = "0.2.32"
+version = "0.2.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673"
+checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b"
dependencies = [
"const_format_proc_macros",
]
[[package]]
name = "const_format_proc_macros"
-version = "0.2.32"
+version = "0.2.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500"
+checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1"
dependencies = [
"proc-macro2",
"quote",
@@ -1374,7 +1452,7 @@ dependencies = [
"anes",
"cast",
"ciborium",
- "clap 4.5.7",
+ "clap 4.5.17",
"criterion-plot",
"is-terminal",
"itertools 0.10.5",
@@ -1460,22 +1538,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "crossterm"
-version = "0.26.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13"
-dependencies = [
- "bitflags 1.3.2",
- "crossterm_winapi",
- "libc",
- "mio 0.8.11",
- "parking_lot 0.12.3",
- "signal-hook",
- "signal-hook-mio",
- "winapi",
-]
-
[[package]]
name = "crossterm"
version = "0.27.0"
@@ -1622,16 +1684,15 @@ dependencies = [
[[package]]
name = "curve25519-dalek"
-version = "4.1.2"
+version = "4.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
+checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
dependencies = [
"cfg-if",
"cpufeatures",
"curve25519-dalek-derive",
"digest 0.10.7",
"fiat-crypto",
- "platforms",
"rustc_version 0.4.0",
"serde",
"subtle 2.5.0",
@@ -1840,6 +1901,7 @@ dependencies = [
"lock_api",
"once_cell",
"parking_lot_core 0.9.10",
+ "serde",
]
[[package]]
@@ -1850,11 +1912,10 @@ checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
[[package]]
name = "defguard_wireguard_rs"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ba16f17698d4b389907310af018b0c3a80b025bba9c38d947cbc6dd70921743"
+version = "0.4.7"
+source = "git+https://github.com/DefGuard/wireguard-rs.git?rev=v0.4.7#ef1cf3714629bf5016fb38cbb7320451dc69fb09"
dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
"libc",
"log",
"netlink-packet-core",
@@ -1863,7 +1924,7 @@ dependencies = [
"netlink-packet-utils",
"netlink-packet-wireguard",
"netlink-sys",
- "nix 0.27.1",
+ "nix 0.29.0",
"serde",
"thiserror",
]
@@ -1911,6 +1972,17 @@ dependencies = [
"syn 1.0.109",
]
+[[package]]
+name = "derive_arbitrary"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
[[package]]
name = "devise"
version = "0.4.1"
@@ -2071,6 +2143,26 @@ dependencies = [
"spki",
]
+[[package]]
+name = "echo-server"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "bincode",
+ "bytecodec",
+ "bytes",
+ "dashmap",
+ "dirs 5.0.1",
+ "nym-sdk",
+ "serde",
+ "tokio",
+ "tokio-stream",
+ "tokio-util",
+ "tracing",
+ "tracing-subscriber",
+ "uuid",
+]
+
[[package]]
name = "ed25519"
version = "2.2.3"
@@ -2101,7 +2193,7 @@ version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
dependencies = [
- "curve25519-dalek 4.1.2",
+ "curve25519-dalek 4.1.3",
"ed25519",
"rand_core 0.6.4",
"serde",
@@ -2130,6 +2222,9 @@ name = "either"
version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
+dependencies = [
+ "serde",
+]
[[package]]
name = "elliptic-curve"
@@ -2166,6 +2261,16 @@ dependencies = [
"cfg-if",
]
+[[package]]
+name = "env_filter"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+dependencies = [
+ "log",
+ "regex",
+]
+
[[package]]
name = "env_logger"
version = "0.7.1"
@@ -2179,16 +2284,6 @@ dependencies = [
"termcolor",
]
-[[package]]
-name = "env_logger"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
-dependencies = [
- "log",
- "regex",
-]
-
[[package]]
name = "equivalent"
version = "1.0.1"
@@ -2222,10 +2317,10 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
[[package]]
name = "explorer-api"
-version = "1.1.39"
+version = "1.1.41"
dependencies = [
"chrono",
- "clap 4.5.7",
+ "clap 4.5.17",
"dotenvy",
"humantime-serde",
"isocountry",
@@ -2300,6 +2395,12 @@ dependencies = [
"ext-trait",
]
+[[package]]
+name = "extern-c"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320bea982e85d42441eb25c49b41218e7eaa2657e8f90bc4eca7437376751e23"
+
[[package]]
name = "eyre"
version = "0.6.12"
@@ -2333,9 +2434,9 @@ dependencies = [
[[package]]
name = "fastrand"
-version = "2.1.0"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
[[package]]
name = "ff"
@@ -2380,13 +2481,19 @@ dependencies = [
]
[[package]]
-name = "flate2"
-version = "1.0.30"
+name = "fixedbitset"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+
+[[package]]
+name = "flate2"
+version = "1.0.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
dependencies = [
"crc32fast",
- "miniz_oxide",
+ "miniz_oxide 0.8.0",
]
[[package]]
@@ -2432,6 +2539,15 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8cbd1169bd7b4a0a20d92b9af7a7e0422888bd38a6f5ec29c1fd8c1558a272e"
+[[package]]
+name = "fs-err"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41"
+dependencies = [
+ "autocfg",
+]
+
[[package]]
name = "fsevent-sys"
version = "4.1.0"
@@ -2617,14 +2733,14 @@ dependencies = [
[[package]]
name = "getset"
-version = "0.1.2"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9"
+checksum = "f636605b743120a8d32ed92fc27b6cde1a769f8f936c065151eb66f88ded513c"
dependencies = [
- "proc-macro-error",
+ "proc-macro-error2",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.66",
]
[[package]]
@@ -2672,9 +2788,9 @@ dependencies = [
[[package]]
name = "gloo-timers"
-version = "0.2.6"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
+checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
dependencies = [
"futures-channel",
"futures-core",
@@ -2708,6 +2824,17 @@ dependencies = [
"web-sys",
]
+[[package]]
+name = "goblin"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d6b4de4a8eb6c46a8c77e1d3be942cb9a8bf073c22374578e5ba4b08ed0ff68"
+dependencies = [
+ "log",
+ "plain",
+ "scroll",
+]
+
[[package]]
name = "group"
version = "0.13.0"
@@ -3043,9 +3170,9 @@ dependencies = [
[[package]]
name = "hyper"
-version = "1.3.1"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
+checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
dependencies = [
"bytes",
"futures-channel",
@@ -3083,7 +3210,7 @@ checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c"
dependencies = [
"futures-util",
"http 1.1.0",
- "hyper 1.3.1",
+ "hyper 1.4.1",
"hyper-util",
"rustls 0.22.4",
"rustls-pki-types",
@@ -3115,7 +3242,7 @@ dependencies = [
"futures-util",
"http 1.1.0",
"http-body 1.0.0",
- "hyper 1.3.1",
+ "hyper 1.4.1",
"pin-project-lite",
"socket2",
"tokio",
@@ -3147,124 +3274,6 @@ dependencies = [
"cc",
]
-[[package]]
-name = "icu_collections"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
-dependencies = [
- "displaydoc",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
-dependencies = [
- "displaydoc",
- "litemap",
- "tinystr",
- "writeable",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
-
-[[package]]
-name = "icu_normalizer"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_normalizer_data",
- "icu_properties",
- "icu_provider",
- "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
- "zerovec",
-]
-
-[[package]]
-name = "icu_normalizer_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
-
-[[package]]
-name = "icu_properties"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_locid_transform",
- "icu_properties_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_properties_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
-
-[[package]]
-name = "icu_provider"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_provider_macros",
- "stable_deref_trait",
- "tinystr",
- "writeable",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
[[package]]
name = "ident_case"
version = "1.0.1"
@@ -3283,14 +3292,12 @@ dependencies = [
[[package]]
name = "idna"
-version = "1.0.0"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
dependencies = [
- "icu_normalizer",
- "icu_properties",
- "smallvec",
- "utf8_iter",
+ "unicode-bidi",
+ "unicode-normalization",
]
[[package]]
@@ -3435,15 +3442,6 @@ version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
-[[package]]
-name = "ipnetwork"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8eca9f51da27bc908ef3dd85c21e1bbba794edaf94d7841e37356275b82d31e"
-dependencies = [
- "serde",
-]
-
[[package]]
name = "ipnetwork"
version = "0.18.0"
@@ -3571,9 +3569,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
[[package]]
name = "js-sys"
-version = "0.3.69"
+version = "0.3.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
dependencies = [
"wasm-bindgen",
]
@@ -3724,12 +3722,6 @@ dependencies = [
"keystream",
]
-[[package]]
-name = "litemap"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
-
[[package]]
name = "lock_api"
version = "0.4.12"
@@ -3742,9 +3734,9 @@ dependencies = [
[[package]]
name = "log"
-version = "0.4.21"
+version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
[[package]]
name = "loom"
@@ -3851,6 +3843,16 @@ dependencies = [
"serde",
]
+[[package]]
+name = "md-5"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
+dependencies = [
+ "cfg-if",
+ "digest 0.10.7",
+]
+
[[package]]
name = "memchr"
version = "2.7.2"
@@ -3882,6 +3884,16 @@ dependencies = [
"unicase",
]
+[[package]]
+name = "minicov"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169"
+dependencies = [
+ "cc",
+ "walkdir",
+]
+
[[package]]
name = "minimal-lexical"
version = "0.2.1"
@@ -3897,6 +3909,15 @@ dependencies = [
"adler",
]
+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+dependencies = [
+ "adler2",
+]
+
[[package]]
name = "mio"
version = "0.8.11"
@@ -3991,14 +4012,15 @@ dependencies = [
[[package]]
name = "netlink-packet-route"
-version = "0.17.1"
+version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053998cea5a306971f88580d0829e90f270f940befd7cf928da179d4187a5a66"
+checksum = "55e5bda7ca0f9ac5e75b5debac3b75e29a8ac8e2171106a2c3bb466389a8dd83"
dependencies = [
"anyhow",
- "bitflags 1.3.2",
+ "bitflags 2.5.0",
"byteorder",
"libc",
+ "log",
"netlink-packet-core",
"netlink-packet-utils",
]
@@ -4058,7 +4080,6 @@ dependencies = [
"bitflags 2.5.0",
"cfg-if",
"libc",
- "memoffset",
]
[[package]]
@@ -4071,6 +4092,7 @@ dependencies = [
"cfg-if",
"cfg_aliases",
"libc",
+ "memoffset",
]
[[package]]
@@ -4163,6 +4185,27 @@ dependencies = [
"libc",
]
+[[package]]
+name = "num_enum"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
[[package]]
name = "num_threads"
version = "0.1.7"
@@ -4180,23 +4223,25 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
[[package]]
name = "nym-api"
-version = "1.1.43"
+version = "1.1.45"
dependencies = [
"anyhow",
"async-trait",
+ "axum 0.7.5",
+ "axum-extra",
"bincode",
"bip39",
"bloomfilter",
- "bs58 0.5.1",
+ "bs58",
"cfg-if",
- "clap 4.5.7",
+ "clap 4.5.17",
"console-subscriber",
"cosmwasm-std",
"cw-utils",
"cw2",
"cw3",
"cw4",
- "dirs 4.0.0",
+ "dirs 5.0.1",
"futures",
"getset",
"humantime-serde",
@@ -4220,6 +4265,7 @@ dependencies = [
"nym-ecash-double-spending",
"nym-ecash-time",
"nym-gateway-client",
+ "nym-http-api-common",
"nym-inclusion-probability",
"nym-mixnet-contract-common",
"nym-multisig-contract-common",
@@ -4229,6 +4275,7 @@ dependencies = [
"nym-sphinx",
"nym-task",
"nym-topology",
+ "nym-types",
"nym-validator-client",
"nym-vesting-contract-common",
"okapi",
@@ -4250,8 +4297,15 @@ dependencies = [
"time",
"tokio",
"tokio-stream",
+ "tokio-util",
+ "tower-http",
+ "tracing",
+ "tracing-subscriber",
"ts-rs",
"url",
+ "utoipa",
+ "utoipa-swagger-ui",
+ "utoipauto",
"zeroize",
]
@@ -4259,7 +4313,7 @@ dependencies = [
name = "nym-api-requests"
version = "0.1.0"
dependencies = [
- "bs58 0.5.1",
+ "bs58",
"cosmrs 0.17.0-pre",
"cosmwasm-std",
"ecdsa",
@@ -4280,6 +4334,7 @@ dependencies = [
"thiserror",
"time",
"ts-rs",
+ "utoipa",
]
[[package]]
@@ -4298,22 +4353,27 @@ version = "0.1.0"
dependencies = [
"anyhow",
"bincode",
- "bs58 0.5.1",
+ "bs58",
"bytes",
- "clap 4.5.7",
+ "clap 4.5.17",
"defguard_wireguard_rs",
- "fastrand 2.1.0",
+ "fastrand 2.1.1",
"futures",
- "ipnetwork 0.16.0",
+ "ipnetwork 0.20.0",
"log",
"nym-authenticator-requests",
"nym-bin-common",
"nym-client-core",
"nym-config",
+ "nym-credential-verification",
+ "nym-credentials-interface",
"nym-crypto",
+ "nym-gateway-requests",
+ "nym-gateway-storage",
"nym-id",
"nym-network-defaults",
"nym-sdk",
+ "nym-service-provider-requests-common",
"nym-service-providers-common",
"nym-sphinx",
"nym-task",
@@ -4334,11 +4394,19 @@ dependencies = [
name = "nym-authenticator-requests"
version = "0.1.0"
dependencies = [
+ "base64 0.22.1",
"bincode",
+ "hmac",
+ "nym-credentials-interface",
+ "nym-crypto",
+ "nym-service-provider-requests-common",
"nym-sphinx",
"nym-wireguard-types",
"rand",
"serde",
+ "sha2 0.10.8",
+ "thiserror",
+ "x25519-dalek",
]
[[package]]
@@ -4365,7 +4433,7 @@ dependencies = [
name = "nym-bin-common"
version = "0.6.0"
dependencies = [
- "clap 4.5.7",
+ "clap 4.5.17",
"clap_complete",
"clap_complete_fig",
"const-str",
@@ -4374,7 +4442,7 @@ dependencies = [
"opentelemetry-jaeger",
"pretty_env_logger",
"schemars",
- "semver 0.11.0",
+ "semver 1.0.23",
"serde",
"serde_json",
"tracing-opentelemetry",
@@ -4401,13 +4469,13 @@ dependencies = [
[[package]]
name = "nym-cli"
-version = "1.1.41"
+version = "1.1.43"
dependencies = [
"anyhow",
- "base64 0.13.1",
+ "base64 0.22.1",
"bip39",
- "bs58 0.5.1",
- "clap 4.5.7",
+ "bs58",
+ "clap 4.5.17",
"clap_complete",
"clap_complete_fig",
"dotenvy",
@@ -4429,13 +4497,13 @@ name = "nym-cli-commands"
version = "1.0.0"
dependencies = [
"anyhow",
- "base64 0.21.7",
+ "base64 0.22.1",
"bip39",
- "bs58 0.5.1",
+ "bs58",
"cfg-if",
- "clap 4.5.7",
+ "clap 4.5.17",
"colored",
- "comfy-table 6.2.0",
+ "comfy-table",
"cosmrs 0.17.0-pre",
"cosmwasm-std",
"csv",
@@ -4471,6 +4539,7 @@ dependencies = [
"serde",
"serde_json",
"tap",
+ "tempfile",
"thiserror",
"time",
"tokio",
@@ -4481,11 +4550,11 @@ dependencies = [
[[package]]
name = "nym-client"
-version = "1.1.40"
+version = "1.1.42"
dependencies = [
- "bs58 0.5.1",
- "clap 4.5.7",
- "dirs 4.0.0",
+ "bs58",
+ "clap 4.5.17",
+ "dirs 5.0.1",
"futures",
"log",
"nym-bandwidth-controller",
@@ -4521,16 +4590,16 @@ name = "nym-client-core"
version = "1.1.15"
dependencies = [
"async-trait",
- "base64 0.21.7",
- "bs58 0.5.1",
+ "base64 0.22.1",
+ "bs58",
"cfg-if",
- "clap 4.5.7",
- "comfy-table 7.1.1",
+ "clap 4.5.17",
+ "comfy-table",
"futures",
"gloo-timers",
"http-body-util",
"humantime-serde",
- "hyper 1.3.1",
+ "hyper 1.4.1",
"hyper-util",
"log",
"nym-bandwidth-controller",
@@ -4556,6 +4625,7 @@ dependencies = [
"nym-topology",
"nym-validator-client",
"rand",
+ "rand_chacha",
"serde",
"serde_json",
"sha2 0.10.8",
@@ -4662,7 +4732,7 @@ name = "nym-coconut"
version = "0.5.0"
dependencies = [
"bls12_381",
- "bs58 0.5.1",
+ "bs58",
"criterion 0.4.0",
"digest 0.9.0",
"doc-comment",
@@ -4710,7 +4780,7 @@ version = "0.1.0"
dependencies = [
"bincode",
"bls12_381",
- "bs58 0.5.1",
+ "bs58",
"cfg-if",
"criterion 0.5.1",
"digest 0.9.0",
@@ -4736,7 +4806,7 @@ dependencies = [
"log",
"nym-network-defaults",
"serde",
- "toml 0.7.8",
+ "toml 0.8.14",
"url",
]
@@ -4744,7 +4814,7 @@ dependencies = [
name = "nym-contracts-common"
version = "0.5.0"
dependencies = [
- "bs58 0.5.1",
+ "bs58",
"cosmwasm-schema",
"cosmwasm-std",
"cw-storage-plus",
@@ -4763,6 +4833,20 @@ dependencies = [
"tracing",
]
+[[package]]
+name = "nym-cpp-ffi"
+version = "0.1.2"
+dependencies = [
+ "anyhow",
+ "bs58",
+ "lazy_static",
+ "nym-bin-common",
+ "nym-ffi-shared",
+ "nym-sdk",
+ "nym-sphinx-anonymous-replies",
+ "tokio",
+]
+
[[package]]
name = "nym-credential-storage"
version = "0.1.0"
@@ -4798,6 +4882,31 @@ dependencies = [
"tokio",
]
+[[package]]
+name = "nym-credential-verification"
+version = "0.1.0"
+dependencies = [
+ "bs58",
+ "cosmwasm-std",
+ "cw-utils",
+ "futures",
+ "nym-api-requests",
+ "nym-credentials",
+ "nym-credentials-interface",
+ "nym-ecash-contract-common",
+ "nym-ecash-double-spending",
+ "nym-gateway-requests",
+ "nym-gateway-storage",
+ "nym-task",
+ "nym-validator-client",
+ "rand",
+ "si-scale",
+ "thiserror",
+ "time",
+ "tokio",
+ "tracing",
+]
+
[[package]]
name = "nym-credentials"
version = "0.1.0"
@@ -4812,6 +4921,7 @@ dependencies = [
"nym-ecash-contract-common",
"nym-ecash-time",
"nym-network-defaults",
+ "nym-serde-helpers",
"nym-validator-client",
"rand",
"serde",
@@ -4830,7 +4940,7 @@ dependencies = [
"nym-network-defaults",
"rand",
"serde",
- "strum 0.25.0",
+ "strum 0.26.3",
"thiserror",
"time",
]
@@ -4839,9 +4949,11 @@ dependencies = [
name = "nym-crypto"
version = "0.4.0"
dependencies = [
+ "aead",
"aes",
+ "aes-gcm-siv",
"blake3",
- "bs58 0.5.1",
+ "bs58",
"cipher",
"ctr",
"digest 0.10.7",
@@ -4861,13 +4973,37 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "nym-data-observatory"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "axum 0.7.5",
+ "chrono",
+ "nym-bin-common",
+ "nym-network-defaults",
+ "nym-node-requests",
+ "nym-task",
+ "serde",
+ "serde_json",
+ "sqlx",
+ "tokio",
+ "tokio-util",
+ "tower-http",
+ "tracing",
+ "tracing-subscriber",
+ "utoipa",
+ "utoipa-swagger-ui",
+ "utoipauto",
+]
+
[[package]]
name = "nym-dkg"
version = "0.1.0"
dependencies = [
"bitvec",
"bls12_381",
- "bs58 0.5.1",
+ "bs58",
"criterion 0.4.0",
"ff",
"group",
@@ -4888,7 +5024,7 @@ dependencies = [
name = "nym-ecash-contract-common"
version = "0.1.0"
dependencies = [
- "bs58 0.5.1",
+ "bs58",
"cosmwasm-schema",
"cosmwasm-std",
"cw-controllers",
@@ -4960,6 +5096,21 @@ dependencies = [
"url",
]
+[[package]]
+name = "nym-ffi-shared"
+version = "0.2.0"
+dependencies = [
+ "anyhow",
+ "bs58",
+ "lazy_static",
+ "nym-bin-common",
+ "nym-sdk",
+ "nym-sphinx-anonymous-replies",
+ "tokio",
+ "uniffi",
+ "uniffi_build",
+]
+
[[package]]
name = "nym-gateway"
version = "1.1.36"
@@ -4967,28 +5118,24 @@ dependencies = [
"anyhow",
"async-trait",
"bip39",
- "bloomfilter",
- "bs58 0.5.1",
- "clap 4.5.7",
+ "bs58",
+ "clap 4.5.17",
"colored",
- "cosmwasm-std",
- "cw-utils",
"dashmap",
"defguard_wireguard_rs",
- "dirs 4.0.0",
+ "dirs 5.0.1",
"dotenvy",
"futures",
"humantime-serde",
- "ipnetwork 0.16.0",
+ "ipnetwork 0.20.0",
"nym-api-requests",
"nym-authenticator",
"nym-bin-common",
"nym-config",
+ "nym-credential-verification",
"nym-credentials",
"nym-credentials-interface",
"nym-crypto",
- "nym-ecash-contract-common",
- "nym-ecash-double-spending",
"nym-gateway-requests",
"nym-gateway-storage",
"nym-ip-packet-router",
@@ -5012,7 +5159,6 @@ dependencies = [
"sqlx",
"subtle-encoding",
"thiserror",
- "time",
"tokio",
"tokio-stream",
"tokio-tungstenite",
@@ -5029,7 +5175,6 @@ dependencies = [
"futures",
"getrandom",
"gloo-utils 0.2.0",
- "log",
"nym-bandwidth-controller",
"nym-credential-storage",
"nym-credentials",
@@ -5048,19 +5193,21 @@ dependencies = [
"tokio",
"tokio-stream",
"tokio-tungstenite",
+ "tracing",
"tungstenite 0.20.1",
"url",
"wasm-bindgen",
"wasm-bindgen-futures",
"wasm-utils",
"wasmtimer",
+ "zeroize",
]
[[package]]
name = "nym-gateway-requests"
version = "0.1.0"
dependencies = [
- "bs58 0.5.1",
+ "bs58",
"futures",
"generic-array 0.14.7",
"nym-compact-ecash",
@@ -5073,6 +5220,7 @@ dependencies = [
"rand",
"serde",
"serde_json",
+ "strum 0.26.3",
"thiserror",
"tokio",
"tracing",
@@ -5099,6 +5247,22 @@ dependencies = [
"tracing",
]
+[[package]]
+name = "nym-go-ffi"
+version = "0.2.0"
+dependencies = [
+ "anyhow",
+ "lazy_static",
+ "nym-bin-common",
+ "nym-ffi-shared",
+ "nym-sdk",
+ "nym-sphinx-anonymous-replies",
+ "thiserror",
+ "tokio",
+ "uniffi",
+ "uniffi_build",
+]
+
[[package]]
name = "nym-group-contract-common"
version = "0.1.0"
@@ -5132,10 +5296,12 @@ version = "0.1.0"
dependencies = [
"axum 0.7.5",
"bytes",
+ "colored",
"mime",
"serde",
"serde_json",
"serde_yaml",
+ "tracing",
"utoipa",
]
@@ -5156,8 +5322,8 @@ name = "nym-id-cli"
version = "0.1.0"
dependencies = [
"anyhow",
- "bs58 0.5.1",
- "clap 4.5.7",
+ "bs58",
+ "clap 4.5.17",
"nym-bin-common",
"nym-credential-storage",
"nym-id",
@@ -5197,9 +5363,9 @@ version = "0.1.0"
dependencies = [
"anyhow",
"bincode",
- "bs58 0.5.1",
+ "bs58",
"bytes",
- "clap 4.5.7",
+ "clap 4.5.17",
"etherparse",
"futures",
"log",
@@ -5270,7 +5436,7 @@ dependencies = [
name = "nym-mixnet-contract-common"
version = "0.6.0"
dependencies = [
- "bs58 0.4.0",
+ "bs58",
"cosmwasm-schema",
"cosmwasm-std",
"cw-controllers",
@@ -5286,6 +5452,7 @@ dependencies = [
"thiserror",
"time",
"ts-rs",
+ "utoipa",
]
[[package]]
@@ -5294,11 +5461,11 @@ version = "1.1.37"
dependencies = [
"anyhow",
"axum 0.7.5",
- "bs58 0.5.1",
- "clap 4.5.7",
+ "bs58",
+ "clap 4.5.17",
"colored",
"cupid",
- "dirs 4.0.0",
+ "dirs 5.0.1",
"futures",
"humantime-serde",
"lazy_static",
@@ -5324,12 +5491,12 @@ dependencies = [
"rand",
"serde",
"serde_json",
- "sysinfo 0.27.8",
+ "sysinfo",
"thiserror",
"time",
"tokio",
"tokio-util",
- "toml 0.5.11",
+ "toml 0.8.14",
"url",
]
@@ -5387,18 +5554,49 @@ dependencies = [
"schemars",
"serde",
"url",
+ "utoipa",
+]
+
+[[package]]
+name = "nym-network-monitor"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "axum 0.7.5",
+ "clap 4.5.17",
+ "dashmap",
+ "futures",
+ "log",
+ "nym-bin-common",
+ "nym-crypto",
+ "nym-network-defaults",
+ "nym-sdk",
+ "nym-sphinx",
+ "nym-topology",
+ "nym-types",
+ "nym-validator-client",
+ "petgraph",
+ "rand",
+ "rand_chacha",
+ "reqwest 0.12.4",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tokio-util",
+ "utoipa",
+ "utoipa-swagger-ui",
]
[[package]]
name = "nym-network-requester"
-version = "1.1.41"
+version = "1.1.43"
dependencies = [
"addr",
"anyhow",
"async-trait",
- "bs58 0.5.1",
- "clap 4.5.7",
- "dirs 4.0.0",
+ "bs58",
+ "clap 4.5.17",
+ "dirs 5.0.1",
"futures",
"humantime-serde",
"ipnetwork 0.20.0",
@@ -5442,18 +5640,18 @@ dependencies = [
[[package]]
name = "nym-node"
-version = "1.1.7"
+version = "1.1.9"
dependencies = [
"anyhow",
"bip39",
- "bs58 0.5.1",
- "cargo_metadata",
+ "bs58",
+ "cargo_metadata 0.18.1",
"celes",
- "clap 4.5.7",
+ "clap 4.5.17",
"colored",
"cupid",
"humantime-serde",
- "ipnetwork 0.16.0",
+ "ipnetwork 0.20.0",
"nym-authenticator",
"nym-bin-common",
"nym-client-core-config-types",
@@ -5475,7 +5673,7 @@ dependencies = [
"semver 1.0.23",
"serde",
"serde_json",
- "sysinfo 0.30.12",
+ "sysinfo",
"thiserror",
"tokio",
"toml 0.8.14",
@@ -5490,21 +5688,20 @@ version = "0.1.0"
dependencies = [
"axum 0.7.5",
"axum-extra",
- "base64 0.21.7",
+ "base64 0.22.1",
"colored",
"dashmap",
- "fastrand 2.1.0",
+ "fastrand 2.1.1",
"headers",
"hmac",
- "hyper 1.3.1",
- "ipnetwork 0.16.0",
+ "hyper 1.4.1",
+ "ipnetwork 0.20.0",
"nym-crypto",
"nym-http-api-common",
"nym-metrics",
"nym-node-requests",
"nym-task",
"nym-wireguard",
- "nym-wireguard-types",
"rand",
"serde_json",
"thiserror",
@@ -5523,7 +5720,7 @@ name = "nym-node-requests"
version = "0.1.0"
dependencies = [
"async-trait",
- "base64 0.21.7",
+ "base64 0.22.1",
"celes",
"humantime 2.1.0",
"humantime-serde",
@@ -5554,6 +5751,7 @@ dependencies = [
"nym-task",
"nym-topology",
"rand",
+ "rand_chacha",
"serde",
"serde_json",
"thiserror",
@@ -5596,7 +5794,7 @@ name = "nym-nr-query"
version = "0.1.0"
dependencies = [
"anyhow",
- "clap 4.5.7",
+ "clap 4.5.17",
"log",
"nym-bin-common",
"nym-network-defaults",
@@ -5623,8 +5821,8 @@ dependencies = [
"chacha20",
"chacha20poly1305",
"criterion 0.4.0",
- "curve25519-dalek 4.1.2",
- "fastrand 2.1.0",
+ "curve25519-dalek 4.1.3",
+ "fastrand 2.1.1",
"getrandom",
"log",
"rand",
@@ -5647,9 +5845,12 @@ version = "0.1.0"
dependencies = [
"anyhow",
"async-trait",
+ "bincode",
"bip39",
"bytecodec",
"bytes",
+ "dashmap",
+ "dirs 5.0.1",
"dotenvy",
"futures",
"hex",
@@ -5678,13 +5879,17 @@ dependencies = [
"pretty_env_logger",
"rand",
"reqwest 0.12.4",
+ "serde",
"tap",
"thiserror",
"tokio",
"tokio-stream",
"tokio-util",
- "toml 0.5.11",
+ "toml 0.8.14",
+ "tracing",
+ "tracing-subscriber",
"url",
+ "uuid",
"zeroize",
]
@@ -5692,8 +5897,16 @@ dependencies = [
name = "nym-serde-helpers"
version = "0.1.0"
dependencies = [
- "base64 0.21.7",
- "bs58 0.5.1",
+ "base64 0.22.1",
+ "bs58",
+ "serde",
+ "time",
+]
+
+[[package]]
+name = "nym-service-provider-requests-common"
+version = "0.1.0"
+dependencies = [
"serde",
]
@@ -5716,10 +5929,10 @@ dependencies = [
[[package]]
name = "nym-socks5-client"
-version = "1.1.40"
+version = "1.1.42"
dependencies = [
- "bs58 0.5.1",
- "clap 4.5.7",
+ "bs58",
+ "clap 4.5.17",
"log",
"nym-bin-common",
"nym-client-core",
@@ -5752,7 +5965,7 @@ name = "nym-socks5-client-core"
version = "0.1.0"
dependencies = [
"anyhow",
- "dirs 4.0.0",
+ "dirs 5.0.1",
"futures",
"log",
"nym-bandwidth-controller",
@@ -5837,6 +6050,7 @@ version = "0.1.0"
dependencies = [
"log",
"nym-crypto",
+ "nym-metrics",
"nym-mixnet-contract-common",
"nym-sphinx-acknowledgements",
"nym-sphinx-addressing",
@@ -5850,6 +6064,7 @@ dependencies = [
"nym-sphinx-types",
"nym-topology",
"rand",
+ "rand_chacha",
"rand_distr",
"thiserror",
"tokio",
@@ -5888,7 +6103,7 @@ dependencies = [
name = "nym-sphinx-anonymous-replies"
version = "0.1.0"
dependencies = [
- "bs58 0.5.1",
+ "bs58",
"nym-crypto",
"nym-sphinx-addressing",
"nym-sphinx-params",
@@ -5906,12 +6121,17 @@ dependencies = [
name = "nym-sphinx-chunking"
version = "0.1.0"
dependencies = [
+ "dashmap",
"log",
+ "nym-crypto",
+ "nym-metrics",
"nym-sphinx-addressing",
"nym-sphinx-params",
"nym-sphinx-types",
"rand",
+ "serde",
"thiserror",
+ "utoipa",
]
[[package]]
@@ -6014,7 +6234,7 @@ name = "nym-topology"
version = "0.1.0"
dependencies = [
"async-trait",
- "bs58 0.5.1",
+ "bs58",
"log",
"nym-api-requests",
"nym-bin-common",
@@ -6025,7 +6245,8 @@ dependencies = [
"nym-sphinx-routing",
"nym-sphinx-types",
"rand",
- "semver 0.11.0",
+ "reqwest 0.12.4",
+ "semver 1.0.23",
"serde",
"serde_json",
"thiserror",
@@ -6050,7 +6271,7 @@ dependencies = [
name = "nym-types"
version = "1.0.0"
dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
"cosmrs 0.17.0-pre",
"cosmwasm-std",
"eyre",
@@ -6067,7 +6288,7 @@ dependencies = [
"serde",
"serde_json",
"sha2 0.10.8",
- "strum 0.25.0",
+ "strum 0.26.3",
"tempfile",
"thiserror",
"ts-rs",
@@ -6080,7 +6301,7 @@ name = "nym-validator-client"
version = "0.1.0"
dependencies = [
"async-trait",
- "base64 0.13.1",
+ "base64 0.22.1",
"bip32",
"bip39",
"colored",
@@ -6130,7 +6351,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"bip39",
- "clap 4.5.7",
+ "clap 4.5.17",
"cosmwasm-std",
"futures",
"humantime 2.1.0",
@@ -6198,13 +6419,16 @@ dependencies = [
name = "nym-wireguard"
version = "0.1.0"
dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
"bincode",
"chrono",
"dashmap",
"defguard_wireguard_rs",
+ "futures",
"ip_network",
"log",
+ "nym-authenticator-requests",
+ "nym-credential-verification",
"nym-crypto",
"nym-gateway-storage",
"nym-network-defaults",
@@ -6220,29 +6444,24 @@ dependencies = [
name = "nym-wireguard-types"
version = "0.1.0"
dependencies = [
- "base64 0.21.7",
- "dashmap",
- "hmac",
+ "base64 0.22.1",
"log",
"nym-config",
"nym-crypto",
"nym-network-defaults",
"rand",
"serde",
- "serde_json",
- "sha2 0.10.8",
"thiserror",
- "utoipa",
"x25519-dalek",
]
[[package]]
name = "nymvisor"
-version = "0.1.6"
+version = "0.1.8"
dependencies = [
"anyhow",
"bytes",
- "clap 4.5.7",
+ "clap 4.5.17",
"dotenvy",
"flate2",
"futures",
@@ -6317,6 +6536,12 @@ version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+[[package]]
+name = "oneshot-uniffi"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c548d5c78976f6955d72d0ced18c48ca07030f7a1d4024529fedd7c1c01b29c"
+
[[package]]
name = "oorandom"
version = "11.1.3"
@@ -6662,6 +6887,16 @@ dependencies = [
"sha2 0.10.8",
]
+[[package]]
+name = "petgraph"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
+dependencies = [
+ "fixedbitset",
+ "indexmap 2.2.6",
+]
+
[[package]]
name = "pin-project"
version = "1.1.5"
@@ -6711,10 +6946,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
[[package]]
-name = "platforms"
-version = "3.4.0"
+name = "plain"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7"
+checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
[[package]]
name = "plotters"
@@ -6807,7 +7042,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d"
dependencies = [
- "env_logger 0.7.1",
+ "env_logger",
"log",
]
@@ -6821,6 +7056,15 @@ dependencies = [
"syn 1.0.109",
]
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+dependencies = [
+ "toml_edit 0.21.1",
+]
+
[[package]]
name = "proc-macro-error"
version = "1.0.4"
@@ -6845,6 +7089,28 @@ dependencies = [
"version_check",
]
+[[package]]
+name = "proc-macro-error-attr2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "proc-macro-error2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
+dependencies = [
+ "proc-macro-error-attr2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
[[package]]
name = "proc-macro2"
version = "1.0.85"
@@ -6991,9 +7257,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
[[package]]
name = "quote"
-version = "1.0.36"
+version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2",
]
@@ -7148,9 +7414,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.10.5"
+version = "1.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
dependencies = [
"aho-corasick",
"memchr",
@@ -7239,12 +7505,13 @@ checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
dependencies = [
"base64 0.22.1",
"bytes",
+ "futures-channel",
"futures-core",
"futures-util",
"http 1.1.0",
"http-body 1.0.0",
"http-body-util",
- "hyper 1.3.1",
+ "hyper 1.4.1",
"hyper-rustls 0.26.0",
"hyper-util",
"ipnet",
@@ -7645,16 +7912,18 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
[[package]]
name = "safer-ffi"
-version = "0.1.8"
+version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44abae8773dc41fb96af52696b834b1f4c806006b456b22ee3602f7b061e3ad0"
+checksum = "435fdd58b61a6f1d8545274c1dfa458e905ff68c166e65e294a0130ef5e675bd"
dependencies = [
+ "extern-c",
"inventory",
"libc",
"macro_rules_attribute",
"paste",
"safer_ffi-proc_macros",
"scopeguard",
+ "stabby",
"uninit",
"unwind_safe",
"with_builtin_macros",
@@ -7662,9 +7931,9 @@ dependencies = [
[[package]]
name = "safer_ffi-proc_macros"
-version = "0.1.8"
+version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c9d4117a8a72f9b615169d4d720d79e74931f74003c73cc2f3927c700156ddf"
+checksum = "f0f25be5ba5f319542edb31925517e0380245ae37df50a9752cdbc05ef948156"
dependencies = [
"macro_rules_attribute",
"prettyplease",
@@ -7728,6 +7997,26 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+[[package]]
+name = "scroll"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da"
+dependencies = [
+ "scroll_derive",
+]
+
+[[package]]
+name = "scroll_derive"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
[[package]]
name = "sct"
version = "0.7.1"
@@ -7782,16 +8071,7 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
dependencies = [
- "semver-parser 0.7.0",
-]
-
-[[package]]
-name = "semver"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser 0.10.2",
+ "semver-parser",
]
[[package]]
@@ -7809,20 +8089,11 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
-
[[package]]
name = "serde"
-version = "1.0.203"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
dependencies = [
"serde_derive",
]
@@ -7860,18 +8131,18 @@ dependencies = [
[[package]]
name = "serde_bytes"
-version = "0.11.14"
+version = "0.11.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734"
+checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a"
dependencies = [
"serde",
]
[[package]]
name = "serde_derive"
-version = "1.0.203"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
dependencies = [
"proc-macro2",
"quote",
@@ -7902,11 +8173,12 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.117"
+version = "1.0.128"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
dependencies = [
"itoa",
+ "memchr",
"ryu",
"serde",
]
@@ -7955,9 +8227,9 @@ dependencies = [
[[package]]
name = "serde_with"
-version = "3.8.1"
+version = "3.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"
+checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
dependencies = [
"base64 0.22.1",
"chrono",
@@ -7973,9 +8245,9 @@ dependencies = [
[[package]]
name = "serde_with_macros"
-version = "3.8.1"
+version = "3.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
+checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
dependencies = [
"darling 0.20.9",
"proc-macro2",
@@ -8051,6 +8323,12 @@ dependencies = [
"digest 0.10.7",
]
+[[package]]
+name = "sha2-const-stable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f179d4e11094a893b82fff208f74d448a7512f99f5a0acbd5c679b705f83ed9"
+
[[package]]
name = "sharded-slab"
version = "0.1.7"
@@ -8061,10 +8339,16 @@ dependencies = [
]
[[package]]
-name = "si-scale"
-version = "0.2.2"
+name = "shlex"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44beb68bf488343b13ddbd74d1d5d5e6559a58b6dfaee74eb8d5ed4f7ed7666f"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "si-scale"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b72e7cd0744e007e382ba320435f1ed1ecd709409b4ebd5cfbc843d77b25a8aa"
[[package]]
name = "signal-hook"
@@ -8106,6 +8390,12 @@ dependencies = [
"rand_core 0.6.4",
]
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
[[package]]
name = "siphasher"
version = "1.0.1"
@@ -8179,11 +8469,11 @@ dependencies = [
"aes",
"arrayref",
"blake2 0.8.1",
- "bs58 0.5.1",
+ "bs58",
"byteorder",
"chacha",
"ctr",
- "curve25519-dalek 4.1.2",
+ "curve25519-dalek 4.1.3",
"digest 0.10.7",
"hkdf",
"hmac",
@@ -8248,12 +8538,14 @@ checksum = "fa8241483a83a3f33aa5fff7e7d9def398ff9990b2752b6c6112b83c6d246029"
dependencies = [
"ahash 0.7.8",
"atoi",
+ "base64 0.13.1",
"bitflags 1.3.2",
"byteorder",
"bytes",
"chrono",
"crc",
"crossbeam-queue",
+ "dirs 4.0.0",
"dotenvy",
"either",
"event-listener",
@@ -8265,17 +8557,24 @@ dependencies = [
"futures-util",
"hashlink",
"hex",
+ "hkdf",
+ "hmac",
"indexmap 1.9.3",
"itoa",
"libc",
"libsqlite3-sys",
"log",
+ "md-5",
"memchr",
"once_cell",
"paste",
"percent-encoding",
+ "rand",
"rustls 0.20.9",
"rustls-pemfile 1.0.4",
+ "serde",
+ "serde_json",
+ "sha1",
"sha2 0.10.8",
"smallvec",
"sqlformat",
@@ -8286,6 +8585,7 @@ dependencies = [
"tokio-stream",
"url",
"webpki-roots 0.22.6",
+ "whoami",
]
[[package]]
@@ -8297,9 +8597,12 @@ dependencies = [
"dotenvy",
"either",
"heck 0.4.1",
+ "hex",
"once_cell",
"proc-macro2",
"quote",
+ "serde",
+ "serde_json",
"sha2 0.10.8",
"sqlx-core",
"sqlx-rt",
@@ -8323,11 +8626,45 @@ name = "ssl-inject"
version = "0.1.0"
dependencies = [
"anyhow",
- "clap 4.5.7",
+ "clap 4.5.17",
"hex",
"tokio",
]
+[[package]]
+name = "stabby"
+version = "36.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "311d6bcf0070c462ff626122ec2246f42bd2acd44b28908eedbfd07d500c7d99"
+dependencies = [
+ "rustversion",
+ "stabby-abi",
+]
+
+[[package]]
+name = "stabby-abi"
+version = "36.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6daae1a0707399f56d27fce7f212e50e31d215112a447e1bbcd837ae1bf5f49"
+dependencies = [
+ "rustversion",
+ "sha2-const-stable",
+ "stabby-macros",
+]
+
+[[package]]
+name = "stabby-macros"
+version = "36.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43cf89a0cc9131279235baf8599b0e073fbcb096419204de0cc5d1a48ae73f74"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "rand",
+ "syn 1.0.109",
+]
+
[[package]]
name = "stable-pattern"
version = "0.1.0"
@@ -8337,12 +8674,6 @@ dependencies = [
"memchr",
]
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
[[package]]
name = "state"
version = "0.6.0"
@@ -8352,6 +8683,12 @@ dependencies = [
"loom",
]
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
[[package]]
name = "stringprep"
version = "0.1.5"
@@ -8384,26 +8721,14 @@ dependencies = [
"strum_macros 0.23.1",
]
-[[package]]
-name = "strum"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
-
-[[package]]
-name = "strum"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
-dependencies = [
- "strum_macros 0.25.3",
-]
-
[[package]]
name = "strum"
version = "0.26.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
+dependencies = [
+ "strum_macros 0.26.4",
+]
[[package]]
name = "strum_macros"
@@ -8418,32 +8743,6 @@ dependencies = [
"syn 1.0.109",
]
-[[package]]
-name = "strum_macros"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
-dependencies = [
- "heck 0.4.1",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.25.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
-dependencies = [
- "heck 0.4.1",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 2.0.66",
-]
-
[[package]]
name = "strum_macros"
version = "0.26.4"
@@ -8518,37 +8817,11 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
-[[package]]
-name = "synstructure"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
[[package]]
name = "sysinfo"
-version = "0.27.8"
+version = "0.30.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a902e9050fca0a5d6877550b769abd2bd1ce8c04634b941dbe2809735e1a1e33"
-dependencies = [
- "cfg-if",
- "core-foundation-sys",
- "libc",
- "ntapi",
- "once_cell",
- "rayon",
- "winapi",
-]
-
-[[package]]
-name = "sysinfo"
-version = "0.30.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae"
+checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3"
dependencies = [
"cfg-if",
"core-foundation-sys",
@@ -8604,7 +8877,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
dependencies = [
"cfg-if",
- "fastrand 2.1.0",
+ "fastrand 2.1.1",
"rustix",
"windows-sys 0.52.0",
]
@@ -8768,8 +9041,8 @@ version = "0.1.0"
dependencies = [
"anyhow",
"bip39",
- "bs58 0.5.1",
- "clap 4.5.7",
+ "bs58",
+ "clap 4.5.17",
"console",
"cw-utils",
"dkg-bypass-contract",
@@ -8809,18 +9082,18 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
[[package]]
name = "thiserror"
-version = "1.0.61"
+version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.61"
+version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
dependencies = [
"proc-macro2",
"quote",
@@ -8893,16 +9166,6 @@ dependencies = [
"time-core",
]
-[[package]]
-name = "tinystr"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
-dependencies = [
- "displaydoc",
- "zerovec",
-]
-
[[package]]
name = "tinytemplate"
version = "1.2.1"
@@ -8930,9 +9193,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.39.2"
+version = "1.40.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
dependencies = [
"backtrace",
"bytes",
@@ -9014,9 +9277,9 @@ dependencies = [
[[package]]
name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
dependencies = [
"futures-core",
"pin-project-lite",
@@ -9066,9 +9329,9 @@ dependencies = [
[[package]]
name = "tokio-util"
-version = "0.7.11"
+version = "0.7.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
dependencies = [
"bytes",
"futures-core",
@@ -9089,18 +9352,6 @@ dependencies = [
"serde",
]
-[[package]]
-name = "toml"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit 0.19.15",
-]
-
[[package]]
name = "toml"
version = "0.8.14"
@@ -9124,13 +9375,11 @@ dependencies = [
[[package]]
name = "toml_edit"
-version = "0.19.15"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
dependencies = [
"indexmap 2.2.6",
- "serde",
- "serde_spanned",
"toml_datetime",
"winnow 0.5.40",
]
@@ -9584,6 +9833,138 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
+[[package]]
+name = "uniffi"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21345172d31092fd48c47fd56c53d4ae9e41c4b1f559fb8c38c1ab1685fd919f"
+dependencies = [
+ "anyhow",
+ "camino",
+ "clap 4.5.17",
+ "uniffi_bindgen",
+ "uniffi_build",
+ "uniffi_core",
+ "uniffi_macros",
+]
+
+[[package]]
+name = "uniffi_bindgen"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd992f2929a053829d5875af1eff2ee3d7a7001cb3b9a46cc7895f2caede6940"
+dependencies = [
+ "anyhow",
+ "askama",
+ "camino",
+ "cargo_metadata 0.15.4",
+ "clap 4.5.17",
+ "fs-err",
+ "glob",
+ "goblin",
+ "heck 0.4.1",
+ "once_cell",
+ "paste",
+ "serde",
+ "toml 0.5.11",
+ "uniffi_meta",
+ "uniffi_testing",
+ "uniffi_udl",
+]
+
+[[package]]
+name = "uniffi_build"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "001964dd3682d600084b3aaf75acf9c3426699bc27b65e96bb32d175a31c74e9"
+dependencies = [
+ "anyhow",
+ "camino",
+ "uniffi_bindgen",
+]
+
+[[package]]
+name = "uniffi_checksum_derive"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55137c122f712d9330fd985d66fa61bdc381752e89c35708c13ce63049a3002c"
+dependencies = [
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "uniffi_core"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6121a127a3af1665cd90d12dd2b3683c2643c5103281d0fed5838324ca1fad5b"
+dependencies = [
+ "anyhow",
+ "bytes",
+ "camino",
+ "log",
+ "once_cell",
+ "oneshot-uniffi",
+ "paste",
+ "static_assertions",
+]
+
+[[package]]
+name = "uniffi_macros"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11cf7a58f101fcedafa5b77ea037999b88748607f0ef3a33eaa0efc5392e92e4"
+dependencies = [
+ "bincode",
+ "camino",
+ "fs-err",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "syn 2.0.66",
+ "toml 0.5.11",
+ "uniffi_build",
+ "uniffi_meta",
+]
+
+[[package]]
+name = "uniffi_meta"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71dc8573a7b1ac4b71643d6da34888273ebfc03440c525121f1b3634ad3417a2"
+dependencies = [
+ "anyhow",
+ "bytes",
+ "siphasher 0.3.11",
+ "uniffi_checksum_derive",
+]
+
+[[package]]
+name = "uniffi_testing"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "118448debffcb676ddbe8c5305fb933ab7e0123753e659a71dc4a693f8d9f23c"
+dependencies = [
+ "anyhow",
+ "camino",
+ "cargo_metadata 0.15.4",
+ "fs-err",
+ "once_cell",
+]
+
+[[package]]
+name = "uniffi_udl"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "889edb7109c6078abe0e53e9b4070cf74a6b3468d141bdf5ef1bd4d1dc24a1c3"
+dependencies = [
+ "anyhow",
+ "uniffi_meta",
+ "uniffi_testing",
+ "weedle2",
+]
+
[[package]]
name = "uninit"
version = "0.5.1"
@@ -9629,12 +10010,12 @@ checksum = "0976c77def3f1f75c4ef892a292c31c0bbe9e3d0702c63044d7c76db298171a3"
[[package]]
name = "url"
-version = "2.5.1"
+version = "2.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
dependencies = [
"form_urlencoded",
- "idna 1.0.0",
+ "idna 0.5.0",
"percent-encoding",
"serde",
]
@@ -9651,18 +10032,6 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-[[package]]
-name = "utf16_iter"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-
-[[package]]
-name = "utf8_iter"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
-
[[package]]
name = "utf8parse"
version = "0.2.2"
@@ -9696,25 +10065,59 @@ dependencies = [
[[package]]
name = "utoipa-swagger-ui"
-version = "6.0.0"
+version = "7.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b39868d43c011961e04b41623e050aedf2cc93652562ff7935ce0f819aaf2da"
+checksum = "943e0ff606c6d57d410fd5663a4d7c074ab2c5f14ab903b9514565e59fa1189e"
dependencies = [
"axum 0.7.5",
"mime_guess",
"regex",
+ "reqwest 0.12.4",
"rust-embed",
"serde",
"serde_json",
+ "url",
"utoipa",
"zip",
]
[[package]]
-name = "uuid"
-version = "1.8.0"
+name = "utoipauto"
+version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+checksum = "608b8f2279483be386261655b562e40877ea434eb92093c894a644fda2021860"
+dependencies = [
+ "utoipauto-macro",
+]
+
+[[package]]
+name = "utoipauto-core"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17e82ab96c5a55263b5bed151b8426410d93aa909a453acdbd4b6792b5af7d64"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "utoipauto-macro"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8338dc3c9526011ffaa2aa6bd60ddfda9d49d2123108690755c6e34844212"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+ "utoipauto-core",
+]
+
+[[package]]
+name = "uuid"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
dependencies = [
"getrandom",
"serde",
@@ -9740,7 +10143,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525"
dependencies = [
"anyhow",
- "cargo_metadata",
+ "cargo_metadata 0.18.1",
"cfg-if",
"regex",
"rustc_version 0.4.0",
@@ -9786,20 +10189,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
-name = "wasm-bindgen"
-version = "0.2.92"
+name = "wasite"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
dependencies = [
"cfg-if",
+ "once_cell",
"wasm-bindgen-macro",
]
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
dependencies = [
"bumpalo",
"log",
@@ -9812,9 +10222,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.42"
+version = "0.4.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
dependencies = [
"cfg-if",
"js-sys",
@@ -9824,9 +10234,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -9834,9 +10244,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
dependencies = [
"proc-macro2",
"quote",
@@ -9847,18 +10257,19 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
[[package]]
name = "wasm-bindgen-test"
-version = "0.3.42"
+version = "0.3.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9bf62a58e0780af3e852044583deee40983e5886da43a271dd772379987667b"
+checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9"
dependencies = [
"console_error_panic_hook",
"js-sys",
+ "minicov",
"scoped-tls",
"wasm-bindgen",
"wasm-bindgen-futures",
@@ -9867,9 +10278,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-test-macro"
-version = "0.3.42"
+version = "0.3.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
+checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021"
dependencies = [
"proc-macro2",
"quote",
@@ -9969,9 +10380,9 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.69"
+version = "0.3.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -10020,6 +10431,26 @@ dependencies = [
"rustls-pki-types",
]
+[[package]]
+name = "weedle2"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e79c5206e1f43a2306fd64bdb95025ee4228960f2e6c5a8b173f3caaf807741"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "whoami"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
+dependencies = [
+ "redox_syscall 0.5.1",
+ "wasite",
+ "web-sys",
+]
+
[[package]]
name = "winapi"
version = "0.3.9"
@@ -10342,18 +10773,6 @@ dependencies = [
"syn 1.0.109",
]
-[[package]]
-name = "write16"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
-
-[[package]]
-name = "writeable"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
-
[[package]]
name = "wyz"
version = "0.5.1"
@@ -10369,7 +10788,7 @@ version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"
dependencies = [
- "curve25519-dalek 4.1.2",
+ "curve25519-dalek 4.1.3",
"rand_core 0.6.4",
"serde",
"zeroize",
@@ -10395,30 +10814,6 @@ dependencies = [
"is-terminal",
]
-[[package]]
-name = "yoke"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
-dependencies = [
- "serde",
- "stable_deref_trait",
- "yoke-derive",
- "zerofrom",
-]
-
-[[package]]
-name = "yoke-derive"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
- "synstructure",
-]
-
[[package]]
name = "zerocopy"
version = "0.7.34"
@@ -10439,27 +10834,6 @@ dependencies = [
"syn 2.0.66",
]
-[[package]]
-name = "zerofrom"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
-dependencies = [
- "zerofrom-derive",
-]
-
-[[package]]
-name = "zerofrom-derive"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
- "synstructure",
-]
-
[[package]]
name = "zeroize"
version = "1.6.0"
@@ -10480,38 +10854,20 @@ dependencies = [
"syn 2.0.66",
]
-[[package]]
-name = "zerovec"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c"
-dependencies = [
- "yoke",
- "zerofrom",
- "zerovec-derive",
-]
-
-[[package]]
-name = "zerovec-derive"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
[[package]]
name = "zip"
-version = "0.6.6"
+version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
+checksum = "9cc23c04387f4da0374be4533ad1208cbb091d5c11d070dfef13676ad6497164"
dependencies = [
- "byteorder",
+ "arbitrary",
"crc32fast",
"crossbeam-utils",
+ "displaydoc",
"flate2",
+ "indexmap 2.2.6",
+ "num_enum",
+ "thiserror",
]
[[package]]
@@ -10520,7 +10876,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"async-trait",
- "bs58 0.5.1",
+ "bs58",
"getrandom",
"js-sys",
"nym-bin-common",
diff --git a/pkgs/by-name/ny/nym/package.nix b/pkgs/by-name/ny/nym/package.nix
index 2456b3b76906..ead40b8a913e 100644
--- a/pkgs/by-name/ny/nym/package.nix
+++ b/pkgs/by-name/ny/nym/package.nix
@@ -8,17 +8,23 @@
darwin,
nix-update-script,
rustc,
+ fetchurl,
}:
rustPlatform.buildRustPackage rec {
pname = "nym";
- version = "2024.10-caramello";
+ version = "2024.12-aero";
src = fetchFromGitHub {
owner = "nymtech";
repo = "nym";
rev = "nym-binaries-v${version}";
- hash = "sha256-0vEvjVCbwyJ7lpvZnIT551Kul0JfkcNSeURbX2PUZ4w=";
+ hash = "sha256-bUY0ctfE1i0pjqdT/LT43FB9rDO5OKBVaTckm5qxnms=";
+ };
+
+ swagger-ui = fetchurl {
+ url = "https://github.com/swagger-api/swagger-ui/archive/refs/tags/v5.17.14.zip";
+ hash = "sha256-SBJE0IEgl7Efuu73n3HZQrFxYX+cn5UU5jrL4T5xzNw=";
};
cargoLock = {
@@ -26,10 +32,15 @@ rustPlatform.buildRustPackage rec {
outputHashes = {
"bls12_381-0.8.0" = "sha256-4+X/ZQ5Z+Nax4Ot1JWWvvLxuIUaucHkfnDB2L+Ak7Ro=";
"cosmos-sdk-proto-0.22.0-pre" = "sha256-nRfcAbjFcvAqool+6heYK8joiU5YaSWITnO6S5MRM1E=";
+ "defguard_wireguard_rs-0.4.7" = "sha256-+5m1+XGJ6Fi8v6rgjt0jRmwIruIL+OPP7zq/+166WMw=";
"indexed_db_futures-0.4.2" = "sha256-vVqrD40CBdSSEtU+kQeuZUfsgpJdl8ks+os0Fct8Ung=";
};
};
+ env = {
+ SWAGGER_UI_DOWNLOAD_URL = "file://${swagger-ui}";
+ };
+
nativeBuildInputs = [
pkg-config
];
diff --git a/pkgs/by-name/ob/objfw/package.nix b/pkgs/by-name/ob/objfw/package.nix
new file mode 100644
index 000000000000..4a02e4989849
--- /dev/null
+++ b/pkgs/by-name/ob/objfw/package.nix
@@ -0,0 +1,41 @@
+{
+ autoconf,
+ autogen,
+ automake,
+ clangStdenv,
+ fetchFromGitHub,
+ lib,
+}:
+
+clangStdenv.mkDerivation (finalAttrs: {
+ pname = "objfw";
+ version = "1.1.7";
+
+ src = fetchFromGitHub {
+ owner = "ObjFW";
+ repo = "ObjFW";
+ rev = "refs/tags/1.1.7-release";
+ hash = "sha256-0ylG/2ZSO3b8zdh6W9QJH5OJW9V344CCik1DduV5mhI=";
+ };
+
+ nativeBuildInputs = [
+ automake
+ autogen
+ autoconf
+ ];
+
+ preConfigure = "./autogen.sh";
+ configureFlags = [
+ "--without-tls"
+ ];
+
+ doCheck = true;
+
+ meta = {
+ description = "A portable framework for the Objective-C language";
+ homepage = "https://github.com/ObjFW/ObjFW";
+ license = lib.licenses.lgpl3;
+ maintainers = [ lib.maintainers.steeleduncan ];
+ platforms = lib.platforms.linux;
+ };
+})
diff --git a/pkgs/by-name/oc/octoscan/package.nix b/pkgs/by-name/oc/octoscan/package.nix
index b6ca64b5a97c..1190e8831e8b 100644
--- a/pkgs/by-name/oc/octoscan/package.nix
+++ b/pkgs/by-name/oc/octoscan/package.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "octoscan";
- version = "0.1.1";
+ version = "0.1.2";
src = fetchFromGitHub {
owner = "synacktiv";
repo = "octoscan";
rev = "refs/tags/v${version}";
- hash = "sha256-KoNM+Wqv+NmlXHYUn5YIXrG4rHkccVk2QWsNd0iK8YI=";
+ hash = "sha256-v8KINZwVH/AqRKLaornIOu7VsmjbQ6CuejXgKaomWso=";
};
vendorHash = "sha256-9IT8qTFzn8otWGTBP7ODcT8iBckIJ/3+jkbF1dq6aDw=";
diff --git a/pkgs/by-name/od/odoo/package.nix b/pkgs/by-name/od/odoo/package.nix
index fd3768bcd742..8c7477c074ea 100644
--- a/pkgs/by-name/od/odoo/package.nix
+++ b/pkgs/by-name/od/odoo/package.nix
@@ -1,29 +1,17 @@
{ lib
, fetchgit
, fetchzip
-, python310
+, python312
, rtlcss
, wkhtmltopdf
, nixosTests
-, odoo_version ? "17.0"
-, odoo_release ? "20240610"
}:
let
- python = python310.override {
+ odoo_version = "18.0";
+ odoo_release = "20241010";
+ python = python312.override {
self = python;
- packageOverrides = final: prev: {
- # requirements.txt fixes docutils at 0.17; the default 0.21.1 tested throws exceptions
- docutils-0_17 = prev.docutils.overridePythonAttrs (old: rec {
- version = "0.17";
- src = fetchgit {
- url = "git://repo.or.cz/docutils.git";
- rev = "docutils-${version}";
- hash = "sha256-O/9q/Dg1DBIxKdNBOhDV16yy5ez0QANJYMjeovDoWX8=";
- };
- buildInputs = with prev; [setuptools];
- });
- };
};
in python.pkgs.buildPythonApplication rec {
pname = "odoo";
@@ -34,13 +22,10 @@ in python.pkgs.buildPythonApplication rec {
src = fetchzip {
# find latest version on https://nightly.odoo.com/${odoo_version}/nightly/src
url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip";
- name = "${pname}-${version}";
- hash = "sha256-blibGJyaz+MxMazOXhPbGBAJWZoGubirwSnjVYyLBJs="; # odoo
+ name = "odoo-${version}";
+ hash = "sha256-TUfLyB0m8XyEiS493Q/ECgSJutAd1rtWX93f3mwfOK0="; # odoo
};
- # needs some investigation
- doCheck = false;
-
makeWrapperArgs = [
"--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf rtlcss ]}"
];
@@ -50,7 +35,8 @@ in python.pkgs.buildPythonApplication rec {
chardet
cryptography
decorator
- docutils-0_17 # sphinx has a docutils requirement >= 18
+ docutils
+ distutils
ebaysdk
freezegun
geoip2
diff --git a/pkgs/by-name/od/odoo/update.sh b/pkgs/by-name/od/odoo/update.sh
index e9c50ccb5081..2265f9048c0e 100755
--- a/pkgs/by-name/od/odoo/update.sh
+++ b/pkgs/by-name/od/odoo/update.sh
@@ -1,9 +1,15 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p curl gnused nix coreutils nix-prefetch
+# shellcheck shell=bash
set -euo pipefail
-VERSION="17.0" # must be incremented manually
+SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
+PKG=$(basename "$SCRIPT_DIR")
+
+LATEST="18" # increment manually
+VERSION="${PKG/#odoo}"
+VERSION="${VERSION:-$LATEST}.0"
RELEASE="$(
curl "https://nightly.odoo.com/$VERSION/nightly/src/" |
@@ -12,15 +18,15 @@ RELEASE="$(
)"
latestVersion="$VERSION.$RELEASE"
-currentVersion=$(nix-instantiate --eval -E "with import ./. {}; odoo.version or (lib.getVersion odoo)" | tr -d '"')
+currentVersion=$(nix-instantiate --eval -E "with import ./. {}; $PKG.version or (lib.getVersion $PKG)" | tr -d '"')
if [[ "$currentVersion" == "$latestVersion" ]]; then
- echo "odoo is up-to-date: $currentVersion"
+ echo "$PKG is up-to-date: $currentVersion"
exit 0
fi
-cd "$(dirname "${BASH_SOURCE[0]}")"
+cd "$SCRIPT_DIR"
-sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch -q fetchzip --url "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.zip")\"; # odoo|g" package.nix
-sed -ri "s|, odoo_version \? .+|, odoo_version ? \"$VERSION\"|" package.nix
-sed -ri "s|, odoo_release \? .+|, odoo_release ? \"$RELEASE\"|" package.nix
+sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch -q fetchzip --option extra-experimental-features flakes --url "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.zip")\"; # odoo|g" package.nix
+sed -ri "s|odoo_version = .+|odoo_version = \"$VERSION\";|" package.nix
+sed -ri "s|odoo_release = .+|odoo_release = \"$RELEASE\";|" package.nix
diff --git a/pkgs/by-name/od/odoo15/package.nix b/pkgs/by-name/od/odoo15/package.nix
index ca2a1444a02c..be0f9a690660 100644
--- a/pkgs/by-name/od/odoo15/package.nix
+++ b/pkgs/by-name/od/odoo15/package.nix
@@ -1,13 +1,20 @@
-{ lib, fetchFromGitHub, fetchzip, python310, rtlcss, wkhtmltopdf
-, nixosTests }:
+{ lib
+, fetchFromGitHub
+, fetchzip
+, python310
+, rtlcss
+, wkhtmltopdf
+, nixosTests
+}:
let
+ odoo_version = "15.0";
+ odoo_release = "20241010";
python = python310.override {
self = python;
packageOverrides = self: super: {
pypdf2 = super.pypdf2.overridePythonAttrs (old: rec {
version = "1.28.6";
- format = "setuptools";
src = fetchFromGitHub {
owner = "py-pdf";
@@ -17,43 +24,25 @@ let
hash = "sha256-WnRbsy/PJcotZqY9mJPLadrYqkXykOVifLIbDyNf4s4=";
};
+ dependencies = [ self.setuptools ];
+
nativeCheckInputs = with self; [ pytestCheckHook pillow ];
});
- flask = super.flask.overridePythonAttrs (old: rec {
- version = "2.1.3";
- src = old.src.override {
- inherit version;
- hash = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss=";
- };
- });
- werkzeug = super.werkzeug.overridePythonAttrs (old: rec {
- version = "2.1.2";
- src = old.src.override {
- inherit version;
- hash = "sha256-HOCOgJPtZ9Y41jh5/Rujc1gX96gN42dNKT9ZhPJftuY=";
- };
- });
};
};
-
- odoo_version = "15.0";
- odoo_release = "20230816";
in python.pkgs.buildPythonApplication rec {
- pname = "odoo15";
+ pname = "odoo";
version = "${odoo_version}.${odoo_release}";
format = "setuptools";
- # latest release is at https://github.com/odoo/docker/blob/master/15.0/Dockerfile
+ # latest release is at https://github.com/odoo/docker/blob/5fb6a842747c296099d9384587cd89640eb7a615/15.0/Dockerfile#L58
src = fetchzip {
url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip";
- name = "${pname}-${version}";
- hash = "sha256-h81JA0o44DVtl/bZ52rGQfg54TigwQcNpcMjQbi0zIQ="; # odoo
+ name = "odoo-${version}";
+ hash = "sha256-Hkre6mghEiLrDwfB1BxGbqEm/zruHLwaS+eIFQKjl1o="; # odoo
};
- # needs some investigation
- doCheck = false;
-
makeWrapperArgs = [
"--prefix"
"PATH"
@@ -74,6 +63,7 @@ in python.pkgs.buildPythonApplication rec {
jinja2
libsass
lxml
+ lxml-html-clean
markupsafe
mock
num2words
@@ -108,6 +98,7 @@ in python.pkgs.buildPythonApplication rec {
dontStrip = true;
passthru = {
+ updateScript = ./update.sh;
tests = { inherit (nixosTests) odoo15; };
};
diff --git a/pkgs/by-name/od/odoo15/update.sh b/pkgs/by-name/od/odoo15/update.sh
new file mode 100755
index 000000000000..2265f9048c0e
--- /dev/null
+++ b/pkgs/by-name/od/odoo15/update.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl gnused nix coreutils nix-prefetch
+# shellcheck shell=bash
+
+set -euo pipefail
+
+SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
+PKG=$(basename "$SCRIPT_DIR")
+
+LATEST="18" # increment manually
+VERSION="${PKG/#odoo}"
+VERSION="${VERSION:-$LATEST}.0"
+
+RELEASE="$(
+ curl "https://nightly.odoo.com/$VERSION/nightly/src/" |
+ sed -nE 's/.*odoo_'"$VERSION"'.(20[0-9]{6}).tar.gz.*/\1/p' |
+ tail -n 1
+)"
+
+latestVersion="$VERSION.$RELEASE"
+currentVersion=$(nix-instantiate --eval -E "with import ./. {}; $PKG.version or (lib.getVersion $PKG)" | tr -d '"')
+
+if [[ "$currentVersion" == "$latestVersion" ]]; then
+ echo "$PKG is up-to-date: $currentVersion"
+ exit 0
+fi
+
+cd "$SCRIPT_DIR"
+
+sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch -q fetchzip --option extra-experimental-features flakes --url "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.zip")\"; # odoo|g" package.nix
+sed -ri "s|odoo_version = .+|odoo_version = \"$VERSION\";|" package.nix
+sed -ri "s|odoo_release = .+|odoo_release = \"$RELEASE\";|" package.nix
diff --git a/pkgs/by-name/od/odoo16/package.nix b/pkgs/by-name/od/odoo16/package.nix
index 91e634a13b22..b2acd426cf60 100644
--- a/pkgs/by-name/od/odoo16/package.nix
+++ b/pkgs/by-name/od/odoo16/package.nix
@@ -7,31 +7,11 @@
}:
let
+ odoo_version = "16.0";
+ odoo_release = "20241010";
python = python310.override {
self = python;
- packageOverrides = self: super: {
- flask = super.flask.overridePythonAttrs (old: rec {
- version = "2.3.3";
- src = old.src.override {
- inherit version;
- hash = "sha256-CcNHqSqn/0qOfzIGeV8w2CZlS684uHPQdEzVccpgnvw=";
- };
- });
- werkzeug = super.werkzeug.overridePythonAttrs (old: rec {
- version = "2.3.7";
- src = old.src.override {
- inherit version;
- hash = "sha256-K4wORHtLnbzIXdl7butNy69si2w74L1lTiVVPgohV9g=";
- };
- disabledTests = old.disabledTests ++ [
- "test_response_body"
- ];
- });
- };
};
-
- odoo_version = "16.0";
- odoo_release = "20231024";
in python.pkgs.buildPythonApplication rec {
pname = "odoo";
version = "${odoo_version}.${odoo_release}";
@@ -41,13 +21,10 @@ in python.pkgs.buildPythonApplication rec {
# latest release is at https://github.com/odoo/docker/blob/master/16.0/Dockerfile
src = fetchzip {
url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip";
- name = "${pname}-${version}";
- hash = "sha256-Ux8RfA7kWLKissBBY5wrfL+aKKw++5BxjP3Vw0JAOsk="; # odoo
+ name = "odoo-${version}";
+ hash = "sha256-ICe5UOy+Ga81fE66SnIhRz3+JEEbGfoz7ag53mkG4UM="; # odoo
};
- # needs some investigation
- doCheck = false;
-
makeWrapperArgs = [
"--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf rtlcss ]}"
];
@@ -66,6 +43,7 @@ in python.pkgs.buildPythonApplication rec {
jinja2
libsass
lxml
+ lxml-html-clean
markupsafe
num2words
ofxparse
@@ -102,6 +80,7 @@ in python.pkgs.buildPythonApplication rec {
dontStrip = true;
passthru = {
+ updateScript = ./update.sh;
tests = {
inherit (nixosTests) odoo;
};
diff --git a/pkgs/by-name/od/odoo16/update.sh b/pkgs/by-name/od/odoo16/update.sh
new file mode 100755
index 000000000000..2265f9048c0e
--- /dev/null
+++ b/pkgs/by-name/od/odoo16/update.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl gnused nix coreutils nix-prefetch
+# shellcheck shell=bash
+
+set -euo pipefail
+
+SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
+PKG=$(basename "$SCRIPT_DIR")
+
+LATEST="18" # increment manually
+VERSION="${PKG/#odoo}"
+VERSION="${VERSION:-$LATEST}.0"
+
+RELEASE="$(
+ curl "https://nightly.odoo.com/$VERSION/nightly/src/" |
+ sed -nE 's/.*odoo_'"$VERSION"'.(20[0-9]{6}).tar.gz.*/\1/p' |
+ tail -n 1
+)"
+
+latestVersion="$VERSION.$RELEASE"
+currentVersion=$(nix-instantiate --eval -E "with import ./. {}; $PKG.version or (lib.getVersion $PKG)" | tr -d '"')
+
+if [[ "$currentVersion" == "$latestVersion" ]]; then
+ echo "$PKG is up-to-date: $currentVersion"
+ exit 0
+fi
+
+cd "$SCRIPT_DIR"
+
+sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch -q fetchzip --option extra-experimental-features flakes --url "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.zip")\"; # odoo|g" package.nix
+sed -ri "s|odoo_version = .+|odoo_version = \"$VERSION\";|" package.nix
+sed -ri "s|odoo_release = .+|odoo_release = \"$RELEASE\";|" package.nix
diff --git a/pkgs/by-name/od/odoo17/package.nix b/pkgs/by-name/od/odoo17/package.nix
new file mode 100644
index 000000000000..698afb37d103
--- /dev/null
+++ b/pkgs/by-name/od/odoo17/package.nix
@@ -0,0 +1,121 @@
+{
+ lib,
+ fetchgit,
+ fetchzip,
+ python310,
+ rtlcss,
+ wkhtmltopdf,
+ nixosTests,
+}:
+
+let
+ odoo_version = "17.0";
+ odoo_release = "20241010";
+ python = python310.override {
+ self = python;
+ packageOverrides = final: prev: {
+ # requirements.txt fixes docutils at 0.17; the default 0.21.1 tested throws exceptions
+ docutils-0_17 = prev.docutils.overridePythonAttrs (old: rec {
+ version = "0.17";
+ src = fetchgit {
+ url = "git://repo.or.cz/docutils.git";
+ rev = "docutils-${version}";
+ hash = "sha256-O/9q/Dg1DBIxKdNBOhDV16yy5ez0QANJYMjeovDoWX8=";
+ };
+ buildInputs = with prev; [ setuptools ];
+ });
+ };
+ };
+in
+python.pkgs.buildPythonApplication rec {
+ pname = "odoo";
+ version = "${odoo_version}.${odoo_release}";
+
+ format = "setuptools";
+
+ # latest release is at https://github.com/odoo/docker/blob/master/17.0/Dockerfile
+ src = fetchzip {
+ url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip";
+ name = "odoo-${version}";
+ hash = "sha256-s4Fvzjwl2oM0V9G1WQdSoqo7kE7b8tJdluk9f7A06e8="; # odoo
+ };
+
+ makeWrapperArgs = [
+ "--prefix"
+ "PATH"
+ ":"
+ "${lib.makeBinPath [
+ wkhtmltopdf
+ rtlcss
+ ]}"
+ ];
+
+ propagatedBuildInputs = with python.pkgs; [
+ babel
+ chardet
+ cryptography
+ decorator
+ docutils-0_17 # sphinx has a docutils requirement >= 18
+ ebaysdk
+ freezegun
+ geoip2
+ gevent
+ greenlet
+ idna
+ jinja2
+ libsass
+ lxml
+ lxml-html-clean
+ markupsafe
+ num2words
+ ofxparse
+ passlib
+ pillow
+ polib
+ psutil
+ psycopg2
+ pydot
+ pyopenssl
+ pypdf2
+ pyserial
+ python-dateutil
+ python-ldap
+ python-stdnum
+ pytz
+ pyusb
+ qrcode
+ reportlab
+ requests
+ rjsmin
+ urllib3
+ vobject
+ werkzeug
+ xlrd
+ xlsxwriter
+ xlwt
+ zeep
+
+ setuptools
+ mock
+ ];
+
+ # takes 5+ minutes and there are not files to strip
+ dontStrip = true;
+
+ passthru = {
+ updateScript = ./update.sh;
+ tests = {
+ inherit (nixosTests) odoo;
+ };
+ };
+
+ meta = with lib; {
+ description = "Open Source ERP and CRM";
+ homepage = "https://www.odoo.com/";
+ license = licenses.lgpl3Only;
+ maintainers = with maintainers; [
+ mkg20001
+ siriobalmelli
+ ];
+ };
+}
diff --git a/pkgs/by-name/od/odoo17/update.sh b/pkgs/by-name/od/odoo17/update.sh
new file mode 100755
index 000000000000..2265f9048c0e
--- /dev/null
+++ b/pkgs/by-name/od/odoo17/update.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl gnused nix coreutils nix-prefetch
+# shellcheck shell=bash
+
+set -euo pipefail
+
+SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
+PKG=$(basename "$SCRIPT_DIR")
+
+LATEST="18" # increment manually
+VERSION="${PKG/#odoo}"
+VERSION="${VERSION:-$LATEST}.0"
+
+RELEASE="$(
+ curl "https://nightly.odoo.com/$VERSION/nightly/src/" |
+ sed -nE 's/.*odoo_'"$VERSION"'.(20[0-9]{6}).tar.gz.*/\1/p' |
+ tail -n 1
+)"
+
+latestVersion="$VERSION.$RELEASE"
+currentVersion=$(nix-instantiate --eval -E "with import ./. {}; $PKG.version or (lib.getVersion $PKG)" | tr -d '"')
+
+if [[ "$currentVersion" == "$latestVersion" ]]; then
+ echo "$PKG is up-to-date: $currentVersion"
+ exit 0
+fi
+
+cd "$SCRIPT_DIR"
+
+sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch -q fetchzip --option extra-experimental-features flakes --url "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.zip")\"; # odoo|g" package.nix
+sed -ri "s|odoo_version = .+|odoo_version = \"$VERSION\";|" package.nix
+sed -ri "s|odoo_release = .+|odoo_release = \"$RELEASE\";|" package.nix
diff --git a/pkgs/by-name/of/offat/package.nix b/pkgs/by-name/of/offat/package.nix
index 46bbba00f771..83bb81df0fc8 100644
--- a/pkgs/by-name/of/offat/package.nix
+++ b/pkgs/by-name/of/offat/package.nix
@@ -18,7 +18,10 @@ python3.pkgs.buildPythonApplication rec {
sourceRoot = "${src.name}/src";
- pythonRelaxDeps = [ "setuptools" ];
+ pythonRelaxDeps = [
+ "setuptools"
+ "tenacity"
+ ];
build-system = with python3.pkgs; [ poetry-core ];
diff --git a/pkgs/development/tools/omnisharp-roslyn/deps.nix b/pkgs/by-name/om/omnisharp-roslyn/deps.nix
similarity index 100%
rename from pkgs/development/tools/omnisharp-roslyn/deps.nix
rename to pkgs/by-name/om/omnisharp-roslyn/deps.nix
diff --git a/pkgs/by-name/om/omnisharp-roslyn/package.nix b/pkgs/by-name/om/omnisharp-roslyn/package.nix
new file mode 100644
index 000000000000..5ca7c3290eab
--- /dev/null
+++ b/pkgs/by-name/om/omnisharp-roslyn/package.nix
@@ -0,0 +1,125 @@
+{
+ buildDotnetModule,
+ dotnetCorePackages,
+ fetchFromGitHub,
+ lib,
+ stdenv,
+ runCommand,
+ expect,
+}:
+
+let
+ inherit (dotnetCorePackages) sdk_8_0 runtime_6_0;
+in
+let
+ finalPackage = buildDotnetModule rec {
+ pname = "omnisharp-roslyn";
+ version = "1.39.12";
+
+ src = fetchFromGitHub {
+ owner = "OmniSharp";
+ repo = "omnisharp-roslyn";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-WQIBNqUqvVA0UhSoPdf179X+GYKp4LhPvYeEAet6TnY=";
+ };
+
+ projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj";
+ nugetDeps = ./deps.nix;
+
+ dotnet-sdk =
+ with dotnetCorePackages;
+ combinePackages [
+ sdk_6_0
+ sdk_8_0
+ ];
+ dotnet-runtime = sdk_8_0;
+
+ dotnetInstallFlags = [ "--framework net6.0" ];
+ dotnetBuildFlags = [
+ "--framework net6.0"
+ "--no-self-contained"
+ ];
+ dotnetFlags = [
+ # These flags are set by the cake build.
+ "-property:PackageVersion=${version}"
+ "-property:AssemblyVersion=${version}.0"
+ "-property:FileVersion=${version}.0"
+ "-property:InformationalVersion=${version}"
+ "-property:RuntimeFrameworkVersion=${runtime_6_0.version}"
+ "-property:RollForward=LatestMajor"
+ ];
+
+ postPatch = ''
+ # Relax the version requirement
+ rm global.json
+
+ # Patch the project files so we can compile them properly
+ for project in src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj src/OmniSharp.LanguageServerProtocol/OmniSharp.LanguageServerProtocol.csproj src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj; do
+ substituteInPlace $project \
+ --replace 'win7-x64;win7-x86;win10-arm64' 'linux-x64;linux-arm64;osx-x64;osx-arm64'
+ done
+ '';
+
+ useDotnetFromEnv = true;
+ executables = [ "OmniSharp" ];
+
+ passthru.tests =
+ let
+ with-sdk =
+ sdk:
+ runCommand "with-${if sdk ? version then sdk.version else "no"}-sdk"
+ {
+ nativeBuildInputs = [
+ finalPackage
+ sdk
+ expect
+ ];
+ meta.timeout = 60;
+ }
+ ''
+ HOME=$TMPDIR
+ expect <<"EOF"
+ spawn OmniSharp
+ expect_before timeout {
+ send_error "timeout!\n"
+ exit 1
+ }
+ expect ".NET Core SDK ${if sdk ? version then sdk.version else sdk_8_0.version}"
+ expect "{\"Event\":\"started\","
+ send \x03
+ expect eof
+ catch wait result
+ exit [lindex $result 3]
+ EOF
+ touch $out
+ '';
+ in
+ {
+ # Make sure we can run OmniSharp with any supported SDK version, as well as without
+ with-net6-sdk = with-sdk dotnetCorePackages.sdk_6_0;
+ with-net8-sdk = with-sdk dotnetCorePackages.sdk_8_0;
+ no-sdk = with-sdk null;
+ };
+
+ passthru.updateScript = ./update.sh;
+
+ meta = {
+ description = "OmniSharp based on roslyn workspaces";
+ homepage = "https://github.com/OmniSharp/omnisharp-roslyn";
+ sourceProvenance = with lib.sourceTypes; [
+ fromSource
+ binaryNativeCode # dependencies
+ ];
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [
+ corngood
+ ericdallo
+ gepbird
+ mdarocha
+ tesq0
+ ];
+ mainProgram = "OmniSharp";
+ };
+ };
+in
+finalPackage
diff --git a/pkgs/development/tools/omnisharp-roslyn/updater.sh b/pkgs/by-name/om/omnisharp-roslyn/update.sh
similarity index 79%
rename from pkgs/development/tools/omnisharp-roslyn/updater.sh
rename to pkgs/by-name/om/omnisharp-roslyn/update.sh
index 10868fbd0992..6acb7d7e1a0a 100755
--- a/pkgs/development/tools/omnisharp-roslyn/updater.sh
+++ b/pkgs/by-name/om/omnisharp-roslyn/update.sh
@@ -6,8 +6,8 @@ set -euo pipefail
cd "$(dirname "${BASH_SOURCE[0]}")"
-new_version="$(curl -s "https://api.github.com/repos/OmniSharp/omnisharp-roslyn/releases?per_page=1" | jq -r '.[0].name')"
-old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"
+new_version="$(curl -s "https://api.github.com/repos/OmniSharp/omnisharp-roslyn/releases/latest" | jq -r '.name')"
+old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)"
if [[ "$new_version" == "$old_version" ]]; then
echo "Already up to date!"
diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix
index e401e72d0ff3..d743dda45176 100644
--- a/pkgs/by-name/op/open-webui/package.nix
+++ b/pkgs/by-name/op/open-webui/package.nix
@@ -2,24 +2,24 @@
lib,
buildNpmPackage,
fetchFromGitHub,
- python3,
+ python311,
nixosTests,
}:
let
pname = "open-webui";
- version = "0.3.32";
+ version = "0.3.35";
src = fetchFromGitHub {
owner = "open-webui";
repo = "open-webui";
rev = "refs/tags/v${version}";
- hash = "sha256-XpPaMGn+JA3Rq+Eb97IGWMLAR+0pI+ZJRxOTmxIMPZg=";
+ hash = "sha256-H46qoOEajPKRU/Lbd6r7r0vRjWSd7uGoA0deaDv6HSw=";
};
frontend = buildNpmPackage {
inherit pname version src;
- npmDepsHash = "sha256-tAPI/H5/lv+RuDZ68lL/cZHcOs8H6ZxXSwiFvkp0y4A=";
+ npmDepsHash = "sha256-ohWSfwZfC/jfOpnNSqsvMyYnukk3Xa3Tq32PAl8Ds60=";
# Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
# Until this is solved, running python packages from the browser will not work.
@@ -29,6 +29,7 @@ let
'';
env.CYPRESS_INSTALL_BINARY = "0"; # disallow cypress from downloading binaries in sandbox
+ env.ONNXRUNTIME_NODE_INSTALL_CUDA = "skip";
installPhase = ''
runHook preInstall
@@ -40,7 +41,7 @@ let
'';
};
in
-python3.pkgs.buildPythonApplication rec {
+python311.pkgs.buildPythonApplication rec {
inherit pname version src;
pyproject = true;
@@ -55,21 +56,18 @@ python3.pkgs.buildPythonApplication rec {
pythonRelaxDeps = true;
pythonRemoveDeps = [
- # using `opencv4`
- "opencv-python-headless"
- # using `psycopg2` instead
- "psycopg2-binary"
"docker"
"pytest"
"pytest-docker"
];
- dependencies = with python3.pkgs; [
+ dependencies = with python311.pkgs; [
aiohttp
alembic
anthropic
apscheduler
argon2-cffi
+ async-timeout
authlib
bcrypt
beautifulsoup4
@@ -88,6 +86,7 @@ python3.pkgs.buildPythonApplication rec {
flask-cors
fpdf2
ftfy
+ qdrant-client
google-generativeai
googleapis-common-protos
langchain
@@ -97,16 +96,17 @@ python3.pkgs.buildPythonApplication rec {
markdown
nltk
openai
- opencv4
+ opencv-python-headless
openpyxl
pandas
passlib
peewee
peewee-migrate
psutil
- psycopg2
+ psycopg2-binary
pydub
pyjwt
+ pymdown-extensions
pymilvus
pymongo
pymysql
@@ -128,11 +128,12 @@ python3.pkgs.buildPythonApplication rec {
unstructured
uvicorn
validators
+ xhtml2pdf
xlrd
youtube-transcript-api
];
- build-system = with python3.pkgs; [ hatchling ];
+ build-system = with python311.pkgs; [ hatchling ];
pythonImportsCheck = [ "open_webui" ];
diff --git a/pkgs/by-name/op/openapi-python-client/package.nix b/pkgs/by-name/op/openapi-python-client/package.nix
index a4445a6a5670..171434d7a30b 100644
--- a/pkgs/by-name/op/openapi-python-client/package.nix
+++ b/pkgs/by-name/op/openapi-python-client/package.nix
@@ -5,14 +5,13 @@
python3Packages,
fetchFromGitHub,
installShellFiles,
- ruff,
testers,
openapi-python-client,
}:
python3Packages.buildPythonApplication rec {
pname = "openapi-python-client";
- version = "0.21.5";
+ version = "0.21.6";
pyproject = true;
src = fetchFromGitHub {
@@ -20,7 +19,7 @@ python3Packages.buildPythonApplication rec {
owner = "openapi-generators";
repo = "openapi-python-client";
rev = "refs/tags/v${version}";
- hash = "sha256-/m/XXNqsr0FjYSEGMSw4zIUpWJDOqu9BzNuJKyb7fKY=";
+ hash = "sha256-hmVRPQ3+20ZBRCkQltX+S+pGGy2unsBSztyif93sKsw=";
};
nativeBuildInputs =
@@ -35,22 +34,24 @@ python3Packages.buildPythonApplication rec {
hatchling
];
- dependencies =
- (with python3Packages; [
+ dependencies = (
+ with python3Packages;
+ [
attrs
httpx
jinja2
pydantic
python-dateutil
ruamel-yaml
+ ruff
shellingham
typer
typing-extensions
- ])
- ++ [ ruff ];
-
- # ruff is not packaged as a python module in nixpkgs
- pythonRemoveDeps = [ "ruff" ];
+ ]
+ );
+ # openapi-python-client defines upper bounds to the dependencies, ruff python library is
+ # just a simple wrapper to locate the binary. We'll remove the upper bound
+ pythonRelaxDeps = [ "ruff" ];
postInstall = ''
# see: https://github.com/fastapi/typer/blob/5889cf82f4ed925f92e6b0750bf1b1ed9ee672f3/typer/completion.py#L54
diff --git a/pkgs/by-name/op/opencomposite/package.nix b/pkgs/by-name/op/opencomposite/package.nix
index f78e6a9de933..30a18084aa32 100644
--- a/pkgs/by-name/op/opencomposite/package.nix
+++ b/pkgs/by-name/op/opencomposite/package.nix
@@ -15,14 +15,14 @@
stdenv.mkDerivation {
pname = "opencomposite";
- version = "0-unstable-2024-10-02";
+ version = "0-unstable-2024-10-28";
src = fetchFromGitLab {
owner = "znixian";
repo = "OpenOVR";
- rev = "f969a972e9a151de776fa8d1bd6e67056f0a5d5d";
+ rev = "e162c7e9be2521a357fba4bee13af85437a1027b";
fetchSubmodules = true;
- hash = "sha256-3Aar7HGhn9nd/EtJoeUbQTkUR16jx946ZXMNDOXSdfQ=";
+ hash = "sha256-+suq0gV8zRDhF3ApnzQCC/5st59VniU6v7TcDdght6Q=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/op/openctm/package.nix b/pkgs/by-name/op/openctm/package.nix
index d89640ca8210..bb6bd763ea1d 100644
--- a/pkgs/by-name/op/openctm/package.nix
+++ b/pkgs/by-name/op/openctm/package.nix
@@ -6,6 +6,7 @@
libglut,
gtk2,
libGLU,
+ darwin,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -26,18 +27,30 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ pkg-config ];
- buildInputs = [
- libglut
- gtk2
- libGLU
- ];
+ buildInputs =
+ [
+ libglut
+ libGLU
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk2 ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
- postPatch = ''
- substituteInPlace tools/tinyxml/Makefile.linux \
- --replace-warn "-Wno-format" "-Wno-format -Wno-format-security"
- substituteInPlace tools/Makefile.linux \
- --replace-warn "-lglut" "-lglut -lGL -lGLU"
- '';
+ postPatch =
+ lib.optionalString stdenv.hostPlatform.isLinux ''
+ substituteInPlace "tools/tinyxml/Makefile.linux" \
+ --replace-warn "-Wno-format" "-Wno-format -Wno-format-security"
+ substituteInPlace "tools/Makefile.linux" \
+ --replace-warn "-lglut" "-lglut -lGL -lGLU"
+ ''
+ + lib.optionalString stdenv.hostPlatform.isDarwin ''
+ substituteInPlace "lib/Makefile.macosx" \
+ "tools/Makefile.macosx" \
+ "tools/jpeg/makefile.macosx" \
+ "tools/zlib/Makefile.macosx" \
+ --replace-warn "gcc" "${stdenv.cc.targetPrefix}cc"
+ substituteInPlace "lib/Makefile.macosx" "tools/Makefile.macosx" "tools/tinyxml/Makefile.macosx" \
+ --replace-warn "g++" "${stdenv.cc.targetPrefix}c++"
+ '';
makeFlags = [
"BINDIR=$(bin)/bin/"
diff --git a/pkgs/by-name/op/opengfw/package.nix b/pkgs/by-name/op/opengfw/package.nix
index ad1b57dcad3a..0d09f94cc875 100644
--- a/pkgs/by-name/op/opengfw/package.nix
+++ b/pkgs/by-name/op/opengfw/package.nix
@@ -5,7 +5,7 @@
}:
let
pname = "opengfw";
- version = "0.4.0";
+ version = "0.4.1";
in
buildGoModule {
inherit pname version;
@@ -16,7 +16,7 @@ buildGoModule {
owner = "apernet";
repo = "opengfw";
rev = "refs/tags/v${version}";
- hash = "sha256-kmbG6l5CtZGM/zpvl2pukq5xsOIy28RDyb4sHBsoyOw=";
+ hash = "sha256-6PFfsPfLzzeaImcteX9u/k5pwe3cvSQwT90TCizA3gI=";
};
meta = {
diff --git a/pkgs/by-name/op/opengothic/package.nix b/pkgs/by-name/op/opengothic/package.nix
new file mode 100644
index 000000000000..3c61f32a9526
--- /dev/null
+++ b/pkgs/by-name/op/opengothic/package.nix
@@ -0,0 +1,64 @@
+{
+ alsa-lib,
+ cmake,
+ fetchFromGitHub,
+ glslang,
+ lib,
+ libX11,
+ libXcursor,
+ libglvnd,
+ makeWrapper,
+ ninja,
+ stdenv,
+ vulkan-headers,
+ vulkan-loader,
+ vulkan-validation-layers,
+}:
+stdenv.mkDerivation {
+ pname = "opengothic";
+ version = "0.80-unstable-09-10-2024";
+
+ src = fetchFromGitHub {
+ owner = "Try";
+ repo = "OpenGothic";
+ rev = "0db60b0a956e2a2f365aa3a8bdbe366be198e641";
+ fetchSubmodules = true;
+ hash = "sha256-Hf3B7B4CaW/GsTcYs0PChpPfA9aK41pPJkImtUDgoKc=";
+ };
+
+ outputs = [
+ "dev"
+ "out"
+ ];
+
+ nativeBuildInputs = [
+ cmake
+ glslang
+ makeWrapper
+ ninja
+ ];
+
+ buildInputs = [
+ alsa-lib
+ libX11
+ libXcursor
+ libglvnd
+ vulkan-headers
+ vulkan-loader
+ vulkan-validation-layers
+ ];
+
+ postFixup = ''
+ wrapProgram $out/bin/Gothic2Notr \
+ --set LD_PRELOAD "${lib.getLib alsa-lib}/lib/libasound.so.2"
+ '';
+
+ meta = {
+ description = "Open source re-implementation of Gothic 2: Night of the Raven";
+ homepage = "https://github.com/Try/OpenGothic";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ azahi ];
+ platforms = lib.platforms.linux;
+ mainProgram = "Gothic2Notr";
+ };
+}
diff --git a/pkgs/by-name/op/openpgp-card-tools/package.nix b/pkgs/by-name/op/openpgp-card-tools/package.nix
index 5ed445a55eef..8bd0e1fb5cb9 100644
--- a/pkgs/by-name/op/openpgp-card-tools/package.nix
+++ b/pkgs/by-name/op/openpgp-card-tools/package.nix
@@ -12,17 +12,17 @@
rustPlatform.buildRustPackage rec {
pname = "openpgp-card-tools";
- version = "0.11.6";
+ version = "0.11.7";
src = fetchFromGitea {
domain = "codeberg.org";
owner = "openpgp-card";
repo = "openpgp-card-tools";
rev = "v${version}";
- hash = "sha256-ZnIJLNg9soRzGEjoRNbUzDUtj71y54t+qTC4QDjiCmM=";
+ hash = "sha256-sR+jBCSuDH4YdJz3YuvA4EE36RHV3m/xU8hIEXXsqKo=";
};
- cargoHash = "sha256-t+fKCviu9UOz2GHkIBqtSp0vyqXPAR1TuWi4yOYR0Bc=";
+ cargoHash = "sha256-G5+lVK41hbzy/Ltc0EKoUfqF0M1OYu679jyVjYKJmn0=";
nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix
index 38411adb4ea2..1ab75103433c 100644
--- a/pkgs/by-name/op/openvas-scanner/package.nix
+++ b/pkgs/by-name/op/openvas-scanner/package.nix
@@ -31,13 +31,13 @@
stdenv.mkDerivation rec {
pname = "openvas-scanner";
- version = "23.9.0";
+ version = "23.10.0";
src = fetchFromGitHub {
owner = "greenbone";
repo = "openvas-scanner";
rev = "refs/tags/v${version}";
- hash = "sha256-vdqIM0qkCpOjohmMP245Og87wOmejlCBEIceBfwEB8U=";
+ hash = "sha256-5eXw9buGln2of4wumPUFloguCvru9at4pUEb1FVYzoM=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/op/openvas-smb/package.nix b/pkgs/by-name/op/openvas-smb/package.nix
index cc6297628329..66d6de69b5d4 100644
--- a/pkgs/by-name/op/openvas-smb/package.nix
+++ b/pkgs/by-name/op/openvas-smb/package.nix
@@ -1,16 +1,17 @@
-{ fetchFromGitHub
-, fetchurl
-, lib
-, stdenv
-, cmake
-, git
-, pkg-config
-, glib
-, gnutls
-, perl
-, heimdal
-, popt
-, libunistring
+{
+ fetchFromGitHub,
+ fetchurl,
+ lib,
+ stdenv,
+ cmake,
+ git,
+ pkg-config,
+ glib,
+ gnutls,
+ perl,
+ heimdal,
+ popt,
+ libunistring,
}:
let
heimdalConfigHeader = fetchurl {
@@ -66,6 +67,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Only;
maintainers = with maintainers; [ mi-ael ];
mainProgram = "wmic";
- platforms = platforms.unix;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/by-name/op/opnborg/package.nix b/pkgs/by-name/op/opnborg/package.nix
index 15ab67158a97..ab5e289280af 100644
--- a/pkgs/by-name/op/opnborg/package.nix
+++ b/pkgs/by-name/op/opnborg/package.nix
@@ -5,13 +5,13 @@
}:
buildGoModule rec {
pname = "opnborg";
- version = "0.1.18";
+ version = "0.1.24";
src = fetchFromGitHub {
owner = "paepckehh";
repo = "opnborg";
rev = "v${version}";
- hash = "sha256-eRJLdrNspkdpb24Bz7GjvcC+1iwRVXyG6Rjqf3fGkZY=";
+ hash = "sha256-lJPu1Ixx1BUWrZ+h6AuxLyVMScKAmcp+sK2duOxC9e0=";
};
vendorHash = "sha256-REXJryUcu+/AdVx1aK0nJ98Wq/EdhrZqL24kC1wK6mc=";
diff --git a/pkgs/by-name/or/orbiton/package.nix b/pkgs/by-name/or/orbiton/package.nix
index 6e9cee2539fe..b1bcb193e322 100644
--- a/pkgs/by-name/or/orbiton/package.nix
+++ b/pkgs/by-name/or/orbiton/package.nix
@@ -4,32 +4,27 @@
buildGoModule rec {
pname = "orbiton";
- version = "2.65.12";
+ version = "2.67.1";
src = fetchFromGitHub {
owner = "xyproto";
repo = "orbiton";
rev = "v${version}";
- hash = "sha256-1KVw2dj//6vwUUj1jVWe2J/9F6J8BQsvCAEbJZnW26c=";
+ hash = "sha256-/5USD588kr3uB/Zs1ASKVgxH4kAWZCNBrZL7qqx49gU=";
};
vendorHash = null;
- postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
- substituteInPlace Makefile \
- --replace "-Wl,--as-needed" ""
-
- # Requires impure pbcopy and pbpaste
- substituteInPlace v2/pbcopy_test.go \
- --replace TestPBcopy SkipTestPBcopy
- '';
-
nativeBuildInputs = [ installShellFiles makeWrapper pkg-config ];
buildInputs = lib.optional withGui vte;
preBuild = "cd v2";
+ checkFlags = [
+ "-skip=TestPBcopy" # Requires impure pbcopy and pbpaste
+ ];
+
postInstall = ''
cd ..
installManPage o.1
diff --git a/pkgs/by-name/ot/otel-desktop-viewer/package.nix b/pkgs/by-name/ot/otel-desktop-viewer/package.nix
index e8dc8f184435..c8a7e0b33948 100644
--- a/pkgs/by-name/ot/otel-desktop-viewer/package.nix
+++ b/pkgs/by-name/ot/otel-desktop-viewer/package.nix
@@ -3,6 +3,8 @@
, fetchFromGitHub
, testers
, otel-desktop-viewer
+, stdenv
+, apple-sdk_12
}:
buildGoModule rec {
@@ -25,6 +27,8 @@ buildGoModule rec {
ldflags = [ "-s" "-w" ];
+ buildInputs = lib.optional stdenv.isDarwin apple-sdk_12;
+
passthru.tests.version = testers.testVersion {
inherit version;
package = otel-desktop-viewer;
diff --git a/pkgs/by-name/ov/overlayed/Cargo.lock b/pkgs/by-name/ov/overlayed/Cargo.lock
index ff8b531c03ac..44e60ad4e328 100644
--- a/pkgs/by-name/ov/overlayed/Cargo.lock
+++ b/pkgs/by-name/ov/overlayed/Cargo.lock
@@ -17,6 +17,17 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+[[package]]
+name = "ahash"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
+dependencies = [
+ "getrandom 0.2.15",
+ "once_cell",
+ "version_check",
+]
+
[[package]]
name = "aho-corasick"
version = "1.1.3"
@@ -47,6 +58,23 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+[[package]]
+name = "android_log-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937"
+
+[[package]]
+name = "android_logger"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b07e8e73d720a1f2e4b6014766e6039fd2e96a4fa44e2a78d0e1fa2ff49826"
+dependencies = [
+ "android_log-sys",
+ "env_filter",
+ "log",
+]
+
[[package]]
name = "android_system_properties"
version = "0.1.5"
@@ -63,22 +91,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
[[package]]
-name = "async-broadcast"
-version = "0.5.1"
+name = "arbitrary"
+version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b"
+checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
dependencies = [
- "event-listener 2.5.3",
- "futures-core",
+ "derive_arbitrary",
]
+[[package]]
+name = "arrayvec"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+
[[package]]
name = "async-broadcast"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e"
dependencies = [
- "event-listener 5.3.1",
+ "event-listener",
"event-listener-strategy",
"futures-core",
"pin-project-lite",
@@ -98,86 +131,45 @@ dependencies = [
[[package]]
name = "async-executor"
-version = "1.12.0"
+version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0"
+checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
dependencies = [
"async-task",
"concurrent-queue",
- "fastrand 2.1.0",
- "futures-lite 2.3.0",
+ "fastrand",
+ "futures-lite",
"slab",
]
-[[package]]
-name = "async-fs"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06"
-dependencies = [
- "async-lock 2.8.0",
- "autocfg",
- "blocking",
- "futures-lite 1.13.0",
-]
-
[[package]]
name = "async-fs"
version = "2.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
dependencies = [
- "async-lock 3.4.0",
+ "async-lock",
"blocking",
- "futures-lite 2.3.0",
+ "futures-lite",
]
[[package]]
name = "async-io"
-version = "1.13.0"
+version = "2.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
+checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8"
dependencies = [
- "async-lock 2.8.0",
- "autocfg",
- "cfg-if",
- "concurrent-queue",
- "futures-lite 1.13.0",
- "log",
- "parking",
- "polling 2.8.0",
- "rustix 0.37.27",
- "slab",
- "socket2 0.4.10",
- "waker-fn",
-]
-
-[[package]]
-name = "async-io"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
-dependencies = [
- "async-lock 3.4.0",
+ "async-lock",
"cfg-if",
"concurrent-queue",
"futures-io",
- "futures-lite 2.3.0",
+ "futures-lite",
"parking",
- "polling 3.7.2",
- "rustix 0.38.34",
+ "polling",
+ "rustix",
"slab",
"tracing",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "async-lock"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
-dependencies = [
- "event-listener 2.5.3",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -186,46 +178,29 @@ version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
dependencies = [
- "event-listener 5.3.1",
+ "event-listener",
"event-listener-strategy",
"pin-project-lite",
]
[[package]]
name = "async-process"
-version = "1.8.1"
+version = "2.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88"
-dependencies = [
- "async-io 1.13.0",
- "async-lock 2.8.0",
- "async-signal",
- "blocking",
- "cfg-if",
- "event-listener 3.1.0",
- "futures-lite 1.13.0",
- "rustix 0.38.34",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "async-process"
-version = "2.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a"
+checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374"
dependencies = [
"async-channel",
- "async-io 2.3.3",
- "async-lock 3.4.0",
+ "async-io",
+ "async-lock",
"async-signal",
"async-task",
"blocking",
"cfg-if",
- "event-listener 5.3.1",
- "futures-lite 2.3.0",
- "rustix 0.38.34",
+ "event-listener",
+ "futures-lite",
+ "rustix",
"tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -236,25 +211,25 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.68",
+ "syn 2.0.75",
]
[[package]]
name = "async-signal"
-version = "0.2.8"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d"
+checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3"
dependencies = [
- "async-io 2.3.3",
- "async-lock 3.4.0",
+ "async-io",
+ "async-lock",
"atomic-waker",
"cfg-if",
"futures-core",
"futures-io",
- "rustix 0.38.34",
+ "rustix",
"signal-hook-registry",
"slab",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -265,37 +240,36 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
[[package]]
name = "async-trait"
-version = "0.1.80"
+version = "0.1.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.68",
+ "syn 2.0.75",
]
[[package]]
name = "atk"
-version = "0.15.1"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd"
+checksum = "b4af014b17dd80e8af9fa689b2d4a211ddba6eb583c1622f35d0cb543f6b17e4"
dependencies = [
"atk-sys",
- "bitflags 1.3.2",
"glib",
"libc",
]
[[package]]
name = "atk-sys"
-version = "0.15.1"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6"
+checksum = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009"
dependencies = [
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 6.2.2",
+ "system-deps",
]
[[package]]
@@ -325,12 +299,6 @@ dependencies = [
"rustc-demangle",
]
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
[[package]]
name = "base64"
version = "0.21.7"
@@ -343,15 +311,6 @@ version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
[[package]]
name = "bitflags"
version = "1.3.2"
@@ -363,6 +322,21 @@ name = "bitflags"
version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
[[package]]
name = "block"
@@ -379,6 +353,15 @@ dependencies = [
"generic-array",
]
+[[package]]
+name = "block2"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
+dependencies = [
+ "objc2",
+]
+
[[package]]
name = "blocking"
version = "1.6.1"
@@ -388,15 +371,39 @@ dependencies = [
"async-channel",
"async-task",
"futures-io",
- "futures-lite 2.3.0",
+ "futures-lite",
"piper",
]
[[package]]
-name = "brotli"
-version = "3.5.0"
+name = "borsh"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391"
+checksum = "26d4d6dafc1a3bb54687538972158f07b2c948bc57d5890df22c0739098b3028"
+dependencies = [
+ "borsh-derive",
+ "cfg_aliases 0.1.1",
+]
+
+[[package]]
+name = "borsh-derive"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf4918709cc4dd777ad2b6303ed03cb37f3ca0ccede8c1b0d28ac6db8f4710e0"
+dependencies = [
+ "once_cell",
+ "proc-macro-crate 2.0.2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.75",
+ "syn_derive",
+]
+
+[[package]]
+name = "brotli"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b"
dependencies = [
"alloc-no-stdlib",
"alloc-stdlib",
@@ -405,24 +412,14 @@ dependencies = [
[[package]]
name = "brotli-decompressor"
-version = "2.5.1"
+version = "4.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f"
+checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362"
dependencies = [
"alloc-no-stdlib",
"alloc-stdlib",
]
-[[package]]
-name = "bstr"
-version = "1.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
-dependencies = [
- "memchr",
- "serde",
-]
-
[[package]]
name = "bumpalo"
version = "3.16.0"
@@ -430,10 +427,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
[[package]]
-name = "bytemuck"
-version = "1.16.1"
+name = "byte-unit"
+version = "5.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
+checksum = "33ac19bdf0b2665407c39d82dbc937e951e7e2001609f0fb32edd0af45a2d63e"
+dependencies = [
+ "rust_decimal",
+ "serde",
+ "utf8-width",
+]
+
+[[package]]
+name = "bytecheck"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2"
+dependencies = [
+ "bytecheck_derive",
+ "ptr_meta",
+ "simdutf8",
+]
+
+[[package]]
+name = "bytecheck_derive"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "bytemuck"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31"
[[package]]
name = "byteorder"
@@ -442,53 +472,95 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
-name = "bytes"
-version = "1.6.0"
+name = "byteorder-lite"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
+
+[[package]]
+name = "bytes"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
dependencies = [
"serde",
]
[[package]]
name = "cairo-rs"
-version = "0.15.12"
+version = "0.18.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc"
+checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
"cairo-sys-rs",
"glib",
"libc",
+ "once_cell",
"thiserror",
]
[[package]]
name = "cairo-sys-rs"
-version = "0.15.1"
+version = "0.18.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8"
+checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51"
dependencies = [
"glib-sys",
"libc",
- "system-deps 6.2.2",
+ "system-deps",
+]
+
+[[package]]
+name = "camino"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo-platform"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver",
+ "serde",
+ "serde_json",
+ "thiserror",
]
[[package]]
name = "cargo_toml"
-version = "0.15.3"
+version = "0.17.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838"
+checksum = "8a969e13a7589e9e3e4207e153bae624ade2b5622fb4684a4923b23ec3d57719"
dependencies = [
"serde",
- "toml 0.7.8",
+ "toml 0.8.2",
]
[[package]]
name = "cc"
-version = "1.0.102"
+version = "1.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "779e6b7d17797c0b42023d417228c02889300190e700cb074c3438d9c541d332"
+checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48"
+dependencies = [
+ "shlex",
+]
[[package]]
name = "cesu8"
@@ -507,15 +579,6 @@ dependencies = [
"uuid",
]
-[[package]]
-name = "cfg-expr"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7"
-dependencies = [
- "smallvec",
-]
-
[[package]]
name = "cfg-expr"
version = "0.15.8"
@@ -538,6 +601,12 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
[[package]]
name = "chrono"
version = "0.4.38"
@@ -548,23 +617,7 @@ dependencies = [
"iana-time-zone",
"num-traits",
"serde",
- "windows-targets 0.52.5",
-]
-
-[[package]]
-name = "cocoa"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a"
-dependencies = [
- "bitflags 1.3.2",
- "block",
- "cocoa-foundation",
- "core-foundation",
- "core-graphics 0.22.3",
- "foreign-types 0.3.2",
- "libc",
- "objc",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -575,10 +628,26 @@ checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c"
dependencies = [
"bitflags 1.3.2",
"block",
- "cocoa-foundation",
- "core-foundation",
+ "cocoa-foundation 0.1.2",
+ "core-foundation 0.9.4",
"core-graphics 0.23.2",
- "foreign-types 0.5.0",
+ "foreign-types",
+ "libc",
+ "objc",
+]
+
+[[package]]
+name = "cocoa"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2"
+dependencies = [
+ "bitflags 2.6.0",
+ "block",
+ "cocoa-foundation 0.2.0",
+ "core-foundation 0.10.0",
+ "core-graphics 0.24.0",
+ "foreign-types",
"libc",
"objc",
]
@@ -591,17 +660,25 @@ checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7"
dependencies = [
"bitflags 1.3.2",
"block",
- "core-foundation",
- "core-graphics-types",
+ "core-foundation 0.9.4",
+ "core-graphics-types 0.1.3",
"libc",
"objc",
]
[[package]]
-name = "color_quant"
-version = "1.1.0"
+name = "cocoa-foundation"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
+checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d"
+dependencies = [
+ "bitflags 2.6.0",
+ "block",
+ "core-foundation 0.10.0",
+ "core-graphics-types 0.2.0",
+ "libc",
+ "objc",
+]
[[package]]
name = "combine"
@@ -628,6 +705,34 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+[[package]]
+name = "cookie"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
+dependencies = [
+ "percent-encoding",
+ "time",
+ "version_check",
+]
+
+[[package]]
+name = "cookie_store"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa"
+dependencies = [
+ "cookie",
+ "idna 0.5.0",
+ "log",
+ "publicsuffix",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "time",
+ "url",
+]
+
[[package]]
name = "core-foundation"
version = "0.9.4"
@@ -639,24 +744,21 @@ dependencies = [
]
[[package]]
-name = "core-foundation-sys"
-version = "0.8.6"
+name = "core-foundation"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
-
-[[package]]
-name = "core-graphics"
-version = "0.22.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
+checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "core-graphics-types",
- "foreign-types 0.3.2",
+ "core-foundation-sys",
"libc",
]
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
[[package]]
name = "core-graphics"
version = "0.23.2"
@@ -664,9 +766,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
dependencies = [
"bitflags 1.3.2",
- "core-foundation",
- "core-graphics-types",
- "foreign-types 0.5.0",
+ "core-foundation 0.9.4",
+ "core-graphics-types 0.1.3",
+ "foreign-types",
+ "libc",
+]
+
+[[package]]
+name = "core-graphics"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
+dependencies = [
+ "bitflags 2.6.0",
+ "core-foundation 0.10.0",
+ "core-graphics-types 0.2.0",
+ "foreign-types",
"libc",
]
@@ -677,15 +792,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
dependencies = [
"bitflags 1.3.2",
- "core-foundation",
+ "core-foundation 0.9.4",
+ "libc",
+]
+
+[[package]]
+name = "core-graphics-types"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
+dependencies = [
+ "bitflags 2.6.0",
+ "core-foundation 0.10.0",
"libc",
]
[[package]]
name = "cpufeatures"
-version = "0.2.12"
+version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
dependencies = [
"libc",
]
@@ -708,25 +834,6 @@ dependencies = [
"crossbeam-utils",
]
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
-dependencies = [
- "crossbeam-utils",
-]
-
[[package]]
name = "crossbeam-utils"
version = "0.8.20"
@@ -767,7 +874,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
dependencies = [
"quote",
- "syn 2.0.68",
+ "syn 2.0.75",
]
[[package]]
@@ -777,14 +884,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f"
dependencies = [
"quote",
- "syn 2.0.68",
+ "syn 2.0.75",
]
[[package]]
name = "darling"
-version = "0.20.9"
+version = "0.20.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
dependencies = [
"darling_core",
"darling_macro",
@@ -792,27 +899,27 @@ dependencies = [
[[package]]
name = "darling_core"
-version = "0.20.9"
+version = "0.20.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
dependencies = [
"fnv",
"ident_case",
"proc-macro2",
"quote",
"strsim",
- "syn 2.0.68",
+ "syn 2.0.75",
]
[[package]]
name = "darling_macro"
-version = "0.20.9"
+version = "0.20.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [
"darling_core",
"quote",
- "syn 2.0.68",
+ "syn 2.0.75",
]
[[package]]
@@ -821,6 +928,12 @@ version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
+[[package]]
+name = "data-url"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a"
+
[[package]]
name = "deranged"
version = "0.3.11"
@@ -842,6 +955,17 @@ dependencies = [
"syn 1.0.109",
]
+[[package]]
+name = "derive_arbitrary"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.75",
+]
+
[[package]]
name = "derive_more"
version = "0.99.18"
@@ -852,7 +976,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustc_version",
- "syn 2.0.68",
+ "syn 2.0.75",
]
[[package]]
@@ -866,24 +990,24 @@ dependencies = [
]
[[package]]
-name = "dirs-next"
-version = "2.0.0"
+name = "dirs"
+version = "5.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
dependencies = [
- "cfg-if",
- "dirs-sys-next",
+ "dirs-sys",
]
[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
+name = "dirs-sys"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
dependencies = [
"libc",
+ "option-ext",
"redox_users",
- "winapi",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -892,6 +1016,49 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.75",
+]
+
+[[package]]
+name = "dlopen2"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1297103d2bbaea85724fcee6294c2d50b1081f9ad47d0f6f6f61eda65315a6"
+dependencies = [
+ "dlopen2_derive",
+ "libc",
+ "once_cell",
+ "winapi",
+]
+
+[[package]]
+name = "dlopen2_derive"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.75",
+]
+
+[[package]]
+name = "dpi"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
+dependencies = [
+ "serde",
+]
+
[[package]]
name = "dtoa"
version = "1.0.9"
@@ -909,22 +1076,28 @@ dependencies = [
[[package]]
name = "dunce"
-version = "1.0.4"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+
+[[package]]
+name = "dyn-clone"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
[[package]]
name = "embed-resource"
-version = "2.4.2"
+version = "2.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d"
+checksum = "4edcacde9351c33139a41e3c97eb2334351a81a2791bebb0b243df837128f602"
dependencies = [
"cc",
"memchr",
"rustc_version",
- "toml 0.8.14",
+ "toml 0.8.2",
"vswhom",
- "winreg 0.52.0",
+ "winreg",
]
[[package]]
@@ -966,7 +1139,17 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.68",
+ "syn 2.0.75",
+]
+
+[[package]]
+name = "env_filter"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+dependencies = [
+ "log",
+ "regex",
]
[[package]]
@@ -975,6 +1158,16 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+[[package]]
+name = "erased-serde"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
+dependencies = [
+ "serde",
+ "typeid",
+]
+
[[package]]
name = "errno"
version = "0.3.9"
@@ -985,23 +1178,6 @@ dependencies = [
"windows-sys 0.52.0",
]
-[[package]]
-name = "event-listener"
-version = "2.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
-
-[[package]]
-name = "event-listener"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
[[package]]
name = "event-listener"
version = "5.3.1"
@@ -1019,19 +1195,10 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
dependencies = [
- "event-listener 5.3.1",
+ "event-listener",
"pin-project-lite",
]
-[[package]]
-name = "fastrand"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
-
[[package]]
name = "fastrand"
version = "2.1.0"
@@ -1047,53 +1214,62 @@ dependencies = [
"simd-adler32",
]
+[[package]]
+name = "fern"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee"
+dependencies = [
+ "log",
+]
+
[[package]]
name = "field-offset"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
dependencies = [
- "memoffset 0.9.1",
+ "memoffset",
"rustc_version",
]
[[package]]
name = "filetime"
-version = "0.2.23"
+version = "0.2.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
+checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall 0.4.1",
- "windows-sys 0.52.0",
+ "libredox",
+ "windows-sys 0.59.0",
]
[[package]]
name = "flate2"
-version = "1.0.30"
+version = "1.0.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920"
dependencies = [
"crc32fast",
"miniz_oxide",
]
+[[package]]
+name = "fluent-uri"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
[[package]]
name = "fnv"
version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared 0.1.1",
-]
-
[[package]]
name = "foreign-types"
version = "0.5.0"
@@ -1101,7 +1277,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
dependencies = [
"foreign-types-macros",
- "foreign-types-shared 0.3.1",
+ "foreign-types-shared",
]
[[package]]
@@ -1112,15 +1288,9 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.68",
+ "syn 2.0.75",
]
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
[[package]]
name = "foreign-types-shared"
version = "0.3.1"
@@ -1136,6 +1306,12 @@ dependencies = [
"percent-encoding",
]
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
[[package]]
name = "futf"
version = "0.1.5"
@@ -1178,28 +1354,13 @@ version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
-[[package]]
-name = "futures-lite"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
-dependencies = [
- "fastrand 1.9.0",
- "futures-core",
- "futures-io",
- "memchr",
- "parking",
- "pin-project-lite",
- "waker-fn",
-]
-
[[package]]
name = "futures-lite"
version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
dependencies = [
- "fastrand 2.1.0",
+ "fastrand",
"futures-core",
"futures-io",
"parking",
@@ -1214,7 +1375,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.68",
+ "syn 2.0.75",
]
[[package]]
@@ -1257,11 +1418,10 @@ dependencies = [
[[package]]
name = "gdk"
-version = "0.15.4"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8"
+checksum = "f5ba081bdef3b75ebcdbfc953699ed2d7417d6bd853347a42a37d76406a33646"
dependencies = [
- "bitflags 1.3.2",
"cairo-rs",
"gdk-pixbuf",
"gdk-sys",
@@ -1273,35 +1433,35 @@ dependencies = [
[[package]]
name = "gdk-pixbuf"
-version = "0.15.11"
+version = "0.18.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a"
+checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec"
dependencies = [
- "bitflags 1.3.2",
"gdk-pixbuf-sys",
"gio",
"glib",
"libc",
+ "once_cell",
]
[[package]]
name = "gdk-pixbuf-sys"
-version = "0.15.10"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7"
+checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7"
dependencies = [
"gio-sys",
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 6.2.2",
+ "system-deps",
]
[[package]]
name = "gdk-sys"
-version = "0.15.1"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88"
+checksum = "31ff856cb3386dae1703a920f803abafcc580e9b5f711ca62ed1620c25b51ff2"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -1311,33 +1471,47 @@ dependencies = [
"libc",
"pango-sys",
"pkg-config",
- "system-deps 6.2.2",
+ "system-deps",
]
[[package]]
name = "gdkwayland-sys"
-version = "0.15.3"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2"
+checksum = "a90fbf5c033c65d93792192a49a8efb5bb1e640c419682a58bb96f5ae77f3d4a"
dependencies = [
"gdk-sys",
"glib-sys",
"gobject-sys",
"libc",
"pkg-config",
- "system-deps 6.2.2",
+ "system-deps",
+]
+
+[[package]]
+name = "gdkx11"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2ea8a4909d530f79921290389cbd7c34cb9d623bfe970eaae65ca5f9cd9cce"
+dependencies = [
+ "gdk",
+ "gdkx11-sys",
+ "gio",
+ "glib",
+ "libc",
+ "x11",
]
[[package]]
name = "gdkx11-sys"
-version = "0.15.1"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178"
+checksum = "fee8f00f4ee46cad2939b8990f5c70c94ff882c3028f3cc5abf950fa4ab53043"
dependencies = [
"gdk-sys",
"glib-sys",
"libc",
- "system-deps 6.2.2",
+ "system-deps",
"x11",
]
@@ -1364,6 +1538,16 @@ dependencies = [
"version_check",
]
+[[package]]
+name = "gethostname"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
+dependencies = [
+ "libc",
+ "windows-targets 0.48.5",
+]
+
[[package]]
name = "getrandom"
version = "0.1.16"
@@ -1394,49 +1578,54 @@ checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
[[package]]
name = "gio"
-version = "0.15.12"
+version = "0.18.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b"
+checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73"
dependencies = [
- "bitflags 1.3.2",
"futures-channel",
"futures-core",
"futures-io",
+ "futures-util",
"gio-sys",
"glib",
"libc",
"once_cell",
+ "pin-project-lite",
+ "smallvec",
"thiserror",
]
[[package]]
name = "gio-sys"
-version = "0.15.10"
+version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d"
+checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2"
dependencies = [
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 6.2.2",
+ "system-deps",
"winapi",
]
[[package]]
name = "glib"
-version = "0.15.12"
+version = "0.18.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d"
+checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
"futures-channel",
"futures-core",
"futures-executor",
"futures-task",
+ "futures-util",
+ "gio-sys",
"glib-macros",
"glib-sys",
"gobject-sys",
"libc",
+ "memchr",
"once_cell",
"smallvec",
"thiserror",
@@ -1444,27 +1633,26 @@ dependencies = [
[[package]]
name = "glib-macros"
-version = "0.15.13"
+version = "0.18.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a"
+checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc"
dependencies = [
- "anyhow",
"heck 0.4.1",
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 2.0.2",
"proc-macro-error",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.75",
]
[[package]]
name = "glib-sys"
-version = "0.15.10"
+version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4"
+checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898"
dependencies = [
"libc",
- "system-deps 6.2.2",
+ "system-deps",
]
[[package]]
@@ -1473,38 +1661,24 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-[[package]]
-name = "globset"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
-dependencies = [
- "aho-corasick",
- "bstr",
- "log",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
-]
-
[[package]]
name = "gobject-sys"
-version = "0.15.10"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a"
+checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44"
dependencies = [
"glib-sys",
"libc",
- "system-deps 6.2.2",
+ "system-deps",
]
[[package]]
name = "gtk"
-version = "0.15.5"
+version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0"
+checksum = "93c4f5e0e20b60e10631a5f06da7fe3dda744b05ad0ea71fee2f47adf865890c"
dependencies = [
"atk",
- "bitflags 1.3.2",
"cairo-rs",
"field-offset",
"futures-channel",
@@ -1515,16 +1689,15 @@ dependencies = [
"gtk-sys",
"gtk3-macros",
"libc",
- "once_cell",
"pango",
"pkg-config",
]
[[package]]
name = "gtk-sys"
-version = "0.15.3"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84"
+checksum = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722"
dependencies = [
"atk-sys",
"cairo-sys-rs",
@@ -1535,36 +1708,35 @@ dependencies = [
"gobject-sys",
"libc",
"pango-sys",
- "system-deps 6.2.2",
+ "system-deps",
]
[[package]]
name = "gtk3-macros"
-version = "0.15.6"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d"
+checksum = "c6063efb63db582968fb7df72e1ae68aa6360dcfb0a75143f34fc7d616bad75e"
dependencies = [
- "anyhow",
"proc-macro-crate 1.3.1",
"proc-macro-error",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.75",
]
[[package]]
name = "h2"
-version = "0.3.26"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
+checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
dependencies = [
+ "atomic-waker",
"bytes",
"fnv",
"futures-core",
"futures-sink",
- "futures-util",
- "http 0.2.12",
- "indexmap 2.2.6",
+ "http",
+ "indexmap 2.4.0",
"slab",
"tokio",
"tokio-util",
@@ -1576,6 +1748,9 @@ name = "hashbrown"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+dependencies = [
+ "ahash",
+]
[[package]]
name = "hashbrown"
@@ -1583,15 +1758,6 @@ version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-[[package]]
-name = "heck"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
[[package]]
name = "heck"
version = "0.4.1"
@@ -1636,17 +1802,6 @@ dependencies = [
"syn 1.0.109",
]
-[[package]]
-name = "http"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
-dependencies = [
- "bytes",
- "fnv",
- "itoa 1.0.11",
-]
-
[[package]]
name = "http"
version = "1.1.0"
@@ -1660,20 +1815,26 @@ dependencies = [
[[package]]
name = "http-body"
-version = "0.4.6"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
dependencies = [
"bytes",
- "http 0.2.12",
- "pin-project-lite",
+ "http",
]
[[package]]
-name = "http-range"
-version = "0.1.5"
+name = "http-body-util"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "pin-project-lite",
+]
[[package]]
name = "httparse"
@@ -1681,47 +1842,62 @@ version = "1.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
-[[package]]
-name = "httpdate"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
-
[[package]]
name = "hyper"
-version = "0.14.29"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33"
+checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
dependencies = [
"bytes",
"futures-channel",
- "futures-core",
"futures-util",
"h2",
- "http 0.2.12",
+ "http",
"http-body",
"httparse",
- "httpdate",
"itoa 1.0.11",
"pin-project-lite",
- "socket2 0.5.7",
+ "smallvec",
"tokio",
- "tower-service",
- "tracing",
"want",
]
[[package]]
-name = "hyper-tls"
-version = "0.5.0"
+name = "hyper-rustls"
+version = "0.27.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+dependencies = [
+ "futures-util",
+ "http",
+ "hyper",
+ "hyper-util",
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+ "webpki-roots",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
dependencies = [
"bytes",
+ "futures-channel",
+ "futures-util",
+ "http",
+ "http-body",
"hyper",
- "native-tls",
+ "pin-project-lite",
+ "socket2",
"tokio",
- "tokio-native-tls",
+ "tower",
+ "tower-service",
+ "tracing",
]
[[package]]
@@ -1747,16 +1923,6 @@ dependencies = [
"cc",
]
-[[package]]
-name = "ico"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "031530fe562d8c8d71c0635013d6d155bbfe8ba0aa4b4d2d24ce8af6b71047bd"
-dependencies = [
- "byteorder",
- "png",
-]
-
[[package]]
name = "ico"
version = "0.3.0"
@@ -1773,6 +1939,16 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+[[package]]
+name = "idna"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
[[package]]
name = "idna"
version = "0.5.0"
@@ -1783,32 +1959,16 @@ dependencies = [
"unicode-normalization",
]
-[[package]]
-name = "ignore"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1"
-dependencies = [
- "crossbeam-deque",
- "globset",
- "log",
- "memchr",
- "regex-automata 0.4.7",
- "same-file",
- "walkdir",
- "winapi-util",
-]
-
[[package]]
name = "image"
-version = "0.24.9"
+version = "0.25.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
+checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10"
dependencies = [
"bytemuck",
- "byteorder",
- "color_quant",
+ "byteorder-lite",
"num-traits",
+ "png",
]
[[package]]
@@ -1824,9 +1984,9 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "2.2.6"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
dependencies = [
"equivalent",
"hashbrown 0.14.5",
@@ -1835,18 +1995,9 @@ dependencies = [
[[package]]
name = "infer"
-version = "0.9.0"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f178e61cdbfe084aa75a2f4f7a25a5bb09701a47ae1753608f194b15783c937a"
-dependencies = [
- "cfb",
-]
-
-[[package]]
-name = "infer"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc"
+checksum = "bc150e5ce2330295b8616ce0e3f53250e53af31759a9dbedad1621ba29151847"
dependencies = [
"cfb",
]
@@ -1860,23 +2011,31 @@ dependencies = [
"cfg-if",
]
-[[package]]
-name = "io-lifetimes"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
-dependencies = [
- "hermit-abi 0.3.9",
- "libc",
- "windows-sys 0.48.0",
-]
-
[[package]]
name = "ipnet"
version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+[[package]]
+name = "is-docker"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "is-wsl"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5"
+dependencies = [
+ "is-docker",
+ "once_cell",
+]
+
[[package]]
name = "itoa"
version = "0.4.8"
@@ -1891,9 +2050,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
[[package]]
name = "javascriptcore-rs"
-version = "0.16.0"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c"
+checksum = "ca5671e9ffce8ffba57afc24070e906da7fc4b1ba66f2cabebf61bf2ea257fcc"
dependencies = [
"bitflags 1.3.2",
"glib",
@@ -1902,28 +2061,30 @@ dependencies = [
[[package]]
name = "javascriptcore-rs-sys"
-version = "0.4.0"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c"
+checksum = "af1be78d14ffa4b75b66df31840478fef72b51f8c2465d4ca7c194da9f7a5124"
dependencies = [
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 5.0.0",
+ "system-deps",
]
[[package]]
name = "jni"
-version = "0.20.0"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
dependencies = [
"cesu8",
+ "cfg-if",
"combine",
"jni-sys",
"log",
"thiserror",
"walkdir",
+ "windows-sys 0.45.0",
]
[[package]]
@@ -1934,24 +2095,47 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
[[package]]
name = "js-sys"
-version = "0.3.69"
+version = "0.3.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
dependencies = [
"wasm-bindgen",
]
[[package]]
name = "json-patch"
-version = "1.4.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b"
+checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc"
dependencies = [
+ "jsonptr",
"serde",
"serde_json",
"thiserror",
]
+[[package]]
+name = "jsonptr"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c6e529149475ca0b2820835d3dce8fcc41c6b943ca608d32f35b449255e4627"
+dependencies = [
+ "fluent-uri",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "keyboard-types"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a"
+dependencies = [
+ "bitflags 2.6.0",
+ "serde",
+ "unicode-segmentation",
+]
+
[[package]]
name = "kuchikiki"
version = "0.8.2"
@@ -1973,9 +2157,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "libappindicator"
-version = "0.7.1"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2d3cb96d092b4824cb306c9e544c856a4cb6210c1081945187f7f1924b47e8"
+checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a"
dependencies = [
"glib",
"gtk",
@@ -1986,9 +2170,9 @@ dependencies = [
[[package]]
name = "libappindicator-sys"
-version = "0.7.3"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa"
+checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf"
dependencies = [
"gtk-sys",
"libloading",
@@ -1997,9 +2181,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.155"
+version = "0.2.157"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "374af5f94e54fa97cf75e945cce8a6b201e88a1a07e688b47dfd2a59c66dbd86"
[[package]]
name = "libloading"
@@ -2019,20 +2203,9 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
dependencies = [
"bitflags 2.6.0",
"libc",
+ "redox_syscall",
]
-[[package]]
-name = "line-wrap"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
-
[[package]]
name = "linux-raw-sys"
version = "0.4.14"
@@ -2054,6 +2227,9 @@ name = "log"
version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+dependencies = [
+ "value-bag",
+]
[[package]]
name = "loom"
@@ -2076,19 +2252,6 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
-[[package]]
-name = "mac-notification-sys"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64"
-dependencies = [
- "cc",
- "dirs-next",
- "objc-foundation",
- "objc_id",
- "time",
-]
-
[[package]]
name = "malloc_buf"
version = "0.0.6"
@@ -2133,15 +2296,6 @@ version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-[[package]]
-name = "memoffset"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
-dependencies = [
- "autocfg",
-]
-
[[package]]
name = "memoffset"
version = "0.9.1"
@@ -2175,42 +2329,47 @@ dependencies = [
[[package]]
name = "mio"
-version = "0.8.11"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
dependencies = [
+ "hermit-abi 0.3.9",
"libc",
"wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
]
[[package]]
-name = "native-tls"
-version = "0.2.12"
+name = "muda"
+version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
+checksum = "86c410a9d21523a819e84881603fbc00331c8001eb899964952046671deddb9c"
dependencies = [
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
+ "cocoa 0.26.0",
+ "crossbeam-channel",
+ "dpi",
+ "gtk",
+ "keyboard-types",
+ "objc",
+ "once_cell",
+ "png",
+ "serde",
+ "thiserror",
+ "windows-sys 0.59.0",
]
[[package]]
name = "ndk"
-version = "0.6.0"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4"
+checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
"jni-sys",
+ "log",
"ndk-sys",
"num_enum",
+ "raw-window-handle",
"thiserror",
]
@@ -2222,9 +2381,9 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
[[package]]
name = "ndk-sys"
-version = "0.3.0"
+version = "0.6.0+11769913"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97"
+checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873"
dependencies = [
"jni-sys",
]
@@ -2237,27 +2396,14 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
[[package]]
name = "nix"
-version = "0.26.4"
+version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
-dependencies = [
- "bitflags 1.3.2",
- "cfg-if",
- "libc",
- "memoffset 0.7.1",
-]
-
-[[package]]
-name = "nix"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
dependencies = [
"bitflags 2.6.0",
"cfg-if",
- "cfg_aliases",
"libc",
- "memoffset 0.9.1",
+ "memoffset",
]
[[package]]
@@ -2266,19 +2412,6 @@ version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-[[package]]
-name = "notify-rust"
-version = "4.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5312f837191c317644f313f7b2b39f9cb1496570c74f7c17152dd3961219551f"
-dependencies = [
- "log",
- "mac-notification-sys",
- "serde",
- "tauri-winrt-notification",
- "zbus 4.3.0",
-]
-
[[package]]
name = "nu-ansi-term"
version = "0.46.0"
@@ -2304,35 +2437,34 @@ dependencies = [
"autocfg",
]
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi 0.3.9",
- "libc",
-]
-
[[package]]
name = "num_enum"
-version = "0.5.11"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
dependencies = [
"num_enum_derive",
]
[[package]]
name = "num_enum_derive"
-version = "0.5.11"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 2.0.2",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.75",
+]
+
+[[package]]
+name = "num_threads"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
+dependencies = [
+ "libc",
]
[[package]]
@@ -2356,6 +2488,106 @@ dependencies = [
"objc_id",
]
+[[package]]
+name = "objc-sys"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
+
+[[package]]
+name = "objc2"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
+dependencies = [
+ "objc-sys",
+ "objc2-encode",
+]
+
+[[package]]
+name = "objc2-app-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "libc",
+ "objc2",
+ "objc2-core-data",
+ "objc2-core-image",
+ "objc2-foundation",
+ "objc2-quartz-core",
+]
+
+[[package]]
+name = "objc2-core-data"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-image"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-foundation",
+ "objc2-metal",
+]
+
+[[package]]
+name = "objc2-encode"
+version = "4.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8"
+
+[[package]]
+name = "objc2-foundation"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "dispatch",
+ "libc",
+ "objc2",
+]
+
+[[package]]
+name = "objc2-metal"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-quartz-core"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+ "objc2-metal",
+]
+
[[package]]
name = "objc_exception"
version = "0.1.2"
@@ -2376,9 +2608,9 @@ dependencies = [
[[package]]
name = "object"
-version = "0.36.1"
+version = "0.36.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce"
+checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
dependencies = [
"memchr",
]
@@ -2391,57 +2623,20 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
[[package]]
name = "open"
-version = "3.2.0"
+version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8"
+checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3"
dependencies = [
+ "is-wsl",
+ "libc",
"pathdiff",
- "windows-sys 0.42.0",
]
[[package]]
-name = "openssl"
-version = "0.10.64"
+name = "option-ext"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
-dependencies = [
- "bitflags 2.6.0",
- "cfg-if",
- "foreign-types 0.3.2",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.68",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.102"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
[[package]]
name = "ordered-stream"
@@ -2464,18 +2659,38 @@ dependencies = [
"windows-sys 0.52.0",
]
+[[package]]
+name = "os_pipe"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
[[package]]
name = "overlayed"
version = "0.0.0"
dependencies = [
"anyhow",
- "cocoa 0.25.0",
+ "cocoa 0.26.0",
+ "log",
"objc",
"serde",
+ "serde_json",
+ "system-notification",
"tauri",
"tauri-build",
"tauri-nspanel",
+ "tauri-plugin-fs",
+ "tauri-plugin-http",
+ "tauri-plugin-log",
+ "tauri-plugin-os",
+ "tauri-plugin-process",
+ "tauri-plugin-shell",
"tauri-plugin-single-instance",
+ "tauri-plugin-updater",
"tauri-plugin-websocket",
"tauri-plugin-window-state",
"tokio",
@@ -2489,11 +2704,11 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "pango"
-version = "0.15.10"
+version = "0.18.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f"
+checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4"
dependencies = [
- "bitflags 1.3.2",
+ "gio",
"glib",
"libc",
"once_cell",
@@ -2502,14 +2717,14 @@ dependencies = [
[[package]]
name = "pango-sys"
-version = "0.15.10"
+version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa"
+checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5"
dependencies = [
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 6.2.2",
+ "system-deps",
]
[[package]]
@@ -2536,9 +2751,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall 0.5.2",
+ "redox_syscall",
"smallvec",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -2657,7 +2872,7 @@ dependencies = [
"phf_shared 0.11.2",
"proc-macro2",
"quote",
- "syn 2.0.68",
+ "syn 2.0.75",
]
[[package]]
@@ -2687,6 +2902,26 @@ dependencies = [
"siphasher",
]
+[[package]]
+name = "pin-project"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.75",
+]
+
[[package]]
name = "pin-project-lite"
version = "0.2.14"
@@ -2701,12 +2936,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "piper"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
dependencies = [
"atomic-waker",
- "fastrand 2.1.0",
+ "fastrand",
"futures-io",
]
@@ -2718,13 +2953,12 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
[[package]]
name = "plist"
-version = "1.6.1"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9"
+checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"
dependencies = [
- "base64 0.21.7",
- "indexmap 2.2.6",
- "line-wrap",
+ "base64 0.22.1",
+ "indexmap 2.4.0",
"quick-xml",
"serde",
"time",
@@ -2745,33 +2979,17 @@ dependencies = [
[[package]]
name = "polling"
-version = "2.8.0"
+version = "3.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
-dependencies = [
- "autocfg",
- "bitflags 1.3.2",
- "cfg-if",
- "concurrent-queue",
- "libc",
- "log",
- "pin-project-lite",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "polling"
-version = "3.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
+checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511"
dependencies = [
"cfg-if",
"concurrent-queue",
"hermit-abi 0.4.0",
"pin-project-lite",
- "rustix 0.38.34",
+ "rustix",
"tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -2782,9 +3000,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
[[package]]
name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
[[package]]
name = "precomputed-hash"
@@ -2804,11 +3025,12 @@ dependencies = [
[[package]]
name = "proc-macro-crate"
-version = "3.1.0"
+version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24"
dependencies = [
- "toml_edit 0.21.1",
+ "toml_datetime",
+ "toml_edit 0.20.2",
]
[[package]]
@@ -2851,14 +3073,98 @@ dependencies = [
]
[[package]]
-name = "quick-xml"
-version = "0.31.0"
+name = "psl-types"
+version = "2.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
+checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac"
+
+[[package]]
+name = "ptr_meta"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1"
+dependencies = [
+ "ptr_meta_derive",
+]
+
+[[package]]
+name = "ptr_meta_derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "publicsuffix"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457"
+dependencies = [
+ "idna 0.3.0",
+ "psl-types",
+]
+
+[[package]]
+name = "quick-xml"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2"
dependencies = [
"memchr",
]
+[[package]]
+name = "quinn"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
+dependencies = [
+ "bytes",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash",
+ "rustls",
+ "socket2",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd"
+dependencies = [
+ "bytes",
+ "rand 0.8.5",
+ "ring",
+ "rustc-hash",
+ "rustls",
+ "slab",
+ "thiserror",
+ "tinyvec",
+ "tracing",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
+dependencies = [
+ "libc",
+ "once_cell",
+ "socket2",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
[[package]]
name = "quote"
version = "1.0.36"
@@ -2868,6 +3174,12 @@ dependencies = [
"proc-macro2",
]
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
[[package]]
name = "rand"
version = "0.7.3"
@@ -2951,24 +3263,15 @@ dependencies = [
[[package]]
name = "raw-window-handle"
-version = "0.5.2"
+version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
+checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
[[package]]
name = "redox_syscall"
-version = "0.4.1"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
+checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
dependencies = [
"bitflags 2.6.0",
]
@@ -2986,9 +3289,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.10.5"
+version = "1.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
dependencies = [
"aho-corasick",
"memchr",
@@ -3029,37 +3332,52 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
[[package]]
-name = "reqwest"
-version = "0.11.27"
+name = "rend"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
+checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c"
dependencies = [
- "base64 0.21.7",
+ "bytecheck",
+]
+
+[[package]]
+name = "reqwest"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
+dependencies = [
+ "base64 0.22.1",
"bytes",
+ "cookie",
+ "cookie_store",
"encoding_rs",
"futures-core",
"futures-util",
"h2",
- "http 0.2.12",
+ "http",
"http-body",
+ "http-body-util",
"hyper",
- "hyper-tls",
+ "hyper-rustls",
+ "hyper-util",
"ipnet",
"js-sys",
"log",
"mime",
- "native-tls",
"once_cell",
"percent-encoding",
"pin-project-lite",
+ "quinn",
+ "rustls",
"rustls-pemfile",
+ "rustls-pki-types",
"serde",
"serde_json",
"serde_urlencoded",
"sync_wrapper",
"system-configuration",
"tokio",
- "tokio-native-tls",
+ "tokio-rustls",
"tokio-util",
"tower-service",
"url",
@@ -3067,31 +3385,68 @@ dependencies = [
"wasm-bindgen-futures",
"wasm-streams",
"web-sys",
- "winreg 0.50.0",
+ "webpki-roots",
+ "winreg",
]
[[package]]
-name = "rfd"
-version = "0.10.0"
+name = "ring"
+version = "0.17.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
dependencies = [
- "block",
- "dispatch",
- "glib-sys",
- "gobject-sys",
- "gtk-sys",
- "js-sys",
- "lazy_static",
- "log",
- "objc",
- "objc-foundation",
- "objc_id",
- "raw-window-handle",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "windows 0.37.0",
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.15",
+ "libc",
+ "spin",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rkyv"
+version = "0.7.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b"
+dependencies = [
+ "bitvec",
+ "bytecheck",
+ "bytes",
+ "hashbrown 0.12.3",
+ "ptr_meta",
+ "rend",
+ "rkyv_derive",
+ "seahash",
+ "tinyvec",
+ "uuid",
+]
+
+[[package]]
+name = "rkyv_derive"
+version = "0.7.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "rust_decimal"
+version = "1.36.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555"
+dependencies = [
+ "arrayvec",
+ "borsh",
+ "bytes",
+ "num-traits",
+ "rand 0.8.5",
+ "rkyv",
+ "serde",
+ "serde_json",
]
[[package]]
@@ -3100,6 +3455,12 @@ version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+[[package]]
+name = "rustc-hash"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+
[[package]]
name = "rustc_version"
version = "0.4.0"
@@ -3109,20 +3470,6 @@ dependencies = [
"semver",
]
-[[package]]
-name = "rustix"
-version = "0.37.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
-dependencies = [
- "bitflags 1.3.2",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys 0.3.8",
- "windows-sys 0.48.0",
-]
-
[[package]]
name = "rustix"
version = "0.38.34"
@@ -3132,17 +3479,49 @@ dependencies = [
"bitflags 2.6.0",
"errno",
"libc",
- "linux-raw-sys 0.4.14",
+ "linux-raw-sys",
"windows-sys 0.52.0",
]
[[package]]
-name = "rustls-pemfile"
-version = "1.0.4"
+name = "rustls"
+version = "0.23.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
dependencies = [
- "base64 0.21.7",
+ "once_cell",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+dependencies = [
+ "base64 0.22.1",
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+
+[[package]]
+name = "rustls-webpki"
+version = "0.102.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
]
[[package]]
@@ -3167,12 +3546,29 @@ dependencies = [
]
[[package]]
-name = "schannel"
-version = "0.1.23"
+name = "schemars"
+version = "0.8.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92"
dependencies = [
- "windows-sys 0.52.0",
+ "dyn-clone",
+ "indexmap 1.9.3",
+ "schemars_derive",
+ "serde",
+ "serde_json",
+ "url",
+]
+
+[[package]]
+name = "schemars_derive"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde_derive_internals",
+ "syn 2.0.75",
]
[[package]]
@@ -3188,27 +3584,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
-name = "security-framework"
-version = "2.11.0"
+name = "seahash"
+version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
-dependencies = [
- "bitflags 2.6.0",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
+checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
[[package]]
name = "selectors"
@@ -3241,32 +3620,54 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.203"
+version = "1.0.208"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
dependencies = [
"serde_derive",
]
[[package]]
-name = "serde_derive"
-version = "1.0.203"
+name = "serde-untagged"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+checksum = "2676ba99bd82f75cae5cbd2c8eda6fa0b8760f18978ea840e980dd5567b5c5b6"
+dependencies = [
+ "erased-serde",
+ "serde",
+ "typeid",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.208"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.68",
+ "syn 2.0.75",
+]
+
+[[package]]
+name = "serde_derive_internals"
+version = "0.29.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.75",
]
[[package]]
name = "serde_json"
-version = "1.0.118"
+version = "1.0.125"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4"
+checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed"
dependencies = [
- "indexmap 2.2.6",
"itoa 1.0.11",
+ "memchr",
"ryu",
"serde",
]
@@ -3279,14 +3680,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.68",
+ "syn 2.0.75",
]
[[package]]
name = "serde_spanned"
-version = "0.6.6"
+version = "0.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
+checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
dependencies = [
"serde",
]
@@ -3305,15 +3706,15 @@ dependencies = [
[[package]]
name = "serde_with"
-version = "3.8.1"
+version = "3.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"
+checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
dependencies = [
"base64 0.22.1",
"chrono",
"hex",
"indexmap 1.9.3",
- "indexmap 2.2.6",
+ "indexmap 2.4.0",
"serde",
"serde_derive",
"serde_json",
@@ -3323,14 +3724,14 @@ dependencies = [
[[package]]
name = "serde_with_macros"
-version = "3.8.1"
+version = "3.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
+checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn 2.0.68",
+ "syn 2.0.75",
]
[[package]]
@@ -3396,6 +3797,22 @@ dependencies = [
"lazy_static",
]
+[[package]]
+name = "shared_child"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09fa9338aed9a1df411814a5b2252f7cd206c55ae9bf2fa763f8de84603aa60c"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
[[package]]
name = "signal-hook-registry"
version = "1.4.2"
@@ -3411,6 +3828,12 @@ version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+[[package]]
+name = "simdutf8"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
+
[[package]]
name = "siphasher"
version = "0.3.11"
@@ -3432,16 +3855,6 @@ version = "1.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-[[package]]
-name = "socket2"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
-dependencies = [
- "libc",
- "winapi",
-]
-
[[package]]
name = "socket2"
version = "0.5.7"
@@ -3453,33 +3866,60 @@ dependencies = [
]
[[package]]
-name = "soup2"
-version = "0.2.1"
+name = "softbuffer"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0"
+checksum = "d623bff5d06f60d738990980d782c8c866997d9194cfe79ecad00aa2f76826dd"
dependencies = [
- "bitflags 1.3.2",
- "gio",
- "glib",
- "libc",
- "once_cell",
- "soup2-sys",
+ "bytemuck",
+ "cfg_aliases 0.2.1",
+ "core-graphics 0.23.2",
+ "foreign-types",
+ "js-sys",
+ "log",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
+ "objc2-quartz-core",
+ "raw-window-handle",
+ "redox_syscall",
+ "wasm-bindgen",
+ "web-sys",
+ "windows-sys 0.52.0",
]
[[package]]
-name = "soup2-sys"
-version = "0.2.0"
+name = "soup3"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf"
+checksum = "471f924a40f31251afc77450e781cb26d55c0b650842efafc9c6cbd2f7cc4f9f"
+dependencies = [
+ "futures-channel",
+ "gio",
+ "glib",
+ "libc",
+ "soup3-sys",
+]
+
+[[package]]
+name = "soup3-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ebe8950a680a12f24f15ebe1bf70db7af98ad242d9db43596ad3108aab86c27"
dependencies = [
- "bitflags 1.3.2",
"gio-sys",
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 5.0.0",
+ "system-deps",
]
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
[[package]]
name = "stable_deref_trait"
version = "1.2.0"
@@ -3488,9 +3928,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "state"
-version = "0.5.3"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b"
+checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8"
dependencies = [
"loom",
]
@@ -3533,6 +3973,23 @@ version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "swift-rs"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4057c98e2e852d51fdcfca832aac7b571f6b351ad159f9eda5db1655f8d0c4d7"
+dependencies = [
+ "base64 0.21.7",
+ "serde",
+ "serde_json",
+]
+
[[package]]
name = "syn"
version = "1.0.109"
@@ -3546,9 +4003,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.68"
+version = "2.0.75"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
+checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9"
dependencies = [
"proc-macro2",
"quote",
@@ -3556,22 +4013,30 @@ dependencies = [
]
[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
+name = "syn_derive"
+version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.75",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
[[package]]
name = "sys-locale"
-version = "0.2.4"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8a11bd9c338fdba09f7881ab41551932ad42e405f61d01e8406baea71c07aee"
+checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0"
dependencies = [
- "js-sys",
"libc",
- "wasm-bindgen",
- "web-sys",
- "windows-sys 0.45.0",
]
[[package]]
@@ -3581,7 +4046,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
dependencies = [
"bitflags 1.3.2",
- "core-foundation",
+ "core-foundation 0.9.4",
"system-configuration-sys",
]
@@ -3595,61 +4060,50 @@ dependencies = [
"libc",
]
-[[package]]
-name = "system-deps"
-version = "5.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e"
-dependencies = [
- "cfg-expr 0.9.1",
- "heck 0.3.3",
- "pkg-config",
- "toml 0.5.11",
- "version-compare 0.0.11",
-]
-
[[package]]
name = "system-deps"
version = "6.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
dependencies = [
- "cfg-expr 0.15.8",
+ "cfg-expr",
"heck 0.5.0",
"pkg-config",
- "toml 0.8.14",
- "version-compare 0.2.0",
+ "toml 0.8.2",
+ "version-compare",
+]
+
+[[package]]
+name = "system-notification"
+version = "0.1.0"
+source = "git+https://github.com/ahkohd/tauri-toolkit?branch=v2#9ba387cadcaf91dc0ec36673890849099c564622"
+dependencies = [
+ "block",
+ "cocoa 0.25.0",
+ "objc",
+ "tauri",
]
[[package]]
name = "tao"
-version = "0.16.9"
+version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "575c856fc21e551074869dcfaad8f706412bd5b803dfa0fbf6881c4ff4bfafab"
+checksum = "2a93f2c6b8fdaeb7f417bda89b5bc767999745c3052969664ae1fa65892deb7e"
dependencies = [
- "bitflags 1.3.2",
- "cairo-rs",
- "cc",
- "cocoa 0.24.1",
- "core-foundation",
- "core-graphics 0.22.3",
+ "bitflags 2.6.0",
+ "cocoa 0.26.0",
+ "core-foundation 0.10.0",
+ "core-graphics 0.24.0",
"crossbeam-channel",
- "dirs-next",
"dispatch",
- "gdk",
- "gdk-pixbuf",
- "gdk-sys",
+ "dlopen2",
+ "dpi",
"gdkwayland-sys",
"gdkx11-sys",
- "gio",
- "glib",
- "glib-sys",
"gtk",
- "image",
"instant",
"jni",
"lazy_static",
- "libappindicator",
"libc",
"log",
"ndk",
@@ -3658,15 +4112,14 @@ dependencies = [
"objc",
"once_cell",
"parking_lot",
- "png",
"raw-window-handle",
"scopeguard",
- "serde",
"tao-macros",
"unicode-segmentation",
- "uuid",
- "windows 0.39.0",
- "windows-implement 0.39.0",
+ "url",
+ "windows 0.58.0",
+ "windows-core 0.58.0",
+ "windows-version",
"x11-dl",
]
@@ -3681,6 +4134,12 @@ dependencies = [
"syn 1.0.109",
]
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
[[package]]
name = "tar"
version = "0.4.41"
@@ -3694,175 +4153,328 @@ dependencies = [
[[package]]
name = "target-lexicon"
-version = "0.12.14"
+version = "0.12.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "tauri"
-version = "1.6.8"
+version = "2.0.0-rc.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77567d2b3b74de4588d544147142d02297f3eaa171a25a065252141d8597a516"
+checksum = "4f60dc86a0513f775a6515d79cf2a54ce38f2fa7225e0c5b9d5ae8241e599afa"
dependencies = [
"anyhow",
- "base64 0.21.7",
"bytes",
- "cocoa 0.24.1",
- "dirs-next",
+ "cocoa 0.26.0",
+ "dirs",
"dunce",
"embed_plist",
- "encoding_rs",
- "flate2",
"futures-util",
"getrandom 0.2.15",
- "glib",
"glob",
"gtk",
"heck 0.5.0",
- "http 0.2.12",
- "ico 0.2.0",
- "ignore",
- "indexmap 1.9.3",
- "infer 0.9.0",
- "minisign-verify",
- "nix 0.26.4",
- "notify-rust",
+ "http",
+ "image",
+ "jni",
+ "libc",
+ "log",
+ "mime",
+ "muda",
"objc",
- "once_cell",
- "open",
- "os_info",
"percent-encoding",
- "png",
- "rand 0.8.5",
"raw-window-handle",
- "regex",
"reqwest",
- "rfd",
- "semver",
"serde",
"serde_json",
"serde_repr",
"serialize-to-javascript",
"state",
- "sys-locale",
- "tar",
+ "swift-rs",
+ "tauri-build",
"tauri-macros",
"tauri-runtime",
"tauri-runtime-wry",
"tauri-utils",
- "tempfile",
"thiserror",
- "time",
"tokio",
+ "tray-icon",
"url",
- "uuid",
+ "urlpattern",
"webkit2gtk",
"webview2-com",
- "windows 0.39.0",
- "zip",
+ "window-vibrancy",
+ "windows 0.58.0",
]
[[package]]
name = "tauri-build"
-version = "1.5.2"
+version = "2.0.0-rc.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab30cba12974d0f9b09794f61e72cad6da2142d3ceb81e519321bab86ce53312"
+checksum = "f9d6fc774b19bedadd547b0310fbdbfadbc7546978eccd6d3e389be7cabc437a"
dependencies = [
"anyhow",
"cargo_toml",
- "dirs-next",
+ "dirs",
+ "glob",
"heck 0.5.0",
"json-patch",
+ "schemars",
"semver",
"serde",
"serde_json",
"tauri-utils",
"tauri-winres",
+ "toml 0.8.2",
"walkdir",
]
[[package]]
name = "tauri-codegen"
-version = "1.4.3"
+version = "2.0.0-rc.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3a1d90db526a8cdfd54444ad3f34d8d4d58fa5c536463915942393743bd06f8"
+checksum = "d14af7a85713898cb8a6be3ece89eb1c39392d8756dd1cc0309ebd6fdc966eb3"
dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
"brotli",
- "ico 0.3.0",
+ "ico",
"json-patch",
"plist",
"png",
"proc-macro2",
"quote",
- "regex",
"semver",
"serde",
"serde_json",
"sha2",
+ "syn 2.0.75",
"tauri-utils",
"thiserror",
"time",
+ "url",
"uuid",
"walkdir",
]
[[package]]
name = "tauri-macros"
-version = "1.4.4"
+version = "2.0.0-rc.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a582d75414250122e4a597b9dd7d3c910a2c77906648fc2ac9353845ff0feec"
+checksum = "b9f698301cd7297a7876bb81181a830d40d401461eb14fdaf7ae189b1b56ef76"
dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.75",
"tauri-codegen",
"tauri-utils",
]
[[package]]
name = "tauri-nspanel"
-version = "0.0.0"
-source = "git+https://github.com/ahkohd/tauri-nspanel?branch=v1#9bf268429c8b0bebff0f5e63a18ab51b90c728de"
+version = "2.0.0-beta"
+source = "git+https://github.com/ahkohd/tauri-nspanel?branch=v2#07b1a04efee07c10b5eb4bfe3af71e32957d2d7a"
dependencies = [
"bitflags 2.6.0",
"block",
- "cocoa 0.25.0",
- "core-foundation",
- "core-graphics 0.23.2",
+ "cocoa 0.26.0",
+ "core-foundation 0.10.0",
+ "core-graphics 0.24.0",
"objc",
"objc-foundation",
"objc_id",
"tauri",
]
+[[package]]
+name = "tauri-plugin"
+version = "2.0.0-rc.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad2b0b4fe684059a1b700c1a0d7d51698c05b2257ca64eca2a730d7be2e47c6a"
+dependencies = [
+ "anyhow",
+ "glob",
+ "plist",
+ "schemars",
+ "serde",
+ "serde_json",
+ "tauri-utils",
+ "toml 0.8.2",
+ "walkdir",
+]
+
+[[package]]
+name = "tauri-plugin-fs"
+version = "2.0.0-rc.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5da009a6d75a07593085ea5e37adb2c55dbe9feb428b0f7610bd1018ebb3660"
+dependencies = [
+ "anyhow",
+ "dunce",
+ "glob",
+ "percent-encoding",
+ "schemars",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "tauri",
+ "tauri-plugin",
+ "thiserror",
+ "url",
+ "uuid",
+]
+
+[[package]]
+name = "tauri-plugin-http"
+version = "2.0.0-rc.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c714b1abe7b355203c54575ad09a9601106e6f0d6f91d63593810affb899cda9"
+dependencies = [
+ "data-url",
+ "http",
+ "regex",
+ "reqwest",
+ "schemars",
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-plugin",
+ "tauri-plugin-fs",
+ "thiserror",
+ "tokio",
+ "url",
+ "urlpattern",
+]
+
+[[package]]
+name = "tauri-plugin-log"
+version = "2.0.0-rc.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b57e4666c4a5d81f81b7bb8eacf51ae32c4e69c35071aabb480ad20a80836e4e"
+dependencies = [
+ "android_logger",
+ "byte-unit",
+ "cocoa 0.25.0",
+ "fern",
+ "log",
+ "objc",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "swift-rs",
+ "tauri",
+ "tauri-plugin",
+ "thiserror",
+ "time",
+]
+
+[[package]]
+name = "tauri-plugin-os"
+version = "2.0.0-rc.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc4ee761edd532fce2232453e9c8e0f7d9c0b6fe125c4b90b3eb4362ee84224"
+dependencies = [
+ "gethostname",
+ "log",
+ "os_info",
+ "serde",
+ "serde_json",
+ "serialize-to-javascript",
+ "sys-locale",
+ "tauri",
+ "tauri-plugin",
+ "thiserror",
+]
+
+[[package]]
+name = "tauri-plugin-process"
+version = "2.0.0-rc.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c9eb80b601682dcbd45dc5ed5f7cc214f1d994aeea730d500899cc616784559"
+dependencies = [
+ "tauri",
+ "tauri-plugin",
+]
+
+[[package]]
+name = "tauri-plugin-shell"
+version = "2.0.0-rc.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e83800ddf78b820172efb5ed7310344e8e4f97fd30cd8237a3f20c12a79eb136"
+dependencies = [
+ "encoding_rs",
+ "log",
+ "open",
+ "os_pipe",
+ "regex",
+ "schemars",
+ "serde",
+ "serde_json",
+ "shared_child",
+ "tauri",
+ "tauri-plugin",
+ "thiserror",
+ "tokio",
+]
+
[[package]]
name = "tauri-plugin-single-instance"
-version = "0.0.0"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#81676da7ab0155c630dc56cd704cfa985867ab51"
+version = "2.0.0-rc.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c24e22c4d830f5d8c13d078560aeb497c9f31fc1013e39842a08c486ed4be89c"
dependencies = [
"log",
"serde",
"serde_json",
"tauri",
"thiserror",
- "windows-sys 0.52.0",
- "zbus 3.15.2",
+ "windows-sys 0.59.0",
+ "zbus",
+]
+
+[[package]]
+name = "tauri-plugin-updater"
+version = "2.0.0-rc.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "391ebb8ae8cd6aec44b5d96d3005659d88cde69c57326f639bbc660116a30d63"
+dependencies = [
+ "base64 0.22.1",
+ "dirs",
+ "flate2",
+ "futures-util",
+ "http",
+ "infer",
+ "minisign-verify",
+ "reqwest",
+ "semver",
+ "serde",
+ "serde_json",
+ "tar",
+ "tauri",
+ "tauri-plugin",
+ "tempfile",
+ "thiserror",
+ "time",
+ "tokio",
+ "url",
+ "windows-sys 0.59.0",
+ "zip",
]
[[package]]
name = "tauri-plugin-websocket"
-version = "0.0.0"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#81676da7ab0155c630dc56cd704cfa985867ab51"
+version = "2.0.0-rc.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0559ff75acabdd8a2d1bc1dee480d65d6760fd3b758916ff19db0bc1c1f19d7e"
dependencies = [
"futures-util",
- "http 1.1.0",
+ "http",
"log",
"rand 0.8.5",
"serde",
"serde_json",
"tauri",
+ "tauri-plugin",
"thiserror",
"tokio",
"tokio-tungstenite",
@@ -3870,72 +4482,74 @@ dependencies = [
[[package]]
name = "tauri-plugin-window-state"
-version = "0.1.1"
-source = "git+https://github.com/Hacksore/plugins-workspace?branch=v1#ad0b46f5fb5dae87b9ef2db5bce640e10a096b6b"
+version = "2.0.0-rc.1"
+source = "git+https://github.com/Hacksore/plugins-workspace?branch=v2#01acc8c406b8fdf5f1c53999aa76a7ebba79768c"
dependencies = [
- "bincode",
"bitflags 2.6.0",
"log",
"serde",
"serde_json",
"tauri",
+ "tauri-plugin",
"thiserror",
]
[[package]]
name = "tauri-runtime"
-version = "0.14.3"
+version = "2.0.0-rc.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd7ffddf36d450791018e63a3ddf54979b9581d9644c584a5fb5611e6b5f20b4"
+checksum = "6a0758dce4f9e08ebeee877d84de0062859495507e1d16f647f97b29f881b43d"
dependencies = [
+ "dpi",
"gtk",
- "http 0.2.12",
- "http-range",
- "rand 0.8.5",
+ "http",
+ "jni",
"raw-window-handle",
"serde",
"serde_json",
"tauri-utils",
"thiserror",
"url",
- "uuid",
- "webview2-com",
- "windows 0.39.0",
+ "windows 0.58.0",
]
[[package]]
name = "tauri-runtime-wry"
-version = "0.14.8"
+version = "2.0.0-rc.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1989b3b4d611f5428b3414a4abae6fa6df30c7eb8ed33250ca90a5f7e5bb3655"
+checksum = "78dd7f77e769630da5d91a55e4f102a84ff9c5a99c71e1b5c916a18b5ccafc16"
dependencies = [
- "cocoa 0.24.1",
+ "cocoa 0.26.0",
"gtk",
+ "http",
+ "jni",
+ "log",
"percent-encoding",
- "rand 0.8.5",
"raw-window-handle",
+ "softbuffer",
+ "tao",
"tauri-runtime",
"tauri-utils",
- "uuid",
+ "url",
"webkit2gtk",
"webview2-com",
- "windows 0.39.0",
+ "windows 0.58.0",
"wry",
]
[[package]]
name = "tauri-utils"
-version = "1.5.4"
+version = "2.0.0-rc.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "450b17a7102e5d46d4bdabae0d1590fd27953e704e691fc081f06c06d2253b35"
+checksum = "ba92ad9cdf7658fefa29a7218dda0acead9400c021bbf9c3f88e98f5e3b9bbab"
dependencies = [
"brotli",
+ "cargo_metadata",
"ctor",
"dunce",
"glob",
- "heck 0.5.0",
"html5ever",
- "infer 0.13.0",
+ "infer",
"json-patch",
"kuchikiki",
"log",
@@ -3943,14 +4557,19 @@ dependencies = [
"phf 0.11.2",
"proc-macro2",
"quote",
+ "regex",
+ "schemars",
"semver",
"serde",
+ "serde-untagged",
"serde_json",
"serde_with",
+ "swift-rs",
"thiserror",
+ "toml 0.8.2",
"url",
+ "urlpattern",
"walkdir",
- "windows-version",
]
[[package]]
@@ -3963,27 +4582,17 @@ dependencies = [
"toml 0.7.8",
]
-[[package]]
-name = "tauri-winrt-notification"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871"
-dependencies = [
- "quick-xml",
- "windows 0.56.0",
- "windows-version",
-]
-
[[package]]
name = "tempfile"
-version = "3.10.1"
+version = "3.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
dependencies = [
"cfg-if",
- "fastrand 2.1.0",
- "rustix 0.38.34",
- "windows-sys 0.52.0",
+ "fastrand",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -4005,22 +4614,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"
[[package]]
name = "thiserror"
-version = "1.0.61"
+version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.61"
+version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.68",
+ "syn 2.0.75",
]
[[package]]
@@ -4041,7 +4650,9 @@ checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
dependencies = [
"deranged",
"itoa 1.0.11",
+ "libc",
"num-conv",
+ "num_threads",
"powerfmt",
"serde",
"time-core",
@@ -4066,9 +4677,9 @@ dependencies = [
[[package]]
name = "tinyvec"
-version = "1.6.1"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
dependencies = [
"tinyvec_macros",
]
@@ -4081,41 +4692,41 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.38.0"
+version = "1.39.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5"
dependencies = [
"backtrace",
"bytes",
"libc",
"mio",
- "num_cpus",
"parking_lot",
"pin-project-lite",
"signal-hook-registry",
- "socket2 0.5.7",
+ "socket2",
"tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
]
[[package]]
name = "tokio-macros"
-version = "2.3.0"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.68",
+ "syn 2.0.75",
]
[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
+name = "tokio-rustls"
+version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
dependencies = [
- "native-tls",
+ "rustls",
+ "rustls-pki-types",
"tokio",
]
@@ -4127,10 +4738,12 @@ checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd"
dependencies = [
"futures-util",
"log",
- "native-tls",
+ "rustls",
+ "rustls-pki-types",
"tokio",
- "tokio-native-tls",
+ "tokio-rustls",
"tungstenite",
+ "webpki-roots",
]
[[package]]
@@ -4146,15 +4759,6 @@ dependencies = [
"tokio",
]
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
[[package]]
name = "toml"
version = "0.7.8"
@@ -4169,21 +4773,21 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.8.14"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
+checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
- "toml_edit 0.22.14",
+ "toml_edit 0.20.2",
]
[[package]]
name = "toml_datetime"
-version = "0.6.6"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
dependencies = [
"serde",
]
@@ -4194,42 +4798,52 @@ version = "0.19.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.4.0",
"serde",
"serde_spanned",
"toml_datetime",
- "winnow 0.5.40",
+ "winnow",
]
[[package]]
name = "toml_edit"
-version = "0.21.1"
+version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
dependencies = [
- "indexmap 2.2.6",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
-dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.4.0",
"serde",
"serde_spanned",
"toml_datetime",
- "winnow 0.6.13",
+ "winnow",
]
+[[package]]
+name = "tower"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project",
+ "pin-project-lite",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
[[package]]
name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
[[package]]
name = "tracing"
@@ -4250,7 +4864,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.68",
+ "syn 2.0.75",
]
[[package]]
@@ -4292,6 +4906,27 @@ dependencies = [
"tracing-log",
]
+[[package]]
+name = "tray-icon"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "044d7738b3d50f288ddef035b793228740ad4d927f5466b0af55dc15e7e03cfe"
+dependencies = [
+ "core-graphics 0.24.0",
+ "crossbeam-channel",
+ "dirs",
+ "libappindicator",
+ "muda",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
+ "once_cell",
+ "png",
+ "serde",
+ "thiserror",
+ "windows-sys 0.59.0",
+]
+
[[package]]
name = "try-lock"
version = "0.2.5"
@@ -4307,16 +4942,23 @@ dependencies = [
"byteorder",
"bytes",
"data-encoding",
- "http 1.1.0",
+ "http",
"httparse",
"log",
- "native-tls",
"rand 0.8.5",
+ "rustls",
+ "rustls-pki-types",
"sha1",
"thiserror",
"utf-8",
]
+[[package]]
+name = "typeid"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
+
[[package]]
name = "typenum"
version = "1.17.0"
@@ -4329,11 +4971,52 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
dependencies = [
- "memoffset 0.9.1",
+ "memoffset",
"tempfile",
"winapi",
]
+[[package]]
+name = "unic-char-property"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221"
+dependencies = [
+ "unic-char-range",
+]
+
+[[package]]
+name = "unic-char-range"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc"
+
+[[package]]
+name = "unic-common"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc"
+
+[[package]]
+name = "unic-ucd-ident"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987"
+dependencies = [
+ "unic-char-property",
+ "unic-char-range",
+ "unic-ucd-version",
+]
+
+[[package]]
+name = "unic-ucd-version"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4"
+dependencies = [
+ "unic-common",
+]
+
[[package]]
name = "unicode-bidi"
version = "0.3.15"
@@ -4361,6 +5044,12 @@ version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
[[package]]
name = "url"
version = "2.5.2"
@@ -4368,11 +5057,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
dependencies = [
"form_urlencoded",
- "idna",
+ "idna 0.5.0",
"percent-encoding",
"serde",
]
+[[package]]
+name = "urlpattern"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70acd30e3aa1450bc2eece896ce2ad0d178e9c079493819301573dae3c37ba6d"
+dependencies = [
+ "regex",
+ "serde",
+ "unic-ucd-ident",
+ "url",
+]
+
[[package]]
name = "utf-8"
version = "0.7.6"
@@ -4380,10 +5081,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
[[package]]
-name = "uuid"
-version = "1.9.1"
+name = "utf8-width"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439"
+checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3"
+
+[[package]]
+name = "uuid"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
dependencies = [
"getrandom 0.2.15",
]
@@ -4395,16 +5102,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
[[package]]
-name = "vcpkg"
-version = "0.2.15"
+name = "value-bag"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "version-compare"
-version = "0.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b"
+checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101"
[[package]]
name = "version-compare"
@@ -4414,9 +5115,9 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
[[package]]
name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]]
name = "vswhom"
@@ -4438,12 +5139,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "waker-fn"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
-
[[package]]
name = "walkdir"
version = "2.5.0"
@@ -4477,34 +5172,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
dependencies = [
"cfg-if",
+ "once_cell",
"wasm-bindgen-macro",
]
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.68",
+ "syn 2.0.75",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.42"
+version = "0.4.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
dependencies = [
"cfg-if",
"js-sys",
@@ -4514,9 +5210,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -4524,22 +5220,22 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.68",
+ "syn 2.0.75",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
[[package]]
name = "wasm-streams"
@@ -4556,9 +5252,9 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.69"
+version = "0.3.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -4566,9 +5262,9 @@ dependencies = [
[[package]]
name = "webkit2gtk"
-version = "0.18.2"
+version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370"
+checksum = "76b1bc1e54c581da1e9f179d0b38512ba358fb1af2d634a1affe42e37172361a"
dependencies = [
"bitflags 1.3.2",
"cairo-rs",
@@ -4584,20 +5280,18 @@ dependencies = [
"javascriptcore-rs",
"libc",
"once_cell",
- "soup2",
+ "soup3",
"webkit2gtk-sys",
]
[[package]]
name = "webkit2gtk-sys"
-version = "0.18.0"
+version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3"
+checksum = "62daa38afc514d1f8f12b8693d30d5993ff77ced33ce30cd04deebc267a6d57c"
dependencies = [
- "atk-sys",
"bitflags 1.3.2",
"cairo-sys-rs",
- "gdk-pixbuf-sys",
"gdk-sys",
"gio-sys",
"glib-sys",
@@ -4605,48 +5299,54 @@ dependencies = [
"gtk-sys",
"javascriptcore-rs-sys",
"libc",
- "pango-sys",
"pkg-config",
- "soup2-sys",
- "system-deps 6.2.2",
+ "soup3-sys",
+ "system-deps",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.26.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd"
+dependencies = [
+ "rustls-pki-types",
]
[[package]]
name = "webview2-com"
-version = "0.19.1"
+version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178"
+checksum = "6f61ff3d9d0ee4efcb461b14eb3acfda2702d10dc329f339303fc3e57215ae2c"
dependencies = [
"webview2-com-macros",
"webview2-com-sys",
- "windows 0.39.0",
- "windows-implement 0.39.0",
+ "windows 0.58.0",
+ "windows-core 0.58.0",
+ "windows-implement",
+ "windows-interface",
]
[[package]]
name = "webview2-com-macros"
-version = "0.6.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac"
+checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.75",
]
[[package]]
name = "webview2-com-sys"
-version = "0.19.0"
+version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7"
+checksum = "a3a3e2eeb58f82361c93f9777014668eb3d07e7d174ee4c819575a9208011886"
dependencies = [
- "regex",
- "serde",
- "serde_json",
"thiserror",
- "windows 0.39.0",
- "windows-bindgen",
- "windows-metadata",
+ "windows 0.58.0",
+ "windows-core 0.58.0",
]
[[package]]
@@ -4667,11 +5367,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-util"
-version = "0.1.8"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -4681,30 +5381,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
-name = "windows"
-version = "0.37.0"
+name = "window-vibrancy"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647"
+checksum = "d8cdd6999298d969289d8078dae02ce798ad23452075985cccba8b6326711ecf"
dependencies = [
- "windows_aarch64_msvc 0.37.0",
- "windows_i686_gnu 0.37.0",
- "windows_i686_msvc 0.37.0",
- "windows_x86_64_gnu 0.37.0",
- "windows_x86_64_msvc 0.37.0",
-]
-
-[[package]]
-name = "windows"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a"
-dependencies = [
- "windows-implement 0.39.0",
- "windows_aarch64_msvc 0.39.0",
- "windows_i686_gnu 0.39.0",
- "windows_i686_msvc 0.39.0",
- "windows_x86_64_gnu 0.39.0",
- "windows_x86_64_msvc 0.39.0",
+ "cocoa 0.26.0",
+ "objc",
+ "raw-window-handle",
+ "windows-sys 0.59.0",
+ "windows-version",
]
[[package]]
@@ -4718,22 +5404,12 @@ dependencies = [
[[package]]
name = "windows"
-version = "0.56.0"
+version = "0.58.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132"
+checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
dependencies = [
- "windows-core 0.56.0",
- "windows-targets 0.52.5",
-]
-
-[[package]]
-name = "windows-bindgen"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41"
-dependencies = [
- "windows-metadata",
- "windows-tokens",
+ "windows-core 0.58.0",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -4742,81 +5418,61 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
]
[[package]]
name = "windows-core"
-version = "0.56.0"
+version = "0.58.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6"
+checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
dependencies = [
- "windows-implement 0.56.0",
+ "windows-implement",
"windows-interface",
"windows-result",
- "windows-targets 0.52.5",
+ "windows-strings",
+ "windows-targets 0.52.6",
]
[[package]]
name = "windows-implement"
-version = "0.39.0"
+version = "0.58.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7"
-dependencies = [
- "syn 1.0.109",
- "windows-tokens",
-]
-
-[[package]]
-name = "windows-implement"
-version = "0.56.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
+checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.68",
+ "syn 2.0.75",
]
[[package]]
name = "windows-interface"
-version = "0.56.0"
+version = "0.58.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
+checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.68",
+ "syn 2.0.75",
]
-[[package]]
-name = "windows-metadata"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278"
-
[[package]]
name = "windows-result"
-version = "0.1.2"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
]
[[package]]
-name = "windows-sys"
-version = "0.42.0"
+name = "windows-strings"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows-result",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -4843,7 +5499,16 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
]
[[package]]
@@ -4878,33 +5543,27 @@ dependencies = [
[[package]]
name = "windows-targets"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
"windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
]
-[[package]]
-name = "windows-tokens"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597"
-
[[package]]
name = "windows-version"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515"
dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -4921,21 +5580,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_msvc"
@@ -4951,21 +5598,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_i686_gnu"
@@ -4981,27 +5616,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
[[package]]
name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
[[package]]
name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_msvc"
@@ -5017,21 +5640,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
[[package]]
name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_x86_64_gnu"
@@ -5047,9 +5658,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnullvm"
@@ -5065,21 +5676,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_msvc"
@@ -5095,9 +5694,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winnow"
@@ -5108,25 +5707,6 @@ dependencies = [
"memchr",
]
-[[package]]
-name = "winnow"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winreg"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
[[package]]
name = "winreg"
version = "0.52.0"
@@ -5139,40 +5719,51 @@ dependencies = [
[[package]]
name = "wry"
-version = "0.24.10"
+version = "0.43.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00711278ed357350d44c749c286786ecac644e044e4da410d466212152383b45"
+checksum = "f4d715cf5fe88e9647f3d17b207b6d060d4a88e7171d4ccb2d2c657dd1d44728"
dependencies = [
- "base64 0.13.1",
+ "base64 0.22.1",
"block",
- "cocoa 0.24.1",
- "core-graphics 0.22.3",
+ "cocoa 0.26.0",
+ "core-graphics 0.24.0",
"crossbeam-channel",
+ "dpi",
"dunce",
- "gdk",
- "gio",
- "glib",
+ "gdkx11",
"gtk",
"html5ever",
- "http 0.2.12",
+ "http",
+ "javascriptcore-rs",
+ "jni",
"kuchikiki",
"libc",
- "log",
+ "ndk",
"objc",
"objc_id",
"once_cell",
- "serde",
- "serde_json",
+ "percent-encoding",
+ "raw-window-handle",
"sha2",
- "soup2",
- "tao",
+ "soup3",
+ "tao-macros",
"thiserror",
- "url",
"webkit2gtk",
"webkit2gtk-sys",
"webview2-com",
- "windows 0.39.0",
- "windows-implement 0.39.0",
+ "windows 0.58.0",
+ "windows-core 0.58.0",
+ "windows-version",
+ "x11-dl",
+]
+
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
]
[[package]]
@@ -5203,84 +5794,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
dependencies = [
"libc",
- "linux-raw-sys 0.4.14",
- "rustix 0.38.34",
+ "linux-raw-sys",
+ "rustix",
]
[[package]]
name = "xdg-home"
-version = "1.2.0"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8"
+checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6"
dependencies = [
"libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
name = "zbus"
-version = "3.15.2"
+version = "4.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6"
+checksum = "7b8e3d6ae3342792a6cc2340e4394334c7402f3d793b390d2c5494a4032b3030"
dependencies = [
- "async-broadcast 0.5.1",
+ "async-broadcast",
"async-executor",
- "async-fs 1.6.0",
- "async-io 1.13.0",
- "async-lock 2.8.0",
- "async-process 1.8.1",
+ "async-fs",
+ "async-io",
+ "async-lock",
+ "async-process",
"async-recursion",
"async-task",
"async-trait",
"blocking",
- "byteorder",
"derivative",
"enumflags2",
- "event-listener 2.5.3",
+ "event-listener",
"futures-core",
"futures-sink",
"futures-util",
"hex",
- "nix 0.26.4",
- "once_cell",
- "ordered-stream",
- "rand 0.8.5",
- "serde",
- "serde_repr",
- "sha1",
- "static_assertions",
- "tracing",
- "uds_windows",
- "winapi",
- "xdg-home",
- "zbus_macros 3.15.2",
- "zbus_names 2.6.1",
- "zvariant 3.15.2",
-]
-
-[[package]]
-name = "zbus"
-version = "4.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5"
-dependencies = [
- "async-broadcast 0.7.1",
- "async-executor",
- "async-fs 2.1.2",
- "async-io 2.3.3",
- "async-lock 3.4.0",
- "async-process 2.2.3",
- "async-recursion",
- "async-task",
- "async-trait",
- "blocking",
- "enumflags2",
- "event-listener 5.3.1",
- "futures-core",
- "futures-sink",
- "futures-util",
- "hex",
- "nix 0.28.0",
+ "nix",
"ordered-stream",
"rand 0.8.5",
"serde",
@@ -5291,47 +5842,23 @@ dependencies = [
"uds_windows",
"windows-sys 0.52.0",
"xdg-home",
- "zbus_macros 4.3.0",
- "zbus_names 3.0.0",
- "zvariant 4.1.1",
+ "zbus_macros",
+ "zbus_names",
+ "zvariant",
]
[[package]]
name = "zbus_macros"
-version = "3.15.2"
+version = "4.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5"
+checksum = "b7a3e850ff1e7217a3b7a07eba90d37fe9bb9e89a310f718afcde5885ca9b6d7"
dependencies = [
"proc-macro-crate 1.3.1",
"proc-macro2",
"quote",
"regex",
"syn 1.0.109",
- "zvariant_utils 1.0.1",
-]
-
-[[package]]
-name = "zbus_macros"
-version = "4.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d"
-dependencies = [
- "proc-macro-crate 3.1.0",
- "proc-macro2",
- "quote",
- "syn 2.0.68",
- "zvariant_utils 2.0.0",
-]
-
-[[package]]
-name = "zbus_names"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d"
-dependencies = [
- "serde",
- "static_assertions",
- "zvariant 3.15.2",
+ "zvariant_utils",
]
[[package]]
@@ -5342,91 +5869,84 @@ checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
dependencies = [
"serde",
"static_assertions",
- "zvariant 4.1.1",
+ "zvariant",
]
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.75",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
[[package]]
name = "zip"
-version = "0.6.6"
+version = "2.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
+checksum = "40dd8c92efc296286ce1fbd16657c5dbefff44f1b4ca01cc5f517d8b7b3d3e2e"
dependencies = [
- "byteorder",
+ "arbitrary",
"crc32fast",
"crossbeam-utils",
+ "displaydoc",
+ "indexmap 2.4.0",
+ "memchr",
+ "thiserror",
]
[[package]]
name = "zvariant"
-version = "3.15.2"
+version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db"
-dependencies = [
- "byteorder",
- "enumflags2",
- "libc",
- "serde",
- "static_assertions",
- "zvariant_derive 3.15.2",
-]
-
-[[package]]
-name = "zvariant"
-version = "4.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7"
+checksum = "4e09e8be97d44eeab994d752f341e67b3b0d80512a8b315a0671d47232ef1b65"
dependencies = [
"endi",
"enumflags2",
"serde",
"static_assertions",
- "zvariant_derive 4.1.1",
+ "zvariant_derive",
]
[[package]]
name = "zvariant_derive"
-version = "3.15.2"
+version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9"
+checksum = "72a5857e2856435331636a9fbb415b09243df4521a267c5bedcd5289b4d5799e"
dependencies = [
"proc-macro-crate 1.3.1",
"proc-macro2",
"quote",
"syn 1.0.109",
- "zvariant_utils 1.0.1",
-]
-
-[[package]]
-name = "zvariant_derive"
-version = "4.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8"
-dependencies = [
- "proc-macro-crate 3.1.0",
- "proc-macro2",
- "quote",
- "syn 2.0.68",
- "zvariant_utils 2.0.0",
+ "zvariant_utils",
]
[[package]]
name = "zvariant_utils"
-version = "1.0.1"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200"
+checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
]
-
-[[package]]
-name = "zvariant_utils"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.68",
-]
diff --git a/pkgs/by-name/ov/overlayed/package.nix b/pkgs/by-name/ov/overlayed/package.nix
index 215b205d78ea..05cf017825a7 100644
--- a/pkgs/by-name/ov/overlayed/package.nix
+++ b/pkgs/by-name/ov/overlayed/package.nix
@@ -5,20 +5,21 @@
pkg-config,
openssl,
libsoup,
- webkitgtk_4_0,
+ webkitgtk_4_1,
fetchFromGitHub,
libayatana-appindicator,
+ nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "overlayed";
- version = "0.5.0";
+ version = "0.6.2";
src = fetchFromGitHub {
owner = "overlayeddev";
repo = "overlayed";
rev = "refs/tags/v${version}";
- hash = "sha256-yS1u7pp7SfmqzoH0QOAH060uo3nFb/N9VIng0T21tVw=";
+ hash = "sha256-3GFg8czBf1csojXUNC51xFXJnGuXltP6D46fCt6q24I=";
};
sourceRoot = "${src.name}/apps/desktop/src-tauri";
@@ -33,7 +34,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [
openssl
- webkitgtk_4_0
+ webkitgtk_4_1
libsoup
];
@@ -44,9 +45,9 @@ rustPlatform.buildRustPackage rec {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
- "tauri-plugin-window-state-0.1.1" = "sha256-2cdO+5YAP7MOK0/YKclQemK4N9ci2JX3AfmMaeauwNI=";
- "tauri-nspanel-0.0.0" = "sha256-tQHY0OX37b4dqhs89phYIzw7JzEPmMJo5e/jlyzxdMg=";
- "tauri-plugin-single-instance-0.0.0" = "sha256-S1nsT/Dr0aIJdiPnW1FGamCth7CDMNAp4v34tpWqjHg=";
+ "system-notification-0.1.0" = "sha256-T9SnKBy4x0Y5Ul6oECHJ/lvsYS2TPY8Nrg1R9JtJUXs=";
+ "tauri-nspanel-2.0.0-beta" = "sha256-PhMkSrmmc6fJ0GmT9lPwYMsyBap7/g8vIp210l2nFU4=";
+ "tauri-plugin-window-state-2.0.0-rc.1" = "sha256-8GR9q1+eiULDOtWlLy+sLylOzfAOUO5Q61EP/XvP6c0=";
};
};
@@ -54,8 +55,8 @@ rustPlatform.buildRustPackage rec {
substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
--replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
substituteInPlace ./tauri.conf.json \
- --replace-fail '"distDir": "../dist",' '"distDir": "${webui}",' \
- --replace-fail '"beforeBuildCommand": "pnpm build"' '"beforeBuildCommand": ""'
+ --replace-fail '../dist' '${webui}' \
+ --replace-fail 'pnpm build' ' '
'';
meta = {
diff --git a/pkgs/by-name/ov/overlayed/webui.nix b/pkgs/by-name/ov/overlayed/webui.nix
index 80263ab64072..085b3436a9ca 100644
--- a/pkgs/by-name/ov/overlayed/webui.nix
+++ b/pkgs/by-name/ov/overlayed/webui.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) src pname version;
- hash = "sha256-YTZ6uT1hcNSh+xhRvOq4q/opMOEksXT/MH3BgCnccrA=";
+ hash = "sha256-+yyxoodcDfqJ2pkosd6sMk77/71RDsGthedo1Oigwto=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/pa/paratest/composer.lock b/pkgs/by-name/pa/paratest/composer.lock
index 23177e4e5da4..a018f09c24f8 100644
--- a/pkgs/by-name/pa/paratest/composer.lock
+++ b/pkgs/by-name/pa/paratest/composer.lock
@@ -4,20 +4,20 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "11632300688e9bcc111cc0e38617b43f",
+ "content-hash": "43d0970d6c73e855634c9cfc40801913",
"packages": [
{
"name": "fidry/cpu-core-counter",
- "version": "1.1.0",
+ "version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/theofidry/cpu-core-counter.git",
- "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42"
+ "reference": "8520451a140d3f46ac33042715115e290cf5785f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/f92996c4d5c1a696a6a970e20f7c4216200fcc42",
- "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42",
+ "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/8520451a140d3f46ac33042715115e290cf5785f",
+ "reference": "8520451a140d3f46ac33042715115e290cf5785f",
"shasum": ""
},
"require": {
@@ -57,7 +57,7 @@
],
"support": {
"issues": "https://github.com/theofidry/cpu-core-counter/issues",
- "source": "https://github.com/theofidry/cpu-core-counter/tree/1.1.0"
+ "source": "https://github.com/theofidry/cpu-core-counter/tree/1.2.0"
},
"funding": [
{
@@ -65,20 +65,20 @@
"type": "github"
}
],
- "time": "2024-02-07T09:43:46+00:00"
+ "time": "2024-08-06T10:04:20+00:00"
},
{
"name": "jean85/pretty-package-versions",
- "version": "2.0.5",
+ "version": "2.0.6",
"source": {
"type": "git",
"url": "https://github.com/Jean85/pretty-package-versions.git",
- "reference": "ae547e455a3d8babd07b96966b17d7fd21d9c6af"
+ "reference": "f9fdd29ad8e6d024f52678b570e5593759b550b4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/ae547e455a3d8babd07b96966b17d7fd21d9c6af",
- "reference": "ae547e455a3d8babd07b96966b17d7fd21d9c6af",
+ "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/f9fdd29ad8e6d024f52678b570e5593759b550b4",
+ "reference": "f9fdd29ad8e6d024f52678b570e5593759b550b4",
"shasum": ""
},
"require": {
@@ -86,9 +86,9 @@
"php": "^7.1|^8.0"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "^2.17",
+ "friendsofphp/php-cs-fixer": "^3.2",
"jean85/composer-provided-replaced-stub-package": "^1.0",
- "phpstan/phpstan": "^0.12.66",
+ "phpstan/phpstan": "^1.4",
"phpunit/phpunit": "^7.5|^8.5|^9.4",
"vimeo/psalm": "^4.3"
},
@@ -122,22 +122,22 @@
],
"support": {
"issues": "https://github.com/Jean85/pretty-package-versions/issues",
- "source": "https://github.com/Jean85/pretty-package-versions/tree/2.0.5"
+ "source": "https://github.com/Jean85/pretty-package-versions/tree/2.0.6"
},
- "time": "2021-10-08T21:21:46+00:00"
+ "time": "2024-03-08T09:58:59+00:00"
},
{
"name": "myclabs/deep-copy",
- "version": "1.11.1",
+ "version": "1.12.0",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
+ "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
- "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
+ "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
"shasum": ""
},
"require": {
@@ -145,11 +145,12 @@
},
"conflict": {
"doctrine/collections": "<1.6.8",
- "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+ "doctrine/common": "<2.13.3 || >=3 <3.2.2"
},
"require-dev": {
"doctrine/collections": "^1.6.8",
"doctrine/common": "^2.13.3 || ^3.2.2",
+ "phpspec/prophecy": "^1.10",
"phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
},
"type": "library",
@@ -175,7 +176,7 @@
],
"support": {
"issues": "https://github.com/myclabs/DeepCopy/issues",
- "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
+ "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0"
},
"funding": [
{
@@ -183,20 +184,20 @@
"type": "tidelift"
}
],
- "time": "2023-03-08T13:26:56+00:00"
+ "time": "2024-06-12T14:39:25+00:00"
},
{
"name": "nikic/php-parser",
- "version": "v5.0.0",
+ "version": "v5.3.1",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc"
+ "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4a21235f7e56e713259a6f76bf4b5ea08502b9dc",
- "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
+ "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
"shasum": ""
},
"require": {
@@ -207,7 +208,7 @@
},
"require-dev": {
"ircmaxell/php-yacc": "^0.0.7",
- "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
+ "phpunit/phpunit": "^9.0"
},
"bin": [
"bin/php-parse"
@@ -239,26 +240,27 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.0"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
},
- "time": "2024-01-07T17:17:35+00:00"
+ "time": "2024-10-08T18:51:32+00:00"
},
{
"name": "phar-io/manifest",
- "version": "2.0.3",
+ "version": "2.0.4",
"source": {
"type": "git",
"url": "https://github.com/phar-io/manifest.git",
- "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
+ "reference": "54750ef60c58e43759730615a392c31c80e23176"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
- "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
+ "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
+ "reference": "54750ef60c58e43759730615a392c31c80e23176",
"shasum": ""
},
"require": {
"ext-dom": "*",
+ "ext-libxml": "*",
"ext-phar": "*",
"ext-xmlwriter": "*",
"phar-io/version": "^3.0.1",
@@ -299,9 +301,15 @@
"description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
"support": {
"issues": "https://github.com/phar-io/manifest/issues",
- "source": "https://github.com/phar-io/manifest/tree/2.0.3"
+ "source": "https://github.com/phar-io/manifest/tree/2.0.4"
},
- "time": "2021-07-20T11:28:43+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/theseer",
+ "type": "github"
+ }
+ ],
+ "time": "2024-03-03T12:33:53+00:00"
},
{
"name": "phar-io/version",
@@ -356,35 +364,35 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "11.0.0",
+ "version": "11.0.7",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "5e238e4b982cb272bf9faeee6f33af83d465d0e2"
+ "reference": "f7f08030e8811582cc459871d28d6f5a1a4d35ca"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/5e238e4b982cb272bf9faeee6f33af83d465d0e2",
- "reference": "5e238e4b982cb272bf9faeee6f33af83d465d0e2",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f7f08030e8811582cc459871d28d6f5a1a4d35ca",
+ "reference": "f7f08030e8811582cc459871d28d6f5a1a4d35ca",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*",
"ext-xmlwriter": "*",
- "nikic/php-parser": "^5.0",
+ "nikic/php-parser": "^5.3.1",
"php": ">=8.2",
- "phpunit/php-file-iterator": "^5.0",
- "phpunit/php-text-template": "^4.0",
- "sebastian/code-unit-reverse-lookup": "^4.0",
- "sebastian/complexity": "^4.0",
- "sebastian/environment": "^7.0",
- "sebastian/lines-of-code": "^3.0",
- "sebastian/version": "^5.0",
- "theseer/tokenizer": "^1.2.0"
+ "phpunit/php-file-iterator": "^5.1.0",
+ "phpunit/php-text-template": "^4.0.1",
+ "sebastian/code-unit-reverse-lookup": "^4.0.1",
+ "sebastian/complexity": "^4.0.1",
+ "sebastian/environment": "^7.2.0",
+ "sebastian/lines-of-code": "^3.0.1",
+ "sebastian/version": "^5.0.2",
+ "theseer/tokenizer": "^1.2.3"
},
"require-dev": {
- "phpunit/phpunit": "^11.0"
+ "phpunit/phpunit": "^11.4.1"
},
"suggest": {
"ext-pcov": "PHP extension that provides line coverage",
@@ -393,7 +401,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "11.0-dev"
+ "dev-main": "11.0.x-dev"
}
},
"autoload": {
@@ -422,7 +430,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
"security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.0"
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.7"
},
"funding": [
{
@@ -430,20 +438,20 @@
"type": "github"
}
],
- "time": "2024-02-02T06:03:46+00:00"
+ "time": "2024-10-09T06:21:38+00:00"
},
{
"name": "phpunit/php-file-iterator",
- "version": "5.0.0",
+ "version": "5.1.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
- "reference": "99e95c94ad9500daca992354fa09d7b99abe2210"
+ "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/99e95c94ad9500daca992354fa09d7b99abe2210",
- "reference": "99e95c94ad9500daca992354fa09d7b99abe2210",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/118cfaaa8bc5aef3287bf315b6060b1174754af6",
+ "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6",
"shasum": ""
},
"require": {
@@ -483,7 +491,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
"security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
- "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/5.0.0"
+ "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/5.1.0"
},
"funding": [
{
@@ -491,20 +499,20 @@
"type": "github"
}
],
- "time": "2024-02-02T06:05:04+00:00"
+ "time": "2024-08-27T05:02:59+00:00"
},
{
"name": "phpunit/php-invoker",
- "version": "5.0.0",
+ "version": "5.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-invoker.git",
- "reference": "5d8d9355a16d8cc5a1305b0a85342cfa420612be"
+ "reference": "c1ca3814734c07492b3d4c5f794f4b0995333da2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5d8d9355a16d8cc5a1305b0a85342cfa420612be",
- "reference": "5d8d9355a16d8cc5a1305b0a85342cfa420612be",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/c1ca3814734c07492b3d4c5f794f4b0995333da2",
+ "reference": "c1ca3814734c07492b3d4c5f794f4b0995333da2",
"shasum": ""
},
"require": {
@@ -547,7 +555,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/php-invoker/issues",
"security": "https://github.com/sebastianbergmann/php-invoker/security/policy",
- "source": "https://github.com/sebastianbergmann/php-invoker/tree/5.0.0"
+ "source": "https://github.com/sebastianbergmann/php-invoker/tree/5.0.1"
},
"funding": [
{
@@ -555,20 +563,20 @@
"type": "github"
}
],
- "time": "2024-02-02T06:05:50+00:00"
+ "time": "2024-07-03T05:07:44+00:00"
},
{
"name": "phpunit/php-text-template",
- "version": "4.0.0",
+ "version": "4.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-text-template.git",
- "reference": "d38f6cbff1cdb6f40b03c9811421561668cc133e"
+ "reference": "3e0404dc6b300e6bf56415467ebcb3fe4f33e964"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/d38f6cbff1cdb6f40b03c9811421561668cc133e",
- "reference": "d38f6cbff1cdb6f40b03c9811421561668cc133e",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/3e0404dc6b300e6bf56415467ebcb3fe4f33e964",
+ "reference": "3e0404dc6b300e6bf56415467ebcb3fe4f33e964",
"shasum": ""
},
"require": {
@@ -607,7 +615,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/php-text-template/issues",
"security": "https://github.com/sebastianbergmann/php-text-template/security/policy",
- "source": "https://github.com/sebastianbergmann/php-text-template/tree/4.0.0"
+ "source": "https://github.com/sebastianbergmann/php-text-template/tree/4.0.1"
},
"funding": [
{
@@ -615,20 +623,20 @@
"type": "github"
}
],
- "time": "2024-02-02T06:06:56+00:00"
+ "time": "2024-07-03T05:08:43+00:00"
},
{
"name": "phpunit/php-timer",
- "version": "7.0.0",
+ "version": "7.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-timer.git",
- "reference": "8a59d9e25720482ee7fcdf296595e08795b84dc5"
+ "reference": "3b415def83fbcb41f991d9ebf16ae4ad8b7837b3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8a59d9e25720482ee7fcdf296595e08795b84dc5",
- "reference": "8a59d9e25720482ee7fcdf296595e08795b84dc5",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3b415def83fbcb41f991d9ebf16ae4ad8b7837b3",
+ "reference": "3b415def83fbcb41f991d9ebf16ae4ad8b7837b3",
"shasum": ""
},
"require": {
@@ -667,7 +675,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/php-timer/issues",
"security": "https://github.com/sebastianbergmann/php-timer/security/policy",
- "source": "https://github.com/sebastianbergmann/php-timer/tree/7.0.0"
+ "source": "https://github.com/sebastianbergmann/php-timer/tree/7.0.1"
},
"funding": [
{
@@ -675,20 +683,20 @@
"type": "github"
}
],
- "time": "2024-02-02T06:08:01+00:00"
+ "time": "2024-07-03T05:09:35+00:00"
},
{
"name": "phpunit/phpunit",
- "version": "11.0.3",
+ "version": "11.4.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "de24e7e7c67fbf437f7b6cd7bc919f2dc6fd89d4"
+ "reference": "e8e8ed1854de5d36c088ec1833beae40d2dedd76"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/de24e7e7c67fbf437f7b6cd7bc919f2dc6fd89d4",
- "reference": "de24e7e7c67fbf437f7b6cd7bc919f2dc6fd89d4",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e8e8ed1854de5d36c088ec1833beae40d2dedd76",
+ "reference": "e8e8ed1854de5d36c088ec1833beae40d2dedd76",
"shasum": ""
},
"require": {
@@ -698,25 +706,25 @@
"ext-mbstring": "*",
"ext-xml": "*",
"ext-xmlwriter": "*",
- "myclabs/deep-copy": "^1.10.1",
- "phar-io/manifest": "^2.0.3",
- "phar-io/version": "^3.0.2",
+ "myclabs/deep-copy": "^1.12.0",
+ "phar-io/manifest": "^2.0.4",
+ "phar-io/version": "^3.2.1",
"php": ">=8.2",
- "phpunit/php-code-coverage": "^11.0",
- "phpunit/php-file-iterator": "^5.0",
- "phpunit/php-invoker": "^5.0",
- "phpunit/php-text-template": "^4.0",
- "phpunit/php-timer": "^7.0",
- "sebastian/cli-parser": "^3.0",
- "sebastian/code-unit": "^3.0",
- "sebastian/comparator": "^6.0",
- "sebastian/diff": "^6.0",
- "sebastian/environment": "^7.0",
- "sebastian/exporter": "^6.0",
- "sebastian/global-state": "^7.0",
- "sebastian/object-enumerator": "^6.0",
- "sebastian/type": "^5.0",
- "sebastian/version": "^5.0"
+ "phpunit/php-code-coverage": "^11.0.7",
+ "phpunit/php-file-iterator": "^5.1.0",
+ "phpunit/php-invoker": "^5.0.1",
+ "phpunit/php-text-template": "^4.0.1",
+ "phpunit/php-timer": "^7.0.1",
+ "sebastian/cli-parser": "^3.0.2",
+ "sebastian/code-unit": "^3.0.1",
+ "sebastian/comparator": "^6.1.1",
+ "sebastian/diff": "^6.0.2",
+ "sebastian/environment": "^7.2.0",
+ "sebastian/exporter": "^6.1.3",
+ "sebastian/global-state": "^7.0.2",
+ "sebastian/object-enumerator": "^6.0.1",
+ "sebastian/type": "^5.1.0",
+ "sebastian/version": "^5.0.2"
},
"suggest": {
"ext-soap": "To be able to generate mocks based on WSDL files"
@@ -727,7 +735,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "11.0-dev"
+ "dev-main": "11.4-dev"
}
},
"autoload": {
@@ -759,7 +767,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/11.0.3"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/11.4.3"
},
"funding": [
{
@@ -775,7 +783,7 @@
"type": "tidelift"
}
],
- "time": "2024-02-10T06:31:16+00:00"
+ "time": "2024-10-28T13:07:50+00:00"
},
{
"name": "psr/container",
@@ -832,16 +840,16 @@
},
{
"name": "sebastian/cli-parser",
- "version": "3.0.0",
+ "version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/cli-parser.git",
- "reference": "efd6ce5bb8131fe981e2f879dbd47605fbe0cc6f"
+ "reference": "15c5dd40dc4f38794d383bb95465193f5e0ae180"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/efd6ce5bb8131fe981e2f879dbd47605fbe0cc6f",
- "reference": "efd6ce5bb8131fe981e2f879dbd47605fbe0cc6f",
+ "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/15c5dd40dc4f38794d383bb95465193f5e0ae180",
+ "reference": "15c5dd40dc4f38794d383bb95465193f5e0ae180",
"shasum": ""
},
"require": {
@@ -877,7 +885,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/cli-parser/issues",
"security": "https://github.com/sebastianbergmann/cli-parser/security/policy",
- "source": "https://github.com/sebastianbergmann/cli-parser/tree/3.0.0"
+ "source": "https://github.com/sebastianbergmann/cli-parser/tree/3.0.2"
},
"funding": [
{
@@ -885,20 +893,20 @@
"type": "github"
}
],
- "time": "2024-02-02T05:48:04+00:00"
+ "time": "2024-07-03T04:41:36+00:00"
},
{
"name": "sebastian/code-unit",
- "version": "3.0.0",
+ "version": "3.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/code-unit.git",
- "reference": "6634549cb8d702282a04a774e36a7477d2bd9015"
+ "reference": "6bb7d09d6623567178cf54126afa9c2310114268"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/6634549cb8d702282a04a774e36a7477d2bd9015",
- "reference": "6634549cb8d702282a04a774e36a7477d2bd9015",
+ "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/6bb7d09d6623567178cf54126afa9c2310114268",
+ "reference": "6bb7d09d6623567178cf54126afa9c2310114268",
"shasum": ""
},
"require": {
@@ -934,7 +942,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/code-unit/issues",
"security": "https://github.com/sebastianbergmann/code-unit/security/policy",
- "source": "https://github.com/sebastianbergmann/code-unit/tree/3.0.0"
+ "source": "https://github.com/sebastianbergmann/code-unit/tree/3.0.1"
},
"funding": [
{
@@ -942,20 +950,20 @@
"type": "github"
}
],
- "time": "2024-02-02T05:50:41+00:00"
+ "time": "2024-07-03T04:44:28+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
- "version": "4.0.0",
+ "version": "4.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
- "reference": "df80c875d3e459b45c6039e4d9b71d4fbccae25d"
+ "reference": "183a9b2632194febd219bb9246eee421dad8d45e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/df80c875d3e459b45c6039e4d9b71d4fbccae25d",
- "reference": "df80c875d3e459b45c6039e4d9b71d4fbccae25d",
+ "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/183a9b2632194febd219bb9246eee421dad8d45e",
+ "reference": "183a9b2632194febd219bb9246eee421dad8d45e",
"shasum": ""
},
"require": {
@@ -990,7 +998,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
"security": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/security/policy",
- "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/4.0.0"
+ "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/4.0.1"
},
"funding": [
{
@@ -998,20 +1006,20 @@
"type": "github"
}
],
- "time": "2024-02-02T05:52:17+00:00"
+ "time": "2024-07-03T04:45:54+00:00"
},
{
"name": "sebastian/comparator",
- "version": "6.0.0",
+ "version": "6.1.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "bd0f2fa5b9257c69903537b266ccb80fcf940db8"
+ "reference": "5ef523a49ae7a302b87b2102b72b1eda8918d686"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/bd0f2fa5b9257c69903537b266ccb80fcf940db8",
- "reference": "bd0f2fa5b9257c69903537b266ccb80fcf940db8",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5ef523a49ae7a302b87b2102b72b1eda8918d686",
+ "reference": "5ef523a49ae7a302b87b2102b72b1eda8918d686",
"shasum": ""
},
"require": {
@@ -1022,12 +1030,12 @@
"sebastian/exporter": "^6.0"
},
"require-dev": {
- "phpunit/phpunit": "^11.0"
+ "phpunit/phpunit": "^11.3"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "6.0-dev"
+ "dev-main": "6.1-dev"
}
},
"autoload": {
@@ -1067,7 +1075,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/comparator/issues",
"security": "https://github.com/sebastianbergmann/comparator/security/policy",
- "source": "https://github.com/sebastianbergmann/comparator/tree/6.0.0"
+ "source": "https://github.com/sebastianbergmann/comparator/tree/6.1.1"
},
"funding": [
{
@@ -1075,20 +1083,20 @@
"type": "github"
}
],
- "time": "2024-02-02T05:53:45+00:00"
+ "time": "2024-10-18T15:00:48+00:00"
},
{
"name": "sebastian/complexity",
- "version": "4.0.0",
+ "version": "4.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/complexity.git",
- "reference": "88a434ad86150e11a606ac4866b09130712671f0"
+ "reference": "ee41d384ab1906c68852636b6de493846e13e5a0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/88a434ad86150e11a606ac4866b09130712671f0",
- "reference": "88a434ad86150e11a606ac4866b09130712671f0",
+ "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/ee41d384ab1906c68852636b6de493846e13e5a0",
+ "reference": "ee41d384ab1906c68852636b6de493846e13e5a0",
"shasum": ""
},
"require": {
@@ -1125,7 +1133,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/complexity/issues",
"security": "https://github.com/sebastianbergmann/complexity/security/policy",
- "source": "https://github.com/sebastianbergmann/complexity/tree/4.0.0"
+ "source": "https://github.com/sebastianbergmann/complexity/tree/4.0.1"
},
"funding": [
{
@@ -1133,20 +1141,20 @@
"type": "github"
}
],
- "time": "2024-02-02T05:55:19+00:00"
+ "time": "2024-07-03T04:49:50+00:00"
},
{
"name": "sebastian/diff",
- "version": "6.0.0",
+ "version": "6.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
- "reference": "3e3f502419518897a923aa1c64d51f9def2e0aff"
+ "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3e3f502419518897a923aa1c64d51f9def2e0aff",
- "reference": "3e3f502419518897a923aa1c64d51f9def2e0aff",
+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/b4ccd857127db5d41a5b676f24b51371d76d8544",
+ "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544",
"shasum": ""
},
"require": {
@@ -1192,7 +1200,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/diff/issues",
"security": "https://github.com/sebastianbergmann/diff/security/policy",
- "source": "https://github.com/sebastianbergmann/diff/tree/6.0.0"
+ "source": "https://github.com/sebastianbergmann/diff/tree/6.0.2"
},
"funding": [
{
@@ -1200,20 +1208,20 @@
"type": "github"
}
],
- "time": "2024-02-02T05:56:35+00:00"
+ "time": "2024-07-03T04:53:05+00:00"
},
{
"name": "sebastian/environment",
- "version": "7.0.0",
+ "version": "7.2.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "100d8b855d7180f79f9a9a5c483f2d960581c3ea"
+ "reference": "855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/100d8b855d7180f79f9a9a5c483f2d960581c3ea",
- "reference": "100d8b855d7180f79f9a9a5c483f2d960581c3ea",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5",
+ "reference": "855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5",
"shasum": ""
},
"require": {
@@ -1228,7 +1236,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "7.0-dev"
+ "dev-main": "7.2-dev"
}
},
"autoload": {
@@ -1256,7 +1264,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/environment/issues",
"security": "https://github.com/sebastianbergmann/environment/security/policy",
- "source": "https://github.com/sebastianbergmann/environment/tree/7.0.0"
+ "source": "https://github.com/sebastianbergmann/environment/tree/7.2.0"
},
"funding": [
{
@@ -1264,20 +1272,20 @@
"type": "github"
}
],
- "time": "2024-02-02T05:57:54+00:00"
+ "time": "2024-07-03T04:54:44+00:00"
},
{
"name": "sebastian/exporter",
- "version": "6.0.0",
+ "version": "6.1.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
- "reference": "d0c0a93fc746b0c066037f1e7d09104129e868ff"
+ "reference": "c414673eee9a8f9d51bbf8d61fc9e3ef1e85b20e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/d0c0a93fc746b0c066037f1e7d09104129e868ff",
- "reference": "d0c0a93fc746b0c066037f1e7d09104129e868ff",
+ "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/c414673eee9a8f9d51bbf8d61fc9e3ef1e85b20e",
+ "reference": "c414673eee9a8f9d51bbf8d61fc9e3ef1e85b20e",
"shasum": ""
},
"require": {
@@ -1286,12 +1294,12 @@
"sebastian/recursion-context": "^6.0"
},
"require-dev": {
- "phpunit/phpunit": "^11.0"
+ "phpunit/phpunit": "^11.2"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "6.0-dev"
+ "dev-main": "6.1-dev"
}
},
"autoload": {
@@ -1334,7 +1342,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/exporter/issues",
"security": "https://github.com/sebastianbergmann/exporter/security/policy",
- "source": "https://github.com/sebastianbergmann/exporter/tree/6.0.0"
+ "source": "https://github.com/sebastianbergmann/exporter/tree/6.1.3"
},
"funding": [
{
@@ -1342,20 +1350,20 @@
"type": "github"
}
],
- "time": "2024-02-02T05:58:52+00:00"
+ "time": "2024-07-03T04:56:19+00:00"
},
{
"name": "sebastian/global-state",
- "version": "7.0.0",
+ "version": "7.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/global-state.git",
- "reference": "590e7cbc6565fa2e26c3df4e629a34bb0bc00c17"
+ "reference": "3be331570a721f9a4b5917f4209773de17f747d7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/590e7cbc6565fa2e26c3df4e629a34bb0bc00c17",
- "reference": "590e7cbc6565fa2e26c3df4e629a34bb0bc00c17",
+ "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/3be331570a721f9a4b5917f4209773de17f747d7",
+ "reference": "3be331570a721f9a4b5917f4209773de17f747d7",
"shasum": ""
},
"require": {
@@ -1396,7 +1404,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/global-state/issues",
"security": "https://github.com/sebastianbergmann/global-state/security/policy",
- "source": "https://github.com/sebastianbergmann/global-state/tree/7.0.0"
+ "source": "https://github.com/sebastianbergmann/global-state/tree/7.0.2"
},
"funding": [
{
@@ -1404,20 +1412,20 @@
"type": "github"
}
],
- "time": "2024-02-02T05:59:33+00:00"
+ "time": "2024-07-03T04:57:36+00:00"
},
{
"name": "sebastian/lines-of-code",
- "version": "3.0.0",
+ "version": "3.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/lines-of-code.git",
- "reference": "376c5b3f6b43c78fdc049740bca76a7c846706c0"
+ "reference": "d36ad0d782e5756913e42ad87cb2890f4ffe467a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/376c5b3f6b43c78fdc049740bca76a7c846706c0",
- "reference": "376c5b3f6b43c78fdc049740bca76a7c846706c0",
+ "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/d36ad0d782e5756913e42ad87cb2890f4ffe467a",
+ "reference": "d36ad0d782e5756913e42ad87cb2890f4ffe467a",
"shasum": ""
},
"require": {
@@ -1454,7 +1462,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
"security": "https://github.com/sebastianbergmann/lines-of-code/security/policy",
- "source": "https://github.com/sebastianbergmann/lines-of-code/tree/3.0.0"
+ "source": "https://github.com/sebastianbergmann/lines-of-code/tree/3.0.1"
},
"funding": [
{
@@ -1462,20 +1470,20 @@
"type": "github"
}
],
- "time": "2024-02-02T06:00:36+00:00"
+ "time": "2024-07-03T04:58:38+00:00"
},
{
"name": "sebastian/object-enumerator",
- "version": "6.0.0",
+ "version": "6.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/object-enumerator.git",
- "reference": "f75f6c460da0bbd9668f43a3dde0ec0ba7faa678"
+ "reference": "f5b498e631a74204185071eb41f33f38d64608aa"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/f75f6c460da0bbd9668f43a3dde0ec0ba7faa678",
- "reference": "f75f6c460da0bbd9668f43a3dde0ec0ba7faa678",
+ "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/f5b498e631a74204185071eb41f33f38d64608aa",
+ "reference": "f5b498e631a74204185071eb41f33f38d64608aa",
"shasum": ""
},
"require": {
@@ -1512,7 +1520,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
"security": "https://github.com/sebastianbergmann/object-enumerator/security/policy",
- "source": "https://github.com/sebastianbergmann/object-enumerator/tree/6.0.0"
+ "source": "https://github.com/sebastianbergmann/object-enumerator/tree/6.0.1"
},
"funding": [
{
@@ -1520,20 +1528,20 @@
"type": "github"
}
],
- "time": "2024-02-02T06:01:29+00:00"
+ "time": "2024-07-03T05:00:13+00:00"
},
{
"name": "sebastian/object-reflector",
- "version": "4.0.0",
+ "version": "4.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/object-reflector.git",
- "reference": "bb2a6255d30853425fd38f032eb64ced9f7f132d"
+ "reference": "6e1a43b411b2ad34146dee7524cb13a068bb35f9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/bb2a6255d30853425fd38f032eb64ced9f7f132d",
- "reference": "bb2a6255d30853425fd38f032eb64ced9f7f132d",
+ "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/6e1a43b411b2ad34146dee7524cb13a068bb35f9",
+ "reference": "6e1a43b411b2ad34146dee7524cb13a068bb35f9",
"shasum": ""
},
"require": {
@@ -1568,7 +1576,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/object-reflector/issues",
"security": "https://github.com/sebastianbergmann/object-reflector/security/policy",
- "source": "https://github.com/sebastianbergmann/object-reflector/tree/4.0.0"
+ "source": "https://github.com/sebastianbergmann/object-reflector/tree/4.0.1"
},
"funding": [
{
@@ -1576,20 +1584,20 @@
"type": "github"
}
],
- "time": "2024-02-02T06:02:18+00:00"
+ "time": "2024-07-03T05:01:32+00:00"
},
{
"name": "sebastian/recursion-context",
- "version": "6.0.0",
+ "version": "6.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/recursion-context.git",
- "reference": "b75224967b5a466925c6d54e68edd0edf8dd4ed4"
+ "reference": "694d156164372abbd149a4b85ccda2e4670c0e16"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b75224967b5a466925c6d54e68edd0edf8dd4ed4",
- "reference": "b75224967b5a466925c6d54e68edd0edf8dd4ed4",
+ "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/694d156164372abbd149a4b85ccda2e4670c0e16",
+ "reference": "694d156164372abbd149a4b85ccda2e4670c0e16",
"shasum": ""
},
"require": {
@@ -1632,7 +1640,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/recursion-context/issues",
"security": "https://github.com/sebastianbergmann/recursion-context/security/policy",
- "source": "https://github.com/sebastianbergmann/recursion-context/tree/6.0.0"
+ "source": "https://github.com/sebastianbergmann/recursion-context/tree/6.0.2"
},
"funding": [
{
@@ -1640,32 +1648,32 @@
"type": "github"
}
],
- "time": "2024-02-02T06:08:48+00:00"
+ "time": "2024-07-03T05:10:34+00:00"
},
{
"name": "sebastian/type",
- "version": "5.0.0",
+ "version": "5.1.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/type.git",
- "reference": "b8502785eb3523ca0dd4afe9ca62235590020f3f"
+ "reference": "461b9c5da241511a2a0e8f240814fb23ce5c0aac"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8502785eb3523ca0dd4afe9ca62235590020f3f",
- "reference": "b8502785eb3523ca0dd4afe9ca62235590020f3f",
+ "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/461b9c5da241511a2a0e8f240814fb23ce5c0aac",
+ "reference": "461b9c5da241511a2a0e8f240814fb23ce5c0aac",
"shasum": ""
},
"require": {
"php": ">=8.2"
},
"require-dev": {
- "phpunit/phpunit": "^11.0"
+ "phpunit/phpunit": "^11.3"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "5.0-dev"
+ "dev-main": "5.1-dev"
}
},
"autoload": {
@@ -1689,7 +1697,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/type/issues",
"security": "https://github.com/sebastianbergmann/type/security/policy",
- "source": "https://github.com/sebastianbergmann/type/tree/5.0.0"
+ "source": "https://github.com/sebastianbergmann/type/tree/5.1.0"
},
"funding": [
{
@@ -1697,20 +1705,20 @@
"type": "github"
}
],
- "time": "2024-02-02T06:09:34+00:00"
+ "time": "2024-09-17T13:12:04+00:00"
},
{
"name": "sebastian/version",
- "version": "5.0.0",
+ "version": "5.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/version.git",
- "reference": "13999475d2cb1ab33cb73403ba356a814fdbb001"
+ "reference": "c687e3387b99f5b03b6caa64c74b63e2936ff874"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/13999475d2cb1ab33cb73403ba356a814fdbb001",
- "reference": "13999475d2cb1ab33cb73403ba356a814fdbb001",
+ "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c687e3387b99f5b03b6caa64c74b63e2936ff874",
+ "reference": "c687e3387b99f5b03b6caa64c74b63e2936ff874",
"shasum": ""
},
"require": {
@@ -1743,7 +1751,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/version/issues",
"security": "https://github.com/sebastianbergmann/version/security/policy",
- "source": "https://github.com/sebastianbergmann/version/tree/5.0.0"
+ "source": "https://github.com/sebastianbergmann/version/tree/5.0.2"
},
"funding": [
{
@@ -1751,20 +1759,20 @@
"type": "github"
}
],
- "time": "2024-02-02T06:10:47+00:00"
+ "time": "2024-10-09T05:16:32+00:00"
},
{
"name": "symfony/console",
- "version": "v7.0.3",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "c5010d50f1ee4b25cfa0201d9915cf1b14071456"
+ "reference": "bb5192af6edc797cbab5c8e8ecfea2fe5f421e57"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/c5010d50f1ee4b25cfa0201d9915cf1b14071456",
- "reference": "c5010d50f1ee4b25cfa0201d9915cf1b14071456",
+ "url": "https://api.github.com/repos/symfony/console/zipball/bb5192af6edc797cbab5c8e8ecfea2fe5f421e57",
+ "reference": "bb5192af6edc797cbab5c8e8ecfea2fe5f421e57",
"shasum": ""
},
"require": {
@@ -1828,7 +1836,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v7.0.3"
+ "source": "https://github.com/symfony/console/tree/v7.1.6"
},
"funding": [
{
@@ -1844,24 +1852,91 @@
"type": "tidelift"
}
],
- "time": "2024-01-23T15:02:46+00:00"
+ "time": "2024-10-09T08:46:59+00:00"
},
{
- "name": "symfony/polyfill-ctype",
- "version": "v1.29.0",
+ "name": "symfony/deprecation-contracts",
+ "version": "v3.5.0",
"source": {
"type": "git",
- "url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
+ "url": "https://github.com/symfony/deprecation-contracts.git",
+ "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
- "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
+ "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
+ "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=8.1"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-main": "3.5-dev"
+ },
+ "thanks": {
+ "name": "symfony/contracts",
+ "url": "https://github.com/symfony/contracts"
+ }
+ },
+ "autoload": {
+ "files": [
+ "function.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "A generic function and convention to trigger deprecation notices",
+ "homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0"
+ },
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2024-04-18T09:32:20+00:00"
+ },
+ {
+ "name": "symfony/polyfill-ctype",
+ "version": "v1.31.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-ctype.git",
+ "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+ "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.2"
},
"provide": {
"ext-ctype": "*"
@@ -1907,7 +1982,7 @@
"portable"
],
"support": {
- "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
},
"funding": [
{
@@ -1923,24 +1998,24 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-intl-grapheme",
- "version": "v1.29.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
- "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f"
+ "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f",
- "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
+ "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"suggest": {
"ext-intl": "For best performance"
@@ -1985,7 +2060,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0"
},
"funding": [
{
@@ -2001,24 +2076,24 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
- "version": "v1.29.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
- "reference": "bc45c394692b948b4d383a08d7753968bed9a83d"
+ "reference": "3833d7255cc303546435cb650316bff708a1c75c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
- "reference": "bc45c394692b948b4d383a08d7753968bed9a83d",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
+ "reference": "3833d7255cc303546435cb650316bff708a1c75c",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"suggest": {
"ext-intl": "For best performance"
@@ -2066,7 +2141,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0"
},
"funding": [
{
@@ -2082,24 +2157,24 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.29.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
+ "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
- "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
+ "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"provide": {
"ext-mbstring": "*"
@@ -2146,7 +2221,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
},
"funding": [
{
@@ -2162,20 +2237,20 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/process",
- "version": "v7.0.3",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "937a195147e0c27b2759ade834169ed006d0bc74"
+ "reference": "6aaa189ddb4ff6b5de8fa3210f2fb42c87b4d12e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/937a195147e0c27b2759ade834169ed006d0bc74",
- "reference": "937a195147e0c27b2759ade834169ed006d0bc74",
+ "url": "https://api.github.com/repos/symfony/process/zipball/6aaa189ddb4ff6b5de8fa3210f2fb42c87b4d12e",
+ "reference": "6aaa189ddb4ff6b5de8fa3210f2fb42c87b4d12e",
"shasum": ""
},
"require": {
@@ -2207,7 +2282,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/process/tree/v7.0.3"
+ "source": "https://github.com/symfony/process/tree/v7.1.6"
},
"funding": [
{
@@ -2223,25 +2298,26 @@
"type": "tidelift"
}
],
- "time": "2024-01-23T15:02:46+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
"name": "symfony/service-contracts",
- "version": "v3.4.1",
+ "version": "v3.5.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
- "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0"
+ "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0",
- "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0",
+ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
+ "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
"shasum": ""
},
"require": {
"php": ">=8.1",
- "psr/container": "^1.1|^2.0"
+ "psr/container": "^1.1|^2.0",
+ "symfony/deprecation-contracts": "^2.5|^3"
},
"conflict": {
"ext-psr": "<1.1|>=2"
@@ -2249,7 +2325,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.4-dev"
+ "dev-main": "3.5-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -2289,7 +2365,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/service-contracts/tree/v3.4.1"
+ "source": "https://github.com/symfony/service-contracts/tree/v3.5.0"
},
"funding": [
{
@@ -2305,20 +2381,20 @@
"type": "tidelift"
}
],
- "time": "2023-12-26T14:02:43+00:00"
+ "time": "2024-04-18T09:32:20+00:00"
},
{
"name": "symfony/string",
- "version": "v7.0.3",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "524aac4a280b90a4420d8d6a040718d0586505ac"
+ "reference": "61b72d66bf96c360a727ae6232df5ac83c71f626"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/524aac4a280b90a4420d8d6a040718d0586505ac",
- "reference": "524aac4a280b90a4420d8d6a040718d0586505ac",
+ "url": "https://api.github.com/repos/symfony/string/zipball/61b72d66bf96c360a727ae6232df5ac83c71f626",
+ "reference": "61b72d66bf96c360a727ae6232df5ac83c71f626",
"shasum": ""
},
"require": {
@@ -2332,6 +2408,7 @@
"symfony/translation-contracts": "<2.5"
},
"require-dev": {
+ "symfony/emoji": "^7.1",
"symfony/error-handler": "^6.4|^7.0",
"symfony/http-client": "^6.4|^7.0",
"symfony/intl": "^6.4|^7.0",
@@ -2375,7 +2452,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v7.0.3"
+ "source": "https://github.com/symfony/string/tree/v7.1.6"
},
"funding": [
{
@@ -2391,20 +2468,20 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T15:41:16+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
"name": "theseer/tokenizer",
- "version": "1.2.2",
+ "version": "1.2.3",
"source": {
"type": "git",
"url": "https://github.com/theseer/tokenizer.git",
- "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96"
+ "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
- "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
+ "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+ "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
"shasum": ""
},
"require": {
@@ -2433,7 +2510,7 @@
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
"support": {
"issues": "https://github.com/theseer/tokenizer/issues",
- "source": "https://github.com/theseer/tokenizer/tree/1.2.2"
+ "source": "https://github.com/theseer/tokenizer/tree/1.2.3"
},
"funding": [
{
@@ -2441,7 +2518,7 @@
"type": "github"
}
],
- "time": "2023-11-20T00:12:19+00:00"
+ "time": "2024-03-03T12:36:25+00:00"
}
],
"packages-dev": [
@@ -2581,16 +2658,16 @@
},
{
"name": "phpstan/phpdoc-parser",
- "version": "1.25.0",
+ "version": "1.33.0",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpdoc-parser.git",
- "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240"
+ "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bd84b629c8de41aa2ae82c067c955e06f1b00240",
- "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240",
+ "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/82a311fd3690fb2bf7b64d5c98f912b3dd746140",
+ "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140",
"shasum": ""
},
"require": {
@@ -2622,22 +2699,22 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": {
"issues": "https://github.com/phpstan/phpdoc-parser/issues",
- "source": "https://github.com/phpstan/phpdoc-parser/tree/1.25.0"
+ "source": "https://github.com/phpstan/phpdoc-parser/tree/1.33.0"
},
- "time": "2024-01-04T17:06:16+00:00"
+ "time": "2024-10-13T11:25:22+00:00"
},
{
"name": "phpstan/phpstan",
- "version": "1.10.59",
+ "version": "1.12.7",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "e607609388d3a6d418a50a49f7940e8086798281"
+ "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e607609388d3a6d418a50a49f7940e8086798281",
- "reference": "e607609388d3a6d418a50a49f7940e8086798281",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc2b9976bd8b0f84ec9b0e50cc35378551de7af0",
+ "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0",
"shasum": ""
},
"require": {
@@ -2680,35 +2757,30 @@
{
"url": "https://github.com/phpstan",
"type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
- "type": "tidelift"
}
],
- "time": "2024-02-20T13:59:13+00:00"
+ "time": "2024-10-18T11:12:07+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",
- "version": "1.1.4",
+ "version": "1.2.1",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-deprecation-rules.git",
- "reference": "089d8a8258ed0aeefdc7b68b6c3d25572ebfdbaa"
+ "reference": "f94d246cc143ec5a23da868f8f7e1393b50eaa82"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan-deprecation-rules/zipball/089d8a8258ed0aeefdc7b68b6c3d25572ebfdbaa",
- "reference": "089d8a8258ed0aeefdc7b68b6c3d25572ebfdbaa",
+ "url": "https://api.github.com/repos/phpstan/phpstan-deprecation-rules/zipball/f94d246cc143ec5a23da868f8f7e1393b50eaa82",
+ "reference": "f94d246cc143ec5a23da868f8f7e1393b50eaa82",
"shasum": ""
},
"require": {
"php": "^7.2 || ^8.0",
- "phpstan/phpstan": "^1.10.3"
+ "phpstan/phpstan": "^1.12"
},
"require-dev": {
"php-parallel-lint/php-parallel-lint": "^1.2",
- "phpstan/phpstan-php-parser": "^1.1",
"phpstan/phpstan-phpunit": "^1.0",
"phpunit/phpunit": "^9.5"
},
@@ -2732,27 +2804,27 @@
"description": "PHPStan rules for detecting usage of deprecated classes, methods, properties, constants and traits.",
"support": {
"issues": "https://github.com/phpstan/phpstan-deprecation-rules/issues",
- "source": "https://github.com/phpstan/phpstan-deprecation-rules/tree/1.1.4"
+ "source": "https://github.com/phpstan/phpstan-deprecation-rules/tree/1.2.1"
},
- "time": "2023-08-05T09:02:04+00:00"
+ "time": "2024-09-11T15:52:35+00:00"
},
{
"name": "phpstan/phpstan-phpunit",
- "version": "1.3.15",
+ "version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-phpunit.git",
- "reference": "70ecacc64fe8090d8d2a33db5a51fe8e88acd93a"
+ "reference": "f3ea021866f4263f07ca3636bf22c64be9610c11"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/70ecacc64fe8090d8d2a33db5a51fe8e88acd93a",
- "reference": "70ecacc64fe8090d8d2a33db5a51fe8e88acd93a",
+ "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/f3ea021866f4263f07ca3636bf22c64be9610c11",
+ "reference": "f3ea021866f4263f07ca3636bf22c64be9610c11",
"shasum": ""
},
"require": {
"php": "^7.2 || ^8.0",
- "phpstan/phpstan": "^1.10"
+ "phpstan/phpstan": "^1.11"
},
"conflict": {
"phpunit/phpunit": "<7.0"
@@ -2784,27 +2856,27 @@
"description": "PHPUnit extensions and rules for PHPStan",
"support": {
"issues": "https://github.com/phpstan/phpstan-phpunit/issues",
- "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.15"
+ "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.4.0"
},
- "time": "2023-10-09T18:58:39+00:00"
+ "time": "2024-04-20T06:39:00+00:00"
},
{
"name": "phpstan/phpstan-strict-rules",
- "version": "1.5.2",
+ "version": "1.6.1",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-strict-rules.git",
- "reference": "7a50e9662ee9f3942e4aaaf3d603653f60282542"
+ "reference": "daeec748b53de80a97498462513066834ec28f8b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/7a50e9662ee9f3942e4aaaf3d603653f60282542",
- "reference": "7a50e9662ee9f3942e4aaaf3d603653f60282542",
+ "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/daeec748b53de80a97498462513066834ec28f8b",
+ "reference": "daeec748b53de80a97498462513066834ec28f8b",
"shasum": ""
},
"require": {
"php": "^7.2 || ^8.0",
- "phpstan/phpstan": "^1.10.34"
+ "phpstan/phpstan": "^1.12.4"
},
"require-dev": {
"nikic/php-parser": "^4.13.0",
@@ -2833,38 +2905,38 @@
"description": "Extra strict and opinionated rules for PHPStan",
"support": {
"issues": "https://github.com/phpstan/phpstan-strict-rules/issues",
- "source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.5.2"
+ "source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.6.1"
},
- "time": "2023-10-30T14:35:06+00:00"
+ "time": "2024-09-20T14:04:44+00:00"
},
{
"name": "slevomat/coding-standard",
- "version": "8.14.1",
+ "version": "8.15.0",
"source": {
"type": "git",
"url": "https://github.com/slevomat/coding-standard.git",
- "reference": "fea1fd6f137cc84f9cba0ae30d549615dbc6a926"
+ "reference": "7d1d957421618a3803b593ec31ace470177d7817"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/fea1fd6f137cc84f9cba0ae30d549615dbc6a926",
- "reference": "fea1fd6f137cc84f9cba0ae30d549615dbc6a926",
+ "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/7d1d957421618a3803b593ec31ace470177d7817",
+ "reference": "7d1d957421618a3803b593ec31ace470177d7817",
"shasum": ""
},
"require": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0",
"php": "^7.2 || ^8.0",
"phpstan/phpdoc-parser": "^1.23.1",
- "squizlabs/php_codesniffer": "^3.7.1"
+ "squizlabs/php_codesniffer": "^3.9.0"
},
"require-dev": {
"phing/phing": "2.17.4",
"php-parallel-lint/php-parallel-lint": "1.3.2",
- "phpstan/phpstan": "1.10.37",
+ "phpstan/phpstan": "1.10.60",
"phpstan/phpstan-deprecation-rules": "1.1.4",
- "phpstan/phpstan-phpunit": "1.3.14",
- "phpstan/phpstan-strict-rules": "1.5.1",
- "phpunit/phpunit": "8.5.21|9.6.8|10.3.5"
+ "phpstan/phpstan-phpunit": "1.3.16",
+ "phpstan/phpstan-strict-rules": "1.5.2",
+ "phpunit/phpunit": "8.5.21|9.6.8|10.5.11"
},
"type": "phpcodesniffer-standard",
"extra": {
@@ -2888,7 +2960,7 @@
],
"support": {
"issues": "https://github.com/slevomat/coding-standard/issues",
- "source": "https://github.com/slevomat/coding-standard/tree/8.14.1"
+ "source": "https://github.com/slevomat/coding-standard/tree/8.15.0"
},
"funding": [
{
@@ -2900,20 +2972,20 @@
"type": "tidelift"
}
],
- "time": "2023-10-08T07:28:08+00:00"
+ "time": "2024-03-09T15:20:58+00:00"
},
{
"name": "squizlabs/php_codesniffer",
- "version": "3.9.0",
+ "version": "3.10.3",
"source": {
"type": "git",
"url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
- "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b"
+ "reference": "62d32998e820bddc40f99f8251958aed187a5c9c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
- "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
+ "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/62d32998e820bddc40f99f8251958aed187a5c9c",
+ "reference": "62d32998e820bddc40f99f8251958aed187a5c9c",
"shasum": ""
},
"require": {
@@ -2980,20 +3052,20 @@
"type": "open_collective"
}
],
- "time": "2024-02-16T15:06:51+00:00"
+ "time": "2024-09-18T10:38:58+00:00"
},
{
"name": "symfony/filesystem",
- "version": "v7.0.3",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "2890e3a825bc0c0558526c04499c13f83e1b6b12"
+ "reference": "c835867b3c62bb05c7fe3d637c871c7ae52024d4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/2890e3a825bc0c0558526c04499c13f83e1b6b12",
- "reference": "2890e3a825bc0c0558526c04499c13f83e1b6b12",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/c835867b3c62bb05c7fe3d637c871c7ae52024d4",
+ "reference": "c835867b3c62bb05c7fe3d637c871c7ae52024d4",
"shasum": ""
},
"require": {
@@ -3001,6 +3073,9 @@
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-mbstring": "~1.8"
},
+ "require-dev": {
+ "symfony/process": "^6.4|^7.0"
+ },
"type": "library",
"autoload": {
"psr-4": {
@@ -3027,7 +3102,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/filesystem/tree/v7.0.3"
+ "source": "https://github.com/symfony/filesystem/tree/v7.1.6"
},
"funding": [
{
@@ -3043,16 +3118,16 @@
"type": "tidelift"
}
],
- "time": "2024-01-23T15:02:46+00:00"
+ "time": "2024-10-25T15:11:02+00:00"
}
],
"aliases": [],
"minimum-stability": "stable",
- "stability-flags": [],
+ "stability-flags": {},
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
- "php": "~8.2.0 || ~8.3.0",
+ "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
"ext-dom": "*",
"ext-pcre": "*",
"ext-reflection": "*",
diff --git a/pkgs/by-name/pa/paratest/package.nix b/pkgs/by-name/pa/paratest/package.nix
index 855db7c079d6..c4eca0346a71 100644
--- a/pkgs/by-name/pa/paratest/package.nix
+++ b/pkgs/by-name/pa/paratest/package.nix
@@ -3,19 +3,19 @@
, lib
}:
-(php.withExtensions ({ enabled, all }: enabled ++ [ all.pcov ])).buildComposerProject (finalAttrs: {
+(php.withExtensions ({ enabled, all }: enabled ++ [ all.pcov ])).buildComposerProject2 (finalAttrs: {
pname = "paratest";
- version = "7.4.3";
+ version = "7.6.0";
src = fetchFromGitHub {
owner = "paratestphp";
repo = "paratest";
rev = "v${finalAttrs.version}";
- hash = "sha256-Shf/fsGhDmupFn/qERzXGg3ko7mBgUqYzafO/VPqmoU=";
+ hash = "sha256-p7m/MDHy+NOh+MnoIWy74Ipm/5hevp4x6Qwn4uPIEAM=";
};
composerLock = ./composer.lock;
- vendorHash = "sha256-9KFh6Vwzt17v6WlEutRpwCauLOcj05hR4JGDcPbYL1U=";
+ vendorHash = "sha256-NQWwfSYgvAmvWnr563vAKh+IdFRDB/CJZReDUzftOvw=";
meta = {
changelog = "https://github.com/paratestphp/paratest/releases/tag/v${finalAttrs.version}";
diff --git a/pkgs/by-name/pa/parpd/package.nix b/pkgs/by-name/pa/parpd/package.nix
new file mode 100644
index 000000000000..777c5e72fe6d
--- /dev/null
+++ b/pkgs/by-name/pa/parpd/package.nix
@@ -0,0 +1,30 @@
+{
+ stdenv,
+ lib,
+ fetchFromGitHub,
+ nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "parpd";
+ version = "2.3.0";
+
+ src = fetchFromGitHub {
+ owner = "NetworkConfiguration";
+ repo = "parpd";
+ rev = "refs/tags/v${finalAttrs.version}";
+ hash = "sha256-6qmoAW9jm7xMRHZUMQLpe0N+UeVnQP8dC4+Iq+d5Eaw=";
+ };
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ homepage = "https://roy.marples.name/projects/parpd";
+ changelog = "https://github.com/NetworkConfiguration/parpd/releases/tag/v${finalAttrs.version}";
+ description = "Proxy ARP Daemon that complies with RFC 1027";
+ maintainers = with lib.maintainers; [ bot-wxt1221 ];
+ platforms = lib.platforms.linux;
+ license = lib.licenses.bsd2;
+ mainProgram = "parpd";
+ };
+})
diff --git a/pkgs/applications/radio/pat/default.nix b/pkgs/by-name/pa/pat/package.nix
similarity index 53%
rename from pkgs/applications/radio/pat/default.nix
rename to pkgs/by-name/pa/pat/package.nix
index 1f1140e5fd4b..0352ef2c6cd9 100644
--- a/pkgs/applications/radio/pat/default.nix
+++ b/pkgs/by-name/pa/pat/package.nix
@@ -1,30 +1,42 @@
-{ lib
-, stdenv
-, buildGoModule
-, fetchFromGitHub
-, libax25
-, installShellFiles
+{
+ lib,
+ stdenv,
+ buildGoModule,
+ fetchFromGitHub,
+ libax25,
+ installShellFiles,
+ fetchpatch,
}:
buildGoModule rec {
pname = "pat";
- version = "0.15.1";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "la5nta";
repo = "pat";
rev = "v${version}";
- hash = "sha256-wNWqqGc4mf3z0ejMpU+jWhqCbjNJ2b6+pbBjDYKwKK8=";
+ hash = "sha256-JlqYdsAXs3pS5i59tiel+gxQsTrn5mUs0qLzjHxGZU0=";
};
- vendorHash = "sha256-m5yb6+TfRApw0ZROx9ZA3RPiKV+1DHo/73CNQpIfMlU=";
-
- ldflags = [ "-s" "-w" ];
-
- nativeBuildInputs = [
- installShellFiles
+ # Remove upon next release since upstream is fixed
+ # https://github.com/la5nta/pat/pull/449
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/la5nta/pat/commit/5604eac8853216d96d49d7d9947bdc514e195538.patch";
+ sha256 = "sha256-Z9uoZLlhdCslULUxGkc4ao4ptC4ImWzSrfabSA5S/PE=";
+ })
];
+ vendorHash = "sha256-Z6p0wiOY5l++nch64BJWGXleBgUNecTDm+yVCnmXvtU=";
+
+ ldflags = [
+ "-s"
+ "-w"
+ ];
+
+ nativeBuildInputs = [ installShellFiles ];
+
buildInputs = lib.optional stdenv.hostPlatform.isLinux [ libax25 ];
# Needed by wl2k-go go module for libax25 to include support for Linux' AX.25 stack by linking against libax25.
@@ -39,7 +51,10 @@ buildGoModule rec {
description = "Pat is a cross platform Winlink client written in Go";
homepage = "https://getpat.io/";
license = licenses.mit;
- maintainers = with maintainers; [ dotemup sarcasticadmin ];
+ maintainers = with maintainers; [
+ dotemup
+ sarcasticadmin
+ ];
platforms = platforms.unix;
mainProgram = "pat";
};
diff --git a/pkgs/by-name/pc/pcsx2-bin/package.nix b/pkgs/by-name/pc/pcsx2-bin/package.nix
index 335cf8353f08..71b64e23672f 100644
--- a/pkgs/by-name/pc/pcsx2-bin/package.nix
+++ b/pkgs/by-name/pc/pcsx2-bin/package.nix
@@ -7,11 +7,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "pcsx2-bin";
- version = "2.1.205";
+ version = "2.1.231";
src = fetchurl {
url = "https://github.com/PCSX2/pcsx2/releases/download/v${finalAttrs.version}/pcsx2-v${finalAttrs.version}-macos-Qt.tar.xz";
- hash = "sha256-m5OSxAUBJhokNd7AamQJmkKSMYd1JRidHVYLHpyb0IQ=";
+ hash = "sha256-c1Tvti8NatGct0OAwcWdFNBQhv6Zwiy2ECJ2qyCs9qA=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/pd/pdfarranger/package.nix b/pkgs/by-name/pd/pdfarranger/package.nix
index 8050e5af6755..ed832c2be816 100644
--- a/pkgs/by-name/pd/pdfarranger/package.nix
+++ b/pkgs/by-name/pd/pdfarranger/package.nix
@@ -6,6 +6,8 @@
gtk3,
poppler_gi,
libhandy,
+ gettext,
+ stdenv,
}:
python3Packages.buildPythonApplication rec {
@@ -20,7 +22,15 @@ python3Packages.buildPythonApplication rec {
hash = "sha256-94qziqJaKW8/L/6+U1yojxdG8BmeAStn+qbfGemTrVA=";
};
- nativeBuildInputs = [ wrapGAppsHook3 ];
+ nativeBuildInputs = [ wrapGAppsHook3 ] ++ lib.optionals stdenv.isDarwin [ gettext ];
+
+ postPatch = lib.optionalString stdenv.isDarwin ''
+ LINTL="${lib.getLib gettext}/lib/libintl.8.dylib"
+ substituteInPlace pdfarranger/pdfarranger.py --replace-fail \
+ "return 'libintl.8.dylib'" \
+ "return '$LINTL'"
+ unset LINTL
+ '';
build-system = with python3Packages; [ setuptools ];
@@ -49,8 +59,10 @@ python3Packages.buildPythonApplication rec {
inherit (src.meta) homepage;
description = "Merge or split pdf documents and rotate, crop and rearrange their pages using a graphical interface";
mainProgram = "pdfarranger";
- platforms = lib.platforms.linux;
- maintainers = with lib.maintainers; [ symphorien ];
+ maintainers = with lib.maintainers; [
+ symphorien
+ endle
+ ];
license = lib.licenses.gpl3Plus;
changelog = "https://github.com/pdfarranger/pdfarranger/releases/tag/${version}";
};
diff --git a/pkgs/by-name/pd/pdk/Gemfile b/pkgs/by-name/pd/pdk/Gemfile
index 1e165ac0c6c1..7a7c9e0ec7f4 100644
--- a/pkgs/by-name/pd/pdk/Gemfile
+++ b/pkgs/by-name/pd/pdk/Gemfile
@@ -1,2 +1,2 @@
source 'https://rubygems.org'
-gem 'pdk', '3.2.0'
+gem 'pdk', '3.3.0'
diff --git a/pkgs/by-name/pd/pdk/Gemfile.lock b/pkgs/by-name/pd/pdk/Gemfile.lock
index cd5c071a641b..c34293761fb2 100644
--- a/pkgs/by-name/pd/pdk/Gemfile.lock
+++ b/pkgs/by-name/pd/pdk/Gemfile.lock
@@ -1,24 +1,26 @@
GEM
remote: https://rubygems.org/
specs:
- addressable (2.8.6)
- public_suffix (>= 2.0.2, < 6.0)
- childprocess (4.1.0)
- cri (2.15.11)
+ addressable (2.8.7)
+ public_suffix (>= 2.0.2, < 7.0)
+ childprocess (5.1.0)
+ logger (~> 1.5)
+ cri (2.15.12)
deep_merge (1.2.2)
diff-lcs (1.5.1)
ffi (1.17.0)
hitimes (2.0.0)
- json-schema (4.3.0)
+ json-schema (4.3.1)
addressable (>= 2.8)
json_pure (2.6.3)
- minitar (0.9)
+ logger (1.6.1)
+ minitar (0.12.1)
pastel (0.8.0)
tty-color (~> 0.5)
pathspec (1.1.3)
- pdk (3.2.0)
+ pdk (3.3.0)
bundler (>= 2.1.0, < 3.0.0)
- childprocess (~> 4.1.0)
+ childprocess (~> 5.0)
cri (~> 2.15.11)
deep_merge (~> 1.2.2)
diff-lcs (>= 1.5.0)
@@ -28,10 +30,14 @@ GEM
json_pure (~> 2.6.3)
minitar (~> 0.8)
pathspec (~> 1.1)
+ puppet-modulebuilder (~> 1.0)
tty-prompt (~> 0.23)
tty-spinner (~> 0.9)
tty-which (~> 0.5)
- public_suffix (5.0.5)
+ public_suffix (6.0.1)
+ puppet-modulebuilder (1.1.0)
+ minitar (~> 0.9)
+ pathspec (>= 0.2.1, < 3.0.0)
tty-color (0.6.0)
tty-cursor (0.7.1)
tty-prompt (0.23.1)
@@ -51,7 +57,7 @@ PLATFORMS
ruby
DEPENDENCIES
- pdk (= 3.2.0)
+ pdk (= 3.3.0)
BUNDLED WITH
- 2.5.9
+ 2.5.16
diff --git a/pkgs/by-name/pd/pdk/gemset.nix b/pkgs/by-name/pd/pdk/gemset.nix
index 28f276022d0e..77f06054e403 100644
--- a/pkgs/by-name/pd/pdk/gemset.nix
+++ b/pkgs/by-name/pd/pdk/gemset.nix
@@ -5,30 +5,31 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr";
+ sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
type = "gem";
};
- version = "2.8.6";
+ version = "2.8.7";
};
childprocess = {
+ dependencies = ["logger"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1lvcp8bsd35g57f7wz4jigcw2sryzzwrpcgjwwf3chmjrjcww5in";
+ sha256 = "1v5nalaarxnfdm6rxb7q6fmc6nx097jd630ax6h9ch7xw95li3cs";
type = "gem";
};
- version = "4.1.0";
+ version = "5.1.0";
};
cri = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bhsgnjav94mz5vf3305gxz1g34gm9kxvnrn1dkz530r8bpj0hr5";
+ sha256 = "1rank6i9p2drwdcmhan6ifkzrz1v3mwpx47fwjl75rskxwjfkgwa";
type = "gem";
};
- version = "2.15.11";
+ version = "2.15.12";
};
deep_merge = {
groups = ["default"];
@@ -76,10 +77,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ljqbpjc5aa8a2cgq8f64iwbx7rr9dqvpk7v8n5jpslyz6mvyddc";
+ sha256 = "09bq393nrxa7hmphc3li8idgxdnb5hwgj15d0q5qsh4l5g1qvrnm";
type = "gem";
};
- version = "4.3.0";
+ version = "4.3.1";
};
json_pure = {
groups = ["default"];
@@ -91,15 +92,25 @@
};
version = "2.6.3";
};
+ logger = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
+ type = "gem";
+ };
+ version = "1.6.1";
+ };
minitar = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "126mq86x67d1p63acrfka4zx0cx2r0vc93884jggxnrmmnzbxh13";
+ sha256 = "0f307mpj4j0gp7iq77xj4p149f4krcvbll9rismng3jcijpbn79s";
type = "gem";
};
- version = "0.9";
+ version = "0.12.1";
};
pastel = {
dependencies = ["tty-color"];
@@ -123,25 +134,36 @@
version = "1.1.3";
};
pdk = {
- dependencies = ["childprocess" "cri" "deep_merge" "diff-lcs" "ffi" "hitimes" "json-schema" "json_pure" "minitar" "pathspec" "tty-prompt" "tty-spinner" "tty-which"];
+ dependencies = ["childprocess" "cri" "deep_merge" "diff-lcs" "ffi" "hitimes" "json-schema" "json_pure" "minitar" "pathspec" "puppet-modulebuilder" "tty-prompt" "tty-spinner" "tty-which"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1avc2dgcdi9l6xam9crka790jhpx04536387f1vq2p9yqpr5lw7h";
+ sha256 = "1gildcnii3ayw585as8d8bqhnfb9diqg7n3vmgaz8c5b9wb8c106";
type = "gem";
};
- version = "3.2.0";
+ version = "3.3.0";
};
public_suffix = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "14y4vzjwf5gp0mqgs880kis0k7n2biq8i6ci6q2n315kichl1hvj";
+ sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
type = "gem";
};
- version = "5.0.5";
+ version = "6.0.1";
+ };
+ puppet-modulebuilder = {
+ dependencies = ["minitar" "pathspec"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0rh31hq24nkddd83cx7n9ln5bsib3a052hrmn120sq0937337173";
+ type = "gem";
+ };
+ version = "1.1.0";
};
tty-color = {
groups = ["default"];
diff --git a/pkgs/by-name/pi/pixi/Cargo.lock b/pkgs/by-name/pi/pixi/Cargo.lock
index 13031bdfe9d4..a67d68e188cf 100644
--- a/pkgs/by-name/pi/pixi/Cargo.lock
+++ b/pkgs/by-name/pi/pixi/Cargo.lock
@@ -4,18 +4,18 @@ version = 3
[[package]]
name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
dependencies = [
"gimli",
]
[[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
[[package]]
name = "aes"
@@ -139,9 +139,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.86"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
[[package]]
name = "arbitrary"
@@ -198,9 +198,9 @@ dependencies = [
[[package]]
name = "async-compression"
-version = "0.4.12"
+version = "0.4.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa"
+checksum = "e26a9844c659a2a293d239c7910b752f8487fe122c6c8bd1659bf85a6507c302"
dependencies = [
"bzip2",
"flate2",
@@ -216,13 +216,13 @@ dependencies = [
[[package]]
name = "async-executor"
-version = "1.13.0"
+version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
+checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
dependencies = [
"async-task",
"concurrent-queue",
- "fastrand 2.1.0",
+ "fastrand 2.1.1",
"futures-lite",
"slab",
]
@@ -255,9 +255,9 @@ dependencies = [
[[package]]
name = "async-io"
-version = "2.3.3"
+version = "2.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
+checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8"
dependencies = [
"async-lock",
"cfg-if",
@@ -269,7 +269,7 @@ dependencies = [
"rustix",
"slab",
"tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -317,7 +317,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -346,13 +346,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
[[package]]
name = "async-trait"
-version = "0.1.82"
+version = "0.1.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -365,8 +365,8 @@ dependencies = [
"futures",
"http-content-range",
"itertools 0.12.1",
- "memmap2 0.9.4",
- "reqwest 0.12.5",
+ "memmap2 0.9.5",
+ "reqwest 0.12.8",
"reqwest-middleware",
"thiserror",
"tokio",
@@ -397,9 +397,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
[[package]]
name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "backoff"
@@ -417,17 +417,17 @@ dependencies = [
[[package]]
name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
dependencies = [
"addr2line",
- "cc",
"cfg-if",
"libc",
"miniz_oxide",
"object",
"rustc-demangle",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -590,9 +590,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
-version = "1.7.1"
+version = "1.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
[[package]]
name = "bzip2"
@@ -701,12 +701,13 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.1.7"
+version = "1.1.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"
+checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945"
dependencies = [
"jobserver",
"libc",
+ "shlex",
]
[[package]]
@@ -758,9 +759,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.5.13"
+version = "4.5.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
dependencies = [
"clap_builder",
"clap_derive",
@@ -778,15 +779,15 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.13"
+version = "4.5.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
dependencies = [
"anstream",
"anstyle",
"clap_lex",
"strsim",
- "terminal_size",
+ "terminal_size 0.4.0",
]
[[package]]
@@ -810,14 +811,14 @@ dependencies = [
[[package]]
name = "clap_derive"
-version = "4.5.13"
+version = "4.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -878,9 +879,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
[[package]]
name = "cpufeatures"
-version = "0.2.12"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
dependencies = [
"libc",
]
@@ -980,7 +981,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -991,14 +992,14 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [
"darling_core",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
name = "dashmap"
-version = "6.0.1"
+version = "6.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28"
+checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
dependencies = [
"cfg-if",
"crossbeam-utils",
@@ -1027,9 +1028,9 @@ dependencies = [
[[package]]
name = "dbus-secret-service"
-version = "4.0.2"
+version = "4.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1caa0c241c01ad8d99a78d553567d38f873dd3ac16eca33a5370d650ab25584e"
+checksum = "b42a16374481d92aed73ae45b1f120207d8e71d24fb89f357fadbd8f946fd84b"
dependencies = [
"aes",
"block-padding",
@@ -1089,9 +1090,15 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
+[[package]]
+name = "deunicode"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00"
+
[[package]]
name = "dialoguer"
version = "0.11.0"
@@ -1154,7 +1161,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -1264,7 +1271,7 @@ dependencies = [
"heck 0.4.1",
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -1276,7 +1283,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -1297,7 +1304,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -1358,6 +1365,16 @@ dependencies = [
"pin-project-lite",
]
+[[package]]
+name = "fake"
+version = "2.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c25829bde82205da46e1823b2259db6273379f626fc211f126f65654a2669be"
+dependencies = [
+ "deunicode",
+ "rand",
+]
+
[[package]]
name = "fancy_display"
version = "0.1.0"
@@ -1376,9 +1393,9 @@ dependencies = [
[[package]]
name = "fastrand"
-version = "2.1.0"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
[[package]]
name = "fd-lock"
@@ -1393,9 +1410,9 @@ dependencies = [
[[package]]
name = "file_url"
-version = "0.1.5"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31b8d0fe7b11e53d71e1484766a00187bc239910dcacb5bf8909f1f3ffd9b4aa"
+checksum = "e581e35fcfcf40b1767a88e44e3e1ef27faa11fc7383287d47bd3efef1cfe199"
dependencies = [
"itertools 0.13.0",
"percent-encoding",
@@ -1406,14 +1423,14 @@ dependencies = [
[[package]]
name = "filetime"
-version = "0.2.23"
+version = "0.2.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall 0.4.1",
- "windows-sys 0.52.0",
+ "libredox",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -1424,9 +1441,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
[[package]]
name = "flate2"
-version = "1.0.31"
+version = "1.0.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920"
+checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
dependencies = [
"crc32fast",
"miniz_oxide",
@@ -1535,9 +1552,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
[[package]]
name = "futures"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
dependencies = [
"futures-channel",
"futures-core",
@@ -1550,9 +1567,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
dependencies = [
"futures-core",
"futures-sink",
@@ -1560,15 +1577,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
[[package]]
name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
dependencies = [
"futures-core",
"futures-task",
@@ -1577,9 +1594,9 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
[[package]]
name = "futures-lite"
@@ -1587,7 +1604,7 @@ version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
dependencies = [
- "fastrand 2.1.0",
+ "fastrand 2.1.1",
"futures-core",
"futures-io",
"parking",
@@ -1596,26 +1613,26 @@ dependencies = [
[[package]]
name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
[[package]]
name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
[[package]]
name = "futures-timer"
@@ -1625,9 +1642,9 @@ checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
[[package]]
name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
dependencies = [
"futures-channel",
"futures-core",
@@ -1676,9 +1693,9 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
[[package]]
name = "glob"
@@ -1695,8 +1712,8 @@ dependencies = [
"aho-corasick",
"bstr",
"log",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.8",
+ "regex-syntax 0.8.5",
]
[[package]]
@@ -1764,7 +1781,7 @@ dependencies = [
"futures-sink",
"futures-util",
"http 0.2.12",
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
"slab",
"tokio",
"tokio-util",
@@ -1773,9 +1790,9 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.4.5"
+version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
+checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
dependencies = [
"atomic-waker",
"bytes",
@@ -1783,7 +1800,7 @@ dependencies = [
"futures-core",
"futures-sink",
"http 1.1.0",
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
"slab",
"tokio",
"tokio-util",
@@ -1819,6 +1836,12 @@ dependencies = [
"allocator-api2",
]
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
[[package]]
name = "heck"
version = "0.4.1"
@@ -1971,7 +1994,7 @@ dependencies = [
"http 1.1.0",
"http-cache",
"http-cache-semantics",
- "reqwest 0.12.5",
+ "reqwest 0.12.8",
"reqwest-middleware",
"serde",
"url",
@@ -1985,7 +2008,7 @@ checksum = "92baf25cf0b8c9246baecf3a444546360a97b569168fdf92563ee6a47829920c"
dependencies = [
"http 1.1.0",
"http-serde",
- "reqwest 0.12.5",
+ "reqwest 0.12.8",
"serde",
"time",
]
@@ -2008,9 +2031,9 @@ dependencies = [
[[package]]
name = "httparse"
-version = "1.9.4"
+version = "1.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
[[package]]
name = "httpdate"
@@ -2041,9 +2064,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "hyper"
-version = "0.14.30"
+version = "0.14.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
+checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85"
dependencies = [
"bytes",
"futures-channel",
@@ -2065,14 +2088,14 @@ dependencies = [
[[package]]
name = "hyper"
-version = "1.4.1"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a"
dependencies = [
"bytes",
"futures-channel",
"futures-util",
- "h2 0.4.5",
+ "h2 0.4.6",
"http 1.1.0",
"http-body 1.0.1",
"httparse",
@@ -2091,7 +2114,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
dependencies = [
"futures-util",
"http 0.2.12",
- "hyper 0.14.30",
+ "hyper 0.14.31",
"rustls 0.21.12",
"tokio",
"tokio-rustls 0.24.1",
@@ -2099,21 +2122,21 @@ dependencies = [
[[package]]
name = "hyper-rustls"
-version = "0.27.2"
+version = "0.27.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
dependencies = [
"futures-util",
"http 1.1.0",
- "hyper 1.4.1",
+ "hyper 1.5.0",
"hyper-util",
- "rustls 0.23.12",
+ "rustls 0.23.14",
"rustls-native-certs",
"rustls-pki-types",
"tokio",
"tokio-rustls 0.26.0",
"tower-service",
- "webpki-roots 0.26.3",
+ "webpki-roots 0.26.5",
]
[[package]]
@@ -2123,7 +2146,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
dependencies = [
"bytes",
- "hyper 0.14.30",
+ "hyper 0.14.31",
"native-tls",
"tokio",
"tokio-native-tls",
@@ -2137,7 +2160,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
dependencies = [
"bytes",
"http-body-util",
- "hyper 1.4.1",
+ "hyper 1.5.0",
"hyper-util",
"native-tls",
"tokio",
@@ -2147,29 +2170,28 @@ dependencies = [
[[package]]
name = "hyper-util"
-version = "0.1.6"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956"
+checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
dependencies = [
"bytes",
"futures-channel",
"futures-util",
"http 1.1.0",
"http-body 1.0.1",
- "hyper 1.4.1",
+ "hyper 1.5.0",
"pin-project-lite",
"socket2",
"tokio",
- "tower",
"tower-service",
"tracing",
]
[[package]]
name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
dependencies = [
"android_system_properties",
"core-foundation-sys",
@@ -2214,7 +2236,7 @@ dependencies = [
"globset",
"log",
"memchr",
- "regex-automata 0.4.7",
+ "regex-automata 0.4.8",
"same-file",
"walkdir",
"winapi-util",
@@ -2233,12 +2255,12 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "2.3.0"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
dependencies = [
"equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.0",
"serde",
]
@@ -2333,9 +2355,9 @@ dependencies = [
[[package]]
name = "ipnet"
-version = "2.9.0"
+version = "2.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
[[package]]
name = "is_ci"
@@ -2476,9 +2498,9 @@ dependencies = [
[[package]]
name = "keyring"
-version = "3.2.0"
+version = "3.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73b9af47ded4df3067484d7d45758ca2b36bd083bf6d024c2952bbd8af1cdaa4"
+checksum = "030a9b84bb2a2f3673d4c8b8236091ed5d8f6b66a56d8085471d8abd5f3c6a80"
dependencies = [
"byteorder",
"dbus-secret-service",
@@ -2490,9 +2512,9 @@ dependencies = [
[[package]]
name = "lazy-regex"
-version = "3.2.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "576c8060ecfdf2e56995cf3274b4f2d71fa5e4fa3607c1c0b63c10180ee58741"
+checksum = "8d8e41c97e6bc7ecb552016274b99fbb5d035e8de288c582d9b933af6677bfda"
dependencies = [
"lazy-regex-proc_macros",
"once_cell",
@@ -2501,14 +2523,14 @@ dependencies = [
[[package]]
name = "lazy-regex-proc_macros"
-version = "3.2.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9efb9e65d4503df81c615dc33ff07042a9408ac7f26b45abee25566f7fbfd12c"
+checksum = "76e1d8b05d672c53cb9c7b920bbba8783845ae4f0b076e02a3db1d02c81b4163"
dependencies = [
"proc-macro2",
"quote",
"regex",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -2519,9 +2541,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "libc"
-version = "0.2.155"
+version = "0.2.159"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
[[package]]
name = "libdbus-sys"
@@ -2556,6 +2578,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
dependencies = [
"bitflags 2.6.0",
"libc",
+ "redox_syscall 0.5.3",
]
[[package]]
@@ -2650,9 +2673,9 @@ dependencies = [
[[package]]
name = "memmap2"
-version = "0.9.4"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
dependencies = [
"libc",
]
@@ -2692,7 +2715,7 @@ dependencies = [
"supports-color",
"supports-hyperlinks",
"supports-unicode",
- "terminal_size",
+ "terminal_size 0.3.0",
"textwrap",
"thiserror",
"unicode-width",
@@ -2706,7 +2729,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -2717,7 +2740,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -2743,18 +2766,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
dependencies = [
- "adler",
+ "adler2",
]
[[package]]
name = "mio"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
dependencies = [
"hermit-abi 0.3.9",
"libc",
@@ -2948,9 +2971,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
[[package]]
name = "object"
-version = "0.36.2"
+version = "0.36.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
dependencies = [
"memchr",
]
@@ -2967,15 +2990,15 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
[[package]]
name = "openssl"
-version = "0.10.66"
+version = "0.10.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
+checksum = "7b8cefcf97f41316955f9294cd61f639bdcfa9f2f230faac6cb896aa8ab64704"
dependencies = [
"bitflags 2.6.0",
"cfg-if",
@@ -2994,7 +3017,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -3005,9 +3028,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-sys"
-version = "0.9.103"
+version = "0.9.104"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
dependencies = [
"cc",
"libc",
@@ -3063,7 +3086,7 @@ dependencies = [
"proc-macro2",
"proc-macro2-diagnostics",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -3074,15 +3097,15 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "owo-colors"
-version = "4.0.0"
+version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f"
+checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56"
[[package]]
name = "parking"
-version = "2.2.0"
+version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
[[package]]
name = "parking_lot"
@@ -3186,7 +3209,7 @@ version = "0.6.0"
source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e"
dependencies = [
"boxcar",
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
"itertools 0.13.0",
"pep440_rs",
"pubgrub",
@@ -3216,7 +3239,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
dependencies = [
"fixedbitset",
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
]
[[package]]
@@ -3249,7 +3272,7 @@ dependencies = [
"phf_shared",
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
"unicase",
]
@@ -3265,22 +3288,22 @@ dependencies = [
[[package]]
name = "pin-project"
-version = "1.1.5"
+version = "1.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -3297,18 +3320,18 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "piper"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
dependencies = [
"atomic-waker",
- "fastrand 2.1.0",
+ "fastrand 2.1.1",
"futures-io",
]
[[package]]
name = "pixi"
-version = "0.31.0"
+version = "0.34.0"
dependencies = [
"ahash 0.8.11",
"assert_matches",
@@ -3325,19 +3348,20 @@ dependencies = [
"csv",
"deno_task_shell",
"dialoguer",
- "dirs",
"distribution-filename",
"distribution-types",
"dunce",
+ "fake",
"fancy_display",
"flate2",
+ "fs-err",
"fs_extra",
"futures",
"http 1.1.0",
"human_bytes",
"humantime",
"ignore",
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
"indicatif",
"insta",
"install-wheel-rs",
@@ -3374,11 +3398,10 @@ dependencies = [
"rattler_solve",
"rattler_virtual_packages",
"regex",
- "reqwest 0.12.5",
+ "reqwest 0.12.8",
"reqwest-middleware",
"rlimit",
"rstest",
- "same-file",
"self-replace",
"serde",
"serde_json",
@@ -3392,7 +3415,7 @@ dependencies = [
"thiserror",
"tokio",
"tokio-util",
- "toml_edit 0.22.20",
+ "toml_edit",
"tracing",
"tracing-subscriber",
"url",
@@ -3431,7 +3454,7 @@ dependencies = [
"serde",
"serde_ignored",
"serde_json",
- "toml_edit 0.22.20",
+ "toml_edit",
"tracing",
"url",
]
@@ -3462,7 +3485,7 @@ dependencies = [
"dunce",
"fancy_display",
"glob",
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
"insta",
"itertools 0.13.0",
"miette 7.2.0",
@@ -3485,7 +3508,7 @@ dependencies = [
"strsim",
"tempfile",
"thiserror",
- "toml_edit 0.22.20",
+ "toml_edit",
"tracing",
"url",
]
@@ -3523,7 +3546,7 @@ dependencies = [
"serde_with",
"serde_yaml",
"thiserror",
- "toml_edit 0.22.20",
+ "toml_edit",
"typed-path",
"url",
]
@@ -3542,8 +3565,9 @@ dependencies = [
"pixi_consts",
"rattler_conda_types",
"rattler_networking",
- "reqwest 0.12.5",
+ "reqwest 0.12.8",
"reqwest-middleware",
+ "rstest",
"serde",
"serde_json",
"serde_yaml",
@@ -3576,9 +3600,9 @@ dependencies = [
[[package]]
name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
[[package]]
name = "plain"
@@ -3613,7 +3637,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"
dependencies = [
"base64 0.22.1",
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
"quick-xml",
"serde",
"time",
@@ -3621,9 +3645,9 @@ dependencies = [
[[package]]
name = "polling"
-version = "3.7.2"
+version = "3.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
+checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511"
dependencies = [
"cfg-if",
"concurrent-queue",
@@ -3631,14 +3655,14 @@ dependencies = [
"pin-project-lite",
"rustix",
"tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
name = "portable-atomic"
-version = "1.7.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
[[package]]
name = "powerfmt"
@@ -3663,23 +3687,23 @@ checksum = "70c501afe3a2e25c9bd219aa56ec1e04cdb3fcdd763055be268778c13fa82c1f"
dependencies = [
"autocfg",
"equivalent",
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
]
[[package]]
name = "proc-macro-crate"
-version = "3.1.0"
+version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
dependencies = [
- "toml_edit 0.21.1",
+ "toml_edit",
]
[[package]]
name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
dependencies = [
"unicode-ident",
]
@@ -3692,7 +3716,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
"version_check",
"yansi",
]
@@ -3722,7 +3746,7 @@ name = "pubgrub"
version = "0.2.1"
source = "git+https://github.com/astral-sh/pubgrub?rev=388685a8711092971930986644cfed152d1a1f6c#388685a8711092971930986644cfed152d1a1f6c"
dependencies = [
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
"log",
"priority-queue",
"rustc-hash",
@@ -3750,7 +3774,7 @@ version = "0.0.1"
source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e"
dependencies = [
"distribution-filename",
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
"itertools 0.13.0",
"jiff",
"mailparse",
@@ -3783,7 +3807,7 @@ dependencies = [
"pixi_consts",
"rattler_conda_types",
"rattler_digest",
- "reqwest 0.12.5",
+ "reqwest 0.12.8",
"reqwest-middleware",
"reqwest-retry 0.5.0",
"serde",
@@ -3810,7 +3834,7 @@ version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef7061023bcb58a0fc4a4bbe9819c13b0dca7c2abc14da14f5ecc1532ab3a36a"
dependencies = [
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
"pep440_rs",
"pep508_rs",
"serde",
@@ -3828,16 +3852,16 @@ dependencies = [
[[package]]
name = "quinn"
-version = "0.11.3"
+version = "0.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
+checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684"
dependencies = [
"bytes",
"pin-project-lite",
"quinn-proto",
"quinn-udp",
"rustc-hash",
- "rustls 0.23.12",
+ "rustls 0.23.14",
"socket2",
"thiserror",
"tokio",
@@ -3846,15 +3870,15 @@ dependencies = [
[[package]]
name = "quinn-proto"
-version = "0.11.6"
+version = "0.11.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd"
+checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6"
dependencies = [
"bytes",
"rand",
"ring",
"rustc-hash",
- "rustls 0.23.12",
+ "rustls 0.23.14",
"slab",
"thiserror",
"tinyvec",
@@ -3863,22 +3887,22 @@ dependencies = [
[[package]]
name = "quinn-udp"
-version = "0.5.4"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
+checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b"
dependencies = [
"libc",
"once_cell",
"socket2",
"tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
name = "quote"
-version = "1.0.36"
+version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2",
]
@@ -3927,9 +3951,9 @@ dependencies = [
[[package]]
name = "rattler"
-version = "0.27.14"
+version = "0.27.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85a8488d78fb6fa616eeaed34dd3e3ae28de3d41f5fd0f2a692b714546769f6d"
+checksum = "19b1afb401b5ae69ef0c20beabdf822c650cc6c387bd01369876a3cc05807b65"
dependencies = [
"anyhow",
"clap",
@@ -3939,11 +3963,11 @@ dependencies = [
"fs-err",
"futures",
"humantime",
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
"indicatif",
"itertools 0.13.0",
"memchr",
- "memmap2 0.9.4",
+ "memmap2 0.9.5",
"once_cell",
"parking_lot 0.12.3",
"rattler_cache",
@@ -3954,7 +3978,7 @@ dependencies = [
"rattler_shell",
"reflink-copy",
"regex",
- "reqwest 0.12.5",
+ "reqwest 0.12.8",
"reqwest-middleware",
"simple_spawn_blocking",
"smallvec",
@@ -3968,9 +3992,9 @@ dependencies = [
[[package]]
name = "rattler_cache"
-version = "0.2.5"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50307f280939786d161dc4a117032bb3aabd8fd1301f3fcaf63caa095638d990"
+checksum = "abdd55d83e6b1a573920b0b40b79fe11b4957abef45e2fac3144c323f48a2f60"
dependencies = [
"anyhow",
"dashmap",
@@ -3985,7 +4009,7 @@ dependencies = [
"rattler_digest",
"rattler_networking",
"rattler_package_streaming",
- "reqwest 0.12.5",
+ "reqwest 0.12.8",
"reqwest-middleware",
"simple_spawn_blocking",
"thiserror",
@@ -3996,9 +4020,9 @@ dependencies = [
[[package]]
name = "rattler_conda_types"
-version = "0.28.1"
+version = "0.28.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cd1f00e6500bd4252ebb414d1c83aad05e0ab4c177e577344011d38d49ef223"
+checksum = "ada4de35daa5b8ef2eecf18f51eaec355c52c5a6f9ca21b6413807b72cb90d0f"
dependencies = [
"chrono",
"dirs",
@@ -4006,7 +4030,7 @@ dependencies = [
"fxhash",
"glob",
"hex",
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
"itertools 0.13.0",
"lazy-regex",
"nom",
@@ -4049,14 +4073,14 @@ dependencies = [
[[package]]
name = "rattler_lock"
-version = "0.22.26"
+version = "0.22.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62ff07b4be849f3eeb334d36d0e3496f8e0fdf096d7ca2b2142b2cbe66e60515"
+checksum = "889a7a66861b54beec196fbcf72fc699e3696692cec02b8e429b6394257dd2c9"
dependencies = [
"chrono",
"file_url",
"fxhash",
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
"itertools 0.13.0",
"pep440_rs",
"pep508_rs",
@@ -4077,7 +4101,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0306a96eb7216c786fa6234fd26207bf3769cbb48b2373d682eabb36ff11c175"
dependencies = [
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -4098,7 +4122,7 @@ dependencies = [
"itertools 0.13.0",
"keyring",
"netrc-rs",
- "reqwest 0.12.5",
+ "reqwest 0.12.8",
"reqwest-middleware",
"retry-policies 0.4.0",
"serde",
@@ -4110,9 +4134,9 @@ dependencies = [
[[package]]
name = "rattler_package_streaming"
-version = "0.22.9"
+version = "0.22.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a3584bca0b2b7c67c61ae15c280f2202b6590e6afb201a83186432114dc53"
+checksum = "ac020482d1e8eac6aa1114bc87f2af426a8c719e56b7798afe331354a41d1e5e"
dependencies = [
"bzip2",
"chrono",
@@ -4122,7 +4146,7 @@ dependencies = [
"rattler_digest",
"rattler_networking",
"rattler_redaction",
- "reqwest 0.12.5",
+ "reqwest 0.12.8",
"reqwest-middleware",
"serde_json",
"tar",
@@ -4142,16 +4166,16 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a8b3a430398cc4ecd0350204087377bc31d977dfd897d3b6930f195f39c515b"
dependencies = [
- "reqwest 0.12.5",
+ "reqwest 0.12.8",
"reqwest-middleware",
"url",
]
[[package]]
name = "rattler_repodata_gateway"
-version = "0.21.16"
+version = "0.21.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89a4c1042b0ae79c38f13292fd27a6b8319dcb056928ac688eab67214a6fc125"
+checksum = "05726dde3ce7a7f46d67b9b41c6515af96219453043f0ba61359df40fbcff4db"
dependencies = [
"anyhow",
"async-compression",
@@ -4175,7 +4199,7 @@ dependencies = [
"json-patch",
"libc",
"md-5",
- "memmap2 0.9.4",
+ "memmap2 0.9.5",
"ouroboros",
"parking_lot 0.12.3",
"pin-project-lite",
@@ -4184,7 +4208,7 @@ dependencies = [
"rattler_digest",
"rattler_networking",
"rattler_redaction",
- "reqwest 0.12.5",
+ "reqwest 0.12.8",
"reqwest-middleware",
"rmp-serde",
"serde",
@@ -4204,12 +4228,12 @@ dependencies = [
[[package]]
name = "rattler_shell"
-version = "0.22.3"
+version = "0.22.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75a7d11ca9da7e3954764cb37b96dea0e07c59fbe2f35363083926618a192a2a"
+checksum = "1b9ab12a632b2a9641c4935d160ac181564a66ca56767780bf6ffa9814161dd5"
dependencies = [
"enum_dispatch",
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
"itertools 0.13.0",
"rattler_conda_types",
"serde_json",
@@ -4222,9 +4246,9 @@ dependencies = [
[[package]]
name = "rattler_solve"
-version = "1.0.10"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee39b9a5a7e3f1506392034bb39fb7bcac5a296c3ce411a57f285250d953258"
+checksum = "726c21f9119981b47fab512da5d94ddd139617a45ed2863aa709958badc26510"
dependencies = [
"chrono",
"futures",
@@ -4241,9 +4265,9 @@ dependencies = [
[[package]]
name = "rattler_virtual_packages"
-version = "1.1.6"
+version = "1.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5386d3d7d4e7894f4eeee35b0a3ef204f55993c6eeb7e3fc772ec4566df679f1"
+checksum = "7f6d62812b0b3050fb63ebb3368dd1b64eac3a4d6eb2509bae04d49200b036c5"
dependencies = [
"archspec",
"libloading",
@@ -4295,15 +4319,6 @@ dependencies = [
"bitflags 1.3.2",
]
-[[package]]
-name = "redox_syscall"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
-dependencies = [
- "bitflags 1.3.2",
-]
-
[[package]]
name = "redox_syscall"
version = "0.5.3"
@@ -4341,7 +4356,7 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -4357,14 +4372,14 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.10.6"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
dependencies = [
"aho-corasick",
"memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.8",
+ "regex-syntax 0.8.5",
]
[[package]]
@@ -4378,13 +4393,13 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
dependencies = [
"aho-corasick",
"memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
]
[[package]]
@@ -4395,9 +4410,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "relative-path"
@@ -4449,7 +4464,7 @@ dependencies = [
"h2 0.3.26",
"http 0.2.12",
"http-body 0.4.6",
- "hyper 0.14.30",
+ "hyper 0.14.31",
"hyper-rustls 0.24.2",
"hyper-tls 0.5.0",
"ipnet",
@@ -4466,7 +4481,7 @@ dependencies = [
"serde_json",
"serde_urlencoded",
"sync_wrapper 0.1.2",
- "system-configuration",
+ "system-configuration 0.5.1",
"tokio",
"tokio-native-tls",
"tokio-rustls 0.24.1",
@@ -4476,14 +4491,14 @@ dependencies = [
"wasm-bindgen-futures",
"web-sys",
"webpki-roots 0.25.4",
- "winreg 0.50.0",
+ "winreg",
]
[[package]]
name = "reqwest"
-version = "0.12.5"
+version = "0.12.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
+checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b"
dependencies = [
"async-compression",
"base64 0.22.1",
@@ -4491,12 +4506,12 @@ dependencies = [
"futures-channel",
"futures-core",
"futures-util",
- "h2 0.4.5",
+ "h2 0.4.6",
"http 1.1.0",
"http-body 1.0.1",
"http-body-util",
- "hyper 1.4.1",
- "hyper-rustls 0.27.2",
+ "hyper 1.5.0",
+ "hyper-rustls 0.27.3",
"hyper-tls 0.6.0",
"hyper-util",
"ipnet",
@@ -4508,15 +4523,15 @@ dependencies = [
"percent-encoding",
"pin-project-lite",
"quinn",
- "rustls 0.23.12",
+ "rustls 0.23.14",
"rustls-native-certs",
- "rustls-pemfile 2.1.3",
+ "rustls-pemfile 2.2.0",
"rustls-pki-types",
"serde",
"serde_json",
"serde_urlencoded",
"sync_wrapper 1.0.1",
- "system-configuration",
+ "system-configuration 0.6.1",
"tokio",
"tokio-native-tls",
"tokio-rustls 0.26.0",
@@ -4527,8 +4542,8 @@ dependencies = [
"wasm-bindgen-futures",
"wasm-streams",
"web-sys",
- "webpki-roots 0.26.3",
- "winreg 0.52.0",
+ "webpki-roots 0.26.5",
+ "windows-registry",
]
[[package]]
@@ -4539,7 +4554,7 @@ dependencies = [
"anyhow",
"async-trait",
"http 1.1.0",
- "reqwest 0.12.5",
+ "reqwest 0.12.8",
"serde",
"thiserror",
"tower-service",
@@ -4557,9 +4572,9 @@ dependencies = [
"futures",
"getrandom",
"http 1.1.0",
- "hyper 1.4.1",
+ "hyper 1.5.0",
"parking_lot 0.11.2",
- "reqwest 0.12.5",
+ "reqwest 0.12.8",
"reqwest-middleware",
"retry-policies 0.3.0",
"tokio",
@@ -4577,9 +4592,9 @@ dependencies = [
"futures",
"getrandom",
"http 1.1.0",
- "hyper 1.4.1",
+ "hyper 1.5.0",
"parking_lot 0.11.2",
- "reqwest 0.12.5",
+ "reqwest 0.12.8",
"reqwest-middleware",
"retry-policies 0.4.0",
"thiserror",
@@ -4590,16 +4605,16 @@ dependencies = [
[[package]]
name = "resolvo"
-version = "0.8.1"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d68c0ae687bbcd99ab33236c7cbccd2ba1c526a7f7a59743cb991074414c5293"
+checksum = "1621ce52e3ff36c8f55f0017f1e4909f59514af8f852ee943997760bf12c7c15"
dependencies = [
"ahash 0.8.11",
"bitvec",
"elsa",
"event-listener",
"futures",
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
"itertools 0.13.0",
"petgraph",
"tracing",
@@ -4725,7 +4740,7 @@ dependencies = [
"regex",
"relative-path",
"rustc_version",
- "syn 2.0.72",
+ "syn 2.0.79",
"unicode-ident",
]
@@ -4761,9 +4776,9 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.38.34"
+version = "0.38.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
dependencies = [
"bitflags 2.6.0",
"errno",
@@ -4786,26 +4801,26 @@ dependencies = [
[[package]]
name = "rustls"
-version = "0.23.12"
+version = "0.23.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8"
dependencies = [
"once_cell",
"ring",
"rustls-pki-types",
- "rustls-webpki 0.102.6",
+ "rustls-webpki 0.102.8",
"subtle",
"zeroize",
]
[[package]]
name = "rustls-native-certs"
-version = "0.7.1"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba"
+checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a"
dependencies = [
"openssl-probe",
- "rustls-pemfile 2.1.3",
+ "rustls-pemfile 2.2.0",
"rustls-pki-types",
"schannel",
"security-framework",
@@ -4822,19 +4837,18 @@ dependencies = [
[[package]]
name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
dependencies = [
- "base64 0.22.1",
"rustls-pki-types",
]
[[package]]
name = "rustls-pki-types"
-version = "1.7.0"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
[[package]]
name = "rustls-webpki"
@@ -4848,9 +4862,9 @@ dependencies = [
[[package]]
name = "rustls-webpki"
-version = "0.102.6"
+version = "0.102.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
dependencies = [
"ring",
"rustls-pki-types",
@@ -4859,9 +4873,9 @@ dependencies = [
[[package]]
name = "rustversion"
-version = "1.0.17"
+version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
[[package]]
name = "ryu"
@@ -4909,7 +4923,7 @@ dependencies = [
"proc-macro2",
"quote",
"serde_derive_internals",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -4935,7 +4949,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -5015,9 +5029,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
[[package]]
name = "serde"
-version = "1.0.204"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
dependencies = [
"serde_derive",
]
@@ -5035,13 +5049,13 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.204"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -5052,7 +5066,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -5066,11 +5080,11 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.122"
+version = "1.0.128"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
dependencies = [
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
"itoa",
"memchr",
"ryu",
@@ -5085,14 +5099,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
dependencies = [
"serde",
]
@@ -5111,15 +5125,15 @@ dependencies = [
[[package]]
name = "serde_with"
-version = "3.9.0"
+version = "3.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817"
dependencies = [
"base64 0.22.1",
"chrono",
"hex",
"indexmap 1.9.3",
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
"serde",
"serde_derive",
"serde_json",
@@ -5129,14 +5143,14 @@ dependencies = [
[[package]]
name = "serde_with_macros"
-version = "3.9.0"
+version = "3.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d"
dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -5145,7 +5159,7 @@ version = "0.9.34+deprecated"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
dependencies = [
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
"itoa",
"ryu",
"serde",
@@ -5239,9 +5253,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
[[package]]
name = "simd-json"
-version = "0.14.0"
+version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f0b376aada35f30a0012f5790e50aed62f91804a0682669aefdbe81c7fcb91"
+checksum = "bfa5500f67df6466a45c6f83d1aada89fe0f7e9b17afec424ea06feee0906549"
dependencies = [
"getrandom",
"halfbrown",
@@ -5254,9 +5268,9 @@ dependencies = [
[[package]]
name = "simdutf8"
-version = "0.1.4"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
[[package]]
name = "similar"
@@ -5405,7 +5419,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -5454,9 +5468,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.72"
+version = "2.0.79"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
dependencies = [
"proc-macro2",
"quote",
@@ -5474,6 +5488,9 @@ name = "sync_wrapper"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+dependencies = [
+ "futures-core",
+]
[[package]]
name = "sys-info"
@@ -5522,7 +5539,18 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
dependencies = [
"bitflags 1.3.2",
"core-foundation",
- "system-configuration-sys",
+ "system-configuration-sys 0.5.0",
+]
+
+[[package]]
+name = "system-configuration"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
+dependencies = [
+ "bitflags 2.6.0",
+ "core-foundation",
+ "system-configuration-sys 0.6.0",
]
[[package]]
@@ -5535,6 +5563,16 @@ dependencies = [
"libc",
]
+[[package]]
+name = "system-configuration-sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
[[package]]
name = "tabwriter"
version = "1.4.0"
@@ -5552,9 +5590,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
[[package]]
name = "tar"
-version = "0.4.41"
+version = "0.4.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909"
+checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020"
dependencies = [
"filetime",
"libc",
@@ -5569,15 +5607,15 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "tempfile"
-version = "3.11.0"
+version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
dependencies = [
"cfg-if",
- "fastrand 2.1.0",
+ "fastrand 2.1.1",
"once_cell",
"rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -5590,6 +5628,16 @@ dependencies = [
"windows-sys 0.48.0",
]
+[[package]]
+name = "terminal_size"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef"
+dependencies = [
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
[[package]]
name = "textwrap"
version = "0.16.1"
@@ -5603,22 +5651,22 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.63"
+version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -5684,9 +5732,9 @@ source = "git+https://github.com/charliermarsh/tl.git?rev=6e25b2ee2513d75385101a
[[package]]
name = "tokio"
-version = "1.39.2"
+version = "1.40.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
dependencies = [
"backtrace",
"bytes",
@@ -5708,7 +5756,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -5737,16 +5785,16 @@ version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
dependencies = [
- "rustls 0.23.12",
+ "rustls 0.23.14",
"rustls-pki-types",
"tokio",
]
[[package]]
name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
dependencies = [
"futures-core",
"pin-project-lite",
@@ -5771,9 +5819,9 @@ dependencies = [
[[package]]
name = "tokio-util"
-version = "0.7.11"
+version = "0.7.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
dependencies = [
"bytes",
"futures-core",
@@ -5792,7 +5840,7 @@ dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
- "toml_edit 0.22.20",
+ "toml_edit",
]
[[package]]
@@ -5806,54 +5854,22 @@ dependencies = [
[[package]]
name = "toml_edit"
-version = "0.21.1"
+version = "0.22.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
dependencies = [
- "indexmap 2.3.0",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
-dependencies = [
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
"serde",
"serde_spanned",
"toml_datetime",
- "winnow 0.6.18",
+ "winnow",
]
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tokio",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
-
[[package]]
name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
[[package]]
name = "tracing"
@@ -5874,7 +5890,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -5924,15 +5940,15 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]]
name = "typed-path"
-version = "0.9.1"
+version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04645b6c01cfb2ddabffc7c67ae6bfe7c3e28a5c37d729f6bb498e784f1fd70c"
+checksum = "82205ffd44a9697e34fc145491aa47310f9871540bb7909eaa9365e0a9a46607"
[[package]]
name = "typeid"
-version = "1.0.0"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf"
+checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
[[package]]
name = "typenum"
@@ -5962,15 +5978,15 @@ dependencies = [
[[package]]
name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
[[package]]
name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
[[package]]
name = "unicode-linebreak"
@@ -5980,18 +5996,18 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
[[package]]
name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
dependencies = [
"tinyvec",
]
[[package]]
name = "unicode-width"
-version = "0.1.13"
+version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
[[package]]
name = "unsafe-libyaml"
@@ -6043,9 +6059,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "uuid"
-version = "1.10.0"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
dependencies = [
"getrandom",
"rand",
@@ -6062,7 +6078,7 @@ dependencies = [
"futures",
"http 1.1.0",
"once-map",
- "reqwest 0.12.5",
+ "reqwest 0.12.8",
"reqwest-middleware",
"rust-netrc",
"rustc-hash",
@@ -6147,7 +6163,7 @@ dependencies = [
"pep508_rs",
"platform-tags",
"pypi-types",
- "reqwest 0.12.5",
+ "reqwest 0.12.8",
"reqwest-middleware",
"reqwest-retry 0.7.1",
"rkyv",
@@ -6233,7 +6249,7 @@ dependencies = [
"pep508_rs",
"platform-tags",
"pypi-types",
- "reqwest 0.12.5",
+ "reqwest 0.12.8",
"reqwest-middleware",
"rmp-serde",
"rustc-hash",
@@ -6270,7 +6286,7 @@ dependencies = [
"md-5",
"pypi-types",
"rayon",
- "reqwest 0.12.5",
+ "reqwest 0.12.8",
"rustc-hash",
"sha2",
"thiserror",
@@ -6313,7 +6329,7 @@ dependencies = [
"cargo-util",
"dashmap",
"fs-err",
- "reqwest 0.12.5",
+ "reqwest 0.12.8",
"reqwest-middleware",
"serde",
"thiserror",
@@ -6369,7 +6385,7 @@ source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb7
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
"textwrap",
]
@@ -6421,7 +6437,7 @@ dependencies = [
"platform-tags",
"pypi-types",
"regex",
- "reqwest 0.12.5",
+ "reqwest 0.12.8",
"reqwest-middleware",
"rmp-serde",
"rustix",
@@ -6459,7 +6475,7 @@ dependencies = [
"distribution-types",
"either",
"futures",
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
"install-wheel-rs",
"itertools 0.13.0",
"jiff",
@@ -6481,7 +6497,7 @@ dependencies = [
"tokio",
"tokio-stream",
"toml",
- "toml_edit 0.22.20",
+ "toml_edit",
"tracing",
"url",
"uv-client",
@@ -6577,7 +6593,7 @@ dependencies = [
"thiserror",
"tokio",
"toml",
- "toml_edit 0.22.20",
+ "toml_edit",
"tracing",
"url",
"uv-fs",
@@ -6664,7 +6680,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
"wasm-bindgen-shared",
]
@@ -6698,7 +6714,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -6755,9 +6771,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
[[package]]
name = "webpki-roots"
-version = "0.26.3"
+version = "0.26.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd"
+checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
dependencies = [
"rustls-pki-types",
]
@@ -6856,7 +6872,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -6867,7 +6883,18 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
+]
+
+[[package]]
+name = "windows-registry"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+dependencies = [
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -7039,18 +7066,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winnow"
-version = "0.5.40"
+version = "0.6.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winnow"
-version = "0.6.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
dependencies = [
"memchr",
]
@@ -7065,16 +7083,6 @@ dependencies = [
"windows-sys 0.48.0",
]
-[[package]]
-name = "winreg"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
[[package]]
name = "winsafe"
version = "0.0.19"
@@ -7109,12 +7117,12 @@ dependencies = [
[[package]]
name = "xdg-home"
-version = "1.2.0"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8"
+checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6"
dependencies = [
"libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -7185,7 +7193,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
"zvariant_utils",
]
@@ -7218,7 +7226,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
[[package]]
@@ -7250,7 +7258,7 @@ dependencies = [
"crossbeam-utils",
"displaydoc",
"flate2",
- "indexmap 2.3.0",
+ "indexmap 2.6.0",
"memchr",
"thiserror",
"time",
@@ -7321,7 +7329,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
"zvariant_utils",
]
@@ -7333,5 +7341,5 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.72",
+ "syn 2.0.79",
]
diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix
index 70651e508546..b82ae5bb76ab 100644
--- a/pkgs/by-name/pi/pixi/package.nix
+++ b/pkgs/by-name/pi/pixi/package.nix
@@ -13,13 +13,13 @@
rustPlatform.buildRustPackage rec {
pname = "pixi";
- version = "0.31.0";
+ version = "0.34.0";
src = fetchFromGitHub {
owner = "prefix-dev";
repo = "pixi";
rev = "v${version}";
- hash = "sha256-1Woi+HwlN1nP05/cMNj+FVqEVREy/+UivdWGD6lZSNY=";
+ hash = "sha256-pXJna0WuosQ21u+ImIc70OaG63xVODLaWFkuYqxUc/Y=";
};
cargoLock = {
diff --git a/pkgs/by-name/pl/plasmusic-toolbar/package.nix b/pkgs/by-name/pl/plasmusic-toolbar/package.nix
index 28c991a76376..151527ff3c2e 100644
--- a/pkgs/by-name/pl/plasmusic-toolbar/package.nix
+++ b/pkgs/by-name/pl/plasmusic-toolbar/package.nix
@@ -1,18 +1,19 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, kdePackages
-, nix-update-script
+{
+ lib,
+ stdenvNoCC,
+ fetchFromGitHub,
+ kdePackages,
+ nix-update-script,
}:
-stdenv.mkDerivation (finalAttrs: {
+stdenvNoCC.mkDerivation (finalAttrs: {
pname = "plasmusic-toolbar";
- version = "1.6.0";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "ccatterina";
repo = "plasmusic-toolbar";
- rev = "v${finalAttrs.version}";
- hash = "sha256-tZ2xcoGZp2GWoKd4XjO2K4he3tKBHgxi0PdqY+5ULn0=";
+ rev = "refs/tags/v${finalAttrs.version}";
+ hash = "sha256-geT3QfZi0jNHxRcsGavcj5fnlPms1QgMgM4nAf/d2UI=";
};
installPhase = ''
@@ -27,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
description = "KDE Plasma widget that shows currently playing song information and provide playback controls.";
homepage = "https://github.com/ccatterina/plasmusic-toolbar";
- changelog = "https://github.com/ccatterina/plasmusic-toolbar/releases/tag/${finalAttrs.src.rev}";
+ changelog = "https://github.com/ccatterina/plasmusic-toolbar/releases/tag/v${finalAttrs.version}";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ HeitorAugustoLN ];
inherit (kdePackages.kwindowsystem.meta) platforms;
diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix
index 47afc221df15..964386dfbb4c 100644
--- a/pkgs/by-name/pm/pmtiles/package.nix
+++ b/pkgs/by-name/pm/pmtiles/package.nix
@@ -1,16 +1,16 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "pmtiles";
- version = "1.22.0";
+ version = "1.22.1";
src = fetchFromGitHub {
owner = "protomaps";
repo = "go-pmtiles";
rev = "v${version}";
- hash = "sha256-r3gp0f771Cfy4JNekilnct+FKu4nOb+8y+B1A+anJ5Y=";
+ hash = "sha256-b473V082jM8d0XRn4tPzVGLryFNHn5Cab3IkNWve49s=";
};
- vendorHash = "sha256-5oKcq1eTrcjQKWySDOsEFFbKkld9g494D5Tg9Bej8JQ=";
+ vendorHash = "sha256-QDGs0L29W4QQBeIH1Z23nI/FYdu95kLnOAIZEWPOMWw=";
ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ];
diff --git a/pkgs/by-name/po/podlet/package.nix b/pkgs/by-name/po/podlet/package.nix
new file mode 100644
index 000000000000..c759da032181
--- /dev/null
+++ b/pkgs/by-name/po/podlet/package.nix
@@ -0,0 +1,28 @@
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "podlet";
+ version = "0.3.0";
+
+ src = fetchFromGitHub {
+ owner = "containers";
+ repo = "podlet";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-STkYCaXBoQSmFKpMdsKzqFGXHh9s0jeGi5K2itj8jmc=";
+ };
+
+ cargoHash = "sha256-G+X9b4PAQ+1TkzGIs1g+qz7HYjwPJ/CvaHMiOAn3dV8=";
+
+ meta = {
+ description = "Generate Podman Quadlet files from a Podman command, compose file, or existing object";
+ homepage = "https://github.com/containers/podlet";
+ changelog = "https://github.com/containers/podlet/blob/v${version}/CHANGELOG.md";
+ license = lib.licenses.mpl20;
+ maintainers = with lib.maintainers; [ qwqawawow ];
+ mainProgram = "podlet";
+ };
+}
diff --git a/pkgs/by-name/po/polybar-pulseaudio-control/package.nix b/pkgs/by-name/po/polybar-pulseaudio-control/package.nix
index a4063dd34f8c..44067422bf1f 100644
--- a/pkgs/by-name/po/polybar-pulseaudio-control/package.nix
+++ b/pkgs/by-name/po/polybar-pulseaudio-control/package.nix
@@ -2,6 +2,8 @@
, bash
, coreutils
, fetchFromGitHub
+, gnused
+, gnugrep
, gawk
, makeWrapper
, pulseaudio
@@ -28,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
install -Dm755 pulseaudio-control.bash $out/bin/pulseaudio-control
wrapProgram "$out/bin/pulseaudio-control" \
- --prefix PATH : "${lib.makeBinPath [ bash coreutils gawk pulseaudio ]}"
+ --prefix PATH : "${lib.makeBinPath [ bash coreutils gnused gnugrep gawk pulseaudio ]}"
runHook postInstall
'';
@@ -39,6 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://github.com/marioortizmanero/polybar-pulseaudio-control";
platforms = platforms.linux;
license = licenses.mit;
- maintainers = with maintainers; [ benlemasurier ];
+ maintainers = with maintainers; [ benlemasurier wesleyjrz ];
};
})
diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix
new file mode 100644
index 000000000000..c399ba32f752
--- /dev/null
+++ b/pkgs/by-name/po/positron-bin/package.nix
@@ -0,0 +1,137 @@
+{
+ lib,
+ _7zz,
+ alsa-lib,
+ systemd,
+ autoPatchelfHook,
+ blas,
+ dpkg,
+ fetchurl,
+ gtk3,
+ libglvnd,
+ libxkbcommon,
+ makeShellWrapper,
+ mesa,
+ musl,
+ nss,
+ patchelf,
+ stdenv,
+ xorg,
+}:
+let
+ pname = "positron-bin";
+ version = "2024.11.0-116";
+in
+stdenv.mkDerivation {
+ inherit version pname;
+
+ src =
+ if stdenv.isDarwin then
+ fetchurl {
+ url = "https://github.com/posit-dev/positron/releases/download/${version}/Positron-${version}.dmg";
+ hash = "sha256-5Ym42InDgFLGdZk0LYV1H0eC5WzmsYToG1KLdiGgTto=";
+ }
+ else
+ fetchurl {
+ url = "https://github.com/posit-dev/positron/releases/download/${version}/Positron-${version}.deb";
+ hash = "sha256-pE25XVYFW8WwyQ7zmox2mmXy6ZCSaXk2gSnPimg7xtU=";
+ };
+
+ buildInputs =
+ [ makeShellWrapper ]
+ ++ lib.optionals stdenv.hostPlatform.isLinux [
+ alsa-lib
+ dpkg
+ gtk3
+ libglvnd
+ libxkbcommon
+ mesa
+ musl
+ nss
+ stdenv.cc.cc
+ xorg.libX11
+ xorg.libXcomposite
+ xorg.libXdamage
+ xorg.libxkbfile
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ blas
+ patchelf
+ ];
+
+ nativeBuildInputs =
+ lib.optionals stdenv.hostPlatform.isLinux [
+ autoPatchelfHook
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ _7zz
+ ];
+
+ runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [
+ # Needed to fix the "Zygote could not fork" error.
+ (lib.getLib systemd)
+ ];
+
+ unpackPhase = ''
+ runHook preUnpack
+ ${lib.optionalString stdenv.hostPlatform.isLinux ''dpkg-deb --fsys-tarfile "$src" | tar -x --no-same-owner''}
+ runHook postUnpack
+ '';
+
+ installPhase =
+ if stdenv.hostPlatform.isDarwin then
+ ''
+ runHook preInstall
+ mkdir -p "$out/Applications" "$out/bin"
+ cp -r . "$out/Applications/Positron.app"
+
+ # Positron will use the system version of BLAS if we don't provide the nix version.
+ wrapProgram "$out/Applications/Positron.app/Contents/Resources/app/bin/code" \
+ --prefix DYLD_INSERT_LIBRARIES : "${lib.makeLibraryPath [ blas ]}/libblas.dylib"
+
+ ln -s "$out/Applications/Positron.app/Contents/Resources/app/bin/code" "$out/bin/positron"
+ runHook postInstall
+ ''
+ else
+ ''
+ runHook preInstall
+ mkdir -p "$out/share"
+ cp -r usr/share/pixmaps "$out/share/pixmaps"
+ cp -r usr/share/positron "$out/share/positron"
+
+ mkdir -p "$out/share/applications"
+ install -m 444 -D usr/share/applications/positron.desktop "$out/share/applications/positron.desktop"
+ substituteInPlace "$out/share/applications/positron.desktop" \
+ --replace-fail \
+ "Icon=com.visualstudio.code.oss" \
+ "Icon=$out/share/pixmaps/com.visualstudio.code.oss.png" \
+ --replace-fail \
+ "Exec=/usr/share/positron/positron %F" \
+ "Exec=$out/share/positron/.positron-wrapped %F" \
+ --replace-fail \
+ "/usr/share/positron/positron --new-window %F" \
+ "$out/share/positron/.positron-wrapped --new-window %F"
+
+ # Fix libGL.so not found errors.
+ wrapProgram "$out/share/positron/positron" \
+ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libglvnd ]}"
+
+ mkdir -p "$out/bin"
+ ln -s "$out/share/positron/positron" "$out/bin/positron"
+ runHook postInstall
+ '';
+
+ passthru.updateScript = ./update.sh;
+
+ meta = with lib; {
+ description = "Positron, a next-generation data science IDE";
+ homepage = "https://github.com/posit-dev/positron";
+ license = licenses.elastic20;
+ maintainers = with maintainers; [
+ b-rodrigues
+ detroyejr
+ ];
+ mainProgram = "positron";
+ platforms = [ "x86_64-linux" ] ++ platforms.darwin;
+ };
+}
diff --git a/pkgs/by-name/po/positron-bin/update.sh b/pkgs/by-name/po/positron-bin/update.sh
new file mode 100755
index 000000000000..28081f589ec9
--- /dev/null
+++ b/pkgs/by-name/po/positron-bin/update.sh
@@ -0,0 +1,54 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p curl jq git
+
+nixpkgs="$(git rev-parse --show-toplevel)"
+positron_nix="$nixpkgs/pkgs/by-name/po/positron-bin/package.nix"
+
+current_version=$(grep -oP "version = \"\K.*\d" $positron_nix)
+new_version=$(curl -sSfL \
+ -H "Accept: application/vnd.github+json" \
+ -H "X-GitHub-Api-Version: 2022-11-28" \
+ "https://api.github.com/repos/posit-dev/positron/releases?per_page=1" \
+ | jq -r '.[0].name')
+
+if [[ "$new_version" == "$current_version" ]]; then
+ echo 'Positron is already up to date'
+ exit 0;
+fi
+
+# Update Darwin hash.
+current_hash=$(nix store prefetch-file --json --hash-type sha256 \
+ "https://github.com/posit-dev/positron/releases/download/${current_version}/Positron-${current_version}.dmg" \
+ | jq -r .hash)
+
+new_hash=$(nix store prefetch-file --json --hash-type sha256 \
+ "https://github.com/posit-dev/positron/releases/download/${new_version}/Positron-${new_version}.dmg" \
+ | jq -r .hash)
+
+sed -i "s|$current_hash|$new_hash|g" $positron_nix
+
+# Update Linux hash.
+current_hash=$(nix store prefetch-file --json --hash-type sha256 \
+ "https://github.com/posit-dev/positron/releases/download/${current_version}/Positron-${current_version}.deb" \
+ | jq -r .hash)
+
+new_hash=$(nix store prefetch-file --json --hash-type sha256 \
+ "https://github.com/posit-dev/positron/releases/download/${new_version}/Positron-${new_version}.deb" \
+ | jq -r .hash)
+
+sed -i "s|$current_hash|$new_hash|g" $positron_nix
+
+# Update version
+sed -i "s|$current_version|$new_version|g" $positron_nix
+
+# Attempt to build.
+export NIXPKGS_ALLOW_UNFREE=1
+
+if ! nix-build -A positron-bin "$nixpkgs"; then
+ echo "The updated positron-bin failed to build."
+ exit 1
+fi
+
+# Commit changes
+git add "$positron_nix"
+git commit -m "positron-bin: ${current_version} -> ${new_version}"
diff --git a/pkgs/by-name/pq/pqiv/package.nix b/pkgs/by-name/pq/pqiv/package.nix
index ec621a56dca3..f9d17bc2f913 100644
--- a/pkgs/by-name/pq/pqiv/package.nix
+++ b/pkgs/by-name/pq/pqiv/package.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pqiv";
- version = "2.13.1";
+ version = "2.13.2";
src = fetchFromGitHub {
owner = "phillipberndt";
repo = "pqiv";
rev = finalAttrs.version;
- hash = "sha256-Op+N4zzq7MazjFvx5VisjsRXbIqLtWPv4hdVjmS7lPY=";
+ hash = "sha256-wpM8eG2/sEfwYLfh6s3AL+z73IzeXxwGm/scWRRKLPo=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix
index c0b5c56fbc23..78fdd3f34b66 100644
--- a/pkgs/by-name/pr/pretalx/package.nix
+++ b/pkgs/by-name/pr/pretalx/package.nix
@@ -37,20 +37,20 @@ let
};
};
- version = "2024.3.0";
+ version = "2024.3.1";
src = fetchFromGitHub {
owner = "pretalx";
repo = "pretalx";
rev = "v${version}";
- hash = "sha256-Xv3VwYrwCGgOUf1ilD58ATj+bkehF9+im4124ivCaEU=";
+ hash = "sha256-y3BsNmLh9M5NgDPURCjCGWYci40hYcQtDVqsu2HqPRU=";
};
meta = with lib; {
description = "Conference planning tool: CfP, scheduling, speaker management";
mainProgram = "pretalx-manage";
homepage = "https://github.com/pretalx/pretalx";
- changelog = "https://docs.pretalx.org/en/latest/changelog.html";
+ changelog = "https://docs.pretalx.org/changelog/#${version}";
license = licenses.asl20;
maintainers = with maintainers; [ hexa] ++ teams.c3d2.members;
platforms = platforms.linux;
@@ -220,6 +220,8 @@ python.pkgs.buildPythonApplication rec {
"test_schedule_page_text_table"
"test_schedule_page_text_wrong_format"
"test_versioned_schedule_page"
+ # Test is racy
+ "test_can_reset_password_by_email"
];
passthru = {
diff --git a/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix b/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix
index 9aef55d3ae19..c5fc4c0eb530 100644
--- a/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-borgmatic-exporter/package.nix
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec {
pname = "prometheus-borgmatic-exporter";
- version = "0.2.5";
+ version = "0.2.7";
pyproject = true;
src = fetchFromGitHub {
owner = "maxim-mityutko";
repo = "borgmatic-exporter";
rev = "refs/tags/v${version}";
- hash = "sha256-SgP1utu4Eqs9214pYOT9wP0Ms7AUQH1A3czQF8+qBRo=";
+ hash = "sha256-ZZdCuIavJrIHO/ayMnirNRYyqovKQaW5jTRRrSOhofQ=";
};
pythonRelaxDeps = [ "prometheus-client" ];
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/by-name/pr/prometheus-pushgateway/package.nix
similarity index 87%
rename from pkgs/servers/monitoring/prometheus/pushgateway.nix
rename to pkgs/by-name/pr/prometheus-pushgateway/package.nix
index cc8e11ade635..fde0bab36916 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway.nix
+++ b/pkgs/by-name/pr/prometheus-pushgateway/package.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pushgateway";
- version = "1.9.0";
+ version = "1.10.0";
src = fetchFromGitHub {
owner = "prometheus";
repo = "pushgateway";
rev = "v${version}";
- sha256 = "sha256-SpHxBxBl0APP/y7MnR/p/+VjNAvFOZVlgGMlMGTbodI=";
+ sha256 = "sha256-Avp5hWRdkM/vCz6B/b7uOrnYjFrN5UkE7siK0+ANO1Q=";
};
- vendorHash = "sha256-GydAY73Ui6z833x0DoWa6BpK35CYdYfyHw2+RwT3miw=";
+ vendorHash = "sha256-cyZ/LzKB3UlyqzID9f6I4niwJ/sPIm2htVOn3Ik2HAY=";
ldflags = [
"-s"
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/by-name/pr/prometheus/package.nix
similarity index 95%
rename from pkgs/servers/monitoring/prometheus/default.nix
rename to pkgs/by-name/pr/prometheus/package.nix
index 6d3e32640fe1..d3145ad7075d 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/by-name/pr/prometheus/package.nix
@@ -31,10 +31,10 @@
}:
let
- version = "2.54.1";
+ version = "2.55.0";
webUiStatic = fetchurl {
url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz";
- hash = "sha256-asum4ND7dHIIP6f1ofIb/xboCPZEIhes7lXqRUhUDJk=";
+ hash = "sha256-iSiK6JKm78AMANfBydfCQu+aUpw6B1sZ5fGPa0KL7Fs=";
};
in
buildGoModule rec {
@@ -47,10 +47,10 @@ buildGoModule rec {
owner = "prometheus";
repo = "prometheus";
rev = "v${version}";
- hash = "sha256-SF9A/xyjQwwIcMZtuLeJiwkBZvvEyU5EKu0WXTQAT/A=";
+ hash = "sha256-yzAp/YxLCWlpkj5z2aUdsokDaFvRwVnT6ViwL3hivdI=";
};
- vendorHash = "sha256-y91c5qPND3wbFlX5rV6bcSlXAKn1eomylI6EdZQvkh0=";
+ vendorHash = "sha256-p2PjhFT8KOido+MMmKc7eHPkE175my3VfTp1G8bBZcA=";
excludedPackages = [ "documentation/prometheus-mixin" ];
diff --git a/pkgs/by-name/pr/protoc-gen-elixir/package.nix b/pkgs/by-name/pr/protoc-gen-elixir/package.nix
index 8e38f3317646..0bc5b5032bd1 100644
--- a/pkgs/by-name/pr/protoc-gen-elixir/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-elixir/package.nix
@@ -5,20 +5,20 @@
}:
beamPackages.mixRelease rec {
pname = "protoc-gen-elixir";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchFromGitHub {
owner = "elixir-protobuf";
repo = "protobuf";
rev = "refs/tags/v${version}";
- hash = "sha256-wLU3iM9jI/Zc96/HfPUjNvjteGryWos6IobIb/4zqpw=";
+ hash = "sha256-TnuIlXYr36hx1sVktPHj4J4cJLCFK5F1xaX0V9/+ICQ=";
};
mixFodDeps = beamPackages.fetchMixDeps {
inherit version src;
pname = "protoc-gen-elixir-deps";
- hash = "sha256-H7yiBHoxuiqWcNbWwPU5X0Nnv8f6nM8z/ZAfZAGPZjE=";
+ hash = "sha256-lFfAfKAM4O+yIBXgdCA+EPe1XAOaTIjTfpOFjITpvQ4=";
};
postBuild = ''
diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix
index 81262e2cf051..fa152d3aeb8b 100644
--- a/pkgs/by-name/pr/proton-ge-bin/package.nix
+++ b/pkgs/by-name/pr/proton-ge-bin/package.nix
@@ -6,11 +6,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "proton-ge-bin";
- version = "GE-Proton9-15";
+ version = "GE-Proton9-16";
src = fetchzip {
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
- hash = "sha256-WeqntQxez6XPRZxpPNUAQ8/7sw6TzOKU1yrtPHmQNh0=";
+ hash = "sha256-n/pU5bAr78Hawo8BMk7VW8uK0FjVsBJGMf78zRMGFPQ=";
};
outputs = [
diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix
index de0cfe6a2614..b24b00a53467 100644
--- a/pkgs/by-name/pr/prowler/package.nix
+++ b/pkgs/by-name/pr/prowler/package.nix
@@ -45,6 +45,7 @@ python3.pkgs.buildPythonApplication rec {
boto3
botocore
colorama
+ cryptography
dash
dash-bootstrap-components
detect-secrets
@@ -52,12 +53,13 @@ python3.pkgs.buildPythonApplication rec {
google-auth-httplib2
jsonschema
kubernetes
+ microsoft-kiota-abstractions
msgraph-sdk
- msrestazure
numpy
pandas
py-ocsf-models
pydantic
+ python-dateutil
pytz
schema
shodan
diff --git a/pkgs/by-name/pu/puffin/package.nix b/pkgs/by-name/pu/puffin/package.nix
new file mode 100644
index 000000000000..ac3959e111c4
--- /dev/null
+++ b/pkgs/by-name/pu/puffin/package.nix
@@ -0,0 +1,26 @@
+{
+ lib,
+ fetchFromGitHub,
+ buildGoModule,
+}:
+buildGoModule rec {
+ pname = "puffin";
+ version = "2.1.1";
+
+ src = fetchFromGitHub {
+ owner = "siddhantac";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-5lglIiVOsxnMbeR/E3O5TaMtoR5DJACWjStE4d7hDao=";
+ };
+
+ vendorHash = "sha256-ZxAqR3D5VUtbntktrpnywPG3m9rq1utO4fdum0Qe6TU=";
+
+ meta = {
+ description = "Beautiful terminal dashboard for hledger";
+ homepage = "https://github.com/siddhantac/puffin";
+ license = lib.licenses.mit;
+ mainProgram = "puffin";
+ maintainers = with lib.maintainers; [ renesat ];
+ };
+}
diff --git a/pkgs/tools/security/pwncat/default.nix b/pkgs/by-name/pw/pwncat/package.nix
similarity index 50%
rename from pkgs/tools/security/pwncat/default.nix
rename to pkgs/by-name/pw/pwncat/package.nix
index 98b782bf194c..12b54f3a4738 100644
--- a/pkgs/tools/security/pwncat/default.nix
+++ b/pkgs/by-name/pw/pwncat/package.nix
@@ -1,25 +1,30 @@
-{ lib
-, buildPythonApplication
-, fetchPypi
+{
+ lib,
+ python3Packages,
+ fetchPypi,
}:
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
pname = "pwncat";
version = "0.1.2";
+ pyproject = true;
src = fetchPypi {
inherit pname version;
- sha256 = "1230fdn5mx3wwr3a3nn6z2vwh973n248m11hnx9y3fjq7bgpky67";
+ hash = "sha256-x/h53zpYuuFTtzCEioiw4yTIt/jG2qFG5nz0WmxzYIg=";
};
+ build-system = with python3Packages; [ setuptools ];
+
# Tests requires to start containers
doCheck = false;
meta = with lib; {
description = "TCP/UDP communication suite";
- mainProgram = "pwncat";
homepage = "https://pwncat.org/";
- license = with licenses; [ mit ];
+ changelog = "https://github.com/cytopia/pwncat/releases/tag/v${version}";
+ license = licenses.mit;
maintainers = with maintainers; [ fab ];
+ mainProgram = "pwncat";
};
}
diff --git a/pkgs/by-name/py/pyditz/package.nix b/pkgs/by-name/py/pyditz/package.nix
new file mode 100644
index 000000000000..4e8da8bb296b
--- /dev/null
+++ b/pkgs/by-name/py/pyditz/package.nix
@@ -0,0 +1,33 @@
+{
+ lib,
+ python3Packages,
+ fetchPypi,
+}:
+
+python3Packages.buildPythonApplication rec {
+ pname = "pyditz";
+ version = "0.11";
+ pyproject = true;
+
+ src = fetchPypi {
+ inherit pname version;
+ hash = "sha256-2gNlrpBk4wxKJ1JvsNeoAv2lyGUc2mmQ0Xvn7eiaJVE=";
+ };
+
+ build-system = with python3Packages; [ setuptools-scm ];
+
+ dependencies = with python3Packages; [
+ pyyaml
+ six
+ jinja2
+ cerberus
+ ];
+
+ meta = {
+ homepage = "https://hg.sr.ht/~zondo/pyditz";
+ description = "Drop-in replacement for the Ditz distributed issue tracker";
+ maintainers = with lib.maintainers; [ ilikeavocadoes ];
+ license = lib.licenses.lgpl2Plus;
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix
index f056ee9e99a0..bf9785d49468 100644
--- a/pkgs/by-name/py/pyfa/package.nix
+++ b/pkgs/by-name/py/pyfa/package.nix
@@ -4,7 +4,7 @@
fetchurl,
}:
let
- version = "2.60.1";
+ version = "2.60.2";
in
appimageTools.wrapType2 {
inherit version;
@@ -13,7 +13,7 @@ appimageTools.wrapType2 {
src = fetchurl {
name = "pyfa-appimage-${version}";
url = "https://github.com/pyfa-org/Pyfa/releases/download/v${version}/pyfa-v${version}-linux.AppImage";
- hash = "sha256-+nyIG6pweIgC6ZiWJaO4E2Fp0/zP+DhQrUWzHnIBQXk=";
+ hash = "sha256-6doetQ6E1Occ/SqewfxRqPEX1MnUuFomm+8VmetIz4Y=";
};
meta = {
diff --git a/pkgs/by-name/py/pylyzer/Cargo.lock b/pkgs/by-name/py/pylyzer/Cargo.lock
index 217016722d5e..005e347dc5fb 100644
--- a/pkgs/by-name/py/pylyzer/Cargo.lock
+++ b/pkgs/by-name/py/pylyzer/Cargo.lock
@@ -99,9 +99,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "cc"
-version = "1.1.30"
+version = "1.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945"
+checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
dependencies = [
"shlex",
]
@@ -134,7 +134,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustc_version",
- "syn 2.0.79",
+ "syn 2.0.81",
]
[[package]]
@@ -145,9 +145,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
[[package]]
name = "els"
-version = "0.1.59-nightly.2"
+version = "0.1.59-nightly.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2f90c210a0919808e48b96ecffd370ac788386ab061203132872e9bf1ad9f7f"
+checksum = "4b4e110537afd761192ab9cbea35f98d2e1421c1d98520a7c7114d30805ebe8d"
dependencies = [
"erg_common",
"erg_compiler",
@@ -161,9 +161,9 @@ dependencies = [
[[package]]
name = "erg_common"
-version = "0.6.47-nightly.2"
+version = "0.6.47-nightly.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d41f171eb77bf2763b119893966358ad9da72a3edd43cf278a78cf1c16daa2cf"
+checksum = "c17933aa843a988726e412295f030a501e1bf4c5c8ed1fa4bb5013a37bce9d8a"
dependencies = [
"backtrace-on-stack-overflow",
"erg_proc_macros",
@@ -174,9 +174,9 @@ dependencies = [
[[package]]
name = "erg_compiler"
-version = "0.6.47-nightly.2"
+version = "0.6.47-nightly.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d0486bc668c120faf7af954dd4046224185c28821fb945a97eedcadf3e7d58"
+checksum = "d3a10f7dd0644d0378bf1ba45cd923d774552757ac6f19d5f9dee090f0ac668b"
dependencies = [
"erg_common",
"erg_parser",
@@ -184,9 +184,9 @@ dependencies = [
[[package]]
name = "erg_parser"
-version = "0.6.47-nightly.2"
+version = "0.6.47-nightly.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98c37f58f3aef2e765610e7281ada15dbba707beaa0262a71e7f6958ee058ed0"
+checksum = "8ca055f88af21585c301b93874cff818477c26e0343cb1dfe3b4c69c928bfe31"
dependencies = [
"erg_common",
"erg_proc_macros",
@@ -195,9 +195,9 @@ dependencies = [
[[package]]
name = "erg_proc_macros"
-version = "0.6.47-nightly.2"
+version = "0.6.47-nightly.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fa545f626fd04abea193a07c364c4fca3903c228bbe9cca4895500944b5aaf"
+checksum = "8560abd2df3c3db6183e7495384f0c1d04d42e779bc0e1402589ab488ab0aaec"
dependencies = [
"quote",
"syn 1.0.109",
@@ -266,7 +266,7 @@ dependencies = [
"Inflector",
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.81",
]
[[package]]
@@ -563,7 +563,7 @@ dependencies = [
[[package]]
name = "py2erg"
-version = "0.0.67"
+version = "0.0.68"
dependencies = [
"erg_common",
"erg_compiler",
@@ -573,7 +573,7 @@ dependencies = [
[[package]]
name = "pylyzer"
-version = "0.0.67"
+version = "0.0.68"
dependencies = [
"els",
"erg_common",
@@ -583,7 +583,7 @@ dependencies = [
[[package]]
name = "pylyzer_core"
-version = "0.0.67"
+version = "0.0.68"
dependencies = [
"erg_common",
"erg_compiler",
@@ -594,7 +594,7 @@ dependencies = [
[[package]]
name = "pylyzer_wasm"
-version = "0.0.67"
+version = "0.0.68"
dependencies = [
"erg_common",
"erg_compiler",
@@ -759,14 +759,14 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.81",
]
[[package]]
name = "serde_json"
-version = "1.0.131"
+version = "1.0.132"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67d42a0bd4ac281beff598909bb56a86acaf979b84483e1c79c10dcaf98f8cf3"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
dependencies = [
"itoa",
"memchr",
@@ -782,7 +782,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.81",
]
[[package]]
@@ -822,9 +822,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.79"
+version = "2.0.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+checksum = "198514704ca887dd5a1e408c6c6cdcba43672f9b4062e1b24aa34e74e6d7faae"
dependencies = [
"proc-macro2",
"quote",
@@ -1027,7 +1027,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.81",
"wasm-bindgen-shared",
]
@@ -1049,7 +1049,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.81",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -1091,7 +1091,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.81",
]
[[package]]
@@ -1102,7 +1102,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.81",
]
[[package]]
@@ -1206,5 +1206,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.79",
+ "syn 2.0.81",
]
diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix
index c033e5c6c47f..942afc41abab 100644
--- a/pkgs/by-name/py/pylyzer/package.nix
+++ b/pkgs/by-name/py/pylyzer/package.nix
@@ -15,13 +15,13 @@
rustPlatform.buildRustPackage rec {
pname = "pylyzer";
- version = "0.0.67";
+ version = "0.0.68";
src = fetchFromGitHub {
owner = "mtshiba";
repo = "pylyzer";
rev = "refs/tags/v${version}";
- hash = "sha256-UMNyztdcFr88wOpRMBtLigGJcxR+0uScN+8i0+WfeYU=";
+ hash = "sha256-xeQDyj18L9jCftne9S79kWjrW0K7Nkx86Cy2aFqePfA=";
};
cargoLock = {
diff --git a/pkgs/by-name/py/pyradio/package.nix b/pkgs/by-name/py/pyradio/package.nix
index 4c1077dd7571..85ccaedd97a8 100644
--- a/pkgs/by-name/py/pyradio/package.nix
+++ b/pkgs/by-name/py/pyradio/package.nix
@@ -6,13 +6,13 @@
python3Packages.buildPythonApplication rec {
pname = "pyradio";
- version = "0.9.3.11";
+ version = "0.9.3.11.1";
src = fetchFromGitHub {
owner = "coderholic";
repo = "pyradio";
rev = "refs/tags/${version}";
- hash = "sha256-JvvnzIA5xhHgH87g0j60Ul0FHGhA88knsEFf1n2MQ84=";
+ hash = "sha256-k/MgvdR4ed9qMLx52AAK7Aq963/qkUyF+bam06yCZHc=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/py/pytr/package.nix b/pkgs/by-name/py/pytr/package.nix
index 4e6d13cd7189..6c1e92a9419a 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.2.5";
+ version = "0.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "pytr-org";
repo = "pytr";
rev = "refs/tags/v${version}";
- hash = "sha256-9FKG4QgRBU+DaaYJIDMDqqxFMCAguv5iRUUrQr6RMz8=";
+ hash = "sha256-sMDWL0lA5iJ2v2dhUIhMgSZ1vk7LjkNMYZGiJRpd3XY=";
};
build-system = with python3Packages; [
@@ -49,7 +49,7 @@ python3Packages.buildPythonApplication rec {
pythonImportsCheck = [ "pytr" ];
meta = {
- changelog = "https://github.com/pytr-org/pytr/releases/tag/${version}";
+ changelog = "https://github.com/pytr-org/pytr/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
description = "Use TradeRepublic in terminal and mass download all documents";
homepage = "https://github.com/pytr-org/pytr";
license = lib.licenses.mit;
diff --git a/pkgs/by-name/q2/q2pro/package.nix b/pkgs/by-name/q2/q2pro/package.nix
new file mode 100644
index 000000000000..de838ef82fef
--- /dev/null
+++ b/pkgs/by-name/q2/q2pro/package.nix
@@ -0,0 +1,109 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ meson,
+ pkg-config,
+ ninja,
+ zlib,
+ libpng,
+ libjpeg,
+ curl,
+ SDL2,
+ openalSoft,
+ libogg,
+ libvorbis,
+ libXi,
+ wayland,
+ wayland-protocols,
+ libdecor,
+ ffmpeg,
+ wayland-scanner,
+ makeWrapper,
+ versionCheckHook,
+ x11Support ? stdenv.isLinux,
+ waylandSupport ? stdenv.isLinux,
+}:
+
+stdenv.mkDerivation (finalAttrs: rec {
+ pname = "q2pro";
+ version = "3510";
+
+ src = fetchFromGitHub {
+ owner = "skullernet";
+ repo = "q2pro";
+ rev = "refs/tags/r${version}";
+ hash = "sha256-LNOrGJarXnf4QqFXDkUfUgLGrjSqbjncpIN2yttbMuk=";
+ };
+
+ nativeBuildInputs =
+ [
+ meson
+ pkg-config
+ ninja
+ makeWrapper
+ ]
+ ++ lib.optionals waylandSupport [
+ wayland-scanner
+ ];
+
+ buildInputs =
+ [
+ zlib
+ libpng
+ libjpeg
+ curl
+ SDL2
+ libogg
+ libvorbis
+ ffmpeg
+ openalSoft
+ ]
+ ++ lib.optionals waylandSupport [
+ wayland
+ wayland-protocols
+ libdecor
+ ]
+ ++ lib.optionals x11Support [ libXi ];
+
+ mesonBuildType = "release";
+
+ mesonFlags = [
+ (lib.mesonBool "anticheat-server" true)
+ (lib.mesonBool "client-gtv" true)
+ (lib.mesonBool "packetdup-hack" true)
+ (lib.mesonBool "variable-fps" true)
+ (lib.mesonEnable "wayland" waylandSupport)
+ (lib.mesonEnable "x11" x11Support)
+ (lib.mesonEnable "icmp-errors" stdenv.isLinux)
+ (lib.mesonEnable "windows-crash-dumps" false)
+ ];
+
+ postPatch = ''
+ echo 'r${version}' > VERSION
+ '';
+
+ postInstall =
+ let
+ ldLibraryPathEnvName =
+ if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
+ in
+ ''
+ mv -v $out/bin/q2pro $out/bin/q2pro-unwrapped
+ makeWrapper $out/bin/q2pro-unwrapped $out/bin/q2pro \
+ --prefix ${ldLibraryPathEnvName} : "${lib.makeLibraryPath finalAttrs.buildInputs}"
+ '';
+
+ nativeInstallCheckInputs = [ versionCheckHook ];
+ versionCheckProgramArg = "--version";
+ doInstallCheck = true;
+
+ meta = {
+ description = "Enhanced Quake 2 client and server focused on multiplayer";
+ homepage = "https://github.com/skullernet/q2pro";
+ license = lib.licenses.gpl2;
+ maintainers = with lib.maintainers; [ carlossless ];
+ platforms = lib.platforms.unix;
+ mainProgram = "q2pro";
+ };
+})
diff --git a/pkgs/by-name/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix
index 6615c4133f8a..66321e3b4dc4 100644
--- a/pkgs/by-name/qq/qq/package.nix
+++ b/pkgs/by-name/qq/qq/package.nix
@@ -1,30 +1,31 @@
-{ alsa-lib
-, libuuid
-, cups
-, dpkg
-, fetchurl
-, glib
-, libssh2
-, gtk3
-, lib
-, libayatana-appindicator
-, libdrm
-, libgcrypt
-, libkrb5
-, libnotify
-, mesa # for libgbm
-, libpulseaudio
-, libGL
-, nss
-, xorg
-, systemd
-, stdenv
-, vips
-, at-spi2-core
-, autoPatchelfHook
-, makeShellWrapper
-, wrapGAppsHook3
-, commandLineArgs ? ""
+{
+ alsa-lib,
+ libuuid,
+ cups,
+ dpkg,
+ fetchurl,
+ glib,
+ libssh2,
+ gtk3,
+ lib,
+ libayatana-appindicator,
+ libdrm,
+ libgcrypt,
+ libkrb5,
+ libnotify,
+ mesa, # for libgbm
+ libpulseaudio,
+ libGL,
+ nss,
+ xorg,
+ systemd,
+ stdenv,
+ vips,
+ at-spi2-core,
+ autoPatchelfHook,
+ makeShellWrapper,
+ wrapGAppsHook3,
+ commandLineArgs ? "",
}:
let
@@ -39,7 +40,8 @@ let
hash = sources.arm64_hash;
};
};
- src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+ src =
+ srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
in
stdenv.mkDerivation {
pname = "qq";
@@ -87,7 +89,12 @@ stdenv.mkDerivation {
makeShellWrapper $out/opt/QQ/qq $out/bin/qq \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
--prefix LD_PRELOAD : "${lib.makeLibraryPath [ libssh2 ]}/libssh2.so.1" \
- --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL libuuid ]}" \
+ --prefix LD_LIBRARY_PATH : "${
+ lib.makeLibraryPath [
+ libGL
+ libuuid
+ ]
+ }" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \
--add-flags ${lib.escapeShellArg commandLineArgs} \
"''${gappsWrapperArgs[@]}"
@@ -110,12 +117,18 @@ stdenv.mkDerivation {
passthru.updateScript = ./update.sh;
- meta = with lib; {
+ meta = {
homepage = "https://im.qq.com/linuxqq/";
description = "Messaging app";
- platforms = [ "x86_64-linux" "aarch64-linux" ];
- license = licenses.unfree;
- sourceProvenance = with sourceTypes; [ binaryNativeCode ];
- maintainers = with lib.maintainers; [ fee1-dead bot-wxt1221 ];
+ platforms = [
+ "x86_64-linux"
+ "aarch64-linux"
+ ];
+ license = lib.licenses.unfree;
+ sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+ maintainers = with lib.maintainers; [
+ fee1-dead
+ bot-wxt1221
+ ];
};
}
diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix
index f3783a8ba511..3ff5e1afb0f9 100644
--- a/pkgs/by-name/qq/qq/sources.nix
+++ b/pkgs/by-name/qq/qq/sources.nix
@@ -1,9 +1,9 @@
# Generated by ./update.sh - do not update manually!
-# Last updated: 2024-09-28
+# Last updated: 2024-10-25
{
- version = "3.2.12-2024.9.27";
- amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240927_amd64_01.deb";
- arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240927_arm64_01.deb";
- arm64_hash = "sha256-VfM+p2cTNkDZc7sTftfTuRSMKVWwE6TerW25pA1MIR0=";
- amd64_hash = "sha256-xBGSSxXDu+qUwj203i3iAkfI97iLtGOuGMGfEU6kCyQ=";
+ version = "3.2.13-2024.10.23";
+ amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.13_241023_amd64_01.deb";
+ arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.13_241023_arm64_01.deb";
+ arm64_hash = "sha256-n2ezKgLfmugUZYvGzDvaLKy+Tf8ooUC6Oc6xCDp5rYA=";
+ amd64_hash = "sha256-H5ACKFVV4AQ3de9UV4i9ejL1WjuuPJhTLTVqK5EcssM=";
}
diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix
index 18a0246cfa76..a31b2ae9ec92 100644
--- a/pkgs/by-name/ra/railway/package.nix
+++ b/pkgs/by-name/ra/railway/package.nix
@@ -12,16 +12,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "railway";
- version = "3.15.1";
+ version = "3.17.10";
src = fetchFromGitHub {
owner = "railwayapp";
repo = "cli";
rev = "v${version}";
- hash = "sha256-2/Yaz+eqZEOh/bCme9DuQep4XDkatr9kw32zN1yn9DQ=";
+ hash = "sha256-WrNWtVlvEscyo/MOQEf+MikxHCKIqfKWfhPtV0DVhXM=";
};
- cargoHash = "sha256-9fO8YmmqyqVp0FYndUnTD6+nSvlV9jzjT+G/iNlZYLo=";
+ cargoHash = "sha256-C1lqK60asOW9Kl3cNgJvdDtZEtPUOE/SbBww0qL3fsU=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix
index ffc47f38de8f..4f9b3b56239f 100644
--- a/pkgs/by-name/ra/rainfrog/package.nix
+++ b/pkgs/by-name/ra/rainfrog/package.nix
@@ -7,7 +7,7 @@
stdenv,
}:
let
- version = "0.2.7";
+ version = "0.2.9";
in
rustPlatform.buildRustPackage {
inherit version;
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
owner = "achristmascarl";
repo = "rainfrog";
rev = "refs/tags/v${version}";
- hash = "sha256-ey9ioPDeuNYw2+UBUgtE0C1wES3wecFDWd9CMeKBq4Q=";
+ hash = "sha256-PiJRVf+rpYFWRmys7Ca2lLfe5F9/ksIzkpKs6CQWu+A=";
};
- cargoHash = "sha256-mc7Lgaf1seefVu+LafctJm4y8xjX3c1ApadeQMi3STE=";
+ cargoHash = "sha256-L0gXxV/3+5oRV/Ipm4sRqr9dh9AEChWhtILO3PaNxYY=";
buildInputs = lib.optionals stdenv.isDarwin (
with darwin.apple_sdk.frameworks;
diff --git a/pkgs/servers/readarr/default.nix b/pkgs/by-name/re/readarr/package.nix
similarity index 79%
rename from pkgs/servers/readarr/default.nix
rename to pkgs/by-name/re/readarr/package.nix
index 3a67b592fcc3..dc1ebb8c7a72 100644
--- a/pkgs/servers/readarr/default.nix
+++ b/pkgs/by-name/re/readarr/package.nix
@@ -8,13 +8,13 @@ let
x86_64-darwin = "x64";
}."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
hash = {
- x64-linux_hash = "sha256-qvq4Ivv9AKIljEwdMMKWjy5vZnZ4LPd0gxUUIHcEP7E=";
- arm64-linux_hash = "sha256-MNJOIDNT+3ZZP7sTnTdiDFG+Q+42dUvEj6pGZ3LLS/4=";
- x64-osx_hash = "sha256-DKPllZhtebuOfYrJVfhxfhPcoXSnozD2VM6+NP3azus=";
+ x64-linux_hash = "sha256-oEdO9V9QLPXkZh+QUyVjlMY21iFT1p8i2DoPWpR3Qlg=";
+ arm64-linux_hash = "sha256-SjLCyo2Oc8SMll1crTyH/TPf7jx5Lul6zmbVy7m3LcM=";
+ x64-osx_hash = "sha256-vMpLDGoBLDk11EafFhEg/k1/9xiv873WWuUv1UrNxIo=";
}."${arch}-${os}_hash";
in stdenv.mkDerivation rec {
pname = "readarr";
- version = "0.3.32.2587";
+ version = "0.4.1.2648";
src = fetchurl {
url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz";
@@ -41,11 +41,11 @@ in stdenv.mkDerivation rec {
tests.smoke-test = nixosTests.readarr;
};
- meta = with lib; {
+ meta = {
description = "Usenet/BitTorrent ebook downloader";
homepage = "https://readarr.com";
- license = licenses.gpl3;
- maintainers = [ maintainers.jocelynthode ];
+ license = lib.licenses.gpl3;
+ maintainers = with lib.maintainers; [ jocelynthode devusb ];
mainProgram = "Readarr";
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
diff --git a/pkgs/servers/readarr/update.sh b/pkgs/by-name/re/readarr/update.sh
similarity index 89%
rename from pkgs/servers/readarr/update.sh
rename to pkgs/by-name/re/readarr/update.sh
index 0372ac9fa1a4..4334c3aa8527 100755
--- a/pkgs/servers/readarr/update.sh
+++ b/pkgs/by-name/re/readarr/update.sh
@@ -17,15 +17,15 @@ updateHash()
hash=$(nix-prefetch-url --type sha256 $url)
sriHash="$(nix hash to-sri --type sha256 $hash)"
- sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix"
+ sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/package.nix"
}
updateVersion()
{
- sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix"
+ sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/package.nix"
}
-currentVersion=$(cd $dirname && nix eval --raw -f ../../.. readarr.version)
+currentVersion=$(cd $dirname && nix eval --raw -f ../../../.. readarr.version)
# We cannot use the latest releases as in the past Readarr released old version with v2.0 and then went back to 0.1
latestTag=$(curl https://api.github.com/repos/Readarr/Readarr/releases | jq -r ".[0].tag_name")
diff --git a/pkgs/by-name/re/rectangle/package.nix b/pkgs/by-name/re/rectangle/package.nix
index 4b0ccc0109aa..8690439df1d5 100644
--- a/pkgs/by-name/re/rectangle/package.nix
+++ b/pkgs/by-name/re/rectangle/package.nix
@@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation rec {
pname = "rectangle";
- version = "0.83";
+ version = "0.84";
src = fetchurl {
url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg";
- hash = "sha256-R364m1X0NQky/W9NzszUzP+2f06ZqBuJKh5m2uOXLmo=";
+ hash = "sha256-W09un/7gkKvYUQZtkZMJLeuZHpbQLfvfYm20NSK4oBg=";
};
sourceRoot = ".";
diff --git a/pkgs/by-name/re/redact/package.nix b/pkgs/by-name/re/redact/package.nix
new file mode 100644
index 000000000000..d922ce7e26c1
--- /dev/null
+++ b/pkgs/by-name/re/redact/package.nix
@@ -0,0 +1,60 @@
+{
+ lib,
+ fetchurl,
+ appimageTools,
+ makeWrapper,
+ writeScript,
+}:
+let
+ pname = "redact";
+ version = "0.18.0";
+ src = fetchurl {
+ url = "https://update-desktop.redact.dev/build/Redact-${version}.AppImage";
+ hash = "sha256-qqqf8BAwXEKgZwl6vsPw/0S+qItz5ZqB59DJkW9q1xc=";
+ };
+ appimageContents = appimageTools.extractType2 { inherit pname src version; };
+in
+appimageTools.wrapType2 {
+ inherit pname version src;
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ extraInstallCommands = ''
+ wrapProgram $out/bin/${pname} \
+ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}"
+ install -Dm444 ${appimageContents}/redact.desktop -t $out/share/applications
+ install -Dm444 ${appimageContents}/redact.png -t $out/share/icons/hicolor/512x512/apps/redact.png
+ substituteInPlace $out/share/applications/redact.desktop \
+ --replace-fail 'Exec=AppRun' 'Exec=${pname}'
+ '';
+
+ passthru.updateScript =
+ writeScript "update.sh"
+ /**
+ Scraping the Windows URL for version is intentional, since
+ the download link for Linux on redact.dev points to an older version,
+ even though the Cloudflare bucket contains the latest Linux version.
+ */
+ ''
+ #!/usr/bin/env nix-shell
+ #!nix-shell -i bash -p curl coreutils gnused common-updater-scripts
+ set -eu -o pipefail
+ url="$(curl -ILs -w %{url_effective} -o /dev/null https://download.redact.dev/windows)"
+ version="$(echo $url | sed -n 's/.*Redact-Setup-\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/p')"
+ currentVersion=$(nix-instantiate --eval -E "with import ./. {}; redact.version or (lib.getVersion redact)" | tr -d '"')
+ if [[ "$version" != "$currentVersion" ]]; then
+ hash=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "$url")")
+ update-source-version redact "$version" "$hash" --print-changes
+ fi
+ '';
+
+ meta = {
+ description = "The only platform that allows you to automatically clean up your old posts from services like Twitter, Reddit, Facebook, Discord, and more, all in one place.";
+ homepage = "https://redact.dev/";
+ license = lib.licenses.unfree;
+ maintainers = with lib.maintainers; [ reputable2772 ];
+ mainProgram = "redact";
+ sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/by-name/re/redmine/Gemfile.lock b/pkgs/by-name/re/redmine/Gemfile.lock
index fe895ddd26e7..4eb035582d1c 100644
--- a/pkgs/by-name/re/redmine/Gemfile.lock
+++ b/pkgs/by-name/re/redmine/Gemfile.lock
@@ -79,15 +79,15 @@ GEM
xpath (~> 3.2)
chunky_png (1.4.0)
commonmarker (0.23.10)
- concurrent-ruby (1.3.3)
+ concurrent-ruby (1.3.4)
crass (1.0.6)
- css_parser (1.17.1)
+ css_parser (1.19.1)
addressable
csv (3.2.9)
date (3.3.4)
deckar01-task_list (2.3.2)
html-pipeline
- docile (1.4.0)
+ docile (1.4.1)
erubi (1.13.0)
ffi (1.17.0)
globalid (1.2.1)
@@ -96,15 +96,15 @@ GEM
activesupport (>= 2)
nokogiri (>= 1.4)
htmlentities (4.3.4)
- i18n (1.14.5)
+ i18n (1.14.6)
concurrent-ruby (~> 1.0)
- json (2.7.2)
+ json (2.7.4)
language_server-protocol (3.17.0.3)
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
- logger (1.6.0)
- loofah (2.22.0)
+ logger (1.6.1)
+ loofah (2.23.1)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mail (2.8.1)
@@ -118,8 +118,8 @@ GEM
mini_magick (4.12.0)
mini_mime (1.1.5)
mini_portile2 (2.8.7)
- minitest (5.24.1)
- mocha (2.4.0)
+ minitest (5.25.1)
+ mocha (2.5.0)
ruby2_keywords (>= 0.0.5)
mysql2 (0.5.6)
net-imap (0.3.7)
@@ -132,20 +132,20 @@ GEM
timeout
net-smtp (0.3.4)
net-protocol
- nio4r (2.7.3)
+ nio4r (2.7.4)
nokogiri (1.15.6)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
- parallel (1.25.1)
- parser (3.3.4.0)
+ parallel (1.26.3)
+ parser (3.3.5.0)
ast (~> 2.4.1)
racc
- pg (1.5.6)
- public_suffix (6.0.0)
- puma (6.4.2)
+ pg (1.5.9)
+ public_suffix (6.0.1)
+ puma (6.4.3)
nio4r (~> 2.0)
- racc (1.8.0)
- rack (2.2.9)
+ racc (1.8.1)
+ rack (2.2.10)
rack-test (2.1.0)
rack (>= 1.3)
rails (6.1.7.8)
@@ -189,8 +189,7 @@ GEM
regexp_parser (2.9.2)
request_store (1.5.1)
rack (>= 1.4)
- rexml (3.3.1)
- strscan
+ rexml (3.3.9)
roadie (5.2.1)
css_parser (~> 1.4)
nokogiri (~> 1.15)
@@ -214,7 +213,7 @@ GEM
rubocop-ast (>= 1.28.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
- rubocop-ast (1.31.3)
+ rubocop-ast (1.32.3)
parser (>= 3.3.1.0)
rubocop-performance (1.19.1)
rubocop (>= 1.7.0, < 2.0)
@@ -227,10 +226,10 @@ GEM
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
- sanitize (6.1.1)
+ sanitize (6.1.3)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
- selenium-webdriver (4.22.0)
+ selenium-webdriver (4.25.0)
base64 (~> 0.2)
logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
@@ -240,24 +239,23 @@ GEM
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
- simplecov-html (0.12.3)
+ simplecov-html (0.13.1)
simplecov_json_formatter (0.1.4)
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
- sprockets-rails (3.5.1)
+ sprockets-rails (3.5.2)
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
sqlite3 (1.6.9)
mini_portile2 (~> 2.8.0)
- strscan (3.1.0)
- thor (1.3.1)
+ thor (1.3.2)
timeout (0.4.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
- unicode-display_width (2.5.0)
- webrick (1.8.1)
+ unicode-display_width (2.6.0)
+ webrick (1.8.2)
websocket (1.2.11)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
@@ -267,8 +265,8 @@ GEM
zeitwerk (>= 2.6)
xpath (3.2.0)
nokogiri (~> 1.8)
- yard (0.9.36)
- zeitwerk (2.6.16)
+ yard (0.9.37)
+ zeitwerk (2.6.18)
PLATFORMS
ruby
@@ -321,7 +319,7 @@ DEPENDENCIES
yard
RUBY VERSION
- ruby 3.1.5p252
+ ruby 3.1.6p260
BUNDLED WITH
2.5.9
diff --git a/pkgs/by-name/re/redmine/gemset.nix b/pkgs/by-name/re/redmine/gemset.nix
index 720e7d7fa731..33d1cb392200 100644
--- a/pkgs/by-name/re/redmine/gemset.nix
+++ b/pkgs/by-name/re/redmine/gemset.nix
@@ -208,10 +208,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g";
+ sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
type = "gem";
};
- version = "1.3.3";
+ version = "1.3.4";
};
crass = {
groups = ["default"];
@@ -229,10 +229,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1rhqn05w27w2mjrf0a6ppb4fxpxbfvyhwgdxa8z886jr4qnhywzb";
+ sha256 = "17i0fn99kswvfps8r698zw2cr16rc98xdrl0d26y36rv3vhdqh0r";
type = "gem";
};
- version = "1.17.1";
+ version = "1.19.1";
};
csv = {
groups = ["default"];
@@ -270,10 +270,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz";
+ sha256 = "07pj4z3h8wk4fgdn6s62vw1lwvhj0ac0x10vfbdkr9xzk7krn5cn";
type = "gem";
};
- version = "1.4.0";
+ version = "1.4.1";
};
erubi = {
groups = ["default"];
@@ -343,20 +343,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16";
+ sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw";
type = "gem";
};
- version = "1.14.5";
+ version = "1.14.6";
};
json = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q";
+ sha256 = "1klf2mnfilzjqwcjdi5qb1zl3ghrifz1amcnvwjvsfnx9a5jb9ly";
type = "gem";
};
- version = "2.7.2";
+ version = "2.7.4";
};
language_server-protocol = {
groups = ["default" "test"];
@@ -384,10 +384,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0gpg8gzi0xwymw4aaq2iafcbx31i3xzkg3fb30mdxn1d4qhc3dqa";
+ sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
type = "gem";
};
- version = "1.6.0";
+ version = "1.6.1";
};
loofah = {
dependencies = ["crass" "nokogiri"];
@@ -395,10 +395,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zkjqf37v2d7s11176cb35cl83wls5gm3adnfkn2zcc61h3nxmqh";
+ sha256 = "0ppp2cgli5avzk0z3dwnah6y65ymyr793yja28p2fs9vrci7986h";
type = "gem";
};
- version = "2.22.0";
+ version = "2.23.1";
};
mail = {
dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"];
@@ -484,10 +484,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jj629q3vw5yn90q4di4dyb87pil4a8qfm2srhgy5nc8j2n33v1i";
+ sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix";
type = "gem";
};
- version = "5.24.1";
+ version = "5.25.1";
};
mocha = {
dependencies = ["ruby2_keywords"];
@@ -495,10 +495,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bzpqxmk8h9pr0m6knryjd0dgmmyg0bwrksp3rqhrdxpaa3ddr6s";
+ sha256 = "05vp9kfz8d8wmclpkc9vj67ic1f7p1d5m2kd7xm4rvz8ci85jlkq";
type = "gem";
};
- version = "2.4.0";
+ version = "2.5.0";
};
mysql2 = {
groups = ["default"];
@@ -577,10 +577,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "017nbw87dpr4wyk81cgj8kxkxqgsgblrkxnmmadc77cg9gflrfal";
+ sha256 = "1a9www524fl1ykspznz54i0phfqya4x45hqaz67in9dvw1lfwpfr";
type = "gem";
};
- version = "2.7.3";
+ version = "2.7.4";
};
nokogiri = {
dependencies = ["mini_portile2" "racc"];
@@ -598,10 +598,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "145bn5q7ysnjj02jdf1x4nc1f0xxrv7ihgz9yr1j7sinmawqkq0j";
+ sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq";
type = "gem";
};
- version = "1.25.1";
+ version = "1.26.3";
};
parser = {
dependencies = ["ast" "racc"];
@@ -609,10 +609,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10ly2wind06nylyqa5724ld2l0l46d3ag4fm04ifjgw7qdlpf94d";
+ sha256 = "1cqs31cyg2zp8yx2zzm3zkih0j93q870wasbviy2w343nxqvn3pk";
type = "gem";
};
- version = "3.3.4.0";
+ version = "3.3.5.0";
};
pg = {
groups = ["default"];
@@ -627,20 +627,20 @@
}];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "071b55bhsz7mivlnp2kv0a11msnl7xg5awvk8mlflpl270javhsb";
+ sha256 = "1p2gqqrm895fzr9vi8d118zhql67bm8ydjvgqbq1crdnfggzn7kn";
type = "gem";
};
- version = "1.5.6";
+ version = "1.5.9";
};
public_suffix = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17m8q2dzm7a74amnab5rf3f3m466i300awihl3ygh4v80wpf3j6j";
+ sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
type = "gem";
};
- version = "6.0.0";
+ version = "6.0.1";
};
puma = {
dependencies = ["nio4r"];
@@ -648,30 +648,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0i2vaww6qcazj0ywva1plmjnj6rk23b01szswc5jhcq7s2cikd1y";
+ sha256 = "0gml1rixrfb0naciq3mrnqkpcvm9ahgps1c04hzxh4b801f69914";
type = "gem";
};
- version = "6.4.2";
+ version = "6.4.3";
};
racc = {
groups = ["common_mark" "default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09";
+ sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa";
type = "gem";
};
- version = "1.8.0";
+ version = "1.8.1";
};
rack = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0hj0rkw2z9r1lcg2wlrcld2n3phwrcgqcp7qd1g9a7hwgalh2qzx";
+ sha256 = "0ax778fsfvlhj7c11n0d1wdcb8bxvkb190a9lha5d91biwzyx9g4";
type = "gem";
};
- version = "2.2.9";
+ version = "2.2.10";
};
rack-test = {
dependencies = ["rack"];
@@ -822,15 +822,14 @@
version = "1.5.1";
};
rexml = {
- dependencies = ["strscan"];
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09f3sw7f846fpcpwdm362ylqldwqxpym6z0qpld4av7zisrrzbrl";
+ sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p";
type = "gem";
};
- version = "3.3.1";
+ version = "3.3.9";
};
roadie = {
dependencies = ["css_parser" "nokogiri"];
@@ -912,10 +911,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "063qgvqbyv354icl2sgx758z22wzq38hd9skc3n96sbpv0cdc1qv";
+ sha256 = "03zywfpm4540q6hw8srhi8pzp0gg51w65ir8jkaw58vk3j31w820";
type = "gem";
};
- version = "1.31.3";
+ version = "1.32.3";
};
rubocop-performance = {
dependencies = ["rubocop" "rubocop-ast"];
@@ -975,10 +974,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qczw46f82f8nam87xdzk17frwfwwqq7km6ma0kwc0nadmi4glgq";
+ sha256 = "0lj1jjxn1znxmaf6jnngfrz26rw85smxb69m4jl6a9yq6gwyab54";
type = "gem";
};
- version = "6.1.1";
+ version = "6.1.3";
};
selenium-webdriver = {
dependencies = ["base64" "logger" "rexml" "rubyzip" "websocket"];
@@ -986,10 +985,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rjxlivsh32xvjq78p1m1sr366aa04wms4hwb2r187ygrnmp0hv4";
+ sha256 = "1md0sixm8dq8a7riv50x4q1z273q47b5jvcbv5hxympxn3ran4by";
type = "gem";
};
- version = "4.22.0";
+ version = "4.25.0";
};
simplecov = {
dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"];
@@ -1007,10 +1006,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0yx01bxa8pbf9ip4hagqkp5m0mqfnwnw2xk8kjraiywz4lrss6jb";
+ sha256 = "02zi3rwihp7rlnp9x18c9idnkx7x68w6jmxdhyc0xrhjwrz0pasx";
type = "gem";
};
- version = "0.12.3";
+ version = "0.13.1";
};
simplecov_json_formatter = {
groups = ["default" "test"];
@@ -1039,10 +1038,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0j7gwm749b3ff6544wxa878fpd1kvf2qc9fafassi8c7735jcin4";
+ sha256 = "17hiqkdpcjyyhlm997mgdcr45v35j5802m5a979i5jgqx5n8xs59";
type = "gem";
};
- version = "3.5.1";
+ version = "3.5.2";
};
sqlite3 = {
dependencies = ["mini_portile2"];
@@ -1063,25 +1062,15 @@
};
version = "1.6.9";
};
- strscan = {
- groups = ["default" "test"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01";
- type = "gem";
- };
- version = "3.1.0";
- };
thor = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps";
+ sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f";
type = "gem";
};
- version = "1.3.1";
+ version = "1.3.2";
};
timeout = {
groups = ["default"];
@@ -1109,20 +1098,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky";
+ sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj";
type = "gem";
};
- version = "2.5.0";
+ version = "2.6.0";
};
webrick = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r";
+ sha256 = "089gy5494j560b242vi173wnbj2913hwlwnjkpzld58r96ilc5s3";
type = "gem";
};
- version = "1.8.1";
+ version = "1.8.2";
};
websocket = {
groups = ["default" "test"];
@@ -1182,19 +1171,19 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1r0b8w58p7gy06wph1qdjv2p087hfnmhd9jk23vjdj803dn761am";
+ sha256 = "14k9lb9a60r9z2zcqg08by9iljrrgjxdkbd91gw17rkqkqwi1sd6";
type = "gem";
};
- version = "0.9.36";
+ version = "0.9.37";
};
zeitwerk = {
groups = ["common_mark" "default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08cfb35232p9s1r4jqv8wacv38vxh699mgbr9y03ga89gx9lipqp";
+ sha256 = "10cpfdswql21vildiin0q7drg5zfzf2sahnk9hv3nyzzjqwj2bdx";
type = "gem";
};
- version = "2.6.16";
+ version = "2.6.18";
};
}
diff --git a/pkgs/by-name/re/redocly/package.nix b/pkgs/by-name/re/redocly/package.nix
index fe53529c18b9..7eb4b8d0631a 100644
--- a/pkgs/by-name/re/redocly/package.nix
+++ b/pkgs/by-name/re/redocly/package.nix
@@ -8,16 +8,16 @@
buildNpmPackage rec {
pname = "redocly";
- version = "1.25.5";
+ version = "1.25.9";
src = fetchFromGitHub {
owner = "Redocly";
repo = "redocly-cli";
rev = "@redocly/cli@${version}";
- hash = "sha256-pVSmrORa6KcAwllYepwra8QpnlfFoB9+noevLSmoWzY=";
+ hash = "sha256-QOD1EqigHa/daanwajoiQAy0fJRi8yWJKj41k0SZyJo=";
};
- npmDepsHash = "sha256-nFRKC3xM+vq9SDeIelUqE/ZSSCSke0G0Qm629/s6WO8=";
+ npmDepsHash = "sha256-Bo8Zdft+AfjSXDnxXvKq+AEpU4vtB+XBkmzqLRuHLrw=";
npmBuildScript = "prepare";
@@ -36,7 +36,7 @@ buildNpmPackage rec {
makeWrapper $out/lib/node_modules/@redocly/cli/node_modules/@redocly/cli/bin/cli.js \
$out/bin/redocly \
--set-default REDOCLY_TELEMETRY off \
- --set-default CI true # Silence update messages
+ --set-default REDOCLY_SUPPRESS_UPDATE_NOTICE true
# Symlink for backwards compatibility. Remove after 24.05.
ln -s $out/bin/redocly $out/bin/redocly-cli
diff --git a/pkgs/by-name/re/remctl/package.nix b/pkgs/by-name/re/remctl/package.nix
new file mode 100644
index 000000000000..b354440de81a
--- /dev/null
+++ b/pkgs/by-name/re/remctl/package.nix
@@ -0,0 +1,62 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ autoreconfHook,
+ libevent,
+ krb5,
+ openssl,
+ perl,
+ pkg-config,
+}:
+stdenv.mkDerivation (finalAttrs: {
+ pname = "remctl";
+ version = "3.18";
+
+ src = fetchFromGitHub {
+ owner = "rra";
+ repo = "remctl";
+ rev = "release/${finalAttrs.version}";
+ hash = "sha256-4KzNhFswNTwcXrDBAfRyr502zwRQ3FACV8gDfBm7M0A=";
+ };
+
+ # Fix references to /usr/bin/perl in tests and
+ # disable acl/localgroup test that does not work in sandbox.
+ postPatch = ''
+ patchShebangs tests
+ sed -i '\,server/acl/localgroup,d' tests/TESTS
+ '';
+
+ nativeBuildInputs = [
+ autoreconfHook
+ perl
+ pkg-config
+ ];
+
+ buildInputs = [
+ krb5
+ libevent
+ openssl
+ ];
+
+ # Invokes pod2man to create man pages required by Makefile.
+ preConfigure = ''
+ ./bootstrap
+ '';
+
+ makeFlags = [
+ "LD=$(CC)"
+ "REMCTL_PERL_FLAGS='--prefix=$(out)'"
+ "REMCTL_PYTHON_INSTALL='--prefix=$(out)'"
+ ];
+
+ checkTarget = "check-local";
+
+ meta = with lib; {
+ description = "Remote execution tool";
+ homepage = "https://www.eyrie.org/~eagle/software/remctl";
+ mainProgram = "remctl";
+ license = licenses.mit;
+ maintainers = teams.deshaw.members;
+ };
+})
diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix
index bbeadc7773cd..eb01ac3c885d 100644
--- a/pkgs/by-name/re/remind/package.nix
+++ b/pkgs/by-name/re/remind/package.nix
@@ -3,7 +3,7 @@
stdenv,
fetchurl,
tk,
- tcllib,
+ tclPackages,
tcl,
tkremind ? null,
withGui ?
@@ -23,7 +23,7 @@ tcl.mkTclDerivation rec {
};
propagatedBuildInputs = lib.optionals withGui [
- tcllib
+ tclPackages.tcllib
tk
];
diff --git a/pkgs/by-name/re/repak/package.nix b/pkgs/by-name/re/repak/package.nix
new file mode 100644
index 000000000000..dd52b9858f0c
--- /dev/null
+++ b/pkgs/by-name/re/repak/package.nix
@@ -0,0 +1,34 @@
+{
+ lib,
+ fetchFromGitHub,
+ rustPlatform,
+ nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "repak";
+ version = "0.2.2";
+
+ src = fetchFromGitHub {
+ owner = "trumank";
+ repo = "repak";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-nl05EsR52YFSR9Id3zFynhrBIvaqVwUOdjPlSp19Gcc=";
+ };
+
+ cargoHash = "sha256-4RA3Nv4Wes3etrnZSnHRjJ3ukA6stJXDj3ftaCxGwuY=";
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ description = "Unreal Engine .pak file library and CLI in rust";
+ homepage = "https://github.com/trumank/repak";
+ changelog = "https://github.com/trumank/repak/releases/tag/v${version}";
+ license = with lib.licenses; [
+ mit
+ asl20
+ ];
+ maintainers = with lib.maintainers; [ florensie ];
+ mainProgram = "repak";
+ };
+}
diff --git a/pkgs/by-name/re/revpfw3/package.nix b/pkgs/by-name/re/revpfw3/package.nix
index d7ae4ac43fbe..6858f84354b2 100644
--- a/pkgs/by-name/re/revpfw3/package.nix
+++ b/pkgs/by-name/re/revpfw3/package.nix
@@ -2,10 +2,13 @@
lib,
fetchgit,
rustPlatform,
+ nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "revpfw3";
- version = "0.4.0";
+ version = "0.4.2";
+
+ passthru.updateScript = nix-update-script { };
src = fetchgit {
url = "https://git.tudbut.de/tudbut/revpfw3";
@@ -13,7 +16,7 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-v8BtgQYdELui5Yu8kpE5f97MSo/WhNah+e1xXhZGJwM=";
};
- cargoHash = "sha256-0AVp6fQq/NCkvKcK5ALbFNxNkt0NgbOmGlmDBGxwONQ=";
+ cargoHash = "sha256-MmVN4NmwSZiWYh7uMAQ+OogJT1kRLoB2q6gVfoaer54=";
meta = {
description = "Reverse proxy to bypass the need for port forwarding";
diff --git a/pkgs/by-name/ro/rofi-games/fix-justfile.patch b/pkgs/by-name/ro/rofi-games/fix-justfile.patch
new file mode 100644
index 000000000000..05d0ab946c50
--- /dev/null
+++ b/pkgs/by-name/ro/rofi-games/fix-justfile.patch
@@ -0,0 +1,26 @@
+diff --git a/justfile b/justfile
+index cd111a1..b6f3827 100644
+--- a/justfile
++++ b/justfile
+@@ -13,9 +13,9 @@ PKGNAME := env("PKGNAME", "rofi-games")
+ PKGDIR := env("PKGDIR", "")
+ LIB_NAME := "librofi_games.so"
+ PLUGIN_NAME := "games.so"
+-THEMES_DIR := "/usr/share/rofi/themes"
+-LICENSES_DIR := "/usr/share/licenses/" + PKGNAME
+-PLUGINS_DIR := `pkg-config --variable pluginsdir rofi || if test -d "/usr/lib64"; then echo "/usr/lib64/rofi"; else echo "/usr/lib/rofi"; fi`
++THEMES_DIR := "/share/rofi/themes"
++LICENSES_DIR := "/share/licenses/" + PKGNAME
++PLUGINS_DIR := "/lib/rofi"
+ PLUGIN_PATH := join(PLUGINS_DIR, PLUGIN_NAME)
+
+ # Set rust flags if running a version of `rofi` with changes newer than the base `1.7.5`
+@@ -32,7 +32,7 @@ RUSTFLAGS := if `rofi -version` =~ '^Version: 1\.7\.5(?:\+wayland2)?$' { "" } el
+
+ # List commands
+ default:
+- just --list
++ just build
+
+ # Build
+ build:
diff --git a/pkgs/by-name/ro/rofi-games/package.nix b/pkgs/by-name/ro/rofi-games/package.nix
new file mode 100644
index 000000000000..4f85dbfc159d
--- /dev/null
+++ b/pkgs/by-name/ro/rofi-games/package.nix
@@ -0,0 +1,62 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ rustPlatform,
+ cargo,
+ just,
+ rofi,
+ pkg-config,
+ glib,
+ cairo,
+ pango,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "rofi-games";
+ version = "1.10.2";
+
+ src = fetchFromGitHub {
+ owner = "Rolv-Apneseth";
+ repo = "rofi-games";
+ rev = "refs/tags/v${finalAttrs.version}";
+ hash = "sha256-4L3gk/RG9g5QnUW1AJkZIl0VkBiO/L0HUBC3pibN/qo=";
+ };
+
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit (finalAttrs) pname version src;
+ hash = "sha256-cU7gp/c1yx3ZLaZuGs1bvOV4AKgLusraILVJ2EhH1iA=";
+ };
+
+ patches = [
+ # fix the install locations of files and set default just task
+ ./fix-justfile.patch
+ ];
+
+ env.PKGDIR = placeholder "out";
+
+ strictDeps = true;
+
+ nativeBuildInputs = [
+ rustPlatform.cargoSetupHook
+ cargo
+ just
+ rofi
+ pkg-config
+ ];
+
+ buildInputs = [
+ glib
+ cairo
+ pango
+ ];
+
+ meta = {
+ changelog = "https://github.com/Rolv-Apneseth/rofi-games/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+ description = "Rofi plugin which adds a mode that will list available games for launch along with their box art";
+ homepage = "https://github.com/Rolv-Apneseth/rofi-games";
+ license = lib.licenses.gpl2Only;
+ maintainers = with lib.maintainers; [ tomasajt ];
+ platforms = lib.platforms.linux;
+ };
+})
diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix
index 12942225207d..deaeac82bda8 100644
--- a/pkgs/by-name/rp/rpcs3/package.nix
+++ b/pkgs/by-name/rp/rpcs3/package.nix
@@ -33,10 +33,10 @@
let
# Keep these separate so the update script can regex them
- rpcs3GitVersion = "16999-938306a7b";
- rpcs3Version = "0.0.33-16999-938306a7b";
- rpcs3Revision = "938306a7bc86edd0dfdd995d28e818f36240bf8f";
- rpcs3Hash = "sha256-5XufzJ3LmhBpLiIscIW3KBgj/R9aSDD5zFiBo/D+p34=";
+ rpcs3GitVersion = "17070-8b8396b94";
+ rpcs3Version = "0.0.33-17070-8b8396b94";
+ rpcs3Revision = "8b8396b9455394486656660c960d420c5b6c446c";
+ rpcs3Hash = "sha256-LUgKUzoBNY4ZemRBsLOjtXxLXHyRkPivtdSSgUGw5h4=";
inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland;
in
diff --git a/pkgs/by-name/rs/rsop/package.nix b/pkgs/by-name/rs/rsop/package.nix
new file mode 100644
index 000000000000..080063968f6c
--- /dev/null
+++ b/pkgs/by-name/rs/rsop/package.nix
@@ -0,0 +1,49 @@
+{
+ lib,
+ rustPlatform,
+ fetchFromGitea,
+ pkg-config,
+ pcsclite,
+ nix-update-script,
+ testers,
+ rsop,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "rsop";
+ version = "0.3.9";
+
+ src = fetchFromGitea {
+ domain = "codeberg.org";
+ owner = "heiko";
+ repo = "rsop";
+ rev = "rsop/v${version}";
+ hash = "sha256-K69vyZFaVvZj4yLaV/zQYoItvcTDuFR4mdmMcfl1UDA=";
+ };
+
+ cargoHash = "sha256-DJVgnfPpXf8hGX6Dv6W8GzqspMEFZHc2/Fkn1MZRXd0=";
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [ pcsclite ];
+
+ passthru = {
+ updateScript = nix-update-script { };
+ tests.version = testers.testVersion {
+ command = "rsop version";
+ package = rsop;
+ };
+ };
+
+ meta = {
+ homepage = "https://codeberg.org/heiko/rsop";
+ description = "Stateless OpenPGP (SOP) based on rpgp";
+ license = with lib.licenses; [
+ mit
+ apsl20
+ cc0
+ ];
+ maintainers = with lib.maintainers; [ nikstur ];
+ mainProgram = "rsop";
+ };
+}
diff --git a/pkgs/by-name/ru/ruff-lsp/package.nix b/pkgs/by-name/ru/ruff-lsp/package.nix
index b2a3a9285a72..e924e8b95ebb 100644
--- a/pkgs/by-name/ru/ruff-lsp/package.nix
+++ b/pkgs/by-name/ru/ruff-lsp/package.nix
@@ -3,9 +3,6 @@
python3Packages,
fetchFromGitHub,
- # nativeCheckInputs
- ruff,
-
# tests
versionCheckHook,
@@ -25,17 +22,13 @@ python3Packages.buildPythonApplication rec {
hash = "sha256-TB4OcKkaUGYAmiGNJRnfRmiXTyTQL4sFoBrzxT6DWec=";
};
- postPatch = ''
- # ruff binary added to PATH in wrapper so it's not needed
- sed -i '/"ruff>=/d' pyproject.toml
- '';
-
build-system = with python3Packages; [ hatchling ];
dependencies = with python3Packages; [
packaging
pygls
lsprotocol
+ ruff
typing-extensions
];
@@ -43,15 +36,14 @@ python3Packages.buildPythonApplication rec {
pytestCheckHook
pytest-asyncio
python-lsp-jsonrpc
- ruff
+ ruff.bin
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
makeWrapperArgs = [
# prefer ruff from user's PATH, that's usually desired behavior
- "--suffix PATH : ${lib.makeBinPath [ ruff ]}"
-
+ "--suffix PATH : ${lib.makeBinPath (with python3Packages; [ ruff ])}"
# Unset ambient PYTHONPATH in the wrapper, so ruff-lsp only ever runs with
# its own, isolated set of dependencies. This works because the correct
# PYTHONPATH is set in the Python script, which runs after the wrapper.
diff --git a/pkgs/by-name/ru/ruff/Cargo.lock b/pkgs/by-name/ru/ruff/Cargo.lock
index 9fd3cb9b621d..0e488abec554 100644
--- a/pkgs/by-name/ru/ruff/Cargo.lock
+++ b/pkgs/by-name/ru/ruff/Cargo.lock
@@ -69,7 +69,7 @@ version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e"
dependencies = [
- "unicode-width",
+ "unicode-width 0.1.13",
"yansi-term",
]
@@ -123,9 +123,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.89"
+version = "1.0.90"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95"
[[package]]
name = "append-only-vec"
@@ -407,7 +407,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.82",
]
[[package]]
@@ -491,7 +491,7 @@ dependencies = [
"encode_unicode",
"lazy_static",
"libc",
- "unicode-width",
+ "unicode-width 0.1.13",
"windows-sys 0.52.0",
]
@@ -687,7 +687,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim 0.10.0",
- "syn",
+ "syn 2.0.82",
]
[[package]]
@@ -698,7 +698,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
dependencies = [
"darling_core",
"quote",
- "syn",
+ "syn 2.0.82",
]
[[package]]
@@ -750,6 +750,27 @@ dependencies = [
"crypto-common",
]
+[[package]]
+name = "dir-test"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c44bdf9319ad5223afb7eb15a7110452b0adf0373ea6756561b2c708eef0dd1"
+dependencies = [
+ "dir-test-macros",
+]
+
+[[package]]
+name = "dir-test-macros"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "644f96047137dfaa7a09e34d4623f9e52a1926ecc25ba32ad2ba3fc422536b25"
+dependencies = [
+ "glob",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
[[package]]
name = "dirs"
version = "4.0.0"
@@ -879,9 +900,9 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
[[package]]
name = "fern"
-version = "0.6.2"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee"
+checksum = "69ff9c9d5fb3e6da8ac2f77ab76fe7e8087d512ce095200f8f29ac5b656cf6dc"
dependencies = [
"log",
]
@@ -957,7 +978,7 @@ version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
dependencies = [
- "unicode-width",
+ "unicode-width 0.1.13",
]
[[package]]
@@ -1160,7 +1181,7 @@ dependencies = [
"instant",
"number_prefix",
"portable-atomic",
- "unicode-width",
+ "unicode-width 0.1.13",
"vt100",
]
@@ -1246,7 +1267,7 @@ dependencies = [
"Inflector",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.82",
]
[[package]]
@@ -1346,9 +1367,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
-version = "0.2.159"
+version = "0.2.161"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
[[package]]
name = "libcst"
@@ -1372,7 +1393,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2ae40017ac09cd2c6a53504cb3c871c7f2b41466eac5bc66ba63f39073b467b"
dependencies = [
"quote",
- "syn",
+ "syn 2.0.82",
]
[[package]]
@@ -1760,18 +1781,17 @@ dependencies = [
"once_cell",
"regex",
"serde",
- "unicode-width",
+ "unicode-width 0.1.13",
]
[[package]]
name = "pep440_rs"
-version = "0.6.6"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "466eada3179c2e069ca897b99006cbb33f816290eaeec62464eea907e22ae385"
+checksum = "7c8ee724d21f351f9d47276614ac9710975db827ba9fe2ca5a517ba648193307"
dependencies = [
- "once_cell",
"serde",
- "unicode-width",
+ "unicode-width 0.2.0",
"unscanny",
]
@@ -1787,7 +1807,7 @@ dependencies = [
"serde",
"thiserror",
"tracing",
- "unicode-width",
+ "unicode-width 0.1.13",
"url",
]
@@ -1828,7 +1848,7 @@ dependencies = [
"pest_meta",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.82",
]
[[package]]
@@ -1943,9 +1963,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.87"
+version = "1.0.88"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
+checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
dependencies = [
"unicode-ident",
]
@@ -2080,6 +2100,7 @@ dependencies = [
"camino",
"compact_str",
"countme",
+ "dir-test",
"hashbrown 0.15.0",
"insta",
"itertools 0.13.0",
@@ -2087,7 +2108,6 @@ dependencies = [
"ordermap",
"red_knot_test",
"red_knot_vendored",
- "rstest",
"ruff_db",
"ruff_index",
"ruff_python_ast",
@@ -2136,7 +2156,7 @@ version = "0.0.0"
dependencies = [
"anyhow",
"colored",
- "once_cell",
+ "memchr",
"red_knot_python_semantic",
"red_knot_vendored",
"regex",
@@ -2154,7 +2174,6 @@ dependencies = [
name = "red_knot_vendored"
version = "0.0.0"
dependencies = [
- "once_cell",
"path-slash",
"ruff_db",
"walkdir",
@@ -2270,12 +2289,6 @@ version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
-[[package]]
-name = "relative-path"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
-
[[package]]
name = "ring"
version = "0.17.8"
@@ -2291,36 +2304,9 @@ dependencies = [
"windows-sys 0.52.0",
]
-[[package]]
-name = "rstest"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b423f0e62bdd61734b67cd21ff50871dfaeb9cc74f869dcd6af974fbcb19936"
-dependencies = [
- "rstest_macros",
- "rustc_version",
-]
-
-[[package]]
-name = "rstest_macros"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e1711e7d14f74b12a58411c542185ef7fb7f2e7f8ee6e2940a883628522b42"
-dependencies = [
- "cfg-if",
- "glob",
- "proc-macro2",
- "quote",
- "regex",
- "relative-path",
- "rustc_version",
- "syn",
- "unicode-ident",
-]
-
[[package]]
name = "ruff"
-version = "0.7.0"
+version = "0.7.1"
dependencies = [
"anyhow",
"argfile",
@@ -2382,7 +2368,6 @@ dependencies = [
"codspeed-criterion-compat",
"criterion",
"mimalloc",
- "once_cell",
"rayon",
"red_knot_python_semantic",
"red_knot_workspace",
@@ -2506,7 +2491,7 @@ dependencies = [
"serde",
"static_assertions",
"tracing",
- "unicode-width",
+ "unicode-width 0.1.13",
]
[[package]]
@@ -2515,7 +2500,6 @@ version = "0.1.0"
dependencies = [
"anyhow",
"clap",
- "once_cell",
"red_knot_python_semantic",
"ruff_cache",
"ruff_db",
@@ -2539,7 +2523,7 @@ dependencies = [
[[package]]
name = "ruff_linter"
-version = "0.7.0"
+version = "0.7.1"
dependencies = [
"aho-corasick",
"annotate-snippets 0.9.2",
@@ -2560,10 +2544,9 @@ dependencies = [
"log",
"memchr",
"natord",
- "once_cell",
"path-absolutize",
"pathdiff",
- "pep440_rs 0.6.6",
+ "pep440_rs 0.7.1",
"pyproject-toml",
"quick-junit",
"regex",
@@ -2594,7 +2577,7 @@ dependencies = [
"toml",
"typed-arena",
"unicode-normalization",
- "unicode-width",
+ "unicode-width 0.1.13",
"unicode_names2",
"url",
]
@@ -2607,7 +2590,7 @@ dependencies = [
"proc-macro2",
"quote",
"ruff_python_trivia",
- "syn",
+ "syn 2.0.82",
]
[[package]]
@@ -2616,7 +2599,6 @@ version = "0.0.0"
dependencies = [
"anyhow",
"itertools 0.13.0",
- "once_cell",
"rand",
"ruff_diagnostics",
"ruff_source_file",
@@ -2638,7 +2620,6 @@ dependencies = [
"compact_str",
"is-macro",
"itertools 0.13.0",
- "once_cell",
"ruff_cache",
"ruff_macros",
"ruff_python_trivia",
@@ -2664,7 +2645,6 @@ dependencies = [
name = "ruff_python_codegen"
version = "0.0.0"
dependencies = [
- "once_cell",
"ruff_python_ast",
"ruff_python_literal",
"ruff_python_parser",
@@ -2682,7 +2662,6 @@ dependencies = [
"insta",
"itertools 0.13.0",
"memchr",
- "once_cell",
"regex",
"ruff_cache",
"ruff_formatter",
@@ -2833,6 +2812,7 @@ dependencies = [
"serde",
"serde_json",
"shellexpand",
+ "thiserror",
"tracing",
"tracing-subscriber",
]
@@ -2842,7 +2822,6 @@ name = "ruff_source_file"
version = "0.0.0"
dependencies = [
"memchr",
- "once_cell",
"ruff_text_size",
"serde",
]
@@ -2859,7 +2838,7 @@ dependencies = [
[[package]]
name = "ruff_wasm"
-version = "0.7.0"
+version = "0.7.1"
dependencies = [
"console_error_panic_hook",
"console_log",
@@ -2898,7 +2877,7 @@ dependencies = [
"matchit",
"path-absolutize",
"path-slash",
- "pep440_rs 0.6.6",
+ "pep440_rs 0.7.1",
"regex",
"ruff_cache",
"ruff_formatter",
@@ -2940,15 +2919,6 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
-[[package]]
-name = "rustc_version"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
-dependencies = [
- "semver",
-]
-
[[package]]
name = "rustix"
version = "0.38.37"
@@ -3009,7 +2979,7 @@ checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
[[package]]
name = "salsa"
version = "0.18.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=b14be5c0392f4c55eca60b92e457a35549372382#b14be5c0392f4c55eca60b92e457a35549372382"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=254c749b02cde2fd29852a7463a33e800b771758#254c749b02cde2fd29852a7463a33e800b771758"
dependencies = [
"append-only-vec",
"arc-swap",
@@ -3029,17 +2999,17 @@ dependencies = [
[[package]]
name = "salsa-macro-rules"
version = "0.1.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=b14be5c0392f4c55eca60b92e457a35549372382#b14be5c0392f4c55eca60b92e457a35549372382"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=254c749b02cde2fd29852a7463a33e800b771758#254c749b02cde2fd29852a7463a33e800b771758"
[[package]]
name = "salsa-macros"
version = "0.18.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=b14be5c0392f4c55eca60b92e457a35549372382#b14be5c0392f4c55eca60b92e457a35549372382"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=254c749b02cde2fd29852a7463a33e800b771758#254c749b02cde2fd29852a7463a33e800b771758"
dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.82",
"synstructure",
]
@@ -3073,7 +3043,7 @@ dependencies = [
"proc-macro2",
"quote",
"serde_derive_internals",
- "syn",
+ "syn 2.0.82",
]
[[package]]
@@ -3094,12 +3064,6 @@ version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
-[[package]]
-name = "semver"
-version = "1.0.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
-
[[package]]
name = "serde"
version = "1.0.210"
@@ -3128,7 +3092,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.82",
]
[[package]]
@@ -3139,14 +3103,14 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.82",
]
[[package]]
name = "serde_json"
-version = "1.0.128"
+version = "1.0.132"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
dependencies = [
"itoa",
"memchr",
@@ -3162,7 +3126,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.82",
]
[[package]]
@@ -3203,7 +3167,7 @@ dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.82",
]
[[package]]
@@ -3305,7 +3269,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
- "syn",
+ "syn 2.0.82",
]
[[package]]
@@ -3316,9 +3280,20 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
[[package]]
name = "syn"
-version = "2.0.79"
+version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021"
dependencies = [
"proc-macro2",
"quote",
@@ -3333,7 +3308,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.82",
]
[[package]]
@@ -3396,7 +3371,7 @@ dependencies = [
"cfg-if",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.82",
]
[[package]]
@@ -3407,7 +3382,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.82",
"test-case-core",
]
@@ -3428,7 +3403,7 @@ checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.82",
]
[[package]]
@@ -3540,7 +3515,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.82",
]
[[package]]
@@ -3704,6 +3679,12 @@ version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+[[package]]
+name = "unicode-width"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+
[[package]]
name = "unicode_names2"
version = "1.3.0"
@@ -3774,9 +3755,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "uuid"
-version = "1.10.0"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
dependencies = [
"getrandom",
"rand",
@@ -3786,13 +3767,13 @@ dependencies = [
[[package]]
name = "uuid-macro-internal"
-version = "1.10.0"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee1cd046f83ea2c4e920d6ee9f7c3537ef928d75dce5d84a87c2c5d6b3999a3a"
+checksum = "6b91f57fe13a38d0ce9e28a03463d8d3c2468ed03d75375110ec71d93b449a08"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.82",
]
[[package]]
@@ -3815,7 +3796,7 @@ checksum = "84cd863bf0db7e392ba3bd04994be3473491b31e66340672af5d11943c6274de"
dependencies = [
"itoa",
"log",
- "unicode-width",
+ "unicode-width 0.1.13",
"vte",
]
@@ -3878,7 +3859,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.82",
"wasm-bindgen-shared",
]
@@ -3912,7 +3893,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.82",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -3946,7 +3927,7 @@ checksum = "c97b2ef2c8d627381e51c071c2ab328eac606d3f69dd82bcbca20a9e389d95f0"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.82",
]
[[package]]
@@ -4234,7 +4215,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.82",
]
[[package]]
diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index 4e31b051105c..25678f65f83a 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -4,44 +4,77 @@
fetchFromGitHub,
installShellFiles,
stdenv,
+ python3Packages,
darwin,
rust-jemalloc-sys,
ruff-lsp,
nix-update-script,
versionCheckHook,
+ libiconv,
}:
-rustPlatform.buildRustPackage rec {
+python3Packages.buildPythonPackage rec {
pname = "ruff";
- version = "0.7.0";
+ version = "0.7.1";
+ pyproject = true;
+
+ outputs = [
+ "bin"
+ "out"
+ ];
src = fetchFromGitHub {
owner = "astral-sh";
repo = "ruff";
rev = "refs/tags/${version}";
- hash = "sha256-//ayB5ayYM5FqiSXDDns2tIL+PJ0Osvkp8+MEEL0L+8=";
+ hash = "sha256-TPr6YdSb5JKltXHDi1PdGzPYjmmsbCFQKxIiJURrBMI=";
};
- cargoLock = {
+ # Do not rely on path lookup at runtime to find the ruff binary
+ postPatch = ''
+ substituteInPlace python/ruff/__main__.py \
+ --replace-fail \
+ 'ruff_exe = "ruff" + sysconfig.get_config_var("EXE")' \
+ 'return "${placeholder "bin"}/bin/ruff"'
+ '';
+
+ cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"lsp-types-0.95.1" = "sha256-8Oh299exWXVi6A39pALOISNfp8XBya8z+KT/Z7suRxQ=";
- "salsa-0.18.0" = "sha256-vuLgeaqIL8U+5PUHJaGdovHFapAMGGQ9nPAMJJnxz/o=";
+ "salsa-0.18.0" = "sha256-zUF2ZBorJzgo8O8ZEnFaitAvWXqNwtHSqx4JE8nByIg=";
};
};
- nativeBuildInputs = [ installShellFiles ];
+ nativeBuildInputs =
+ [ installShellFiles ]
+ ++ (with rustPlatform; [
+ cargoSetupHook
+ maturinBuildHook
+ cargoCheckHook
+ ]);
- buildInputs = [
- rust-jemalloc-sys
- ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ];
+ buildInputs =
+ [
+ rust-jemalloc-sys
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ darwin.apple_sdk.frameworks.CoreServices
+ libiconv
+ ];
- postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
- installShellCompletion --cmd ruff \
- --bash <($out/bin/ruff generate-shell-completion bash) \
- --fish <($out/bin/ruff generate-shell-completion fish) \
- --zsh <($out/bin/ruff generate-shell-completion zsh)
- '';
+ postInstall =
+ ''
+ mkdir -p $bin/bin
+ mv $out/bin/ruff $bin/bin/
+ rmdir $out/bin
+ ''
+ + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+ installShellCompletion --cmd ruff \
+ --bash <($bin/bin/ruff generate-shell-completion bash) \
+ --fish <($bin/bin/ruff generate-shell-completion fish) \
+ --zsh <($bin/bin/ruff generate-shell-completion zsh)
+ '';
passthru = {
tests = {
@@ -50,6 +83,12 @@ rustPlatform.buildRustPackage rec {
updateScript = nix-update-script { };
};
+ # Run cargo tests
+ cargoCheckType = "debug";
+ postInstallCheck = ''
+ cargoCheckHook
+ '';
+
# Failing on darwin for an unclear reason.
# According to the maintainers, those tests are from an experimental crate that isn't actually
# used by ruff currently and can thus be safely skipped.
@@ -73,11 +112,12 @@ rustPlatform.buildRustPackage rec {
"--skip=unix::symlink_inside_workspace"
];
- nativeInstallCheckInputs = [
+ nativeCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = [ "--version" ];
- doInstallCheck = true;
+
+ pythonImportsCheck = [ "ruff" ];
meta = {
description = "Extremely fast Python linter";
diff --git a/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock b/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock
index 406c1525a8f8..fb924be286cf 100644
--- a/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock
+++ b/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock
@@ -3043,7 +3043,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "hwcodec"
version = "0.7.0"
-source = "git+https://github.com/rustdesk-org/hwcodec#f74410edec91435252b8394c38f8eeca87ad2a26"
+source = "git+https://github.com/rustdesk-org/hwcodec#8bbd05bb300ad07cc345356ad85570f9ea99fbfa"
dependencies = [
"bindgen 0.59.2",
"cc",
@@ -5197,7 +5197,7 @@ dependencies = [
[[package]]
name = "rdev"
version = "0.5.0-2"
-source = "git+https://github.com/rustdesk-org/rdev#d4c1759926d693ba269e2cb8cf9f87b13e424e4e"
+source = "git+https://github.com/rustdesk-org/rdev#961d25cc00c6b3ef80f444e6a7bed9872e2c35ea"
dependencies = [
"cocoa 0.24.1",
"core-foundation 0.9.4",
@@ -5472,7 +5472,7 @@ dependencies = [
[[package]]
name = "rustdesk"
-version = "1.3.1"
+version = "1.3.2"
dependencies = [
"android-wakelock",
"android_logger",
@@ -5572,7 +5572,7 @@ dependencies = [
[[package]]
name = "rustdesk-portable-packer"
-version = "1.3.1"
+version = "1.3.2"
dependencies = [
"brotli",
"dirs 5.0.1",
diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix
index 2dd1b134eaa6..3ff05d808baa 100644
--- a/pkgs/by-name/ru/rustdesk-flutter/package.nix
+++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix
@@ -29,7 +29,7 @@ let
flutterRustBridge = rustPlatform.buildRustPackage rec {
pname = "flutter_rust_bridge_codegen";
- version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.3.1/.github/workflows/bridge.yml#L10
+ version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.3.2/.github/workflows/bridge.yml#L10
src = fetchFromGitHub {
owner = "fzyzcjy";
@@ -51,12 +51,12 @@ let
in
flutter319.buildFlutterApplication rec {
pname = "rustdesk";
- version = "1.3.1";
+ version = "1.3.2";
src = fetchFromGitHub {
owner = "rustdesk";
repo = "rustdesk";
rev = version;
- hash = "sha256-PioaSdvgJ9oXC5DAbl+em7rxcGx1om9+sjCMdrvox90=";
+ hash = "sha256-SvK11IuuTkO8sxLVnYyyRtYyzV6R9NwMtyY5UCdw/P8=";
};
strictDeps = true;
@@ -64,13 +64,13 @@ flutter319.buildFlutterApplication rec {
# Configure the Flutter/Dart build
sourceRoot = "${src.name}/flutter";
- # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.3.1/flutter/pubspec.lock | yq > pubspec.lock.json
+ # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.3.2/flutter/pubspec.lock | yq > pubspec.lock.json
pubspecLock = lib.importJSON ./pubspec.lock.json;
gitHashes = {
dash_chat_2 = "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow=";
- desktop_multi_window = "sha256-6nbOUmGTmJQx3Dr4MI6cKWwB1jEgUFUeHx24gpCkWY0=";
+ desktop_multi_window = "sha256-yIhcsTb3/mynUDE05c7dANj32O2tcZl8m0Tw8d36J/4=";
dynamic_layouts = "sha256-eFp1YVI6vI2HRgtE5nTqGZIylB226H0O8kuxy9ypuf8=";
- flutter_gpu_texture_renderer = "sha256-0znIHlZ0ashRTev2kAXU179eq/V1RJC9Hp4jAfiPh5Q=";
+ flutter_gpu_texture_renderer = "sha256-6m34FB9Zi4wWbpQQ7uwtMnjUBvdCQnqlkHtWcZddtqU=";
flutter_improved_scrolling = "sha256-fKs1+JmhDVVfjyhr6Fl17pc6n++mCTjBo1PT3l/DUnc=";
window_manager = "sha256-CUTcSl+W7Wz/Og5k9ujOdAlhKWv/gIYe58wurf9CJH4=";
window_size = "sha256-+lqY46ZURT0qcqPvHFXUnd83Uvfq79Xr+rw1AHqrpak=";
@@ -90,7 +90,7 @@ flutter319.buildFlutterApplication rec {
"confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU=";
"core-foundation-0.9.3" = "sha256-iB4OVmWZhuWbs9RFWvNc+RNut6rip2/50o5ZM6c0c3g=";
"evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0=";
- "hwcodec-0.7.0" = "sha256-SswZI2BJ4pRXT379cziJlisPsc5sOiOiDqJ5WaPETnA=";
+ "hwcodec-0.7.0" = "sha256-JdpaKIzI6AOaHPB4SeWIccpP7FuDLP00fOFnbA9DIEc=";
"impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI=";
"keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4=";
"machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE=";
@@ -98,7 +98,7 @@ flutter319.buildFlutterApplication rec {
"pam-0.7.0" = "sha256-o47tVoFlW9RiL7O8Lvuwz7rMYQHO+5TG27XxkAdHEOE=";
"pam-sys-1.0.0-alpha4" = "sha256-5HIErVWnanLo5054NgU+DEKC2wwyiJ8AHvbx0BGbyWo=";
"parity-tokio-ipc-0.7.3-4" = "sha256-PKw2Twd2ap+tRrQxqg8T1FvpoeKn0hvBqn1Z44F1LcY=";
- "rdev-0.5.0-2" = "sha256-G+PvnA5mZyN080uoI5CGj/dQ9B1J4h5iYd7214MKBR8=";
+ "rdev-0.5.0-2" = "sha256-0e8NMPMlzkmghe/E4SssoRzbGG2jWMKwxzVpiJ8MnDo=";
"reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc=";
"rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM=";
"sciter-rs-0.5.57" = "sha256-5Nd9npdx8yQJEczHv7WmSmrE1lBfvp5z7BubTbYBg3E=";
@@ -242,7 +242,7 @@ flutter319.buildFlutterApplication rec {
description = "Virtual / remote desktop infrastructure for everyone! Open source TeamViewer / Citrix alternative";
homepage = "https://rustdesk.com";
license = licenses.agpl3Only;
- maintainers = with maintainers; [ das_j ];
+ maintainers = teams.helsinki-systems.members;
mainProgram = "rustdesk";
platforms = platforms.linux; # should work on darwin as well but I have no machine to test with
};
diff --git a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json
index a0a7ad0d8076..4ca542e41794 100644
--- a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json
+++ b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json
@@ -416,7 +416,7 @@
"description": {
"path": ".",
"ref": "HEAD",
- "resolved-ref": "80b063b9d4e015f62e17f42a5aa0b3d20a365926",
+ "resolved-ref": "519350f1f40746798299e94786197d058353bac9",
"url": "https://github.com/rustdesk-org/rustdesk_desktop_multi_window"
},
"source": "git",
diff --git a/pkgs/by-name/ru/rustic/package.nix b/pkgs/by-name/ru/rustic/package.nix
index 9dc223823145..23121c5ffea4 100644
--- a/pkgs/by-name/ru/rustic/package.nix
+++ b/pkgs/by-name/ru/rustic/package.nix
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "rustic";
- version = "0.9.3";
+ version = "0.9.4";
src = fetchFromGitHub {
owner = "rustic-rs";
repo = "rustic";
rev = "refs/tags/v${version}";
- hash = "sha256-5Zr3ZxKUT8S8vfHNaCResF+S2UcHrk5pGwJH4riTzIw=";
+ hash = "sha256-DtLyVfABMRhEaelOBKV6tnFYezOOyM8C9T50sPuaHXQ=";
};
- cargoHash = "sha256-HOpBBXJk8bHjXfRq8UczfMjr3bM91lB62taTlUGUC+M=";
+ cargoHash = "sha256-Ha9qW+nCG4dMUEL6CYm/gl2Xrsp5gQ2+xi0Se5dxmyU=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ru/rusty-bash/Cargo.lock b/pkgs/by-name/ru/rusty-bash/Cargo.lock
new file mode 100644
index 000000000000..c8e77afd52ee
--- /dev/null
+++ b/pkgs/by-name/ru/rusty-bash/Cargo.lock
@@ -0,0 +1,223 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "faccess"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ae66425802d6a903e268ae1a08b8c38ba143520f227a205edf4e9c7e3e26d5"
+dependencies = [
+ "bitflags 1.3.2",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.161"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+ "redox_syscall",
+]
+
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
+[[package]]
+name = "numtoa"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6aa2c4e539b869820a2b82e1aef6ff40aa85e65decdd5185e83fb4b1249cd00f"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "redox_termios"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb"
+
+[[package]]
+name = "rev_lines"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed62916ac7a5ccbf13fa5e1d303029ff015600fee841756dfc134a1ac62bf05f"
+dependencies = [
+ "thiserror",
+]
+
+[[package]]
+name = "signal-hook"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
+dependencies = [
+ "libc",
+ "signal-hook-registry",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "sush"
+version = "0.8.5"
+dependencies = [
+ "faccess",
+ "nix",
+ "rev_lines",
+ "signal-hook",
+ "termion",
+ "unicode-width",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.85"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "termion"
+version = "4.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7eaa98560e51a2cf4f0bb884d8b2098a9ea11ecf3b7078e9c68242c74cc923a7"
+dependencies = [
+ "libc",
+ "libredox",
+ "numtoa",
+ "redox_termios",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/pkgs/by-name/ru/rusty-bash/package.nix b/pkgs/by-name/ru/rusty-bash/package.nix
new file mode 100644
index 000000000000..7db90b1fa463
--- /dev/null
+++ b/pkgs/by-name/ru/rusty-bash/package.nix
@@ -0,0 +1,33 @@
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "rusty-bash";
+ version = "0.8.5";
+
+ src = fetchFromGitHub {
+ owner = "shellgei";
+ repo = "rusty_bash";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-hUMkgsWlGSqOnYdFhDGBWbc13oAssklbuJAg8NkY398=";
+ };
+
+ postPatch = ''
+ cp ${./Cargo.lock} ./Cargo.lock
+ '';
+
+ cargoLock.lockFile = ./Cargo.lock;
+
+ passthru.shellPath = "/bin/sush";
+
+ meta = {
+ description = "Bash written with Rust, a.k.a. sushi shell";
+ homepage = "https://github.com/shellgei/rusty_bash";
+ license = lib.licenses.bsd3;
+ mainProgram = "sush";
+ maintainers = with lib.maintainers; [ aleksana ];
+ };
+}
diff --git a/pkgs/by-name/sa/sasquatch/package.nix b/pkgs/by-name/sa/sasquatch/package.nix
index 1c71a75452fb..40d31d04a143 100644
--- a/pkgs/by-name/sa/sasquatch/package.nix
+++ b/pkgs/by-name/sa/sasquatch/package.nix
@@ -51,6 +51,7 @@ let
"LZO_SUPPORT=1"
"XZ_SUPPORT=1"
"ZSTD_SUPPORT=1"
+ "AR:=$(AR)"
];
env.NIX_CFLAGS_COMPILE = lib.optionalString bigEndian "-DFIX_BE";
diff --git a/pkgs/by-name/sc/scip-go/package.nix b/pkgs/by-name/sc/scip-go/package.nix
index 54bb11c8d5ae..3f4c8de886a7 100644
--- a/pkgs/by-name/sc/scip-go/package.nix
+++ b/pkgs/by-name/sc/scip-go/package.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "scip-go";
- version = "0.1.15";
+ version = "0.1.21";
src = fetchFromGitHub {
owner = "sourcegraph";
repo = "scip-go";
rev = "v${version}";
- hash = "sha256-2UKiPKeGDkNiI96RieYWaJygz/ZqfdcBmm9PCuby7qQ=";
+ hash = "sha256-CUmivqMFAjtSS06tEs8xuXh5nyLD3MYdI2j0EAyWpY0=";
};
- vendorHash = "sha256-UID2mLrkY86k5Ms0cDgIsZR8s6h4TVwRLvLtoLXAXl4=";
+ vendorHash = "sha256-E/1ubWGIx+sGC+owqw4nOkrwUFJfgTeqDNpH8HCwNhA=";
ldflags = [ "-s" "-w" ];
diff --git a/pkgs/by-name/se/send/package.nix b/pkgs/by-name/se/send/package.nix
new file mode 100644
index 000000000000..4c92e5642f62
--- /dev/null
+++ b/pkgs/by-name/se/send/package.nix
@@ -0,0 +1,58 @@
+{
+ lib,
+ buildNpmPackage,
+ fetchFromGitHub,
+ makeBinaryWrapper,
+ nodejs,
+ nixosTests,
+}:
+
+buildNpmPackage rec {
+ pname = "send";
+ version = "3.4.23";
+
+ src = fetchFromGitHub {
+ owner = "timvisee";
+ repo = "send";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-bqQEXLwUvTKX+m2yNHRnrl+eeaGmcovXpXugxd+j14A=";
+ };
+
+ npmDepsHash = "sha256-r1iaurKuhpP0sevB5pFdtv9j1ikM1fKL7Jgakh4FzTI=";
+
+ nativeBuildInputs = [
+ makeBinaryWrapper
+ ];
+
+ env = {
+ PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = "true";
+ };
+
+ makeCacheWritable = true;
+
+ npmPackFlags = [ "--ignore-scripts" ];
+
+ NODE_OPTIONS = "--openssl-legacy-provider";
+
+ postInstall = ''
+ cp -r dist $out/lib/node_modules/send/
+ ln -s $out/lib/node_modules/send/dist/version.json $out/lib/node_modules/send/version.json
+
+ makeWrapper ${lib.getExe nodejs} $out/bin/send \
+ --add-flags $out/lib/node_modules/send/server/bin/prod.js \
+ --set "NODE_ENV" "production"
+ '';
+
+ passthru.tests = {
+ inherit (nixosTests) send;
+ };
+
+ meta = {
+ description = "File Sharing Experiment";
+ changelog = "https://github.com/timvisee/send/releases/tag/v${version}";
+ homepage = "https://github.com/timvisee/send";
+ license = lib.licenses.mpl20;
+ maintainers = with lib.maintainers; [ moraxyc ];
+ mainProgram = "send";
+ };
+}
diff --git a/pkgs/by-name/sh/shaka-packager/0001-Allow-external-declaration-of-packager-version.patch b/pkgs/by-name/sh/shaka-packager/0001-Allow-external-declaration-of-packager-version.patch
index ef06193a68d7..c6d54b5943de 100644
--- a/pkgs/by-name/sh/shaka-packager/0001-Allow-external-declaration-of-packager-version.patch
+++ b/pkgs/by-name/sh/shaka-packager/0001-Allow-external-declaration-of-packager-version.patch
@@ -1,12 +1,3 @@
-From e243cc17f48c5e1b8db29cab85ca98b033d972fb Mon Sep 17 00:00:00 2001
-From: Niklas Korz
-Date: Wed, 4 Sep 2024 14:51:30 +0200
-Subject: [PATCH 1/3] Allow external declaration of packager version
-
----
- packager/version/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
diff --git a/packager/version/CMakeLists.txt b/packager/version/CMakeLists.txt
index fba4fb8282..ad56e0a23b 100644
--- a/packager/version/CMakeLists.txt
@@ -27,6 +18,4 @@ index fba4fb8282..ad56e0a23b 100644
add_library(version STATIC version.cc)
target_compile_definitions(version PRIVATE
---
-2.46.0
diff --git a/pkgs/by-name/sh/shaka-packager/0002-Unvendor-dependencies.patch b/pkgs/by-name/sh/shaka-packager/0002-Unvendor-dependencies.patch
index 5054862b656c..19abd9ad5a6c 100644
--- a/pkgs/by-name/sh/shaka-packager/0002-Unvendor-dependencies.patch
+++ b/pkgs/by-name/sh/shaka-packager/0002-Unvendor-dependencies.patch
@@ -1,13 +1,3 @@
-From 4c7743f4fd231648d7bd1513c9db71a651ef7553 Mon Sep 17 00:00:00 2001
-From: Niklas Korz
-Date: Wed, 4 Sep 2024 14:52:23 +0200
-Subject: [PATCH 2/3] Unvendor dependencies
-
----
- CMakeLists.txt | 24 ++++++++++++++++++++++++
- packager/CMakeLists.txt | 1 -
- 2 files changed, 24 insertions(+), 1 deletion(-)
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b96a2429e..181df0bf2d 100644
--- a/CMakeLists.txt
@@ -62,6 +52,27 @@ index 7238d243bb..722217bbc4 100644
add_subdirectory(tools)
add_subdirectory(utils)
add_subdirectory(version)
---
-2.46.0
+diff --git a/packager/tools/pssh/CMakeLists.txt b/packager/tools/pssh/CMakeLists.txt
+index 9ec3a39d26..0b981cec29 100644
+--- a/packager/tools/pssh/CMakeLists.txt
++++ b/packager/tools/pssh/CMakeLists.txt
+@@ -14,7 +14,6 @@ set(PSSH_BOX_OUTPUTS
+
+ add_custom_command(
+ DEPENDS
+- protobuf_py
+ widevine_protos
+ pssh-box.py
+ OUTPUT ${PSSH_BOX_OUTPUTS}
+@@ -26,10 +25,6 @@ add_custom_command(
+ ${CMAKE_BINARY_DIR}/packager/media/base/widevine_common_encryption_pb2.py
+ ${CMAKE_BINARY_DIR}/packager/media/base/widevine_pssh_data_pb2.py
+ ${CMAKE_BINARY_DIR}/packager/pssh-box-protos/
+- COMMAND
+- ${CMAKE_COMMAND} -E copy_directory
+- ${CMAKE_BINARY_DIR}/packager/third_party/protobuf/py/google
+- ${CMAKE_BINARY_DIR}/packager/pssh-box-protos/google
+ COMMAND
+ ${CMAKE_COMMAND} -E copy
+ ${CMAKE_CURRENT_SOURCE_DIR}/pssh-box.py
diff --git a/pkgs/by-name/sh/shaka-packager/0003-Fix-curl-deprecations.patch b/pkgs/by-name/sh/shaka-packager/0003-Fix-curl-deprecations.patch
deleted file mode 100644
index 59bffb9925ef..000000000000
--- a/pkgs/by-name/sh/shaka-packager/0003-Fix-curl-deprecations.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c8b0b467a140d8a67157f5cee26a8510444706be Mon Sep 17 00:00:00 2001
-From: Niklas Korz
-Date: Wed, 4 Sep 2024 14:52:47 +0200
-Subject: [PATCH 3/3] Fix curl deprecations
-
----
- packager/file/http_file.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/packager/file/http_file.cc b/packager/file/http_file.cc
-index b50fef6f07..dca43e26ca 100644
---- a/packager/file/http_file.cc
-+++ b/packager/file/http_file.cc
-@@ -311,7 +311,7 @@ void HttpFile::SetupRequest() {
- curl_easy_setopt(curl, CURLOPT_POST, 1L);
- break;
- case HttpMethod::kPut:
-- curl_easy_setopt(curl, CURLOPT_PUT, 1L);
-+ curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);
- break;
- }
-
---
-2.46.0
-
diff --git a/pkgs/by-name/sh/shaka-packager/package.nix b/pkgs/by-name/sh/shaka-packager/package.nix
index 6c1cd25bd2e1..2923b852d479 100644
--- a/pkgs/by-name/sh/shaka-packager/package.nix
+++ b/pkgs/by-name/sh/shaka-packager/package.nix
@@ -22,13 +22,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "shaka-packager";
- version = "3.2.0";
+ version = "3.3.0";
src = fetchFromGitHub {
owner = "shaka-project";
repo = "shaka-packager";
rev = "refs/tags/v${finalAttrs.version}";
- hash = "sha256-L10IMsc4dTMa5zwYq612F4J+uKOmEEChY8k/m09wuNE=";
+ hash = "sha256-5TDfIbguBipYciXusn0rDS0ZQl0+fDFfHYbrnYjxSdE=";
};
patches = [
@@ -46,10 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
# The last step is necessary to keep the patch size to a minimum, otherwise we'd have
# to add the namespace identifiers everywhere a dependency is used.
./0002-Unvendor-dependencies.patch
- # As nixpkgs ships with a newer version of libcurl than the one vendored in shaka-packager,
- # we have to fix one deprecation.
- # See https://curl.se/libcurl/c/CURLOPT_PUT.html for further information.
- ./0003-Fix-curl-deprecations.patch
];
nativeBuildInputs = [
@@ -58,7 +54,12 @@ stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
- python3
+ (python3.withPackages (ps: [
+ # As we remove the vendored protobuf in our patch,
+ # we must re-add it to the python package used for
+ # pssh_box.py.
+ ps.protobuf
+ ]))
abseil-cpp
curl
gtest
@@ -95,13 +96,13 @@ stdenv.mkDerivation (finalAttrs: {
};
};
- meta = with lib; {
+ meta = {
description = "Media packaging framework for VOD and Live DASH and HLS applications";
homepage = "https://shaka-project.github.io/shaka-packager/html/";
changelog = "https://github.com/shaka-project/shaka-packager/releases/tag/v${finalAttrs.version}";
- license = licenses.bsd3;
+ license = lib.licenses.bsd3;
mainProgram = "packager";
- maintainers = with maintainers; [ niklaskorz ];
- platforms = platforms.all;
+ maintainers = with lib.maintainers; [ niklaskorz ];
+ platforms = lib.platforms.all;
};
})
diff --git a/pkgs/by-name/sh/sherlock/package.nix b/pkgs/by-name/sh/sherlock/package.nix
index 50421ff991b6..84f9fe58d35e 100644
--- a/pkgs/by-name/sh/sherlock/package.nix
+++ b/pkgs/by-name/sh/sherlock/package.nix
@@ -74,7 +74,7 @@ python3.pkgs.buildPythonApplication rec {
];
meta = {
- homepage = "https://sherlock-project.github.io/";
+ homepage = "https://sherlockproject.xyz/";
description = "Hunt down social media accounts by username across social networks";
license = lib.licenses.mit;
mainProgram = "sherlock";
diff --git a/pkgs/by-name/sh/shopify-cli/package-lock.json b/pkgs/by-name/sh/shopify-cli/package-lock.json
index 791b8cf7a175..7ed9710de6eb 100644
--- a/pkgs/by-name/sh/shopify-cli/package-lock.json
+++ b/pkgs/by-name/sh/shopify-cli/package-lock.json
@@ -1,14 +1,14 @@
{
"name": "shopify",
- "version": "3.67.1",
+ "version": "3.69.3",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "shopify",
- "version": "3.67.1",
+ "version": "3.69.3",
"dependencies": {
- "@shopify/cli": "3.67.1"
+ "@shopify/cli": "3.69.3"
},
"bin": {
"shopify": "node_modules/@shopify/cli/bin/run.js"
@@ -480,9 +480,9 @@
}
},
"node_modules/@shopify/cli": {
- "version": "3.67.1",
- "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.67.1.tgz",
- "integrity": "sha512-yThhhrfV4M9cAx8Ng5DPoxEemtPtiIur1jiVJBp8cuooJMTHvjANZ3eOcs9xeKGb5BMzoseZ1jR5Gh8MYGCjQQ==",
+ "version": "3.69.3",
+ "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.69.3.tgz",
+ "integrity": "sha512-tc7gH5EOgDvAuSGazTP4zl0Yj4547gwypyDzmUfxb15PExMpj7lMyIQujKyAGwEfu1+LRF3K13Hfgib1sqvUUQ==",
"license": "MIT",
"os": [
"darwin",
diff --git a/pkgs/by-name/sh/shopify-cli/package.json b/pkgs/by-name/sh/shopify-cli/package.json
index 288f3e31876a..d4515de77622 100644
--- a/pkgs/by-name/sh/shopify-cli/package.json
+++ b/pkgs/by-name/sh/shopify-cli/package.json
@@ -1,11 +1,11 @@
{
"name": "shopify",
- "version": "3.67.1",
+ "version": "3.69.3",
"private": true,
"bin": {
"shopify": "node_modules/@shopify/cli/bin/run.js"
},
"dependencies": {
- "@shopify/cli": "3.67.1"
+ "@shopify/cli": "3.69.3"
}
}
diff --git a/pkgs/by-name/sh/shopify-cli/package.nix b/pkgs/by-name/sh/shopify-cli/package.nix
index b0c74741be1e..b49e430de8be 100644
--- a/pkgs/by-name/sh/shopify-cli/package.nix
+++ b/pkgs/by-name/sh/shopify-cli/package.nix
@@ -1,6 +1,6 @@
{ buildNpmPackage, lib, testers, shopify-cli }:
let
- version = "3.67.1";
+ version = "3.69.3";
in
buildNpmPackage {
pname = "shopify";
@@ -14,7 +14,7 @@ buildNpmPackage {
];
};
- npmDepsHash = "sha256-jb87K1tCMYgWrsAgzvdHW8ChB+dvc9yNM0hqajy8Rbo=";
+ npmDepsHash = "sha256-QhbOKOs/0GEOeySG4uROzgtD4o7C+6tS/TAaPcmC3xk=";
dontNpmBuild = true;
passthru = {
diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix
index 8e841ac44636..4aba0ae8d75b 100644
--- a/pkgs/by-name/si/simdutf/package.nix
+++ b/pkgs/by-name/si/simdutf/package.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "simdutf";
- version = "5.5.0";
+ version = "5.6.0";
src = fetchFromGitHub {
owner = "simdutf";
repo = "simdutf";
rev = "v${finalAttrs.version}";
- hash = "sha256-LEXx/b0DJZ9xxQX9+4YHjQCLFp2aXCE78Z6iPlXJjAw=";
+ hash = "sha256-DJCr+QoCmN0wJiXH+mv4g/zJYFfgJDGw0l6pzPriBVs=";
};
# Fix build on darwin
diff --git a/pkgs/by-name/si/simple64-netplay-server/package.nix b/pkgs/by-name/si/simple64-netplay-server/package.nix
new file mode 100644
index 000000000000..079997fca19b
--- /dev/null
+++ b/pkgs/by-name/si/simple64-netplay-server/package.nix
@@ -0,0 +1,27 @@
+{
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+}:
+
+buildGoModule rec {
+ pname = "simple64-netplay-server";
+ version = "2024.10.1";
+
+ src = fetchFromGitHub {
+ owner = "simple64";
+ repo = "simple64-netplay-server";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-p9hHVf1LD95w280ScUkxHKmBJLJ9eiH3WEYV+kaALgQ=";
+ };
+
+ vendorHash = "sha256-HeYA/nR0NuP/fPMJXGGuN2eP6vB4yj1yWFfFDyp34QE=";
+
+ meta = {
+ description = "Dedicated server for simple64 netplay";
+ homepage = "https://github.com/simple64/simple64-netplay-server";
+ license = lib.licenses.gpl3Only;
+ mainProgram = "simple64-netplay-server";
+ maintainers = with lib.maintainers; [ tomasajt ];
+ };
+}
diff --git a/pkgs/by-name/si/simple64/add-official-server-error-message.patch b/pkgs/by-name/si/simple64/add-official-server-error-message.patch
new file mode 100644
index 000000000000..7d37e33c11d1
--- /dev/null
+++ b/pkgs/by-name/si/simple64/add-official-server-error-message.patch
@@ -0,0 +1,15 @@
+diff --git a/simple64-gui/netplay/joinroom.cpp b/simple64-gui/netplay/joinroom.cpp
+index 3b5c34e..68b46f2 100644
+--- a/simple64-gui/netplay/joinroom.cpp
++++ b/simple64-gui/netplay/joinroom.cpp
+@@ -308,7 +308,9 @@ void JoinRoom::processTextMessage(QString message)
+ }
+ else
+ {
+- msgBox.setText(json.value("message").toString());
++ QString msg = json.value("message").toString();
++ if(msg == "Bad authentication code") msg += "
Note: using the official netplay servers is not allowed on unofficial builds.
You can host your own server with `simple64-netplay-server`";
++ msgBox.setText(msg);
+ msgBox.exec();
+ }
+ }
diff --git a/pkgs/by-name/si/simple64/dont-use-vosk-and-discord.patch b/pkgs/by-name/si/simple64/dont-use-vosk-and-discord.patch
new file mode 100644
index 000000000000..69d595cc428a
--- /dev/null
+++ b/pkgs/by-name/si/simple64/dont-use-vosk-and-discord.patch
@@ -0,0 +1,37 @@
+diff --git a/build.sh b/build.sh
+index 254a90d..e2d26cf 100644
+--- a/build.sh
++++ b/build.sh
+@@ -77,7 +77,7 @@ cmake -G Ninja -DCMAKE_BUILD_TYPE="${RELEASE_TYPE}" ..
+ cmake --build .
+ cp simple64-video-parallel.* "${install_dir}"
+
+-if [[ ! -d "${base_dir}/discord" ]]; then
++if false; then
+ echo "Downloading Discord SDK"
+ mkdir -p "${base_dir}/discord"
+ cd "${base_dir}/discord"
+@@ -86,7 +86,7 @@ if [[ ! -d "${base_dir}/discord" ]]; then
+ rm discord_game_sdk.zip
+ fi
+
+-if [[ ! -d "${base_dir}/vosk" ]]; then
++if false; then
+ mkdir -p "${base_dir}/vosk"
+ cd "${base_dir}/vosk"
+ if [[ ${UNAME} == *"MINGW64"* ]]; then
+@@ -156,14 +156,6 @@ if [[ ${UNAME} == *"MINGW64"* ]]; then
+ cp -v "${base_dir}/7z/x64/7za.exe" "${install_dir}"
+ cp -v "${base_dir}/discord/lib/x86_64/discord_game_sdk.dll" "${install_dir}"
+ cp -v "${base_dir}/vosk/libvosk.dll" "${install_dir}/vosk.dll"
+-else
+- cp "${base_dir}/vosk/libvosk.so" "${install_dir}"
+- if [[ "${PLATFORM}" == "aarch64" ]]; then
+- my_os=linux_aarch64
+- else
+- my_os=linux_x86_64
+- cp "${base_dir}/discord/lib/x86_64/discord_game_sdk.so" "${install_dir}/libdiscord_game_sdk.so"
+- fi
+ fi
+
+ if [[ "$1" == "zip" ]]; then
diff --git a/pkgs/by-name/si/simple64/package.nix b/pkgs/by-name/si/simple64/package.nix
new file mode 100644
index 000000000000..4c00f6b806dd
--- /dev/null
+++ b/pkgs/by-name/si/simple64/package.nix
@@ -0,0 +1,102 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ fetchurl,
+ writeShellScriptBin,
+ cmake,
+ ninja,
+ pkg-config,
+ makeWrapper,
+ zlib,
+ libpng,
+ SDL2,
+ SDL2_net,
+ hidapi,
+ qt6,
+ vulkan-loader,
+}:
+
+let
+ cheats-json = fetchurl {
+ url = "https://raw.githubusercontent.com/simple64/cheat-parser/87963b7aca06e0d4632b66bc5ffe7d6b34060f4f/cheats.json";
+ hash = "sha256-rS/4Mdi+18C2ywtM5nW2XaJkC1YnKZPc4YdQ3mCfESU=";
+ };
+in
+stdenv.mkDerivation (finalAttrs: {
+ pname = "simple64";
+ version = "2024.09.1";
+
+ src = fetchFromGitHub {
+ owner = "simple64";
+ repo = "simple64";
+ rev = "refs/tags/v${finalAttrs.version}";
+ hash = "sha256-t3V7mvHlCP8cOvizR3N9DiCofnSvSHI6U0iXXkaMb34=";
+ };
+
+ patches = [
+ ./dont-use-vosk-and-discord.patch
+ ./add-official-server-error-message.patch
+ ];
+
+ postPatch = ''
+ cp ${cheats-json} cheats.json
+ '';
+
+ stictDeps = true;
+
+ nativeBuildInputs = [
+ qt6.wrapQtAppsHook
+ cmake
+ ninja
+ pkg-config
+ makeWrapper
+ # fake git command for version info generator
+ (writeShellScriptBin "git" "echo ${finalAttrs.src.rev}")
+ ];
+
+ buildInputs = [
+ zlib
+ libpng
+ SDL2
+ SDL2_net
+ hidapi
+ qt6.qtbase
+ qt6.qtwebsockets
+ qt6.qtwayland
+ ];
+
+ dontUseCmakeConfigure = true;
+
+ dontWrapQtApps = true;
+
+ buildPhase = ''
+ runHook preInstall
+
+ sh build.sh
+
+ runHook postInstall
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/share/simple64 $out/bin
+ cp -r simple64/* $out/share/simple64
+
+ makeWrapper $out/share/simple64/simple64-gui $out/bin/simple64-gui \
+ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]} \
+ "''${qtWrapperArgs[@]}"
+
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "Easy to use N64 emulator";
+ homepage = "https://simple64.github.io";
+ license = lib.licenses.gpl3Only;
+ mainProgram = "simple64-gui";
+ maintainers = with lib.maintainers; [ tomasajt ];
+ platforms = lib.platforms.linux;
+ };
+})
diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix
index 38df48bb1704..4c9c443ee8d6 100644
--- a/pkgs/by-name/si/simplex-chat-desktop/package.nix
+++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix
@@ -6,11 +6,11 @@
let
pname = "simplex-chat-desktop";
- version = "6.0.5";
+ version = "6.1.0";
src = fetchurl {
url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
- hash = "sha256-z40Udd3+GWd4JSVNsqwFUm3GcbfNre+lFR/UP1+msyo=";
+ hash = "sha256-Fe84rggb539MJXkbJqQRemToTLyX61BbXtoDRUuds8k=";
};
appimageContents = appimageTools.extract {
@@ -43,7 +43,7 @@ in appimageTools.wrapType2 {
homepage = "https://simplex.chat";
changelog = "https://github.com/simplex-chat/simplex-chat/releases/tag/v${version}";
license = licenses.agpl3Only;
- maintainers = with maintainers; [ terryg yuu ];
+ maintainers = with maintainers; [ terryg ];
platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/by-name/sk/skeditor/nuget-deps.nix b/pkgs/by-name/sk/skeditor/nuget-deps.nix
new file mode 100644
index 000000000000..3cfb79ed5964
--- /dev/null
+++ b/pkgs/by-name/sk/skeditor/nuget-deps.nix
@@ -0,0 +1,476 @@
+# This file was automatically generated by passthru.fetch-deps.
+# Please dont edit it manually, your changes might get overwritten!
+
+{ fetchNuGet }:
+[
+ (fetchNuGet {
+ pname = "AsyncImageLoader.Avalonia";
+ version = "3.3.0";
+ hash = "sha256-blhfKI+vX+ojT2cOvSHu3Kp2CuxvhW/l+as88Dia4bA=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia";
+ version = "11.1.3";
+ hash = "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Angle.Windows.Natives";
+ version = "2.1.22045.20230930";
+ hash = "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.BuildServices";
+ version = "0.0.29";
+ hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Controls.ColorPicker";
+ version = "11.0.0";
+ hash = "sha256-xzbJvbOYGHtd8rtKgsMTtOarbVQ8mIvs7IruODv8jxs=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Controls.ColorPicker";
+ version = "11.1.0";
+ hash = "sha256-xawQhivop0f7n98Xqj5fScDdF0RPPpVIoTpVs+p6T3Q=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Controls.ColorPicker";
+ version = "11.1.3";
+ hash = "sha256-W17Wvmi8/47cf5gCF3QRcaKLz0ZpXtZYCCkaERkbyXU=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Controls.DataGrid";
+ version = "11.0.0";
+ hash = "sha256-Ukvt2JebIWb+y1x77EAVl2Nbay92OX30k5TdwElvjGI=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Controls.DataGrid";
+ version = "11.1.0";
+ hash = "sha256-CcfwmgbN+Z/uqNtgKRH2KFJwomnnkWVhZbTPF2K0Oeg=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Controls.DataGrid";
+ version = "11.1.3";
+ hash = "sha256-OOKTovi5kckn0x/8dMcq56cvq57UVMLzA9LRXDxm2Vc=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Controls.ItemsRepeater";
+ version = "11.1.3";
+ hash = "sha256-1CbelZlb3BwMp9Faen/CQLEPBHko79uNqEtCWNf6yA0=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Desktop";
+ version = "11.1.3";
+ hash = "sha256-mNFscbtyqLlodzGa3SJ3oVY467JjWwY45LxZiKDAn/w=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Diagnostics";
+ version = "11.1.3";
+ hash = "sha256-PD9ZIeBZJrLaVDjmWBz4GocrdUSNUou11gAERU+xWDo=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Fonts.Inter";
+ version = "11.1.3";
+ hash = "sha256-OKQokPLo8/vAoJl4mAiUgQT5z5zwico4WqPOR+CbYuA=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.FreeDesktop";
+ version = "11.1.3";
+ hash = "sha256-nUBhSRE0Bly3dVC14wXwU19vP3g0VbE4bCUohx7DCVI=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Markup.Xaml.Loader";
+ version = "11.1.3";
+ hash = "sha256-4ZzcK4XRyKokwd4IfxicQ7GNfJT8ztwYnAFFEhKOIzg=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Native";
+ version = "11.1.3";
+ hash = "sha256-byAVGW7XgkyzDj1TnqaCeDU/xTD9z8ACGrSJgwJ+XXs=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Remote.Protocol";
+ version = "11.0.0";
+ hash = "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Remote.Protocol";
+ version = "11.1.0";
+ hash = "sha256-MAguJ8qTdwvgtEq5SYxyzFNsC90gcBfZxXPkFBEWx5E=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Remote.Protocol";
+ version = "11.1.3";
+ hash = "sha256-CKF+62zCbK1Rd/HiC6MGrags3ylXrVQ1lni3Um0Muqk=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Skia";
+ version = "11.0.0";
+ hash = "sha256-A01nrs3Ij1eTo6tPmu7++T1K+Wo/H/9LvpeuOUGbQeU=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Skia";
+ version = "11.1.0";
+ hash = "sha256-w4ozV8lIs5vxoYP5D5Lut2iTMiJKVPbjdtqDB1sb0MI=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Skia";
+ version = "11.1.3";
+ hash = "sha256-EtB86g+nz6i8wL6xytMkYl2Ehgt3GFMMNPzQfhbfopM=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Svg.Skia";
+ version = "11.1.0";
+ hash = "sha256-6TvmqslBd3l2Fd+HFCyY381EUkCNUGAqzNKEYwQf9qg=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Themes.Fluent";
+ version = "11.1.3";
+ hash = "sha256-qfmRK2gLGSgHx4dNIeVesWxLUjcook9ET2xru/Xyiw8=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Themes.Simple";
+ version = "11.1.3";
+ hash = "sha256-Q6jL5J/6aBtOY85I641RVp8RpuqJbPy6C6LxnRkFtMM=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Win32";
+ version = "11.1.3";
+ hash = "sha256-zcxTpEnpLf50p8Yaiylk5/CS9MNDe7lK1uX1CPaJBUc=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.X11";
+ version = "11.1.3";
+ hash = "sha256-M2+y661/znDxZRdwNRIQi4mS2m6T4kQkBbYeE7KyQAw=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Xaml.Behaviors";
+ version = "11.1.0";
+ hash = "sha256-+QzOb0/GpWmUrZDHJvoPnmzugyr5KJyz1jrXRbHGNPY=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Xaml.Interactions";
+ version = "11.1.0";
+ hash = "sha256-+dxsxoJmpNdMWmiUgsiNnmko0zp1rAImXQ2Rf44lE7E=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Xaml.Interactions.Custom";
+ version = "11.1.0";
+ hash = "sha256-2nLEU+0UQ9DflsHM9Ijv1Y4YCBHOHxA01zsAivay0hA=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Xaml.Interactions.DragAndDrop";
+ version = "11.1.0";
+ hash = "sha256-LQyCsZDqTheFUpCeZ/Ib5rejFZmg3Q0ppZTTjFPE81o=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Xaml.Interactions.Draggable";
+ version = "11.1.0";
+ hash = "sha256-1gU9iZj11/+MmHq9unAueC73tV6hrNGRlsx17eAqDCY=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Xaml.Interactions.Events";
+ version = "11.1.0";
+ hash = "sha256-bF0cOfw9XejLowrMA3CwRzNvopateW4a7eF70bvU8wc=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Xaml.Interactions.Responsive";
+ version = "11.1.0";
+ hash = "sha256-SMqp2YjiImfxaY1f60E15Z5Cfi3oD0G70MjZ3kCDqJ8=";
+ })
+ (fetchNuGet {
+ pname = "Avalonia.Xaml.Interactivity";
+ version = "11.1.0";
+ hash = "sha256-QO/ft2Qgjt1haSu3IX3q15XyowLuyDgoA9jvcqEpVWg=";
+ })
+ (fetchNuGet {
+ pname = "CommunityToolkit.Mvvm";
+ version = "8.2.2";
+ hash = "sha256-vdprWEw+J6yJZLWZTUFTrQAHWLuPVXPBaYmePD7kcwY=";
+ })
+ (fetchNuGet {
+ pname = "DiscordRichPresence";
+ version = "1.2.1.24";
+ hash = "sha256-oRNrlF1/yK0QvrW2+48RsmSg9h9/pDIfA56/bpoHXFU=";
+ })
+ (fetchNuGet {
+ pname = "ExCSS";
+ version = "4.2.3";
+ hash = "sha256-M/H6P5p7qqdFz/fgAI2MMBWQ7neN/GIieYSSxxjsM9I=";
+ })
+ (fetchNuGet {
+ pname = "FluentAvaloniaUI";
+ version = "2.0.0";
+ hash = "sha256-LyBiRiv/mbp4mDpLmGD665l+kxEK9XiuKgcqpRi6cDg=";
+ })
+ (fetchNuGet {
+ pname = "FluentIcons.Avalonia.Fluent";
+ version = "1.1.253";
+ hash = "sha256-jn7i8LQPlBTPbnsb9F7O4utOd4E7pmdGx5TDkKjv4gs=";
+ })
+ (fetchNuGet {
+ pname = "FluentIcons.Common";
+ version = "1.1.253";
+ hash = "sha256-P0Segg1nxsgfU4TZjjcU6koL5ktYxEZ8svFyc10O714=";
+ })
+ (fetchNuGet {
+ pname = "HarfBuzzSharp";
+ version = "2.8.2.3";
+ hash = "sha256-4tbdgUabPjlkBm3aUFeocj4Fdslmms2olDFpzOLyqoQ=";
+ })
+ (fetchNuGet {
+ pname = "HarfBuzzSharp";
+ version = "7.3.0.2";
+ hash = "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8=";
+ })
+ (fetchNuGet {
+ pname = "HarfBuzzSharp.NativeAssets.Linux";
+ version = "2.8.2.3";
+ hash = "sha256-3xwVfNfKTkuLdnT+e3bfG9tNTdEmar7ByzY+NTlUKLg=";
+ })
+ (fetchNuGet {
+ pname = "HarfBuzzSharp.NativeAssets.Linux";
+ version = "7.3.0.2";
+ hash = "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU=";
+ })
+ (fetchNuGet {
+ pname = "HarfBuzzSharp.NativeAssets.macOS";
+ version = "2.8.2.3";
+ hash = "sha256-ZohUEaovj/sRB4rjuJIOq6S9eim3m+qMlpHIebNDTRQ=";
+ })
+ (fetchNuGet {
+ pname = "HarfBuzzSharp.NativeAssets.macOS";
+ version = "7.3.0.2";
+ hash = "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08=";
+ })
+ (fetchNuGet {
+ pname = "HarfBuzzSharp.NativeAssets.WebAssembly";
+ version = "2.8.2.3";
+ hash = "sha256-ZsiBGpXfODHUHPgU/50k9QR/j6Klo7rsB0SUt8zYcBA=";
+ })
+ (fetchNuGet {
+ pname = "HarfBuzzSharp.NativeAssets.WebAssembly";
+ version = "7.3.0.2";
+ hash = "sha256-aEZr9uKAlCTeeHoYNR1Rs6L3P54765CemyrgJF8x09c=";
+ })
+ (fetchNuGet {
+ pname = "HarfBuzzSharp.NativeAssets.Win32";
+ version = "2.8.2.3";
+ hash = "sha256-5GSzM5IUoOwK+zJg0d74WlT3n1VZly8pKlyjiqVocCI=";
+ })
+ (fetchNuGet {
+ pname = "HarfBuzzSharp.NativeAssets.Win32";
+ version = "7.3.0.2";
+ hash = "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo=";
+ })
+ (fetchNuGet {
+ pname = "MicroCom.CodeGenerator.MSBuild";
+ version = "0.11.0";
+ hash = "sha256-TsxziX9V8T3qRrEA3o9wY84ocDcUUUBzvARi5QZW23o=";
+ })
+ (fetchNuGet {
+ pname = "MicroCom.Runtime";
+ version = "0.11.0";
+ hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.NETCore.Platforms";
+ version = "2.0.0";
+ hash = "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.Win32.Registry";
+ version = "4.5.0";
+ hash = "sha256-WMBXsIb0DgPFPaFkNVxY9b9vcMxPqtgFgijKYMJfV/0=";
+ })
+ (fetchNuGet {
+ pname = "Newtonsoft.Json";
+ version = "13.0.3";
+ hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=";
+ })
+ (fetchNuGet {
+ pname = "NuGet.Common";
+ version = "6.11.0";
+ hash = "sha256-eb7G07RyZv4AQT6ItRqdBuUf9e9BXcQygsy5RNEXfNE=";
+ })
+ (fetchNuGet {
+ pname = "NuGet.Configuration";
+ version = "6.11.0";
+ hash = "sha256-2SNZkX64SB15glzQx3k+vI7btr8Yqg4CayaaaK1B0AQ=";
+ })
+ (fetchNuGet {
+ pname = "NuGet.Frameworks";
+ version = "6.11.0";
+ hash = "sha256-8DC7V2IlCjiMDQ9yWbl7QQHia6OpBrbWh5rL0qa0Opw=";
+ })
+ (fetchNuGet {
+ pname = "NuGet.Packaging";
+ version = "6.11.0";
+ hash = "sha256-LVLvxcB6SMdayxAsrc5bCuLLt25fqPr6KfYcYoWWIQk=";
+ })
+ (fetchNuGet {
+ pname = "NuGet.Protocol";
+ version = "6.11.0";
+ hash = "sha256-3vdB/8IiJ2LMHhFXLWOzf0H59Ow/zcoq6W4uCHbihCQ=";
+ })
+ (fetchNuGet {
+ pname = "NuGet.Versioning";
+ version = "6.11.0";
+ hash = "sha256-03edgWvbqUtbzpBBTIxTwsSRoj1T2muGVL+vTuIHXag=";
+ })
+ (fetchNuGet {
+ pname = "Octokit";
+ version = "13.0.1";
+ hash = "sha256-uxQC+bbmWloIdwndqWUb+FY8iAUsPgxzqfw41EPWuAU=";
+ })
+ (fetchNuGet {
+ pname = "Serilog";
+ version = "4.0.0";
+ hash = "sha256-j8hQ5TdL1TjfdGiBO9PyHJFMMPvATHWN1dtrrUZZlNw=";
+ })
+ (fetchNuGet {
+ pname = "Serilog.Sinks.File";
+ version = "6.0.0";
+ hash = "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow=";
+ })
+ (fetchNuGet {
+ pname = "ShimSkiaSharp";
+ version = "2.0.0";
+ hash = "sha256-xW0amMDf1ExXs9SBP9S3Slgl4SiGjSkCiLErZ1hlGNM=";
+ })
+ (fetchNuGet {
+ pname = "SkAvaloniaEdit";
+ version = "11.0.7";
+ hash = "sha256-n3CDyDR4EangE4v/D64shPFGqgqidXX+J+8v8aUba1c=";
+ })
+ (fetchNuGet {
+ pname = "SkFluentAvalonia";
+ version = "2.0.5.3";
+ hash = "sha256-PeJNoM2BG8LeL3bwOOyUwDd65GEjJSR8dqKLLcCGhnk=";
+ })
+ (fetchNuGet {
+ pname = "SkiaSharp";
+ version = "2.88.3";
+ hash = "sha256-WyMAjnQt8ZsuWpGLI89l/f4bHvv+cg7FdTAL7CtJBvs=";
+ })
+ (fetchNuGet {
+ pname = "SkiaSharp";
+ version = "2.88.8";
+ hash = "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A=";
+ })
+ (fetchNuGet {
+ pname = "SkiaSharp.HarfBuzz";
+ version = "2.88.8";
+ hash = "sha256-W9jNuEo/8q+k2aHNC19FfKcBUIEWx2zDcGwM+jDZ1o8=";
+ })
+ (fetchNuGet {
+ pname = "SkiaSharp.NativeAssets.Linux";
+ version = "2.88.3";
+ hash = "sha256-eExWAAURgnwwm2fRwsK/rf+TeOAPs2n02XZzC0zeUjU=";
+ })
+ (fetchNuGet {
+ pname = "SkiaSharp.NativeAssets.Linux";
+ version = "2.88.8";
+ hash = "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y=";
+ })
+ (fetchNuGet {
+ pname = "SkiaSharp.NativeAssets.macOS";
+ version = "2.88.3";
+ hash = "sha256-8G4swiLMr6XS3kjfO/YC1PyoVdfSq7nxZthZZ+KTKqQ=";
+ })
+ (fetchNuGet {
+ pname = "SkiaSharp.NativeAssets.macOS";
+ version = "2.88.8";
+ hash = "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI=";
+ })
+ (fetchNuGet {
+ pname = "SkiaSharp.NativeAssets.WebAssembly";
+ version = "2.88.3";
+ hash = "sha256-/SkV2pIZnt0ziSKB7gt7U2Rltk2Id+zOzbmqgfWUtvA=";
+ })
+ (fetchNuGet {
+ pname = "SkiaSharp.NativeAssets.WebAssembly";
+ version = "2.88.8";
+ hash = "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w=";
+ })
+ (fetchNuGet {
+ pname = "SkiaSharp.NativeAssets.Win32";
+ version = "2.88.3";
+ hash = "sha256-2PhMTwRHitT13KCKiZltKIFieAvNY4jBmVZ2ndVynA8=";
+ })
+ (fetchNuGet {
+ pname = "SkiaSharp.NativeAssets.Win32";
+ version = "2.88.8";
+ hash = "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM=";
+ })
+ (fetchNuGet {
+ pname = "SpacedGrid-Avalonia";
+ version = "11.0.0";
+ hash = "sha256-U4WezNpOWtdaK6wh0tVRLoK31mLCdFWVB1xLqok9izw=";
+ })
+ (fetchNuGet {
+ pname = "Svg.Custom";
+ version = "2.0.0";
+ hash = "sha256-/iy8eithVIqzSA9p5zj1igiu47mX0KhMQiM0l6gRFFY=";
+ })
+ (fetchNuGet {
+ pname = "Svg.Model";
+ version = "2.0.0";
+ hash = "sha256-ThGAwPyEv/ZLfRu9LRU91RO13T+MPED/i+ojOOZkCYM=";
+ })
+ (fetchNuGet {
+ pname = "Svg.Skia";
+ version = "2.0.0";
+ hash = "sha256-wjVvUQTZD1f5TGk4ytJCJTXzkwKp04kXxN/OXxhrLB4=";
+ })
+ (fetchNuGet {
+ pname = "System.Formats.Asn1";
+ version = "6.0.0";
+ hash = "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8=";
+ })
+ (fetchNuGet {
+ pname = "System.IO.Pipelines";
+ version = "6.0.0";
+ hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA=";
+ })
+ (fetchNuGet {
+ pname = "System.Numerics.Vectors";
+ version = "4.5.0";
+ hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=";
+ })
+ (fetchNuGet {
+ pname = "System.Reactive";
+ version = "6.0.0";
+ hash = "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y=";
+ })
+ (fetchNuGet {
+ pname = "System.Security.AccessControl";
+ version = "4.5.0";
+ hash = "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM=";
+ })
+ (fetchNuGet {
+ pname = "System.Security.Cryptography.Pkcs";
+ version = "6.0.4";
+ hash = "sha256-2e0aRybote+OR66bHaNiYpF//4fCiaO3zbR2e9GABUI=";
+ })
+ (fetchNuGet {
+ pname = "System.Security.Cryptography.ProtectedData";
+ version = "4.4.0";
+ hash = "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE=";
+ })
+ (fetchNuGet {
+ pname = "System.Security.Principal.Windows";
+ version = "4.5.0";
+ hash = "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY=";
+ })
+ (fetchNuGet {
+ pname = "System.Threading.AccessControl";
+ version = "9.0.0-preview.5.24306.7";
+ hash = "sha256-8jEX2o0vT8hYcZn54U4ryXEpj49DSQPV4eeTWmTGYgE=";
+ })
+ (fetchNuGet {
+ pname = "Tmds.DBus.Protocol";
+ version = "0.16.0";
+ hash = "sha256-vKYEaa1EszR7alHj48R8G3uYArhI+zh2ZgiBv955E98=";
+ })
+]
diff --git a/pkgs/by-name/sk/skeditor/package.nix b/pkgs/by-name/sk/skeditor/package.nix
new file mode 100644
index 000000000000..57ffd6d6b01e
--- /dev/null
+++ b/pkgs/by-name/sk/skeditor/package.nix
@@ -0,0 +1,34 @@
+{
+ lib,
+ buildDotnetModule,
+ fetchFromGitHub,
+ dotnetCorePackages,
+}:
+buildDotnetModule rec {
+ pname = "skeditor";
+ version = "2.8.1";
+
+ src = fetchFromGitHub {
+ owner = "skeditorteam";
+ repo = "skeditor";
+ rev = "v${version}";
+ hash = "sha256-ojE276nonX52UTjvdKL5mX8dj3MNElqlR1A/c0vT9WE=";
+ };
+
+ projectFile = "SkEditor/SkEditor.csproj";
+ executables = [ "SkEditor" ];
+ nugetDeps = ./nuget-deps.nix;
+
+ dotnet-sdk = dotnetCorePackages.sdk_8_0;
+ dotnet-runtime = dotnetCorePackages.runtime_8_0;
+
+ passthru.updateScript = ./update.sh;
+
+ meta = {
+ description = "App for editing Skript files";
+ homepage = "https://github.com/SkEditorTeam/SkEditor";
+ changelog = "https://github.com/SkEditorTeam/SkEditor/releases/tag/v${version}";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ eveeifyeve ];
+ };
+}
diff --git a/pkgs/by-name/sk/skeditor/update.sh b/pkgs/by-name/sk/skeditor/update.sh
new file mode 100644
index 000000000000..3ffc5a75709e
--- /dev/null
+++ b/pkgs/by-name/sk/skeditor/update.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts gnused nix coreutils
+
+set -euo pipefail
+
+latestVersion="$(curl -s "https://api.github.com/repos/SkEditorTeam/skEditor/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')"
+currentVersion=$(nix-instantiate --eval -E "with import ./. {}; skeditor.version or (lib.getVersion skeditor)" | tr -d '"')
+
+if [[ "$currentVersion" == "$latestVersion" ]]; then
+ echo "skeditor is up-to-date: $currentVersion"
+ exit 0
+fi
+
+update-source-version skeditor "$latestVersion"
+
+$(nix-build . -A skeditor.fetch-deps --no-out-link)
diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix
index 143339093140..c069430866d4 100644
--- a/pkgs/by-name/sk/sketchybar-app-font/package.nix
+++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix
@@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "sketchybar-app-font";
- version = "2.0.24";
+ version = "2.0.25";
src = fetchFromGitHub {
owner = "kvndrsslr";
repo = "sketchybar-app-font";
- rev = "v2.0.24";
- hash = "sha256-7ILGOz+5S1I6R28i3cdmVs7gYmucPiOfCTIZM7rimV4=";
+ rev = "v2.0.25";
+ hash = "sha256-R3vf9IyMiPBC0cFjvRcaIDqd/q76dA2RbOjZKCwdk/Y=";
};
pnpmDeps = pnpm.fetchDeps {
diff --git a/pkgs/by-name/sk/skypeforlinux/package.nix b/pkgs/by-name/sk/skypeforlinux/package.nix
index f0d6784bf86f..fa58fd862638 100644
--- a/pkgs/by-name/sk/skypeforlinux/package.nix
+++ b/pkgs/by-name/sk/skypeforlinux/package.nix
@@ -42,8 +42,8 @@ let
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
# source of the latter disappears much faster.
- version = "8.130.0.205";
- revision = "368";
+ version = "8.131.0.202";
+ revision = "370";
rpath =
lib.makeLibraryPath [
@@ -103,7 +103,7 @@ let
fetchurl {
name = "skypeforlinux-${version}-${revision}.snap";
url = "https://api.snapcraft.io/api/v1/snaps/download/QRDEfjn4WJYnm0FzDKwqqRZZI77awQEV_${revision}.snap";
- hash = "sha512-eDSJQndUDxSsRg9bSevWUih1iXDp3n1kU0RdRAu3GsHeRC/JJx3m4vKxP0F/Rcf2Toxd3MPG2r6Oa1Wa7upcGg==";
+ hash = "sha512-POCDkJe58ie78PIze6qADPIbjfFxNhLJt5z7ooHNIna6IrJoeqpFYIrRo9uosHkUURu83MfueeyYd6z0j+P/RQ==";
}
else
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
diff --git a/pkgs/development/tools/misc/slint-lsp/default.nix b/pkgs/by-name/sl/slint-lsp/package.nix
similarity index 83%
rename from pkgs/development/tools/misc/slint-lsp/default.nix
rename to pkgs/by-name/sl/slint-lsp/package.nix
index f51b848a621a..969457481da7 100644
--- a/pkgs/development/tools/misc/slint-lsp/default.nix
+++ b/pkgs/by-name/sl/slint-lsp/package.nix
@@ -25,14 +25,14 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "slint-lsp";
- version = "1.5.1";
+ version = "1.8.0";
src = fetchCrate {
inherit pname version;
- hash = "sha256-wqAcHBHWtYavAakHLhHHCI+Yercgdtzo1EAOilsZOK0=";
+ hash = "sha256-Shgcjr0mlUNAobMAarZ7dFnXgPGzBHXs2KnUDT/8I2A=";
};
- cargoHash = "sha256-XjVXhXoGEhxWc+LZa0EsPiw3Gq2pg03YjKONTptSQvA=";
+ cargoHash = "sha256-wyzrFg3hwsJ7SV8KGLKo+gNHzLFpnMx9/jgMalGkufY=";
nativeBuildInputs = [ cmake pkg-config fontconfig ];
buildInputs = rpathLibs ++ [ xorg.libxcb.dev ]
@@ -46,6 +46,9 @@ rustPlatform.buildRustPackage rec {
OpenGL
];
+ # Tests requires `i_slint_backend_testing` which is only a dev dependency
+ doCheck = false;
+
postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
patchelf --set-rpath ${lib.makeLibraryPath rpathLibs} $out/bin/slint-lsp
'';
diff --git a/pkgs/by-name/sm/smartcat/package.nix b/pkgs/by-name/sm/smartcat/package.nix
index fb7195bfeaee..e68ce1185777 100644
--- a/pkgs/by-name/sm/smartcat/package.nix
+++ b/pkgs/by-name/sm/smartcat/package.nix
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "smartcat";
- version = "1.4.1";
+ version = "1.7.1";
src = fetchFromGitHub {
owner = "efugier";
repo = "smartcat";
rev = "refs/tags/${version}";
- hash = "sha256-/BJdLHK8rb9QVlkLbRCXIPlHiI2eThAZvhIhJWW43Q4=";
+ hash = "sha256-62yvXrhk9JO7JBfD7tNFjba2nHxdqAVyMIW3q+2Aomc=";
};
- cargoHash = "sha256-mMoLFlY4mExG7MCu2uXPzmG3krKIWOLwcnth8gt40eg=";
+ cargoHash = "sha256-y0EA6pDxAO4mxZE+k15LUrjxsDD4A/KxvJltZL9Lqgc=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/by-name/sn/snoop/package.nix b/pkgs/by-name/sn/snoop/package.nix
index 3736427ef953..4cc1d0bb3394 100644
--- a/pkgs/by-name/sn/snoop/package.nix
+++ b/pkgs/by-name/sn/snoop/package.nix
@@ -20,14 +20,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "snoop";
- version = "0.4";
+ version = "0.4.1";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "philippun1";
repo = "snoop";
rev = "refs/tags/${finalAttrs.version}";
- hash = "sha256-JrSUGxhlr4wCGoh589AkPRhNmfsi7msv9EO2k1pHlKY=";
+ hash = "sha256-v4+A0q04+THBJ+U5izICVhofXPEC3db73MzYonXcDvU=";
};
patchPhase = ''
diff --git a/pkgs/by-name/so/softether/package.nix b/pkgs/by-name/so/softether/package.nix
index 2f7cba342808..e1d8d575f99e 100644
--- a/pkgs/by-name/so/softether/package.nix
+++ b/pkgs/by-name/so/softether/package.nix
@@ -1,7 +1,7 @@
{
lib,
stdenv,
- fetchurl,
+ fetchFromGitHub,
openssl,
readline,
ncurses,
@@ -9,14 +9,15 @@
dataDir ? "/var/lib/softether",
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "softether";
- version = "4.38";
- build = "9760";
+ version = "4.41-9782-beta";
- src = fetchurl {
- url = "https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/releases/download/v${version}-${build}-rtm/softether-src-v${version}-${build}-rtm.tar.gz";
- sha256 = "0d8zahi9lkv72jh8yj66pwrsi4451vk113d3khzrzgbic6s2i0g6";
+ src = fetchFromGitHub {
+ owner = "SoftEtherVPN";
+ repo = "SoftEtherVPN_Stable";
+ rev = "refs/tags/v${finalAttrs.version}";
+ hash = "sha256-yvN5hlfAtE+gWm0s/TY/Lp53By5SDHyQIvvDutRnDNQ=";
};
buildInputs = [
@@ -40,11 +41,14 @@ stdenv.mkDerivation rec {
Makefile
'';
- meta = with lib; {
+ meta = {
description = "Open-Source Free Cross-platform Multi-protocol VPN Program";
homepage = "https://www.softether.org/";
- license = licenses.asl20;
- maintainers = [ maintainers.rick68 ];
- platforms = [ "x86_64-linux" ];
+ license = lib.licenses.asl20;
+ maintainers = [ lib.maintainers.rick68 ];
+ platforms = [
+ "x86_64-linux"
+ "aarch64-linux"
+ ];
};
-}
+})
diff --git a/pkgs/by-name/so/sonar-scanner-cli/package.nix b/pkgs/by-name/so/sonar-scanner-cli/package.nix
new file mode 100644
index 000000000000..94c03ac15530
--- /dev/null
+++ b/pkgs/by-name/so/sonar-scanner-cli/package.nix
@@ -0,0 +1,81 @@
+{
+ lib,
+ coreutils,
+ fetchFromGitHub,
+ jre,
+ libarchive,
+ makeWrapper,
+ maven,
+ nix-update-script,
+}:
+
+maven.buildMavenPackage rec {
+ pname = "sonar-scanner-cli";
+ version = "6.2.1.4610";
+
+ src = fetchFromGitHub {
+ owner = "SonarSource";
+ repo = "sonar-scanner-cli";
+ rev = "refs/tags/${version}";
+ hash = "sha256-k1gZO3h6ZGwxJNQ5QwUH96aDPGpJuEn6HYUsYOpqo+g=";
+ };
+
+ mvnHash = "sha256-RNWE9wjX2CP6G/Hoh/vJExUkTEsSh5D+1PAMZ9TuIh0=";
+
+ mvnParameters = "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z";
+
+ nativeBuildInputs = [
+ # For bsdtar (name is a misnomer since it handles multiple archive formats) to extract nested directories from .zip files.
+ libarchive
+ makeWrapper
+ ];
+
+ doCheck = false;
+
+ # The .zip file with the programs is placed at "target/sonar-scanner-{project.version}.zip".
+ #
+ # To compute this .zip file path directly, we need to get the project version from the project's pom.xml.
+ #
+ # Parsing pom.xml is unsafe because project versions can be set dynamically. We need to use maven-help-plugin to get the evaluated value instead.
+ #
+ # Network isolation, however, prevents Maven from downloading packages in our shell script so we can't do this:
+ #
+ # MAVEN_PROJECT_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:3.4.1:evaluate \
+ # -Dmaven.repo.local=.m2 \
+ # -Dexpression=project.version \
+ # -DforceStdout \
+ # --quiet)
+ #
+ # We'll use wildcard expansion instead to find (what should be) the only .zip file in the "target" directory.
+ installPhase = ''
+ mkdir $out
+
+ FILES=(target/sonar-scanner-*.zip)
+ bsdtar --extract --file ''${FILES[0]} --strip-components 1 --directory $out
+
+ wrapProgram $out/bin/sonar-scanner \
+ --prefix PATH : ${
+ lib.makeBinPath [
+ coreutils
+ jre
+ ]
+ } \
+ --set JAVA_HOME ${jre}
+
+ wrapProgram $out/bin/sonar-scanner-debug \
+ --prefix PATH : ${lib.makeBinPath [ coreutils ]}
+ '';
+
+ passthru = {
+ updateScript = nix-update-script { };
+ };
+
+ meta = {
+ description = "Scanner CLI for SonarQube and SonarCloud";
+ homepage = "https://github.com/SonarSource/sonar-scanner-cli";
+ license = lib.licenses.lgpl3Only;
+ mainProgram = "sonar-scanner";
+ platforms = lib.platforms.unix;
+ maintainers = with lib.maintainers; [ peterromfeldhk ];
+ };
+}
diff --git a/pkgs/by-name/so/sonusmix/Cargo.lock b/pkgs/by-name/so/sonusmix/Cargo.lock
new file mode 100644
index 000000000000..50426acc2c85
--- /dev/null
+++ b/pkgs/by-name/so/sonusmix/Cargo.lock
@@ -0,0 +1,2020 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "addr2line"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "annotate-snippets"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e"
+dependencies = [
+ "unicode-width",
+ "yansi-term",
+]
+
+[[package]]
+name = "ansi_term"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+dependencies = [
+ "backtrace",
+]
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "backtrace"
+version = "0.3.73"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "bindgen"
+version = "0.69.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
+dependencies = [
+ "annotate-snippets",
+ "bitflags 2.6.0",
+ "cexpr",
+ "clang-sys",
+ "itertools 0.12.1",
+ "lazy_static",
+ "lazycell",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn 2.0.77",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "cairo-rs"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8a0ea147c94108c9613235388f540e4d14c327f7081c9e471fc8ee8a2533e69"
+dependencies = [
+ "bitflags 2.6.0",
+ "cairo-sys-rs",
+ "glib",
+ "libc",
+]
+
+[[package]]
+name = "cairo-sys-rs"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f"
+dependencies = [
+ "glib-sys",
+ "libc",
+ "system-deps 7.0.2",
+]
+
+[[package]]
+name = "cc"
+version = "1.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "cfg-expr"
+version = "0.15.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
+dependencies = [
+ "smallvec",
+ "target-lexicon",
+]
+
+[[package]]
+name = "cfg-expr"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "345c78335be0624ed29012dc10c49102196c6882c12dde65d9f35b02da2aada8"
+dependencies = [
+ "smallvec",
+ "target-lexicon",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "clang-sys"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "clap"
+version = "2.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+dependencies = [
+ "ansi_term",
+ "atty",
+ "bitflags 1.3.2",
+ "strsim",
+ "textwrap",
+ "unicode-width",
+ "vec_map",
+]
+
+[[package]]
+name = "colog"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c426b7af8d5e0ad79de6713996632ce31f0d68ba84068fb0d654b396e519df0"
+dependencies = [
+ "colored",
+ "env_logger",
+ "log",
+]
+
+[[package]]
+name = "colorchoice"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+
+[[package]]
+name = "colored"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8"
+dependencies = [
+ "lazy_static",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "cookie-factory"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2"
+dependencies = [
+ "futures",
+]
+
+[[package]]
+name = "dbus"
+version = "0.9.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b"
+dependencies = [
+ "libc",
+ "libdbus-sys",
+ "winapi",
+]
+
+[[package]]
+name = "dbus-codegen"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a49da9fdfbe872d4841d56605dc42efa5e6ca3291299b87f44e1cde91a28617c"
+dependencies = [
+ "clap",
+ "dbus",
+ "xml-rs",
+]
+
+[[package]]
+name = "dbus-tree"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f456e698ae8e54575e19ddb1f9b7bce2298568524f215496b248eb9498b4f508"
+dependencies = [
+ "dbus",
+]
+
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "dotenvy"
+version = "0.15.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "env_filter"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+dependencies = [
+ "log",
+ "regex",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.11.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "humantime",
+ "log",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+
+[[package]]
+name = "field-offset"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
+dependencies = [
+ "memoffset",
+ "rustc_version",
+]
+
+[[package]]
+name = "flume"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+ "nanorand",
+ "spin",
+]
+
+[[package]]
+name = "fragile"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
+
+[[package]]
+name = "futures"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.77",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+
+[[package]]
+name = "futures-task"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+
+[[package]]
+name = "futures-util"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "fuzzy-matcher"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94"
+dependencies = [
+ "thread_local",
+]
+
+[[package]]
+name = "gdk-pixbuf"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8730751991b97419fc3f0c2dca2c9e45b48edf46e48e0f965964ecf33889812f"
+dependencies = [
+ "gdk-pixbuf-sys",
+ "gio",
+ "glib",
+ "libc",
+]
+
+[[package]]
+name = "gdk-pixbuf-sys"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ffbf649fd5b1c8c0f0feeb015b7533c3ef92da2887fb95ddd338bc2b1644a7c"
+dependencies = [
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps 7.0.2",
+]
+
+[[package]]
+name = "gdk4"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b7d7237c1487ed4b300aac7744efcbf1319e12d60d7afcd6f505414bd5b5dea"
+dependencies = [
+ "cairo-rs",
+ "gdk-pixbuf",
+ "gdk4-sys",
+ "gio",
+ "glib",
+ "libc",
+ "pango",
+]
+
+[[package]]
+name = "gdk4-sys"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a67576c8ec012156d7f680e201a807b4432a77babb3157e0555e990ab6bcd878"
+dependencies = [
+ "cairo-sys-rs",
+ "gdk-pixbuf-sys",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "pango-sys",
+ "pkg-config",
+ "system-deps 7.0.2",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "wasi",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "gimli"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+
+[[package]]
+name = "gio"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcacaa37401cad0a95aadd266bc39c72a131d454fc012f6dfd217f891d76cc52"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-util",
+ "gio-sys",
+ "glib",
+ "libc",
+ "pin-project-lite",
+ "smallvec",
+]
+
+[[package]]
+name = "gio-sys"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5237611e97e9b86ab5768adc3eef853ae713ea797aa3835404acdfacffc9fb38"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps 7.0.2",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "glib"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c1ea829497810f8e87f5ee6d05c4879af641704add879e6b6080607cceeefe4"
+dependencies = [
+ "bitflags 2.6.0",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-task",
+ "futures-util",
+ "gio-sys",
+ "glib-macros",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "memchr",
+ "smallvec",
+]
+
+[[package]]
+name = "glib-macros"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "951aa19c5e89555c0ca5e94ee874b24b2594ece8412b387bd84ee3266b8a3ea0"
+dependencies = [
+ "heck",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.77",
+]
+
+[[package]]
+name = "glib-sys"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92eee4531c1c9abba945d19378b205031b5890e1f99c319ba0503b6e0c06a163"
+dependencies = [
+ "libc",
+ "system-deps 7.0.2",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "gobject-sys"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa3d1dcd8a1eb2e7c22be3d5e792b14b186f3524f79b25631730f9a8c169d49a"
+dependencies = [
+ "glib-sys",
+ "libc",
+ "system-deps 7.0.2",
+]
+
+[[package]]
+name = "graphene-rs"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80aac87f74e81c0e13433e892a047237abdc37945c86887f5eed905038356e69"
+dependencies = [
+ "glib",
+ "graphene-sys",
+ "libc",
+]
+
+[[package]]
+name = "graphene-sys"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc2f91ecd32989efad60326cc20a8fb252bd2852239a08e4e70cde8c100de9ca"
+dependencies = [
+ "glib-sys",
+ "libc",
+ "pkg-config",
+ "system-deps 7.0.2",
+]
+
+[[package]]
+name = "gsk4"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3cf2091e1af185b347b3450817d93dea6fe435df7abd4c2cd7fb5bcb4cfda8"
+dependencies = [
+ "cairo-rs",
+ "gdk4",
+ "glib",
+ "graphene-rs",
+ "gsk4-sys",
+ "libc",
+ "pango",
+]
+
+[[package]]
+name = "gsk4-sys"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6aa69614a26d8760c186c3690f1b0fbb917572ca23ef83137445770ceddf8cde"
+dependencies = [
+ "cairo-sys-rs",
+ "gdk4-sys",
+ "glib-sys",
+ "gobject-sys",
+ "graphene-sys",
+ "libc",
+ "pango-sys",
+ "system-deps 7.0.2",
+]
+
+[[package]]
+name = "gtk4"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4fe572bf318e5dbc6f5a2f8a25d853f1ae3f42768c0b08af6ca20a18f4057e1"
+dependencies = [
+ "cairo-rs",
+ "field-offset",
+ "futures-channel",
+ "gdk-pixbuf",
+ "gdk4",
+ "gio",
+ "glib",
+ "graphene-rs",
+ "gsk4",
+ "gtk4-macros",
+ "gtk4-sys",
+ "libc",
+ "pango",
+]
+
+[[package]]
+name = "gtk4-macros"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9e7b362c8fccd2712297903717d65d30defdab2b509bc9d209cbe5ffb9fabaf"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.77",
+]
+
+[[package]]
+name = "gtk4-sys"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1114a207af8ada02cf4658a76692f4190f06f093380d5be07e3ca8b43aa7c666"
+dependencies = [
+ "cairo-sys-rs",
+ "gdk-pixbuf-sys",
+ "gdk4-sys",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "graphene-sys",
+ "gsk4-sys",
+ "libc",
+ "pango-sys",
+ "system-deps 7.0.2",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
+[[package]]
+name = "indexmap"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+ "serde",
+]
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "ksni"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4934310bdd016e55725482b8d35ac0c16fd058c1b955d8959aa2d953b918c85b"
+dependencies = [
+ "dbus",
+ "dbus-codegen",
+ "dbus-tree",
+ "thiserror",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "libc"
+version = "0.2.158"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+
+[[package]]
+name = "libdbus-sys"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72"
+dependencies = [
+ "pkg-config",
+]
+
+[[package]]
+name = "libloading"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+dependencies = [
+ "cfg-if",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+]
+
+[[package]]
+name = "libspa"
+version = "0.8.0"
+source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs.git#016e554768ae251c8de3724ea4b06f4749a8dd00"
+dependencies = [
+ "bitflags 2.6.0",
+ "cc",
+ "convert_case",
+ "cookie-factory",
+ "libc",
+ "libspa-sys",
+ "nix",
+ "nom",
+ "system-deps 6.2.2",
+]
+
+[[package]]
+name = "libspa-sys"
+version = "0.8.0"
+source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs.git#016e554768ae251c8de3724ea4b06f4749a8dd00"
+dependencies = [
+ "bindgen",
+ "cc",
+ "system-deps 6.2.2",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "nanorand"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "libc",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "object"
+version = "0.36.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "oneshot"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e296cf87e61c9cfc1a61c3c63a0f7f286ed4554e0e22be84e8a38e1d264a2a29"
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "pango"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5764e5a174a5a0ec054fe5962ce6d4fc7052e2d0dcc23bbc77202b40a4a403d3"
+dependencies = [
+ "gio",
+ "glib",
+ "libc",
+ "pango-sys",
+]
+
+[[package]]
+name = "pango-sys"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd317e1de76b14b3d3efe05518c08b360327f1ab7fec150473a89ffcad4b072d"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps 7.0.2",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pipewire"
+version = "0.8.0"
+source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs.git#016e554768ae251c8de3724ea4b06f4749a8dd00"
+dependencies = [
+ "anyhow",
+ "bitflags 2.6.0",
+ "libc",
+ "libspa",
+ "libspa-sys",
+ "nix",
+ "once_cell",
+ "pipewire-sys",
+ "thiserror",
+]
+
+[[package]]
+name = "pipewire-sys"
+version = "0.8.0"
+source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs.git#016e554768ae251c8de3724ea4b06f4749a8dd00"
+dependencies = [
+ "bindgen",
+ "libspa-sys",
+ "system-deps 6.2.2",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
+dependencies = [
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
+dependencies = [
+ "getrandom",
+ "libredox",
+ "thiserror",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+
+[[package]]
+name = "relm4"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf0363f92b6a7eefd985b47f27b7ae168dd2fd5cd4013a338c9b111c33744d1f"
+dependencies = [
+ "flume",
+ "fragile",
+ "futures",
+ "gtk4",
+ "once_cell",
+ "relm4-css",
+ "relm4-macros",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "relm4-css"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d3b924557df1cddc687b60b313c4b76620fdbf0e463afa4b29f67193ccf37f9"
+
+[[package]]
+name = "relm4-macros"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc5885640821d60062497737dd42fd04248d13c7ecccee620caaa4b210fe9905"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.77",
+]
+
+[[package]]
+name = "ron"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
+dependencies = [
+ "base64",
+ "bitflags 2.6.0",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36"
+dependencies = [
+ "bitflags 2.6.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "semver"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+
+[[package]]
+name = "serde"
+version = "1.0.209"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.209"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.77",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "slotmap"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
+dependencies = [
+ "serde",
+ "version_check",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "sonusmix"
+version = "0.1.1"
+dependencies = [
+ "anyhow",
+ "colog",
+ "derivative",
+ "dirs",
+ "dotenvy",
+ "fuzzy-matcher",
+ "gtk4",
+ "indexmap",
+ "itertools 0.13.0",
+ "ksni",
+ "log",
+ "oneshot",
+ "paste",
+ "pipewire",
+ "relm4",
+ "ron",
+ "serde",
+ "slotmap",
+ "tempfile",
+ "thiserror",
+ "tokio",
+ "ulid",
+]
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
+[[package]]
+name = "strsim"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "system-deps"
+version = "6.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
+dependencies = [
+ "cfg-expr 0.15.8",
+ "heck",
+ "pkg-config",
+ "toml",
+ "version-compare",
+]
+
+[[package]]
+name = "system-deps"
+version = "7.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "070a0a5e7da2d24be457809c4b3baa57a835fd2829ad8b86f9a049052fe71031"
+dependencies = [
+ "cfg-expr 0.16.0",
+ "heck",
+ "pkg-config",
+ "toml",
+ "version-compare",
+]
+
+[[package]]
+name = "target-lexicon"
+version = "0.12.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+
+[[package]]
+name = "tempfile"
+version = "3.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.77",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "tokio"
+version = "1.40.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+dependencies = [
+ "backtrace",
+ "pin-project-lite",
+ "tokio-macros",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.77",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.77",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "ulid"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04f903f293d11f31c0c29e4148f6dc0d033a7f80cebc0282bea147611667d289"
+dependencies = [
+ "getrandom",
+ "rand",
+ "serde",
+ "web-time",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "vec_map"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+
+[[package]]
+name = "version-compare"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.77",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.77",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "winnow"
+version = "0.6.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "xml-rs"
+version = "0.8.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26"
+
+[[package]]
+name = "yansi-term"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.77",
+]
diff --git a/pkgs/by-name/so/sonusmix/package.nix b/pkgs/by-name/so/sonusmix/package.nix
new file mode 100644
index 000000000000..ea9b7de49519
--- /dev/null
+++ b/pkgs/by-name/so/sonusmix/package.nix
@@ -0,0 +1,54 @@
+{
+ lib,
+ rustPlatform,
+ fetchFromGitea,
+ pkg-config,
+ glib,
+ gtk4,
+ pipewire,
+ dbus,
+ wrapGAppsHook4,
+ autoPatchelfHook,
+}:
+rustPlatform.buildRustPackage rec {
+ pname = "sonusmix";
+ version = "0.1.1";
+ doCheck = false;
+
+ src = fetchFromGitea {
+ domain = "codeberg.org";
+ owner = "sonusmix";
+ repo = "sonusmix";
+ rev = "v${version}";
+ hash = "sha256-vqbYJuErghSsvkFccLFUYuf1Dsg17tCBhF4/NLcba/E=";
+ };
+
+ cargoLock = {
+ lockFile = ./Cargo.lock;
+ outputHashes = {
+ "libspa-0.8.0" = "sha256-R68TkFbzDFA/8Btcar+0omUErLyBMm4fsmQlCvfqR9o=";
+ };
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ rustPlatform.bindgenHook
+ wrapGAppsHook4
+ autoPatchelfHook
+ ];
+
+ buildInputs = [
+ glib
+ gtk4
+ pipewire
+ dbus
+ ];
+
+ meta = {
+ description = "Next-gen Pipewire audio routing tool";
+ homepage = "https://codeberg.org/sonusmix/sonusmix";
+ license = lib.licenses.mpl20;
+ maintainers = with lib.maintainers; [ aucub ];
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/pkgs/by-name/so/sopwith/package.nix b/pkgs/by-name/so/sopwith/package.nix
index fe6fb0c147d3..0c006b405f8c 100644
--- a/pkgs/by-name/so/sopwith/package.nix
+++ b/pkgs/by-name/so/sopwith/package.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "sopwith";
- version = "2.5.0";
+ version = "2.6.0";
src = fetchFromGitHub {
owner = "fragglet";
repo = "sdl-sopwith";
rev = "refs/tags/sdl-sopwith-${version}";
- hash = "sha256-e7/Cv/v5NhYG5eb9B5oVxh/Dbmm2v4Y4KUKI4JI5SFw=";
+ hash = "sha256-sjg61QgcQDSQ/qrR+4PEZIf8OOnGBZvUSLCKGpS1bwg=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/sp/sphinxygen/package.nix b/pkgs/by-name/sp/sphinxygen/package.nix
new file mode 100644
index 000000000000..4ef1ad7d628b
--- /dev/null
+++ b/pkgs/by-name/sp/sphinxygen/package.nix
@@ -0,0 +1,33 @@
+{
+ lib,
+ python3,
+ fetchFromGitLab,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "sphinxygen";
+ version = "1.0.4";
+ pyproject = true;
+
+ src = fetchFromGitLab {
+ owner = "drobilla";
+ repo = "sphinxygen";
+ rev = "v${version}";
+ hash = "sha256-TIACg89E/BaMwPgFqj6JUncq7BI5xQ9jUDe4nQ9YiI4=";
+ };
+
+ build-system = with python3.pkgs; [
+ setuptools
+ ];
+
+ pythonImportsCheck = [ "sphinxygen" ];
+
+ meta = {
+ description = "Generates Sphinx markup from an XML description extracted by Doxygen";
+ homepage = "https://gitlab.com/drobilla/sphinxygen";
+ changelog = "https://gitlab.com/drobilla/sphinxygen/-/releases/v${version}";
+ license = lib.licenses.isc;
+ maintainers = with lib.maintainers; [ samueltardieu ];
+ mainProgram = "sphinxygen";
+ };
+}
diff --git a/pkgs/by-name/sp/spread/local-script-path.patch b/pkgs/by-name/sp/spread/local-script-path.patch
new file mode 100644
index 000000000000..f720cf1f67ff
--- /dev/null
+++ b/pkgs/by-name/sp/spread/local-script-path.patch
@@ -0,0 +1,13 @@
+diff --git a/spread/client.go b/spread/client.go
+index c72d48a..e927567 100644
+--- a/spread/client.go
++++ b/spread/client.go
+@@ -791,7 +791,7 @@ func (s *localScript) run() (stdout, stderr []byte, err error) {
+ buf.WriteString("NOMATCH() { { set +xu; } 2> /dev/null; local stdin=$(cat); if echo $stdin | grep -q -E \"$@\"; then echo \"NOMATCH pattern='$@' found in:\n$stdin\">&2; return 1; fi }\n")
+ buf.WriteString("export DEBIAN_FRONTEND=noninteractive\n")
+ buf.WriteString("export DEBIAN_PRIORITY=critical\n")
+- buf.WriteString("export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin\n")
++ buf.WriteString(fmt.Sprintf("export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:%s\n", os.Getenv("PATH")))
+
+ for _, k := range s.env.Keys() {
+ v := s.env.Get(k)
diff --git a/pkgs/by-name/sp/spread/package.nix b/pkgs/by-name/sp/spread/package.nix
new file mode 100644
index 000000000000..4fb6a143e051
--- /dev/null
+++ b/pkgs/by-name/sp/spread/package.nix
@@ -0,0 +1,66 @@
+{
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+ nix-update-script,
+ bash,
+ coreutils,
+ gnutar,
+ gzip,
+ makeWrapper,
+}:
+
+buildGoModule {
+ pname = "spread";
+ version = "0-unstable-2023-03-01";
+
+ src = fetchFromGitHub {
+ owner = "snapcore";
+ repo = "spread";
+ rev = "ded9133cdbceaf01f8a1c9decf6ff9ea56e194d6";
+ hash = "sha256-uHBzVABfRCyBAGP9f+2GS49Qc8R9d1HaRr6bYPeVSU4=";
+ };
+
+ vendorHash = "sha256-SULAfCLtNSnuUXvA33I48hnhU0Ixq79HhADPIKYkWNU=";
+
+ subPackages = [ "cmd/spread" ];
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ patches = [
+ # The upstream project statically assigns a PATH when running scripts in the
+ # local machine context. This patch keeps that static PATH assignment, but also
+ # appends the PATH from the environment context in which spread was run, so
+ # that nix-installed binaries are also available.
+ ./local-script-path.patch
+ ];
+
+ postPatch = ''
+ # Replace direct calls to /bin/bash
+ substituteInPlace spread/lxd.go --replace-fail '"/bin/bash", ' '"/usr/bin/env", "bash", '
+ substituteInPlace spread/client.go --replace-fail '"/bin/bash", ' '"/usr/bin/env", "bash", '
+ substituteInPlace spread/project.go --replace-fail '"/bin/bash", ' '"/usr/bin/env", "bash", '
+ '';
+
+ postInstall = ''
+ wrapProgram $out/bin/spread --prefix PATH : ${
+ lib.makeBinPath [
+ bash
+ coreutils
+ gnutar
+ gzip
+ ]
+ }
+ '';
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ mainProgram = "spread";
+ license = lib.licenses.gpl3Only;
+ description = "Convenient full-system test (task) distribution";
+ homepage = "https://github.com/snapcore/spread";
+ maintainers = with lib.maintainers; [ jnsgruk ];
+ platforms = lib.platforms.linux;
+ };
+}
diff --git a/pkgs/by-name/sq/sql-studio/package.nix b/pkgs/by-name/sq/sql-studio/package.nix
new file mode 100644
index 000000000000..b3ef7d0317eb
--- /dev/null
+++ b/pkgs/by-name/sq/sql-studio/package.nix
@@ -0,0 +1,47 @@
+{
+ lib,
+ stdenv,
+ rustPlatform,
+ buildNpmPackage,
+ fetchFromGitHub,
+}:
+let
+ pname = "sql-studio";
+ version = "0.1.27";
+
+ src = fetchFromGitHub {
+ owner = "frectonz";
+ repo = "sql-studio";
+ rev = version;
+ hash = "sha256-iSvxdqarHX0AvkMSzL2JFOm32OyMwVKt+Gn7odgwalU=";
+ };
+
+ ui = buildNpmPackage {
+ inherit version src;
+ pname = "${pname}-ui";
+ npmDepsHash = "sha256-kGukH0PKF7MtIO5UH+55fddj6Tv2dNLmOC6oytEhP3c=";
+ sourceRoot = "${src.name}/ui";
+ installPhase = ''
+ cp -pr --reflink=auto -- dist "$out/"
+ '';
+ };
+in
+rustPlatform.buildRustPackage {
+ inherit pname version src;
+
+ cargoHash = "sha256-BlYFbJEDap/k3oi9tFl4JpTyYh8ce7F3NIlOtOid59s=";
+
+ preBuild = ''
+ cp -pr --reflink=auto -- ${ui} ui/dist
+ '';
+
+ meta = {
+ description = "SQL Database Explorer [SQLite, libSQL, PostgreSQL, MySQL/MariaDB, DuckDB, ClickHouse]";
+ homepage = "https://github.com/frectonz/sql-studio";
+ mainProgram = "sql-studio";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.frectonz ];
+ platforms = lib.platforms.all;
+ broken = stdenv.isDarwin;
+ };
+}
diff --git a/pkgs/by-name/sq/sqlc/package.nix b/pkgs/by-name/sq/sqlc/package.nix
new file mode 100644
index 000000000000..c605faf4335a
--- /dev/null
+++ b/pkgs/by-name/sq/sqlc/package.nix
@@ -0,0 +1,57 @@
+{
+ lib,
+ stdenv,
+ buildGoModule,
+ fetchFromGitHub,
+ installShellFiles,
+ testers,
+ sqlc,
+}:
+
+let
+ version = "1.27.0";
+in
+buildGoModule {
+ pname = "sqlc";
+ inherit version;
+
+ src = fetchFromGitHub {
+ owner = "sqlc-dev";
+ repo = "sqlc";
+ rev = "v${version}";
+ hash = "sha256-wxQ+YPsDX0Z6B8whlQ/IaT2dRqapPL8kOuFEc6As1rU=";
+ };
+
+ proxyVendor = true;
+ vendorHash = "sha256-ndOw3uShF5TngpxYNumoK3H3R9v4crfi5V3ZCoSqW90=";
+
+ subPackages = [ "cmd/sqlc" ];
+
+ nativeBuildInputs = [ installShellFiles ];
+
+ ldflags = [
+ "-s"
+ "-w"
+ ];
+
+ postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+ installShellCompletion --cmd sqlc \
+ --bash <($out/bin/sqlc completion bash) \
+ --fish <($out/bin/sqlc completion fish) \
+ --zsh <($out/bin/sqlc completion zsh)
+ '';
+
+ passthru.tests.version = testers.testVersion {
+ package = sqlc;
+ command = "sqlc version";
+ version = "v${version}";
+ };
+
+ meta = {
+ description = "Generate type-safe code from SQL";
+ homepage = "https://sqlc.dev/";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ aaronjheng ];
+ mainProgram = "sqlc";
+ };
+}
diff --git a/pkgs/by-name/ss/ssh-import-id/package.nix b/pkgs/by-name/ss/ssh-import-id/package.nix
new file mode 100644
index 000000000000..5f2c2531774d
--- /dev/null
+++ b/pkgs/by-name/ss/ssh-import-id/package.nix
@@ -0,0 +1,63 @@
+{
+ lib,
+ extraHandlers ? [ ],
+ fetchgit,
+ installShellFiles,
+ makeWrapper,
+ python3Packages,
+}:
+
+python3Packages.buildPythonApplication rec {
+ pname = "ssh-import-id";
+ version = "5.11";
+ pyproject = true;
+
+ src = fetchgit {
+ url = "https://git.launchpad.net/ssh-import-id";
+ rev = "refs/tags/${version}";
+ hash = "sha256-tYbaJGH59qyvjp4kwo3ZFVs0EaE0Lsd2CQ6iraFkAdI=";
+ };
+
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace-fail "long_description_content_type='markdown'" "long_description_content_type='text/markdown'"
+ '';
+
+ build-system = with python3Packages; [ setuptools ];
+
+ nativeBuildInputs = [
+ makeWrapper
+ installShellFiles
+ ];
+
+ dependencies =
+ with python3Packages;
+ [
+ requests
+ distro
+ ]
+ ++ extraHandlers;
+
+ postInstall = ''
+ installManPage $src/usr/share/man/man1/ssh-import-id.1
+ '';
+
+ # Handlers require main bin, main bin requires handlers
+ makeWrapperArgs = [
+ "--prefix"
+ ":"
+ "$out/bin"
+ ];
+
+ meta = with lib; {
+ description = "Retrieves an SSH public key and installs it locally";
+ homepage = "https://launchpad.net/ssh-import-id";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [
+ mkg20001
+ viraptor
+ ];
+ mainProgram = "ssh-import-id";
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/by-name/ss/sshified/package.nix b/pkgs/by-name/ss/sshified/package.nix
new file mode 100644
index 000000000000..56498841a3d6
--- /dev/null
+++ b/pkgs/by-name/ss/sshified/package.nix
@@ -0,0 +1,36 @@
+{
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+}:
+
+buildGoModule rec {
+ pname = "sshified";
+ version = "1.2.1";
+
+ src = fetchFromGitHub {
+ owner = "hoffie";
+ repo = "sshified";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-oCeuQ4Do+Lyqsf8hBH9qvLxWbWQlqol481VrbnAW2ic=";
+ };
+
+ vendorHash = null;
+
+ ldflags = [
+ "-s"
+ "-w"
+ "-X=main.Version=${version}"
+ ];
+
+ subPackages = [ "." ];
+
+ meta = {
+ description = "Proxy HTTP requests through SSH";
+ homepage = "https://github.com/hoffie/sshified";
+ changelog = "https://github.com/hoffie/sshified/blob/v${version}/CHANGELOG.md";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ joinemm ];
+ mainProgram = "sshified";
+ };
+}
diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix
index 28a2d452c96c..5c97acbb0f8b 100644
--- a/pkgs/by-name/st/stalwart-mail/package.nix
+++ b/pkgs/by-name/st/stalwart-mail/package.nix
@@ -149,6 +149,7 @@ rustPlatform.buildRustPackage {
doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
passthru = {
+ inherit rocksdb; # make used rocksdb version available (e.g., for backup scripts)
webadmin = callPackage ./webadmin.nix { };
updateScript = nix-update-script { };
tests.stalwart-mail = nixosTests.stalwart-mail;
diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix
index 46a148ea563b..c1d048866cbd 100644
--- a/pkgs/by-name/st/stats/package.nix
+++ b/pkgs/by-name/st/stats/package.nix
@@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "stats";
- version = "2.11.14";
+ version = "2.11.16";
src = fetchurl {
url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg";
- hash = "sha256-JljFHlMcc8kfjGTdGAOP4ot+FqVy0yAJ1kxVO0TawHU=";
+ hash = "sha256-cv2fTb3Xykp5HnBhkGezUwWk2SkHQVMcRjJ8rXJlUrU=";
};
sourceRoot = ".";
diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/by-name/st/step-ca/package.nix
similarity index 82%
rename from pkgs/tools/security/step-ca/default.nix
rename to pkgs/by-name/st/step-ca/package.nix
index f37c05f93fbb..911c479c7189 100644
--- a/pkgs/tools/security/step-ca/default.nix
+++ b/pkgs/by-name/st/step-ca/package.nix
@@ -5,24 +5,24 @@
buildGoModule,
coreutils,
pcsclite,
- PCSC,
pkg-config,
hsmSupport ? true,
nixosTests,
+ darwin,
}:
buildGoModule rec {
pname = "step-ca";
- version = "0.27.2";
+ version = "0.27.5";
src = fetchFromGitHub {
owner = "smallstep";
repo = "certificates";
rev = "refs/tags/v${version}";
- hash = "sha256-byVWNab6Q3yryluhMomzLkRNfXQ/68pAq+YGFjbvX1o=";
+ hash = "sha256-0KIAO9KPP9Lrrw9IIaRdlmmfJ0mwQK0ne//Zofu3TfE=";
};
- vendorHash = "sha256-gQEGCbVgtKIaUgBkfpVwLXoUg1EUhaQFn9JZvV5Rjhc=";
+ vendorHash = "sha256-yi4mbuCaT6ydnZwhqqhqMI7bF6IwHm0UqfR5JM81/Ik=";
ldflags = [
"-w"
@@ -33,9 +33,9 @@ buildGoModule rec {
buildInputs =
lib.optionals (hsmSupport && stdenv.hostPlatform.isLinux) [ pcsclite ]
- ++ lib.optionals (hsmSupport && stdenv.hostPlatform.isDarwin) [ PCSC ];
-
+ ++ lib.optionals (hsmSupport && stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.PCSC ];
postPatch = ''
+ substituteInPlace authority/http_client_test.go --replace-fail 't.Run("SystemCertPool", func(t *testing.T) {' 't.Skip("SystemCertPool", func(t *testing.T) {'
substituteInPlace systemd/step-ca.service --replace "/bin/kill" "${coreutils}/bin/kill"
'';
diff --git a/pkgs/by-name/st/storcli/package.nix b/pkgs/by-name/st/storcli/package.nix
index bb1e92247663..7c78a2fefd17 100644
--- a/pkgs/by-name/st/storcli/package.nix
+++ b/pkgs/by-name/st/storcli/package.nix
@@ -7,12 +7,12 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "storcli";
- version = "7.2904.00";
- phase = "30";
+ version = "7.3103.00";
+ phase = "32";
src = fetchzip {
url = "https://docs.broadcom.com/docs-and-downloads/host-bus-adapters/host-bus-adapters-common-files/sas_sata_nvme_12g_p${finalAttrs.phase}/STORCLI_SAS3.5_P${finalAttrs.phase}.zip";
- hash = "sha256-VfK71eiDonzWdR6g5zkXgRRi25vwoI4DDL6xy3zsfak=";
+ hash = "sha256-bOlIChZi2eWpc5QA+wXBQA4s+o/MVLVWsligjDpUXEU=";
};
nativeBuildInputs = [ rpmextract ];
diff --git a/pkgs/by-name/st/streamcontroller/package.nix b/pkgs/by-name/st/streamcontroller/package.nix
index 830bc1229052..71e2a2ee65d1 100644
--- a/pkgs/by-name/st/streamcontroller/package.nix
+++ b/pkgs/by-name/st/streamcontroller/package.nix
@@ -16,15 +16,13 @@
stdenv.mkDerivation rec {
pname = "streamcontroller";
- # Note that the latest tagged version (1.5.0-beta.6) includes a python dependency
- # that doesn't exist anymore, so we package an unstable version instead.
- version = "1.5.0-beta.6-unstable-2024-08-13";
+ version = "1.5.0-beta.7";
src = fetchFromGitHub {
repo = "StreamController";
owner = "StreamController";
- rev = "dbb6460a69137af192db09d504224ae9f1127cbd";
- hash = "sha256-+YYzHLRU5MNjF3iaKIDj9k4PVg+vnEZhbc3ZmNI7xyw=";
+ rev = version;
+ hash = "sha256-UBcsA9pAo7fONhk4vYXQU4EgSVKm1D7/7nvL9BaNIgo=";
};
# The installation method documented upstream
diff --git a/pkgs/by-name/st/stylance-cli/package.nix b/pkgs/by-name/st/stylance-cli/package.nix
index b0154c709191..fd01a5acf180 100644
--- a/pkgs/by-name/st/stylance-cli/package.nix
+++ b/pkgs/by-name/st/stylance-cli/package.nix
@@ -4,14 +4,14 @@
}:
rustPlatform.buildRustPackage rec {
pname = "stylance-cli";
- version = "0.5.1";
+ version = "0.5.2";
src = fetchCrate {
inherit pname version;
- hash = "sha256-kpii3Jwvqhzp+Kummr0ypI9vyYVOcYKK0xCPwQknuWY=";
+ hash = "sha256-2RLdO2TxIa/ngji5tzKzSfpq2qErI7gaQqObDTMrd/g=";
};
- cargoHash = "sha256-tVSMZW2umkSilgPs/J7iFoBxKISrh7D73q3JWh2dJhI=";
+ cargoHash = "sha256-26EKLvqc9x7JT6EDkH9KbQJ+xX/CUslLmEF4XxnPbFY=";
meta = with lib; {
description = "Library and cli tool for working with scoped CSS in rust";
diff --git a/pkgs/by-name/su/sudachidict/package.nix b/pkgs/by-name/su/sudachidict/package.nix
index cb5149dcb446..744439283367 100644
--- a/pkgs/by-name/su/sudachidict/package.nix
+++ b/pkgs/by-name/su/sudachidict/package.nix
@@ -6,20 +6,20 @@
let
pname = "sudachidict";
- version = "20240716";
+ version = "20241021";
srcs = {
core = fetchzip {
url = "https://github.com/WorksApplications/SudachiDict/releases/download/v${version}/sudachi-dictionary-${version}-core.zip";
- hash = "sha256-6Sps7Q2AdQRJfhRf9oibLLIpgmNL//74lzCmTKXy7sU=";
+ hash = "sha256-wLcRhR4TCazRxDMKXYZ8T5Vn+rnY6aJmwExIpTIAyeE=";
};
small = fetchzip {
url = "https://github.com/WorksApplications/SudachiDict/releases/download/v${version}/sudachi-dictionary-${version}-small.zip";
- hash = "sha256-cZveAFaTpjaL/ge5Qv6zUzXYlNI/oLDivNnAa37gNYY=";
+ hash = "sha256-Qhp9seFCnLnLLWoQ2izDVKcdca+xZE1s+SCqfj0d3sU=";
};
full = fetchzip {
url = "https://github.com/WorksApplications/SudachiDict/releases/download/v${version}/sudachi-dictionary-${version}-full.zip";
- hash = "sha256-Mu0JgR3G6CRIzh25cCGhsUQBnfotOzRYzEC5Lma+n8s=";
+ hash = "sha256-8nlUDGHUKrZ0ZFEnnL4rHiu2ybyW25G6Bm6vF4smxWE=";
};
};
in
diff --git a/pkgs/by-name/su/surfer/package.nix b/pkgs/by-name/su/surfer/package.nix
index 52fc985cf0c9..08fba6bdb0ce 100644
--- a/pkgs/by-name/su/surfer/package.nix
+++ b/pkgs/by-name/su/surfer/package.nix
@@ -12,6 +12,7 @@
libXcursor,
libXi,
stdenv,
+ darwin,
makeWrapper,
zenity,
}:
@@ -27,19 +28,21 @@ rustPlatform.buildRustPackage rec {
fetchSubmodules = true;
};
- nativeBuildInputs = [
+ nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
pkg-config
autoPatchelfHook
makeWrapper
];
- buildInputs = [
- openssl
- stdenv.cc.cc.lib
- ];
+ buildInputs =
+ lib.optionals stdenv.hostPlatform.isLinux [
+ openssl
+ stdenv.cc.cc.lib
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ];
# Wayland and X11 libs are required at runtime since winit uses dlopen
- runtimeDependencies = [
+ runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [
wayland
libxkbcommon
libGL
@@ -60,7 +63,7 @@ rustPlatform.buildRustPackage rec {
# Avoid the network attempt from skia. See: https://github.com/cargo2nix/cargo2nix/issues/318
doCheck = false;
- postFixup = ''
+ postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
wrapProgram $out/bin/surfer \
--prefix PATH : ${lib.makeBinPath [ zenity ]}
'';
@@ -71,7 +74,7 @@ rustPlatform.buildRustPackage rec {
changelog = "https://gitlab.com/surfer-project/surfer/-/releases/v${version}";
license = lib.licenses.eupl12;
maintainers = with lib.maintainers; [ hakan-demirli ];
- platforms = lib.platforms.linux;
+ platforms = lib.platforms.linux ++ lib.platforms.darwin;
mainProgram = "surfer";
};
}
diff --git a/pkgs/by-name/sw/sway-unwrapped/package.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix
index 6bcff1c52a2d..05a182ac8063 100644
--- a/pkgs/by-name/sw/sway-unwrapped/package.nix
+++ b/pkgs/by-name/sw/sway-unwrapped/package.nix
@@ -13,14 +13,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "sway-unwrapped";
- version = "1.9";
+ version = "1.10";
inherit enableXWayland isNixOS systemdSupport trayEnabled;
src = fetchFromGitHub {
owner = "swaywm";
repo = "sway";
rev = finalAttrs.version;
- hash = "sha256-/6+iDkQfdLcL/pTJaqNc6QdP4SRVOYLjfOItEu/bZtg=";
+ hash = "sha256-PzeU/niUdqI6sf2TCG19G2vNgAZJE5JCyoTwtO9uFTk=";
};
patches = [
@@ -71,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
sd-bus-provider = if systemdSupport then "libsystemd" else "basu";
in [
(mesonOption "sd-bus-provider" sd-bus-provider)
- (mesonEnable "xwayland" finalAttrs.enableXWayland)
(mesonEnable "tray" finalAttrs.trayEnabled)
];
diff --git a/pkgs/by-name/sw/swig3/package.nix b/pkgs/by-name/sw/swig3/package.nix
new file mode 100644
index 000000000000..44848c13582c
--- /dev/null
+++ b/pkgs/by-name/sw/swig3/package.nix
@@ -0,0 +1,56 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ autoconf,
+ automake,
+ libtool,
+ bison,
+ pcre,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "swig";
+ version = "3.0.12";
+
+ src = fetchFromGitHub {
+ owner = "swig";
+ repo = "swig";
+ rev = "rel-${finalAttrs.version}";
+ sha256 = "1wyffskbkzj5zyhjnnpip80xzsjcr3p0q5486z3wdwabnysnhn8n";
+ };
+
+ # Not using autoreconfHook because it fails due to missing macros, contrary
+ # to this script
+ preConfigure = ''
+ ./autogen.sh
+ '';
+
+ nativeBuildInputs = [
+ autoconf
+ automake
+ libtool
+ bison
+ ];
+ buildInputs = [
+ pcre
+ ];
+
+ configureFlags = [
+ "--without-tcl"
+ ];
+
+ # Disable ccache documentation as it needs yodl
+ postPatch = ''
+ sed -i '/man1/d' CCache/Makefile.in
+ '';
+
+ meta = {
+ description = "Interface compiler that connects C/C++ code to higher-level languages";
+ homepage = "https://swig.org/";
+ # Different types of licenses available: http://www.swig.org/Release/LICENSE .
+ license = lib.licenses.gpl3Plus;
+ platforms = lib.platforms.unix;
+ maintainers = with lib.maintainers; [ doronbehar ];
+ };
+})
diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs
index 61932cb55591..7996d1454a65 100644
--- a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs
+++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs
@@ -940,10 +940,7 @@ fn do_user_switch(parent_exe: String) -> anyhow::Result<()> {
fn usage(argv0: &str) -> ! {
eprintln!(
r#"Usage: {} [switch|boot|test|dry-activate]
-switch: make the configuration the boot default and activate now
-boot: make the configuration the boot default
-test: activate the configuration, but don't make it the boot default
-dry-activate: show what would be done if this configuration were activated
+Consider calling `apply` instead of `switch-to-configuration`.
"#,
argv0
);
diff --git a/pkgs/by-name/sy/symfony-cli/package.nix b/pkgs/by-name/sy/symfony-cli/package.nix
index 47ae24c60822..62fe10210b47 100644
--- a/pkgs/by-name/sy/symfony-cli/package.nix
+++ b/pkgs/by-name/sy/symfony-cli/package.nix
@@ -10,14 +10,14 @@
buildGoModule rec {
pname = "symfony-cli";
- version = "5.10.2";
- vendorHash = "sha256-WSZM/9inaFLlZIAwH3E8hWyRQaOvY8BJ6ECpbkqJN6g=";
+ version = "5.10.4";
+ vendorHash = "sha256-UqaRZPCgjiexeeylfP8p0rye6oc+rWac87p8KbVKrdc=";
src = fetchFromGitHub {
owner = "symfony-cli";
repo = "symfony-cli";
rev = "v${version}";
- hash = "sha256-/fJ9Ovk2gXCIvvieCXxnI8gDjwrhQHJoF3Ia47dSdgQ=";
+ hash = "sha256-eyQ62cImviq+QCTFfkmwLcwFslPoXYssd2TpS9pPX48=";
leaveDotGit = true;
postFetch = ''
git --git-dir $out/.git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > $out/SOURCE_DATE
diff --git a/pkgs/by-name/sy/syncstorage-rs/Cargo.lock b/pkgs/by-name/sy/syncstorage-rs/Cargo.lock
index 4333f1d26fbb..4f364aacbdd5 100644
--- a/pkgs/by-name/sy/syncstorage-rs/Cargo.lock
+++ b/pkgs/by-name/sy/syncstorage-rs/Cargo.lock
@@ -2458,8 +2458,7 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
[[package]]
name = "sentry"
version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5484316556650182f03b43d4c746ce0e3e48074a21e2f51244b648b6542e1066"
+source = "git+https://github.com/getsentry/sentry-rust?rev=1b65b5c#1b65b5c99af975496880e7325218479e0037d097"
dependencies = [
"curl",
"httpdate",
@@ -2473,8 +2472,7 @@ dependencies = [
[[package]]
name = "sentry-backtrace"
version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40aa225bb41e2ec9d7c90886834367f560efc1af028f1c5478a6cce6a59c463a"
+source = "git+https://github.com/getsentry/sentry-rust?rev=1b65b5c#1b65b5c99af975496880e7325218479e0037d097"
dependencies = [
"backtrace",
"once_cell",
@@ -2485,8 +2483,7 @@ dependencies = [
[[package]]
name = "sentry-contexts"
version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a8dd746da3d16cb8c39751619cefd4fcdbd6df9610f3310fd646b55f6e39910"
+source = "git+https://github.com/getsentry/sentry-rust?rev=1b65b5c#1b65b5c99af975496880e7325218479e0037d097"
dependencies = [
"hostname",
"libc",
@@ -2499,8 +2496,7 @@ dependencies = [
[[package]]
name = "sentry-core"
version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "161283cfe8e99c8f6f236a402b9ccf726b201f365988b5bb637ebca0abbd4a30"
+source = "git+https://github.com/getsentry/sentry-rust?rev=1b65b5c#1b65b5c99af975496880e7325218479e0037d097"
dependencies = [
"once_cell",
"rand",
@@ -2512,8 +2508,7 @@ dependencies = [
[[package]]
name = "sentry-debug-images"
version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc6b25e945fcaa5e97c43faee0267eebda9f18d4b09a251775d8fef1086238a"
+source = "git+https://github.com/getsentry/sentry-rust?rev=1b65b5c#1b65b5c99af975496880e7325218479e0037d097"
dependencies = [
"findshlibs",
"once_cell",
@@ -2523,8 +2518,7 @@ dependencies = [
[[package]]
name = "sentry-tracing"
version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd3c5faf2103cd01eeda779ea439b68c4ee15adcdb16600836e97feafab362ec"
+source = "git+https://github.com/getsentry/sentry-rust?rev=1b65b5c#1b65b5c99af975496880e7325218479e0037d097"
dependencies = [
"sentry-backtrace",
"sentry-core",
@@ -2535,8 +2529,7 @@ dependencies = [
[[package]]
name = "sentry-types"
version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d68cdf6bc41b8ff3ae2a9c4671e97426dcdd154cc1d4b6b72813f285d6b163f"
+source = "git+https://github.com/getsentry/sentry-rust?rev=1b65b5c#1b65b5c99af975496880e7325218479e0037d097"
dependencies = [
"debugid",
"hex",
@@ -2827,7 +2820,7 @@ checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
[[package]]
name = "syncserver"
-version = "0.17.9"
+version = "0.17.12"
dependencies = [
"actix-cors",
"actix-http",
@@ -2882,7 +2875,7 @@ dependencies = [
[[package]]
name = "syncserver-common"
-version = "0.17.9"
+version = "0.17.12"
dependencies = [
"actix-web",
"backtrace",
@@ -2902,7 +2895,7 @@ dependencies = [
[[package]]
name = "syncserver-db-common"
-version = "0.17.9"
+version = "0.17.12"
dependencies = [
"backtrace",
"deadpool",
@@ -2916,7 +2909,7 @@ dependencies = [
[[package]]
name = "syncserver-settings"
-version = "0.17.9"
+version = "0.17.12"
dependencies = [
"config 0.11.0",
"num_cpus",
@@ -2930,7 +2923,7 @@ dependencies = [
[[package]]
name = "syncstorage-db"
-version = "0.17.9"
+version = "0.17.12"
dependencies = [
"async-trait",
"cadence",
@@ -2953,7 +2946,7 @@ dependencies = [
[[package]]
name = "syncstorage-db-common"
-version = "0.17.9"
+version = "0.17.12"
dependencies = [
"async-trait",
"backtrace",
@@ -2972,7 +2965,7 @@ dependencies = [
[[package]]
name = "syncstorage-mysql"
-version = "0.17.9"
+version = "0.17.12"
dependencies = [
"async-trait",
"backtrace",
@@ -2995,7 +2988,7 @@ dependencies = [
[[package]]
name = "syncstorage-settings"
-version = "0.17.9"
+version = "0.17.12"
dependencies = [
"rand",
"serde 1.0.203",
@@ -3005,7 +2998,7 @@ dependencies = [
[[package]]
name = "syncstorage-spanner"
-version = "0.17.9"
+version = "0.17.12"
dependencies = [
"async-trait",
"backtrace",
@@ -3149,7 +3142,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokenserver-auth"
-version = "0.17.9"
+version = "0.17.12"
dependencies = [
"async-trait",
"base64 0.22.1",
@@ -3176,7 +3169,7 @@ dependencies = [
[[package]]
name = "tokenserver-common"
-version = "0.17.9"
+version = "0.17.12"
dependencies = [
"actix-web",
"backtrace",
@@ -3191,7 +3184,7 @@ dependencies = [
[[package]]
name = "tokenserver-db"
-version = "0.17.9"
+version = "0.17.12"
dependencies = [
"async-trait",
"backtrace",
@@ -3216,7 +3209,7 @@ dependencies = [
[[package]]
name = "tokenserver-settings"
-version = "0.17.9"
+version = "0.17.12"
dependencies = [
"jsonwebtoken",
"serde 1.0.203",
diff --git a/pkgs/by-name/sy/syncstorage-rs/package.nix b/pkgs/by-name/sy/syncstorage-rs/package.nix
index 4c24a889afd0..51dc44b14e34 100644
--- a/pkgs/by-name/sy/syncstorage-rs/package.nix
+++ b/pkgs/by-name/sy/syncstorage-rs/package.nix
@@ -6,6 +6,7 @@
, libmysqlclient
, makeBinaryWrapper
, lib
+, nix-update-script
}:
let
@@ -20,13 +21,13 @@ in
rustPlatform.buildRustPackage rec {
pname = "syncstorage-rs";
- version = "0.17.9";
+ version = "0.17.12";
src = fetchFromGitHub {
owner = "mozilla-services";
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-ezTwAAtt0/jKfA6FtvzuQVFYOODMcD4RFiU3x0Umifk=";
+ hash = "sha256-hvKbKbRa5zk+80xmKWeMRjshaS6uybFzb5KdBY19Sl8=";
};
nativeBuildInputs = [
@@ -49,12 +50,15 @@ rustPlatform.buildRustPackage rec {
lockFile = ./Cargo.lock;
outputHashes = {
"deadpool-0.7.0" = "sha256-yQwn45EuzmPBwuT+iLJ/LLWAkBkW2vF+GLswdbpFVAY=";
+ "sentry-0.34.0" = "sha256-BdWz6EIEm2YU3DG3ODkuXCVCMV6srdyx2gXkOxINjHc=";
};
};
# almost all tests need a DB to test against
doCheck = false;
+ passthru.updateScript = nix-update-script {};
+
meta = {
description = "Mozilla Sync Storage built with Rust";
homepage = "https://github.com/mozilla-services/syncstorage-rs";
diff --git a/pkgs/by-name/sy/system76-power/Cargo.lock b/pkgs/by-name/sy/system76-power/Cargo.lock
index 82292ac66c79..04db447b4335 100644
--- a/pkgs/by-name/sy/system76-power/Cargo.lock
+++ b/pkgs/by-name/sy/system76-power/Cargo.lock
@@ -4,18 +4,18 @@ version = 3
[[package]]
name = "addr2line"
-version = "0.21.0"
+version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
dependencies = [
"gimli",
]
[[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
[[package]]
name = "aho-corasick"
@@ -28,47 +28,48 @@ dependencies = [
[[package]]
name = "anstream"
-version = "0.6.13"
+version = "0.6.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
dependencies = [
"anstyle",
"anstyle-parse",
"anstyle-query",
"anstyle-wincon",
"colorchoice",
+ "is_terminal_polyfill",
"utf8parse",
]
[[package]]
name = "anstyle"
-version = "1.0.6"
+version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
[[package]]
name = "anstyle-parse"
-version = "0.2.3"
+version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
-version = "1.0.2"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
dependencies = [
"windows-sys 0.52.0",
]
[[package]]
name = "anstyle-wincon"
-version = "3.0.2"
+version = "3.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
dependencies = [
"anstyle",
"windows-sys 0.52.0",
@@ -76,9 +77,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.82"
+version = "1.0.91"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
+checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8"
[[package]]
name = "async-broadcast"
@@ -92,26 +93,25 @@ dependencies = [
[[package]]
name = "async-channel"
-version = "2.2.1"
+version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
dependencies = [
"concurrent-queue",
- "event-listener 5.3.0",
- "event-listener-strategy 0.5.1",
+ "event-listener-strategy",
"futures-core",
"pin-project-lite",
]
[[package]]
name = "async-executor"
-version = "1.11.0"
+version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a"
+checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
dependencies = [
"async-task",
"concurrent-queue",
- "fastrand 2.0.2",
+ "fastrand 2.1.1",
"futures-lite 2.3.0",
"slab",
]
@@ -150,21 +150,21 @@ dependencies = [
[[package]]
name = "async-io"
-version = "2.3.2"
+version = "2.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884"
+checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8"
dependencies = [
- "async-lock 3.3.0",
+ "async-lock 3.4.0",
"cfg-if",
"concurrent-queue",
"futures-io",
"futures-lite 2.3.0",
"parking",
- "polling 3.7.0",
- "rustix 0.38.34",
+ "polling 3.7.3",
+ "rustix 0.38.37",
"slab",
"tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -178,12 +178,12 @@ dependencies = [
[[package]]
name = "async-lock"
-version = "3.3.0"
+version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
dependencies = [
- "event-listener 4.0.3",
- "event-listener-strategy 0.4.0",
+ "event-listener 5.3.1",
+ "event-listener-strategy",
"pin-project-lite",
]
@@ -200,7 +200,7 @@ dependencies = [
"cfg-if",
"event-listener 3.1.0",
"futures-lite 1.13.0",
- "rustix 0.38.34",
+ "rustix 0.38.37",
"windows-sys 0.48.0",
]
@@ -212,42 +212,42 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.82",
]
[[package]]
name = "async-signal"
-version = "0.2.6"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda"
+checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3"
dependencies = [
- "async-io 2.3.2",
- "async-lock 3.3.0",
+ "async-io 2.3.4",
+ "async-lock 3.4.0",
"atomic-waker",
"cfg-if",
"futures-core",
"futures-io",
- "rustix 0.38.34",
+ "rustix 0.38.37",
"signal-hook-registry",
"slab",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
name = "async-task"
-version = "4.7.0"
+version = "4.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
[[package]]
name = "async-trait"
-version = "0.1.80"
+version = "0.1.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.82",
]
[[package]]
@@ -258,23 +258,23 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
[[package]]
name = "autocfg"
-version = "1.2.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "backtrace"
-version = "0.3.71"
+version = "0.3.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
dependencies = [
"addr2line",
- "cc",
"cfg-if",
"libc",
"miniz_oxide",
"object",
"rustc-demangle",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -285,9 +285,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
[[package]]
name = "block-buffer"
@@ -300,18 +300,15 @@ dependencies = [
[[package]]
name = "blocking"
-version = "1.5.1"
+version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118"
+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
dependencies = [
"async-channel",
- "async-lock 3.3.0",
"async-task",
- "fastrand 2.0.2",
"futures-io",
"futures-lite 2.3.0",
"piper",
- "tracing",
]
[[package]]
@@ -322,15 +319,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
-version = "1.6.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
[[package]]
name = "cc"
-version = "1.0.95"
+version = "1.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b"
+checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
+dependencies = [
+ "shlex",
+]
[[package]]
name = "cfg-if"
@@ -340,9 +340,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "clap"
-version = "4.5.4"
+version = "4.5.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
dependencies = [
"clap_builder",
"clap_derive",
@@ -350,39 +350,39 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.2"
+version = "4.5.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
dependencies = [
"anstream",
"anstyle",
"clap_lex",
- "strsim 0.11.1",
+ "strsim",
]
[[package]]
name = "clap_derive"
-version = "4.5.4"
+version = "4.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.82",
]
[[package]]
name = "clap_lex"
-version = "0.7.0"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
[[package]]
name = "colorchoice"
-version = "1.0.0"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
[[package]]
name = "concat-in-place"
@@ -392,27 +392,27 @@ checksum = "c5b80dba65d26e0c4b692ad0312b837f1177e8175031af57fd1de4f3bc36b430"
[[package]]
name = "concurrent-queue"
-version = "2.4.0"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
dependencies = [
"crossbeam-utils",
]
[[package]]
name = "cpufeatures"
-version = "0.2.12"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
dependencies = [
"libc",
]
[[package]]
name = "crossbeam-utils"
-version = "0.8.19"
+version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
[[package]]
name = "crypto-common"
@@ -426,9 +426,9 @@ dependencies = [
[[package]]
name = "darling"
-version = "0.20.8"
+version = "0.20.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
dependencies = [
"darling_core",
"darling_macro",
@@ -436,27 +436,27 @@ dependencies = [
[[package]]
name = "darling_core"
-version = "0.20.8"
+version = "0.20.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
dependencies = [
"fnv",
"ident_case",
"proc-macro2",
"quote",
- "strsim 0.10.0",
- "syn 2.0.60",
+ "strsim",
+ "syn 2.0.82",
]
[[package]]
name = "darling_macro"
-version = "0.20.8"
+version = "0.20.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [
"darling_core",
"quote",
- "syn 2.0.60",
+ "syn 2.0.82",
]
[[package]]
@@ -479,7 +479,7 @@ dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.82",
]
[[package]]
@@ -494,9 +494,9 @@ dependencies = [
[[package]]
name = "enumflags2"
-version = "0.7.9"
+version = "0.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d"
+checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d"
dependencies = [
"enumflags2_derive",
"serde",
@@ -504,13 +504,13 @@ dependencies = [
[[package]]
name = "enumflags2_derive"
-version = "0.7.9"
+version = "0.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4"
+checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.82",
]
[[package]]
@@ -521,9 +521,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "errno"
-version = "0.3.8"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
dependencies = [
"libc",
"windows-sys 0.52.0",
@@ -548,20 +548,9 @@ dependencies = [
[[package]]
name = "event-listener"
-version = "4.0.3"
+version = "5.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener"
-version = "5.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
dependencies = [
"concurrent-queue",
"parking",
@@ -570,21 +559,11 @@ dependencies = [
[[package]]
name = "event-listener-strategy"
-version = "0.4.0"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
dependencies = [
- "event-listener 4.0.3",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3"
-dependencies = [
- "event-listener 5.3.0",
+ "event-listener 5.3.1",
"pin-project-lite",
]
@@ -599,9 +578,9 @@ dependencies = [
[[package]]
name = "fastrand"
-version = "2.0.2"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
[[package]]
name = "fern"
@@ -620,15 +599,15 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
[[package]]
name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
[[package]]
name = "futures-lite"
@@ -651,7 +630,7 @@ version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
dependencies = [
- "fastrand 2.0.2",
+ "fastrand 2.1.1",
"futures-core",
"futures-io",
"parking",
@@ -660,21 +639,21 @@ dependencies = [
[[package]]
name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
[[package]]
name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
[[package]]
name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
dependencies = [
"futures-core",
"futures-io",
@@ -698,9 +677,9 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.14"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
dependencies = [
"cfg-if",
"libc",
@@ -709,15 +688,15 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.28.1"
+version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
[[package]]
name = "hashbrown"
-version = "0.14.3"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
[[package]]
name = "heck"
@@ -731,6 +710,12 @@ version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+
[[package]]
name = "hex"
version = "0.4.3"
@@ -757,9 +742,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
[[package]]
name = "indexmap"
-version = "2.2.6"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
dependencies = [
"equivalent",
"hashbrown",
@@ -789,9 +774,9 @@ dependencies = [
[[package]]
name = "instant"
-version = "0.1.12"
+version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
dependencies = [
"cfg-if",
]
@@ -813,11 +798,17 @@ version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.9",
"libc",
"windows-sys 0.48.0",
]
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
[[package]]
name = "itoa"
version = "1.0.11"
@@ -826,9 +817,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
[[package]]
name = "libc"
-version = "0.2.153"
+version = "0.2.161"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
[[package]]
name = "linux-raw-sys"
@@ -838,21 +829,21 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]]
name = "linux-raw-sys"
-version = "0.4.13"
+version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
[[package]]
name = "log"
-version = "0.4.21"
+version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
[[package]]
name = "memchr"
-version = "2.7.2"
+version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "memoffset"
@@ -874,22 +865,23 @@ dependencies = [
[[package]]
name = "miniz_oxide"
-version = "0.7.2"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
dependencies = [
- "adler",
+ "adler2",
]
[[package]]
name = "mio"
-version = "0.8.11"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
dependencies = [
+ "hermit-abi 0.3.9",
"libc",
"wasi",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -912,18 +904,18 @@ checksum = "6aa2c4e539b869820a2b82e1aef6ff40aa85e65decdd5185e83fb4b1249cd00f"
[[package]]
name = "object"
-version = "0.32.2"
+version = "0.36.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
dependencies = [
"memchr",
]
[[package]]
name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
[[package]]
name = "ordered-stream"
@@ -937,9 +929,9 @@ dependencies = [
[[package]]
name = "parking"
-version = "2.2.0"
+version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
[[package]]
name = "pin-project-lite"
@@ -955,20 +947,20 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "piper"
-version = "0.2.1"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
dependencies = [
"atomic-waker",
- "fastrand 2.0.2",
+ "fastrand 2.1.1",
"futures-io",
]
[[package]]
name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
[[package]]
name = "polling"
@@ -988,24 +980,27 @@ dependencies = [
[[package]]
name = "polling"
-version = "3.7.0"
+version = "3.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3"
+checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511"
dependencies = [
"cfg-if",
"concurrent-queue",
- "hermit-abi",
+ "hermit-abi 0.4.0",
"pin-project-lite",
- "rustix 0.38.34",
+ "rustix 0.38.37",
"tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
[[package]]
name = "proc-macro-crate"
@@ -1019,18 +1014,18 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.81"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
-version = "1.0.36"
+version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2",
]
@@ -1067,9 +1062,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.10.4"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
dependencies = [
"aho-corasick",
"memchr",
@@ -1079,9 +1074,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.6"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
dependencies = [
"aho-corasick",
"memchr",
@@ -1090,15 +1085,15 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
[[package]]
name = "rustix"
@@ -1116,50 +1111,51 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.38.34"
+version = "0.38.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"errno",
"libc",
- "linux-raw-sys 0.4.13",
+ "linux-raw-sys 0.4.14",
"windows-sys 0.52.0",
]
[[package]]
name = "ryu"
-version = "1.0.17"
+version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
[[package]]
name = "serde"
-version = "1.0.199"
+version = "1.0.213"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a"
+checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.199"
+version = "1.0.213"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc"
+checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.82",
]
[[package]]
name = "serde_json"
-version = "1.0.116"
+version = "1.0.132"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
dependencies = [
"itoa",
+ "memchr",
"ryu",
"serde",
]
@@ -1172,7 +1168,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.82",
]
[[package]]
@@ -1186,6 +1182,12 @@ dependencies = [
"digest",
]
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
[[package]]
name = "signal-hook-registry"
version = "1.4.2"
@@ -1227,9 +1229,9 @@ dependencies = [
[[package]]
name = "socket2"
-version = "0.5.6"
+version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
dependencies = [
"libc",
"windows-sys 0.52.0",
@@ -1241,12 +1243,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
[[package]]
name = "strsim"
version = "0.11.1"
@@ -1266,9 +1262,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.60"
+version = "2.0.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
+checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021"
dependencies = [
"proc-macro2",
"quote",
@@ -1285,7 +1281,7 @@ dependencies = [
[[package]]
name = "system76-power"
-version = "1.2.1"
+version = "1.2.2"
dependencies = [
"anyhow",
"clap",
@@ -1320,41 +1316,42 @@ dependencies = [
[[package]]
name = "tempfile"
-version = "3.10.1"
+version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
dependencies = [
"cfg-if",
- "fastrand 2.0.2",
- "rustix 0.38.34",
- "windows-sys 0.52.0",
+ "fastrand 2.1.1",
+ "once_cell",
+ "rustix 0.38.37",
+ "windows-sys 0.59.0",
]
[[package]]
name = "thiserror"
-version = "1.0.59"
+version = "1.0.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
+checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.59"
+version = "1.0.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
+checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.82",
]
[[package]]
name = "tokio"
-version = "1.37.0"
+version = "1.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb"
dependencies = [
"backtrace",
"bytes",
@@ -1362,28 +1359,28 @@ dependencies = [
"mio",
"pin-project-lite",
"signal-hook-registry",
- "socket2 0.5.6",
+ "socket2 0.5.7",
"tokio-macros",
"tracing",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
]
[[package]]
name = "tokio-macros"
-version = "2.2.0"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.82",
]
[[package]]
name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
[[package]]
name = "toml_edit"
@@ -1415,7 +1412,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.82",
]
[[package]]
@@ -1446,27 +1443,27 @@ dependencies = [
[[package]]
name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
[[package]]
name = "utf8parse"
-version = "0.2.1"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]]
name = "waker-fn"
-version = "1.1.1"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
+checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
[[package]]
name = "wasi"
@@ -1511,7 +1508,16 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
]
[[package]]
@@ -1531,18 +1537,18 @@ dependencies = [
[[package]]
name = "windows-targets"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
"windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
]
[[package]]
@@ -1553,9 +1559,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_msvc"
@@ -1565,9 +1571,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_i686_gnu"
@@ -1577,15 +1583,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
[[package]]
name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
[[package]]
name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_msvc"
@@ -1595,9 +1601,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
[[package]]
name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_x86_64_gnu"
@@ -1607,9 +1613,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnullvm"
@@ -1619,9 +1625,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_msvc"
@@ -1631,9 +1637,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winnow"
@@ -1646,12 +1652,12 @@ dependencies = [
[[package]]
name = "xdg-home"
-version = "1.1.0"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e"
+checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6"
dependencies = [
"libc",
- "winapi",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -1735,6 +1741,27 @@ dependencies = [
"zvariant",
]
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.82",
+]
+
[[package]]
name = "zvariant"
version = "3.15.2"
diff --git a/pkgs/by-name/sy/system76-power/package.nix b/pkgs/by-name/sy/system76-power/package.nix
index 5220534d87e0..600459921c1a 100644
--- a/pkgs/by-name/sy/system76-power/package.nix
+++ b/pkgs/by-name/sy/system76-power/package.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "system76-power";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchFromGitHub {
owner = "pop-os";
repo = "system76-power";
rev = version;
- sha256 = "sha256-kYDrSfpOuRigDX792w3hATXoxX6PWpYWXkxw9Q28P5s=";
+ hash = "sha256-Ju4xIWOf6m8z1fUSbzafKkyt9XXT8q1/8RukrhtswsE=";
};
nativeBuildInputs = [ pkg-config ];
@@ -27,12 +27,12 @@ rustPlatform.buildRustPackage rec {
install -D -m 0644 data/com.system76.PowerDaemon.xml $out/share/dbus-1/interfaces/com.system76.PowerDaemon.xml
'';
- meta = with lib; {
+ meta = {
description = "System76 Power Management";
mainProgram = "system76-power";
homepage = "https://github.com/pop-os/system76-power";
- license = licenses.gpl3Plus;
- platforms = [ "i686-linux" "x86_64-linux" ];
- maintainers = [ maintainers.smonson ];
+ license = lib.licenses.gpl3Plus;
+ platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
+ maintainers = with lib.maintainers; [ smonson ahoneybun ];
};
}
diff --git a/pkgs/by-name/ta/tabby-agent/package.nix b/pkgs/by-name/ta/tabby-agent/package.nix
new file mode 100644
index 000000000000..77f3a5908c8f
--- /dev/null
+++ b/pkgs/by-name/ta/tabby-agent/package.nix
@@ -0,0 +1,69 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ nix-update-script,
+ nodejs,
+ pnpm,
+ wrapGAppsHook3,
+}:
+stdenv.mkDerivation (finalAttrs: {
+ pname = "tabby-agent";
+ version = "0.18.0";
+
+ src = fetchFromGitHub {
+ owner = "TabbyML";
+ repo = "tabby";
+ rev = "refs/tags/v${finalAttrs.version}";
+ hash = "sha256-8clEBWAT+HI2eecOsmldgRcA58Ehq9bZT4ZwUMm494g=";
+ };
+
+ nativeBuildInputs = [
+ pnpm.configHook
+ wrapGAppsHook3
+ ];
+
+ buildInputs = [
+ nodejs
+ ];
+
+ buildPhase = ''
+ runHook preBuild
+
+ pnpm --filter=tabby-agent build
+
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin
+ cp -r ./clients/tabby-agent/dist $out/dist
+ ln -s $out/dist/node/index.js $out/bin/tabby-agent
+ chmod +x $out/bin/tabby-agent
+
+ runHook postInstall
+ '';
+
+ pnpmDeps = pnpm.fetchDeps {
+ inherit (finalAttrs) pname version src;
+ hash = "sha256-WBhkrgLTTR5f8ZVmUfzMbFw/6jIGoLcUspHCsNpOxx4=";
+ };
+
+ passthru.updateScript = nix-update-script {
+ extraArgs = [
+ "--version-regex"
+ "^v([0-9.]+)$"
+ ];
+ };
+
+ meta = {
+ homepage = "https://github.com/TabbyML/tabby";
+ changelog = "https://github.com/TabbyML/tabby/releases/tag/v${finalAttrs.version}";
+ description = "Language server used to communicate with Tabby server";
+ mainProgram = "tabby-agent";
+ license = lib.licenses.asl20;
+ maintainers = [ lib.maintainers.khaneliman ];
+ };
+})
diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index 5e1b6a9babe8..9207b1315b43 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -15,7 +15,7 @@
}:
let
- version = "1.76.1";
+ version = "1.76.3";
in
buildGo123Module {
pname = "tailscale";
@@ -27,7 +27,7 @@ buildGo123Module {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
- hash = "sha256-tuD7GlBZdXPORZkBISp9QDj592a1OX3T+EVysuG+xWw=";
+ hash = "sha256-bSMtBIIpLVbADjHBojeO7VM/Ny+aWM1bz29ZuhOvjRY=";
};
patches = [
diff --git a/pkgs/by-name/te/telegram-bot-api/package.nix b/pkgs/by-name/te/telegram-bot-api/package.nix
new file mode 100644
index 000000000000..97e96a199911
--- /dev/null
+++ b/pkgs/by-name/te/telegram-bot-api/package.nix
@@ -0,0 +1,43 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ cmake,
+ gperf,
+ openssl,
+ zlib,
+}:
+
+stdenv.mkDerivation {
+ pname = "telegram-bot-api";
+ version = "7.10";
+
+ src = fetchFromGitHub {
+ repo = "telegram-bot-api";
+ owner = "tdlib";
+ rev = "a186a9ae823d91678ace87ef5b920688c555f5b5";
+ hash = "sha256-1oGDR9WLWC/0QyAmTkMWkbkD+49/gU/nWBZq0mMOl8g=";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [
+ cmake
+ gperf
+ ];
+ buildInputs = [
+ openssl
+ zlib
+ ];
+
+ meta = {
+ description = "Telegram Bot API server";
+ homepage = "https://github.com/tdlib/telegram-bot-api";
+ license = lib.licenses.boost;
+ maintainers = with lib.maintainers; [
+ Anillc
+ Forden
+ ];
+ platforms = lib.platforms.all;
+ mainProgram = "telegram-bot-api";
+ };
+}
diff --git a/pkgs/by-name/te/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix
index c2c7c21321c2..480f5b46ab97 100644
--- a/pkgs/by-name/te/tenv/package.nix
+++ b/pkgs/by-name/te/tenv/package.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, installShellFiles, lib, tenv, testers }:
+{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles, lib, tenv, testers }:
buildGoModule rec {
pname = "tenv";
@@ -23,7 +23,7 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
- postInstall = ''
+ postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd tenv \
--zsh <($out/bin/tenv completion zsh) \
--bash <($out/bin/tenv completion bash) \
diff --git a/pkgs/by-name/th/theattyr/package.nix b/pkgs/by-name/th/theattyr/package.nix
new file mode 100644
index 000000000000..baf3252e4399
--- /dev/null
+++ b/pkgs/by-name/th/theattyr/package.nix
@@ -0,0 +1,31 @@
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+ nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "theattyr";
+ version = "0.1.10";
+
+ src = fetchFromGitHub {
+ owner = "orhun";
+ repo = "theattyr";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-gqgoG5JwGecm8MEqH36BvJyLuh6nDao1d9ydX1AlbgU=";
+ };
+
+ cargoHash = "sha256-LwJW1WTUa0iz4PeDOMmRr6H0XLhWOn9b4W3SUR+SHyc=";
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ description = "Terminal theater for playing VT100 art and animations";
+ homepage = "https://github.com/orhun/theattyr";
+ changelog = "https://github.com/orhun/theattyr/blob/${src.rev}/CHANGELOG.md";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ a-kenji ];
+ mainProgram = "theattyr";
+ };
+}
diff --git a/pkgs/by-name/tk/tkey-ssh-agent/package.nix b/pkgs/by-name/tk/tkey-ssh-agent/package.nix
index 22f851065074..f377f940baa4 100644
--- a/pkgs/by-name/tk/tkey-ssh-agent/package.nix
+++ b/pkgs/by-name/tk/tkey-ssh-agent/package.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildGoModule }:
+{ lib, fetchFromGitHub, buildGoModule, gitUpdater, testers, tkey-ssh-agent }:
buildGoModule rec {
pname = "tkey-ssh-agent";
@@ -17,6 +17,15 @@ buildGoModule rec {
"cmd/tkey-ssh-agent"
];
+ passthru = {
+ updateScript = gitUpdater { rev-prefix = "v"; };
+ tests = {
+ tkey-ssh-agent-version = testers.testVersion {
+ package = tkey-ssh-agent;
+ };
+ };
+ };
+
meta = with lib; {
description = "SSH Agent for TKey, the flexible open hardware/software USB security key";
homepage = "https://tillitis.se/app/tkey-ssh-agent/";
diff --git a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
index cd4d28ca6621..588125ede99e 100644
--- a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
+++ b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
@@ -71,13 +71,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
stdenvNoCC.mkDerivation
{
inherit pname;
- version = "0-unstable-2024-07-22";
+ version = "0-unstable-2024-10-29";
src = fetchFromGitHub {
owner = "Fausto-Korpsvart";
repo = "Tokyonight-GTK-Theme";
- rev = "a9a25010e9fbfca783c3c27258dbad76a9cc7842";
- hash = "sha256-HbrDDiMej4DjvskGItele/iCUY1NzlWlu3ZneA76feM=";
+ rev = "6c8f79f841550a463039e313535c6bc0d55dbde8";
+ hash = "sha256-KVUcMffz/ZdCg5ivXC82WczodkckLH3XX73qm418pcE=";
};
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
diff --git a/pkgs/by-name/to/tomboy-ng/package.nix b/pkgs/by-name/to/tomboy-ng/package.nix
new file mode 100644
index 000000000000..4341d4ac8325
--- /dev/null
+++ b/pkgs/by-name/to/tomboy-ng/package.nix
@@ -0,0 +1,82 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ fpc,
+ lazarus,
+ autoPatchelfHook,
+
+ glib,
+ cairo,
+ pango,
+ gtk2,
+ gdk-pixbuf,
+ at-spi2-atk,
+ xorg,
+ libnotify,
+
+ nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+ pname = "tomboy-ng";
+ version = "0.40";
+
+ src = fetchFromGitHub {
+ owner = "tomboy-notes";
+ repo = "tomboy-ng";
+ rev = "v${finalAttrs.version}";
+ hash = "sha256-QRv0LVZpRxW9c/cCcDsMSAYQ3zuYa39VJbcys5N+1x0=";
+ };
+ kcontrols = fetchFromGitHub {
+ owner = "davidbannon";
+ repo = "KControls";
+ rev = "4b74f50599544aa05d76385c21795ca9026e9657";
+ hash = "sha256-AHpcbt5v9Y/YG9MZ/zCLLH1Pfryv0zH8UFCgY/RqrdQ=";
+ name = "kcontrols";
+ };
+
+ nativeBuildInputs = [
+ fpc
+ lazarus
+ autoPatchelfHook
+ ];
+
+ buildInputs = [
+ glib
+ cairo
+ pango
+ gtk2
+ gdk-pixbuf
+ at-spi2-atk
+ xorg.libX11
+ libnotify
+ ];
+
+ patches = [ ./simplify-build-script.patch ];
+
+ postPatch = "ln -s ${finalAttrs.kcontrols} kcontrols";
+
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
+
+ passthru.updateScript = nix-update-script {
+ # Stable releases only
+ extraArgs = [
+ "--version-regex"
+ "^v([0-9.]+)$"
+ ];
+ };
+
+ env = {
+ COMPILER = lib.getExe' fpc "fpc";
+ LAZ_DIR = "${lazarus}/share/lazarus";
+ };
+
+ meta = {
+ description = "Note taking app that works and synchronises between Linux, Windows and macOS";
+ homepage = "https://github.com/tomboy-notes/tomboy-ng";
+ license = with lib.licenses; [ mit ];
+ maintainers = with lib.maintainers; [ pluiedev ];
+ mainProgram = "tomboy-ng";
+ platforms = lib.platforms.unix ++ lib.platforms.windows;
+ };
+})
diff --git a/pkgs/by-name/to/tomboy-ng/simplify-build-script.patch b/pkgs/by-name/to/tomboy-ng/simplify-build-script.patch
new file mode 100644
index 000000000000..d2b08ca2a080
--- /dev/null
+++ b/pkgs/by-name/to/tomboy-ng/simplify-build-script.patch
@@ -0,0 +1,79 @@
+diff --git a/buildit.bash b/buildit.bash
+index 6606562..57b9e14 100755
+--- a/buildit.bash
++++ b/buildit.bash
+@@ -61,7 +61,7 @@ EXCLUDEMESSAGE=" -vm6058,2005,5027 " # cut down on compiler noise
+ # 6058 - note about things not being inlined
+ # 5027 - var not used
+ # 2005 - level 2 comment
+-FPCHARD=" -Cg -k-pie -k-znow "
++FPCHARD=""
+ AUTODOWNLOAD=FALSE # downloading large file, use -d to allow it
+
+ # ------------------------ Some functions ------------------------
+@@ -180,8 +180,6 @@ if [ "$CPU" = "powerpc64le" ]; then # power does not like intel switches !
+ fi
+
+ TARGET="$CPU-$OS"
+-CheckFPC
+-CheckLazBuild
+ CheckForQt5
+
+ # OK, if to here, we have a fpc and lazbuild, but which FPC ?
+@@ -228,8 +226,8 @@ cd "$K_DIR" # WARNING, kcontrols is not part of the github zip file, its added
+
+ # Here we build just the kmemo.pas part of kcontrols.
+
+-mkdir -p "lib/$TARGET" # this is where kcontrols object files end up.
+-rm -f "lib/$CPU-$OS/kmemo.o" # make sure we try to build a new one, but probably not there.
++OUTPUT=$(mktemp -d)
++mkdir -p "$OUTPUT/lib/$TARGET"
+
+ FPCKOPT=" -B -MObjFPC -Scgi -Cg -O1 -g -gl -l -vewnibq -vh- $EXCLUDEMESSAGES -Fi$K_DIR"
+ FPCKUNITS=" -Fu$LAZ_DIR/packager/units/$TARGET -Fu$LAZ_DIR/components/lazutils/lib/$TARGET"
+@@ -237,7 +235,7 @@ FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/buildintf/units/$TARGET -Fu$LAZ_DIR
+ FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/lib/$TARGET -Fu$LAZ_DIR/lcl/units/$TARGET -Fu$LAZ_DIR/lcl/units/$TARGET/$WIDGET"
+ FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/cairocanvas/lib/$TARGET/$WIDGET -Fu$LAZ_DIR/components/lazcontrols/lib/$TARGET/$WIDGET"
+ FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/ideintf/units/$TARGET/$WIDGET -Fu$LAZ_DIR/components/printers/lib/$TARGET/$WIDGET"
+-FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/tdbf/lib/$TARGET/$WIDGET -Fu. -FUlib/$TARGET"
++FPCKUNITS="$FPCKUNITS -Fu$LAZ_DIR/components/tdbf/lib/$TARGET/$WIDGET -Fu. -FU$OUTPUT/lib/$TARGET"
+
+ RUNIT="$COMPILER $EXCLUDEMESSAGE $FPCKOPT $FPCHARD $LAZUNITSRC $FPCKUNITS kmemo.pas"
+
+@@ -245,12 +243,12 @@ echo "--------------- kcontrols COMPILE COMMAND -------------"
+ echo "$RUNIT"
+ echo "-----------------"
+
+-$RUNIT 1>tomboy-ng.log
++$RUNIT
+
+ # exit
+
+
+-if [ ! -e "$K_DIR/lib/$CPU-$OS/kmemo.o" ]; then
++if [ ! -e "$OUTPUT/lib/$CPU-$OS/kmemo.o" ]; then
+ echo "ERROR failed to build KControls, exiting..."
+ K_DIR=""
+ exit 1
+@@ -301,7 +299,7 @@ UNITS="$UNITS -Fu$LAZ_DIR/lcl/units/$TARGET"
+ UNITS="$UNITS -Fu$LAZ_DIR/packager/units/$TARGET"
+
+ UNITS="$UNITS -Fu$SOURCE_DIR/"
+-UNITS="$UNITS -FU$SOURCE_DIR/lib/$TARGET/"
++UNITS="$UNITS -FU$OUTPUT/lib/$TARGET/"
+
+ OPT2=" -dLCL -dLCL$WIDGET"
+ DEFS="-dDisableLCLGIF -dDisableLCLJPEG -dDisableLCLPNM -dDisableLCLTIFF"
+@@ -322,11 +320,10 @@ RUNIT="$COMPILER $OPT1 $FPCHARD $UNITS $LAZUNITSRC $OPT2 $DEFS $PROJ.lpr"
+ echo "------------ tomboy-ng COMPILE COMMAND --------------------"
+ echo "$RUNIT"
+
+-TOMBOY_NG_VER="$VERSION" $RUNIT 1>>tomboy-ng.log
++TOMBOY_NG_VER="$VERSION" $RUNIT
+
+ if [ ! -e "$PROJ" ]; then
+ echo "======================== ERROR, COMPILE FAILED source/tomboy-ng.log ====="
+- cat tomboy-ng.log
+ echo "=========================================================== END of LOG =="
+ exit 1
+ else
diff --git a/pkgs/by-name/to/tomlcpp/package.nix b/pkgs/by-name/to/tomlcpp/package.nix
index f782719f2b63..6f77fe1cc763 100644
--- a/pkgs/by-name/to/tomlcpp/package.nix
+++ b/pkgs/by-name/to/tomlcpp/package.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch }:
stdenv.mkDerivation rec {
pname = "tomlcpp";
@@ -11,17 +11,26 @@ stdenv.mkDerivation rec {
hash = "sha256-PM3gURXhyTZr59BWuLHvltjKOlKUSBT9/rqTeX5V//k=";
};
+ patches = [
+ (fetchpatch {
+ # Use implicit $AR variable in Makefile
+ # https://github.com/cktan/tomlcpp/pull/6
+ url = "https://github.com/cktan/tomlcpp/commit/abdb4e0db8b27f719434f5a0d6ec0b1a6b086ded.patch";
+ hash = "sha256-SurUKdAZNWqBC7ss5nv5mDnJyC3DqxG/Q/FweTrkLnk=";
+ })
+ ];
+
dontConfigure = true;
installFlags = [
"prefix=${placeholder "out"}"
];
- meta = with lib;{
+ meta = {
homepage = "https://github.com/cktan/tomlcpp";
description = "No fanfare TOML C++ Library";
- license = licenses.mit;
- maintainers = with maintainers; [ AndersonTorres ];
- platforms = with platforms; unix;
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ AndersonTorres ];
+ platforms = with lib.platforms; unix;
};
}
diff --git a/pkgs/by-name/to/tomlplusplus/package.nix b/pkgs/by-name/to/tomlplusplus/package.nix
new file mode 100644
index 000000000000..7d95a15503b1
--- /dev/null
+++ b/pkgs/by-name/to/tomlplusplus/package.nix
@@ -0,0 +1,68 @@
+{
+ cmake,
+ fetchFromGitHub,
+ fetchpatch2,
+ glibcLocales,
+ lib,
+ meson,
+ ninja,
+ nix-update-script,
+ pkg-config,
+ stdenv,
+ testers,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "tomlplusplus";
+ version = "3.4.0";
+
+ src = fetchFromGitHub {
+ owner = "marzer";
+ repo = "tomlplusplus";
+ rev = "refs/tags/v${finalAttrs.version}";
+ hash = "sha256-h5tbO0Rv2tZezY58yUbyRVpsfRjY3i+5TPkkxr6La8M=";
+ };
+
+ patches = [
+ # TODO: Remove this patch at the next update
+ # https://github.com/marzer/tomlplusplus/pull/233
+ (fetchpatch2 {
+ name = "tomlplusplus-install-example-programs.patch";
+ url = "https://github.com/marzer/tomlplusplus/commit/8128eb632325d1820f4d17dd8250dcda6ab07743.patch";
+ hash = "sha256-7m2P+e1/OASHrzm9LSy6RnayS/kGxFC82xOyGBGXeG0=";
+ })
+ ];
+
+ nativeBuildInputs = [
+ meson
+ cmake
+ ninja
+ pkg-config
+ ];
+
+ checkInputs = [
+ glibcLocales
+ ];
+
+ doCheck = true;
+ mesonFlags = [
+ "-Dbuild_tests=${lib.boolToString finalAttrs.doCheck}"
+ "-Dbuild_examples=true"
+ ];
+
+ passthru = {
+ updateScript = nix-update-script { };
+ tests.pkg-config = testers.hasPkgConfigModules {
+ package = finalAttrs.finalPackage;
+ };
+ };
+
+ meta = with lib; {
+ homepage = "https://github.com/marzer/tomlplusplus";
+ description = "Header-only TOML config file parser and serializer for C++17";
+ license = licenses.mit;
+ maintainers = with maintainers; [ Scrumplex ];
+ pkgConfigModules = [ "tomlplusplus" ];
+ platforms = platforms.unix;
+ };
+})
diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix
index f84198772eeb..cdda6d6b9d57 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -6,6 +6,7 @@
, makeWrapper
, writeText
, autoPatchelfHook
+, patchelfUnstable # have to use patchelfUnstable to support --no-clobber-old-sections
, wrapGAppsHook3
, callPackage
@@ -101,7 +102,7 @@ lib.warnIf (useHardenedMalloc != null)
++ lib.optionals mediaSupport [ ffmpeg ]
);
- version = "13.5.7";
+ version = "14.0.1";
sources = {
x86_64-linux = fetchurl {
@@ -111,7 +112,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-w+W3J07+7/DERDsX0EubHKZfCr9Bc3dKmnS33UA3sdU=";
+ hash = "sha256-DQbKMaXgEXNKHPonQF7RZ1TtEqCRnvD81ahyVUkknY8=";
};
i686-linux = fetchurl {
@@ -121,7 +122,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-GZ6tBxnX3Y4Ot71phDYkpiWDecr3AltuAVFWSNhX3CY=";
+ hash = "sha256-khY/B4c0DjqRd0s9PblEhL0jJONVU5mQCAqZ60M+CjE=";
};
};
@@ -144,7 +145,13 @@ stdenv.mkDerivation rec {
src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
- nativeBuildInputs = [ autoPatchelfHook copyDesktopItems makeWrapper wrapGAppsHook3 ];
+ nativeBuildInputs = [
+ autoPatchelfHook
+ patchelfUnstable
+ copyDesktopItems
+ makeWrapper
+ wrapGAppsHook3
+ ];
buildInputs = [
gtk3
alsa-lib
@@ -152,6 +159,9 @@ stdenv.mkDerivation rec {
libXtst
];
+ # Firefox uses "relrhack" to manually process relocations from a fixed offset
+ patchelfFlags = [ "--no-clobber-old-sections" ];
+
preferLocalBuild = true;
allowSubstitutes = false;
@@ -178,7 +188,6 @@ stdenv.mkDerivation rec {
# For convenience ...
TBB_IN_STORE=$out/share/tor-browser
- interp=$(< $NIX_CC/nix-support/dynamic-linker)
# Unpack & enter
mkdir -p "$TBB_IN_STORE"
@@ -186,10 +195,7 @@ stdenv.mkDerivation rec {
pushd "$TBB_IN_STORE"
# Set ELF interpreter
- for exe in firefox.real TorBrowser/Tor/tor ; do
- echo "Setting ELF interpreter on $exe ..." >&2
- patchelf --set-interpreter "$interp" "$exe"
- done
+ autoPatchelf firefox.real TorBrowser/Tor
# firefox is a wrapper that checks for a more recent libstdc++ & appends it to the ld path
mv firefox.real firefox
@@ -210,16 +216,6 @@ stdenv.mkDerivation rec {
substituteInPlace TorBrowser/Data/Tor/torrc-defaults \
--replace-fail './TorBrowser' "$TBB_IN_STORE/TorBrowser"
- # Fixup obfs transport. Work around patchelf failing to set
- # interpreter for pre-compiled Go binaries by invoking the interpreter
- # directly.
- sed -i TorBrowser/Data/Tor/torrc-defaults \
- -e "s|\(ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit\) exec|\1 exec $interp|"
-
- # Similarly fixup snowflake
- sed -i TorBrowser/Data/Tor/torrc-defaults \
- -e "s|\(ClientTransportPlugin snowflake\) exec|\1 exec $interp|"
-
# Prepare for autoconfig.
#
# See https://developer.mozilla.org/en-US/Firefox/Enterprise_deployment
diff --git a/pkgs/by-name/tp/tpi/package.nix b/pkgs/by-name/tp/tpi/package.nix
new file mode 100644
index 000000000000..bd9965029ea6
--- /dev/null
+++ b/pkgs/by-name/tp/tpi/package.nix
@@ -0,0 +1,26 @@
+{
+ rustPlatform,
+ fetchFromGitHub,
+ lib,
+}:
+rustPlatform.buildRustPackage rec {
+ pname = "tpi";
+ version = "1.0.6";
+
+ src = fetchFromGitHub {
+ owner = "turing-machines";
+ repo = "tpi";
+ rev = "v${version}";
+ hash = "sha256-rkqkb3iJL4obHjTkGEUbVPJmUmfT9KKP4yoQ71cbpKs=";
+ };
+
+ cargoHash = "sha256-hSWDr1XuD6x96QV2QIdhGPQ00Sg7G5O5bkFNTdUx0ug=";
+
+ meta = {
+ description = "CLI tool to control your Turing Pi 2 board";
+ homepage = "https://github.com/turing-machines/tpi";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ WoutSwinkels ];
+ mainProgram = "tpi";
+ };
+}
diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix
index ea58c45f579b..91d03eb80a14 100644
--- a/pkgs/by-name/tp/tpnote/package.nix
+++ b/pkgs/by-name/tp/tpnote/package.nix
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "tpnote";
- version = "1.24.8";
+ version = "1.24.9";
src = fetchFromGitHub {
owner = "getreu";
repo = "tp-note";
rev = "v${version}";
- hash = "sha256-tn6GCBX3DrqyZZz2FJLTn1vJd4eEbawyJM5huco21/8=";
+ hash = "sha256-KXkriFFn1GapoVimcK7Hqv1mUTZ2EbnnZPyX2izI2oo=";
};
- cargoHash = "sha256-2qGObTu7g6GbUwd4obgqufig7bABFLBsCWSyZt8AVac=";
+ cargoHash = "sha256-MCnQJ1cJeWUJ8L+u09px4COG7XUAVOOgBg8nUi37J90=";
nativeBuildInputs = [
cmake
diff --git a/pkgs/applications/networking/trayscale/default.nix b/pkgs/by-name/tr/trayscale/package.nix
similarity index 78%
rename from pkgs/applications/networking/trayscale/default.nix
rename to pkgs/by-name/tr/trayscale/package.nix
index 7e8648c3bb0e..9fa5c40e073f 100644
--- a/pkgs/applications/networking/trayscale/default.nix
+++ b/pkgs/by-name/tr/trayscale/package.nix
@@ -11,16 +11,16 @@
buildGoModule rec {
pname = "trayscale";
- version = "0.13.1";
+ version = "0.13.5";
src = fetchFromGitHub {
owner = "DeedleFake";
repo = "trayscale";
rev = "v${version}";
- hash = "sha256-uOPTF6AD70POD1y0R5aXo7t9WtyFGbRrgL8U++nTRl0=";
+ hash = "sha256-SBt9bK2fjxIEANjw+Gs+lHiWplzNMfporj+ZVtt50pw=";
};
- vendorHash = "sha256-8lrszfxTKLA3KRuuQ312s+1GfK63DwQEK8xDwb1JdrI=";
+ vendorHash = "sha256-PPKrtvW0fwzCO+OqJ7S/Kd6WOwN1DqQDhpeQUPCSpUU=";
subPackages = [ "cmd/trayscale" ];
@@ -45,13 +45,13 @@ buildGoModule rec {
gappsWrapperArgs+=(--prefix PATH : "${tailscale}/bin")
'';
- meta = with lib; {
+ meta = {
changelog = "https://github.com/DeedleFake/trayscale/releases/tag/${src.rev}";
description = "Unofficial GUI wrapper around the Tailscale CLI client";
homepage = "https://github.com/DeedleFake/trayscale";
- license = licenses.mit;
- maintainers = [ ];
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ sikmir ];
mainProgram = "trayscale";
- platforms = platforms.linux;
+ platforms = lib.platforms.linux;
};
}
diff --git a/pkgs/by-name/tu/tuifimanager/package.nix b/pkgs/by-name/tu/tuifimanager/package.nix
index 26b30a477da0..7d2a68badb69 100644
--- a/pkgs/by-name/tu/tuifimanager/package.nix
+++ b/pkgs/by-name/tu/tuifimanager/package.nix
@@ -19,14 +19,14 @@ lib.throwIf (enableDragAndDrop && !hasDndSupport)
python3.pkgs.buildPythonApplication rec {
pname = "tuifimanager";
- version = "4.1.7";
+ version = "5.0.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "GiorgosXou";
repo = "TUIFIManager";
rev = "v.${version}";
- hash = "sha256-kljodLSSjvGcjhD7IhAVAAGd6LoiM6IYwMXuSsIJ198=";
+ hash = "sha256-2yYD1YFGoN0uj3HzcYxEs3zbwfUIDLLzvfTcZILx5h4=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/tu/tun2proxy/Cargo.lock.patch b/pkgs/by-name/tu/tun2proxy/Cargo.lock.patch
new file mode 100644
index 000000000000..15dfcdb26570
--- /dev/null
+++ b/pkgs/by-name/tu/tun2proxy/Cargo.lock.patch
@@ -0,0 +1,1944 @@
+diff --git a/Cargo.lock b/Cargo.lock
+new file mode 100644
+index 000000000000..ca52064f2177
+--- /dev/null
++++ b/Cargo.lock
+@@ -0,0 +1,1938 @@
++# This file is automatically @generated by Cargo.
++# It is not intended for manual editing.
++version = 3
++
++[[package]]
++name = "addr2line"
++version = "0.24.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
++dependencies = [
++ "gimli",
++]
++
++[[package]]
++name = "adler2"
++version = "2.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
++
++[[package]]
++name = "ahash"
++version = "0.8.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
++dependencies = [
++ "cfg-if",
++ "getrandom",
++ "once_cell",
++ "version_check",
++ "zerocopy",
++]
++
++[[package]]
++name = "aho-corasick"
++version = "1.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
++dependencies = [
++ "memchr",
++]
++
++[[package]]
++name = "android-tzdata"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
++
++[[package]]
++name = "android_log-sys"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937"
++
++[[package]]
++name = "android_logger"
++version = "0.14.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "05b07e8e73d720a1f2e4b6014766e6039fd2e96a4fa44e2a78d0e1fa2ff49826"
++dependencies = [
++ "android_log-sys",
++ "env_filter",
++ "log",
++]
++
++[[package]]
++name = "android_system_properties"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "anstream"
++version = "0.6.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338"
++dependencies = [
++ "anstyle",
++ "anstyle-parse",
++ "anstyle-query",
++ "anstyle-wincon",
++ "colorchoice",
++ "is_terminal_polyfill",
++ "utf8parse",
++]
++
++[[package]]
++name = "anstyle"
++version = "1.0.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56"
++
++[[package]]
++name = "anstyle-parse"
++version = "0.2.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
++dependencies = [
++ "utf8parse",
++]
++
++[[package]]
++name = "anstyle-query"
++version = "1.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
++dependencies = [
++ "windows-sys 0.59.0",
++]
++
++[[package]]
++name = "anstyle-wincon"
++version = "3.0.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
++dependencies = [
++ "anstyle",
++ "windows-sys 0.59.0",
++]
++
++[[package]]
++name = "arrayvec"
++version = "0.7.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
++
++[[package]]
++name = "as-any"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5b8a30a44e99a1c83ccb2a6298c563c888952a1c9134953db26876528f84c93a"
++
++[[package]]
++name = "async-channel"
++version = "2.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
++dependencies = [
++ "concurrent-queue",
++ "event-listener-strategy",
++ "futures-core",
++ "pin-project-lite",
++]
++
++[[package]]
++name = "async-task"
++version = "4.7.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
++
++[[package]]
++name = "async-trait"
++version = "0.1.83"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn 2.0.85",
++]
++
++[[package]]
++name = "atomic-waker"
++version = "1.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
++
++[[package]]
++name = "autocfg"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
++
++[[package]]
++name = "backtrace"
++version = "0.3.74"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
++dependencies = [
++ "addr2line",
++ "cfg-if",
++ "libc",
++ "miniz_oxide",
++ "object",
++ "rustc-demangle",
++ "windows-targets 0.52.6",
++]
++
++[[package]]
++name = "base64"
++version = "0.22.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
++
++[[package]]
++name = "bincode"
++version = "1.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
++dependencies = [
++ "serde",
++]
++
++[[package]]
++name = "bitflags"
++version = "2.6.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
++
++[[package]]
++name = "block-buffer"
++version = "0.10.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
++dependencies = [
++ "generic-array",
++]
++
++[[package]]
++name = "blocking"
++version = "1.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
++dependencies = [
++ "async-channel",
++ "async-task",
++ "futures-io",
++ "futures-lite",
++ "piper",
++]
++
++[[package]]
++name = "bumpalo"
++version = "3.16.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
++
++[[package]]
++name = "byteorder"
++version = "1.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
++
++[[package]]
++name = "bytes"
++version = "1.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
++
++[[package]]
++name = "c2rust-bitfields"
++version = "0.19.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "367e5d1b30f28be590b6b3868da1578361d29d9bfac516d22f497d28ed7c9055"
++dependencies = [
++ "c2rust-bitfields-derive",
++]
++
++[[package]]
++name = "c2rust-bitfields-derive"
++version = "0.19.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a279db9c50c4024eeca1a763b6e0f033848ce74e83e47454bcf8a8a98f7b0b56"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn 1.0.109",
++]
++
++[[package]]
++name = "cc"
++version = "1.1.31"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
++dependencies = [
++ "shlex",
++]
++
++[[package]]
++name = "cesu8"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
++
++[[package]]
++name = "cfg-if"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
++
++[[package]]
++name = "cfg_aliases"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
++
++[[package]]
++name = "chrono"
++version = "0.4.38"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
++dependencies = [
++ "android-tzdata",
++ "iana-time-zone",
++ "js-sys",
++ "num-traits",
++ "wasm-bindgen",
++ "windows-targets 0.52.6",
++]
++
++[[package]]
++name = "cidr"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bfc95a0c21d5409adc146dbbb152b5c65aaea32bc2d2f57cf12f850bffdd7ab8"
++dependencies = [
++ "serde",
++]
++
++[[package]]
++name = "clap"
++version = "4.5.20"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
++dependencies = [
++ "clap_builder",
++ "clap_derive",
++]
++
++[[package]]
++name = "clap_builder"
++version = "4.5.20"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
++dependencies = [
++ "anstream",
++ "anstyle",
++ "clap_lex",
++ "strsim",
++ "terminal_size",
++]
++
++[[package]]
++name = "clap_derive"
++version = "4.5.18"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
++dependencies = [
++ "heck",
++ "proc-macro2",
++ "quote",
++ "syn 2.0.85",
++]
++
++[[package]]
++name = "clap_lex"
++version = "0.7.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
++
++[[package]]
++name = "colorchoice"
++version = "1.0.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
++
++[[package]]
++name = "combine"
++version = "4.6.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
++dependencies = [
++ "bytes",
++ "memchr",
++]
++
++[[package]]
++name = "concurrent-queue"
++version = "2.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
++dependencies = [
++ "crossbeam-utils",
++]
++
++[[package]]
++name = "core-foundation"
++version = "0.9.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
++dependencies = [
++ "core-foundation-sys",
++ "libc",
++]
++
++[[package]]
++name = "core-foundation-sys"
++version = "0.8.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
++
++[[package]]
++name = "cpufeatures"
++version = "0.2.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "crossbeam-utils"
++version = "0.8.20"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
++
++[[package]]
++name = "crypto-common"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
++dependencies = [
++ "generic-array",
++ "typenum",
++]
++
++[[package]]
++name = "ctrlc2"
++version = "3.5.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "383ab70e5dc6ffdfe5545b6e6dea714938594be13ecaec73ebacc372ed4e292d"
++dependencies = [
++ "nix",
++ "tokio",
++ "windows-sys 0.59.0",
++]
++
++[[package]]
++name = "daemonize"
++version = "0.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ab8bfdaacb3c887a54d41bdf48d3af8873b3f5566469f8ba21b92057509f116e"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "data-encoding"
++version = "2.6.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
++
++[[package]]
++name = "digest"
++version = "0.10.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
++dependencies = [
++ "block-buffer",
++ "crypto-common",
++]
++
++[[package]]
++name = "digest_auth"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3054f4e81d395e50822796c5e99ca522e6ba7be98947d6d4b0e5e61640bdb894"
++dependencies = [
++ "digest",
++ "hex",
++ "md-5",
++ "rand",
++ "sha2",
++]
++
++[[package]]
++name = "dotenvy"
++version = "0.15.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
++
++[[package]]
++name = "enum-as-inner"
++version = "0.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
++dependencies = [
++ "heck",
++ "proc-macro2",
++ "quote",
++ "syn 2.0.85",
++]
++
++[[package]]
++name = "env_filter"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
++dependencies = [
++ "log",
++ "regex",
++]
++
++[[package]]
++name = "env_logger"
++version = "0.11.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
++dependencies = [
++ "anstream",
++ "anstyle",
++ "env_filter",
++ "humantime",
++ "log",
++]
++
++[[package]]
++name = "errno"
++version = "0.3.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
++dependencies = [
++ "libc",
++ "windows-sys 0.52.0",
++]
++
++[[package]]
++name = "etherparse"
++version = "0.15.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "21696e6dfe1057a166a042c6d27b89a46aad2ee1003e6e1e03c49d54fd3270d7"
++dependencies = [
++ "arrayvec",
++]
++
++[[package]]
++name = "event-listener"
++version = "5.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
++dependencies = [
++ "concurrent-queue",
++ "parking",
++ "pin-project-lite",
++]
++
++[[package]]
++name = "event-listener-strategy"
++version = "0.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
++dependencies = [
++ "event-listener",
++ "pin-project-lite",
++]
++
++[[package]]
++name = "fastrand"
++version = "2.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
++
++[[package]]
++name = "form_urlencoded"
++version = "1.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
++dependencies = [
++ "percent-encoding",
++]
++
++[[package]]
++name = "futures"
++version = "0.3.31"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
++dependencies = [
++ "futures-channel",
++ "futures-core",
++ "futures-executor",
++ "futures-io",
++ "futures-sink",
++ "futures-task",
++ "futures-util",
++]
++
++[[package]]
++name = "futures-channel"
++version = "0.3.31"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
++dependencies = [
++ "futures-core",
++ "futures-sink",
++]
++
++[[package]]
++name = "futures-core"
++version = "0.3.31"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
++
++[[package]]
++name = "futures-executor"
++version = "0.3.31"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
++dependencies = [
++ "futures-core",
++ "futures-task",
++ "futures-util",
++]
++
++[[package]]
++name = "futures-io"
++version = "0.3.31"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
++
++[[package]]
++name = "futures-lite"
++version = "2.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
++dependencies = [
++ "futures-core",
++ "pin-project-lite",
++]
++
++[[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.85",
++]
++
++[[package]]
++name = "futures-sink"
++version = "0.3.31"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
++
++[[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-channel",
++ "futures-core",
++ "futures-io",
++ "futures-macro",
++ "futures-sink",
++ "futures-task",
++ "memchr",
++ "pin-project-lite",
++ "pin-utils",
++ "slab",
++]
++
++[[package]]
++name = "generic-array"
++version = "0.14.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
++dependencies = [
++ "typenum",
++ "version_check",
++]
++
++[[package]]
++name = "getrandom"
++version = "0.2.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
++dependencies = [
++ "cfg-if",
++ "libc",
++ "wasi",
++]
++
++[[package]]
++name = "gimli"
++version = "0.31.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
++
++[[package]]
++name = "hashbrown"
++version = "0.14.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
++dependencies = [
++ "ahash",
++]
++
++[[package]]
++name = "hashlink"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
++dependencies = [
++ "hashbrown",
++]
++
++[[package]]
++name = "heck"
++version = "0.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
++
++[[package]]
++name = "hermit-abi"
++version = "0.3.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
++
++[[package]]
++name = "hex"
++version = "0.4.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
++
++[[package]]
++name = "hickory-proto"
++version = "0.24.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512"
++dependencies = [
++ "async-trait",
++ "cfg-if",
++ "data-encoding",
++ "enum-as-inner",
++ "futures-channel",
++ "futures-io",
++ "futures-util",
++ "idna 0.4.0",
++ "ipnet",
++ "once_cell",
++ "rand",
++ "thiserror",
++ "tinyvec",
++ "tokio",
++ "tracing",
++ "url",
++]
++
++[[package]]
++name = "httparse"
++version = "1.9.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
++
++[[package]]
++name = "humantime"
++version = "2.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
++
++[[package]]
++name = "iana-time-zone"
++version = "0.1.61"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
++dependencies = [
++ "android_system_properties",
++ "core-foundation-sys",
++ "iana-time-zone-haiku",
++ "js-sys",
++ "wasm-bindgen",
++ "windows-core",
++]
++
++[[package]]
++name = "iana-time-zone-haiku"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
++dependencies = [
++ "cc",
++]
++
++[[package]]
++name = "idna"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
++dependencies = [
++ "unicode-bidi",
++ "unicode-normalization",
++]
++
++[[package]]
++name = "idna"
++version = "0.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
++dependencies = [
++ "unicode-bidi",
++ "unicode-normalization",
++]
++
++[[package]]
++name = "ipnet"
++version = "2.10.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
++
++[[package]]
++name = "ipstack"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "12b181930b573c62415bdd2afa8f4ec56ddad89fc5a6669d2b267f1c8ee438c5"
++dependencies = [
++ "ahash",
++ "etherparse",
++ "log",
++ "rand",
++ "thiserror",
++ "tokio",
++]
++
++[[package]]
++name = "is_terminal_polyfill"
++version = "1.70.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
++
++[[package]]
++name = "itoa"
++version = "1.0.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
++
++[[package]]
++name = "jni"
++version = "0.21.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
++dependencies = [
++ "cesu8",
++ "cfg-if",
++ "combine",
++ "jni-sys",
++ "log",
++ "thiserror",
++ "walkdir",
++ "windows-sys 0.45.0",
++]
++
++[[package]]
++name = "jni-sys"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
++
++[[package]]
++name = "js-sys"
++version = "0.3.72"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
++dependencies = [
++ "wasm-bindgen",
++]
++
++[[package]]
++name = "libc"
++version = "0.2.161"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
++
++[[package]]
++name = "libloading"
++version = "0.8.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
++dependencies = [
++ "cfg-if",
++ "windows-targets 0.52.6",
++]
++
++[[package]]
++name = "libmimalloc-sys"
++version = "0.1.39"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44"
++dependencies = [
++ "cc",
++ "libc",
++]
++
++[[package]]
++name = "linux-raw-sys"
++version = "0.4.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
++
++[[package]]
++name = "lock_api"
++version = "0.4.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
++dependencies = [
++ "autocfg",
++ "scopeguard",
++]
++
++[[package]]
++name = "log"
++version = "0.4.22"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
++
++[[package]]
++name = "md-5"
++version = "0.10.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
++dependencies = [
++ "cfg-if",
++ "digest",
++]
++
++[[package]]
++name = "memchr"
++version = "2.7.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
++
++[[package]]
++name = "memoffset"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
++dependencies = [
++ "autocfg",
++]
++
++[[package]]
++name = "mimalloc"
++version = "0.1.43"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633"
++dependencies = [
++ "libmimalloc-sys",
++]
++
++[[package]]
++name = "miniz_oxide"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
++dependencies = [
++ "adler2",
++]
++
++[[package]]
++name = "mio"
++version = "1.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
++dependencies = [
++ "hermit-abi",
++ "libc",
++ "wasi",
++ "windows-sys 0.52.0",
++]
++
++[[package]]
++name = "nix"
++version = "0.29.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
++dependencies = [
++ "bitflags",
++ "cfg-if",
++ "cfg_aliases",
++ "libc",
++ "memoffset",
++]
++
++[[package]]
++name = "num-traits"
++version = "0.2.19"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
++dependencies = [
++ "autocfg",
++]
++
++[[package]]
++name = "object"
++version = "0.36.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
++dependencies = [
++ "memchr",
++]
++
++[[package]]
++name = "once_cell"
++version = "1.20.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
++
++[[package]]
++name = "parking"
++version = "2.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
++
++[[package]]
++name = "parking_lot"
++version = "0.12.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
++dependencies = [
++ "lock_api",
++ "parking_lot_core",
++]
++
++[[package]]
++name = "parking_lot_core"
++version = "0.9.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
++dependencies = [
++ "cfg-if",
++ "libc",
++ "redox_syscall",
++ "smallvec",
++ "windows-targets 0.52.6",
++]
++
++[[package]]
++name = "percent-encoding"
++version = "2.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
++
++[[package]]
++name = "pin-project-lite"
++version = "0.2.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
++
++[[package]]
++name = "pin-utils"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
++
++[[package]]
++name = "piper"
++version = "0.2.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
++dependencies = [
++ "atomic-waker",
++ "fastrand",
++ "futures-io",
++]
++
++[[package]]
++name = "ppv-lite86"
++version = "0.2.20"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
++dependencies = [
++ "zerocopy",
++]
++
++[[package]]
++name = "proc-macro2"
++version = "1.0.89"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
++dependencies = [
++ "unicode-ident",
++]
++
++[[package]]
++name = "quick-error"
++version = "1.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
++
++[[package]]
++name = "quote"
++version = "1.0.37"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
++dependencies = [
++ "proc-macro2",
++]
++
++[[package]]
++name = "rand"
++version = "0.8.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
++dependencies = [
++ "libc",
++ "rand_chacha",
++ "rand_core",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
++dependencies = [
++ "ppv-lite86",
++ "rand_core",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.6.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
++dependencies = [
++ "getrandom",
++]
++
++[[package]]
++name = "redox_syscall"
++version = "0.5.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
++dependencies = [
++ "bitflags",
++]
++
++[[package]]
++name = "regex"
++version = "1.11.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
++dependencies = [
++ "aho-corasick",
++ "memchr",
++ "regex-automata",
++ "regex-syntax",
++]
++
++[[package]]
++name = "regex-automata"
++version = "0.4.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
++dependencies = [
++ "aho-corasick",
++ "memchr",
++ "regex-syntax",
++]
++
++[[package]]
++name = "regex-syntax"
++version = "0.8.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
++
++[[package]]
++name = "resolv-conf"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
++dependencies = [
++ "quick-error",
++]
++
++[[package]]
++name = "rustc-demangle"
++version = "0.1.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
++
++[[package]]
++name = "rustix"
++version = "0.38.37"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
++dependencies = [
++ "bitflags",
++ "errno",
++ "libc",
++ "linux-raw-sys",
++ "windows-sys 0.52.0",
++]
++
++[[package]]
++name = "ryu"
++version = "1.0.18"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
++
++[[package]]
++name = "same-file"
++version = "1.0.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
++dependencies = [
++ "winapi-util",
++]
++
++[[package]]
++name = "scopeguard"
++version = "1.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
++
++[[package]]
++name = "serde"
++version = "1.0.213"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1"
++dependencies = [
++ "serde_derive",
++]
++
++[[package]]
++name = "serde_derive"
++version = "1.0.213"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn 2.0.85",
++]
++
++[[package]]
++name = "serde_json"
++version = "1.0.132"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
++dependencies = [
++ "itoa",
++ "memchr",
++ "ryu",
++ "serde",
++]
++
++[[package]]
++name = "sha2"
++version = "0.10.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
++dependencies = [
++ "cfg-if",
++ "cpufeatures",
++ "digest",
++]
++
++[[package]]
++name = "shlex"
++version = "1.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
++
++[[package]]
++name = "signal-hook-registry"
++version = "1.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "slab"
++version = "0.4.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
++dependencies = [
++ "autocfg",
++]
++
++[[package]]
++name = "smallvec"
++version = "1.13.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
++
++[[package]]
++name = "socket2"
++version = "0.5.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
++dependencies = [
++ "libc",
++ "windows-sys 0.52.0",
++]
++
++[[package]]
++name = "socks5-impl"
++version = "0.5.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3ae3b3dd8f843e5260f8158b08c831d1e53717dd841f52599a51300cfd0f7221"
++dependencies = [
++ "as-any",
++ "async-trait",
++ "byteorder",
++ "bytes",
++ "percent-encoding",
++ "serde",
++ "thiserror",
++ "tokio",
++]
++
++[[package]]
++name = "strsim"
++version = "0.11.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
++
++[[package]]
++name = "syn"
++version = "1.0.109"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "unicode-ident",
++]
++
++[[package]]
++name = "syn"
++version = "2.0.85"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "unicode-ident",
++]
++
++[[package]]
++name = "system-configuration"
++version = "0.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
++dependencies = [
++ "bitflags",
++ "core-foundation",
++ "system-configuration-sys",
++]
++
++[[package]]
++name = "system-configuration-sys"
++version = "0.6.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
++dependencies = [
++ "core-foundation-sys",
++ "libc",
++]
++
++[[package]]
++name = "tempfile"
++version = "3.13.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
++dependencies = [
++ "cfg-if",
++ "fastrand",
++ "once_cell",
++ "rustix",
++ "windows-sys 0.59.0",
++]
++
++[[package]]
++name = "terminal_size"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef"
++dependencies = [
++ "rustix",
++ "windows-sys 0.59.0",
++]
++
++[[package]]
++name = "thiserror"
++version = "1.0.65"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
++dependencies = [
++ "thiserror-impl",
++]
++
++[[package]]
++name = "thiserror-impl"
++version = "1.0.65"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn 2.0.85",
++]
++
++[[package]]
++name = "tinyvec"
++version = "1.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
++dependencies = [
++ "tinyvec_macros",
++]
++
++[[package]]
++name = "tinyvec_macros"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
++
++[[package]]
++name = "tokio"
++version = "1.41.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb"
++dependencies = [
++ "backtrace",
++ "bytes",
++ "libc",
++ "mio",
++ "parking_lot",
++ "pin-project-lite",
++ "signal-hook-registry",
++ "socket2",
++ "tokio-macros",
++ "windows-sys 0.52.0",
++]
++
++[[package]]
++name = "tokio-macros"
++version = "2.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn 2.0.85",
++]
++
++[[package]]
++name = "tokio-util"
++version = "0.7.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
++dependencies = [
++ "bytes",
++ "futures-core",
++ "futures-sink",
++ "pin-project-lite",
++ "tokio",
++]
++
++[[package]]
++name = "tproxy-config"
++version = "6.0.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6675511fcd4521e3a0acf9ff2ad5d194044409ab49fbc60b51743bd87b944c27"
++dependencies = [
++ "cidr",
++ "libloading",
++ "log",
++ "nix",
++ "regex",
++ "resolv-conf",
++ "serde",
++ "serde_json",
++ "system-configuration",
++ "tempfile",
++ "windows-sys 0.59.0",
++]
++
++[[package]]
++name = "tracing"
++version = "0.1.40"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
++dependencies = [
++ "pin-project-lite",
++ "tracing-attributes",
++ "tracing-core",
++]
++
++[[package]]
++name = "tracing-attributes"
++version = "0.1.27"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn 2.0.85",
++]
++
++[[package]]
++name = "tracing-core"
++version = "0.1.32"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
++dependencies = [
++ "once_cell",
++]
++
++[[package]]
++name = "tun2"
++version = "3.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "294ac0e21fef392b8952f1dd538bc5752fd7c2ebfde1c204b0dd09aaa5489cd0"
++dependencies = [
++ "bytes",
++ "cfg-if",
++ "futures",
++ "futures-core",
++ "ipnet",
++ "libc",
++ "log",
++ "nix",
++ "thiserror",
++ "tokio",
++ "tokio-util",
++ "windows-sys 0.59.0",
++ "wintun-bindings",
++]
++
++[[package]]
++name = "tun2proxy"
++version = "0.5.4"
++dependencies = [
++ "android_logger",
++ "async-trait",
++ "base64",
++ "bincode",
++ "chrono",
++ "clap",
++ "ctrlc2",
++ "daemonize",
++ "digest_auth",
++ "dotenvy",
++ "env_logger",
++ "hashlink",
++ "hickory-proto",
++ "httparse",
++ "ipstack",
++ "jni",
++ "log",
++ "mimalloc",
++ "nix",
++ "percent-encoding",
++ "serde",
++ "serde_json",
++ "socks5-impl",
++ "thiserror",
++ "tokio",
++ "tokio-util",
++ "tproxy-config",
++ "tun2",
++ "udp-stream",
++ "unicase",
++ "url",
++ "windows-service",
++]
++
++[[package]]
++name = "typenum"
++version = "1.17.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
++
++[[package]]
++name = "udp-stream"
++version = "0.0.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cf021324a3dc10f5b46ab1c1cf5635e6a81b5559971967b806674673a5f2a18e"
++dependencies = [
++ "bytes",
++ "log",
++ "tokio",
++]
++
++[[package]]
++name = "unicase"
++version = "2.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
++
++[[package]]
++name = "unicode-bidi"
++version = "0.3.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
++
++[[package]]
++name = "unicode-ident"
++version = "1.0.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
++
++[[package]]
++name = "unicode-normalization"
++version = "0.1.24"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
++dependencies = [
++ "tinyvec",
++]
++
++[[package]]
++name = "url"
++version = "2.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
++dependencies = [
++ "form_urlencoded",
++ "idna 0.5.0",
++ "percent-encoding",
++]
++
++[[package]]
++name = "utf8parse"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
++
++[[package]]
++name = "version_check"
++version = "0.9.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
++
++[[package]]
++name = "walkdir"
++version = "2.5.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
++dependencies = [
++ "same-file",
++ "winapi-util",
++]
++
++[[package]]
++name = "wasi"
++version = "0.11.0+wasi-snapshot-preview1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
++
++[[package]]
++name = "wasm-bindgen"
++version = "0.2.95"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
++dependencies = [
++ "cfg-if",
++ "once_cell",
++ "wasm-bindgen-macro",
++]
++
++[[package]]
++name = "wasm-bindgen-backend"
++version = "0.2.95"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
++dependencies = [
++ "bumpalo",
++ "log",
++ "once_cell",
++ "proc-macro2",
++ "quote",
++ "syn 2.0.85",
++ "wasm-bindgen-shared",
++]
++
++[[package]]
++name = "wasm-bindgen-macro"
++version = "0.2.95"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
++dependencies = [
++ "quote",
++ "wasm-bindgen-macro-support",
++]
++
++[[package]]
++name = "wasm-bindgen-macro-support"
++version = "0.2.95"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn 2.0.85",
++ "wasm-bindgen-backend",
++ "wasm-bindgen-shared",
++]
++
++[[package]]
++name = "wasm-bindgen-shared"
++version = "0.2.95"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
++
++[[package]]
++name = "widestring"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
++
++[[package]]
++name = "winapi-util"
++version = "0.1.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
++dependencies = [
++ "windows-sys 0.59.0",
++]
++
++[[package]]
++name = "windows-core"
++version = "0.52.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
++dependencies = [
++ "windows-targets 0.52.6",
++]
++
++[[package]]
++name = "windows-service"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d24d6bcc7f734a4091ecf8d7a64c5f7d7066f45585c1861eba06449909609c8a"
++dependencies = [
++ "bitflags",
++ "widestring",
++ "windows-sys 0.52.0",
++]
++
++[[package]]
++name = "windows-sys"
++version = "0.45.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
++dependencies = [
++ "windows-targets 0.42.2",
++]
++
++[[package]]
++name = "windows-sys"
++version = "0.52.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
++dependencies = [
++ "windows-targets 0.52.6",
++]
++
++[[package]]
++name = "windows-sys"
++version = "0.59.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
++dependencies = [
++ "windows-targets 0.52.6",
++]
++
++[[package]]
++name = "windows-targets"
++version = "0.42.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
++dependencies = [
++ "windows_aarch64_gnullvm 0.42.2",
++ "windows_aarch64_msvc 0.42.2",
++ "windows_i686_gnu 0.42.2",
++ "windows_i686_msvc 0.42.2",
++ "windows_x86_64_gnu 0.42.2",
++ "windows_x86_64_gnullvm 0.42.2",
++ "windows_x86_64_msvc 0.42.2",
++]
++
++[[package]]
++name = "windows-targets"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
++dependencies = [
++ "windows_aarch64_gnullvm 0.52.6",
++ "windows_aarch64_msvc 0.52.6",
++ "windows_i686_gnu 0.52.6",
++ "windows_i686_gnullvm",
++ "windows_i686_msvc 0.52.6",
++ "windows_x86_64_gnu 0.52.6",
++ "windows_x86_64_gnullvm 0.52.6",
++ "windows_x86_64_msvc 0.52.6",
++]
++
++[[package]]
++name = "windows_aarch64_gnullvm"
++version = "0.42.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
++
++[[package]]
++name = "windows_aarch64_gnullvm"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
++
++[[package]]
++name = "windows_aarch64_msvc"
++version = "0.42.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
++
++[[package]]
++name = "windows_aarch64_msvc"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
++
++[[package]]
++name = "windows_i686_gnu"
++version = "0.42.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
++
++[[package]]
++name = "windows_i686_gnu"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
++
++[[package]]
++name = "windows_i686_gnullvm"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
++
++[[package]]
++name = "windows_i686_msvc"
++version = "0.42.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
++
++[[package]]
++name = "windows_i686_msvc"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
++
++[[package]]
++name = "windows_x86_64_gnu"
++version = "0.42.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
++
++[[package]]
++name = "windows_x86_64_gnu"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
++
++[[package]]
++name = "windows_x86_64_gnullvm"
++version = "0.42.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
++
++[[package]]
++name = "windows_x86_64_gnullvm"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
++
++[[package]]
++name = "windows_x86_64_msvc"
++version = "0.42.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
++
++[[package]]
++name = "windows_x86_64_msvc"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
++
++[[package]]
++name = "wintun-bindings"
++version = "0.7.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "74675b7fccee92389d38c3d120445864d1085c421ee91c7ed05d66fb9bb76050"
++dependencies = [
++ "blocking",
++ "c2rust-bitfields",
++ "futures",
++ "libloading",
++ "log",
++ "thiserror",
++ "windows-sys 0.59.0",
++]
++
++[[package]]
++name = "zerocopy"
++version = "0.7.35"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
++dependencies = [
++ "byteorder",
++ "zerocopy-derive",
++]
++
++[[package]]
++name = "zerocopy-derive"
++version = "0.7.35"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn 2.0.85",
++]
diff --git a/pkgs/by-name/tu/tun2proxy/package.nix b/pkgs/by-name/tu/tun2proxy/package.nix
new file mode 100644
index 000000000000..984cafc2d9fa
--- /dev/null
+++ b/pkgs/by-name/tu/tun2proxy/package.nix
@@ -0,0 +1,33 @@
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "tun2proxy";
+ version = "0.6.0";
+
+ src = fetchFromGitHub {
+ owner = "tun2proxy";
+ repo = "tun2proxy";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-LY7vVD85GVFqARYOBDeb4fS6rL2PwPXYXIAJtwm2goo=";
+ };
+
+ cargoHash = "sha256-o/zQjWR9qNs0XVL/dcRiMHgj+8Xvl6vVl/Yw5iLhroI=";
+
+ cargoPatches = [
+ ./Cargo.lock.patch
+ ];
+
+ meta = {
+ homepage = "https://github.com/tun2proxy/tun2proxy";
+ description = "Tunnel (TUN) interface for SOCKS and HTTP proxies";
+ changelog = "https://github.com/tun2proxy/tun2proxy/releases/tag/v${version}";
+ license = lib.licenses.mit;
+ platforms = lib.platforms.linux;
+ mainProgram = "tun2proxy-bin";
+ maintainers = with lib.maintainers; [ mksafavi ];
+ };
+}
diff --git a/pkgs/by-name/tu/turbocase/package.nix b/pkgs/by-name/tu/turbocase/package.nix
new file mode 100644
index 000000000000..cfc46e3c5a27
--- /dev/null
+++ b/pkgs/by-name/tu/turbocase/package.nix
@@ -0,0 +1,33 @@
+{
+ lib,
+ python3,
+ fetchFromGitea,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+ pname = "turbocase";
+ version = "1.8.0";
+ pyproject = true;
+
+ src = fetchFromGitea {
+ domain = "codeberg.org";
+ owner = "MartijnBraam";
+ repo = "TurboCase";
+ rev = version;
+ hash = "sha256-mwWN7XYKr/BD9r935oElqoQN87kdrrWjkmhURkAkjj4=";
+ };
+
+ build-system = [ python3.pkgs.setuptools ];
+
+ dependencies = [ python3.pkgs.sexpdata ];
+
+ pythonImportsCheck = [ "turbocase" ];
+
+ meta = {
+ description = "Generate an OpenSCAD case template from a KiCAD PCB";
+ homepage = "https://turbocase.org";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ MayNiklas ];
+ mainProgram = "turbocase";
+ };
+}
diff --git a/pkgs/by-name/ug/ugit/package.nix b/pkgs/by-name/ug/ugit/package.nix
new file mode 100644
index 000000000000..067a70cbf8d9
--- /dev/null
+++ b/pkgs/by-name/ug/ugit/package.nix
@@ -0,0 +1,77 @@
+{
+ lib,
+ stdenvNoCC,
+ fetchFromGitHub,
+ git,
+ fzf,
+ bash,
+ ncurses,
+ curl,
+ nix-update-script,
+ testers,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+ pname = "ugit";
+ version = "5.8";
+
+ src = fetchFromGitHub {
+ owner = "Bhupesh-V";
+ repo = "ugit";
+ rev = "refs/tags/v${finalAttrs.version}";
+ hash = "sha256-WnEyS2JKH6rrsYOeGEwughWq2LKrHPSjio3TOI0Xm4g=";
+ };
+
+ strictDeps = true;
+ doInstallCheck = true;
+
+ buildInputs = [
+ fzf
+ curl
+ bash
+ ncurses
+ ];
+
+ propagatedBuildInputs = [ git ];
+ nativeInstallCheckInputs = [ ncurses ];
+
+ postPatch = ''
+ substituteInPlace ugit \
+ --replace-fail "fzf " "${lib.getExe fzf} " \
+ --replace-fail "curl" "${lib.getExe curl}" \
+ --replace-fail "tput " "${ncurses}/bin/tput "
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm755 ugit $out/bin/ugit
+ ln -s $out/bin/ugit $out/bin/git-undo
+ install -Dm644 ugit.plugin.zsh $out/share/zsh/ugit/ugit.zsh
+
+ runHook postInstall
+ '';
+
+ installCheckPhase = ''
+ runHook preInstallCheck
+
+ PATH=$PATH:$out/bin ugit --help
+
+ runHook postInstallCheck
+ '';
+
+ passthru = {
+ tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
+ updateScript = nix-update-script { };
+ };
+
+ meta = {
+ description = "Tool that helps undoing the last git command with grace";
+ homepage = "https://github.com/Bhupesh-V/ugit";
+ downloadPage = "https://github.com/Bhupesh-V/ugit/releases";
+ license = lib.licenses.mit;
+ mainProgram = "ugit";
+ platforms = lib.platforms.unix;
+ maintainers = with lib.maintainers; [ d-brasher ];
+ };
+})
diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix
index 19dbe22d987f..9c3de766bcff 100644
--- a/pkgs/by-name/ui/uiua/package.nix
+++ b/pkgs/by-name/ui/uiua/package.nix
@@ -20,16 +20,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "uiua";
- version = "0.13.0-dev.1";
+ version = "0.13.0";
src = fetchFromGitHub {
owner = "uiua-lang";
repo = "uiua";
rev = version;
- hash = "sha256-dwiwv24bhn8/WVxrq8uReEPhU/5zn3oaH/AMjNJiA4M=";
+ hash = "sha256-5IqJ/lvozXzc7LRUzxpG04M3Nir+3h+GoL7dqTgC9J8=";
};
- cargoHash = "sha256-4XHKcmOeaeSGfl7uvQQdhm29DBWEdZLX021d9+Ebrww=";
+ cargoHash = "sha256-0hbE2ZH7daw/VQLe51CxOIborABDF0x00kTyx9NCs9g=";
nativeBuildInputs =
lib.optionals (webcamSupport || stdenv.hostPlatform.isDarwin) [ rustPlatform.bindgenHook ]
diff --git a/pkgs/by-name/ui/uiua386/package.nix b/pkgs/by-name/ui/uiua386/package.nix
index 6b37680ba232..198d0a8cea9f 100644
--- a/pkgs/by-name/ui/uiua386/package.nix
+++ b/pkgs/by-name/ui/uiua386/package.nix
@@ -8,7 +8,7 @@ stdenvNoCC.mkDerivation {
installPhase = ''
runHook preInstall
- install -Dm444 -t $out/share/fonts/truetype ./site/Uiua386.ttf
+ install -Dm444 -t $out/share/fonts/truetype ./src/algorithm/Uiua386.ttf
runHook postInstall
'';
diff --git a/pkgs/by-name/un/universal-android-debloater/package.nix b/pkgs/by-name/un/universal-android-debloater/package.nix
index 30803b31de5f..8fc5e35f5f7b 100644
--- a/pkgs/by-name/un/universal-android-debloater/package.nix
+++ b/pkgs/by-name/un/universal-android-debloater/package.nix
@@ -1,31 +1,33 @@
-{ android-tools
-, clang
-, expat
-, fetchFromGitHub
-, fontconfig
-, freetype
-, lib
-, libglvnd
-, libxkbcommon
-, wayland
-, makeWrapper
-, mold
-, pkg-config
-, rustPlatform
-, xorg
+{
+ android-tools,
+ clang,
+ expat,
+ fetchFromGitHub,
+ fontconfig,
+ freetype,
+ lib,
+ libglvnd,
+ libxkbcommon,
+ wayland,
+ makeWrapper,
+ mold,
+ pkg-config,
+ rustPlatform,
+ xorg,
}:
+
rustPlatform.buildRustPackage rec {
pname = "universal-android-debloater";
- version = "1.0.3";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "Universal-Debloater-Alliance";
repo = "universal-android-debloater-next-generation";
rev = "v${version}";
- hash = "sha256-yiCl6inPFveMO4IA2NwwpEmbRSmrZBeZR+eiKzGj6a0=";
+ hash = "sha256-o54gwFl2x0/nE1hiE5F8D18vQSNCKU9Oxiq8RA+yOoE=";
};
- cargoHash = "sha256-HqyOslcr3pwDvpZ8CNbAy2W5jGhWGWoe/rutq0leNaY=";
+ cargoHash = "sha256-Zm0zC9GZ2IsjVp5Phd38UAiBH8n0O/i56CEURBUapAg=";
buildInputs = [
expat
@@ -49,17 +51,29 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
wrapProgram $out/bin/uad-ng \
- --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ fontconfig freetype libglvnd libxkbcommon wayland xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr ]} \
+ --prefix LD_LIBRARY_PATH : ${
+ lib.makeLibraryPath [
+ fontconfig
+ freetype
+ libglvnd
+ libxkbcommon
+ wayland
+ xorg.libX11
+ xorg.libXcursor
+ xorg.libXi
+ xorg.libXrandr
+ ]
+ } \
--suffix PATH : ${lib.makeBinPath [ android-tools ]}
'';
- meta = with lib; {
+ meta = {
description = "Tool to debloat non-rooted Android devices";
changelog = "https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation/blob/${src.rev}/CHANGELOG.md";
homepage = "https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation";
- license = licenses.gpl3Only;
+ license = lib.licenses.gpl3Only;
mainProgram = "uad-ng";
- maintainers = with maintainers; [ lavafroth ];
- platforms = platforms.linux;
+ maintainers = with lib.maintainers; [ lavafroth ];
+ platforms = lib.platforms.linux;
};
}
diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock
index 066981fdff1d..81507fd74255 100644
--- a/pkgs/by-name/uv/uv/Cargo.lock
+++ b/pkgs/by-name/uv/uv/Cargo.lock
@@ -34,9 +34,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
[[package]]
name = "anstream"
-version = "0.6.15"
+version = "0.6.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338"
dependencies = [
"anstyle",
"anstyle-parse",
@@ -73,19 +73,19 @@ dependencies = [
[[package]]
name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
dependencies = [
"anstyle",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
name = "anyhow"
-version = "1.0.90"
+version = "1.0.91"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95"
+checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8"
[[package]]
name = "arrayref"
@@ -269,9 +269,9 @@ dependencies = [
[[package]]
name = "axoupdater"
-version = "0.7.2"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa6f92ef9ab41a352f403f709ef0f09cda1f461795de52085cd46ed831ead02e"
+checksum = "6fe17874ee40fb66fe1d2cb7871b14de4d298fbf77ea29a6cedb8027365e1a33"
dependencies = [
"axoasset",
"axoprocess",
@@ -279,6 +279,7 @@ dependencies = [
"camino",
"homedir",
"miette",
+ "self-replace",
"serde",
"tempfile",
"thiserror",
@@ -920,6 +921,15 @@ dependencies = [
"dirs-sys",
]
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
[[package]]
name = "dirs-sys"
version = "0.4.1"
@@ -1320,9 +1330,9 @@ dependencies = [
[[package]]
name = "goblin"
-version = "0.8.2"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b363a30c165f666402fe6a3024d3bec7ebc898f96a4a23bd1c99f8dbf3f4f47"
+checksum = "53ab3f32d1d77146981dea5d6b1e8fe31eedcb7013e5e00d6ccd1259a4b4d923"
dependencies = [
"log",
"plain",
@@ -1610,9 +1620,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
[[package]]
name = "insta"
-version = "1.40.0"
+version = "1.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60"
+checksum = "a1f72d3e19488cf7d8ea52d2fc0f8754fc933398b337cd3cbdb28aaeb35159ef"
dependencies = [
"console",
"lazy_static",
@@ -1800,9 +1810,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "libc"
-version = "0.2.159"
+version = "0.2.161"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
[[package]]
name = "libmimalloc-sys"
@@ -2148,6 +2158,15 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+[[package]]
+name = "os_str_bytes"
+version = "6.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
+dependencies = [
+ "memchr",
+]
+
[[package]]
name = "overload"
version = "0.1.1"
@@ -2449,13 +2468,37 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.88"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
dependencies = [
"unicode-ident",
]
+[[package]]
+name = "procfs"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4"
+dependencies = [
+ "bitflags 2.6.0",
+ "flate2",
+ "hex",
+ "lazy_static",
+ "procfs-core",
+ "rustix",
+]
+
+[[package]]
+name = "procfs-core"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29"
+dependencies = [
+ "bitflags 2.6.0",
+ "hex",
+]
+
[[package]]
name = "ptr_meta"
version = "0.3.0"
@@ -2479,13 +2522,14 @@ dependencies = [
[[package]]
name = "pubgrub"
version = "0.2.1"
-source = "git+https://github.com/astral-sh/pubgrub?rev=7243f4faf8e54837aa8a401a18406e7173de4ad5#7243f4faf8e54837aa8a401a18406e7173de4ad5"
+source = "git+https://github.com/astral-sh/pubgrub?rev=95e1390399cdddee986b658be19587eb1fdb2d79#95e1390399cdddee986b658be19587eb1fdb2d79"
dependencies = [
"indexmap",
"log",
"priority-queue",
"rustc-hash",
"thiserror",
+ "version-ranges",
]
[[package]]
@@ -2667,9 +2711,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.11.0"
+version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
dependencies = [
"aho-corasick",
"memchr",
@@ -2765,7 +2809,7 @@ dependencies = [
"wasm-streams",
"web-sys",
"webpki-roots",
- "windows-registry",
+ "windows-registry 0.2.0",
]
[[package]]
@@ -2937,9 +2981,11 @@ checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
[[package]]
name = "rust-netrc"
-version = "0.1.1"
-source = "git+https://github.com/gribouille/netrc?rev=544f3890b621f0dc30fcefb4f804269c160ce2e9#544f3890b621f0dc30fcefb4f804269c160ce2e9"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e98097f62769f92dbf95fb51f71c0a68ec18a4ee2e70e0d3e4f47ac005d63e9"
dependencies = [
+ "shellexpand",
"thiserror",
]
@@ -2957,9 +3003,9 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
[[package]]
name = "rustix"
-version = "0.38.37"
+version = "0.38.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a"
dependencies = [
"bitflags 2.6.0",
"errno",
@@ -3141,6 +3187,17 @@ dependencies = [
"libc",
]
+[[package]]
+name = "self-replace"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03ec815b5eab420ab893f63393878d89c90fdd94c0bcc44c07abb8ad95552fb7"
+dependencies = [
+ "fastrand",
+ "tempfile",
+ "windows-sys 0.52.0",
+]
+
[[package]]
name = "semver"
version = "1.0.23"
@@ -3149,9 +3206,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
[[package]]
name = "serde"
-version = "1.0.210"
+version = "1.0.213"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1"
dependencies = [
"serde_derive",
]
@@ -3169,9 +3226,9 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.210"
+version = "1.0.213"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5"
dependencies = [
"proc-macro2",
"quote",
@@ -3248,6 +3305,17 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f"
+[[package]]
+name = "shellexpand"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b"
+dependencies = [
+ "bstr",
+ "dirs",
+ "os_str_bytes",
+]
+
[[package]]
name = "shlex"
version = "1.3.0"
@@ -3422,9 +3490,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.82"
+version = "2.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021"
+checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
dependencies = [
"proc-macro2",
"quote",
@@ -3564,15 +3632,6 @@ dependencies = [
"syn",
]
-[[package]]
-name = "testing_logger"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d92b727cb45d33ae956f7f46b966b25f1bc712092aeef9dba5ac798fc89f720"
-dependencies = [
- "log",
-]
-
[[package]]
name = "textwrap"
version = "0.16.1"
@@ -3586,18 +3645,18 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.64"
+version = "1.0.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.64"
+version = "1.0.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
dependencies = [
"proc-macro2",
"quote",
@@ -3691,9 +3750,9 @@ source = "git+https://github.com/charliermarsh/tl.git?rev=6e25b2ee2513d75385101a
[[package]]
name = "tokio"
-version = "1.40.0"
+version = "1.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb"
dependencies = [
"backtrace",
"bytes",
@@ -3899,6 +3958,27 @@ dependencies = [
"tracing-serde",
]
+[[package]]
+name = "tracing-test"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "557b891436fe0d5e0e363427fc7f217abf9ccd510d5136549847bdcbcd011d68"
+dependencies = [
+ "tracing-core",
+ "tracing-subscriber",
+ "tracing-test-macro",
+]
+
+[[package]]
+name = "tracing-test-macro"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568"
+dependencies = [
+ "quote",
+ "syn",
+]
+
[[package]]
name = "tracing-tree"
version = "0.4.0"
@@ -4096,7 +4176,7 @@ checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
[[package]]
name = "uv"
-version = "0.4.25"
+version = "0.4.29"
dependencies = [
"anstream",
"anyhow",
@@ -4115,7 +4195,6 @@ dependencies = [
"futures",
"http",
"ignore",
- "indexmap",
"indicatif",
"indoc",
"insta",
@@ -4123,11 +4202,13 @@ dependencies = [
"jiff",
"miette",
"owo-colors",
+ "petgraph",
"predicates",
"rayon",
"regex",
"reqwest",
"rustc-hash",
+ "same-file",
"serde",
"serde_json",
"similar",
@@ -4259,9 +4340,9 @@ dependencies = [
"uv-normalize",
"uv-pep440",
"uv-pep508",
- "uv-pubgrub",
"uv-pypi-types",
"uv-warnings",
+ "version-ranges",
"walkdir",
"zip",
]
@@ -4304,8 +4385,6 @@ name = "uv-cache"
version = "0.0.1"
dependencies = [
"clap",
- "directories",
- "etcetera",
"fs-err",
"nanoid",
"rmp-serde",
@@ -4316,6 +4395,7 @@ dependencies = [
"url",
"uv-cache-info",
"uv-cache-key",
+ "uv-dirs",
"uv-distribution-types",
"uv-fs",
"uv-normalize",
@@ -4502,6 +4582,16 @@ dependencies = [
"walkdir",
]
+[[package]]
+name = "uv-dirs"
+version = "0.0.1"
+dependencies = [
+ "directories",
+ "dirs-sys",
+ "etcetera",
+ "uv-static",
+]
+
[[package]]
name = "uv-dispatch"
version = "0.0.1"
@@ -4718,6 +4808,7 @@ dependencies = [
"uv-pep440",
"uv-platform-tags",
"uv-pypi-types",
+ "uv-trampoline-builder",
"uv-warnings",
"walkdir",
"zip",
@@ -4821,6 +4912,7 @@ dependencies = [
"tracing",
"unicode-width",
"unscanny",
+ "version-ranges",
]
[[package]]
@@ -4831,23 +4923,21 @@ dependencies = [
"indexmap",
"insta",
"itertools 0.13.0",
- "log",
- "pubgrub",
"regex",
"rustc-hash",
"schemars",
"serde",
"serde_json",
"smallvec",
- "testing_logger",
"thiserror",
"tracing",
+ "tracing-test",
"unicode-width",
"url",
"uv-fs",
"uv-normalize",
"uv-pep440",
- "uv-pubgrub",
+ "version-ranges",
]
[[package]]
@@ -4875,16 +4965,6 @@ dependencies = [
"thiserror",
]
-[[package]]
-name = "uv-pubgrub"
-version = "0.0.1"
-dependencies = [
- "itertools 0.13.0",
- "pubgrub",
- "thiserror",
- "uv-pep440",
-]
-
[[package]]
name = "uv-publish"
version = "0.1.0"
@@ -4959,6 +5039,7 @@ dependencies = [
"indoc",
"itertools 0.13.0",
"owo-colors",
+ "procfs",
"regex",
"reqwest",
"reqwest-middleware",
@@ -4980,6 +5061,7 @@ dependencies = [
"uv-cache-info",
"uv-cache-key",
"uv-client",
+ "uv-dirs",
"uv-distribution-filename",
"uv-extract",
"uv-fs",
@@ -4992,7 +5074,7 @@ dependencies = [
"uv-static",
"uv-warnings",
"which",
- "windows-registry",
+ "windows-registry 0.3.0",
"windows-result 0.2.0",
"windows-sys 0.59.0",
]
@@ -5104,7 +5186,6 @@ dependencies = [
"uv-pep440",
"uv-pep508",
"uv-platform-tags",
- "uv-pubgrub",
"uv-pypi-types",
"uv-python",
"uv-requirements-txt",
@@ -5136,9 +5217,11 @@ dependencies = [
name = "uv-settings"
version = "0.0.1"
dependencies = [
+ "assert_fs",
"clap",
"dirs-sys",
"fs-err",
+ "indoc",
"schemars",
"serde",
"textwrap",
@@ -5179,10 +5262,9 @@ dependencies = [
name = "uv-state"
version = "0.0.1"
dependencies = [
- "directories",
- "etcetera",
"fs-err",
"tempfile",
+ "uv-dirs",
]
[[package]]
@@ -5193,7 +5275,6 @@ version = "0.0.1"
name = "uv-tool"
version = "0.0.1"
dependencies = [
- "dirs-sys",
"fs-err",
"pathdiff",
"serde",
@@ -5202,6 +5283,7 @@ dependencies = [
"toml_edit",
"tracing",
"uv-cache",
+ "uv-dirs",
"uv-fs",
"uv-install-wheel",
"uv-installer",
@@ -5215,6 +5297,20 @@ dependencies = [
"uv-virtualenv",
]
+[[package]]
+name = "uv-trampoline-builder"
+version = "0.0.1"
+dependencies = [
+ "anyhow",
+ "assert_cmd",
+ "assert_fs",
+ "fs-err",
+ "thiserror",
+ "uv-fs",
+ "which",
+ "zip",
+]
+
[[package]]
name = "uv-types"
version = "0.0.1"
@@ -5237,7 +5333,7 @@ dependencies = [
[[package]]
name = "uv-version"
-version = "0.4.25"
+version = "0.4.29"
[[package]]
name = "uv-virtualenv"
@@ -5288,6 +5384,7 @@ dependencies = [
"toml_edit",
"tracing",
"url",
+ "uv-cache-key",
"uv-distribution-types",
"uv-fs",
"uv-git",
@@ -5307,6 +5404,14 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+[[package]]
+name = "version-ranges"
+version = "0.1.0"
+source = "git+https://github.com/astral-sh/pubgrub?rev=95e1390399cdddee986b658be19587eb1fdb2d79#95e1390399cdddee986b658be19587eb1fdb2d79"
+dependencies = [
+ "smallvec",
+]
+
[[package]]
name = "version_check"
version = "0.9.5"
@@ -5558,7 +5663,7 @@ dependencies = [
"windows-implement 0.58.0",
"windows-interface 0.58.0",
"windows-result 0.2.0",
- "windows-strings",
+ "windows-strings 0.1.0",
"windows-targets 0.52.6",
]
@@ -5613,7 +5718,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
dependencies = [
"windows-result 0.2.0",
- "windows-strings",
+ "windows-strings 0.1.0",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-registry"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bafa604f2104cf5ae2cc2db1dee84b7e6a5d11b05f737b60def0ffdc398cbc0a"
+dependencies = [
+ "windows-result 0.2.0",
+ "windows-strings 0.2.0",
"windows-targets 0.52.6",
]
@@ -5645,6 +5761,15 @@ dependencies = [
"windows-targets 0.52.6",
]
+[[package]]
+name = "windows-strings"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "978d65aedf914c664c510d9de43c8fd85ca745eaff1ed53edf409b479e441663"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
[[package]]
name = "windows-sys"
version = "0.48.0"
diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 90da34f6d6d7..ef4814207cab 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -15,23 +15,22 @@
python3Packages.buildPythonApplication rec {
pname = "uv";
- version = "0.4.25";
+ version = "0.4.29";
pyproject = true;
src = fetchFromGitHub {
owner = "astral-sh";
repo = "uv";
rev = "refs/tags/${version}";
- hash = "sha256-qAfM9I2NboYkUukWnOjuGcdjp8IONAI6Qwwg1r9kCGg=";
+ hash = "sha256-FJJnb4m9yPf1bBvlAyAgQKgAzt4O0tbokYkz4iY6kbg=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"async_zip-0.0.17" = "sha256-3k9rc4yHWhqsCUJ17K55F8aQoCKdVamrWAn6IDWo3Ss=";
- "pubgrub-0.2.1" = "sha256-mSpRBdQJWtKKD1zHkV7vuyfKTDY6Ejgjll5q5ryCfmY=";
+ "pubgrub-0.2.1" = "sha256-8TrOQ6fYJrYgFNuqiqnGztnHOqFIEDi2MFZEBA+oks4=";
"reqwest-middleware-0.3.3" = "sha256-KjyXB65a7SAfwmxokH2PQFFcJc6io0xuIBQ/yZELJzM=";
- "rust-netrc-0.1.1" = "sha256-DeDAm2k4/2A9Nw8zXeKOMdxhbseGIrRXH0KgGf2shOc=";
"tl-0.7.8" = "sha256-F06zVeSZA4adT6AzLzz1i9uxpI1b8P1h+05fFfjm3GQ=";
};
};
diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix
index 578cb2cbb7c4..8beb49c7e457 100644
--- a/pkgs/by-name/uw/uwsm/package.nix
+++ b/pkgs/by-name/uw/uwsm/package.nix
@@ -27,13 +27,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "uwsm";
- version = "0.20.0";
+ version = "0.20.1";
src = fetchFromGitHub {
owner = "Vladimir-csp";
repo = "uwsm";
rev = "refs/tags/v${finalAttrs.version}";
- hash = "sha256-BtzW0jyYAVGjSBlocgkGHgY3JQUpWizDaSa2YBIX2Bs=";
+ hash = "sha256-iekCav2zjVViuGSM/s5na/Jf4OKyJlsrsXTiGdWOe1M=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/va/vale/package.nix b/pkgs/by-name/va/vale/package.nix
index 3027258e7bd5..4ece69a6f189 100644
--- a/pkgs/by-name/va/vale/package.nix
+++ b/pkgs/by-name/va/vale/package.nix
@@ -10,7 +10,7 @@
buildGoModule rec {
pname = "vale";
- version = "3.7.1";
+ version = "3.8.0";
subPackages = [ "cmd/vale" ];
@@ -18,10 +18,10 @@ buildGoModule rec {
owner = "errata-ai";
repo = "vale";
rev = "v${version}";
- hash = "sha256-jb+ap+XQMrSqstgexycpgO+M2YyENDeSmMQXrV2FiM4=";
+ hash = "sha256-0opa8F0cpC0uh51JDgofxl6e0oecxgkEufnLfxtkaOw=";
};
- vendorHash = "sha256-0AeG0/ALU/mkXxVKzqGhxXLqq2XYmnF/ZRaZkJ5eQxU=";
+ vendorHash = "sha256-EWAgzb3ruxYqaP+owcyGDzNnkPDYp0ttHwCgNXuuTbk=";
ldflags = [
"-s"
diff --git a/pkgs/by-name/ve/vep/package.nix b/pkgs/by-name/ve/vep/package.nix
new file mode 100644
index 000000000000..576b4c9b35fb
--- /dev/null
+++ b/pkgs/by-name/ve/vep/package.nix
@@ -0,0 +1,134 @@
+# Instructions:http://www.ensembl.org/info/docs/api/api_installation.html,
+# Do not use https://github.com/Ensembl/ensembl-vep/archive/release/${version}.zip
+# We cannot use INSTALL.pl but it’s not that bad:install the dependencies and copies the .pm files should be ok
+{
+ lib,
+ htslib,
+ perlPackages,
+ stdenv,
+ fetchFromGitHub,
+ perl,
+ makeWrapper,
+}:
+
+let
+ version = "110";
+ customInstallPhase = ''
+ mkdir -p $out/${perl.libPrefix}/${perl.version}/
+ tests=$(find modules/ -mindepth 1 -maxdepth 1 -type d | grep -v t)
+ cp -r $tests $out/${perl.libPrefix}/${perl.version}/
+ '';
+
+ ensemblGit =
+ name: sha256:
+ # Copy modules directly
+ stdenv.mkDerivation {
+ inherit name version;
+ src = fetchFromGitHub {
+ inherit sha256 version;
+ owner = "Ensembl";
+ repo = name;
+ rev = "release/${version}";
+ };
+ installPhase = ''
+ runHook preInstall
+
+ ${customInstallPhase}
+
+ runHook postInstall'';
+ };
+
+ vepPlugins = fetchFromGitHub {
+ owner = "Ensembl";
+ repo = "VEP_plugins";
+ rev = "8f271c4848338dc7d504881ff71fdf2892c3d096";
+ sha256 = "sha256-LbaXwLFDP3m1QhRHwO9uh36BEFHE2NzL4xdxTb7/S5Q=";
+ };
+
+ # Install ensembl-xs, faster run using re-implementation in C of some of the Perl subroutines
+ ensembl-xs = perlPackages.buildPerlPackage rec {
+ pname = "ensembl-xs";
+ version = "2.3.2";
+ src = fetchFromGitHub {
+ inherit version;
+ owner = "Ensembl";
+ repo = "ensembl-xs";
+ rev = version;
+ sha256 = "1qqnski532f4bz32wxbqd9w1sz40rjh81ipp9p02k3rlaf1gp1fa";
+ };
+ # PREFIX is important
+ configurePhase = ''
+ perl Makefile.PL PREFIX=$out INSTALLDIRS=site
+ '';
+ # Test do not work -- wrong include path
+ doCheck = false;
+ };
+
+ # it contains compiled versions of certain key subroutines used in VEP
+ ensembl = ensemblGit "ensembl" "sha256-ZhI4VNxIY+53RX2uYRNlFeo/ydAmlwGx00WDXaxv6h4=";
+ ensembl-io = ensemblGit "ensembl-io" "sha256-r3RvN5U2kcyghoKM0XuiBRe54t1U4FaZ0QEeYIFiG0w=";
+ ensembl-variation = ensemblGit "ensembl-variation" "sha256-UjrLHF9EqI+Mp+SZR4sLNZUCGiA/UYhoFWtpwiKF8tM=";
+ ensembl-funcgen = ensemblGit "ensembl-funcgen" "sha256-a9hxLBoXJsF5JWuRdpyOac1u033M8ivEjEQecuncghs=";
+in
+perlPackages.buildPerlModule rec {
+ inherit version;
+ pname = "vep";
+ buildInputs =
+ (with perlPackages; [
+ ArchiveZip
+ BioBigFile
+ BioDBHTS
+ BioExtAlign
+ BioPerl
+ DBI
+ DBDmysql
+ LWP
+ JSON
+ ])
+ ++ [
+ ensembl-xs
+ ensembl
+ ensembl-funcgen
+ ensembl-io
+ ensembl-variation
+ ];
+ propagatedBuildInputs = [ htslib ];
+ src = fetchFromGitHub {
+ owner = "Ensembl";
+ repo = "ensembl-${pname}";
+ rev = "release/${version}";
+ sha256 = "sha256-6lRdWV2ispl+mpBhkZez/d9PxOw1fkNUWeG8mUIqBJc=";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+ dontBuild = true;
+ doCheck = false;
+
+ outputs = [ "out" ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin
+ install -D -m755 filter_vep vep $out/bin/
+
+ wrapProgram $out/bin/vep \
+ --prefix PERL5LIB : $out/${perl.libPrefix}/${perl.version}/ \
+ --add-flags "--dir_plugins ${vepPlugins}"
+
+ wrapProgram $out/bin/filter_vep \
+ --prefix PERL5LIB : $out/${perl.libPrefix}/${perl.version}/
+ ${customInstallPhase}
+
+ runHook postInstall
+ '';
+
+ meta = {
+ homepage = "https://www.ensembl.org/info/docs/tools/vep/index.html";
+ description = "Annotate genetics variants based on genes, transcripts, and protein sequence, as well as regulatory regions";
+ license = lib.licenses.asl20;
+ mainProgram = "vep";
+ maintainers = with lib.maintainers; [ apraga ];
+ platforms = lib.platforms.unix;
+ };
+}
diff --git a/pkgs/by-name/ve/verible/package.nix b/pkgs/by-name/ve/verible/package.nix
index 4bfc1a1ca247..3ca60e332c8e 100644
--- a/pkgs/by-name/ve/verible/package.nix
+++ b/pkgs/by-name/ve/verible/package.nix
@@ -1,12 +1,13 @@
-{ lib
-, stdenv
-, buildBazelPackage
-, fetchFromGitHub
-, bazel_6
-, jdk
-, bison
-, flex
-, python3
+{
+ lib,
+ stdenv,
+ buildBazelPackage,
+ fetchFromGitHub,
+ bazel_6,
+ jdk,
+ bison,
+ flex,
+ python3,
}:
let
@@ -18,17 +19,19 @@ buildBazelPackage rec {
# These environment variables are read in bazel/build-version.py to create
# a build string shown in the tools --version output.
# If env variables not set, it would attempt to extract it from .git/.
- GIT_DATE = "2024-09-17";
- GIT_VERSION = "v0.0-3791-g88bf4fb8";
+ GIT_DATE = "2024-10-16";
+ GIT_VERSION = "v0.0-3836-g86ee9bab";
# Derive nix package version from GIT_VERSION: "v1.2-345-abcde" -> "1.2.345"
- version = builtins.concatStringsSep "." (lib.take 3 (lib.drop 1 (builtins.splitVersion GIT_VERSION)));
+ version = builtins.concatStringsSep "." (
+ lib.take 3 (lib.drop 1 (builtins.splitVersion GIT_VERSION))
+ );
src = fetchFromGitHub {
owner = "chipsalliance";
- repo = "verible";
- rev = "${GIT_VERSION}";
- hash = "sha256-Na91NpHhPRZ1k82pLQBvEcL8EWi/1imNN3dPNSl65DQ=";
+ repo = "verible";
+ rev = "${GIT_VERSION}";
+ hash = "sha256-hV02x0b/taBqa6kyy3gvm3lomJrXBeelAbxrkC0s6EU=";
};
bazel = bazel_6;
@@ -41,9 +44,9 @@ buildBazelPackage rec {
};
nativeBuildInputs = [
- jdk # bazel uses that.
- bison # We use local flex and bison as WORKSPACE sources fail
- flex # .. to compile with newer glibc
+ jdk # bazel uses that.
+ bison # We use local flex and bison as WORKSPACE sources fail
+ flex # .. to compile with newer glibc
python3
];
@@ -90,7 +93,10 @@ buildBazelPackage rec {
description = "Suite of SystemVerilog developer tools. Including a style-linter, indexer, formatter, and language server";
homepage = "https://github.com/chipsalliance/verible";
license = licenses.asl20;
- maintainers = with maintainers; [ hzeller newam ];
+ maintainers = with maintainers; [
+ hzeller
+ newam
+ ];
# Platforms linux only currently; some LIBTOOL issue on Darwin w/ bazel
platforms = platforms.linux;
};
diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix
new file mode 100644
index 000000000000..c0f2c33d2e71
--- /dev/null
+++ b/pkgs/by-name/ve/versatiles/package.nix
@@ -0,0 +1,51 @@
+{
+ lib,
+ fetchFromGitHub,
+ rustPlatform,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "versatiles";
+ version = "0.13.0"; # When updating: Replace with current version
+
+ src = fetchFromGitHub {
+ owner = "versatiles-org";
+ repo = "versatiles-rs";
+ rev = "refs/tags/v${version}"; # When updating: Replace with long commit hash of new version
+ hash = "sha256-6HuBKRvt6P4GpFaIiYsGO/8wcjML2UDdUFoYvIM/Z0k="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed.
+ };
+
+ cargoHash = "sha256-7kJf6BHNRfLDFRZp8Q2M2ZGXH0NzG/QBqw5/s20AIm4="; # When updating: Same as above
+
+ # Testing only necessary for the `bins` and `lib` features
+ cargoTestFlags = [
+ "--bins"
+ "--lib"
+ ];
+
+ # Skip tests that require network access
+ checkFlags = [
+ "--skip tools::convert::tests::test_remote1"
+ "--skip tools::convert::tests::test_remote2"
+ "--skip tools::probe::tests::test_remote"
+ "--skip tools::serve::tests::test_remote"
+ "--skip utils::io::data_reader_http"
+ "--skip utils::io::data_reader_http::tests::read_range_git"
+ "--skip utils::io::data_reader_http::tests::read_range_googleapis"
+ ];
+
+ meta = {
+ description = "Toolbox for converting, checking and serving map tiles in various formats";
+ longDescription = ''
+ VersaTiles is a Rust-based project designed for processing and serving tile data efficiently.
+ It supports multiple tile formats and offers various functionalities for handling tile data.
+ '';
+ homepage = "https://versatiles.org/";
+ downloadPage = "https://github.com/versatiles-org/versatiles-rs";
+ changelog = "https://github.com/versatiles-org/versatiles-rs/releases/tag/v${version}";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ wilhelmines ];
+ mainProgram = "versatiles";
+ platforms = with lib.platforms; linux ++ darwin ++ windows;
+ };
+}
diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix
index 3ded9852fff5..8f265415b300 100644
--- a/pkgs/by-name/vi/victoriametrics/package.nix
+++ b/pkgs/by-name/vi/victoriametrics/package.nix
@@ -14,13 +14,13 @@
buildGoModule rec {
pname = "VictoriaMetrics";
- version = "1.102.1";
+ version = "1.105.0";
src = fetchFromGitHub {
owner = "VictoriaMetrics";
repo = "VictoriaMetrics";
rev = "v${version}";
- hash = "sha256-FFQiHPcvB3ht6NlaUWPAuEUswXYUzeRilAw4NQ9+8/o=";
+ hash = "sha256-cMc2CVjVTQLsY/GJht35DCapEtROPJO3j6FCCDXJPMk=";
};
vendorHash = null;
diff --git a/pkgs/by-name/vi/viddy/package.nix b/pkgs/by-name/vi/viddy/package.nix
index 293990d4d545..9436e2a8d5f4 100644
--- a/pkgs/by-name/vi/viddy/package.nix
+++ b/pkgs/by-name/vi/viddy/package.nix
@@ -6,21 +6,21 @@
rustPlatform.buildRustPackage rec {
pname = "viddy";
- version = "1.1.5";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "sachaos";
repo = "viddy";
rev = "v${version}";
- hash = "sha256-RewzToI7vhaH8r6ZWDLgfSJOOCm26Udkzh9+xkJP2jE=";
+ hash = "sha256-r+zgZutBwNRLYNltdSaIB5lS4qHAhI5XL3iFF+FVd64=";
};
- cargoHash = "sha256-NhgiaUEUTfsbVqFkBgLPc3A8XmtwgQ5tp673zFD4TGI=";
+ cargoHash = "sha256-rEz3GFfqtSzZa0r4Nwbu3gEf7GhsOkfawaFaNplD/tE=";
# requires nightly features
env.RUSTC_BOOTSTRAP = 1;
- env.VERGEN_BUILD_DATE = "2024-09-30"; # managed via the update script
+ env.VERGEN_BUILD_DATE = "2024-10-13"; # managed via the update script
env.VERGEN_GIT_DESCRIBE = "Nixpkgs";
passthru.updateScript.command = [ ./update.sh ];
diff --git a/pkgs/by-name/vi/viddy/update.sh b/pkgs/by-name/vi/viddy/update.sh
index 4740effde4a2..ae1586d7e00d 100755
--- a/pkgs/by-name/vi/viddy/update.sh
+++ b/pkgs/by-name/vi/viddy/update.sh
@@ -35,10 +35,10 @@ update-source-version viddy "${latestVersion}"
pushd "$SCRIPT_DIR"
# Build date
-sed -i 's#env.VERGEN_BUILD_DATE = "[^"]*"#env.VERGEN_BUILD_DATE = "'"${latestBuildDate}"'"#' default.nix
+sed -i 's#env.VERGEN_BUILD_DATE = "[^"]*"#env.VERGEN_BUILD_DATE = "'"${latestBuildDate}"'"#' package.nix
# Hashes
# https://github.com/msteen/nix-prefetch/issues/51
cargoHash=$(nix-prefetch --option extra-experimental-features flakes "{ sha256 }: (import $NIXPKGS_DIR {}).viddy.cargoDeps.overrideAttrs (_: { outputHash = sha256; })")
-sed -i -E 's#\bcargoHash = ".*?"#cargoHash = "'"$cargoHash"'"#' default.nix
+sed -i -E 's#\bcargoHash = ".*?"#cargoHash = "'"$cargoHash"'"#' package.nix
popd
diff --git a/pkgs/by-name/wa/warp-plus/package.nix b/pkgs/by-name/wa/warp-plus/package.nix
new file mode 100644
index 000000000000..ec80044aae4f
--- /dev/null
+++ b/pkgs/by-name/wa/warp-plus/package.nix
@@ -0,0 +1,52 @@
+{
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+
+ nix-update-script,
+ testers,
+ warp-plus,
+}:
+
+buildGoModule rec {
+ pname = "warp-plus";
+ version = "1.2.4";
+
+ src = fetchFromGitHub {
+ owner = "bepass-org";
+ repo = "warp-plus";
+ rev = "v${version}";
+ hash = "sha256-fFyYch14JqXSmnplPJ8c3epOxromZmEJAdcuSgkKbcM=";
+ };
+
+ vendorHash = "sha256-/rBZqrX9xZT8yOZwynkOOQyPl0govNmvsEqWVxsuvB4=";
+
+ ldflags = [
+ "-s"
+ "-w"
+ "-X main.version=${version}"
+ ];
+
+ checkFlags =
+ let
+ # Skip tests that require network access
+ skippedTests = [
+ "TestConcurrencySafety"
+ "TestTwoDevicePing"
+ ];
+ in
+ [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
+ passthru = {
+ updateScript = nix-update-script { };
+ tests.version = testers.testVersion { package = warp-plus; };
+ };
+
+ meta = {
+ description = "Warp + Psiphon, an anti censorship utility for Iran";
+ homepage = "https://github.com/bepass-org/warp-plus";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ paveloom ];
+ mainProgram = "warp-plus";
+ };
+}
diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json
index bc420f89b33c..365b4a17878a 100644
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@@ -1,14 +1,14 @@
{
"darwin": {
- "hash": "sha256-6cPn6ukGPpEdzCcENGUT5h+UPSo8rrEZEjeLEHJTG/4=",
- "version": "0.2024.10.15.08.02.stable_03"
+ "hash": "sha256-KaHjVEdmzOw3BnFd77vTb+067IEOPIWiJmVOHQcjN6E=",
+ "version": "0.2024.10.23.14.49.stable_00"
},
"linux_x86_64": {
- "hash": "sha256-ftTBelAaGWxrOlpDGtEeNT9GjtS4XZdvzUsWxEnrGzs=",
- "version": "0.2024.10.15.08.02.stable_03"
+ "hash": "sha256-gRuA+drCQdOPJrSKky2WKxon84dxVVcfK+0GipzMBZU=",
+ "version": "0.2024.10.23.14.49.stable_00"
},
"linux_aarch64": {
- "hash": "sha256-y7oSCc+bsRj7BSF8MiYpNJ73M5xBBTIRhotHdRPsfqk=",
- "version": "0.2024.10.15.08.02.stable_03"
+ "hash": "sha256-LTpcGsQscEbxAosW68yfSb9lDyecDLdci3JzPimTYrQ=",
+ "version": "0.2024.10.23.14.49.stable_00"
}
}
diff --git a/pkgs/by-name/wa/wasm-bindgen-cli/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli/package.nix
index d9b997805440..e705a77dd134 100644
--- a/pkgs/by-name/wa/wasm-bindgen-cli/package.nix
+++ b/pkgs/by-name/wa/wasm-bindgen-cli/package.nix
@@ -9,9 +9,9 @@
stdenv,
curl,
darwin,
- version ? "0.2.93",
- hash ? "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0=",
- cargoHash ? "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ=",
+ version ? "0.2.95",
+ hash ? "sha256-prMIreQeAcbJ8/g3+pMp1Wp9H5u+xLqxRxL+34hICss=",
+ cargoHash ? "sha256-6iMebkD7FQvixlmghGGIvpdGwFNLfnUcFke/Rg8nPK4=",
}:
rustPlatform.buildRustPackage rec {
diff --git a/pkgs/by-name/wa/watchyourlan/package.nix b/pkgs/by-name/wa/watchyourlan/package.nix
new file mode 100644
index 000000000000..f7ab4f9022c6
--- /dev/null
+++ b/pkgs/by-name/wa/watchyourlan/package.nix
@@ -0,0 +1,40 @@
+{
+ buildGoModule,
+ fetchFromGitHub,
+ makeBinaryWrapper,
+ lib,
+ arp-scan,
+}:
+buildGoModule rec {
+ pname = "watchyourlan";
+ version = "2.0.4";
+
+ src = fetchFromGitHub {
+ owner = "aceberg";
+ repo = "WatchYourLAN";
+ rev = version;
+ hash = "sha256-nJYDGCkT8vCkxySLONG3OkWVkaBqXqSFgd7N1TTMAf4=";
+ };
+
+ vendorHash = "sha256-urSFoFkYllV+bsKIRV/azkbL30mbGeciYR7jy/fOE/w=";
+
+ ldflags = [
+ "-s"
+ "-w"
+ ];
+
+ nativeBuildInputs = [ makeBinaryWrapper ];
+
+ postFixup = ''
+ wrapProgram $out/bin/WatchYourLAN \
+ --prefix PATH : '${lib.makeBinPath [ arp-scan ]}'
+ '';
+
+ meta = {
+ description = "Lightweight network IP scanner with web GUI";
+ homepage = "https://github.com/aceberg/WatchYourLAN";
+ license = lib.licenses.mit;
+ mainProgram = "WatchYourLAN";
+ maintainers = [ lib.maintainers.iv-nn ];
+ };
+}
diff --git a/pkgs/by-name/wa/waybar-mpris/package.nix b/pkgs/by-name/wa/waybar-mpris/package.nix
index adbe513b9b44..93f957db33dd 100644
--- a/pkgs/by-name/wa/waybar-mpris/package.nix
+++ b/pkgs/by-name/wa/waybar-mpris/package.nix
@@ -1,12 +1,13 @@
-{ lib
-, fetchgit
-, buildGoModule
-, unstableGitUpdater
+{
+ lib,
+ fetchgit,
+ buildGoModule,
+ nix-update-script,
}:
buildGoModule {
pname = "waybar-mpris";
- version = "unstable-2022-01-27";
+ version = "0.1.0-unstable-2022-01-27";
src = fetchgit {
url = "https://git.hrfee.pw/hrfee/waybar-mpris";
@@ -21,7 +22,7 @@ buildGoModule {
"-w"
];
- passthru.updateScript = unstableGitUpdater { };
+ passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
meta = with lib; {
description = "Waybar component/utility for displaying and controlling MPRIS2 compliant media players individually";
diff --git a/pkgs/by-name/wa/waycheck/package.nix b/pkgs/by-name/wa/waycheck/package.nix
index b8dd02dabded..3480c61ad239 100644
--- a/pkgs/by-name/wa/waycheck/package.nix
+++ b/pkgs/by-name/wa/waycheck/package.nix
@@ -14,14 +14,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "waycheck";
- version = "1.3.1";
+ version = "1.4.0";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "serebit";
repo = "waycheck";
rev = "v${finalAttrs.version}";
- hash = "sha256-ZNUORCSeU+AGQoiIIfPpgW2o1ElX+j5Pcn2X/8pSpRI=";
+ hash = "sha256-wawz7QCzpeQgdxwFQaZ/yV//AepEE+FLNG7ho/lHtFE=";
};
nativeBuildInputs = [
diff --git a/pkgs/by-name/wa/wayfreeze/package.nix b/pkgs/by-name/wa/wayfreeze/package.nix
index 0f0997888d58..7a53a49f6fb7 100644
--- a/pkgs/by-name/wa/wayfreeze/package.nix
+++ b/pkgs/by-name/wa/wayfreeze/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage {
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
- cargoHash = "sha256-3OjZhWAgfmMZ0OGeRawk3KZpPqz1QCVkwsyGM+E7o88=";
+ cargoHash = "sha256-DOG/IMtHYjdzfPVyFDN20+VB4oEzdSle28F07DydETc=";
buildInputs = [
libxkbcommon
diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix
new file mode 100644
index 000000000000..6c9b99348071
--- /dev/null
+++ b/pkgs/by-name/we/wealthfolio/package.nix
@@ -0,0 +1,64 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ cargo-tauri,
+ libsoup,
+ nodejs,
+ openssl,
+ pkg-config,
+ pnpm,
+ rustPlatform,
+ webkitgtk_4_0,
+ wrapGAppsHook3,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "wealthfolio";
+ version = "1.0.18";
+
+ src = fetchFromGitHub {
+ owner = "afadil";
+ repo = "wealthfolio";
+ rev = "v${finalAttrs.version}";
+ hash = "sha256-AH0bwzsnGaGE82Ds1pDeZkVY2GXEB7RqHYw+WAt69/4=";
+ };
+
+ pnpmDeps = pnpm.fetchDeps {
+ inherit (finalAttrs) src pname version;
+ hash = "sha256-OpQg/ZZ4M2vszMZeCJAKzqGduxexZfIVe3Jy/hG3Yu0=";
+ };
+
+ cargoRoot = "src-tauri";
+ buildAndTestSubdir = finalAttrs.cargoRoot;
+
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit (finalAttrs) pname version src;
+ sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";
+ hash = "sha256-jbdshb+Kjnh/yKQlCVaYT3/RQ6Zyo2dm72EToLsbqxc=";
+ };
+
+ nativeBuildInputs = [
+ cargo-tauri.hook
+ nodejs
+ pkg-config
+ pnpm.configHook
+ rustPlatform.cargoSetupHook
+ wrapGAppsHook3
+ ];
+
+ buildInputs = [
+ libsoup
+ openssl
+ webkitgtk_4_0
+ ];
+
+ meta = {
+ description = "A Beautiful Private and Secure Desktop Investment Tracking Application";
+ homepage = "https://wealthfolio.app/";
+ license = lib.licenses.agpl3Only;
+ mainProgram = "wealthfolio";
+ maintainers = with lib.maintainers; [ kilianar ];
+ platforms = lib.platforms.linux;
+ };
+})
diff --git a/pkgs/by-name/wh/whatsie/package.nix b/pkgs/by-name/wh/whatsie/package.nix
index dde65d9f9fbc..1a54a4f142aa 100644
--- a/pkgs/by-name/wh/whatsie/package.nix
+++ b/pkgs/by-name/wh/whatsie/package.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "whatsie";
- version = "4.16.1";
+ version = "4.16.2";
src = fetchFromGitHub {
owner = "keshavbhatt";
repo = "whatsie";
rev = "refs/tags/v${finalAttrs.version}";
- hash = "sha256-9G+2yYc5Lcmw5NvLnn7jVZ4Fw79L29KbhiE2CYh6SLM=";
+ hash = "sha256-4Ur/FNg4jqtyWGB0lW4Uw2XlfMclz080LDRNO+RnkrM=";
};
sourceRoot = "${finalAttrs.src.name}/src";
diff --git a/pkgs/by-name/wi/wired/package.nix b/pkgs/by-name/wi/wired/package.nix
new file mode 100644
index 000000000000..c18c4462b16a
--- /dev/null
+++ b/pkgs/by-name/wi/wired/package.nix
@@ -0,0 +1,53 @@
+{
+ lib,
+ fetchFromGitHub,
+ rustPlatform,
+ pkg-config,
+ dbus,
+ pango,
+ cairo,
+ xorg,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "wired";
+ version = "0.10.6";
+
+ src = fetchFromGitHub {
+ owner = "Toqozz";
+ repo = "wired-notify";
+ rev = "refs/tags/${version}";
+ hash = "sha256-AWIV/+vVwDZECZ4lFMSFyuyUKJc/gb72PiBJv6lbhnc=";
+ };
+
+ cargoHash = "sha256-gIDMD1jT6Wj5FCgbPURF0aayFBOq2mrZE1GZWQ3iYAA=";
+
+ strictDeps = true;
+
+ nativeBuildInputs = [ pkg-config ];
+ buildInputs = [
+ dbus
+ pango
+ cairo
+ xorg.libXScrnSaver
+ xorg.libXcursor
+ xorg.libXrandr
+ xorg.libX11
+ xorg.libXi
+ ];
+
+ postInstall = ''
+ mkdir -p $out/usr/lib/systemd/system
+ substitute ./wired.service $out/usr/lib/systemd/system/wired.service --replace /usr/bin/wired $out/bin/wired
+ install -Dm444 -t $out/etc/wired wired.ron wired_multilayout.ron
+ '';
+
+ meta = {
+ description = "Lightweight notification daemon written in Rust";
+ homepage = "https://github.com/Toqozz/wired-notify";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ fccapria ];
+ badPlatforms = lib.platforms.darwin;
+ mainProgram = "wired";
+ };
+}
diff --git a/pkgs/by-name/wi/wiremock/package.nix b/pkgs/by-name/wi/wiremock/package.nix
index 75e4c30f64b4..615da7a45360 100644
--- a/pkgs/by-name/wi/wiremock/package.nix
+++ b/pkgs/by-name/wi/wiremock/package.nix
@@ -10,11 +10,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "wiremock";
- version = "3.9.1";
+ version = "3.9.2";
src = fetchurl {
url = "mirror://maven/org/wiremock/wiremock-standalone/${finalAttrs.version}/wiremock-standalone-${finalAttrs.version}.jar";
- hash = "sha256-cjqIDVDTsKFFrw3wfleMLLhed/6yIx5pkcmhNmkmkSw=";
+ hash = "sha256-d7iNxBwyaOPOOR8/7yIrDNBpbyhtP8NahLoi/8uHcBI=";
};
dontUnpack = true;
diff --git a/pkgs/by-name/wp/wprs/Cargo.lock b/pkgs/by-name/wp/wprs/Cargo.lock
new file mode 100644
index 000000000000..aa282b11ba34
--- /dev/null
+++ b/pkgs/by-name/wp/wprs/Cargo.lock
@@ -0,0 +1,2419 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "ahash"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
+dependencies = [
+ "getrandom",
+ "once_cell",
+ "version_check",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "anes"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
+
+[[package]]
+name = "anstyle"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+
+[[package]]
+name = "anyhow"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+
+[[package]]
+name = "appendlist"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e149dc73cd30538307e7ffa2acd3d2221148eaeed4871f246657b1c3eaa1cbd2"
+
+[[package]]
+name = "approx"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "arrayref"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "bimap"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7"
+
+[[package]]
+name = "bit-set"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
+dependencies = [
+ "bit-vec",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
+[[package]]
+name = "blake3"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "cc",
+ "cfg-if",
+ "constant_time_eq",
+]
+
+[[package]]
+name = "bpaf"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3280efcf6d66bc77c2cf9b67dc8acee47a217d9be67dd590b3230dffe663724d"
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "bytecheck"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2"
+dependencies = [
+ "bytecheck_derive",
+ "ptr_meta",
+ "simdutf8",
+]
+
+[[package]]
+name = "bytecheck_derive"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "bytemuck"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+
+[[package]]
+name = "calloop"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
+dependencies = [
+ "bitflags 2.5.0",
+ "log",
+ "polling",
+ "rustix",
+ "slab",
+ "thiserror",
+]
+
+[[package]]
+name = "calloop-wayland-source"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20"
+dependencies = [
+ "calloop",
+ "rustix",
+ "wayland-backend",
+ "wayland-client",
+]
+
+[[package]]
+name = "camino"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239"
+
+[[package]]
+name = "cast"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
+
+[[package]]
+name = "cc"
+version = "1.0.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
+dependencies = [
+ "jobserver",
+ "libc",
+ "once_cell",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "cgmath"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a98d30140e3296250832bbaaff83b27dcd6fa3cc70fb6f1f3e5c9c0023b5317"
+dependencies = [
+ "approx",
+ "num-traits",
+]
+
+[[package]]
+name = "ciborium"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
+dependencies = [
+ "ciborium-io",
+ "ciborium-ll",
+ "serde",
+]
+
+[[package]]
+name = "ciborium-io"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
+
+[[package]]
+name = "ciborium-ll"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
+dependencies = [
+ "ciborium-io",
+ "half",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
+dependencies = [
+ "clap_builder",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
+dependencies = [
+ "anstyle",
+ "clap_lex",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "constant_time_eq"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+
+[[package]]
+name = "crc32fast"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "criterion"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
+dependencies = [
+ "anes",
+ "cast",
+ "ciborium",
+ "clap",
+ "criterion-plot",
+ "is-terminal",
+ "itertools 0.10.5",
+ "num-traits",
+ "once_cell",
+ "oorandom",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "tinytemplate",
+ "walkdir",
+]
+
+[[package]]
+name = "criterion-plot"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
+dependencies = [
+ "cast",
+ "itertools 0.10.5",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "cursor-icon"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
+
+[[package]]
+name = "divbuf"
+version = "0.3.2-pre"
+source = "git+https://github.com/asomers/divbuf#6de6bc3c444e7895f6c95605466f711fe06310f4"
+
+[[package]]
+name = "dlib"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
+dependencies = [
+ "libloading",
+]
+
+[[package]]
+name = "downcast-rs"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
+
+[[package]]
+name = "drm-fourcc"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
+
+[[package]]
+name = "either"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "enum-as-inner"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "fallible-iterator"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
+
+[[package]]
+name = "fastrand"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+
+[[package]]
+name = "fdeflate"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
+dependencies = [
+ "simd-adler32",
+]
+
+[[package]]
+name = "flate2"
+version = "1.0.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
+[[package]]
+name = "generator"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "186014d53bc231d0090ef8d6f03e0920c54d85a5ed22f4f2f74315ec56cf83fb"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "libc",
+ "log",
+ "rustversion",
+ "windows",
+]
+
+[[package]]
+name = "gethostname"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
+dependencies = [
+ "libc",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "half"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+dependencies = [
+ "ahash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "home"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.5",
+]
+
+[[package]]
+name = "io-lifetimes"
+version = "2.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c"
+
+[[package]]
+name = "is-terminal"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "jobserver"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lagoon"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d646ad46f3aec5825bb57e0245ad9b9396ae2600102e23d029e5d8274c3e9ae4"
+dependencies = [
+ "crossbeam-channel",
+ "num_cpus",
+ "scopeguard",
+ "spin",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "libloading"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
+dependencies = [
+ "cfg-if",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "libm"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+
+[[package]]
+name = "loom"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca"
+dependencies = [
+ "cfg-if",
+ "generator",
+ "scoped-tls",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+
+[[package]]
+name = "memmap2"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memmap2"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "merkle_hash"
+version = "3.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fad8dc52477aa6f1751748a5ee1c6d50db7092e8dab1d687840dfa23e2ae4e5"
+dependencies = [
+ "anyhow",
+ "blake3",
+ "camino",
+ "rayon",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
+dependencies = [
+ "adler",
+ "simd-adler32",
+]
+
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags 2.5.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+ "memoffset",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+ "libm",
+]
+
+[[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 = "num_enum"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "oorandom"
+version = "11.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
+
+[[package]]
+name = "optional_struct"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6a5805fc07abb78282acc68420a70902e585f80538cc9050f20128129bc4af"
+dependencies = [
+ "optional_struct_export",
+]
+
+[[package]]
+name = "optional_struct_export"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d104275df932249fcae2db0bd2e34b8e690be925aaee5cca5251b928fe71230a"
+dependencies = [
+ "optional_struct_macro_impl",
+ "quote",
+]
+
+[[package]]
+name = "optional_struct_macro_impl"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3314c27f4503e50bd5f7632cd51fef7ac7b1a4af161db616647f190052ffd92"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.5.1",
+ "smallvec",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+
+[[package]]
+name = "plotters"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3"
+dependencies = [
+ "num-traits",
+ "plotters-backend",
+ "plotters-svg",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "plotters-backend"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7"
+
+[[package]]
+name = "plotters-svg"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705"
+dependencies = [
+ "plotters-backend",
+]
+
+[[package]]
+name = "png"
+version = "0.17.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
+dependencies = [
+ "bitflags 1.3.2",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "polling"
+version = "3.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6a007746f34ed64099e88783b0ae369eaa3da6392868ba262e2af9b8fbaea1"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi",
+ "pin-project-lite",
+ "rustix",
+ "tracing",
+ "windows-sys",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+dependencies = [
+ "toml_edit 0.21.1",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.85"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "profiling"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58"
+dependencies = [
+ "profiling-procmacros",
+]
+
+[[package]]
+name = "profiling-procmacros"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
+dependencies = [
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "proptest"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf"
+dependencies = [
+ "bit-set",
+ "bit-vec",
+ "bitflags 2.5.0",
+ "lazy_static",
+ "num-traits",
+ "rand",
+ "rand_chacha",
+ "rand_xorshift",
+ "regex-syntax 0.8.4",
+ "rusty-fork",
+ "tempfile",
+ "unarray",
+]
+
+[[package]]
+name = "ptr_meta"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1"
+dependencies = [
+ "ptr_meta_derive",
+]
+
+[[package]]
+name = "ptr_meta_derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "quick-error"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+
+[[package]]
+name = "quick-xml"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rand_xorshift"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "rayon"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+dependencies = [
+ "bitflags 2.5.0",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.4",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+
+[[package]]
+name = "rend"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c"
+dependencies = [
+ "bytecheck",
+]
+
+[[package]]
+name = "rkyv"
+version = "0.7.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0"
+dependencies = [
+ "bitvec",
+ "bytecheck",
+ "bytes",
+ "hashbrown 0.12.3",
+ "ptr_meta",
+ "rend",
+ "rkyv_derive",
+ "seahash",
+ "tinyvec",
+ "uuid",
+]
+
+[[package]]
+name = "rkyv_derive"
+version = "0.7.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ron"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
+dependencies = [
+ "base64",
+ "bitflags 2.5.0",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+dependencies = [
+ "bitflags 2.5.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+
+[[package]]
+name = "rusty-fork"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
+dependencies = [
+ "fnv",
+ "quick-error",
+ "tempfile",
+ "wait-timeout",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scan_fmt"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b53b0a5db882a8e2fdaae0a43f7b39e7e9082389e978398bdf223a55b581248"
+
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "seahash"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
+
+[[package]]
+name = "serde"
+version = "1.0.203"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.203"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.117"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "simdutf8"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "smithay"
+version = "0.3.0"
+source = "git+https://github.com/Smithay/smithay.git#6169b213fb663d85d2e139d3bbe44dfae1ec9328"
+dependencies = [
+ "appendlist",
+ "bitflags 2.5.0",
+ "calloop",
+ "cgmath",
+ "cursor-icon",
+ "downcast-rs",
+ "drm-fourcc",
+ "encoding_rs",
+ "errno",
+ "indexmap",
+ "lazy_static",
+ "libc",
+ "once_cell",
+ "profiling",
+ "rand",
+ "rustix",
+ "scan_fmt",
+ "scopeguard",
+ "smallvec",
+ "tempfile",
+ "thiserror",
+ "tracing",
+ "wayland-protocols",
+ "wayland-protocols-misc",
+ "wayland-protocols-wlr",
+ "wayland-server",
+ "x11rb",
+ "xkbcommon",
+]
+
+[[package]]
+name = "smithay-client-toolkit"
+version = "0.19.1"
+source = "git+https://github.com/Smithay/client-toolkit.git#ac2c420cae253242dc5650b7a347573e2a036c86"
+dependencies = [
+ "bitflags 2.5.0",
+ "bytemuck",
+ "calloop",
+ "calloop-wayland-source",
+ "cursor-icon",
+ "libc",
+ "log",
+ "memmap2 0.9.4",
+ "pkg-config",
+ "rustix",
+ "thiserror",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-csd-frame",
+ "wayland-cursor",
+ "wayland-protocols",
+ "wayland-protocols-wlr",
+ "wayland-scanner",
+ "xkbcommon",
+ "xkeysym",
+]
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sysctl"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec7dddc5f0fee506baf8b9fdb989e242f17e4b11c61dfbb0635b705217199eea"
+dependencies = [
+ "bitflags 2.5.0",
+ "byteorder",
+ "enum-as-inner",
+ "libc",
+ "thiserror",
+ "walkdir",
+]
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
+name = "tempfile"
+version = "3.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "rustix",
+ "windows-sys",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "tinytemplate"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "toml"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.22.14",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow 0.6.13",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "parking_lot",
+ "regex",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
+]
+
+[[package]]
+name = "tracing-tracy"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6024d04f84a69fd0d1dc1eee3a2b070bd246530a0582f9982ae487cb6c703614"
+dependencies = [
+ "tracing-core",
+ "tracing-subscriber",
+ "tracy-client",
+]
+
+[[package]]
+name = "tracy-client"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59fb931a64ff88984f86d3e9bcd1ae8843aa7fe44dd0f8097527bc172351741d"
+dependencies = [
+ "loom",
+ "once_cell",
+ "tracy-client-sys",
+]
+
+[[package]]
+name = "tracy-client-sys"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d104d610dfa9dd154535102cc9c6164ae1fa37842bc2d9e83f9ac82b0ae0882"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "trybuild"
+version = "1.0.96"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33a5f13f11071020bb12de7a16b925d2d58636175c20c11dc5f96cb64bb6c9b3"
+dependencies = [
+ "glob",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "termcolor",
+ "toml",
+]
+
+[[package]]
+name = "unarray"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "uuid"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "wait-timeout"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+
+[[package]]
+name = "wayland-backend"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07"
+dependencies = [
+ "cc",
+ "downcast-rs",
+ "rustix",
+ "scoped-tls",
+ "smallvec",
+ "wayland-sys",
+]
+
+[[package]]
+name = "wayland-client"
+version = "0.31.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133"
+dependencies = [
+ "bitflags 2.5.0",
+ "rustix",
+ "wayland-backend",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-csd-frame"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
+dependencies = [
+ "bitflags 2.5.0",
+ "cursor-icon",
+ "wayland-backend",
+]
+
+[[package]]
+name = "wayland-cursor"
+version = "0.31.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a206e8b2b53b1d3fcb9428fec72bc278ce539e2fa81fe2bfc1ab27703d5187b9"
+dependencies = [
+ "rustix",
+ "wayland-client",
+ "xcursor",
+]
+
+[[package]]
+name = "wayland-protocols"
+version = "0.32.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83d0f1056570486e26a3773ec633885124d79ae03827de05ba6c85f79904026c"
+dependencies = [
+ "bitflags 2.5.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-scanner",
+ "wayland-server",
+]
+
+[[package]]
+name = "wayland-protocols-misc"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e76311e1866c955afbbc46ae97e57542acda1dc9b0298358263a8550b5247331"
+dependencies = [
+ "bitflags 2.5.0",
+ "wayland-backend",
+ "wayland-protocols",
+ "wayland-scanner",
+ "wayland-server",
+]
+
+[[package]]
+name = "wayland-protocols-wlr"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7dab47671043d9f5397035975fe1cac639e5bca5cc0b3c32d09f01612e34d24"
+dependencies = [
+ "bitflags 2.5.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+ "wayland-server",
+]
+
+[[package]]
+name = "wayland-scanner"
+version = "0.31.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67da50b9f80159dec0ea4c11c13e24ef9e7574bd6ce24b01860a175010cea565"
+dependencies = [
+ "proc-macro2",
+ "quick-xml",
+ "quote",
+]
+
+[[package]]
+name = "wayland-server"
+version = "0.31.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63e89118bd072ba6ce0f9c2c92fa41f72d1d78a138d2abc497a80a8264565559"
+dependencies = [
+ "bitflags 2.5.0",
+ "downcast-rs",
+ "io-lifetimes",
+ "rustix",
+ "wayland-backend",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-sys"
+version = "0.31.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "105b1842da6554f91526c14a2a2172897b7f745a805d62af4ce698706be79c12"
+dependencies = [
+ "dlib",
+ "log",
+ "pkg-config",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "whoami"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9"
+dependencies = [
+ "redox_syscall 0.4.1",
+ "wasite",
+ "web-sys",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows"
+version = "0.54.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
+dependencies = [
+ "windows-core",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.54.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
+dependencies = [
+ "windows-result",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
+dependencies = [
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_msvc 0.52.5",
+ "windows_i686_gnu 0.52.5",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.5",
+ "windows_x86_64_gnu 0.52.5",
+ "windows_x86_64_gnullvm 0.52.5",
+ "windows_x86_64_msvc 0.52.5",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+
+[[package]]
+name = "winnow"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.6.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "wprs"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "arrayref",
+ "bimap",
+ "bpaf",
+ "bytemuck",
+ "criterion",
+ "crossbeam-channel",
+ "divbuf",
+ "enum-as-inner",
+ "fallible-iterator",
+ "home",
+ "itertools 0.13.0",
+ "lagoon",
+ "merkle_hash",
+ "nix",
+ "num_enum",
+ "optional_struct",
+ "png",
+ "proptest",
+ "rkyv",
+ "ron",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "smithay",
+ "smithay-client-toolkit",
+ "static_assertions",
+ "sysctl",
+ "tracing",
+ "tracing-subscriber",
+ "tracing-tracy",
+ "tracy-client",
+ "trybuild",
+ "whoami",
+ "x11rb",
+ "zstd",
+]
+
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
+[[package]]
+name = "x11rb"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12"
+dependencies = [
+ "gethostname",
+ "rustix",
+ "x11rb-protocol",
+]
+
+[[package]]
+name = "x11rb-protocol"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
+
+[[package]]
+name = "xcursor"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911"
+
+[[package]]
+name = "xkbcommon"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e"
+dependencies = [
+ "libc",
+ "memmap2 0.8.0",
+ "xkeysym",
+]
+
+[[package]]
+name = "xkeysym"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
+dependencies = [
+ "bytemuck",
+]
+
+[[package]]
+name = "zstd"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "7.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a"
+dependencies = [
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "2.0.10+zstd.1.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa"
+dependencies = [
+ "cc",
+ "pkg-config",
+]
diff --git a/pkgs/by-name/wp/wprs/package.nix b/pkgs/by-name/wp/wprs/package.nix
new file mode 100644
index 000000000000..829992ed8fbb
--- /dev/null
+++ b/pkgs/by-name/wp/wprs/package.nix
@@ -0,0 +1,57 @@
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+ pkg-config,
+ libxkbcommon,
+ python3,
+ runCommand,
+ wprs,
+}:
+rustPlatform.buildRustPackage {
+ pname = "wprs";
+ version = "0-unstable-2024-10-22";
+
+ src = fetchFromGitHub {
+ owner = "wayland-transpositor";
+ repo = "wprs";
+ rev = "6b993332c55568e66961b52bb6285e76d97d50df";
+ hash = "sha256-WrPr9b1r8As4Y5c+QCOYnHvY9x145+pL4OSmrGsYDpk=";
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ ];
+
+ buildInputs = [
+ libxkbcommon
+ (python3.withPackages (pp: with pp; [ psutil ]))
+ ];
+
+ cargoLock = {
+ lockFile = ./Cargo.lock;
+
+ outputHashes = {
+ "divbuf-0.3.2-pre" = "sha256-xV0RWT4xu/LTVUGQSrafOgJ+X7FlnH7Cz6KreKSlCjw=";
+ "smithay-0.3.0" = "sha256-lqAJACmkJ6Ap/zRGjJjwJbQOynUPPhXAApHS60jYLxo=";
+ "smithay-client-toolkit-0.19.1" = "sha256-Sw/eM5rjaKVVFaEYaYj09jsxaLZTpD2IdQGpr/o0Fpc=";
+ };
+ };
+
+ preFixup = ''
+ cp wprs "$out/bin/wprs"
+ '';
+
+ passthru.tests.sanity = runCommand "wprs-sanity" { nativeBuildInputs = [ wprs ]; } ''
+ ${wprs}/bin/wprs -h > /dev/null && touch $out
+ '';
+
+ meta = with lib; {
+ description = "rootless remote desktop access for remote Wayland";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ mksafavi ];
+ platforms = [ "x86_64-linux" ]; # The aarch64-linux support is not implemented in upstream yet. Also, the darwin platform is not supported as it requires wayland.
+ homepage = "https://github.com/wayland-transpositor/wprs";
+ mainProgram = "wprs";
+ };
+}
diff --git a/pkgs/by-name/ws/wstunnel/Cargo.lock b/pkgs/by-name/ws/wstunnel/Cargo.lock
index 23168aeacee7..7339e0e99303 100644
--- a/pkgs/by-name/ws/wstunnel/Cargo.lock
+++ b/pkgs/by-name/ws/wstunnel/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
[[package]]
name = "addr2line"
-version = "0.24.1"
+version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
dependencies = [
"gimli",
]
@@ -109,6 +109,12 @@ version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+[[package]]
+name = "arc-swap"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+
[[package]]
name = "asn1-rs"
version = "0.6.2"
@@ -185,9 +191,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "aws-lc-rs"
-version = "1.9.0"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f95446d919226d587817a7d21379e6eb099b97b45110a7f272a444ca5c54070"
+checksum = "cdd82dba44d209fddb11c190e0a94b78651f95299598e472215667417a03ff1d"
dependencies = [
"aws-lc-sys",
"mirai-annotations",
@@ -198,9 +204,9 @@ dependencies = [
[[package]]
name = "aws-lc-sys"
-version = "0.21.2"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3ddc4a5b231dd6958b140ff3151b6412b3f4321fab354f399eec8f14b06df62"
+checksum = "df7a4168111d7eb622a31b214057b8509c0a7e1794f44c546d742330dc793972"
dependencies = [
"bindgen",
"cc",
@@ -252,9 +258,9 @@ dependencies = [
[[package]]
name = "bindgen"
-version = "0.69.4"
+version = "0.69.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
dependencies = [
"bitflags 2.6.0",
"cexpr",
@@ -316,7 +322,7 @@ dependencies = [
"hyperlocal",
"log",
"pin-project-lite",
- "rustls 0.23.13",
+ "rustls 0.23.14",
"rustls-native-certs 0.7.3",
"rustls-pemfile 2.2.0",
"rustls-pki-types",
@@ -364,9 +370,9 @@ checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
[[package]]
name = "cc"
-version = "1.1.24"
+version = "1.1.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938"
+checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945"
dependencies = [
"jobserver",
"libc",
@@ -420,9 +426,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.5.19"
+version = "4.5.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
dependencies = [
"clap_builder",
"clap_derive",
@@ -430,9 +436,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.19"
+version = "4.5.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
dependencies = [
"anstream",
"anstyle",
@@ -803,9 +809,9 @@ dependencies = [
[[package]]
name = "futures"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
dependencies = [
"futures-channel",
"futures-core",
@@ -818,9 +824,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
dependencies = [
"futures-core",
"futures-sink",
@@ -828,15 +834,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
[[package]]
name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
dependencies = [
"futures-core",
"futures-task",
@@ -845,15 +851,15 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
[[package]]
name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
@@ -862,21 +868,21 @@ dependencies = [
[[package]]
name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
[[package]]
name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
[[package]]
name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
dependencies = [
"futures-channel",
"futures-core",
@@ -915,9 +921,9 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.31.0"
+version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
[[package]]
name = "glob"
@@ -1171,7 +1177,7 @@ dependencies = [
"http 1.1.0",
"hyper",
"hyper-util",
- "rustls 0.23.13",
+ "rustls 0.23.14",
"rustls-pki-types",
"tokio",
"tokio-rustls 0.26.0",
@@ -1317,9 +1323,9 @@ dependencies = [
[[package]]
name = "ipnet"
-version = "2.10.0"
+version = "2.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
dependencies = [
"serde",
]
@@ -1356,9 +1362,9 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.70"
+version = "0.3.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
dependencies = [
"wasm-bindgen",
]
@@ -1645,9 +1651,9 @@ dependencies = [
[[package]]
name = "object"
-version = "0.36.4"
+version = "0.36.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
dependencies = [
"memchr",
]
@@ -1663,12 +1669,9 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.20.1"
+version = "1.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
-dependencies = [
- "portable-atomic",
-]
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
[[package]]
name = "openssl-probe"
@@ -1750,18 +1753,18 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]]
name = "pin-project"
-version = "1.1.5"
+version = "1.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8"
dependencies = [
"proc-macro2",
"quote",
@@ -1780,12 +1783,6 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-[[package]]
-name = "portable-atomic"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
-
[[package]]
name = "powerfmt"
version = "0.2.0"
@@ -1822,9 +1819,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
dependencies = [
"unicode-ident",
]
@@ -2022,9 +2019,9 @@ dependencies = [
[[package]]
name = "rustls"
-version = "0.23.13"
+version = "0.23.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
+checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8"
dependencies = [
"aws-lc-rs",
"log",
@@ -2137,9 +2134,9 @@ dependencies = [
[[package]]
name = "schannel"
-version = "0.1.24"
+version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
dependencies = [
"windows-sys 0.59.0",
]
@@ -2250,9 +2247,9 @@ dependencies = [
[[package]]
name = "serde_with"
-version = "3.10.0"
+version = "3.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9720086b3357bcb44fce40117d769a4d068c70ecfa190850a980a71755f66fcc"
+checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817"
dependencies = [
"base64 0.22.1",
"chrono",
@@ -2268,9 +2265,9 @@ dependencies = [
[[package]]
name = "serde_with_macros"
-version = "3.10.0"
+version = "3.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f1abbfe725f27678f4663bcacb75a83e829fd464c25d78dd038a3a29e307cec"
+checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d"
dependencies = [
"darling",
"proc-macro2",
@@ -2603,7 +2600,7 @@ version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
dependencies = [
- "rustls 0.23.13",
+ "rustls 0.23.14",
"rustls-pki-types",
"tokio",
]
@@ -2846,9 +2843,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
dependencies = [
"cfg-if",
"once_cell",
@@ -2857,9 +2854,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
dependencies = [
"bumpalo",
"log",
@@ -2872,9 +2869,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -2882,9 +2879,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
dependencies = [
"proc-macro2",
"quote",
@@ -2895,9 +2892,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
[[package]]
name = "which"
@@ -3117,10 +3114,11 @@ dependencies = [
[[package]]
name = "wstunnel"
-version = "10.1.3"
+version = "10.1.5"
dependencies = [
"ahash",
"anyhow",
+ "arc-swap",
"async-channel",
"async-trait",
"base64 0.22.1",
diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix
index 1ea48259ebce..b2b5e42062dc 100644
--- a/pkgs/by-name/ws/wstunnel/package.nix
+++ b/pkgs/by-name/ws/wstunnel/package.nix
@@ -10,7 +10,7 @@
}:
let
- version = "10.1.3";
+ version = "10.1.5";
in
rustPlatform.buildRustPackage {
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
owner = "erebe";
repo = "wstunnel";
rev = "v${version}";
- hash = "sha256-mrCDx9f+EeA6McRc1s9YwYL4RHKSla10fxXZc1WYPio=";
+ hash = "sha256-MomT9iwIsdou7lIfI7zBU9nEjjYGcsHKTlrYbK4p3BQ=";
};
cargoLock = {
@@ -57,6 +57,7 @@ rustPlatform.buildRustPackage {
changelog = "https://github.com/erebe/wstunnel/releases/tag/v${version}";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [
+ raylas
rvdp
neverbehave
];
diff --git a/pkgs/by-name/x4/x4/package.nix b/pkgs/by-name/x4/x4/package.nix
new file mode 100644
index 000000000000..d0c153b4c5a2
--- /dev/null
+++ b/pkgs/by-name/x4/x4/package.nix
@@ -0,0 +1,50 @@
+{
+ lib,
+ rustPlatform,
+ fetchFromGitHub,
+ pkg-config,
+ openssl,
+ zlib,
+ stdenv,
+ darwin,
+}:
+
+rustPlatform.buildRustPackage rec {
+ pname = "x4";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "pwnwriter";
+ repo = "x4";
+ rev = "v${version}";
+ hash = "sha256-IF+8lu56fzYM79p7MiNpVLFIs2GKPlzw5pNXD/hT6BM=";
+ };
+
+ cargoHash = "sha256-p3iMqnRW/quk2AHr2nLgOTvtshZ+xo6DGvWDsDj+bvU=";
+
+ nativeBuildInputs = [
+ pkg-config
+ ];
+
+ buildInputs =
+ [
+ openssl
+ zlib
+ ]
+ ++ lib.optionals stdenv.isDarwin [
+ darwin.apple_sdk.frameworks.Security
+ ];
+
+ env = {
+ OPENSSL_NO_VENDOR = true;
+ };
+
+ meta = {
+ description = "Execute shell commands to server(s) via ssh protocol";
+ homepage = "https://github.com/pwnwriter/x4";
+ changelog = "https://github.com/pwnwriter/x4/blob/${src.rev}/CHANGELOG.md";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ pwnwriter ];
+ mainProgram = "x4";
+ };
+}
diff --git a/pkgs/by-name/xf/xfs-undelete/package.nix b/pkgs/by-name/xf/xfs-undelete/package.nix
index 390a19d1f06c..030f3324fc59 100644
--- a/pkgs/by-name/xf/xfs-undelete/package.nix
+++ b/pkgs/by-name/xf/xfs-undelete/package.nix
@@ -4,7 +4,7 @@
, makeWrapper
, coreutils
, tcl-8_6
-, tcllib
+, tclPackages
, installShellFiles
}:
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
hash = "sha256-ENa/r3+o7abW8iun6V/2LhTVmFVSwVM6v46KXBcKJ1g=";
};
- buildInputs = [ tcl-8_6 tcllib coreutils ];
+ buildInputs = [ tcl-8_6 tclPackages.tcllib coreutils ];
nativeBuildInputs = [ makeWrapper tcl-8_6.tclPackageHook installShellFiles ];
tclWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath [ tcl-8_6 ]) ];
diff --git a/pkgs/by-name/xo/xortool/package.nix b/pkgs/by-name/xo/xortool/package.nix
new file mode 100644
index 000000000000..a59eb77d8cf2
--- /dev/null
+++ b/pkgs/by-name/xo/xortool/package.nix
@@ -0,0 +1,38 @@
+{
+ lib,
+ fetchFromGitHub,
+ python3Packages,
+}:
+
+python3Packages.buildPythonApplication rec {
+ pname = "xortool";
+ version = "1.0.0";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "hellman";
+ repo = "xortool";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-xxaWhGUh/r34eS2TJt8c3Q795OsZOoQLXQllJGJTjqY=";
+ };
+
+ build-system = with python3Packages; [ poetry-core ];
+
+ dependencies = with python3Packages; [
+ docopt
+ importlib-metadata
+ ];
+
+ # Project has no tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "xortool" ];
+
+ meta = with lib; {
+ description = "Tool to analyze multi-byte XOR cipher";
+ homepage = "https://github.com/hellman/xortool";
+ changelog = "https://github.com/hellman/xortool/releases/tag/v${version}";
+ license = licenses.mit;
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/applications/graphics/xrgears/default.nix b/pkgs/by-name/xr/xrgears/package.nix
similarity index 50%
rename from pkgs/applications/graphics/xrgears/default.nix
rename to pkgs/by-name/xr/xrgears/package.nix
index cdb0977b4e97..82a801a54be0 100644
--- a/pkgs/applications/graphics/xrgears/default.nix
+++ b/pkgs/by-name/xr/xrgears/package.nix
@@ -1,30 +1,33 @@
-{ lib, stdenv
-, fetchFromGitLab
-, glm
-, glslang
-, meson
-, ninja
-, openxr-loader
-, pkg-config
-, vulkan-headers
-, vulkan-loader
-, xxd
-, SDL2
-, makeWrapper
-, libGL
-, glib
+{
+ SDL2,
+ fetchFromGitLab,
+ glib,
+ glm,
+ glslang,
+ lib,
+ libGL,
+ makeWrapper,
+ meson,
+ ninja,
+ openxr-loader,
+ pkg-config,
+ stdenv,
+ unstableGitUpdater,
+ vulkan-headers,
+ vulkan-loader,
+ xxd,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
pname = "xrgears";
- version = "unstable-2021-06-19";
+ version = "1.0.1-unstable-2024-07-09";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "monado";
repo = "demos/xrgears";
- rev = "6331b98e065494995c9cc4b48ccdd9d5ccaef461";
- sha256 = "sha256-buw2beTPIWScq+3VQjUyF+uOwS6VF+mnAPHZ2eFGZjc=";
+ rev = "9cabbd34b1f60f27402a9a50fc260f77a41b835b";
+ sha256 = "sha256-9VV1zAOZKkl1zzjnsQQQOINi+T+wpbltdWpJ/d66+cM=";
};
nativeBuildInputs = [
@@ -46,15 +49,25 @@ stdenv.mkDerivation rec {
fixupPhase = ''
wrapProgram $out/bin/xrgears \
- --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ SDL2 libGL ]}
+ --prefix LD_LIBRARY_PATH : ${
+ lib.makeLibraryPath [
+ SDL2
+ libGL
+ ]
+ }
'';
+ passthru.updateScript = unstableGitUpdater { };
+
meta = with lib; {
homepage = "https://gitlab.freedesktop.org/monado/demos/xrgears";
description = "OpenXR example using Vulkan for rendering";
mainProgram = "xrgears";
platforms = platforms.linux;
license = licenses.mit;
- maintainers = with maintainers; [ expipiplus1 ];
+ maintainers = with maintainers; [
+ expipiplus1
+ Scrumplex
+ ];
};
}
diff --git a/pkgs/tools/networking/xrootd/fetchxrd.nix b/pkgs/by-name/xr/xrootd/fetchxrd.nix
similarity index 100%
rename from pkgs/tools/networking/xrootd/fetchxrd.nix
rename to pkgs/by-name/xr/xrootd/fetchxrd.nix
diff --git a/pkgs/by-name/xr/xrootd/package.nix b/pkgs/by-name/xr/xrootd/package.nix
new file mode 100644
index 000000000000..2860c1198538
--- /dev/null
+++ b/pkgs/by-name/xr/xrootd/package.nix
@@ -0,0 +1,163 @@
+{
+ lib,
+ stdenv,
+ callPackage,
+ fetchFromGitHub,
+ davix,
+ cmake,
+ gtest,
+ makeWrapper,
+ pkg-config,
+ curl,
+ isa-l,
+ fuse,
+ libkrb5,
+ libuuid,
+ libxcrypt,
+ libxml2,
+ openssl,
+ readline,
+ scitokens-cpp,
+ systemd,
+ voms,
+ zlib,
+ # If not null, move the default configuration files to "$etc/etc" and look for the configuration
+ # directory at externalEtc.
+ # Otherwise, the program will look for the configuration files under $out/etc."
+ externalEtc ? "/etc",
+ removeReferencesTo,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+ pname = "xrootd";
+ version = "5.7.1";
+
+ src = fetchFromGitHub {
+ owner = "xrootd";
+ repo = "xrootd";
+ rev = "refs/tags/v${finalAttrs.version}";
+ fetchSubmodules = true;
+ hash = "sha256-ZU31nsQgs+Gz9mV8LVv4utJ7g8TXN5OxHjNDfQlt38M=";
+ };
+
+ postPatch =
+ ''
+ patchShebangs genversion.sh
+ substituteInPlace cmake/XRootDConfig.cmake.in \
+ --replace-fail "@PACKAGE_CMAKE_INSTALL_" "@CMAKE_INSTALL_FULL_"
+ ''
+ + lib.optionalString stdenv.hostPlatform.isDarwin ''
+ sed -i cmake/XRootDOSDefs.cmake -e '/set( MacOSX TRUE )/ainclude( GNUInstallDirs )'
+ '';
+
+ outputs = [
+ "bin"
+ "out"
+ "dev"
+ "man"
+ ] ++ lib.optional (externalEtc != null) "etc";
+
+ nativeBuildInputs = [
+ cmake
+ makeWrapper
+ pkg-config
+ removeReferencesTo
+ ];
+
+ buildInputs =
+ [
+ davix
+ curl
+ isa-l
+ libkrb5
+ libuuid
+ libxcrypt
+ libxml2
+ openssl
+ readline
+ scitokens-cpp
+ zlib
+ ]
+ ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+ # https://github.com/xrootd/xrootd/blob/5b5a1f6957def2816b77ec773c7e1bfb3f1cfc5b/cmake/XRootDFindLibs.cmake#L58
+ fuse
+ ]
+ ++ lib.filter (lib.meta.availableOn stdenv.hostPlatform) [
+ systemd # only available on specific non-static Linux platforms
+ voms # only available on Linux due to gsoap failing to build on Darwin
+ ];
+
+ # https://github.com/xrootd/xrootd/blob/master/packaging/rhel/xrootd.spec.in#L665-L675=
+ postInstall =
+ ''
+ mkdir -p "$out/lib/tmpfiles.d"
+ install -m 644 -T ../packaging/rhel/xrootd.tmpfiles "$out/lib/tmpfiles.d/xrootd.conf"
+ mkdir -p "$out/etc/xrootd"
+ install -m 644 -t "$out/etc/xrootd" ../packaging/common/*.cfg
+ install -m 644 -t "$out/etc/xrootd" ../packaging/common/client.conf
+ mkdir -p "$out/etc/xrootd/client.plugins.d"
+ install -m 644 -t "$out/etc/xrootd/client.plugins.d" ../packaging/common/client-plugin.conf.example
+ mkdir -p "$out/etc/logrotate.d"
+ install -m 644 -T ../packaging/common/xrootd.logrotate "$out/etc/logrotate.d/xrootd"
+ ''
+ # Leaving those in bin/ leads to a cyclic reference between $dev and $bin
+ # This happens since https://github.com/xrootd/xrootd/commit/fe268eb622e2192d54a4230cea54c41660bd5788
+ # So far, this xrootd-config script does not seem necessary in $bin
+ + ''
+ moveToOutput "bin/xrootd-config" "$dev"
+ moveToOutput "bin/.xrootd-config-wrapped" "$dev"
+ ''
+ + lib.optionalString stdenv.hostPlatform.isLinux ''
+ mkdir -p "$out/lib/systemd/system"
+ install -m 644 -t "$out/lib/systemd/system" ../packaging/common/*.service ../packaging/common/*.socket
+ '';
+
+ cmakeFlags = [
+ (lib.cmakeFeature "XRootD_VERSION_STRING" finalAttrs.version)
+ (lib.cmakeBool "FORCE_ENABLED" true)
+ (lib.cmakeBool "ENABLE_DAVIX" true)
+ (lib.cmakeBool "ENABLE_FUSE" (!stdenv.hostPlatform.isDarwin)) # XRootD doesn't support MacFUSE
+ (lib.cmakeBool "ENABLE_MACAROONS" false)
+ (lib.cmakeBool "ENABLE_PYTHON" false) # built separately
+ (lib.cmakeBool "ENABLE_SCITOKENS" true)
+ (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
+ (lib.cmakeBool "ENABLE_VOMS" stdenv.hostPlatform.isLinux)
+ ];
+
+ # TODO(@ShamrockLee): Enable the checks.
+ doCheck = false;
+ checkInputs = [ gtest ];
+
+ postFixup = lib.optionalString (externalEtc != null) ''
+ moveToOutput etc "$etc"
+ ln -s ${lib.escapeShellArg externalEtc} "$out/etc"
+ '';
+
+ dontPatchELF = true; # shrinking rpath will cause runtime failures in dlopen
+
+ passthru = {
+ fetchxrd = callPackage ./fetchxrd.nix { xrootd = finalAttrs.finalPackage; };
+ tests = {
+ test-xrdcp = finalAttrs.passthru.fetchxrd {
+ pname = "xrootd-test-xrdcp";
+ # Use the the bin output hash of xrootd as version to ensure that
+ # the test gets rebuild everytime xrootd gets rebuild
+ version =
+ finalAttrs.version
+ + "-"
+ + builtins.substring (builtins.stringLength builtins.storeDir + 1) 32 "${finalAttrs.finalPackage}";
+ url = "root://eospublic.cern.ch//eos/opendata/alice/2010/LHC10h/000138275/ESD/0000/AliESDs.root";
+ hash = "sha256-tIcs2oi+8u/Qr+P7AAaPTbQT+DEt26gEdc4VNerlEHY=";
+ };
+ };
+ };
+
+ meta = {
+ description = "High performance, scalable fault tolerant data access";
+ homepage = "https://xrootd.slac.stanford.edu";
+ changelog = "https://github.com/xrootd/xrootd/releases/tag/v${finalAttrs.version}";
+ license = lib.licenses.lgpl3Plus;
+ platforms = lib.platforms.all;
+ maintainers = with lib.maintainers; [ ShamrockLee ];
+ };
+})
diff --git a/pkgs/applications/science/electronics/xschem/default.nix b/pkgs/by-name/xs/xschem/package.nix
similarity index 92%
rename from pkgs/applications/science/electronics/xschem/default.nix
rename to pkgs/by-name/xs/xschem/package.nix
index 72f4687f5c85..c5146b61011a 100644
--- a/pkgs/applications/science/electronics/xschem/default.nix
+++ b/pkgs/by-name/xs/xschem/package.nix
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "xschem";
- version = "3.4.4";
+ version = "3.4.5";
src = fetchFromGitHub {
owner = "StefanSchippers";
repo = "xschem";
rev = version;
- sha256 = "sha256-1jP1SJeq23XNkOQgcl2X+rBrlka4a04irmfhoKRM1j4=";
+ hash = "sha256-+ygwHkQOXmkoNgcuofwuaZcpYTAV6sOmvO4xeE+8DXE=";
};
nativeBuildInputs = [ bison flex pkg-config ];
diff --git a/pkgs/by-name/ya/yabai/package.nix b/pkgs/by-name/ya/yabai/package.nix
index 22f21c191000..53834f3cd739 100644
--- a/pkgs/by-name/ya/yabai/package.nix
+++ b/pkgs/by-name/ya/yabai/package.nix
@@ -27,7 +27,7 @@ let
in
stdenv'.mkDerivation (finalAttrs: {
pname = "yabai";
- version = "7.1.3";
+ version = "7.1.4";
src =
finalAttrs.passthru.sources.${stdenv.hostPlatform.system}
@@ -96,13 +96,13 @@ stdenv'.mkDerivation (finalAttrs: {
# See the comments on https://github.com/NixOS/nixpkgs/pull/188322 for more information.
"aarch64-darwin" = fetchzip {
url = "https://github.com/koekeishiya/yabai/releases/download/v${finalAttrs.version}/yabai-v${finalAttrs.version}.tar.gz";
- hash = "sha256-wp5B24DYX1RYHS/3+4WRRCzVE6FyCzatJDpzJWrEIpQ=";
+ hash = "sha256-DAHZwEhPIBIfR2V+jTKje1msB8OMKzwGYgYnDql8zb0=";
};
"x86_64-darwin" = fetchFromGitHub {
owner = "koekeishiya";
repo = "yabai";
rev = "v${finalAttrs.version}";
- hash = "sha256-hCwI6ziUR4yuJOv4MQXh3ufbausaDrG8XfjR+jIOeC4=";
+ hash = "sha256-i/UqmBNTLBYY4ORI1Y7FWr+LZK0f/qMdWLPPuTb9+2w=";
};
};
diff --git a/pkgs/by-name/ya/yafc-ce/deps.nix b/pkgs/by-name/ya/yafc-ce/deps.nix
new file mode 100644
index 000000000000..529913f5a3be
--- /dev/null
+++ b/pkgs/by-name/ya/yafc-ce/deps.nix
@@ -0,0 +1,696 @@
+# This file was automatically generated by passthru.fetch-deps.
+# Please dont edit it manually, your changes might get overwritten!
+
+{ fetchNuGet }:
+[
+ (fetchNuGet {
+ pname = "Google.OrTools";
+ version = "9.10.4067";
+ hash = "sha256-3iWcH1uKVOxrD6bL27TMVVNj5JX1fjdZ89d3Ddy8Fg0=";
+ })
+ (fetchNuGet {
+ pname = "Google.OrTools.runtime.linux-arm64";
+ version = "9.10.4067";
+ hash = "sha256-6OE7+DFbLUqBKmw1t2wli//Y+EAy6o67jFtW2lhS0Hw=";
+ })
+ (fetchNuGet {
+ pname = "Google.OrTools.runtime.linux-x64";
+ version = "9.10.4067";
+ hash = "sha256-vd5XqXkOlO8nik5od56x4tncUVJmqamU0CC2DVbEEvY=";
+ })
+ (fetchNuGet {
+ pname = "Google.OrTools.runtime.osx-arm64";
+ version = "9.10.4067";
+ hash = "sha256-2eJVMi51PVat/CrQiW5BailiJQsvKk+ivpAu46S4lHE=";
+ })
+ (fetchNuGet {
+ pname = "Google.OrTools.runtime.osx-x64";
+ version = "9.10.4067";
+ hash = "sha256-3o0Feg/t70gUmH5lAZzt+dClJkjzuz1e2Q/m8kjAhUo=";
+ })
+ (fetchNuGet {
+ pname = "Google.OrTools.runtime.win-x64";
+ version = "9.10.4067";
+ hash = "sha256-7uLHbUEHu9BsC14FXikiApnruLZnMavyFPD+jSAU3XY=";
+ })
+ (fetchNuGet {
+ pname = "Google.Protobuf";
+ version = "3.26.1";
+ hash = "sha256-1tHxDuJwwvJWZ3H9ooPFAKuaJIthSdTDlmjHlxH/euc=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
+ version = "8.0.10";
+ hash = "sha256-GL7OjLalZPKLsoheVJAmVStJFpJ7zTDJtikCP7fB3jU=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
+ version = "8.0.10";
+ hash = "sha256-u6/4q54irXtyKSSi1bH6HYrvcod7yfs5YdYD0NXeYbs=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.CodeCoverage";
+ version = "17.4.0";
+ hash = "sha256-YDALPHtbD+zMN+Llm0aKSG1rp5adKZl7R14h8vdLlZ4=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.NET.Test.Sdk";
+ version = "17.4.0";
+ hash = "sha256-jXKJwOZBy4NJtWwPRjw5wLmNGJD6Wr+YYCokIOIXONA=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.NETCore.App.Host.osx-arm64";
+ version = "8.0.10";
+ hash = "sha256-IZ59kjeU/mGHBVXtOO5AFK0ocxwFAkFqwtn99N+l0zw=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.NETCore.App.Host.osx-x64";
+ version = "8.0.10";
+ hash = "sha256-B4aqUvMpyewAwquTRVh+bs2RG875ZsveYQU89+4VFxw=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
+ version = "8.0.10";
+ hash = "sha256-0fH2KlzVL5ydblrVtBtAoHa5kNYY92Wzv8FCVqav3Mw=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.NETCore.App.Runtime.osx-x64";
+ version = "8.0.10";
+ hash = "sha256-XKUQ0DDWWbZNtgGPKhdI7ufpd9Ki1EcOcK9ojiaWEVM=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.NETCore.Platforms";
+ version = "1.1.0";
+ hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.NETCore.Targets";
+ version = "1.1.0";
+ hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.TestPlatform.ObjectModel";
+ version = "17.4.0";
+ hash = "sha256-SyCFW5vyzm4/YSKogIhmYYUvWdS2pPRur17JMxMOiDY=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.TestPlatform.TestHost";
+ version = "17.4.0";
+ hash = "sha256-xPsmpE7pSfZonzvtMaJtVMCeszBqUPGzTWWSYpt65sY=";
+ })
+ (fetchNuGet {
+ pname = "Microsoft.Win32.Primitives";
+ version = "4.3.0";
+ hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=";
+ })
+ (fetchNuGet {
+ pname = "NETStandard.Library";
+ version = "1.6.1";
+ hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw=";
+ })
+ (fetchNuGet {
+ pname = "Newtonsoft.Json";
+ version = "13.0.1";
+ hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=";
+ })
+ (fetchNuGet {
+ pname = "Newtonsoft.Json";
+ version = "13.0.3";
+ hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=";
+ })
+ (fetchNuGet {
+ pname = "NuGet.Frameworks";
+ version = "5.11.0";
+ hash = "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM=";
+ })
+ (fetchNuGet {
+ pname = "runtime.any.System.Collections";
+ version = "4.3.0";
+ hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=";
+ })
+ (fetchNuGet {
+ pname = "runtime.any.System.Diagnostics.Tools";
+ version = "4.3.0";
+ hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=";
+ })
+ (fetchNuGet {
+ pname = "runtime.any.System.Diagnostics.Tracing";
+ version = "4.3.0";
+ hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=";
+ })
+ (fetchNuGet {
+ pname = "runtime.any.System.Globalization";
+ version = "4.3.0";
+ hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=";
+ })
+ (fetchNuGet {
+ pname = "runtime.any.System.Globalization.Calendars";
+ version = "4.3.0";
+ hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=";
+ })
+ (fetchNuGet {
+ pname = "runtime.any.System.IO";
+ version = "4.3.0";
+ hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=";
+ })
+ (fetchNuGet {
+ pname = "runtime.any.System.Reflection";
+ version = "4.3.0";
+ hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=";
+ })
+ (fetchNuGet {
+ pname = "runtime.any.System.Reflection.Extensions";
+ version = "4.3.0";
+ hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=";
+ })
+ (fetchNuGet {
+ pname = "runtime.any.System.Reflection.Primitives";
+ version = "4.3.0";
+ hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=";
+ })
+ (fetchNuGet {
+ pname = "runtime.any.System.Resources.ResourceManager";
+ version = "4.3.0";
+ hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=";
+ })
+ (fetchNuGet {
+ pname = "runtime.any.System.Runtime";
+ version = "4.3.0";
+ hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=";
+ })
+ (fetchNuGet {
+ pname = "runtime.any.System.Runtime.Handles";
+ version = "4.3.0";
+ hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=";
+ })
+ (fetchNuGet {
+ pname = "runtime.any.System.Runtime.InteropServices";
+ version = "4.3.0";
+ hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=";
+ })
+ (fetchNuGet {
+ pname = "runtime.any.System.Text.Encoding";
+ version = "4.3.0";
+ hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=";
+ })
+ (fetchNuGet {
+ pname = "runtime.any.System.Text.Encoding.Extensions";
+ version = "4.3.0";
+ hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=";
+ })
+ (fetchNuGet {
+ pname = "runtime.any.System.Threading.Tasks";
+ version = "4.3.0";
+ hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=";
+ })
+ (fetchNuGet {
+ pname = "runtime.any.System.Threading.Timer";
+ version = "4.3.0";
+ hash = "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=";
+ })
+ (fetchNuGet {
+ pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl";
+ version = "4.3.0";
+ hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=";
+ })
+ (fetchNuGet {
+ pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl";
+ version = "4.3.0";
+ hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=";
+ })
+ (fetchNuGet {
+ pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl";
+ version = "4.3.0";
+ hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=";
+ })
+ (fetchNuGet {
+ pname = "runtime.native.System";
+ version = "4.3.0";
+ hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=";
+ })
+ (fetchNuGet {
+ pname = "runtime.native.System.IO.Compression";
+ version = "4.3.0";
+ hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=";
+ })
+ (fetchNuGet {
+ pname = "runtime.native.System.Net.Http";
+ version = "4.3.0";
+ hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=";
+ })
+ (fetchNuGet {
+ pname = "runtime.native.System.Security.Cryptography.Apple";
+ version = "4.3.0";
+ hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=";
+ })
+ (fetchNuGet {
+ pname = "runtime.native.System.Security.Cryptography.OpenSsl";
+ version = "4.3.0";
+ hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=";
+ })
+ (fetchNuGet {
+ pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl";
+ version = "4.3.0";
+ hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=";
+ })
+ (fetchNuGet {
+ pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl";
+ version = "4.3.0";
+ hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=";
+ })
+ (fetchNuGet {
+ pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple";
+ version = "4.3.0";
+ hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=";
+ })
+ (fetchNuGet {
+ pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl";
+ version = "4.3.0";
+ hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=";
+ })
+ (fetchNuGet {
+ pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl";
+ version = "4.3.0";
+ hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=";
+ })
+ (fetchNuGet {
+ pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl";
+ version = "4.3.0";
+ hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=";
+ })
+ (fetchNuGet {
+ pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl";
+ version = "4.3.0";
+ hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=";
+ })
+ (fetchNuGet {
+ pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl";
+ version = "4.3.0";
+ hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=";
+ })
+ (fetchNuGet {
+ pname = "runtime.unix.Microsoft.Win32.Primitives";
+ version = "4.3.0";
+ hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=";
+ })
+ (fetchNuGet {
+ pname = "runtime.unix.System.Console";
+ version = "4.3.0";
+ hash = "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=";
+ })
+ (fetchNuGet {
+ pname = "runtime.unix.System.Diagnostics.Debug";
+ version = "4.3.0";
+ hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=";
+ })
+ (fetchNuGet {
+ pname = "runtime.unix.System.IO.FileSystem";
+ version = "4.3.0";
+ hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=";
+ })
+ (fetchNuGet {
+ pname = "runtime.unix.System.Net.Primitives";
+ version = "4.3.0";
+ hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=";
+ })
+ (fetchNuGet {
+ pname = "runtime.unix.System.Net.Sockets";
+ version = "4.3.0";
+ hash = "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=";
+ })
+ (fetchNuGet {
+ pname = "runtime.unix.System.Private.Uri";
+ version = "4.3.0";
+ hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=";
+ })
+ (fetchNuGet {
+ pname = "runtime.unix.System.Runtime.Extensions";
+ version = "4.3.0";
+ hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=";
+ })
+ (fetchNuGet {
+ pname = "SDL2-CS.NetCore";
+ version = "2.0.8";
+ hash = "sha256-8uz6Y2G9fLQkjs+7t7QPdUJFXs9bKAYeoGP+174OE/k=";
+ })
+ (fetchNuGet {
+ pname = "Serilog";
+ version = "4.0.0";
+ hash = "sha256-j8hQ5TdL1TjfdGiBO9PyHJFMMPvATHWN1dtrrUZZlNw=";
+ })
+ (fetchNuGet {
+ pname = "Serilog.Enrichers.Thread";
+ version = "4.0.0";
+ hash = "sha256-lo+3ohNHKe/hTq9vGbk29p/OWcNlcyJToGL6EpCJQm8=";
+ })
+ (fetchNuGet {
+ pname = "Serilog.Sinks.Console";
+ version = "6.0.0";
+ hash = "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro=";
+ })
+ (fetchNuGet {
+ pname = "Serilog.Sinks.File";
+ version = "6.0.0";
+ hash = "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow=";
+ })
+ (fetchNuGet {
+ pname = "System.AppContext";
+ version = "4.3.0";
+ hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=";
+ })
+ (fetchNuGet {
+ pname = "System.Buffers";
+ version = "4.3.0";
+ hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=";
+ })
+ (fetchNuGet {
+ pname = "System.Collections";
+ version = "4.3.0";
+ hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=";
+ })
+ (fetchNuGet {
+ pname = "System.Collections.Concurrent";
+ version = "4.3.0";
+ hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=";
+ })
+ (fetchNuGet {
+ pname = "System.Console";
+ version = "4.3.0";
+ hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=";
+ })
+ (fetchNuGet {
+ pname = "System.Diagnostics.Debug";
+ version = "4.3.0";
+ hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=";
+ })
+ (fetchNuGet {
+ pname = "System.Diagnostics.DiagnosticSource";
+ version = "4.3.0";
+ hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=";
+ })
+ (fetchNuGet {
+ pname = "System.Diagnostics.Tools";
+ version = "4.3.0";
+ hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y=";
+ })
+ (fetchNuGet {
+ pname = "System.Diagnostics.Tracing";
+ version = "4.3.0";
+ hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=";
+ })
+ (fetchNuGet {
+ pname = "System.Globalization";
+ version = "4.3.0";
+ hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=";
+ })
+ (fetchNuGet {
+ pname = "System.Globalization.Calendars";
+ version = "4.3.0";
+ hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=";
+ })
+ (fetchNuGet {
+ pname = "System.Globalization.Extensions";
+ version = "4.3.0";
+ hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=";
+ })
+ (fetchNuGet {
+ pname = "System.IO";
+ version = "4.3.0";
+ hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=";
+ })
+ (fetchNuGet {
+ pname = "System.IO.Compression";
+ version = "4.3.0";
+ hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=";
+ })
+ (fetchNuGet {
+ pname = "System.IO.Compression.ZipFile";
+ version = "4.3.0";
+ hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=";
+ })
+ (fetchNuGet {
+ pname = "System.IO.FileSystem";
+ version = "4.3.0";
+ hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=";
+ })
+ (fetchNuGet {
+ pname = "System.IO.FileSystem.Primitives";
+ version = "4.3.0";
+ hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=";
+ })
+ (fetchNuGet {
+ pname = "System.Linq";
+ version = "4.3.0";
+ hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=";
+ })
+ (fetchNuGet {
+ pname = "System.Linq.Expressions";
+ version = "4.3.0";
+ hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=";
+ })
+ (fetchNuGet {
+ pname = "System.Net.Http";
+ version = "4.3.0";
+ hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=";
+ })
+ (fetchNuGet {
+ pname = "System.Net.NameResolution";
+ version = "4.3.0";
+ hash = "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=";
+ })
+ (fetchNuGet {
+ pname = "System.Net.Primitives";
+ version = "4.3.0";
+ hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=";
+ })
+ (fetchNuGet {
+ pname = "System.Net.Sockets";
+ version = "4.3.0";
+ hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=";
+ })
+ (fetchNuGet {
+ pname = "System.ObjectModel";
+ version = "4.3.0";
+ hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=";
+ })
+ (fetchNuGet {
+ pname = "System.Private.Uri";
+ version = "4.3.0";
+ hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=";
+ })
+ (fetchNuGet {
+ pname = "System.Reflection";
+ version = "4.3.0";
+ hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=";
+ })
+ (fetchNuGet {
+ pname = "System.Reflection.Emit";
+ version = "4.3.0";
+ hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=";
+ })
+ (fetchNuGet {
+ pname = "System.Reflection.Emit.ILGeneration";
+ version = "4.3.0";
+ hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=";
+ })
+ (fetchNuGet {
+ pname = "System.Reflection.Emit.Lightweight";
+ version = "4.3.0";
+ hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=";
+ })
+ (fetchNuGet {
+ pname = "System.Reflection.Extensions";
+ version = "4.3.0";
+ hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=";
+ })
+ (fetchNuGet {
+ pname = "System.Reflection.Metadata";
+ version = "1.6.0";
+ hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=";
+ })
+ (fetchNuGet {
+ pname = "System.Reflection.Primitives";
+ version = "4.3.0";
+ hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=";
+ })
+ (fetchNuGet {
+ pname = "System.Reflection.TypeExtensions";
+ version = "4.3.0";
+ hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=";
+ })
+ (fetchNuGet {
+ pname = "System.Resources.ResourceManager";
+ version = "4.3.0";
+ hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=";
+ })
+ (fetchNuGet {
+ pname = "System.Runtime";
+ version = "4.3.0";
+ hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=";
+ })
+ (fetchNuGet {
+ pname = "System.Runtime.Extensions";
+ version = "4.3.0";
+ hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=";
+ })
+ (fetchNuGet {
+ pname = "System.Runtime.Handles";
+ version = "4.3.0";
+ hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=";
+ })
+ (fetchNuGet {
+ pname = "System.Runtime.InteropServices";
+ version = "4.3.0";
+ hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=";
+ })
+ (fetchNuGet {
+ pname = "System.Runtime.InteropServices.RuntimeInformation";
+ version = "4.3.0";
+ hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=";
+ })
+ (fetchNuGet {
+ pname = "System.Runtime.Numerics";
+ version = "4.3.0";
+ hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=";
+ })
+ (fetchNuGet {
+ pname = "System.Security.Claims";
+ version = "4.3.0";
+ hash = "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=";
+ })
+ (fetchNuGet {
+ pname = "System.Security.Cryptography.Algorithms";
+ version = "4.3.0";
+ hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=";
+ })
+ (fetchNuGet {
+ pname = "System.Security.Cryptography.Cng";
+ version = "4.3.0";
+ hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=";
+ })
+ (fetchNuGet {
+ pname = "System.Security.Cryptography.Csp";
+ version = "4.3.0";
+ hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=";
+ })
+ (fetchNuGet {
+ pname = "System.Security.Cryptography.Encoding";
+ version = "4.3.0";
+ hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=";
+ })
+ (fetchNuGet {
+ pname = "System.Security.Cryptography.OpenSsl";
+ version = "4.3.0";
+ hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=";
+ })
+ (fetchNuGet {
+ pname = "System.Security.Cryptography.Primitives";
+ version = "4.3.0";
+ hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=";
+ })
+ (fetchNuGet {
+ pname = "System.Security.Cryptography.X509Certificates";
+ version = "4.3.0";
+ hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=";
+ })
+ (fetchNuGet {
+ pname = "System.Security.Principal";
+ version = "4.3.0";
+ hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=";
+ })
+ (fetchNuGet {
+ pname = "System.Security.Principal.Windows";
+ version = "4.3.0";
+ hash = "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=";
+ })
+ (fetchNuGet {
+ pname = "System.Text.Encoding";
+ version = "4.3.0";
+ hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=";
+ })
+ (fetchNuGet {
+ pname = "System.Text.Encoding.Extensions";
+ version = "4.3.0";
+ hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=";
+ })
+ (fetchNuGet {
+ pname = "System.Text.RegularExpressions";
+ version = "4.3.0";
+ hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=";
+ })
+ (fetchNuGet {
+ pname = "System.Threading";
+ version = "4.3.0";
+ hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=";
+ })
+ (fetchNuGet {
+ pname = "System.Threading.Tasks";
+ version = "4.3.0";
+ hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=";
+ })
+ (fetchNuGet {
+ pname = "System.Threading.Tasks.Extensions";
+ version = "4.3.0";
+ hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=";
+ })
+ (fetchNuGet {
+ pname = "System.Threading.ThreadPool";
+ version = "4.3.0";
+ hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=";
+ })
+ (fetchNuGet {
+ pname = "System.Threading.Timer";
+ version = "4.3.0";
+ hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=";
+ })
+ (fetchNuGet {
+ pname = "System.Xml.ReaderWriter";
+ version = "4.3.0";
+ hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=";
+ })
+ (fetchNuGet {
+ pname = "System.Xml.XDocument";
+ version = "4.3.0";
+ hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=";
+ })
+ (fetchNuGet {
+ pname = "xunit";
+ version = "2.4.2";
+ hash = "sha256-tePXTtlRgTAhfnUzc13Y9MwowU/cKttl1qlzHLqhWS0=";
+ })
+ (fetchNuGet {
+ pname = "xunit.abstractions";
+ version = "2.0.3";
+ hash = "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM=";
+ })
+ (fetchNuGet {
+ pname = "xunit.analyzers";
+ version = "1.0.0";
+ hash = "sha256-hZEaTaJN0bWw9q8tha5RziGlZ/lkDrj2S+QLQxgRjlw=";
+ })
+ (fetchNuGet {
+ pname = "xunit.assert";
+ version = "2.4.2";
+ hash = "sha256-wMyRXZzDn9Se4c0Pzzn0U4YuKRiUtu6o4MoPjJPPzUU=";
+ })
+ (fetchNuGet {
+ pname = "xunit.core";
+ version = "2.4.2";
+ hash = "sha256-jRFoW8LSuqDINuJlno3xT3VfdkHFVEbDKctU/mISIMc=";
+ })
+ (fetchNuGet {
+ pname = "xunit.extensibility.core";
+ version = "2.4.2";
+ hash = "sha256-wlTMUOQg5NaAPEsWkNSr8QSPbbCNSicpFajp1rowCsA=";
+ })
+ (fetchNuGet {
+ pname = "xunit.extensibility.execution";
+ version = "2.4.2";
+ hash = "sha256-l5Q60IBYWE5tYJCdFEEQnO5rIlXcNEM5S4Ut8vFnL2U=";
+ })
+ (fetchNuGet {
+ pname = "xunit.runner.visualstudio";
+ version = "2.4.5";
+ hash = "sha256-Gv7U1VPKfNb7IOWrwUGUKAeurKtE3AtQmegDFNkYHHk=";
+ })
+]
diff --git a/pkgs/by-name/ya/yafc-ce/package.nix b/pkgs/by-name/ya/yafc-ce/package.nix
new file mode 100644
index 000000000000..7a76a6ceccb3
--- /dev/null
+++ b/pkgs/by-name/ya/yafc-ce/package.nix
@@ -0,0 +1,58 @@
+{
+ buildDotnetModule,
+ lib,
+ fetchFromGitHub,
+ dotnetCorePackages,
+ SDL2,
+ SDL2_image,
+ SDL2_ttf,
+}:
+let
+ dotnet = dotnetCorePackages.dotnet_8;
+in
+buildDotnetModule (finalAttrs: {
+ pname = "yafc-ce";
+ version = "2.1.0";
+
+ src = fetchFromGitHub {
+ owner = "shpaass";
+ repo = "yafc-ce";
+ rev = finalAttrs.version;
+ hash = "sha256-dh+lnilwQSrbZNcRGpEXybsNYxkihZUp5t8co06ZXYE=";
+ };
+
+ projectFile = [ "Yafc/Yafc.csproj" ];
+ testProjectFile = [ "Yafc.Model.Tests/Yafc.Model.Tests.csproj" ];
+ nugetDeps = ./deps.nix;
+
+ dotnet-sdk = dotnet.sdk;
+ dotnet-runtime = dotnet.runtime;
+
+ executables = [ "Yafc" ];
+
+ runtimeDeps = [
+ SDL2
+ SDL2_ttf
+ SDL2_image
+ ];
+
+ meta = {
+ description = "Powerful Factorio calculator/analyser that works with mods, Community Edition";
+ longDescription = ''
+ Yet Another Factorio Calculator or YAFC is a planner and analyzer.
+ The main goal of YAFC is to help with heavily modded Factorio games.
+
+ YAFC Community Edition is an updated and actively-maintained version of the original YAFC.
+ '';
+ homepage = "https://github.com/shpaass/yafc-ce";
+ downloadPage = "https://github.com/shpaass/yafc-ce/releases/tag/${finalAttrs.version}";
+ changelog = "https://github.com/shpaass/yafc-ce/releases/tag/${finalAttrs.version}";
+ license = lib.licenses.gpl3;
+ maintainers = with lib.maintainers; [
+ diamond-deluxe
+ TheColorman
+ ];
+ platforms = with lib.platforms; x86_64 ++ darwin;
+ mainProgram = "Yafc";
+ };
+})
diff --git a/pkgs/by-name/ya/yandex-cloud/sources.json b/pkgs/by-name/ya/yandex-cloud/sources.json
index 2f9bfea320d9..e78fd955b500 100644
--- a/pkgs/by-name/ya/yandex-cloud/sources.json
+++ b/pkgs/by-name/ya/yandex-cloud/sources.json
@@ -1,25 +1,25 @@
{
- "version": "0.133.0",
+ "version": "0.136.0",
"binaries": {
"aarch64-darwin": {
- "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.133.0/darwin/arm64/yc",
- "hash": "sha256-qdpiMIQygggXRysEClQPCSTHyG4Iz3qsqcpkGUmPylQ="
+ "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.136.0/darwin/arm64/yc",
+ "hash": "sha256-tX0YL906t7jSp1cMBrlPvK8xYpZocMM1dyVvrBxjbWQ="
},
"aarch64-linux": {
- "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.133.0/linux/arm64/yc",
- "hash": "sha256-GyAeEIF07DmNFLYsmhmc76pEK7uao5v3XswG/mY0HNA="
+ "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.136.0/linux/arm64/yc",
+ "hash": "sha256-AKix6Qp+3rwv2MzI/e7QDkNS9v84gZV0mWydPDZZBQM="
},
"i686-linux": {
- "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.133.0/linux/386/yc",
- "hash": "sha256-j3Ieq2C+/LHHX7W5xhi77xKLqlMWV6MeCEVmR46ZLDk="
+ "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.136.0/linux/386/yc",
+ "hash": "sha256-897mGRv1D5vhgMUsbPB96UJuFxJO44YZh4OpGb8yKhc="
},
"x86_64-darwin": {
- "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.133.0/darwin/amd64/yc",
- "hash": "sha256-0HnSg1cwLDwv8RuGPZ0wJcCD1vCYOCjJJfLxu5b7hag="
+ "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.136.0/darwin/amd64/yc",
+ "hash": "sha256-wwcISiHla+Kd9emFlfK/hKmD8+L5jx0vIrrxtf+3WX0="
},
"x86_64-linux": {
- "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.133.0/linux/amd64/yc",
- "hash": "sha256-kP0BJUTVtRcyE/S24hBQrKxu/A4Zxo+PzlhdVZbcNc8="
+ "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.136.0/linux/amd64/yc",
+ "hash": "sha256-7q7MR/aP8uUwRu8hsLOJosn9/uIOMZW8Q+VAVtbf6qk="
}
}
}
diff --git a/pkgs/by-name/ya/yandex-music/info.json b/pkgs/by-name/ya/yandex-music/info.json
deleted file mode 100644
index 0223a0ae3ad3..000000000000
--- a/pkgs/by-name/ya/yandex-music/info.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "branch": "master",
- "commit_hash": "d446a98850abccfe28a78363c96468a2a8109cfc",
- "commit_message": "Update packages",
- "date": "2024-09-22",
- "tag": "v5.18.2"
-}
diff --git a/pkgs/by-name/ya/yandex-music/package.nix b/pkgs/by-name/ya/yandex-music/package.nix
index 6ee96d54fdd6..3e9e70770c33 100644
--- a/pkgs/by-name/ya/yandex-music/package.nix
+++ b/pkgs/by-name/ya/yandex-music/package.nix
@@ -14,13 +14,13 @@
}:
stdenvNoCC.mkDerivation rec {
pname = "yandex-music";
- version = "5.18.2";
+ version = "5.23.2";
src = fetchFromGitHub {
owner = "cucumber-sp";
repo = "yandex-music-linux";
rev = "v${version}";
- hash = "sha256-y+T2ckrnhrOiiPKBUlnvDb4FwrIfbaIXwVi16AoX/bQ=";
+ hash = "sha256-nhy4D2PgTMsQOs8hPY39Z+I+Tldgf1ASZbatfxWqNTw=";
};
nativeBuildInputs = [
@@ -38,8 +38,8 @@ stdenvNoCC.mkDerivation rec {
ym_info = builtins.fromJSON (builtins.readFile ./ym_info.json);
in
fetchurl {
- url = ym_info.ym.exe_link;
- sha256 = ym_info.ym.exe_sha256;
+ url = ym_info.exe_link;
+ hash = ym_info.exe_hash;
};
buildPhase = ''
@@ -77,10 +77,10 @@ stdenvNoCC.mkDerivation rec {
'';
meta = {
- description = "Yandex Music - Personal recommendations, selections for any occasion and new music";
+ description = "Personal recommendations, selections for any occasion and new music";
homepage = "https://music.yandex.ru/";
downloadPage = "https://music.yandex.ru/download/";
- changelog = "https://github.com/cucumber-sp/yandex-music-linux/releases/tag/v5.13.2";
+ changelog = "https://github.com/cucumber-sp/yandex-music-linux/releases/tag/v${version}";
license = lib.licenses.unfree;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ shved ];
diff --git a/pkgs/by-name/ya/yandex-music/update.sh b/pkgs/by-name/ya/yandex-music/update.sh
index 92ebdb8d8a2e..c60b8cdf9a2d 100755
--- a/pkgs/by-name/ya/yandex-music/update.sh
+++ b/pkgs/by-name/ya/yandex-music/update.sh
@@ -11,15 +11,10 @@ RAW="https://raw.githubusercontent.com/$OWNER/$REPO"
latest_release="$(curl --silent "$URL/releases/latest")"
latest_tag="$(curl --silent "$URL/tags?per_page=1")"
commit_hash="$(jq -r '.[0].commit.sha' <<<"$latest_tag")"
-latest_commit="$(curl --silent "$URL/commits/$commit_hash"'')"
-commit_message="$(jq -r '.commit.message' <<<"$latest_commit")"
-
tag=$(jq -r '.tag_name' <<<"$latest_release")
# drop 'v' prefix
version="${tag#v}"
-branch=$(jq -r '.target_commitish' <<<"$latest_release")
-
date=$(jq -r '.created_at' <<<"$latest_release")
# truncate time
date=${date%T*}
@@ -30,14 +25,21 @@ update-source-version yandex-music "$version" --ignore-same-hash
# set yandex-music dir
dir="pkgs/by-name/ya/yandex-music"
-echo -e '{
- "branch": "'"$branch"'",
- "commit_hash": "'"$commit_hash"'",
- "commit_message": "'"$commit_message"'",
- "date": "'"$date"'",
- "tag": "'"$tag"'"
-}' >"$dir/info.json" || echo "Please run the script in the root of the Nixpkgs repo"
+# download and save new version of 'exe' file
+ym_info=$(curl --silent "$RAW/$commit_hash/utility/version_info.json" |\
+ jq '.ym')
-curl --silent "$RAW/$commit_hash/utility/version_info.json" |\
- jq . > "$dir/ym_info.json" ||\
+exe_name="$(jq -r '.exe_name' <<<"$ym_info")"
+exe_link="$(jq -r '.exe_link' <<<"$ym_info")"
+exe_sha256="$(jq -r '.exe_sha256' <<<"$ym_info")"
+exe_hash="$(nix-hash --to-sri --type sha256 "$exe_sha256")"
+
+jq '.' > "$dir/ym_info.json" <<- EOJSON ||\
echo "Please run the script in the root of the Nixpkgs repo"
+{
+ "version": "$version",
+ "exe_name": "$exe_name",
+ "exe_link": "$exe_link",
+ "exe_hash": "$exe_hash"
+}
+EOJSON
diff --git a/pkgs/by-name/ya/yandex-music/ym_info.json b/pkgs/by-name/ya/yandex-music/ym_info.json
index cba72691edb9..dd5ec7436833 100644
--- a/pkgs/by-name/ya/yandex-music/ym_info.json
+++ b/pkgs/by-name/ya/yandex-music/ym_info.json
@@ -1,14 +1,6 @@
{
- "ym": {
- "version": "5.18.2",
- "exe_name": "Yandex_Music_x64_5.18.2.exe",
- "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.18.2.exe",
- "exe_sha256": "a513eb6aa4bd05bae8503f5578a8e91d778794ffe4eb3a450040903570106941"
- },
- "electron": {
- "version": "29.4.6",
- "x64": "https://github.com/electron/electron/releases/download/v29.4.6/electron-v29.4.6-linux-x64.zip",
- "armv7l": "https://github.com/electron/electron/releases/download/v29.4.6/electron-v29.4.6-linux-armv7l.zip",
- "arm64": "https://github.com/electron/electron/releases/download/v29.4.6/electron-v29.4.6-linux-arm64.zip"
- }
+ "version": "5.23.2",
+ "exe_name": "Yandex_Music_x64_5.23.2.exe",
+ "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.23.2.exe",
+ "exe_hash": "sha256-PhXmUGV9+9zfRZufw3FVvpPGqVLAB51lrz7KJovm+C8="
}
diff --git a/pkgs/by-name/yo/your_spotify/package.nix b/pkgs/by-name/yo/your_spotify/package.nix
index 77864788fa19..78c1b96700f9 100644
--- a/pkgs/by-name/yo/your_spotify/package.nix
+++ b/pkgs/by-name/yo/your_spotify/package.nix
@@ -9,22 +9,23 @@
makeWrapper,
callPackage,
nixosTests,
+ nix-update-script,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "your_spotify_server";
- version = "1.10.1";
+ version = "1.11.0";
src = fetchFromGitHub {
owner = "Yooooomi";
repo = "your_spotify";
rev = "refs/tags/${finalAttrs.version}";
- hash = "sha256-e82j2blGxQLWAlBNuAnFvlD9vwMk4/mRI0Vf7vuaPA0=";
+ hash = "sha256-BytHkvm0gfMnsKe2gDTARWYIHBpfAfIisf2p4bmrpMA=";
};
offlineCache = fetchYarnDeps {
yarnLock = finalAttrs.src + "/yarn.lock";
- hash = "sha256-5SgknaRVzgO2Dzc8MhAaM8UERWMv+PrItzevoWHbWnA=";
+ hash = "sha256-D7rL3hxidLaChCwn5umQAnWr4cTVQ1iwDs5+gIDgBGI=";
};
nativeBuildInputs = [
@@ -62,11 +63,17 @@ stdenv.mkDerivation (finalAttrs: {
passthru = {
client = callPackage ./client.nix {
- inherit (finalAttrs) src version offlineCache meta;
+ inherit (finalAttrs)
+ src
+ version
+ offlineCache
+ meta
+ ;
};
tests = {
inherit (nixosTests) your_spotify;
};
+ updateScript = nix-update-script { };
};
meta = {
diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix
new file mode 100644
index 000000000000..5e43a0548088
--- /dev/null
+++ b/pkgs/by-name/yt/ytdl-sub/package.nix
@@ -0,0 +1,49 @@
+{
+ python3Packages,
+ fetchPypi,
+ ffmpeg,
+ lib,
+}:
+python3Packages.buildPythonApplication rec {
+ pname = "ytdl-sub";
+ version = "2024.10.27.post5";
+ pyproject = true;
+
+ src = fetchPypi {
+ inherit version;
+ pname = "ytdl_sub";
+ hash = "sha256-NVIQOoRAyiFtc83r7z7DfDiIdWIPmUwylNzG3KSyOXw=";
+ };
+
+ build-system = with python3Packages; [
+ setuptools
+ wheel
+ ];
+
+ dependencies = with python3Packages; [
+ yt-dlp
+ colorama
+ mergedeep
+ mediafile
+ pyyaml
+ ];
+
+ makeWrapperArgs = [
+ "--set YTDL_SUB_FFMPEG_PATH ${lib.getExe' ffmpeg "ffmpeg"}"
+ "--set YTDL_SUB_FFPROBE_PATH ${lib.getExe' ffmpeg "ffprobe"}"
+ ];
+
+ meta = {
+ homepage = "https://github.com/jmbannon/ytdl-sub";
+ description = "Lightweight tool to automate downloading and metadata generation with yt-dlp";
+ longDescription = ''
+ ytdl-sub is a command-line tool that downloads media via yt-dlp and prepares it for your favorite media player, including Kodi, Jellyfin, Plex, Emby, and modern music players. No additional plugins or external scrapers are needed.
+ '';
+ changelog = "https://github.com/jmbannon/ytdl-sub/releases/tag/${version}";
+ license = lib.licenses.gpl3Only;
+ maintainers = with lib.maintainers; [
+ loc
+ ];
+ mainProgram = "ytdl-sub";
+ };
+}
diff --git a/pkgs/by-name/yt/ytmdesktop/package.nix b/pkgs/by-name/yt/ytmdesktop/package.nix
index 21d32541bcc3..f6e04c930b7b 100644
--- a/pkgs/by-name/yt/ytmdesktop/package.nix
+++ b/pkgs/by-name/yt/ytmdesktop/package.nix
@@ -3,7 +3,7 @@
asar,
commandLineArgs ? "",
copyDesktopItems,
- electron_30,
+ electron_33,
fetchurl,
makeDesktopItem,
makeWrapper,
@@ -12,7 +12,7 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ytmdesktop";
- version = "2.0.5";
+ version = "2.0.6";
desktopItems = [
(makeDesktopItem {
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://github.com/ytmdesktop/ytmdesktop/releases/download/v${finalAttrs.version}/youtube-music-desktop-app_${finalAttrs.version}_amd64.deb";
- hash = "sha256-0j8HVmkFyTk/Jpq9dfQXFxd2jnLwzfEiqCgRHuc5g9o=";
+ hash = "sha256-uLTnVA9ooGlbtmUGoYtrT9IlOhTAJpEXMr1GSs3ae/8=";
};
unpackPhase = ''
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
fixupPhase = ''
runHook preFixup
- makeWrapper ${lib.getExe electron_30} $out/bin/ytmdesktop \
+ makeWrapper ${lib.getExe electron_33} $out/bin/ytmdesktop \
--add-flags $out/lib/resources/app.asar \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
--add-flags ${lib.escapeShellArg commandLineArgs}
@@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.gpl3Only;
mainProgram = finalAttrs.pname;
maintainers = [ lib.maintainers.cjshearer ];
- inherit (electron_30.meta) platforms;
+ inherit (electron_33.meta) platforms;
# While the files we extract from the .deb are cross-platform (javascript), the installation
# process for darwin is different, and I don't have a test device. PRs are welcome if you can
# add the correct installation steps. I would suggest looking at the following:
diff --git a/pkgs/by-name/za/zabbix-cli/package.nix b/pkgs/by-name/za/zabbix-cli/package.nix
index 16fd8c84b642..2cb3a0a97626 100644
--- a/pkgs/by-name/za/zabbix-cli/package.nix
+++ b/pkgs/by-name/za/zabbix-cli/package.nix
@@ -8,14 +8,14 @@
python3Packages.buildPythonApplication rec {
pname = "zabbix-cli";
- version = "3.1.2";
+ version = "3.1.3";
pyproject = true;
src = fetchFromGitHub {
owner = "usit-gd";
repo = "zabbix-cli";
rev = "refs/tags/${version}";
- hash = "sha256-It0SVbGNIxf2i4gleqVRAZCIks/Tf/WYSAgipOC+HwE=";
+ hash = "sha256-hvLtc6owEOD29Y1oC7EmOOFp9P8hWOuj9N7qhtqkpks=";
};
pythonRelaxDeps = [ "click-repl" ];
diff --git a/pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch b/pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch
index 4d02d0931d40..b5c804da5459 100644
--- a/pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch
+++ b/pkgs/by-name/ze/zed-editor/0001-generate-licenses.patch
@@ -1,8 +1,8 @@
diff --git a/script/generate-licenses b/script/generate-licenses
-index 43b2f5c458..c740a3afa2 100755
+index 9602813f0c..d16d11c203 100755
--- a/script/generate-licenses
+++ b/script/generate-licenses
-@@ -15,12 +15,6 @@ cat assets/icons/LICENSES >> $OUTPUT_FILE
+@@ -16,16 +16,9 @@ cat assets/icons/LICENSES >> $OUTPUT_FILE
echo -e "# ###### CODE LICENSES ######\n" >> $OUTPUT_FILE
@@ -14,4 +14,8 @@ index 43b2f5c458..c740a3afa2 100755
-fi
echo "Generating cargo licenses"
- cargo about generate --fail -c script/licenses/zed-licenses.toml script/licenses/template.hbs.md >> $OUTPUT_FILE
+ cargo about generate \
+- --fail \
+ -c script/licenses/zed-licenses.toml \
+ "${TEMPLATE_FILE}" >> $OUTPUT_FILE
+
diff --git a/pkgs/by-name/ze/zed-editor/Cargo.lock b/pkgs/by-name/ze/zed-editor/Cargo.lock
index 671d7c086bd8..b740eb1fc9d6 100644
--- a/pkgs/by-name/ze/zed-editor/Cargo.lock
+++ b/pkgs/by-name/ze/zed-editor/Cargo.lock
@@ -16,6 +16,7 @@ dependencies = [
"project",
"smallvec",
"ui",
+ "util",
"workspace",
]
@@ -261,9 +262,9 @@ checksum = "34cd60c5e3152cef0a592f1b296f1cc93715d89d2551d85315828c3a09575ff4"
[[package]]
name = "anyhow"
-version = "1.0.89"
+version = "1.0.91"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8"
[[package]]
name = "approx"
@@ -291,6 +292,12 @@ dependencies = [
"syn 2.0.76",
]
+[[package]]
+name = "arraydeque"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236"
+
[[package]]
name = "arrayref"
version = "0.3.8"
@@ -385,7 +392,7 @@ dependencies = [
"ctor",
"db",
"editor",
- "env_logger",
+ "env_logger 0.11.5",
"feature_flags",
"fs",
"futures 0.3.30",
@@ -412,6 +419,7 @@ dependencies = [
"parking_lot",
"paths",
"picker",
+ "pretty_assertions",
"project",
"proto",
"rand 0.8.5",
@@ -452,9 +460,11 @@ dependencies = [
"anyhow",
"collections",
"derive_more",
+ "futures 0.3.30",
"gpui",
"language",
"parking_lot",
+ "pretty_assertions",
"serde",
"serde_json",
"workspace",
@@ -1008,6 +1018,7 @@ dependencies = [
"smol",
"tempfile",
"util",
+ "which 6.0.3",
"workspace",
]
@@ -1576,7 +1587,7 @@ dependencies = [
"bitflags 2.6.0",
"cexpr",
"clang-sys",
- "itertools 0.12.1",
+ "itertools 0.10.5",
"lazy_static",
"lazycell",
"proc-macro2",
@@ -2546,9 +2557,8 @@ dependencies = [
"ctor",
"dashmap 6.0.1",
"derive_more",
- "dev_server_projects",
"editor",
- "env_logger",
+ "env_logger 0.11.5",
"envy",
"file_finder",
"fs",
@@ -2557,7 +2567,6 @@ dependencies = [
"git_hosting_providers",
"google_ai",
"gpui",
- "headless",
"hex",
"http_client",
"hyper 0.14.30",
@@ -2704,7 +2713,7 @@ dependencies = [
"command_palette_hooks",
"ctor",
"editor",
- "env_logger",
+ "env_logger 0.11.5",
"fuzzy",
"go_to_line",
"gpui",
@@ -3472,18 +3481,6 @@ dependencies = [
"syn 1.0.109",
]
-[[package]]
-name = "dev_server_projects"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "client",
- "gpui",
- "rpc",
- "serde",
- "serde_json",
-]
-
[[package]]
name = "diagnostics"
version = "0.1.0"
@@ -3493,7 +3490,7 @@ dependencies = [
"collections",
"ctor",
"editor",
- "env_logger",
+ "env_logger 0.11.5",
"futures 0.3.30",
"gpui",
"language",
@@ -3648,6 +3645,12 @@ version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
+[[package]]
+name = "ec4rs"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acf65d056c7da9c971c2847ce250fd1f0f9659d5718845c3ec0ad95f5668352c"
+
[[package]]
name = "ecdsa"
version = "0.14.8"
@@ -3675,7 +3678,7 @@ dependencies = [
"ctor",
"db",
"emojis",
- "env_logger",
+ "env_logger 0.11.5",
"file_icons",
"futures 0.3.30",
"fuzzy",
@@ -3881,6 +3884,19 @@ dependencies = [
"regex",
]
+[[package]]
+name = "env_logger"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
+dependencies = [
+ "humantime",
+ "is-terminal",
+ "log",
+ "regex",
+ "termcolor",
+]
+
[[package]]
name = "env_logger"
version = "0.11.5"
@@ -3989,7 +4005,7 @@ dependencies = [
"client",
"clock",
"collections",
- "env_logger",
+ "env_logger 0.11.5",
"feature_flags",
"fs",
"git",
@@ -4084,7 +4100,7 @@ dependencies = [
"client",
"collections",
"ctor",
- "env_logger",
+ "env_logger 0.11.5",
"fs",
"futures 0.3.30",
"gpui",
@@ -4126,7 +4142,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"clap",
- "env_logger",
+ "env_logger 0.11.5",
"extension",
"fs",
"language",
@@ -4285,7 +4301,7 @@ dependencies = [
"collections",
"ctor",
"editor",
- "env_logger",
+ "env_logger 0.11.5",
"file_icons",
"futures 0.3.30",
"fuzzy",
@@ -5040,7 +5056,7 @@ dependencies = [
"ctor",
"derive_more",
"embed-resource",
- "env_logger",
+ "env_logger 0.11.5",
"etagere",
"filedescriptor",
"flume",
@@ -5230,6 +5246,15 @@ dependencies = [
"serde",
]
+[[package]]
+name = "hashlink"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
+dependencies = [
+ "hashbrown 0.14.5",
+]
+
[[package]]
name = "hashlink"
version = "0.9.1"
@@ -5263,28 +5288,6 @@ dependencies = [
"http 0.2.12",
]
-[[package]]
-name = "headless"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "client",
- "extension",
- "fs",
- "futures 0.3.30",
- "gpui",
- "language",
- "log",
- "node_runtime",
- "postage",
- "project",
- "proto",
- "settings",
- "shellexpand 2.1.2",
- "signal-hook",
- "util",
-]
-
[[package]]
name = "heck"
version = "0.3.3"
@@ -5580,7 +5583,7 @@ dependencies = [
"httpdate",
"itoa",
"pin-project-lite",
- "socket2 0.5.7",
+ "socket2 0.4.10",
"tokio",
"tower-service",
"tracing",
@@ -6209,7 +6212,8 @@ dependencies = [
"clock",
"collections",
"ctor",
- "env_logger",
+ "ec4rs",
+ "env_logger 0.11.5",
"futures 0.3.30",
"fuzzy",
"git",
@@ -6222,6 +6226,7 @@ dependencies = [
"lsp",
"parking_lot",
"postage",
+ "pretty_assertions",
"pulldown-cmark 0.12.1",
"rand 0.8.5",
"regex",
@@ -6265,7 +6270,7 @@ dependencies = [
"copilot",
"ctor",
"editor",
- "env_logger",
+ "env_logger 0.11.5",
"feature_flags",
"futures 0.3.30",
"google_ai",
@@ -6322,7 +6327,7 @@ dependencies = [
"collections",
"copilot",
"editor",
- "env_logger",
+ "env_logger 0.11.5",
"futures 0.3.30",
"gpui",
"language",
@@ -6356,6 +6361,11 @@ dependencies = [
"lsp",
"node_runtime",
"paths",
+ "pet",
+ "pet-conda",
+ "pet-core",
+ "pet-poetry",
+ "pet-reporter",
"project",
"regex",
"rope",
@@ -6463,7 +6473,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
dependencies = [
"cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
]
[[package]]
@@ -6652,7 +6662,7 @@ dependencies = [
"async-pipe",
"collections",
"ctor",
- "env_logger",
+ "env_logger 0.11.5",
"futures 0.3.30",
"gpui",
"log",
@@ -6735,7 +6745,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"assets",
- "env_logger",
+ "env_logger 0.11.5",
"futures 0.3.30",
"gpui",
"language",
@@ -6848,7 +6858,7 @@ dependencies = [
"clap",
"clap_complete",
"elasticlunr-rs",
- "env_logger",
+ "env_logger 0.11.5",
"futures-util",
"handlebars 5.1.2",
"ignore",
@@ -7030,6 +7040,15 @@ dependencies = [
"windows-sys 0.48.0",
]
+[[package]]
+name = "msvc_spectre_libs"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8661ace213a0a130c7c5b9542df5023aedf092a02008ccf477b39ff108990305"
+dependencies = [
+ "cc",
+]
+
[[package]]
name = "multi_buffer"
version = "0.1.0"
@@ -7038,7 +7057,7 @@ dependencies = [
"clock",
"collections",
"ctor",
- "env_logger",
+ "env_logger 0.11.5",
"futures 0.3.30",
"gpui",
"itertools 0.13.0",
@@ -7752,8 +7771,10 @@ dependencies = [
"serde",
"serde_json",
"settings",
+ "smallvec",
"smol",
"theme",
+ "ui",
"util",
"workspace",
"worktree",
@@ -7996,6 +8017,366 @@ dependencies = [
"sha2",
]
+[[package]]
+name = "pet"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "clap",
+ "env_logger 0.10.2",
+ "lazy_static",
+ "log",
+ "msvc_spectre_libs",
+ "pet-conda",
+ "pet-core",
+ "pet-env-var-path",
+ "pet-fs",
+ "pet-global-virtualenvs",
+ "pet-homebrew",
+ "pet-jsonrpc",
+ "pet-linux-global-python",
+ "pet-mac-commandlinetools",
+ "pet-mac-python-org",
+ "pet-mac-xcode",
+ "pet-pipenv",
+ "pet-poetry",
+ "pet-pyenv",
+ "pet-python-utils",
+ "pet-reporter",
+ "pet-telemetry",
+ "pet-venv",
+ "pet-virtualenv",
+ "pet-virtualenvwrapper",
+ "pet-windows-registry",
+ "pet-windows-store",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "pet-conda"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "env_logger 0.10.2",
+ "lazy_static",
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-reporter",
+ "regex",
+ "serde",
+ "serde_json",
+ "yaml-rust2",
+]
+
+[[package]]
+name = "pet-core"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "clap",
+ "lazy_static",
+ "log",
+ "msvc_spectre_libs",
+ "pet-fs",
+ "regex",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "pet-env-var-path"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "lazy_static",
+ "log",
+ "msvc_spectre_libs",
+ "pet-conda",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-virtualenv",
+ "regex",
+]
+
+[[package]]
+name = "pet-fs"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "log",
+ "msvc_spectre_libs",
+]
+
+[[package]]
+name = "pet-global-virtualenvs"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "log",
+ "msvc_spectre_libs",
+ "pet-conda",
+ "pet-core",
+ "pet-fs",
+ "pet-virtualenv",
+]
+
+[[package]]
+name = "pet-homebrew"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "lazy_static",
+ "log",
+ "msvc_spectre_libs",
+ "pet-conda",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-virtualenv",
+ "regex",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "pet-jsonrpc"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "env_logger 0.10.2",
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "pet-linux-global-python"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-virtualenv",
+]
+
+[[package]]
+name = "pet-mac-commandlinetools"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-virtualenv",
+]
+
+[[package]]
+name = "pet-mac-python-org"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-virtualenv",
+]
+
+[[package]]
+name = "pet-mac-xcode"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-virtualenv",
+]
+
+[[package]]
+name = "pet-pipenv"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-virtualenv",
+]
+
+[[package]]
+name = "pet-poetry"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "base64 0.22.1",
+ "lazy_static",
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-reporter",
+ "pet-virtualenv",
+ "regex",
+ "serde",
+ "serde_json",
+ "sha2",
+ "toml 0.8.19",
+]
+
+[[package]]
+name = "pet-pyenv"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "lazy_static",
+ "log",
+ "msvc_spectre_libs",
+ "pet-conda",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-reporter",
+ "regex",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "pet-python-utils"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "env_logger 0.10.2",
+ "lazy_static",
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "regex",
+ "serde",
+ "serde_json",
+ "sha2",
+]
+
+[[package]]
+name = "pet-reporter"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "env_logger 0.10.2",
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-jsonrpc",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "pet-telemetry"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "env_logger 0.10.2",
+ "lazy_static",
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "regex",
+]
+
+[[package]]
+name = "pet-venv"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-python-utils",
+ "pet-virtualenv",
+]
+
+[[package]]
+name = "pet-virtualenv"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+]
+
+[[package]]
+name = "pet-virtualenvwrapper"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-virtualenv",
+]
+
+[[package]]
+name = "pet-windows-registry"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "lazy_static",
+ "log",
+ "msvc_spectre_libs",
+ "pet-conda",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-virtualenv",
+ "pet-windows-store",
+ "regex",
+ "winreg 0.52.0",
+]
+
+[[package]]
+name = "pet-windows-store"
+version = "0.1.0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
+dependencies = [
+ "lazy_static",
+ "log",
+ "msvc_spectre_libs",
+ "pet-core",
+ "pet-fs",
+ "pet-python-utils",
+ "pet-virtualenv",
+ "regex",
+ "winreg 0.52.0",
+]
+
[[package]]
name = "petgraph"
version = "0.6.5"
@@ -8084,7 +8465,7 @@ dependencies = [
"anyhow",
"ctor",
"editor",
- "env_logger",
+ "env_logger 0.11.5",
"gpui",
"menu",
"serde",
@@ -8430,8 +8811,7 @@ dependencies = [
"client",
"clock",
"collections",
- "dev_server_projects",
- "env_logger",
+ "env_logger 0.11.5",
"fs",
"futures 0.3.30",
"fuzzy",
@@ -8472,6 +8852,7 @@ dependencies = [
"terminal",
"text",
"unindent",
+ "url",
"util",
"which 6.0.3",
"windows 0.58.0",
@@ -8501,6 +8882,7 @@ dependencies = [
"serde_derive",
"serde_json",
"settings",
+ "smallvec",
"theme",
"ui",
"util",
@@ -8966,15 +9348,15 @@ version = "0.1.0"
dependencies = [
"anyhow",
"auto_update",
- "client",
- "dev_server_projects",
"editor",
"file_finder",
"futures 0.3.30",
"fuzzy",
"gpui",
+ "itertools 0.13.0",
"language",
"log",
+ "markdown",
"menu",
"ordered-float 2.10.1",
"paths",
@@ -8982,14 +9364,13 @@ dependencies = [
"project",
"release_channel",
"remote",
- "rpc",
"schemars",
"serde",
"serde_json",
"settings",
"smol",
"task",
- "terminal_view",
+ "theme",
"ui",
"util",
"workspace",
@@ -9116,6 +9497,7 @@ name = "remote"
version = "0.1.0"
dependencies = [
"anyhow",
+ "async-trait",
"collections",
"fs",
"futures 0.3.30",
@@ -9126,6 +9508,7 @@ dependencies = [
"rpc",
"serde",
"serde_json",
+ "shlex",
"smol",
"tempfile",
"thiserror",
@@ -9140,21 +9523,28 @@ dependencies = [
"async-watch",
"backtrace",
"cargo_toml",
+ "chrono",
"clap",
"client",
"clock",
- "env_logger",
+ "env_logger 0.11.5",
+ "fork",
"fs",
"futures 0.3.30",
+ "git",
+ "git_hosting_providers",
"gpui",
"http_client",
"language",
"languages",
+ "libc",
"log",
"lsp",
"node_runtime",
"paths",
"project",
+ "proto",
+ "release_channel",
"remote",
"reqwest_client",
"rpc",
@@ -9164,6 +9554,7 @@ dependencies = [
"settings",
"shellexpand 2.1.2",
"smol",
+ "telemetry_events",
"toml 0.8.19",
"util",
"worktree",
@@ -9190,7 +9581,7 @@ dependencies = [
"collections",
"command_palette_hooks",
"editor",
- "env_logger",
+ "env_logger 0.11.5",
"futures 0.3.30",
"gpui",
"http_client",
@@ -9297,6 +9688,7 @@ dependencies = [
"system-configuration 0.6.1",
"tokio",
"tokio-rustls 0.26.0",
+ "tokio-socks",
"tokio-util",
"tower-service",
"url",
@@ -9469,7 +9861,7 @@ dependencies = [
"arrayvec",
"criterion",
"ctor",
- "env_logger",
+ "env_logger 0.11.5",
"gpui",
"log",
"rand 0.8.5",
@@ -9500,7 +9892,7 @@ dependencies = [
"base64 0.22.1",
"chrono",
"collections",
- "env_logger",
+ "env_logger 0.11.5",
"futures 0.3.30",
"gpui",
"parking_lot",
@@ -10089,7 +10481,7 @@ dependencies = [
"client",
"clock",
"collections",
- "env_logger",
+ "env_logger 0.11.5",
"feature_flags",
"fs",
"futures 0.3.30",
@@ -10294,6 +10686,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"collections",
+ "ec4rs",
"fs",
"futures 0.3.30",
"gpui",
@@ -10781,7 +11174,7 @@ dependencies = [
"futures-io",
"futures-util",
"hashbrown 0.14.5",
- "hashlink",
+ "hashlink 0.9.1",
"hex",
"indexmap 2.4.0",
"log",
@@ -11105,7 +11498,7 @@ version = "0.1.0"
dependencies = [
"arrayvec",
"ctor",
- "env_logger",
+ "env_logger 0.11.5",
"log",
"rand 0.8.5",
"rayon",
@@ -11119,7 +11512,7 @@ dependencies = [
"client",
"collections",
"editor",
- "env_logger",
+ "env_logger 0.11.5",
"futures 0.3.30",
"gpui",
"http_client",
@@ -11418,7 +11811,7 @@ dependencies = [
"collections",
"ctor",
"editor",
- "env_logger",
+ "env_logger 0.11.5",
"gpui",
"language",
"menu",
@@ -11625,7 +12018,7 @@ dependencies = [
"clock",
"collections",
"ctor",
- "env_logger",
+ "env_logger 0.11.5",
"gpui",
"http_client",
"log",
@@ -11886,7 +12279,6 @@ dependencies = [
"client",
"collections",
"command_palette",
- "dev_server_projects",
"editor",
"extensions_ui",
"feature_flags",
@@ -11995,6 +12387,7 @@ dependencies = [
"futures-io",
"futures-util",
"thiserror",
+ "tokio",
]
[[package]]
@@ -12114,6 +12507,21 @@ dependencies = [
"winnow 0.6.18",
]
+[[package]]
+name = "toolchain_selector"
+version = "0.1.0"
+dependencies = [
+ "editor",
+ "fuzzy",
+ "gpui",
+ "language",
+ "picker",
+ "project",
+ "ui",
+ "util",
+ "workspace",
+]
+
[[package]]
name = "topological-sort"
version = "0.2.2"
@@ -12285,9 +12693,9 @@ dependencies = [
[[package]]
name = "tree-sitter-c"
-version = "0.23.0"
+version = "0.23.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e795ad541f7ae6a80d22975296340a75a12a29afd3a7089f4368021613728e17"
+checksum = "c8b3fb515e498e258799a31d78e6603767cd6892770d9e2290ec00af5c3ad80b"
dependencies = [
"cc",
"tree-sitter-language",
@@ -12295,9 +12703,9 @@ dependencies = [
[[package]]
name = "tree-sitter-cpp"
-version = "0.23.0"
+version = "0.23.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0a588a816017469b69f2e3544742e34a5a59dddfb4b9457b657a6052e2ea39c"
+checksum = "1d67e862242878d6ee50e1e5814f267ee3eea0168aea2cdbd700ccfb4c74b6d3"
dependencies = [
"cc",
"tree-sitter-language",
@@ -12325,9 +12733,9 @@ dependencies = [
[[package]]
name = "tree-sitter-elixir"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6174acad8a059851f6f768d7893f4b25eedc80eb6643283d545dd71bbb38222a"
+checksum = "97bf0efa4be41120018f23305b105ad4dfd3be1b7f302dc4071d0e6c2dec3a32"
dependencies = [
"cc",
"tree-sitter-language",
@@ -12419,7 +12827,7 @@ checksum = "2545046bd1473dac6c626659cc2567c6c0ff302fc8b84a56c4243378276f7f57"
[[package]]
name = "tree-sitter-md"
version = "0.3.2"
-source = "git+https://github.com/zed-industries/tree-sitter-markdown?rev=4cfa6aad6b75052a5077c80fd934757d9267d81b#4cfa6aad6b75052a5077c80fd934757d9267d81b"
+source = "git+https://github.com/tree-sitter-grammars/tree-sitter-markdown?rev=9a23c1a96c0513d8fc6520972beedd419a973539#9a23c1a96c0513d8fc6520972beedd419a973539"
dependencies = [
"cc",
"tree-sitter-language",
@@ -12859,6 +13267,7 @@ dependencies = [
"git",
"gpui",
"picker",
+ "project",
"ui",
"util",
"workspace",
@@ -13403,9 +13812,9 @@ dependencies = [
[[package]]
name = "wasmtime-wasi"
-version = "24.0.0"
+version = "24.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "545ae8298ffce025604f7480f9c7d6948c985bef7ce9aee249ef79307813e83c"
+checksum = "fda03f5bfd5c4cc09f75c7e44846663f25f2c48a2d688fbfb5c7a33af6cf34f5"
dependencies = [
"anyhow",
"async-trait",
@@ -13658,9 +14067,9 @@ dependencies = [
[[package]]
name = "wiggle"
-version = "24.0.0"
+version = "24.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc850ca3c02c5835934d23f28cec4c5a3fb66fe0b4ecd968bbb35609dda5ddc0"
+checksum = "2d3b31bd2b4d2d82a4b747b8dbc45f566214214a4ffdc5690429a73bc221dc8a"
dependencies = [
"anyhow",
"async-trait",
@@ -13673,9 +14082,9 @@ dependencies = [
[[package]]
name = "wiggle-generate"
-version = "24.0.0"
+version = "24.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634b8804a67200bcb43ea8af5f7c53e862439a086b68b16fd333454bc74d5aab"
+checksum = "e2c6136b195fc12067aa9d4e7a5baf118729394df7bc7cbf8c63119bc9f2a7cd"
dependencies = [
"anyhow",
"heck 0.4.1",
@@ -13688,9 +14097,9 @@ dependencies = [
[[package]]
name = "wiggle-macro"
-version = "24.0.0"
+version = "24.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "474b7cbdb942c74031e619d66c600bba7f73867c5800fc2c2306cf307649be2f"
+checksum = "8a41eaceee468da976ac43b85c4eb82e482f828d5e8e56f49f90dfac2d9bc3b4"
dependencies = [
"proc-macro2",
"quote",
@@ -13720,7 +14129,7 @@ version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -14282,8 +14691,7 @@ dependencies = [
"collections",
"db",
"derive_more",
- "dev_server_projects",
- "env_logger",
+ "env_logger 0.11.5",
"fs",
"futures 0.3.30",
"git",
@@ -14320,7 +14728,7 @@ dependencies = [
"anyhow",
"clock",
"collections",
- "env_logger",
+ "env_logger 0.11.5",
"fs",
"futures 0.3.30",
"fuzzy",
@@ -14490,6 +14898,17 @@ dependencies = [
"clap",
]
+[[package]]
+name = "yaml-rust2"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8902160c4e6f2fb145dbe9d6760a75e3c9522d8bf796ed7047c85919ac7115f8"
+dependencies = [
+ "arraydeque",
+ "encoding_rs",
+ "hashlink 0.8.4",
+]
+
[[package]]
name = "yansi"
version = "1.0.1"
@@ -14577,7 +14996,7 @@ dependencies = [
[[package]]
name = "zed"
-version = "0.158.1"
+version = "0.159.5"
dependencies = [
"activity_indicator",
"anyhow",
@@ -14601,10 +15020,9 @@ dependencies = [
"command_palette_hooks",
"copilot",
"db",
- "dev_server_projects",
"diagnostics",
"editor",
- "env_logger",
+ "env_logger 0.11.5",
"extension",
"extensions_ui",
"feature_flags",
@@ -14617,7 +15035,6 @@ dependencies = [
"git_hosting_providers",
"go_to_line",
"gpui",
- "headless",
"http_client",
"image_viewer",
"inline_completion_button",
@@ -14644,6 +15061,7 @@ dependencies = [
"project",
"project_panel",
"project_symbols",
+ "proto",
"quick_action_bar",
"recent_projects",
"release_channel",
@@ -14672,6 +15090,7 @@ dependencies = [
"theme",
"theme_selector",
"time",
+ "toolchain_selector",
"tree-sitter-md",
"tree-sitter-rust",
"ui",
@@ -14685,7 +15104,6 @@ dependencies = [
"winresource",
"workspace",
"zed_actions",
- "zstd",
]
[[package]]
@@ -14720,7 +15138,7 @@ dependencies = [
[[package]]
name = "zed_dart"
-version = "0.1.1"
+version = "0.1.2"
dependencies = [
"zed_extension_api 0.1.0",
]
@@ -14734,7 +15152,7 @@ dependencies = [
[[package]]
name = "zed_elixir"
-version = "0.1.0"
+version = "0.1.1"
dependencies = [
"zed_extension_api 0.1.0",
]
@@ -14817,7 +15235,7 @@ dependencies = [
[[package]]
name = "zed_php"
-version = "0.2.1"
+version = "0.2.2"
dependencies = [
"zed_extension_api 0.1.0",
]
@@ -14858,13 +15276,6 @@ dependencies = [
"zed_extension_api 0.1.0",
]
-[[package]]
-name = "zed_svelte"
-version = "0.2.0"
-dependencies = [
- "zed_extension_api 0.1.0",
-]
-
[[package]]
name = "zed_terraform"
version = "0.1.1"
@@ -14893,14 +15304,6 @@ dependencies = [
"zed_extension_api 0.1.0",
]
-[[package]]
-name = "zed_vue"
-version = "0.1.0"
-dependencies = [
- "serde",
- "zed_extension_api 0.1.0",
-]
-
[[package]]
name = "zed_zig"
version = "0.3.1"
diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index cec232c3d69d..a718b63b31a2 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -88,19 +88,21 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "zed-editor";
- version = "0.158.1";
+ version = "0.159.5";
src = fetchFromGitHub {
owner = "zed-industries";
repo = "zed";
rev = "refs/tags/v${version}";
- hash = "sha256-X5FlNjAYG5W+RTdmyZHF1KYHxdwJGwk/qpOgj0JVD/c=";
+ hash = "sha256-60P5AicvJIN1B/JXe2moHTl4L+7+DWhYak0jciHJGoQ=";
};
patches =
[
# Zed uses cargo-install to install cargo-about during the script execution.
# We provide cargo-about ourselves and can skip this step.
+ # Until https://github.com/zed-industries/zed/issues/19971 is fixed,
+ # we also skip any crate for which the license cannot be determined.
./0001-generate-licenses.patch
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
@@ -124,11 +126,12 @@ rustPlatform.buildRustPackage rec {
"font-kit-0.14.1" = "sha256-qUKvmi+RDoyhMrZ7T6SoVAyMc/aasQ9Y/okzre4SzXo=";
"lsp-types-0.95.1" = "sha256-N4MKoU9j1p/Xeowki/+XiNQPwIcTm9DgmfM/Eieq4js=";
"nvim-rs-0.8.0-pre" = "sha256-VA8zIynflul1YKBlSxGCXCwa2Hz0pT3mH6OPsfS7Izo=";
+ "pet-0.1.0" = "sha256-RxwisvRC5I3TCMAOT+kPasijuf66F+VFok1O9Ep8tGE=";
"reqwest-0.12.8" = "sha256-mjO6SPYOMiw1H0ZEbd4BlPivPtaLVNftpsCu+M2i3Qw=";
"tree-sitter-gomod-1.0.2" = "sha256-FCb8ndKSFiLY7/nTX7tWF8c4KcSvoBU1QB5R4rdOgT0=";
"tree-sitter-gowork-0.0.1" = "sha256-WRMgGjOlJ+bT/YnSBeSLRTLlltA5WwTvV0Ow/949+BE=";
"tree-sitter-heex-0.0.1" = "sha256-SnjhL0WVsHOKuUp3dkTETnCgC/Z7WN0XmpQdJPBeBhw=";
- "tree-sitter-md-0.3.2" = "sha256-sFcQDabSay9qxzVNAQkHEZB1b9j171dDoYQqaL1iVhE=";
+ "tree-sitter-md-0.3.2" = "sha256-q2/aJx+385B8HiU0soZ1vtRvjkE21ABGzIyR1qwKFOU=";
"tree-sitter-yaml-0.6.1" = "sha256-95u/bq74SiUHW8lVp3RpanmYS/lyVPW0Inn8gR7N3IQ=";
"xim-0.4.0" = "sha256-BXyaIBoqMNbzaSJqMadmofdjtlEVSoU6iogF66YP6a4=";
"xkbcommon-0.7.0" = "sha256-2RjZWiAaz8apYTrZ82qqH4Gv20WyCtPT+ldOzm0GWMo=";
diff --git a/pkgs/by-name/ze/zenity/package.nix b/pkgs/by-name/ze/zenity/package.nix
index aa23342eebc2..2e907a48eb1f 100644
--- a/pkgs/by-name/ze/zenity/package.nix
+++ b/pkgs/by-name/ze/zenity/package.nix
@@ -16,11 +16,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "zenity";
- version = "4.0.2";
+ version = "4.0.3";
src = fetchurl {
url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor finalAttrs.version}/zenity-${finalAttrs.version}.tar.xz";
- hash = "sha256-wW3K5G4p4iwvoLlegOBslrKuyThAFhNpyVyF7Z8JMVM=";
+ hash = "sha256-tCnZe4e9nOf7cqwLeN9TRyXYrTmBfdympMou5TgbCN4=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/compression/zfp/default.nix b/pkgs/by-name/zf/zfp/package.nix
similarity index 59%
rename from pkgs/tools/compression/zfp/default.nix
rename to pkgs/by-name/zf/zfp/package.nix
index 8df75d48eb56..01919156fc80 100644
--- a/pkgs/tools/compression/zfp/default.nix
+++ b/pkgs/by-name/zf/zfp/package.nix
@@ -1,29 +1,52 @@
-{ cmake, cudatoolkit, fetchFromGitHub, gfortran, lib, llvmPackages, python3Packages, stdenv
-, config
-, enableCfp ? true
-, enableCuda ? config.cudaSupport
-, enableFortran ? builtins.elem stdenv.hostPlatform.system gfortran.meta.platforms
-, enableOpenMP ? true
-, enablePython ? true
-, enableUtilities ? true }:
+{
+ cmake,
+ cudatoolkit,
+ fetchFromGitHub,
+ gfortran,
+ lib,
+ llvmPackages,
+ python3Packages,
+ stdenv,
+ config,
+ enableCfp ? true,
+ enableCuda ? config.cudaSupport,
+ enableFortran ? builtins.elem stdenv.hostPlatform.system gfortran.meta.platforms,
+ enableOpenMP ? true,
+ enablePython ? true,
+ enableUtilities ? true,
+}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "zfp";
version = "1.0.1";
src = fetchFromGitHub {
owner = "LLNL";
repo = "zfp";
- rev = version;
- sha256 = "sha256-iZxA4lIviZQgaeHj6tEQzEFSKocfgpUyf4WvUykb9qk=";
+ rev = finalAttrs.version;
+ hash = "sha256-iZxA4lIviZQgaeHj6tEQzEFSKocfgpUyf4WvUykb9qk=";
};
+ patches = [
+ # part of https://github.com/LLNL/zfp/pull/217
+ # Remove distutils
+ ./python312.patch
+ ];
+
nativeBuildInputs = [ cmake ];
- buildInputs = lib.optional enableCuda cudatoolkit
+ buildInputs =
+ lib.optional enableCuda cudatoolkit
++ lib.optional enableFortran gfortran
++ lib.optional enableOpenMP llvmPackages.openmp
- ++ lib.optionals enablePython (with python3Packages; [ cython numpy python ]);
+ ++ lib.optionals enablePython (
+ with python3Packages;
+ [
+ cython
+ numpy
+ python
+ ]
+ );
# compile CUDA code for all extant GPUs so the binary will work with any GPU
# and driver combination. to be ultimately solved upstream:
@@ -35,8 +58,10 @@ stdenv.mkDerivation rec {
)
'';
- cmakeFlags = [
- ] ++ lib.optional enableCfp "-DBUILD_CFP=ON"
+ cmakeFlags =
+ [
+ ]
+ ++ lib.optional enableCfp "-DBUILD_CFP=ON"
++ lib.optional enableCuda "-DZFP_WITH_CUDA=ON"
++ lib.optional enableFortran "-DBUILD_ZFORP=ON"
++ lib.optional enableOpenMP "-DZFP_WITH_OPENMP=ON"
@@ -45,13 +70,13 @@ stdenv.mkDerivation rec {
doCheck = true;
- meta = with lib; {
+ meta = {
homepage = "https://computing.llnl.gov/projects/zfp";
description = "Library for random-access compression of floating-point arrays";
- license = licenses.bsd3;
- maintainers = [ maintainers.spease ];
+ license = lib.licenses.bsd3;
+ maintainers = [ lib.maintainers.spease ];
# 64-bit only
- platforms = platforms.aarch64 ++ platforms.x86_64;
+ platforms = lib.platforms.aarch64 ++ lib.platforms.x86_64;
mainProgram = "zfp";
};
-}
+})
diff --git a/pkgs/by-name/zf/zfp/python312.patch b/pkgs/by-name/zf/zfp/python312.patch
new file mode 100644
index 000000000000..acd5a9127c72
--- /dev/null
+++ b/pkgs/by-name/zf/zfp/python312.patch
@@ -0,0 +1,43 @@
+From 6610107a865ddaf988a29fe0f07ece05949a0c77 Mon Sep 17 00:00:00 2001
+From: wxt <3264117476@qq.com>
+Date: Wed, 30 Oct 2024 18:20:51 +0800
+Subject: [PATCH] a
+
+---
+ python/scikit-build-cmake/FindPythonExtensions.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/python/scikit-build-cmake/FindPythonExtensions.cmake b/python/scikit-build-cmake/FindPythonExtensions.cmake
+index 59b30c2..d06c9ad 100644
+--- a/python/scikit-build-cmake/FindPythonExtensions.cmake
++++ b/python/scikit-build-cmake/FindPythonExtensions.cmake
+@@ -254,7 +254,7 @@ endif()
+ include(targetLinkLibrariesWithDynamicLookup)
+
+ set(_command "
+-import distutils.sysconfig
++import sysconfig
+ import itertools
+ import os
+ import os.path
+@@ -266,7 +266,7 @@ rel_result = None
+ candidate_lists = []
+
+ try:
+- candidate_lists.append((distutils.sysconfig.get_python_lib(),))
++ candidate_lists.append((sysconfig.get_paths()['purelib'],))
+ except AttributeError: pass
+
+ try:
+@@ -293,7 +293,7 @@ sys.stdout.write(\";\".join((
+ sys.prefix,
+ result,
+ rel_result,
+- distutils.sysconfig.get_config_var('EXT_SUFFIX')
++ sysconfig.get_config_var('EXT_SUFFIX')
+ )))
+ ")
+
+--
+2.46.1
+
diff --git a/pkgs/servers/search/zincsearch/default.nix b/pkgs/by-name/zi/zincsearch/package.nix
similarity index 71%
rename from pkgs/servers/search/zincsearch/default.nix
rename to pkgs/by-name/zi/zincsearch/package.nix
index 2a1d3fc6faba..8a4c4928bdad 100644
--- a/pkgs/servers/search/zincsearch/default.nix
+++ b/pkgs/by-name/zi/zincsearch/package.nix
@@ -1,16 +1,17 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, buildNpmPackage
+{
+ lib,
+ buildGo122Module,
+ fetchFromGitHub,
+ buildNpmPackage,
}:
let
- version = "0.4.10";
+ version = "0.4.10-unstable-2024-10-25";
src = fetchFromGitHub {
owner = "zinclabs";
repo = "zincsearch";
- rev = "v${version}";
- hash = "sha256-lScwnmu4hM78Va7Yi5HA0E5f2WQXrZaeqjRYJYxnQ5E=";
+ rev = "0652db6d39badc753f28ee1122dcbc0e5da1c35e";
+ hash = "sha256-Py4fiZJ2fMwPe2afd19brR+62PGVoU67nMDMPlUFhKQ=";
};
webui = buildNpmPackage {
@@ -32,7 +33,7 @@ let
};
in
-buildGoModule rec {
+buildGo122Module rec {
pname = "zincsearch";
inherit src version;
@@ -40,7 +41,7 @@ buildGoModule rec {
cp -r ${webui}/share/zinc-ui web/dist
'';
- vendorHash = "sha256-SZG5/ISGblpcwwR/HOKxFl9SthXpE+IYS0S+4HYtHos=";
+ vendorHash = "sha256-JB6+sfMB7PgpPg1lmN9/0JFRLi1c7VBUMD/d4XmLIPw=";
subPackages = [ "cmd/zincsearch" ];
ldflags = [
@@ -55,8 +56,5 @@ buildGoModule rec {
homepage = "https://zincsearch-docs.zinc.dev/";
license = licenses.asl20;
maintainers = with maintainers; [ dit7ya ];
- # Doesn't build with Go version later v1.21 (which is EOL).
- # Upstream issue: https://github.com/zincsearch/zincsearch/issues/975
- broken = true;
};
}
diff --git a/pkgs/by-name/zi/zip2hashcat/package.nix b/pkgs/by-name/zi/zip2hashcat/package.nix
new file mode 100644
index 000000000000..1c18f21a9914
--- /dev/null
+++ b/pkgs/by-name/zi/zip2hashcat/package.nix
@@ -0,0 +1,46 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ ...
+}:
+
+stdenv.mkDerivation rec {
+ pname = "zip2hashcat";
+ version = "1.0";
+
+ src = fetchFromGitHub {
+ owner = "hashstation";
+ repo = "zip2hashcat";
+ # Upstream 1.0 tag has no content
+ rev = "462bd94ea30d69a0810ca9bb3d056aa0f5393d57";
+ hash = "sha256-+hbDTGSDUxA7M8gBI/TViJ2ZvheNxlonYC/aFLvgPW8=";
+ };
+
+ buildPhase = ''
+ runHook preBuild
+
+ $CC zip2hashcat.c -o zip2hashcat
+
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin
+ mv zip2hashcat $out/bin/zip2hashcat
+
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "Processes input ZIP files into a format suitable for use with hashcat";
+ homepage = "https://github.com/hashstation/zip2hashcat";
+ license = lib.licenses.mit;
+ changelog = "https://github.com/hashstation/zip2hashcat/releases/tag/${version}";
+ maintainers = with lib.maintainers; [ pyrox0 ];
+ mainProgram = "zip2hashcat";
+ platforms = lib.platforms.all;
+ };
+}
diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index 23f909a274e6..798f7302ea66 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -49,23 +49,23 @@ let
# and often with different versions. We write them on three lines
# like this (rather than using {}) so that the updater script can
# find where to edit them.
- versions.aarch64-darwin = "6.2.3.40682";
- versions.x86_64-darwin = "6.2.3.40682";
- versions.x86_64-linux = "6.2.3.2056";
+ versions.aarch64-darwin = "6.2.5.41699";
+ versions.x86_64-darwin = "6.2.5.41699";
+ versions.x86_64-linux = "6.2.5.2440";
srcs = {
aarch64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
name = "zoomusInstallerFull.pkg";
- hash = "sha256-kpncl6ZVs/O2TXtBhZ/2049jJuUdYlIaxtLX3wIfpVE=";
+ hash = "sha256-GD3WS4O8Xg2EKYS+CirXWHVjNkn3tQ6Ee5u15x218yA=";
};
x86_64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
- hash = "sha256-gB8pM3EYmA5jF2s/XobV5hk71q16x76nG6M20rWatzE=";
+ hash = "sha256-8yEkB7hpvat33VCxuScsLD+zPKvqeTfK4Wx0vjyA9yY=";
};
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
- hash = "sha256-dEQdyYEGXMwABulPHK3fLgHo0ZMF5BT6RnqzD23Al38=";
+ hash = "sha256-h+kt+Im0xv1zoLTvE+Ac9sfw1VyoAnvqFThf5/MwjHU=";
};
};
diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix
index 1ade403a1187..9bc55d0ffca5 100644
--- a/pkgs/by-name/zp/zpaqfranz/package.nix
+++ b/pkgs/by-name/zp/zpaqfranz/package.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "zpaqfranz";
- version = "60.6";
+ version = "60.7";
src = fetchFromGitHub {
owner = "fcorbelli";
repo = "zpaqfranz";
rev = finalAttrs.version;
- hash = "sha256-/lUczs4YrbLH7agZDyThPwtMLiSi07XMqwk0GgR/jFw=";
+ hash = "sha256-tlMbCHlrGPvRSqdfItdCkxLPm1LtVWcGTQMUoZTCsIg=";
};
nativeBuildInputs = [
diff --git a/pkgs/data/icons/luna-icons/default.nix b/pkgs/data/icons/luna-icons/default.nix
deleted file mode 100644
index 05c5092e9b42..000000000000
--- a/pkgs/data/icons/luna-icons/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ lib
-, stdenvNoCC
-, fetchFromGitHub
-, gtk3
-, breeze-icons
-, hicolor-icon-theme
-, pantheon
-, gitUpdater
-}:
-
-stdenvNoCC.mkDerivation rec {
- pname = "luna-icons";
- version = "2.1";
-
- src = fetchFromGitHub {
- owner = "darkomarko42";
- repo = pname;
- rev = version;
- sha256 = "sha256-zxaay4hwKgb9WWhPNG/s9JekltAvRNYmObeoTJi6Po0=";
- };
-
- nativeBuildInputs = [
- gtk3
- ];
-
- propagatedBuildInputs = [
- breeze-icons
- hicolor-icon-theme
- pantheon.elementary-icon-theme
- ];
-
- dontDropIconThemeCache = true;
-
- installPhase = ''
- runHook preInstall
-
- mkdir -p $out/share/icons
- cp -a Luna* $out/share/icons
-
- for theme in $out/share/icons/*; do
- gtk-update-icon-cache "$theme"
- done
-
- runHook postInstall
- '';
-
- passthru.updateScript = gitUpdater { };
-
- meta = with lib; {
- description = "Icon pack based on marwaita and papirus icons";
- homepage = "https://github.com/darkomarko42/Luna-Icons";
- license = [ licenses.gpl3Only ];
- platforms = platforms.linux;
- maintainers = with maintainers; [ romildo ];
- };
-}
diff --git a/pkgs/data/misc/cldr-annotations/default.nix b/pkgs/data/misc/cldr-annotations/default.nix
index e230382727d0..64c9a0793787 100644
--- a/pkgs/data/misc/cldr-annotations/default.nix
+++ b/pkgs/data/misc/cldr-annotations/default.nix
@@ -2,12 +2,12 @@
stdenvNoCC.mkDerivation rec {
pname = "cldr-annotations";
- version = "45.0";
+ version = "46.0";
src = fetchzip {
url = "https://unicode.org/Public/cldr/${lib.versions.major version}/cldr-common-${version}.zip";
stripRoot = false;
- hash = "sha256-8Id9thc3LWSw87aNpuSjQuLmFsx+XvXcz8Ox1Ua3sJw=";
+ hash = "sha256-dXfbJTBlIg/+JXSrjdf8/iS4vHo7bt5YUwh+5dlsSiw=";
};
installPhase = ''
diff --git a/pkgs/data/misc/unicode-emoji/default.nix b/pkgs/data/misc/unicode-emoji/default.nix
index 580dfef90bc5..b32cdc45d1d5 100644
--- a/pkgs/data/misc/unicode-emoji/default.nix
+++ b/pkgs/data/misc/unicode-emoji/default.nix
@@ -5,7 +5,7 @@
}:
let
- version = "15.1";
+ version = "16.0";
fetchData = { suffix, hash }: stdenvNoCC.mkDerivation {
pname = "unicode-emoji-${suffix}";
@@ -32,20 +32,20 @@ let
srcs = {
emoji-sequences = fetchData {
suffix = "sequences";
- hash = "sha256-63LJEV41BPu+HIYhthn4eUcaRszFbi9EVBe3wcrQUNE=";
+ hash = "sha256-P+PHfnLo8m3zAtx9mbEGxdCP2Ajvckb7XUUC1ln+ZZw=";
};
emoji-test = fetchData {
suffix = "test";
- hash = "sha256-2HbuJJqijqp2z6bfqnAoR6jROwYqpIjUZdA5XugTftk=";
+ hash = "sha256-JPDFNOhs8ULiSWlT6PDkaj5wI5KRHt3NKcbM7YUTlpc=";
};
emoji-zwj-sequences = fetchData {
suffix = "zwj-sequences";
- hash = "sha256-mnagPcrPzY+b/gjEnI2QtVGCuXfLzIemlOioGT77Dlc=";
+ hash = "sha256-lCPsI1R0NW+XCmllBnN+LV1lRTpn9F32a4u+kgw/q4M=";
};
};
in
-symlinkJoin rec {
+symlinkJoin {
name = "unicode-emoji-${version}";
paths = lib.attrValues srcs;
diff --git a/pkgs/data/themes/alacritty-theme/default.nix b/pkgs/data/themes/alacritty-theme/default.nix
index 8b557b504fac..cccac4656a64 100644
--- a/pkgs/data/themes/alacritty-theme/default.nix
+++ b/pkgs/data/themes/alacritty-theme/default.nix
@@ -6,13 +6,13 @@
stdenvNoCC.mkDerivation (self: {
pname = "alacritty-theme";
- version = "0-unstable-2024-09-27";
+ version = "0-unstable-2024-10-24";
src = fetchFromGitHub {
owner = "alacritty";
repo = "alacritty-theme";
- rev = "90a8406beb095fdb1617135a98c38df1ef08859c";
- hash = "sha256-Uav3hn2HxwtpOWdGt8WDCqTR0erxXWF6Wxkcltru1Yw=";
+ rev = "c424c57c8a2b6a62b6602d61ebfbc7e50f2c81d8";
+ hash = "sha256-KdjysVDs4oGU9gQwkW36aHmK30KiCdVNiREJOAETxNw=";
};
dontConfigure = true;
diff --git a/pkgs/desktops/expidus/calculator/default.nix b/pkgs/desktops/expidus/calculator/default.nix
index fb2ab188922a..98328b8874c6 100644
--- a/pkgs/desktops/expidus/calculator/default.nix
+++ b/pkgs/desktops/expidus/calculator/default.nix
@@ -23,16 +23,16 @@ flutter.buildFlutterApplication rec {
postInstall = ''
rm $out/bin/calculator
- ln -s $out/app/calculator $out/bin/expidus-calculator
+ ln -s $out/app/$pname/calculator $out/bin/expidus-calculator
mkdir -p $out/share/applications
- mv $out/app/data/com.expidusos.calculator.desktop $out/share/applications
+ mv $out/app/$pname/data/com.expidusos.calculator.desktop $out/share/applications
mkdir -p $out/share/icons
- mv $out/app/data/com.expidusos.calculator.png $out/share/icons
+ mv $out/app/$pname/data/com.expidusos.calculator.png $out/share/icons
mkdir -p $out/share/metainfo
- mv $out/app/data/com.expidusos.calculator.metainfo.xml $out/share/metainfo
+ mv $out/app/$pname/data/com.expidusos.calculator.metainfo.xml $out/share/metainfo
substituteInPlace "$out/share/applications/com.expidusos.calculator.desktop" \
--replace "Exec=calculator" "Exec=$out/bin/expidus-calculator" \
diff --git a/pkgs/desktops/expidus/file-manager/default.nix b/pkgs/desktops/expidus/file-manager/default.nix
index fa8e50475fde..8de6262d86ba 100644
--- a/pkgs/desktops/expidus/file-manager/default.nix
+++ b/pkgs/desktops/expidus/file-manager/default.nix
@@ -23,16 +23,16 @@ flutter.buildFlutterApplication rec {
postInstall = ''
rm $out/bin/file_manager
- ln -s $out/app/file_manager $out/bin/expidus-file-manager
+ ln -s $out/app/$pname/file_manager $out/bin/expidus-file-manager
mkdir -p $out/share/applications
- mv $out/app/data/com.expidusos.file_manager.desktop $out/share/applications
+ mv $out/app/$pname/data/com.expidusos.file_manager.desktop $out/share/applications
mkdir -p $out/share/icons
- mv $out/app/data/com.expidusos.file_manager.png $out/share/icons
+ mv $out/app/$pname/data/com.expidusos.file_manager.png $out/share/icons
mkdir -p $out/share/metainfo
- mv $out/app/data/com.expidusos.file_manager.metainfo.xml $out/share/metainfo
+ mv $out/app/$pname/data/com.expidusos.file_manager.metainfo.xml $out/share/metainfo
substituteInPlace "$out/share/applications/com.expidusos.file_manager.desktop" \
--replace "Exec=file_manager" "Exec=$out/bin/expidus-file-manager" \
diff --git a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
index 7629da2cbb84..d26ae0780da2 100644
--- a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix
@@ -1,31 +1,32 @@
-{ stdenv
-, lib
-, fetchFromGitLab
-, fetchpatch
-, gitUpdater
-, testers
-, cmake
-, cmake-extras
-, dbus
-, dbus-test-runner
-, glib
-, gtest
-, intltool
-, json-glib
-, libapparmor
-, libxkbcommon
-, lomiri-app-launch
-, lomiri-ui-toolkit
-, makeWrapper
-, pkg-config
-, python3
-, qtbase
-, qtdeclarative
-, qtwayland
-, runtimeShell
-, sqlite
-, systemd
-, wrapQtAppsHook
+{
+ stdenv,
+ lib,
+ fetchFromGitLab,
+ fetchpatch,
+ gitUpdater,
+ testers,
+ cmake,
+ cmake-extras,
+ dbus,
+ dbus-test-runner,
+ glib,
+ gtest,
+ intltool,
+ json-glib,
+ libapparmor,
+ libxkbcommon,
+ lomiri-app-launch,
+ lomiri-ui-toolkit,
+ makeWrapper,
+ pkg-config,
+ python3,
+ qtbase,
+ qtdeclarative,
+ qtwayland,
+ runtimeShell,
+ sqlite,
+ systemd,
+ wrapQtAppsHook,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
outputs = [
"out"
"dev"
+ "lib"
];
patches = [
@@ -51,21 +53,33 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://gitlab.com/sunweaver/lomiri-url-dispatcher/-/commit/ebdd31b9640ca243e90bc7b8aca7951085998bd8.patch";
hash = "sha256-g4EohB3oDcWK4x62/3r/g6CFxqb7/rdK51+E/Fji1Do=";
})
+
+ # Make lomiri-url-dispatcher-gui wrappable
+ # Remove when https://gitlab.com/ubports/development/core/lomiri-url-dispatcher/-/merge_requests/28 merged & in release
+ (fetchpatch {
+ url = "https://gitlab.com/ubports/development/core/lomiri-url-dispatcher/-/commit/6512937e2b388ad1350072b8ed3b4140439b2321.patch";
+ hash = "sha256-P1A3hi8l7fJWFjGeK5hWYl8BoZMzRfo44MUTeM7vG2A=";
+ })
];
- postPatch = ''
- substituteInPlace data/CMakeLists.txt \
- --replace "\''${SYSTEMD_USER_UNIT_DIR}" "\''${CMAKE_INSTALL_LIBDIR}/systemd/user"
+ postPatch =
+ ''
+ substituteInPlace CMakeLists.txt \
+ --replace-fail 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' \
- substituteInPlace tests/url_dispatcher_testability/CMakeLists.txt \
- --replace "\''${PYTHON_PACKAGE_DIR}" "$out/${python3.sitePackages}"
+ substituteInPlace gui/lomiri-url-dispatcher-gui.desktop.in.in \
+ --replace-fail '@CMAKE_INSTALL_FULL_DATADIR@/lomiri-url-dispatcher/gui/lomiri-url-dispatcher-gui.svg' 'lomiri-url-dispatcher-gui'
- # Update URI handler database whenever new url-handler is installed system-wide
- substituteInPlace data/lomiri-url-dispatcher-update-system-dir.*.in \
- --replace '@CMAKE_INSTALL_FULL_DATAROOTDIR@' '/run/current-system/sw/share'
- '' + lib.optionalString finalAttrs.finalPackage.doCheck ''
- patchShebangs tests/test-sql.sh
- '';
+ substituteInPlace tests/url_dispatcher_testability/CMakeLists.txt \
+ --replace-fail "\''${PYTHON_PACKAGE_DIR}" "$out/${python3.sitePackages}"
+
+ # Update URI handler database whenever new url-handler is installed system-wide
+ substituteInPlace data/lomiri-url-dispatcher-update-system-dir.*.in \
+ --replace-fail '@CMAKE_INSTALL_FULL_DATAROOTDIR@' '/run/current-system/sw/share'
+ ''
+ + lib.optionalString finalAttrs.finalPackage.doCheck ''
+ patchShebangs tests/test-sql.sh
+ '';
strictDeps = true;
@@ -75,11 +89,16 @@ stdenv.mkDerivation (finalAttrs: {
intltool
makeWrapper
pkg-config
- (python3.withPackages (ps: with ps; [
- setuptools
- ] ++ lib.optionals finalAttrs.finalPackage.doCheck [
- python-dbusmock
- ]))
+ (python3.withPackages (
+ ps:
+ with ps;
+ [
+ setuptools
+ ]
+ ++ lib.optionals finalAttrs.finalPackage.doCheck [
+ python-dbusmock
+ ]
+ ))
wrapQtAppsHook
];
@@ -104,8 +123,8 @@ stdenv.mkDerivation (finalAttrs: {
];
cmakeFlags = [
- "-DLOCAL_INSTALL=ON"
- "-Denable_mirclient=OFF"
+ (lib.cmakeBool "LOCAL_INSTALL" true)
+ (lib.cmakeBool "enable_mirclient" false)
];
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
@@ -116,34 +135,25 @@ stdenv.mkDerivation (finalAttrs: {
dontWrapQtApps = true;
preFixup = ''
- substituteInPlace $out/bin/lomiri-url-dispatcher-dump \
- --replace '/bin/sh' '${runtimeShell}'
+ substituteInPlace $out/bin/lomiri-url-dispatcher-{dump,gui} \
+ --replace-fail '/bin/sh' '${runtimeShell}'
wrapProgram $out/bin/lomiri-url-dispatcher-dump \
--prefix PATH : ${lib.makeBinPath [ sqlite ]}
- # Move from qmlscene call in desktop file to easier-to-wrap script
- guiScript=$out/bin/lomiri-url-dispatcher-gui
- guiExec=$(grep 'Exec=' $out/share/applications/lomiri-url-dispatcher-gui.desktop | cut -d'=' -f2-)
-
- cat <$guiScript
- #!${runtimeShell}
- $guiExec
- EOF
- chmod +x $guiScript
-
mkdir -p $out/share/icons/hicolor/scalable/apps
ln -s $out/share/lomiri-url-dispatcher/gui/lomiri-url-dispatcher-gui.svg $out/share/icons/hicolor/scalable/apps/
- substituteInPlace $out/share/applications/lomiri-url-dispatcher-gui.desktop \
- --replace "Exec=$guiExec" "Exec=$(basename $guiScript)" \
- --replace "Icon=$out/share/lomiri-url-dispatcher/gui/lomiri-url-dispatcher-gui.svg" "Icon=lomiri-url-dispatcher-gui"
-
# Calls qmlscene from PATH, needs Qt plugins & QML components
qtWrapperArgs+=(
--prefix PATH : ${lib.makeBinPath [ qtdeclarative.dev ]}
)
- wrapQtApp $guiScript
+ wrapQtApp $out/bin/lomiri-url-dispatcher-gui
+ '';
+
+ postFixup = ''
+ moveToOutput share $out
+ moveToOutput libexec $out
'';
passthru = {
@@ -151,17 +161,20 @@ stdenv.mkDerivation (finalAttrs: {
updateScript = gitUpdater { };
};
- meta = with lib; {
+ meta = {
description = "Lomiri operating environment service for requesting URLs to be opened";
longDescription = ''
- Allows applications to request a URL to be opened and handled by another
- process without seeing the list of other applications on the system or
- starting them inside its own Application Confinement.
+ Allows applications to request a URL to be opened and handled by another
+ process without seeing the list of other applications on the system or
+ starting them inside its own Application Confinement.
'';
homepage = "https://gitlab.com/ubports/development/core/lomiri-url-dispatcher";
- license = with licenses; [ lgpl3Only gpl3Only ];
- maintainers = teams.lomiri.members;
- platforms = platforms.linux;
+ license = with lib.licenses; [
+ lgpl3Only
+ gpl3Only
+ ];
+ maintainers = lib.teams.lomiri.members;
+ platforms = lib.platforms.linux;
pkgConfigModules = [
"lomiri-url-dispatcher"
];
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
index bfe1dd1586c1..eaca490740e7 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-bluetooth";
- version = "8.0.0";
+ version = "8.0.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "sha256-A55VCyQi+LBe3hxKp/xsVtXyPHuLPaCOi78Zv6MiwIw=";
+ sha256 = "sha256-NefWnkI7K6I1JY3UG9wUbB/yF3R8tUdPb4tAafiTR3o=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
index 0f90c2af545d..68abe51b4c02 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-network";
- version = "8.0.0";
+ version = "8.0.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- hash = "sha256-N/S4oO7wwOMJZhQeqAeLBOMEsJtoKItxmGhsLHMuOoM=";
+ hash = "sha256-DXXEMST/EIckZkp5BozNP+NlyutlxF92ZeJngj8+EdM=";
};
patches = [
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
index b0ac3670ffc6..b777bb47d9cf 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
, nix-update-script
, meson
, ninja
@@ -33,6 +34,15 @@ stdenv.mkDerivation rec {
sha256 = "sha256-Cv1Ldvk0+VzNsKnDFwDtLZ5ixUOGV+PWYAqN9KV9g/s=";
};
+ patches = [
+ # Set preferred color theme for mutter
+ # https://github.com/elementary/switchboard-plug-pantheon-shell/pull/413
+ (fetchpatch {
+ url = "https://github.com/elementary/switchboard-plug-pantheon-shell/commit/bdc8c167fabe5a4642efd37b0289e235e5d0a504.patch";
+ hash = "sha256-ueTAwURd8GM0U/qfPmoVLO7OVI/ppazq+ljnVzk0Npk=";
+ })
+ ];
+
nativeBuildInputs = [
gettext
meson
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
index 85b6667990cf..d4195f246a8a 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-printers";
- version = "8.0.0";
+ version = "8.0.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "sha256-cPoqpx9G/wwzr4LbCg7+Law4Z1od2+R+uyCT5Jsnqs4=";
+ sha256 = "sha256-1znz8B4CGQGDiJC4Mt61XAh9wWAV8J0+K3AIpFcffXQ=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
index 8f875620141f..c37ad542b778 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
@@ -12,13 +12,13 @@
stdenvNoCC.mkDerivation rec {
pname = "elementary-icon-theme";
- version = "8.0.0";
+ version = "8.1.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "icons";
rev = version;
- sha256 = "sha256-EPmQgE33+HBI78SlCBV3WlyLCP6AggvqsQa7gZuOMRM=";
+ sha256 = "sha256-WltMfWMcfUqpnfuGa6NzfxSeTais0MLsiu82ybaOcvs=";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh b/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh
index 57a7a6c8995a..586d6f21e160 100644
--- a/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh
+++ b/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh
@@ -1,9 +1,3 @@
-xdtEnvHook() {
- addToSearchPath ACLOCAL_PATH $1/share/aclocal
-}
-
-envHooks+=(xdtEnvHook)
-
xdtAutogenPhase() {
mkdir -p m4
NOCONFIGURE=1 xdt-autogen
diff --git a/pkgs/development/ada-modules/gnatprove/0001-fix-install.patch b/pkgs/development/ada-modules/gnatprove/0001-fix-install.patch
new file mode 100644
index 000000000000..d6911fb9a56a
--- /dev/null
+++ b/pkgs/development/ada-modules/gnatprove/0001-fix-install.patch
@@ -0,0 +1,33 @@
+From 7458110cc50d91cb7833b2abd232faca52865566 Mon Sep 17 00:00:00 2001
+From: Thomas Heijligen
+Date: Tue, 21 May 2024 22:02:09 +0000
+Subject: [PATCH] fix install
+
+---
+ Makefile | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 4950b2d5cc..9d9358ad08 100644
+--- a/Makefile
++++ b/Makefile
+@@ -106,11 +106,11 @@ install:
+ $(CP) share/spark/theories/*why $(THEORIESDIR)
+ $(CP) share/spark/theories/*mlw $(THEORIESDIR)
+ $(CP) share/spark/runtimes/README $(RUNTIMESDIR)
+- @echo "Generate Coq files by preprocessing context files:"
+- $(MAKE) -C include generate
+- $(CP) include/src/*.ad? $(INCLUDEDIR)
+- $(CP) include/*.gpr $(LIBDIR)
+- $(CP) include/proof $(LIBDIR)
++ #@echo "Generate Coq files by preprocessing context files:"
++ #$(MAKE) -C include generate
++ #$(CP) include/src/*.ad? $(INCLUDEDIR)
++ #$(CP) include/*.gpr $(LIBDIR)
++ #$(CP) include/proof $(LIBDIR)
+
+ doc: $(DOC)
+
+--
+2.44.0
+
diff --git a/pkgs/development/ada-modules/gnatprove/default.nix b/pkgs/development/ada-modules/gnatprove/default.nix
index d50baba1391f..6e0eda57e8db 100644
--- a/pkgs/development/ada-modules/gnatprove/default.nix
+++ b/pkgs/development/ada-modules/gnatprove/default.nix
@@ -7,10 +7,22 @@
, python3
, ocamlPackages
, makeWrapper
+, gpr2
}:
let
gnat_version = lib.versions.major gnat.version;
+ # gnatprove fsf-14 requires gpr2 from a special branch
+ gpr2_24_2_next = gpr2.overrideAttrs(old: rec {
+ version = "24.2.0-next";
+ src = fetchFromGitHub {
+ owner = "AdaCore";
+ repo = "gpr";
+ rev = "v${version}";
+ hash = "sha256-Tp+N9VLKjVWs1VRPYE0mQY3rl4E5iGb8xDoNatEYBg4=";
+ };
+ });
+
fetchSpark2014 = { rev, hash } : fetchFromGitHub {
owner = "AdaCore";
repo = "spark2014";
@@ -33,10 +45,21 @@ let
};
commit_date = "2023-01-05";
};
+ "14" = {
+ src = fetchSpark2014 {
+ rev = "ce5fad038790d5dc18f9b5345dc604f1ccf45b06"; # branch fsf-14
+ hash = "sha256-WprJJIe/GpcdabzR2xC2dAV7kIYdNTaTpNYoR3UYTVo=";
+ };
+ patches = [
+ # Disable Coq related targets which are missing in the fsf-14 branch
+ ./0001-fix-install.patch
+ ];
+ commit_date = "2024-01-11";
+ };
};
thisSpark = spark2014.${gnat_version} or
- (builtins.throw "GNATprove depend on a specific GNAT version and can't be built using GNAT ${gnat_version}.");
+ (builtins.throw "GNATprove depends on a specific GNAT version and can't be built using GNAT ${gnat_version}.");
in
stdenv.mkDerivation rec {
@@ -45,24 +68,35 @@ stdenv.mkDerivation rec {
src = thisSpark.src;
+ patches = thisSpark.patches or [];
+
nativeBuildInputs = [
gnat
gprbuild
python3
- ocamlPackages.ocaml
makeWrapper
- ];
+ ] ++ (with ocamlPackages; [
+ ocaml
+ findlib
+ menhir
+ ]);
buildInputs = [
gnatcoll-core
- ocamlPackages.camlzip
- ocamlPackages.findlib
- ocamlPackages.menhir
- ocamlPackages.menhirLib
- ocamlPackages.num
- ocamlPackages.yojson
- ocamlPackages.zarith
- ];
+ ] ++ (with ocamlPackages; [
+ ocamlgraph
+ zarith
+ ppx_deriving
+ ppx_sexp_conv
+ camlzip
+ menhirLib
+ num
+ re
+ sexplib
+ yojson
+ ]) ++ (lib.optionals (gnat_version == "14")[
+ gpr2_24_2_next
+ ]);
propagatedBuildInputs = [
gprbuild
@@ -75,14 +109,18 @@ stdenv.mkDerivation rec {
'';
configurePhase = ''
+ runHook preConfigure
make setup
+ runHook postConfigure
'';
installPhase = ''
+ runHook preInstall
make install-all
cp -a ./install/. $out
mkdir $out/share/gpr
ln -s $out/lib/gnat/* $out/share/gpr/
+ runHook postInstall
'';
meta = with lib; {
diff --git a/pkgs/development/ada-modules/gpr2/default.nix b/pkgs/development/ada-modules/gpr2/default.nix
new file mode 100644
index 000000000000..1ad58b125db4
--- /dev/null
+++ b/pkgs/development/ada-modules/gpr2/default.nix
@@ -0,0 +1,53 @@
+{
+ lib,
+ stdenv,
+ fetchurl,
+ gprbuild,
+ which,
+ gnat,
+ gnatcoll-core,
+ gnatcoll-iconv,
+ gnatcoll-gmp,
+ enableShared ? !stdenv.hostPlatform.isStatic,
+}:
+
+stdenv.mkDerivation rec {
+ pname = "gpr2";
+ version = "24.0.0";
+
+ src = fetchurl {
+ url = "https://github.com/AdaCore/gpr/releases/download/v${version}/gpr2-with-lkparser-${lib.versions.majorMinor version}.tgz";
+ sha256 = "1g90689k94q3ma7q76gnjipfblgfvcq6ldwbzcf0l5hx6n8vbly8";
+ };
+
+ nativeBuildInputs = [
+ which
+ gnat
+ gprbuild
+ ];
+
+ makeFlags = [
+ "prefix=$(out)"
+ "GPR2KBDIR=${gprbuild}/share/gprconfig"
+ "PROCESSORS=$(NIX_BUILD_CORES)"
+ "ENABLE_SHARED=${if enableShared then "yes" else "no"}"
+ ];
+
+ propagatedBuildInputs = [
+ gprbuild
+ gnatcoll-gmp
+ gnatcoll-core
+ gnatcoll-iconv
+ ];
+
+ meta = with lib; {
+ description = "The framework for analyzing the GNAT Project (GPR) files";
+ homepage = "https://github.com/AdaCore/gpr";
+ license = with licenses; [
+ asl20
+ gpl3Only
+ ];
+ maintainers = with maintainers; [ heijligen ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 0907c1c4d68d..39745f61faca 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -19,6 +19,7 @@
, libffi
, llvmPackages_13
, llvmPackages_15
+, llvmPackages_18
, makeWrapper
, openssl
, pcre2
@@ -246,6 +247,7 @@ let
passthru.buildCrystalPackage = callPackage ./build-package.nix {
crystal = finalAttrs.finalPackage;
};
+ passthru.llvmPackages = llvmPackages;
meta = with lib; {
inherit (binary.meta) platforms;
@@ -314,5 +316,21 @@ rec {
llvmPackages = llvmPackages_15;
};
- crystal = crystal_1_11;
+ crystal_1_12 = generic {
+ version = "1.12.1";
+ sha256 = "sha256-Q6uI9zPZ3IOGyUuWdC179GPktPGFPRbRWKtOF4YWCBw=";
+ binary = binaryCrystal_1_10;
+ llvmPackages = llvmPackages_18;
+ };
+
+ crystal_1_14 = generic {
+ version = "1.14.0";
+ sha256 = "sha256-ayMF5yinHVOUaZxhlmqxb/iiGJHmloeYuKcnrPmxo9Y=";
+ binary = binaryCrystal_1_10;
+ llvmPackages = llvmPackages_18;
+ doCheck = false; # Some compiler spec problems on x86-64_linux with the .0 release
+ };
+
+
+ crystal = crystal_1_14;
}
diff --git a/pkgs/development/compilers/elm/packages/lamdera/default.nix b/pkgs/development/compilers/elm/packages/lamdera/default.nix
index 989d2a773225..1ab549727663 100644
--- a/pkgs/development/compilers/elm/packages/lamdera/default.nix
+++ b/pkgs/development/compilers/elm/packages/lamdera/default.nix
@@ -8,16 +8,16 @@ let
arch = if stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64";
hashes =
{
- "x86_64-linux" = "1v596zi4zmx88r4axrp7pmci3w9c6f1kz4izrbj65c7ch6wwa7f2";
- "aarch64-linux" = "0xf6lqm9xgph8q95h6smq6dzn5549nfsnayny5nyvm56nbmv5iw9";
- "x86_64-darwin" = "0kijrjfbr7hn469x67yya6ndfwj901m54gd96sq3yiay0jvmapga";
- "aarch64-darwin" = "1iigsd4ac0cbb1q2g02zxjxpcma6yyd7ms72ri8g2vq8i90zys9n";
+ "x86_64-linux" = "8534ff055073490719ed05be847bebef46250ebb7af1d72bdaa4fc115c6dcea3";
+ "aarch64-linux" = "01397ce50cb0ad1dac18e4e0f7ab490bbf41a1c23d06a1946eec689e7811085b";
+ "x86_64-darwin" = "46305fb0de9fd7685fdf7cf175ad965d5320f76d4b5f2de2f9dc8403c8127d52";
+ "aarch64-darwin" = "b1e3d7bd624cdff0522bd71dc5825fa98b4eed1eae064df55a86a40b554ce0d1";
};
in
stdenv.mkDerivation rec {
pname = "lamdera";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchurl {
url = "https://static.lamdera.com/bin/lamdera-${version}-${os}-${arch}";
diff --git a/pkgs/development/compilers/fasmg/default.nix b/pkgs/development/compilers/fasmg/default.nix
index e98715795458..67f47202615c 100644
--- a/pkgs/development/compilers/fasmg/default.nix
+++ b/pkgs/development/compilers/fasmg/default.nix
@@ -1,14 +1,22 @@
{ lib, stdenv
, fetchzip
+
+# update script
+, writeScript
+, coreutils
+, curl
+, gnugrep
+, htmlq
+, nix-update
}:
stdenv.mkDerivation rec {
pname = "fasmg";
- version = "kd3c";
+ version = "kl0e";
src = fetchzip {
url = "https://flatassembler.net/fasmg.${version}.zip";
- sha256 = "sha256-duxune/UjXppKf/yWp7y85rpBn4EIC6JcZPNDhScsEA=";
+ sha256 = "sha256-qUhsUMwxgUduGz+D8+Dm4EXyh7aiE9lJ1mhvTjHP6Tw=";
stripRoot = false;
};
@@ -48,6 +56,18 @@ stdenv.mkDerivation rec {
cp docs/*.txt $doc/share/doc/fasmg
'';
+ passthru.updateScript = writeScript "update-fasmg.sh" ''
+ export PATH="${lib.makeBinPath [ coreutils curl gnugrep htmlq nix-update ]}:$PATH"
+ version=$(
+ curl 'https://flatassembler.net/download.php' \
+ | htmlq .links a.boldlink -a href \
+ | grep -E '^fasmg\..*\.zip$' \
+ | head -n1 \
+ | cut -d. -f2
+ )
+ nix-update fasmg --version "$version"
+ '';
+
meta = with lib; {
description = "x86(-64) macro assembler to binary, MZ, PE, COFF, and ELF";
mainProgram = "fasmg";
diff --git a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix
index f7412a37ec10..e42654c36c51 100644
--- a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix
+++ b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix
@@ -69,7 +69,9 @@ runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}"
lndir -silent '${flutter'}/bin/cache/dart-sdk' "$FLUTTER_ROOT/bin/cache/dart-sdk"
'' + ''
- HOME="$(mktemp -d)" flutter precache -v '--${flutterPlatform}' ${builtins.concatStringsSep " " (map (p: "'--no-${p}'") (lib.remove flutterPlatform flutterPlatforms))}
+ HOME="$(mktemp -d)" flutter precache ${lib.optionalString (flutter ? engine && flutter.engine.meta.available) "--local-engine ${flutter.engine.outName}"} \
+ -v '--${flutterPlatform}' ${builtins.concatStringsSep " " (map (p: "'--no-${p}'") (lib.remove flutterPlatform flutterPlatforms))}
+
rm -rf "$FLUTTER_ROOT/bin/cache/lockfile"
'' + lib.optionalString (lib.versionAtLeast flutter'.version "3.26") ''
rm -rf "$FLUTTER_ROOT/bin/cache/dart-sdk"
diff --git a/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix b/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix
index ff6c6b31006f..ae89d3720b33 100644
--- a/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix
+++ b/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix
@@ -146,21 +146,22 @@ let
built=build/linux/*/$flutterMode/bundle
mkdir -p $out/bin
- mv $built $out/app
+ mkdir -p $out/app
+ mv $built $out/app/$pname
- for f in $(find $out/app -iname "*.desktop" -type f); do
+ for f in $(find $out/app/$pname -iname "*.desktop" -type f); do
install -D $f $out/share/applications/$(basename $f)
done
- for f in $(find $out/app -maxdepth 1 -type f); do
+ for f in $(find $out/app/$pname -maxdepth 1 -type f); do
ln -s $f $out/bin/$(basename $f)
done
# make *.so executable
- find $out/app -iname "*.so" -type f -exec chmod +x {} +
+ find $out/app/$pname -iname "*.so" -type f -exec chmod +x {} +
# remove stuff like /build/source/packages/ubuntu_desktop_installer/linux/flutter/ephemeral
- for f in $(find $out/app -executable -type f); do
+ for f in $(find $out/app/$pname -executable -type f); do
if patchelf --print-rpath "$f" | grep /build; then # this ignores static libs (e,g. libapp.so) also
echo "strip RPath of $f"
newrp=$(patchelf --print-rpath $f | sed -r "s|/build.*ephemeral:||g" | sed -r "s|/build.*profile:||g")
diff --git a/pkgs/development/compilers/flutter/engine/source.nix b/pkgs/development/compilers/flutter/engine/source.nix
index b6cc9683e78d..8d38362464a2 100644
--- a/pkgs/development/compilers/flutter/engine/source.nix
+++ b/pkgs/development/compilers/flutter/engine/source.nix
@@ -100,7 +100,7 @@ runCommand
rm -rf $out/src/{buildtools,fuchsia}
rm -rf $out/src/flutter/{buildtools,prebuilts,third_party/swiftshader,third_party/gn/.versions}
- rm -rf $out/src/flutter/{third_party/dart/tools/sdks/dart-sdk,third_party/ninja/ninja}
+ rm -rf $out/src/flutter/{third_party/dart/tools/sdks/dart-sdk,third_party/ninja/ninja,third_party/java}
rm -rf $out/src/third_party/{dart/tools/sdks/dart-sdk,libcxx/test}
rm -rf $out/.cipd $out/.gclient $out/.gclient_entries $out/.gclient_previous_custom_vars $out/.gclient_previous_sync_commits
diff --git a/pkgs/development/compilers/flutter/engine/tools.nix b/pkgs/development/compilers/flutter/engine/tools.nix
index dbe0b4bcf157..5fa068480515 100644
--- a/pkgs/development/compilers/flutter/engine/tools.nix
+++ b/pkgs/development/compilers/flutter/engine/tools.nix
@@ -71,6 +71,10 @@ in
sed -i 's/''${platform}/${host-constants.platform}/g' "$ensureFile"
sed -i 's/gn\/gn\/${stdenv-constants.platform}/gn\/gn\/${constants.platform}/g' "$ensureFile"
+
+ if grep flutter/java/openjdk "$ensureFile" >/dev/null; then
+ sed -i '/src\/flutter\/third_party\/java\/openjdk/,+2 d' "$ensureFile"
+ fi
else
params="$params $1"
shift 1
diff --git a/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in b/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in
index f6746db43a76..5af7d7fc7719 100644
--- a/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in
+++ b/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in
@@ -1,4 +1,4 @@
-{ callPackage, symlinkJoin, lib }:
+{ callPackage, symlinkJoin, stdenv, lib }:
let
nixpkgsRoot = "@nixpkgs_root@";
version = "@flutter_version@";
@@ -17,9 +17,11 @@ let
++ (map
(targetPlatform:
callPackage "${nixpkgsRoot}/pkgs/development/compilers/flutter/engine/source.nix" {
- targetPlatform = lib.systems.elaborate targetPlatform;
- hostPlatform = lib.systems.elaborate buildPlatform;
- buildPlatform = lib.systems.elaborate buildPlatform;
+ stdenv = stdenv.override {
+ targetPlatform = lib.systems.elaborate targetPlatform;
+ hostPlatform = lib.systems.elaborate buildPlatform;
+ buildPlatform = lib.systems.elaborate buildPlatform;
+ };
flutterVersion = version;
version = engineVersion;
diff --git a/pkgs/development/compilers/flutter/versions/3_24/data.json b/pkgs/development/compilers/flutter/versions/3_24/data.json
index 4a64ccd6e051..114e3e88686e 100644
--- a/pkgs/development/compilers/flutter/versions/3_24/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_24/data.json
@@ -1,33 +1,33 @@
{
- "version": "3.24.3",
- "engineVersion": "36335019a8eab588c3c2ea783c618d90505be233",
+ "version": "3.24.4",
+ "engineVersion": "db49896cf25ceabc44096d5f088d86414e05a7aa",
"engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=",
"engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f",
"channel": "stable",
"engineHashes": {
"aarch64-linux": {
- "aarch64-linux": "sha256-D0TiOX/dkGIia+diy+vDy9ufFkbtbh2s4z+oKE83kr0=",
- "x86_64-linux": "sha256-D0TiOX/dkGIia+diy+vDy9ufFkbtbh2s4z+oKE83kr0="
+ "aarch64-linux": "sha256-/jkMlcE0AZFWgTtUaUk8e/RxD31mObG91C6nfLzXdYU=",
+ "x86_64-linux": "sha256-/jkMlcE0AZFWgTtUaUk8e/RxD31mObG91C6nfLzXdYU="
},
"x86_64-linux": {
- "aarch64-linux": "sha256-MhZW4ymqh513WCxPrWEw0zEGwcEfkt6o5T8xfQfNXqs=",
- "x86_64-linux": "sha256-MhZW4ymqh513WCxPrWEw0zEGwcEfkt6o5T8xfQfNXqs="
+ "aarch64-linux": "sha256-/jkMlcE0AZFWgTtUaUk8e/RxD31mObG91C6nfLzXdYU=",
+ "x86_64-linux": "sha256-/jkMlcE0AZFWgTtUaUk8e/RxD31mObG91C6nfLzXdYU="
}
},
- "dartVersion": "3.5.3",
+ "dartVersion": "3.5.4",
"dartHash": {
- "x86_64-linux": "sha256-/Y8w88OAtAk0hjWyD2B2lWdQCZ76QZ9N8Bf7n7yd4EE=",
- "aarch64-linux": "sha256-6GxmguNxSkbZ5eLleoH+1o0DHH6G4udNqIm2W++4Kco=",
- "x86_64-darwin": "sha256-g0afx9CYOdEHmrUo2IP9yM/gHSb4QblrDfGyGqoDO8s=",
- "aarch64-darwin": "sha256-AgHSytmxf55kD9bsvRM74Z28SFor0CX7sGIgUybRHXs="
+ "x86_64-linux": "sha256-jHyCMOkrd8DEq/IBqCMTqJg9uFkcoAwHiJBFNUHENZY=",
+ "aarch64-linux": "sha256-fFHpWvwKYBC4fbKTMwfhemu4RCdyAqj+cIJgcoE1P30=",
+ "x86_64-darwin": "sha256-9BJL3FjwmPbJw2pdiXH0EjPqjaYavzxt6ohyNKAeyOg=",
+ "aarch64-darwin": "sha256-tebVH1N2VtPnyecH6wYyptkE0xjINpPv/mvKgaucBHk="
},
- "flutterHash": "sha256-7MyvXIsj0OX2h++lXmKEQqxM+6bvGGt5WxIwYC5lz2M=",
+ "flutterHash": "sha256-ykR2ul5JWEvopTMqXvRCAfqZ8ZlirNu0txVczWc/Nvg=",
"artifactHashes": {
"android": {
- "aarch64-darwin": "sha256-2MJbj1wt7c/fMG5uca9dq9t+fdGE/f2vaDpDoBSI5Jo=",
- "aarch64-linux": "sha256-LHA4MeiqXCwsSAWWxidah2g+VEIijmUkoJ4S9X6Fetg=",
- "x86_64-darwin": "sha256-2MJbj1wt7c/fMG5uca9dq9t+fdGE/f2vaDpDoBSI5Jo=",
- "x86_64-linux": "sha256-LHA4MeiqXCwsSAWWxidah2g+VEIijmUkoJ4S9X6Fetg="
+ "aarch64-darwin": "sha256-LlTVOf+8AixZ/W5J+dlagdldwZTE7D2aA3tWYi3te+8=",
+ "aarch64-linux": "sha256-XfsBmIjmPzU+VNJvqu6uXOcKUwfUPXXoL2hUPso3DNo=",
+ "x86_64-darwin": "sha256-LlTVOf+8AixZ/W5J+dlagdldwZTE7D2aA3tWYi3te+8=",
+ "x86_64-linux": "sha256-XfsBmIjmPzU+VNJvqu6uXOcKUwfUPXXoL2hUPso3DNo="
},
"fuchsia": {
"aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
@@ -36,38 +36,38 @@
"x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk="
},
"ios": {
- "aarch64-darwin": "sha256-M9vVSuUW71+ChyFPaRO3gqJdAe9U7rLCRFqWYT0egDc=",
- "aarch64-linux": "sha256-M9vVSuUW71+ChyFPaRO3gqJdAe9U7rLCRFqWYT0egDc=",
- "x86_64-darwin": "sha256-M9vVSuUW71+ChyFPaRO3gqJdAe9U7rLCRFqWYT0egDc=",
- "x86_64-linux": "sha256-M9vVSuUW71+ChyFPaRO3gqJdAe9U7rLCRFqWYT0egDc="
+ "aarch64-darwin": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E=",
+ "aarch64-linux": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E=",
+ "x86_64-darwin": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E=",
+ "x86_64-linux": "sha256-LilLQf/+aBaaG7nVMSd4Ms36e1yos+yH6mbZQxukh8E="
},
"linux": {
- "aarch64-darwin": "sha256-8I8g0Pp/mfGo2THwIBztQRm2iravHTWD9fz7OFn0fmk=",
- "aarch64-linux": "sha256-8I8g0Pp/mfGo2THwIBztQRm2iravHTWD9fz7OFn0fmk=",
- "x86_64-darwin": "sha256-QBx3qm860fQT3+NQ36eVxzkPCS4Z4/LbbkqQ6VU5eeo=",
- "x86_64-linux": "sha256-QBx3qm860fQT3+NQ36eVxzkPCS4Z4/LbbkqQ6VU5eeo="
+ "aarch64-darwin": "sha256-876g3jlrzaAiVN8zYbQe2B2eCXi7gygQNNZH+NSH6IU=",
+ "aarch64-linux": "sha256-876g3jlrzaAiVN8zYbQe2B2eCXi7gygQNNZH+NSH6IU=",
+ "x86_64-darwin": "sha256-zbyMRvUGIGj1Zk/U8xC/bewKAtWssWnAvQFj3wb8XcM=",
+ "x86_64-linux": "sha256-zbyMRvUGIGj1Zk/U8xC/bewKAtWssWnAvQFj3wb8XcM="
},
"macos": {
- "aarch64-darwin": "sha256-li5Ry3h36fUvSLXMAhAFdu0y9ShzpF2JWHR/a+1rO0A=",
- "aarch64-linux": "sha256-li5Ry3h36fUvSLXMAhAFdu0y9ShzpF2JWHR/a+1rO0A=",
- "x86_64-darwin": "sha256-li5Ry3h36fUvSLXMAhAFdu0y9ShzpF2JWHR/a+1rO0A=",
- "x86_64-linux": "sha256-li5Ry3h36fUvSLXMAhAFdu0y9ShzpF2JWHR/a+1rO0A="
+ "aarch64-darwin": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w=",
+ "aarch64-linux": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w=",
+ "x86_64-darwin": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w=",
+ "x86_64-linux": "sha256-mNKPcQh8cn3C45kQ474crY9vmWBdR8MdlLMCXofqv9w="
},
"universal": {
- "aarch64-darwin": "sha256-obWaVD7+q+OihPWhB92tkeWJmwFcA+Ut/139SCAmMyc=",
- "aarch64-linux": "sha256-MCEvE3K+/qrEue8pU9E4MJb7ZSqgTm2MB73eEe55s1s=",
- "x86_64-darwin": "sha256-UnNwbawZuPbetL/LehNkqJ+cQnrFX+rcSfDgVhGLuks=",
- "x86_64-linux": "sha256-D2g7wgDKqOXx9Yk/ojbOUBiTKBfwgKSUejgzlNiXY0Q="
+ "aarch64-darwin": "sha256-SVrhfvGunkEKraIapt2PcNr4VzWI9d5DYMwkE82hKC8=",
+ "aarch64-linux": "sha256-N4/BCd8JTXqMdfX65IhKlZo7EK88t0I47QVoqdlOg7s=",
+ "x86_64-darwin": "sha256-GdBinxPZHgYZdmHvtcT9+qPGadZKqWTOIHJcIJwN2rU=",
+ "x86_64-linux": "sha256-a/AMUZC3n4e/TAquu076vXq+4cuODYJyvIrayTw4o5U="
},
"web": {
- "aarch64-darwin": "sha256-ox+KytkK7lMVuTOk2eRwn+7TftUJ+AkXaZ8cUgwBzt4=",
- "aarch64-linux": "sha256-ox+KytkK7lMVuTOk2eRwn+7TftUJ+AkXaZ8cUgwBzt4=",
- "x86_64-darwin": "sha256-ox+KytkK7lMVuTOk2eRwn+7TftUJ+AkXaZ8cUgwBzt4=",
- "x86_64-linux": "sha256-ox+KytkK7lMVuTOk2eRwn+7TftUJ+AkXaZ8cUgwBzt4="
+ "aarch64-darwin": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g=",
+ "aarch64-linux": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g=",
+ "x86_64-darwin": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g=",
+ "x86_64-linux": "sha256-9JyId7oDRkwjjQp9tdD/LMiKs/DMorO/vyfxRcb+q8g="
},
"windows": {
- "x86_64-darwin": "sha256-hmUQ1XG47FDwlY6gyFWyPQaXc9ZGm02ViCb/K/ypcRU=",
- "x86_64-linux": "sha256-hmUQ1XG47FDwlY6gyFWyPQaXc9ZGm02ViCb/K/ypcRU="
+ "x86_64-darwin": "sha256-EvESJuNqDpnXw3RuEM11tq5k+DGF3Ytm4fqw1WT9dbI=",
+ "x86_64-linux": "sha256-EvESJuNqDpnXw3RuEM11tq5k+DGF3Ytm4fqw1WT9dbI="
}
},
"pubspecLock": {
@@ -272,11 +272,11 @@
"dependency": "direct main",
"description": {
"name": "dds",
- "sha256": "14dcd48de0c83e98528d6da555de03c29d52b6711a82eb8c5495d41a110becec",
+ "sha256": "f3bca60b6b7d2b005268a1a579c82e38bec3d85cc85c332a872fe623c7ba94d7",
"url": "https://pub.dev"
},
"source": "hosted",
- "version": "4.2.4+1"
+ "version": "4.2.4+2"
},
"dds_service_extensions": {
"dependency": "direct main",
diff --git a/pkgs/development/compilers/flutter/versions/3_26/data.json b/pkgs/development/compilers/flutter/versions/3_26/data.json
index 3d1b530a66ad..8dc7dd1cce41 100644
--- a/pkgs/development/compilers/flutter/versions/3_26/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_26/data.json
@@ -5,9 +5,13 @@
"engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f",
"channel": "beta",
"engineHashes": {
+ "aarch64-linux": {
+ "aarch64-linux": "sha256-cDXCGikGuPWxMZZ0HWcnbS7Dt22no9wwbh4wei7w8Bw=",
+ "x86_64-linux": "sha256-cDXCGikGuPWxMZZ0HWcnbS7Dt22no9wwbh4wei7w8Bw="
+ },
"x86_64-linux": {
- "aarch64-linux": "sha256-tOrgkuPsQedWjCObrwZ9ICY15YWi+aVpxOQPE6vdeGc=",
- "x86_64-linux": "sha256-tOrgkuPsQedWjCObrwZ9ICY15YWi+aVpxOQPE6vdeGc="
+ "aarch64-linux": "sha256-cDXCGikGuPWxMZZ0HWcnbS7Dt22no9wwbh4wei7w8Bw=",
+ "x86_64-linux": "sha256-cDXCGikGuPWxMZZ0HWcnbS7Dt22no9wwbh4wei7w8Bw="
}
},
"dartVersion": "3.6.0-216.1.beta",
diff --git a/pkgs/development/compilers/flutter/versions/3_27/data.json b/pkgs/development/compilers/flutter/versions/3_27/data.json
new file mode 100644
index 000000000000..04e89fdfdc05
--- /dev/null
+++ b/pkgs/development/compilers/flutter/versions/3_27/data.json
@@ -0,0 +1,1056 @@
+{
+ "version": "3.27.0-0.1.pre",
+ "engineVersion": "af0f0d559c8a87d912a20971bbd84afc80a54b0f",
+ "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=",
+ "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f",
+ "channel": "beta",
+ "engineHashes": {
+ "aarch64-linux": {
+ "aarch64-linux": "sha256-xEUUengFzRbQhFB7jxTBd8eTMWUhyBTTKyT/ObuyD/o=",
+ "x86_64-linux": "sha256-xEUUengFzRbQhFB7jxTBd8eTMWUhyBTTKyT/ObuyD/o="
+ },
+ "x86_64-linux": {
+ "aarch64-linux": "sha256-xEUUengFzRbQhFB7jxTBd8eTMWUhyBTTKyT/ObuyD/o=",
+ "x86_64-linux": "sha256-xEUUengFzRbQhFB7jxTBd8eTMWUhyBTTKyT/ObuyD/o="
+ }
+ },
+ "dartVersion": "3.6.0-334.3.beta",
+ "dartHash": {
+ "x86_64-linux": "sha256-xErMxL9HK+MSq++DcSiV95TInMPvKkc9tqQzzMRPYDU=",
+ "aarch64-linux": "sha256-1grsqBcTmfRlMMTB1rWHVVyzZS2RLA10AADkrV4kk9I=",
+ "x86_64-darwin": "sha256-4YwpUjyFXTk6/h5OMbOKwd0gTEX0CmHo0TByVs0milA=",
+ "aarch64-darwin": "sha256-bp2tSs+JDSj3xqurc2NOOfmhbq7u/meFbA7VZPNAyZ8="
+ },
+ "flutterHash": "sha256-M9zETok2sIJP8V8QlvbQdobhnM0QM6OHiHF5mwUosB4=",
+ "artifactHashes": {
+ "android": {
+ "aarch64-darwin": "sha256-U29WM+8wPYmBifPWXS4TNdZM2ORsFzhV73B82RAH2TU=",
+ "aarch64-linux": "sha256-ABHHLnhJIqm4mT9FLMaMjJzecDgh6rLUJpVIuVqfUZg=",
+ "x86_64-darwin": "sha256-U29WM+8wPYmBifPWXS4TNdZM2ORsFzhV73B82RAH2TU=",
+ "x86_64-linux": "sha256-ABHHLnhJIqm4mT9FLMaMjJzecDgh6rLUJpVIuVqfUZg="
+ },
+ "fuchsia": {
+ "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
+ "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
+ "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
+ "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk="
+ },
+ "ios": {
+ "aarch64-darwin": "sha256-7faP4+NeYI79nUjts0UPcmWBI4R/CtGOSdhbozrMvYg=",
+ "aarch64-linux": "sha256-7faP4+NeYI79nUjts0UPcmWBI4R/CtGOSdhbozrMvYg=",
+ "x86_64-darwin": "sha256-7faP4+NeYI79nUjts0UPcmWBI4R/CtGOSdhbozrMvYg=",
+ "x86_64-linux": "sha256-7faP4+NeYI79nUjts0UPcmWBI4R/CtGOSdhbozrMvYg="
+ },
+ "linux": {
+ "aarch64-darwin": "sha256-bKyDwhYmbpcOa8Uk68+VP1KNpsbDPFqA95TeO/0oiNk=",
+ "aarch64-linux": "sha256-bKyDwhYmbpcOa8Uk68+VP1KNpsbDPFqA95TeO/0oiNk=",
+ "x86_64-darwin": "sha256-BCGsqIRYtAACYoBsLlV7m5J1P+M8Kyl9tUNj2jql/q4=",
+ "x86_64-linux": "sha256-BCGsqIRYtAACYoBsLlV7m5J1P+M8Kyl9tUNj2jql/q4="
+ },
+ "macos": {
+ "aarch64-darwin": "sha256-vYzob2BxI2Ol/H/K6/D8y9mx07PnDzbaZvZe/ukkVqk=",
+ "aarch64-linux": "sha256-vYzob2BxI2Ol/H/K6/D8y9mx07PnDzbaZvZe/ukkVqk=",
+ "x86_64-darwin": "sha256-vYzob2BxI2Ol/H/K6/D8y9mx07PnDzbaZvZe/ukkVqk=",
+ "x86_64-linux": "sha256-vYzob2BxI2Ol/H/K6/D8y9mx07PnDzbaZvZe/ukkVqk="
+ },
+ "universal": {
+ "aarch64-darwin": "sha256-s6v1V/Xjt8OZgbjQLrSx+1NTKG9YpTpydQxtvmu3Bo8=",
+ "aarch64-linux": "sha256-KmwJH7uDLbdGQQsUhdTjjwuGB39cX7db5PncSQVbJ5U=",
+ "x86_64-darwin": "sha256-iL7+1bwMolQWWWLuXxfnBJWayEGk/KtDnXh+oHpBaZg=",
+ "x86_64-linux": "sha256-0oE3278pTid3n6zVXVxXV+nEzffCs2R1vzS61c76P5g="
+ },
+ "web": {
+ "aarch64-darwin": "sha256-jpT7q3iHqM0mXRNRgKeLJMA9P5c3P8Qg2m5EwnjtlKg=",
+ "aarch64-linux": "sha256-jpT7q3iHqM0mXRNRgKeLJMA9P5c3P8Qg2m5EwnjtlKg=",
+ "x86_64-darwin": "sha256-jpT7q3iHqM0mXRNRgKeLJMA9P5c3P8Qg2m5EwnjtlKg=",
+ "x86_64-linux": "sha256-jpT7q3iHqM0mXRNRgKeLJMA9P5c3P8Qg2m5EwnjtlKg="
+ },
+ "windows": {
+ "x86_64-darwin": "sha256-LJxwZd/lDtrIMfLrMgG+/KOIAlGpW+b/EebMIngIq3w=",
+ "x86_64-linux": "sha256-LJxwZd/lDtrIMfLrMgG+/KOIAlGpW+b/EebMIngIq3w="
+ }
+ },
+ "pubspecLock": {
+ "packages": {
+ "_fe_analyzer_shared": {
+ "dependency": "direct main",
+ "description": {
+ "name": "_fe_analyzer_shared",
+ "sha256": "f6dbf021f4b214d85c79822912c5fcd142a2c4869f01222ad371bc51f9f1c356",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "74.0.0"
+ },
+ "_macros": {
+ "dependency": "transitive",
+ "description": "dart",
+ "source": "sdk",
+ "version": "0.3.3"
+ },
+ "analyzer": {
+ "dependency": "direct main",
+ "description": {
+ "name": "analyzer",
+ "sha256": "f7e8caf82f2d3190881d81012606effdf8a38e6c1ab9e30947149733065f817c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.9.0"
+ },
+ "archive": {
+ "dependency": "direct main",
+ "description": {
+ "name": "archive",
+ "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.6.1"
+ },
+ "args": {
+ "dependency": "direct main",
+ "description": {
+ "name": "args",
+ "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.5.0"
+ },
+ "async": {
+ "dependency": "direct main",
+ "description": {
+ "name": "async",
+ "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.11.0"
+ },
+ "boolean_selector": {
+ "dependency": "direct main",
+ "description": {
+ "name": "boolean_selector",
+ "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.1"
+ },
+ "browser_launcher": {
+ "dependency": "direct main",
+ "description": {
+ "name": "browser_launcher",
+ "sha256": "54a2da4d152c34760b87cbd4a9fe8a563379487e57bfcd1b387be394dfa91734",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.2"
+ },
+ "built_collection": {
+ "dependency": "direct main",
+ "description": {
+ "name": "built_collection",
+ "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "5.1.1"
+ },
+ "built_value": {
+ "dependency": "direct main",
+ "description": {
+ "name": "built_value",
+ "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "8.9.2"
+ },
+ "checked_yaml": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "checked_yaml",
+ "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.3"
+ },
+ "cli_config": {
+ "dependency": "direct main",
+ "description": {
+ "name": "cli_config",
+ "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.2.0"
+ },
+ "clock": {
+ "dependency": "direct main",
+ "description": {
+ "name": "clock",
+ "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.1"
+ },
+ "collection": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "collection",
+ "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.19.0"
+ },
+ "completion": {
+ "dependency": "direct main",
+ "description": {
+ "name": "completion",
+ "sha256": "f11b7a628e6c42b9edc9b0bc3aa490e2d930397546d2f794e8e1325909d11c60",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.1"
+ },
+ "convert": {
+ "dependency": "direct main",
+ "description": {
+ "name": "convert",
+ "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.1.1"
+ },
+ "coverage": {
+ "dependency": "direct main",
+ "description": {
+ "name": "coverage",
+ "sha256": "c1fb2dce3c0085f39dc72668e85f8e0210ec7de05345821ff58530567df345a5",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.9.2"
+ },
+ "crypto": {
+ "dependency": "direct main",
+ "description": {
+ "name": "crypto",
+ "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.5"
+ },
+ "csslib": {
+ "dependency": "direct main",
+ "description": {
+ "name": "csslib",
+ "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.0"
+ },
+ "dap": {
+ "dependency": "direct main",
+ "description": {
+ "name": "dap",
+ "sha256": "c0e53b52c9529d901329045afc4c5acb04304a28acde4b54ab0a08a93da546aa",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.3.0"
+ },
+ "dds": {
+ "dependency": "direct main",
+ "description": {
+ "name": "dds",
+ "sha256": "c90723eb1f1402429c57f717550ce5af80288d74a27c45ccbe754a0e3e038f95",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.2.7"
+ },
+ "dds_service_extensions": {
+ "dependency": "direct main",
+ "description": {
+ "name": "dds_service_extensions",
+ "sha256": "390ae1d0128bb43ffe11f8e3c6cd3a481c1920492d1026883d379cee50bdf1a2",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.0"
+ },
+ "devtools_shared": {
+ "dependency": "direct main",
+ "description": {
+ "name": "devtools_shared",
+ "sha256": "72369878105eccd563547afbad97407a2431b96bd4c04a1d6da75cb068437f50",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "10.0.2"
+ },
+ "dtd": {
+ "dependency": "direct main",
+ "description": {
+ "name": "dtd",
+ "sha256": "6e4e508c0d03e12e2c96f21faa0e5acc191f9431ecd02adb8daee64dbfae6b86",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.3.0"
+ },
+ "dwds": {
+ "dependency": "direct main",
+ "description": {
+ "name": "dwds",
+ "sha256": "d0cf9d18511df6b397c40527f3fd8ddb47b7efcc501e703dd94f13cabaf82ffc",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "24.1.0"
+ },
+ "extension_discovery": {
+ "dependency": "direct main",
+ "description": {
+ "name": "extension_discovery",
+ "sha256": "de1fce715ab013cdfb00befc3bdf0914bea5e409c3a567b7f8f144bc061611a7",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.0"
+ },
+ "fake_async": {
+ "dependency": "direct main",
+ "description": {
+ "name": "fake_async",
+ "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.3.1"
+ },
+ "ffi": {
+ "dependency": "direct main",
+ "description": {
+ "name": "ffi",
+ "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.3"
+ },
+ "file": {
+ "dependency": "direct main",
+ "description": {
+ "name": "file",
+ "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "7.0.0"
+ },
+ "file_testing": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "file_testing",
+ "sha256": "0aaadb4025bd350403f4308ad6c4cea953278d9407814b8342558e4946840fb5",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.0"
+ },
+ "fixnum": {
+ "dependency": "direct main",
+ "description": {
+ "name": "fixnum",
+ "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.0"
+ },
+ "flutter_template_images": {
+ "dependency": "direct main",
+ "description": {
+ "name": "flutter_template_images",
+ "sha256": "fd3e55af73c577b9e3f88d4080d3e366cb5c8ef3fbd50b94dfeca56bb0235df6",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.2.0"
+ },
+ "frontend_server_client": {
+ "dependency": "direct main",
+ "description": {
+ "name": "frontend_server_client",
+ "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.0.0"
+ },
+ "glob": {
+ "dependency": "direct main",
+ "description": {
+ "name": "glob",
+ "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.2"
+ },
+ "graphs": {
+ "dependency": "direct main",
+ "description": {
+ "name": "graphs",
+ "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.3.2"
+ },
+ "html": {
+ "dependency": "direct main",
+ "description": {
+ "name": "html",
+ "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.15.4"
+ },
+ "http": {
+ "dependency": "direct main",
+ "description": {
+ "name": "http",
+ "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.2.2"
+ },
+ "http_multi_server": {
+ "dependency": "direct main",
+ "description": {
+ "name": "http_multi_server",
+ "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.2.1"
+ },
+ "http_parser": {
+ "dependency": "direct main",
+ "description": {
+ "name": "http_parser",
+ "sha256": "40f592dd352890c3b60fec1b68e786cefb9603e05ff303dbc4dda49b304ecdf4",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.1.0"
+ },
+ "intl": {
+ "dependency": "direct main",
+ "description": {
+ "name": "intl",
+ "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.19.0"
+ },
+ "io": {
+ "dependency": "direct main",
+ "description": {
+ "name": "io",
+ "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.4"
+ },
+ "js": {
+ "dependency": "direct main",
+ "description": {
+ "name": "js",
+ "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.7.1"
+ },
+ "json_annotation": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "json_annotation",
+ "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.9.0"
+ },
+ "json_rpc_2": {
+ "dependency": "direct main",
+ "description": {
+ "name": "json_rpc_2",
+ "sha256": "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.2"
+ },
+ "logging": {
+ "dependency": "direct main",
+ "description": {
+ "name": "logging",
+ "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.2.0"
+ },
+ "macros": {
+ "dependency": "transitive",
+ "description": {
+ "name": "macros",
+ "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.1.3-main.0"
+ },
+ "matcher": {
+ "dependency": "direct main",
+ "description": {
+ "name": "matcher",
+ "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.12.16+1"
+ },
+ "meta": {
+ "dependency": "direct main",
+ "description": {
+ "name": "meta",
+ "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.15.0"
+ },
+ "mime": {
+ "dependency": "direct main",
+ "description": {
+ "name": "mime",
+ "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.6"
+ },
+ "multicast_dns": {
+ "dependency": "direct main",
+ "description": {
+ "name": "multicast_dns",
+ "sha256": "982c4cc4cda5f98dd477bddfd623e8e4bd1014e7dbf9e7b05052e14a5b550b99",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.3.2+7"
+ },
+ "mustache_template": {
+ "dependency": "direct main",
+ "description": {
+ "name": "mustache_template",
+ "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.0"
+ },
+ "native_assets_builder": {
+ "dependency": "direct main",
+ "description": {
+ "name": "native_assets_builder",
+ "sha256": "ad76e66cc1ca7aa922d682651aee2663cd80e6ba483a346d13a8c40f604ebfd9",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.8.3"
+ },
+ "native_assets_cli": {
+ "dependency": "direct main",
+ "description": {
+ "name": "native_assets_cli",
+ "sha256": "db902509468ec2a6c6d11fa9ce02805ede280e8dbfb5f0014ef3de8483cadfce",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.8.0"
+ },
+ "native_stack_traces": {
+ "dependency": "direct main",
+ "description": {
+ "name": "native_stack_traces",
+ "sha256": "8ba566c10ea781491c203876b04b9bdcf19dfbe17b9e486869f20eaae0ee470f",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.6.0"
+ },
+ "node_preamble": {
+ "dependency": "direct main",
+ "description": {
+ "name": "node_preamble",
+ "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.2"
+ },
+ "package_config": {
+ "dependency": "direct main",
+ "description": {
+ "name": "package_config",
+ "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.0"
+ },
+ "path": {
+ "dependency": "direct main",
+ "description": {
+ "name": "path",
+ "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.9.0"
+ },
+ "petitparser": {
+ "dependency": "direct main",
+ "description": {
+ "name": "petitparser",
+ "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.0.2"
+ },
+ "platform": {
+ "dependency": "direct main",
+ "description": {
+ "name": "platform",
+ "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.1.5"
+ },
+ "pool": {
+ "dependency": "direct main",
+ "description": {
+ "name": "pool",
+ "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.5.1"
+ },
+ "process": {
+ "dependency": "direct main",
+ "description": {
+ "name": "process",
+ "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "5.0.2"
+ },
+ "pub_semver": {
+ "dependency": "direct main",
+ "description": {
+ "name": "pub_semver",
+ "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.4"
+ },
+ "pubspec_parse": {
+ "dependency": "direct dev",
+ "description": {
+ "name": "pubspec_parse",
+ "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.3.0"
+ },
+ "shelf": {
+ "dependency": "direct main",
+ "description": {
+ "name": "shelf",
+ "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.4.2"
+ },
+ "shelf_packages_handler": {
+ "dependency": "direct main",
+ "description": {
+ "name": "shelf_packages_handler",
+ "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.2"
+ },
+ "shelf_proxy": {
+ "dependency": "direct main",
+ "description": {
+ "name": "shelf_proxy",
+ "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.0.4"
+ },
+ "shelf_static": {
+ "dependency": "direct main",
+ "description": {
+ "name": "shelf_static",
+ "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.3"
+ },
+ "shelf_web_socket": {
+ "dependency": "direct main",
+ "description": {
+ "name": "shelf_web_socket",
+ "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.0.0"
+ },
+ "source_map_stack_trace": {
+ "dependency": "direct main",
+ "description": {
+ "name": "source_map_stack_trace",
+ "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.2"
+ },
+ "source_maps": {
+ "dependency": "direct main",
+ "description": {
+ "name": "source_maps",
+ "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.10.12"
+ },
+ "source_span": {
+ "dependency": "direct main",
+ "description": {
+ "name": "source_span",
+ "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.10.0"
+ },
+ "sprintf": {
+ "dependency": "direct main",
+ "description": {
+ "name": "sprintf",
+ "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "7.0.0"
+ },
+ "sse": {
+ "dependency": "direct main",
+ "description": {
+ "name": "sse",
+ "sha256": "111a05843ea9035042975744fe61d5e8b95bc4d38656dbafc5532da77a0bb89a",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.1.6"
+ },
+ "stack_trace": {
+ "dependency": "direct main",
+ "description": {
+ "name": "stack_trace",
+ "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.12.0"
+ },
+ "standard_message_codec": {
+ "dependency": "direct main",
+ "description": {
+ "name": "standard_message_codec",
+ "sha256": "fc7dd712d191b7e33196a0ecf354c4573492bb95995e7166cb6f73b047f9cae0",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.0.1+4"
+ },
+ "stream_channel": {
+ "dependency": "direct main",
+ "description": {
+ "name": "stream_channel",
+ "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.1.2"
+ },
+ "string_scanner": {
+ "dependency": "direct main",
+ "description": {
+ "name": "string_scanner",
+ "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.3.0"
+ },
+ "sync_http": {
+ "dependency": "direct main",
+ "description": {
+ "name": "sync_http",
+ "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.3.1"
+ },
+ "term_glyph": {
+ "dependency": "direct main",
+ "description": {
+ "name": "term_glyph",
+ "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.2.1"
+ },
+ "test": {
+ "dependency": "direct main",
+ "description": {
+ "name": "test",
+ "sha256": "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.25.8"
+ },
+ "test_api": {
+ "dependency": "direct main",
+ "description": {
+ "name": "test_api",
+ "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.7.3"
+ },
+ "test_core": {
+ "dependency": "direct main",
+ "description": {
+ "name": "test_core",
+ "sha256": "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.6.5"
+ },
+ "typed_data": {
+ "dependency": "direct main",
+ "description": {
+ "name": "typed_data",
+ "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.3.2"
+ },
+ "unified_analytics": {
+ "dependency": "direct main",
+ "description": {
+ "name": "unified_analytics",
+ "sha256": "9f3c68cb30faa6d05b920498d2af79eace00fef0bae9beba9f3cda84fdbe46df",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.1.4"
+ },
+ "usage": {
+ "dependency": "direct main",
+ "description": {
+ "name": "usage",
+ "sha256": "0bdbde65a6e710343d02a56552eeaefd20b735e04bfb6b3ee025b6b22e8d0e15",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.1.1"
+ },
+ "uuid": {
+ "dependency": "direct main",
+ "description": {
+ "name": "uuid",
+ "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "4.5.1"
+ },
+ "vm_service": {
+ "dependency": "direct main",
+ "description": {
+ "name": "vm_service",
+ "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "14.3.0"
+ },
+ "vm_service_interface": {
+ "dependency": "direct main",
+ "description": {
+ "name": "vm_service_interface",
+ "sha256": "f827453d9a3f8ceae04e389810da26f9b67636bdd13aa2dd9405b110c4daf59c",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.0"
+ },
+ "vm_snapshot_analysis": {
+ "dependency": "direct main",
+ "description": {
+ "name": "vm_snapshot_analysis",
+ "sha256": "5a79b9fbb6be2555090f55b03b23907e75d44c3fd7bdd88da09848aa5a1914c8",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.7.6"
+ },
+ "watcher": {
+ "dependency": "direct main",
+ "description": {
+ "name": "watcher",
+ "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.0"
+ },
+ "web": {
+ "dependency": "direct main",
+ "description": {
+ "name": "web",
+ "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.1.0"
+ },
+ "web_socket": {
+ "dependency": "direct main",
+ "description": {
+ "name": "web_socket",
+ "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "0.1.6"
+ },
+ "web_socket_channel": {
+ "dependency": "direct main",
+ "description": {
+ "name": "web_socket_channel",
+ "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.1"
+ },
+ "webdriver": {
+ "dependency": "direct main",
+ "description": {
+ "name": "webdriver",
+ "sha256": "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.0.4"
+ },
+ "webkit_inspection_protocol": {
+ "dependency": "direct main",
+ "description": {
+ "name": "webkit_inspection_protocol",
+ "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "1.2.1"
+ },
+ "xml": {
+ "dependency": "direct main",
+ "description": {
+ "name": "xml",
+ "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "6.5.0"
+ },
+ "yaml": {
+ "dependency": "direct main",
+ "description": {
+ "name": "yaml",
+ "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "3.1.2"
+ },
+ "yaml_edit": {
+ "dependency": "direct main",
+ "description": {
+ "name": "yaml_edit",
+ "sha256": "e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f",
+ "url": "https://pub.dev"
+ },
+ "source": "hosted",
+ "version": "2.2.1"
+ }
+ },
+ "sdks": {
+ "dart": ">=3.4.3 <4.0.0"
+ }
+ }
+}
diff --git a/pkgs/development/compilers/flutter/versions/3_27/patches/deregister-pub-dependencies-artifact.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/deregister-pub-dependencies-artifact.patch
new file mode 100644
index 000000000000..01e34c6d292c
--- /dev/null
+++ b/pkgs/development/compilers/flutter/versions/3_27/patches/deregister-pub-dependencies-artifact.patch
@@ -0,0 +1,19 @@
+diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart
+index 252021cf78..e50ef0885d 100644
+--- a/packages/flutter_tools/lib/src/flutter_cache.dart
++++ b/packages/flutter_tools/lib/src/flutter_cache.dart
+@@ -51,14 +51,6 @@ class FlutterCache extends Cache {
+ registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform));
+ }
+ registerArtifact(FontSubsetArtifacts(this, platform: platform));
+- registerArtifact(PubDependencies(
+- logger: logger,
+- // flutter root and pub must be lazily initialized to avoid accessing
+- // before the version is determined.
+- flutterRoot: () => Cache.flutterRoot!,
+- pub: () => pub,
+- projectFactory: projectFactory,
+- ));
+ }
+ }
+
\ No newline at end of file
diff --git a/pkgs/development/compilers/flutter/versions/3_27/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/disable-auto-update.patch
new file mode 100644
index 000000000000..2ad292efd222
--- /dev/null
+++ b/pkgs/development/compilers/flutter/versions/3_27/patches/disable-auto-update.patch
@@ -0,0 +1,30 @@
+diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart
+index e4e474ab6e..5548599802 100644
+--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart
++++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart
+@@ -1693,7 +1693,7 @@ Run 'flutter -h' (or 'flutter -h') for available flutter commands and
+
+ // Populate the cache. We call this before pub get below so that the
+ // sky_engine package is available in the flutter cache for pub to find.
+- if (shouldUpdateCache) {
++ if (false) {
+ // First always update universal artifacts, as some of these (e.g.
+ // ios-deploy on macOS) are required to determine `requiredArtifacts`.
+ final bool offline;
+diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+index 50783f8435..db94062840 100644
+--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
++++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+@@ -377,11 +377,7 @@ class FlutterCommandRunner extends CommandRunner {
+ globals.analytics.suppressTelemetry();
+ }
+
+- globals.flutterVersion.ensureVersionFile();
+ final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false;
+- if (await _shouldCheckForUpdates(topLevelResults, topLevelMachineFlag: machineFlag)) {
+- await globals.flutterVersion.checkFlutterVersionFreshness();
+- }
+
+ // See if the user specified a specific device.
+ final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?;
+
diff --git a/pkgs/development/compilers/flutter/versions/3_27/patches/fix-ios-build-xcode-backend-sh.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/fix-ios-build-xcode-backend-sh.patch
new file mode 100644
index 000000000000..825d40fc6176
--- /dev/null
+++ b/pkgs/development/compilers/flutter/versions/3_27/patches/fix-ios-build-xcode-backend-sh.patch
@@ -0,0 +1,69 @@
+From 6df275df3b8694daf16302b407520e3b1dee6724 Mon Sep 17 00:00:00 2001
+From: Philip Hayes
+Date: Thu, 12 Sep 2024 13:23:00 -0700
+Subject: [PATCH] fix: cleanup xcode_backend.sh to fix iOS build w/
+ `NixOS/nixpkgs` flutter
+
+This patch cleans up `xcode_backend.sh`. It now effectively just runs
+`exec $FLUTTER_ROOT/bin/dart ./xcode_backend.dart`.
+
+The previous `xcode_backend.sh` tries to discover `$FLUTTER_ROOT` from
+argv[0], even though its presence is already guaranteed (the wrapped
+`xcode_backend.dart` also relies on this env).
+
+When using nixpkgs flutter, the flutter SDK directory is composed of several
+layers, joined together using symlinks (called a `symlinkJoin`). Without this
+patch, the auto-discover traverses the symlinks into the wrong layer, and so it
+uses an "unwrapped" `dart` command instead of a "wrapped" dart that sets some
+important envs/flags (like `$FLUTTER_ROOT`).
+
+Using the "unwrapped" dart then manifests in this error when compiling, since
+it doesn't see the ios build-support artifacts:
+
+```
+$ flutter run -d iphone
+Running Xcode build...
+Xcode build done. 6.4s
+Failed to build iOS app
+Error (Xcode): Target debug_unpack_ios failed: Error: Flutter failed to create a directory at "//XXXX-flutter-3.24.1-unwrapped/bin/cache/artifacts".
+```
+---
+ packages/flutter_tools/bin/xcode_backend.sh | 25 ++++-----------------
+ 1 file changed, 4 insertions(+), 21 deletions(-)
+
+diff --git a/packages/flutter_tools/bin/xcode_backend.sh b/packages/flutter_tools/bin/xcode_backend.sh
+index 2889d7c8e4..48b9d06c6e 100755
+--- a/packages/flutter_tools/bin/xcode_backend.sh
++++ b/packages/flutter_tools/bin/xcode_backend.sh
+@@ -6,24 +6,7 @@
+ # exit on error, or usage of unset var
+ set -euo pipefail
+
+-# Needed because if it is set, cd may print the path it changed to.
+-unset CDPATH
+-
+-function follow_links() (
+- cd -P "$(dirname -- "$1")"
+- file="$PWD/$(basename -- "$1")"
+- while [[ -h "$file" ]]; do
+- cd -P "$(dirname -- "$file")"
+- file="$(readlink -- "$file")"
+- cd -P "$(dirname -- "$file")"
+- file="$PWD/$(basename -- "$file")"
+- done
+- echo "$file"
+-)
+-
+-PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")"
+-BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
+-FLUTTER_ROOT="$BIN_DIR/../../.."
+-DART="$FLUTTER_ROOT/bin/dart"
+-
+-"$DART" "$BIN_DIR/xcode_backend.dart" "$@"
++# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT.
++dart="${FLUTTER_ROOT}/bin/dart"
++xcode_backend_dart="${BASH_SOURCE[0]%.sh}.dart"
++exec "${dart}" "${xcode_backend_dart}" "$@"
+--
+2.46.0
+
diff --git a/pkgs/development/compilers/flutter/versions/3_27/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/gradle-flutter-tools-wrapper.patch
new file mode 100644
index 000000000000..de6080efbba8
--- /dev/null
+++ b/pkgs/development/compilers/flutter/versions/3_27/patches/gradle-flutter-tools-wrapper.patch
@@ -0,0 +1,44 @@
+This patch introduces an intermediate Gradle build step to alter the behavior
+of flutter_tools' Gradle project, specifically moving the creation of `build`
+and `.gradle` directories from within the Nix Store to somewhere in `$HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev`.
+
+Without this patch, flutter_tools' Gradle project tries to generate `build` and `.gradle`
+directories within the Nix Store. Resulting in read-only errors when trying to build a
+Flutter Android app at runtime.
+
+This patch takes advantage of the fact settings.gradle takes priority over settings.gradle.kts to build the intermediate Gradle project
+when a Flutter app runs `includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")`
+
+`rootProject.buildFileName = "/dev/null"` so that the intermediate project doesn't use `build.gradle.kts` that's in the same directory.
+
+The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter/nix-flutter-tools-gradle//` and `includeBuild`s it.
+This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting
+`rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`.
+
+Now the `.gradle` will be built in `$HOME/.cache/flutter/nix-flutter-tools-gradle//`, but `build` doesn't.
+To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle//` as well, we need to set `buildDirectory`.
+diff --git a/packages/flutter_tools/gradle/settings.gradle b/packages/flutter_tools/gradle/settings.gradle
+new file mode 100644
+index 0000000000..b2485c94b4
+--- /dev/null
++++ b/packages/flutter_tools/gradle/settings.gradle
+@@ -0,0 +1,19 @@
++rootProject.buildFileName = "/dev/null"
++
++def engineShortRev = (new File("$settingsDir/../../../bin/internal/engine.version")).text.take(10)
++def dir = new File("$System.env.HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev")
++dir.mkdirs()
++def file = new File(dir, "settings.gradle")
++
++file.text = """
++rootProject.projectDir = new File("$settingsDir")
++apply from: new File("$settingsDir/settings.gradle.kts")
++
++gradle.allprojects { project ->
++ project.beforeEvaluate {
++ project.layout.buildDirectory = new File("$dir/build")
++ }
++}
++"""
++
++includeBuild(dir)
diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix
index 650e46ff51b1..a8454ba56f3b 100644
--- a/pkgs/development/compilers/gleam/default.nix
+++ b/pkgs/development/compilers/gleam/default.nix
@@ -5,6 +5,7 @@
, git
, pkg-config
, openssl
+, erlang
, Security
, nix-update-script
, SystemConfiguration
@@ -23,7 +24,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ git pkg-config ];
- buildInputs = [ openssl ] ++
+ buildInputs = [ openssl erlang ] ++
lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ];
cargoHash = "sha256-B8tCVkubP04gAHKQC0idR5AjpVHG/kCXvPCfwKCuaSo=";
diff --git a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
index d360da5dfa6c..f5b18d196ff5 100644
--- a/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
+++ b/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix
@@ -120,27 +120,44 @@ let
xorg.libXtst
];
- postInstall = ''
- # jni.h expects jni_md.h to be in the header search path.
- ln -sf $out/include/linux/*_md.h $out/include/
+ postInstall =
+ let
+ cLibsAsFlags = (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs);
+ preservedNixVariables = [
+ "-ELOCALE_ARCHIVE"
+ "-ENIX_BINTOOLS"
+ "-ENIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}"
+ "-ENIX_BUILD_CORES"
+ "-ENIX_BUILD_TOP"
+ "-ENIX_CC"
+ "-ENIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}"
+ "-ENIX_CFLAGS_COMPILE"
+ "-ENIX_HARDENING_ENABLE"
+ "-ENIX_LDFLAGS"
+ ];
+ preservedNixVariablesAsFlags = (map (f: "--add-flags '${f}'") preservedNixVariables);
+ in
+ ''
+ # jni.h expects jni_md.h to be in the header search path.
+ ln -sf $out/include/linux/*_md.h $out/include/
- mkdir -p $out/share
- # move files in $out like LICENSE.txt
- find $out/ -maxdepth 1 -type f -exec mv {} $out/share \;
- # symbolic link to $out/lib/svm/LICENSE_NATIVEIMAGE.txt
- rm -f $out/LICENSE_NATIVEIMAGE.txt
+ mkdir -p $out/share
+ # move files in $out like LICENSE.txt
+ find $out/ -maxdepth 1 -type f -exec mv {} $out/share \;
+ # symbolic link to $out/lib/svm/LICENSE_NATIVEIMAGE.txt
+ rm -f $out/LICENSE_NATIVEIMAGE.txt
- # copy-paste openjdk's preFixup
- # Set JAVA_HOME automatically.
- mkdir -p $out/nix-support
- cat > $out/nix-support/setup-hook << EOF
- if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
- EOF
+ # copy-paste openjdk's preFixup
+ # Set JAVA_HOME automatically.
+ mkdir -p $out/nix-support
+ cat > $out/nix-support/setup-hook << EOF
+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
+ EOF
- wrapProgram $out/bin/native-image \
- --prefix PATH : ${binPath} \
- ${toString (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs)}
- '';
+ wrapProgram $out/bin/native-image \
+ --prefix PATH : ${binPath} \
+ ${toString (cLibsAsFlags ++ preservedNixVariablesAsFlags)}
+ '';
preFixup = lib.optionalString (stdenv.hostPlatform.isLinux) ''
for bin in $(find "$out/bin" -executable -type f); do
@@ -171,10 +188,8 @@ let
echo "Testing GraalVM"
$out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World'
- extraNativeImageArgs="$(export -p | sed -n 's/^declare -x \([^=]\+\)=.*$/ -E\1/p' | tr -d \\n)"
-
echo "Ahead-Of-Time compilation"
- $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:-CheckToolchain -H:+ReportExceptionStackTraces -march=compatibility $extraNativeImageArgs HelloWorld
+ $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:-CheckToolchain -H:+ReportExceptionStackTraces -march=compatibility HelloWorld
./helloworld | fgrep 'Hello World'
${# -H:+StaticExecutableWithDynamicLibC is only available in Linux
diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix
index 2aa173fdde24..40d13c84e187 100644
--- a/pkgs/development/compilers/ispc/default.nix
+++ b/pkgs/development/compilers/ispc/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub
-, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode, tbb
+, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, tbb
# the default test target is sse4, but that is not supported by all Hydra agents
, testedTargets ? if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ]
}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-1Ns8w34fXgYrSu3XE89uowjaVoW3MOgKYV1Jb/XRj1Q=";
};
- nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.hostPlatform.isDarwin [ xcode ];
+ nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ];
buildInputs = with llvmPackages; [
libllvm libclang openmp ncurses
@@ -63,8 +63,6 @@ stdenv.mkDerivation rec {
"-DISPC_INCLUDE_UTILS=OFF"
("-DARM_ENABLED=" + (if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then "TRUE" else "FALSE"))
("-DX86_ENABLED=" + (if stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isx86_32 then "TRUE" else "FALSE"))
- ] ++ lib.lists.optionals stdenv.hostPlatform.isDarwin [
- "-DISPC_MACOS_SDK_PATH=${xcode}/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
];
meta = with lib; {
diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix
index 5c9662c24d58..45b8090d8214 100644
--- a/pkgs/development/compilers/llvm/common/clang/default.nix
+++ b/pkgs/development/compilers/llvm/common/clang/default.nix
@@ -72,9 +72,7 @@ let
# `clang-pseudo-gen`: https://github.com/llvm/llvm-project/commit/cd2292ef824591cc34cc299910a3098545c840c7
"-DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${buildLlvmTools.libclang.dev}/bin/clang-tidy-confusable-chars-gen"
"-DCLANG_PSEUDO_GEN=${buildLlvmTools.libclang.dev}/bin/clang-pseudo-gen"
- ]) ++ lib.optionals (stdenv.targetPlatform.useLLVM or false) [
- "-DCLANG_DEFAULT_CXX_STDLIB=ON"
- ] ++ lib.optional (lib.versionAtLeast release_version "20") "-DLLVM_DIR=${libllvm.dev}/lib/cmake/llvm"
+ ]) ++ lib.optional (lib.versionAtLeast release_version "20") "-DLLVM_DIR=${libllvm.dev}/lib/cmake/llvm"
++ devExtraCmakeFlags;
postPatch = ''
diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix
index 38bc91977c36..dafecdd709bd 100644
--- a/pkgs/development/compilers/llvm/common/lldb.nix
+++ b/pkgs/development/compilers/llvm/common/lldb.nix
@@ -24,6 +24,8 @@
, patches ? [ ]
, enableManpages ? false
, devExtraCmakeFlags ? [ ]
+, apple-sdk_11
+, darwinMinVersionHook
, ...
}:
@@ -90,33 +92,16 @@ stdenv.mkDerivation (rec {
# buildInputs cc-wrapper will set up rpath correctly for us.
(lib.getLib libclang)
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
- darwin.libobjc
- darwin.apple_sdk.libs.xpc
- darwin.apple_sdk.frameworks.Foundation
darwin.bootstrap_cmds
- darwin.apple_sdk.frameworks.Carbon
- darwin.apple_sdk.frameworks.Cocoa
]
- # The older libSystem used on x86_64 macOS is missing the
- # `` header which `lldb` uses.
- #
- # We copy this header over from macOS 10.12 SDK.
- #
- # See here for context:
- # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132
- ++ lib.optional
+ ++ lib.optionals
(
stdenv.targetPlatform.isDarwin
&& lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0"
- && (lib.versionAtLeast release_version "15")
- )
- (
- runCommand "bsm-audit-session-header" { } ''
- install -Dm444 \
- "${lib.getDev darwin.apple_sdk.sdk}/include/bsm/audit_session.h" \
- "$out/include/bsm/audit_session.h"
- ''
- );
+ ) [
+ apple-sdk_11
+ (darwinMinVersionHook "10.15")
+ ];
hardeningDisable = [ "format" ];
diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
deleted file mode 100644
index 88d21c75a981..000000000000
--- a/pkgs/development/compilers/nim/default.nix
+++ /dev/null
@@ -1,325 +0,0 @@
-# https://nim-lang.github.io/Nim/packaging.html
-# https://nim-lang.org/docs/nimc.html
-
-{ lib, callPackage, buildPackages, stdenv, fetchurl, fetchgit
-, makeWrapper, openssl, pcre, readline, boehmgc, sqlite, Security
-, nim-unwrapped-2, nim-unwrapped-1, nim }:
-
-let
- parseCpu = platform:
- with platform;
- # Derive a Nim CPU identifier
- if isAarch32 then
- "arm"
- else if isAarch64 then
- "arm64"
- else if isAlpha then
- "alpha"
- else if isAvr then
- "avr"
- else if isMips && is32bit then
- "mips"
- else if isMips && is64bit then
- "mips64"
- else if isMsp430 then
- "msp430"
- else if isPower && is32bit then
- "powerpc"
- else if isPower && is64bit then
- "powerpc64"
- else if isRiscV && is64bit then
- "riscv64"
- else if isSparc then
- "sparc"
- else if isx86_32 then
- "i386"
- else if isx86_64 then
- "amd64"
- else
- abort "no Nim CPU support known for ${config}";
-
- parseOs = platform:
- with platform;
- # Derive a Nim OS identifier
- if isAndroid then
- "Android"
- else if isDarwin then
- "MacOSX"
- else if isFreeBSD then
- "FreeBSD"
- else if isGenode then
- "Genode"
- else if isLinux then
- "Linux"
- else if isNetBSD then
- "NetBSD"
- else if isNone then
- "Standalone"
- else if isOpenBSD then
- "OpenBSD"
- else if isWindows then
- "Windows"
- else if isiOS then
- "iOS"
- else
- abort "no Nim OS support known for ${config}";
-
- parsePlatform = p: {
- cpu = parseCpu p;
- os = parseOs p;
- };
-
- nimHost = parsePlatform stdenv.hostPlatform;
- nimTarget = parsePlatform stdenv.targetPlatform;
-
-in {
-
- nim-unwrapped-2 = stdenv.mkDerivation (finalAttrs: {
- pname = "nim-unwrapped";
- version = "2.2.0";
- strictDeps = true;
-
- src = fetchurl {
- url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz";
- hash = "sha256-zphChJyXYOSH7N0c2t98DyhEyvrmBUAcfHKuJXZEiTw=";
- };
-
- buildInputs = [ boehmgc openssl pcre readline sqlite ]
- ++ lib.optional stdenv.hostPlatform.isDarwin Security;
-
- patches = [
- ./NIM_CONFIG_DIR.patch
- # Override compiler configuration via an environmental variable
-
- ./nixbuild.patch
- # Load libraries at runtime by absolute path
-
- ./extra-mangling-2.patch
- # Mangle store paths of modules to prevent runtime dependence.
-
- ./openssl.patch
- # dlopen is widely used by Python, Ruby, Perl, ... what you're really telling me here is that your OS is fundamentally broken. That might be news for you, but it isn't for me.
- ];
-
- configurePhase = let
- bootstrapCompiler = stdenv.mkDerivation {
- pname = "nim-bootstrap";
- inherit (finalAttrs) version src preBuild;
- enableParallelBuilding = true;
- installPhase = ''
- runHook preInstall
- install -Dt $out/bin bin/nim
- runHook postInstall
- '';
- };
- in ''
- runHook preConfigure
- cp ${bootstrapCompiler}/bin/nim bin/
- echo 'define:nixbuild' >> config/nim.cfg
- runHook postConfigure
- '';
-
- kochArgs = [
- "--cpu:${nimHost.cpu}"
- "--os:${nimHost.os}"
- "-d:release"
- "-d:useGnuReadline"
- ] ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) "-d:nativeStacktrace";
-
- preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
- substituteInPlace makefile \
- --replace "aarch64" "arm64"
- '';
-
- buildPhase = ''
- runHook preBuild
- local HOME=$TMPDIR
- ./bin/nim c --parallelBuild:$NIX_BUILD_CORES koch
- ./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES
- ./koch toolsNoExternal $kochArgs --parallelBuild:$NIX_BUILD_CORES
- ./bin/nim js -d:release tools/dochack/dochack.nim
- runHook postBuild
- '';
-
- installPhase = ''
- runHook preInstall
- install -Dt $out/bin bin/*
- ln -sf $out/nim/bin/nim $out/bin/nim
- ln -sf $out/nim/lib $out/lib
- ./install.sh $out
- cp -a tools dist $out/nim/
- runHook postInstall
- '';
-
- passthru = {
- updateScript.command = [ ./update.sh ];
- };
-
- meta = with lib; {
- description = "Statically typed, imperative programming language";
- homepage = "https://nim-lang.org/";
- license = licenses.mit;
- mainProgram = "nim";
- maintainers = with maintainers; [ ehmry eveeifyeve ];
- };
- });
-
- nim-unwrapped-1 = nim-unwrapped-2.overrideAttrs (finalAttrs: prevAttrs: {
- version = "1.6.20";
- src = fetchurl {
- url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz";
- hash = "sha256-/+0EdQTR/K9hDw3Xzz4Ce+kaKSsMnFEWFQTC87mE/7k=";
- };
-
- patches = [
- ./NIM_CONFIG_DIR.patch
- # Override compiler configuration via an environmental variable
-
- ./nixbuild.patch
- # Load libraries at runtime by absolute path
-
- ./extra-mangling.patch
- # Mangle store paths of modules to prevent runtime dependence.
- ] ++ lib.optional (!stdenv.hostPlatform.isWindows) ./toLocation.patch;
- });
-
-} // (let
- wrapNim = { nim', patches }:
- let targetPlatformConfig = stdenv.targetPlatform.config;
- in stdenv.mkDerivation (finalAttrs: {
- name = "${targetPlatformConfig}-nim-wrapper-${nim'.version}";
- inherit (nim') version;
- preferLocalBuild = true;
- strictDeps = true;
-
- nativeBuildInputs = [ makeWrapper ];
-
- # Needed for any nim package that uses the standard library's
- # 'std/sysrand' module.
- depsTargetTargetPropagated = lib.optional stdenv.hostPlatform.isDarwin Security;
-
- inherit patches;
-
- unpackPhase = ''
- runHook preUnpack
- tar xf ${nim'.src} nim-$version/config
- cd nim-$version
- runHook postUnpack
- '';
-
- dontConfigure = true;
-
- buildPhase =
- # Configure the Nim compiler to use $CC and $CXX as backends
- # The compiler is configured by two configuration files, each with
- # a different DSL. The order of evaluation matters and that order
- # is not documented, so duplicate the configuration across both files.
- ''
- runHook preBuild
- cat >> config/config.nims << WTF
-
- switch("os", "${nimTarget.os}")
- switch("cpu", "${nimTarget.cpu}")
- switch("define", "nixbuild")
-
- # Configure the compiler using the $CC set by Nix at build time
- import strutils
- let cc = getEnv"CC"
- if cc.contains("gcc"):
- switch("cc", "gcc")
- elif cc.contains("clang"):
- switch("cc", "clang")
- WTF
-
- mv config/nim.cfg config/nim.cfg.old
- cat > config/nim.cfg << WTF
- os = "${nimTarget.os}"
- cpu = "${nimTarget.cpu}"
- define:"nixbuild"
- WTF
-
- cat >> config/nim.cfg < config/nim.cfg.old
- rm config/nim.cfg.old
-
- cat >> config/nim.cfg << WTF
-
- clang.cpp.exe %= "\$CXX"
- clang.cpp.linkerexe %= "\$CXX"
- clang.exe %= "\$CC"
- clang.linkerexe %= "\$CC"
- gcc.cpp.exe %= "\$CXX"
- gcc.cpp.linkerexe %= "\$CXX"
- gcc.exe %= "\$CC"
- gcc.linkerexe %= "\$CC"
- WTF
-
- runHook postBuild
- '';
-
- wrapperArgs = lib.optionals (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) [
- "--prefix PATH : ${lib.makeBinPath [ buildPackages.gdb ]}:${
- placeholder "out"
- }/bin"
- # Used by nim-gdb
-
- "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl pcre ]}"
- # These libraries may be referred to by the standard library.
- # This is broken for cross-compilation because the package
- # set will be shifted back by nativeBuildInputs.
-
- "--set NIM_CONFIG_PATH ${placeholder "out"}/etc/nim"
- # Use the custom configuration
- ];
-
- installPhase = ''
- runHook preInstall
-
- mkdir -p $out/bin $out/etc
-
- cp -r config $out/etc/nim
-
- for binpath in ${nim'}/bin/nim?*; do
- local binname=`basename $binpath`
- makeWrapper \
- $binpath $out/bin/${targetPlatformConfig}-$binname \
- $wrapperArgs
- ln -s $out/bin/${targetPlatformConfig}-$binname $out/bin/$binname
- done
-
- makeWrapper \
- ${nim'}/nim/bin/nim $out/bin/${targetPlatformConfig}-nim \
- --set-default CC $(command -v $CC) \
- --set-default CXX $(command -v $CXX) \
- $wrapperArgs
- ln -s $out/bin/${targetPlatformConfig}-nim $out/bin/nim
-
- makeWrapper \
- ${nim'}/bin/testament $out/bin/${targetPlatformConfig}-testament \
- $wrapperArgs
- ln -s $out/bin/${targetPlatformConfig}-testament $out/bin/testament
-
- '' + ''
- runHook postInstall
- '';
-
- passthru = { nim = nim'; };
-
- meta = nim'.meta // {
- description = nim'.meta.description
- + " (${targetPlatformConfig} wrapper)";
- platforms = with lib.platforms; unix ++ genode ++ windows;
- };
- });
-in {
-
- nim2 = wrapNim {
- nim' = buildPackages.nim-unwrapped-2;
- patches = [ ./nim2.cfg.patch ];
- };
-
- nim1 = wrapNim {
- nim' = buildPackages.nim-unwrapped-1;
- patches = [ ./nim.cfg.patch ];
- };
-
-})
diff --git a/pkgs/development/compilers/nim/update.sh b/pkgs/development/compilers/nim/update.sh
deleted file mode 100644
index a611f97b259a..000000000000
--- a/pkgs/development/compilers/nim/update.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p bash nix-update curl coreutils jq
-
-set -ex
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
-
-curl_github() {
- curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "$@"
-}
-
-
-case "$UPDATE_NIX_ATTR_PATH" in
-nim)
- latestTag=$(curl_github https://api.github.com/repos/nim-lang/Nim/releases/latest | jq -r ".tag_name")
- latestVersion="$(expr "$latestTag" : 'v\(.*\)')"
-
- echo "Updating Nim"
- nix-update --version "$latestVersion" \
- --override-filename "$SCRIPT_DIR/default.nix" \
- nim
-*)
- echo "Unknown attr path $UPDATE_NIX_ATTR_PATH"
- ;;
-esac
diff --git a/pkgs/development/compilers/open-watcom/bin.nix b/pkgs/development/compilers/open-watcom/bin.nix
index 1f8079908999..5e7805a31b30 100644
--- a/pkgs/development/compilers/open-watcom/bin.nix
+++ b/pkgs/development/compilers/open-watcom/bin.nix
@@ -1,4 +1,4 @@
-{ lib, stdenvNoCC, fetchurl, qemu, expect, writeScript, writeScriptBin, ncurses, bash, coreutils }:
+{ lib, stdenvNoCC, fetchurl, qemu, writeScript, writeScriptBin, ncurses, bash, coreutils, unixtools }:
let
@@ -48,41 +48,6 @@ let
exec ${wrapLegacyBinary} "$TARGET-unwrapped" "$TARGET"
'';
- # Do a scripted installation of OpenWatcom with its original installer.
- #
- # If maintaining this expect script turns out to be too much of a
- # hassle, we can switch to just using `unzip' on the installer and
- # the correct file permissions manually.
- performInstall = writeScriptBin "performInstall" ''
- #!${expect}/bin/expect -f
-
- spawn [lindex $argv 0]
-
- # Wait for button saying "I agree" with escape sequences.
- expect "gree"
-
- # Navigate to "I Agree!" and hit enter.
- send "\t\t\n"
-
- expect "Install Open Watcom"
-
- # Where do we want to install to.
- send "$env(out)\n"
-
- expect "will be installed"
-
- # Select Full Installation, Next
- send "fn"
-
- expect "Setup will now copy"
-
- # Next
- send "n"
-
- expect "completed successfully"
- send "\n"
- '';
-
in
stdenvNoCC.mkDerivation rec {
pname = "${passthru.prettyName}-unwrapped";
@@ -93,7 +58,7 @@ stdenvNoCC.mkDerivation rec {
sha256 = "1wzkvc6ija0cjj5mcyjng5b7hnnc5axidz030c0jh05pgvi4nj7p";
};
- nativeBuildInputs = [ wrapInPlace performInstall ];
+ nativeBuildInputs = [ wrapInPlace unixtools.script ];
dontUnpack = true;
dontConfigure = true;
@@ -104,7 +69,9 @@ stdenvNoCC.mkDerivation rec {
'';
installPhase = ''
- performInstall ./install-bin-unwrapped
+ # Command line options to do an unattended install are documented in
+ # https://github.com/open-watcom/open-watcom-v2/blob/master/bld/setupgui/setup.txt
+ script -c "./install-bin-unwrapped -dDstDir=$out -dFullInstall=1 -i"
for e in $(find $out/binl -type f -executable); do
echo "Wrapping $e"
diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix
index 000c59d67a38..17a43f50f7cd 100644
--- a/pkgs/development/compilers/smlnj/default.nix
+++ b/pkgs/development/compilers/smlnj/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, Libsystem }:
let
- version = "110.95";
+ version = "110.99.6.1";
baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}";
arch = if stdenv.hostPlatform.is64bit
@@ -8,9 +8,9 @@ let
else "32";
boot32 = { url = "${baseurl}/boot.x86-unix.tgz";
- sha256 = "07bcrvjphyin1ygjbymcqhd1mbfk4hff82wmxcllh77lr28l5dxf"; };
+ hash = "sha256-2yBY0wGZ8B1jYC5os9SfH6eKJoWlQ4rAclBC3Pnacoc="; };
boot64 = { url = "${baseurl}/boot.amd64-unix.tgz";
- sha256 = "1zn96a83kb6bn6228yfjsvb58m2qxw9k4j3qz0p9c8za479w4ch6"; };
+ hash = "sha256-kUabK03MdSYVRWhWKl3kS32SExUYpM3MtLU0mCxhiaQ="; };
bootBinary = if stdenv.hostPlatform.is64bit
then boot64
@@ -18,44 +18,32 @@ let
sources = map fetchurl [
bootBinary
- { url = "${baseurl}/config.tgz"; sha256 = "09srqxkxl86iaz6l6dz83c1apsac0pxpfq6b74i6l0nfl261jibw"; }
- { url = "${baseurl}/cm.tgz"; sha256 = "0gh8inrb07z597axw8qipwyx52m8nac5d5r0rvgzvdnnjg9nr9zy"; }
- { url = "${baseurl}/compiler.tgz"; sha256 = "1kk6jwzyc261l5nii3n8rwccmgvcj1mg5fgycfsfsiyyy1v8xfx7"; }
- { url = "${baseurl}/runtime.tgz"; sha256 = "17i069h5cv411sgzx3ynlf4v3wlrxiba9bwy1b0x0cyhs879kppc"; }
- { url = "${baseurl}/system.tgz"; sha256 = "0s8ij3wfxpjrmrwxrgrirfxjj8vkda6l32j88al5q1ic3ncwc58s"; }
- { url = "${baseurl}/MLRISC.tgz"; sha256 = "1v2d3gjxrcgc95x5glqcw0nfp13aapkcw03fyi70m3k1yc61izmz"; }
- { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "04i11ki8v9s7yz3lg6b0djhi03zzkzav0b5cr81ypxlkmf4hh6bp"; }
- { url = "${baseurl}/old-basis.tgz"; sha256 = "1ryqpy0n7c9gd995ndmjvaci74f95nr8n1jjgm28yd1sn7hnavhi"; }
- { url = "${baseurl}/ckit.tgz"; sha256 = "18mcs3j8c5gq9cmck7r175am60blaznqmhzyir622yfc8fpw1map"; }
- { url = "${baseurl}/nlffi.tgz"; sha256 = "16mrl5aqbgsgljxa3z8kj5max9drddml34bq7rn1i78594jfvkwk"; }
- { url = "${baseurl}/cml.tgz"; sha256 = "00x784nv1pi6534k3vva26i9qx84cvw242vgwbs5020zkm6gvrmn"; }
- { url = "${baseurl}/eXene.tgz"; sha256 = "143825h36v6z77kwvrvpszgwnhmjs3yldb18i9z4lwkqfb4kn7f7"; }
- { url = "${baseurl}/ml-lpt.tgz"; sha256 = "17ly9h9ry8r94dx6lkas6w2cxknwkpma4z9pj8rgzmd3w6qm7j1z"; }
- { url = "${baseurl}/ml-lex.tgz"; sha256 = "1ja3l2kiq17754c58mwdiqi25f7ax0cji2wk0vq4872iwwxc22px"; }
- { url = "${baseurl}/ml-yacc.tgz"; sha256 = "1m48nkwvw87yg39sjihlw8na5m34bzz3d4zpfbjaj2f75fkjy3jf"; }
- { url = "${baseurl}/ml-burg.tgz"; sha256 = "13nbvbah7bn8gjm4gi41m412vpl69wd6d3x3wzbb6xpia9vm4z4j"; }
- { url = "${baseurl}/pgraph.tgz"; sha256 = "1aizkl8avz01kx221xy5z7a1a1b5xqn2hrk66wr8d0iav2nh5c98"; }
- { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "1c80xgck9sb2rm554nfg4f5mpjkdbrwkcx88pj120056225l10vx"; }
- { url = "${baseurl}/heap2asm.tgz"; sha256 = "1n68drd7as5dy20ccfvgd9cmnhfpfvz7g3f0gc8kpaqaz3vpy36g"; }
- { url = "${baseurl}/smlnj-c.tgz"; sha256 = "1b6svh2kk5211rq73fdwx3sf80d2rshf0dmkkrq5mw4852nzqz3p"; }
- { url = "${baseurl}/doc.tgz"; sha256 = "021yzhy9maypq4ahz0d0qpr601spndg583fn9mapv6rl42kwhjq6"; }
- { url = "${baseurl}/asdl.tgz"; sha256 = "0nqavqcbidwnphbbwjrxhpy8glbyad51wy0cpqimbsw3sgns0zkd"; }
+ { url = "${baseurl}/config.tgz"; hash = "sha256-9BJPpa/xouqi3j39WsfzlRys4z1yxTdbYttHF5VwCVw="; }
+ { url = "${baseurl}/cm.tgz"; hash = "sha256-A3crC5EWX4kEB6olwdaObglQgkBBNqcBSCi/pQR5Wdw="; }
+ { url = "${baseurl}/compiler.tgz"; hash = "sha256-cTgkc5opaEXskdzt5yYsdjyF5m9846t2SyEiwY6W3HU="; }
+ { url = "${baseurl}/runtime.tgz"; hash = "sha256-JiNzfuZnp1eWQPNZBb9SPmQXtwgknpoGl+38iqUU3W4="; }
+ { url = "${baseurl}/system.tgz"; hash = "sha256-HUn8YCxlLe6+e5H9oMJjIoG23GBF3thMlHEkSGLZTus="; }
+ { url = "${baseurl}/MLRISC.tgz"; hash = "sha256-MPNpYhrbsIbVEOzJ7GIEQCm/7F/Jnxj0UXS7FeTp+7o="; }
+ { url = "${baseurl}/smlnj-lib.tgz"; hash = "sha256-1tp5waPl7MCWS4kIUFm/woQeeRfCjkpgSxHpGb+ymTM="; }
+ { url = "${baseurl}/old-basis.tgz"; hash = "sha256-I6DJRfIx+09ynFKXZ63dDWRpv0pEljWciAarK/EhQ/s="; }
+ { url = "${baseurl}/ckit.tgz"; hash = "sha256-vi6dSZISL+KWkpp/jxLPCNBno+qTYThvbExZ5R5L7Wc="; }
+ { url = "${baseurl}/nlffi.tgz"; hash = "sha256-WfYmX7dhrBqtE4juDVNyjuFtsJ1H+B7rJY2BXJYtKNM="; }
+ { url = "${baseurl}/cml.tgz"; hash = "sha256-5rZzp5IUj/xZX0fyeoNMohyTz1ifdY6Anu/Hg0spDQw="; }
+ { url = "${baseurl}/eXene.tgz"; hash = "sha256-c5QnjAQTtlBgYE6DGFMNDbu9ILSEVZgzs/u0bIowfHc="; }
+ { url = "${baseurl}/ml-lpt.tgz"; hash = "sha256-aRYFTEEl4td7LQ0LhsXGLtJ/ptwCDV1m9GeDtM7+vlo="; }
+ { url = "${baseurl}/ml-lex.tgz"; hash = "sha256-ZwO3xQUDaD2f7Tsro6kkahT7vSN1JvQbLkwY/m7xSIs="; }
+ { url = "${baseurl}/ml-yacc.tgz"; hash = "sha256-DBR4xmKiSA5on7+YDz7Zr8qBA6aD1fS64+g69ukSprc="; }
+ { url = "${baseurl}/ml-burg.tgz"; hash = "sha256-4ruWhGjxny97eUD9Gk4FakqEZzNHwJp7uSa97ET20p0="; }
+ { url = "${baseurl}/pgraph.tgz"; hash = "sha256-kDyaAMB6Pt3CdAna+V8aLfTx8Tj6a5vPfuSxtpga08w="; }
+ { url = "${baseurl}/trace-debug-profile.tgz"; hash = "sha256-AD9KWsskRkjTFYiRCIm0qj02sIBHG6HtBM5wKMBqeXY="; }
+ { url = "${baseurl}/heap2asm.tgz"; hash = "sha256-OHNPMErNoLpYuatgbgYlU/mMB4JXQ4aA50WZ2BHtt3I="; }
+ { url = "${baseurl}/smlnj-c.tgz"; hash = "sha256-Vure6h0TKqne5+5MJBX9cRkBgmrJ/kKVLUzrIIiH7lE="; }
+ { url = "${baseurl}/doc.tgz"; hash = "sha256-PliWxCffISPrAO7Zan33recFLRmGoqZLKHOzSEP0PEk="; }
+ { url = "${baseurl}/asdl.tgz"; hash = "sha256-O6/g20/hsMTG3CvMA59btjG+4UdUbGhMHkizESKJDEA="; }
];
in stdenv.mkDerivation {
pname = "smlnj";
- inherit version;
-
- inherit sources;
-
- patchPhase = ''
- sed -i '/PATH=/d' config/_arch-n-opsys base/runtime/config/gen-posix-names.sh
- echo SRCARCHIVEURL="file:/$TMP" > config/srcarchiveurl
- patch --verbose config/_heap2exec ${./heap2exec.diff}
- '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
- # Locate standard headers like
- substituteInPlace base/runtime/config/gen-posix-names.sh \
- --replace "\$SDK_PATH/usr" "${Libsystem}"
- '';
+ inherit version sources;
unpackPhase = ''
for s in $sources; do
@@ -67,6 +55,15 @@ in stdenv.mkDerivation {
./config/unpack $TMP runtime
'';
+ patchPhase = ''
+ sed -i '/^PATH=/d' config/_arch-n-opsys base/runtime/config/gen-posix-names.sh
+ echo SRCARCHIVEURL="file:/$TMP" > config/srcarchiveurl
+ '' + lib.optionalString stdenv.isDarwin ''
+ # Locate standard headers like
+ substituteInPlace base/runtime/config/gen-posix-names.sh \
+ --replace "\$SDK_PATH/usr" "${Libsystem}"
+ '';
+
buildPhase = ''
./config/install.sh -default ${arch}
'';
@@ -81,12 +78,12 @@ in stdenv.mkDerivation {
done
'';
- meta = with lib; {
+ meta = {
description = "Standard ML of New Jersey, a compiler";
homepage = "http://smlnj.org";
- license = licenses.bsd3;
+ license = lib.licenses.bsd3;
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
- maintainers = with maintainers; [ thoughtpolice ];
+ maintainers = with lib.maintainers; [ skyesoss thoughtpolice ];
mainProgram = "sml";
# never built on x86_64-darwin since first introduction in nixpkgs
broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
diff --git a/pkgs/development/compilers/smlnj/heap2exec.diff b/pkgs/development/compilers/smlnj/heap2exec.diff
deleted file mode 100644
index ef21a8e7f072..000000000000
--- a/pkgs/development/compilers/smlnj/heap2exec.diff
+++ /dev/null
@@ -1,9 +0,0 @@
-@@ -35,7 +35,7 @@
- BIN_DIR=${SMLNJ_HOME}/bin
- fi
-
--ARCH_N_OPSYS=`"$BIN_DIR/.arch-n-opsys $SIZE_OPT"`
-+ARCH_N_OPSYS=`$BIN_DIR/.arch-n-opsys $SIZE_OPT`
- if [ "$?" != "0" ]; then
- die "unable to determine architecture/operating system"
- fi
diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix
index f3d4694202f9..191972664b33 100644
--- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix
+++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix
@@ -9,6 +9,7 @@ let
repo = "analysis";
owner = "math-comp";
+ release."1.5.0".sha256 = "sha256-EWogrkr5TC5F9HjQJwO3bl4P8mij8U7thUGJNNI+k88=";
release."1.4.0".sha256 = "sha256-eDggeuEU0fMK7D5FbxvLkbAgpLw5lwL/Rl0eLXAnJeg=";
release."1.2.0".sha256 = "sha256-w6BivDM4dF4Iv4rUTy++2feweNtMAJxgGExPfYGhXxo=";
release."1.1.0".sha256 = "sha256-wl4kZf4mh9zbFfGcqaFEgWRyp0Bj511F505mYodpS6o=";
@@ -33,7 +34,7 @@ let
defaultVersion = let inherit (lib.versions) range; in
lib.switch [ coq.version mathcomp.version ] [
- { cases = [ (range "8.19" "8.20") (range "2.1.0" "2.2.0") ]; out = "1.4.0"; }
+ { cases = [ (range "8.19" "8.20") (range "2.1.0" "2.2.0") ]; out = "1.5.0"; }
{ cases = [ (range "8.17" "8.20") (range "2.0.0" "2.2.0") ]; out = "1.1.0"; }
{ cases = [ (range "8.17" "8.19") (range "1.17.0" "1.19.0") ]; out = "0.7.0"; }
{ cases = [ (range "8.17" "8.18") (range "1.15.0" "1.18.0") ]; out = "0.6.7"; }
@@ -50,14 +51,26 @@ let
] null;
# list of analysis packages sorted by dependency order
- packages = [ "classical" "analysis" ];
+ packages = {
+ "classical" = [];
+ "reals" = [ "classical" ];
+ "altreals" = [ "reals" ];
+ "analysis" = [ "reals" ];
+ "reals-stdlib" = [ "reals" ];
+ "analysis-stdlib" = [ "analysis" "reals-stdlib" ];
+ };
mathcomp_ = package: let
classical-deps = [ mathcomp.algebra mathcomp-finmap ];
+ altreals-deps = [ mathcomp-bigenough ];
analysis-deps = [ mathcomp.field mathcomp-bigenough ];
- intra-deps = lib.optionals (package != "single") (map mathcomp_ (lib.head (lib.splitList (lib.pred.equal package) packages)));
- pkgpath = if package == "single" then "."
- else if package == "analysis" then "theories" else "${package}";
+ intra-deps = lib.optionals (package != "single") (map mathcomp_ packages.${package});
+ pkgpath = lib.switch package [
+ { case = "single"; out = "."; }
+ { case = "analysis"; out = "theories"; }
+ { case = "reals-stdlib"; out = "reals_stdlib"; }
+ { case = "analysis-stdlib"; out = "analysis_stdlib"; }
+ ] package;
pname = if package == "single" then "mathcomp-analysis-single"
else "mathcomp-${package}";
derivation = mkCoqDerivation ({
@@ -68,6 +81,7 @@ let
propagatedBuildInputs =
intra-deps
++ lib.optionals (lib.elem package [ "classical" "single" ]) classical-deps
+ ++ lib.optionals (lib.elem package [ "altreals" "single" ]) altreals-deps
++ lib.optionals (lib.elem package [ "analysis" "single" ]) analysis-deps;
preBuild = ''
@@ -80,7 +94,7 @@ let
license = lib.licenses.cecill-c;
};
- passthru = lib.genAttrs packages mathcomp_;
+ passthru = lib.mapAttrs (package: deps: mathcomp_ package) packages;
});
# split packages didn't exist before 0.6, so bulding nothing in that case
patched-derivation1 = derivation.overrideAttrs (o:
@@ -93,7 +107,13 @@ let
o.version != null && o.version != "dev" && lib.versions.isLt "0.6" o.version)
{ preBuild = ""; }
);
- patched-derivation = patched-derivation2.overrideAttrs (o:
+ # only packages classical and analysis existed before 1.7, so bulding nothing in that case
+ patched-derivation3 = patched-derivation2.overrideAttrs (o:
+ lib.optionalAttrs (o.pname != null && o.pname != "mathcomp-classical" && o.pname != "mathcomp-analysis" &&
+ o.version != null && o.version != "dev" && lib.versions.isLt "1.7" o.version)
+ { preBuild = ""; buildPhase = "echo doing nothing"; installPhase = "echo doing nothing"; }
+ );
+ patched-derivation = patched-derivation3.overrideAttrs (o:
lib.optionalAttrs (o.version != null
&& (o.version == "dev" || lib.versions.isGe "0.3.4" o.version))
{
diff --git a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix
index 028d32c5af5f..ba42a24720c6 100644
--- a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix
+++ b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix
@@ -7,12 +7,14 @@
inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp-analysis.version] [
+ { cases = [ (range "8.18" "8.20") (isGe "1.5") ]; out = "0.7.3"; }
{ cases = [ (range "8.18" "8.19") (isGe "1.2") ]; out = "0.7.2"; }
{ cases = [ (range "8.17" "8.19") (isGe "1.0") ]; out = "0.7.1"; }
{ cases = [ (isGe "8.17") (range "0.6.6" "0.7.0") ]; out = "0.6.1"; }
{ cases = [ (range "8.17" "8.18") (range "0.6.0" "0.6.7") ]; out = "0.5.2"; }
{ cases = [ (range "8.15" "8.16") (range "0.5.4" "0.6.5") ]; out = "0.5.1"; }
] null;
+ release."0.7.3".sha256 = "sha256-7+qPtE1KfDmo9ZsQtWMzoR2MYnFpTjFHK/yZYVm+GxA=";
release."0.7.2".sha256 = "sha256-dekrdVmuTcqXXmKhIb831EKtMhbPrXHJZhzmGb9rdRo=";
release."0.7.1".sha256 = "sha256-/4Elb35SmscG6EjEcHYDo+AmWrpBUlygZL0WhaD+fcY=";
release."0.6.1".sha256 = "sha256-tFB5lrwRPIlHkP+ebgcJwu03Cc9yVaOINOAo8Bf2LT4=";
diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix
index c79261aa174f..9452ac977b6f 100644
--- a/pkgs/development/coq-modules/metacoq/default.nix
+++ b/pkgs/development/coq-modules/metacoq/default.nix
@@ -38,15 +38,28 @@ let
};
releaseRev = v: "v${v}";
- # list of core metacoq packages sorted by dependency order
- packages = if lib.versionAtLeast coq.coq-version "8.17" || coq.coq-version == "dev"
- then [ "utils" "common" "template-coq" "pcuic" "safechecker" "template-pcuic" "erasure" "quotation" "safechecker-plugin" "erasure-plugin" "all" ]
- else [ "template-coq" "pcuic" "safechecker" "erasure" "all" ];
+ # list of core metacoq packages and their dependencies
+ packages = {
+ "utils" = [];
+ "common" = [ "utils" ];
+ "template-coq" = [ "common" ];
+ "pcuic" = if (lib.versionAtLeast coq.coq-version "8.17" || coq.coq-version == "dev")
+ then [ "common" ]
+ else [ "template-coq" ];
+ "safechecker" = [ "pcuic" ];
+ "template-pcuic" = [ "template-coq" "pcuic" ];
+ "erasure" = [ "safechecker" "template-pcuic" ];
+ "quotation" = [ "template-coq" "pcuic" "template-pcuic" ];
+ "safechecker-plugin" = [ "template-pcuic" "safechecker" ];
+ "erasure-plugin" = [ "template-pcuic" "erasure" ];
+ "translations" = [ "template-coq" ];
+ "all" = [ "safechecker-plugin" "erasure-plugin" "translations" "quotation" ];
+ };
template-coq = metacoq_ "template-coq";
metacoq_ = package: let
- metacoq-deps = lib.optionals (package != "single") (map metacoq_ (lib.head (lib.splitList (lib.pred.equal package) packages)));
+ metacoq-deps = lib.optionals (package != "single") (map metacoq_ packages.${package});
pkgpath = if package == "single" then "./" else "./${package}";
pname = if package == "all" then "metacoq" else "metacoq-${package}";
pkgallMake = ''
@@ -81,7 +94,7 @@ let
configurePhase = lib.optionalString (package == "all") pkgallMake + ''
touch ${pkgpath}/metacoq-config
- '' + lib.optionalString (lib.elem package ["safechecker" "erasure" "template-pcuic" "quotation" "safechecker-plugin" "erasure-plugin"]) ''
+ '' + lib.optionalString (lib.elem package ["erasure" "template-pcuic" "quotation" "safechecker-plugin" "erasure-plugin" "translations"]) ''
echo "-I ${template-coq}/lib/coq/${coq.coq-version}/user-contrib/MetaCoq/Template/" > ${pkgpath}/metacoq-config
'' + lib.optionalString (package == "single") ''
./configure.sh local
@@ -97,7 +110,7 @@ let
maintainers = with lib.maintainers; [ cohencyril ];
};
} // lib.optionalAttrs (package != "single")
- { passthru = lib.genAttrs packages metacoq_; })
+ { passthru = lib.mapAttrs (package: deps: metacoq_ package) packages; })
).overrideAttrs (o:
let requiresOcamlStdlibShims = lib.versionAtLeast o.version "1.0-8.16" ||
(o.version == "dev" && (lib.versionAtLeast coq.coq-version "8.16" || coq.coq-version == "dev")) ;
@@ -105,6 +118,14 @@ let
{
propagatedBuildInputs = o.propagatedBuildInputs ++ lib.optional requiresOcamlStdlibShims coq.ocamlPackages.stdlib-shims;
});
- in derivation;
+ # utils, common, template-pcuic, quotation, safechecker-plugin, and erasure-plugin
+ # packages didn't exist before 1.2, so bulding nothing in that case
+ patched-derivation = derivation.overrideAttrs (o:
+ lib.optionalAttrs (o.pname != null &&
+ lib.elem package [ "utils" "common" "template-pcuic" "quotation" "safechecker-plugin" "erasure-plugin" ] &&
+ o.version != null && o.version != "dev" && lib.versions.isLt "1.2" o.version)
+ { patchPhase = ""; configurePhase = ""; preBuild = ""; buildPhase = "echo doing nothing"; installPhase = "echo doing nothing"; }
+ );
+ in patched-derivation;
in
metacoq_ (if single then "single" else "all")
diff --git a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix b/pkgs/development/cuda-modules/cuda-library-samples/generic.nix
index f5d1c250cfca..43d2bece88c9 100644
--- a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix
+++ b/pkgs/development/cuda-modules/cuda-library-samples/generic.nix
@@ -36,6 +36,7 @@ let
cuSPARSE, cuSOLVER, cuFFT, cuRAND, NPP and nvJPEG.
'';
license = lib.licenses.bsd3;
+ platforms = [ "x86_64-linux" ];
maintainers = with lib.maintainers; [ obsidian-systems-maintenance ] ++ lib.teams.cuda.members;
};
};
diff --git a/pkgs/development/cuda-modules/cuda-samples/generic.nix b/pkgs/development/cuda-modules/cuda-samples/generic.nix
index ed9c57f3d00c..97e05957d3ed 100644
--- a/pkgs/development/cuda-modules/cuda-samples/generic.nix
+++ b/pkgs/development/cuda-modules/cuda-samples/generic.nix
@@ -73,6 +73,7 @@ backendStdenv.mkDerivation (finalAttrs: {
description = "Samples for CUDA Developers which demonstrates features in CUDA Toolkit";
# CUDA itself is proprietary, but these sample apps are not.
license = lib.licenses.bsd3;
+ platforms = [ "x86_64-linux" ];
maintainers = with lib.maintainers; [ obsidian-systems-maintenance ] ++ lib.teams.cuda.members;
};
})
diff --git a/pkgs/development/embedded/edl/default.nix b/pkgs/development/embedded/edl/default.nix
index 86f27bf6a2b2..87b5fd6149ac 100644
--- a/pkgs/development/embedded/edl/default.nix
+++ b/pkgs/development/embedded/edl/default.nix
@@ -8,14 +8,14 @@
python3Packages.buildPythonPackage {
pname = "edl";
- version = "3.52.1-unstable-2024-08-27";
+ version = "3.52.1-unstable-2024-10-12";
src = fetchFromGitHub {
owner = "bkerler";
repo = "edl";
- rev = "d2c585e4ccc066895b71ca9014c1ebb5af316e07";
+ rev = "cef0076e1d4d29c1887c51786eb588503657b907";
fetchSubmodules = true;
- hash = "sha256-hQturda+iDmH5DVP1CjG526wcggdzTSrW2jqrEzLXtY=";
+ hash = "sha256-FOsgmM+i++t2MZiJTKV0Et8KXKDKQoFop67P6DdW1EY=";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/development/gnuradio-modules/grnet/default.nix b/pkgs/development/gnuradio-modules/grnet/default.nix
index 77390e52340b..7fb8d10997e1 100644
--- a/pkgs/development/gnuradio-modules/grnet/default.nix
+++ b/pkgs/development/gnuradio-modules/grnet/default.nix
@@ -8,7 +8,7 @@
, boost
, logLib
, python
-, swig
+, swig3
, mpir
, gmp
, doxygen
@@ -78,7 +78,7 @@ mkDerivation {
pybind11
numpy
] else [
- swig
+ swig3
thrift
python.pkgs.thrift
]);
diff --git a/pkgs/development/gnuradio-modules/gsm/default.nix b/pkgs/development/gnuradio-modules/gsm/default.nix
index 9f184b7be7fb..af7a018f4798 100644
--- a/pkgs/development/gnuradio-modules/gsm/default.nix
+++ b/pkgs/development/gnuradio-modules/gsm/default.nix
@@ -4,7 +4,7 @@
, cmake
, pkg-config
, cppunit
-, swig
+, swig3
, boost
, logLib
, python
@@ -27,7 +27,7 @@ mkDerivation {
nativeBuildInputs = [
cmake
pkg-config
- swig
+ swig3
python
];
diff --git a/pkgs/development/gnuradio-modules/limesdr/default.nix b/pkgs/development/gnuradio-modules/limesdr/default.nix
index 62db654270b9..27c846c44af5 100644
--- a/pkgs/development/gnuradio-modules/limesdr/default.nix
+++ b/pkgs/development/gnuradio-modules/limesdr/default.nix
@@ -5,7 +5,7 @@
, thrift
, cmake
, pkg-config
-, swig
+, swig3
, python
, logLib
, mpir
@@ -38,7 +38,7 @@ in mkDerivation {
nativeBuildInputs = [
cmake
pkg-config
- swig
+ swig3
python
];
buildInputs = [
diff --git a/pkgs/development/gnuradio-modules/nacl/default.nix b/pkgs/development/gnuradio-modules/nacl/default.nix
index 0900ca943b97..34cd04aff4ea 100644
--- a/pkgs/development/gnuradio-modules/nacl/default.nix
+++ b/pkgs/development/gnuradio-modules/nacl/default.nix
@@ -4,7 +4,7 @@
, cmake
, pkg-config
, cppunit
-, swig
+, swig3
, boost
, logLib
, python
@@ -26,7 +26,7 @@ mkDerivation {
nativeBuildInputs = [
cmake
pkg-config
- swig
+ swig3
python
];
diff --git a/pkgs/development/gnuradio-modules/osmosdr/default.nix b/pkgs/development/gnuradio-modules/osmosdr/default.nix
index 663ffafd7f3b..aae85f02ab74 100644
--- a/pkgs/development/gnuradio-modules/osmosdr/default.nix
+++ b/pkgs/development/gnuradio-modules/osmosdr/default.nix
@@ -14,7 +14,7 @@
, thrift
, fftwFloat
, python
-, swig
+, swig3
, uhd
, icu
, airspy
@@ -85,7 +85,7 @@ in mkDerivation {
nativeBuildInputs = [
cmake
pkg-config
- swig
+ swig3
] ++ lib.optionals (gnuradio.hasFeature "python-support") [
(if (gnuradio.versionAttr.major == "3.7") then
python.pkgs.cheetah
diff --git a/pkgs/development/gnuradio-modules/rds/default.nix b/pkgs/development/gnuradio-modules/rds/default.nix
index 9a6f2ccbbad4..5b9a20042cb9 100644
--- a/pkgs/development/gnuradio-modules/rds/default.nix
+++ b/pkgs/development/gnuradio-modules/rds/default.nix
@@ -4,7 +4,7 @@
, gnuradio
, cmake
, pkg-config
-, swig
+, swig3
, python
, logLib
, mpir
@@ -50,7 +50,7 @@ in mkDerivation {
nativeBuildInputs = [
cmake
pkg-config
- swig
+ swig3
python
];
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index df8173ec4f26..03a4838be7e5 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -188,27 +188,27 @@ self: super: builtins.intersectAttrs super {
hledger-web = installHledgerExtraFiles "" (hledgerWebTestFix super.hledger-web);
hledger-ui = installHledgerExtraFiles "" super.hledger-ui;
- hledger_1_34 = installHledgerExtraFiles "embeddedfiles"
- (doDistribute (super.hledger_1_34.override {
- hledger-lib = self.hledger-lib_1_34;
+ hledger_1_40 = installHledgerExtraFiles "embeddedfiles"
+ (doDistribute (super.hledger_1_40.override {
+ hledger-lib = self.hledger-lib_1_40;
}));
- hledger-ui_1_34 = installHledgerExtraFiles ""
- (doDistribute (super.hledger-ui_1_34.override {
- hledger = self.hledger_1_34;
- hledger-lib = self.hledger-lib_1_34;
+ hledger-ui_1_40 = installHledgerExtraFiles ""
+ (doDistribute (super.hledger-ui_1_40.override {
+ hledger = self.hledger_1_40;
+ hledger-lib = self.hledger-lib_1_40;
}));
- hledger-web_1_34 = installHledgerExtraFiles "" (hledgerWebTestFix
- (doDistribute (super.hledger-web_1_34.override {
- hledger = self.hledger_1_34;
- hledger-lib = self.hledger-lib_1_34;
+ hledger-web_1_40 = installHledgerExtraFiles "" (hledgerWebTestFix
+ (doDistribute (super.hledger-web_1_40.override {
+ hledger = self.hledger_1_40;
+ hledger-lib = self.hledger-lib_1_40;
})));
}
) hledger
hledger-web
hledger-ui
- hledger_1_34
- hledger-ui_1_34
- hledger-web_1_34
+ hledger_1_40
+ hledger-ui_1_40
+ hledger-web_1_40
;
cufft = overrideCabal (drv: {
diff --git a/pkgs/development/interpreters/babashka/default.nix b/pkgs/development/interpreters/babashka/default.nix
index f4b51b37c480..f413c47b8169 100644
--- a/pkgs/development/interpreters/babashka/default.nix
+++ b/pkgs/development/interpreters/babashka/default.nix
@@ -9,11 +9,11 @@
let
babashka-unwrapped = buildGraalvmNativeImage rec {
pname = "babashka-unwrapped";
- version = "1.4.192";
+ version = "1.12.194";
src = fetchurl {
url = "https://github.com/babashka/babashka/releases/download/v${version}/babashka-${version}-standalone.jar";
- sha256 = "sha256-uVRk1/lfOXMSp3qOdeMoAFpwJaEBxF1MYtFOv364H7Y=";
+ sha256 = "sha256-Dx3AANMpmCPH8Zaz8/9FRNRRhcEPnZHXQje47udwwRQ=";
};
graalvmDrv = graalvmCEPackages.graalvm-ce;
@@ -37,6 +37,7 @@ let
$out/bin/bb '(vec (dedupe *input*))' <<< '[1 1 1 1 2]' | fgrep '[1 2]'
$out/bin/bb '(prn "bépo àê")' | fgrep 'bépo àê'
$out/bin/bb '(:out (babashka.process/sh "echo" "ä"))' | fgrep 'ä'
+ $out/bin/bb '(into-array [:f])'
'';
postInstall = ''
diff --git a/pkgs/development/interpreters/bqn/cbqn/sources.nix b/pkgs/development/interpreters/bqn/cbqn/sources.nix
index 3b9ca78533e3..48470c50e1ba 100644
--- a/pkgs/development/interpreters/bqn/cbqn/sources.nix
+++ b/pkgs/development/interpreters/bqn/cbqn/sources.nix
@@ -10,13 +10,13 @@
cbqn = let
self = {
pname = "cbqn";
- version = "0.7.0";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "dzaima";
repo = "CBQN";
rev = "v${self.version}";
- hash = "sha256-TUK0HrJ1IyiVi9Y3S1IrK/d4/EZxdRdWyxsAwj79KEc=";
+ hash = "sha256-vmd7CX0jgozysmjKK0p5GM4Qd3vY71q1kcKwfr+6fkw=";
};
};
in
@@ -24,13 +24,13 @@
cbqn-bytecode = {
pname = "cbqn-bytecode";
- version = "0-unstable-2024-05-22";
+ version = "0-unstable-2024-09-15";
src = fetchFromGitHub {
owner = "dzaima";
repo = "cbqnBytecode";
- rev = "c5674783c11d7569e5a4d166600ffcde2409331d";
- hash = "sha256-y7gqHzUxVUUVryutlq3Upuso8r3ZRSyF7ydMg1OVlwA=";
+ rev = "c7d83937710889591bad3525077afc30a21e5148";
+ hash = "sha256-bEHyiJusddBuTk7MZX1NGvkj66WeOJv5qxBQV6Uhs1E=";
};
};
@@ -48,13 +48,13 @@
singeli = {
pname = "singeli";
- version = "0-unstable-2024-02-26";
+ version = "0-unstable-2024-09-29";
src = fetchFromGitHub {
owner = "mlochbaum";
repo = "Singeli";
- rev = "ce6ef5d06d35777f0016bbfe0c6c1cf6a9c1b48e";
- hash = "sha256-dDoWoq4LYMD2CKyPxXDAwoeH2E+f0FDyvngtWPEr67w=";
+ rev = "b43f3999b0c5a40b43ceee258fbe6bb8245d06af";
+ hash = "sha256-tf5mYIV368Y2cgYJ0U4OZQxuN6kldHUKi9oSjAHbA4Y=";
};
};
}
diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix
index 0f7b65df95ef..082fa879e2f7 100644
--- a/pkgs/development/interpreters/lua-5/interpreter.nix
+++ b/pkgs/development/interpreters/lua-5/interpreter.nix
@@ -169,6 +169,7 @@ stdenv.mkDerivation (finalAttrs:
management with incremental garbage collection, making it ideal
for configuration, scripting, and rapid prototyping.
'';
+ mainProgram = "lua";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
};
diff --git a/pkgs/development/interpreters/micropython/default.nix b/pkgs/development/interpreters/micropython/default.nix
index df34036a9423..e557a0614d9f 100644
--- a/pkgs/development/interpreters/micropython/default.nix
+++ b/pkgs/development/interpreters/micropython/default.nix
@@ -9,16 +9,16 @@
stdenv.mkDerivation rec {
pname = "micropython";
- version = "1.23.0";
+ version = "1.24.0";
src = fetchFromGitHub {
owner = "micropython";
repo = "micropython";
rev = "v${version}";
- hash = "sha256-coUFIepbCRuz+766E7VCTQLm0oWB1CTO20ATriC86dc=";
+ hash = "sha256-cFoUa4ZpPy1MldlTeY9ISXi9ilulmhmaH5mapUDBzE8=";
fetchSubmodules = true;
- # remove unused libaries from rp2 port's SDK. we leave this and the other
+ # remove unused libraries from rp2 port's SDK. we leave this and the other
# ports around for users who want to override makeFlags flags to build them.
# https://github.com/micropython/micropython/blob/a61c446c0b34e82aeb54b9770250d267656f2b7f/ports/rp2/CMakeLists.txt#L17-L22
#
diff --git a/pkgs/development/interpreters/nelua/default.nix b/pkgs/development/interpreters/nelua/default.nix
index bde0104e6c1b..2a3bd7a768ef 100644
--- a/pkgs/development/interpreters/nelua/default.nix
+++ b/pkgs/development/interpreters/nelua/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "nelua";
- version = "0-unstable-2024-09-22";
+ version = "0-unstable-2024-10-18";
src = fetchFromGitHub {
owner = "edubart";
repo = "nelua-lang";
- rev = "ff7a42c275239933f6e615b2ad2e6a8d507afe7b";
- hash = "sha256-SQg7Z9Ag+UwIhrjgobAEiVEGu/GgFZKw3lquu4/4rHI=";
+ rev = "038c45f19842d7b18c32b6b4f7e631e15d77d453";
+ hash = "sha256-Qnr+A4nYPnBLUxNGRbUwEwuw2POV0AKXtpKKYcLtF1M=";
};
postPatch = ''
diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix
index 9482ca500eb9..adf8fbfe5981 100644
--- a/pkgs/development/interpreters/php/8.1.nix
+++ b/pkgs/development/interpreters/php/8.1.nix
@@ -21,10 +21,13 @@ let
})
# Backport of PHP_LIBXML_IGNORE_DEPRECATIONS_START and PHP_LIBXML_IGNORE_DEPRECATIONS_END
# Required for libxml2 2.13 compatibility patch.
- ./php81-fix-libxml2-2.13-compatibility.patch
+ (fetchpatch {
+ url = "https://github.com/php/php-src/commit/e2d97314ab342d434e778cd00a2f34e4bdb07664.patch";
+ hash = "sha256-w0hyYUgbRGpvIBfWeDTSEUGpiJdyrtNjKy+Fn1vyAO0=";
+ })
# Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch.
(fetchpatch {
- url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch";
+ url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch";
hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
})
];
diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix
index 50f70617fe1c..e1b8d2201e57 100644
--- a/pkgs/development/interpreters/php/8.2.nix
+++ b/pkgs/development/interpreters/php/8.2.nix
@@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
- version = "8.2.24";
- hash = "sha256-TMduxkTu6X0XySv+jQ6EcU/t8pmlOLffrcBjndDcQy8=";
+ version = "8.2.25";
+ hash = "sha256-B7QcXpbGDAllEORfAvgYQU0RvdDV2htoQN26K6colAE=";
});
in
base.withExtensions ({ all, ... }: with all; ([
diff --git a/pkgs/development/interpreters/php/php81-fix-libxml2-2.13-compatibility.patch b/pkgs/development/interpreters/php/php81-fix-libxml2-2.13-compatibility.patch
deleted file mode 100644
index b4624676ee29..000000000000
--- a/pkgs/development/interpreters/php/php81-fix-libxml2-2.13-compatibility.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h
-index a1011f0b17..7a7622c482 100644
---- a/ext/libxml/php_libxml.h
-+++ b/ext/libxml/php_libxml.h
-@@ -119,6 +119,23 @@ PHP_LIBXML_API void php_libxml_shutdown(void);
- ZEND_TSRMLS_CACHE_EXTERN()
- #endif
-
-+#if defined(__clang__)
-+# define PHP_LIBXML_IGNORE_DEPRECATIONS_START \
-+ _Pragma("clang diagnostic push") \
-+ _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
-+# define PHP_LIBXML_IGNORE_DEPRECATIONS_END \
-+ _Pragma("clang diagnostic pop")
-+#elif defined(__GNUC__)
-+# define PHP_LIBXML_IGNORE_DEPRECATIONS_START \
-+ _Pragma("GCC diagnostic push") \
-+ _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
-+# define PHP_LIBXML_IGNORE_DEPRECATIONS_END \
-+ _Pragma("GCC diagnostic pop")
-+#else
-+# define PHP_LIBXML_IGNORE_DEPRECATIONS_START
-+# define PHP_LIBXML_IGNORE_DEPRECATIONS_END
-+#endif
-+
- /* Other extension may override the global state options, these global options
- * are copied initially to ctxt->options. Set the options to a known good value.
- * See libxml2 globals.c and parserInternals.c.
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index a938918ead3a..0d2ebd009731 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -8,7 +8,7 @@
, openssl
, readline
, sqlite
-, tcl ? null, tk ? null, tix ? null, libX11 ? null, x11Support ? false
+, tcl ? null, tk ? null, tclPackages, libX11 ? null, x11Support ? false
, zlib
, self
, coreutils
@@ -272,8 +272,8 @@ in with passthru; stdenv.mkDerivation ({
setupHook = python-setup-hook sitePackages;
- postPatch = lib.optionalString (x11Support && (tix != null)) ''
- substituteInPlace "Lib/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
+ postPatch = lib.optionalString (x11Support && ((tclPackages.tix or null) != null)) ''
+ substituteInPlace "Lib/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tclPackages.tix}/lib'"
'';
postInstall =
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index b381243ff5bb..f9da42de0b1c 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -35,7 +35,7 @@
, tzdata
, withGdbm ? !stdenv.hostPlatform.isWindows, gdbm
, withReadline ? !stdenv.hostPlatform.isWindows, readline
-, x11Support ? false, tcl, tk, tix, libX11, xorgproto
+, x11Support ? false, tcl, tk, tclPackages, libX11, xorgproto
# splicing/cross
, pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}"
@@ -324,10 +324,10 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
'' + optionalString mimetypesSupport ''
substituteInPlace Lib/mimetypes.py \
--replace-fail "@mime-types@" "${mailcap}"
- '' + optionalString (pythonOlder "3.13" && x11Support && (tix != null)) ''
+ '' + optionalString (pythonOlder "3.13" && x11Support && ((tclPackages.tix or null) != null)) ''
substituteInPlace "Lib/tkinter/tix.py" --replace-fail \
"os.environ.get('TIX_LIBRARY')" \
- "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
+ "os.environ.get('TIX_LIBRARY') or '${tclPackages.tix}/lib'"
'';
env = {
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index 3dcbce42cf0a..4e8199af56b3 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, substituteAll, fetchurl
, zlibSupport ? true, zlib
, bzip2, pkg-config, libffi, libunwind, Security
-, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, libX11
+, sqlite, openssl, ncurses, python, expat, tcl, tk, tclPackages, libX11
, gdbm, db, xz, python-setup-hook
, optimizationLevel ? "jit", boehmgc
# For the Python package set
@@ -98,7 +98,7 @@ in with passthru; stdenv.mkDerivation rec {
--replace "multiprocessing.cpu_count()" "$NIX_BUILD_CORES"
substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" \
- --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
+ --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tclPackages.tix}/lib'"
'';
buildPhase = ''
diff --git a/pkgs/development/interpreters/wamr/default.nix b/pkgs/development/interpreters/wamr/default.nix
index 36a484b2ddce..f8c5814df92e 100644
--- a/pkgs/development/interpreters/wamr/default.nix
+++ b/pkgs/development/interpreters/wamr/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "wamr";
- version = "2.1.1";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = "wasm-micro-runtime";
rev = "WAMR-${finalAttrs.version}";
- hash = "sha256-/DQ+dZ3VoijL7FdgRgPg3H7whhXhjIzjhCaqpjPYw4k=";
+ hash = "sha256-Rhn26TRyjkR30+zyosfooOGjhvG+ztYtJVQlRfzWEFo=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix
index e5894476e9f8..ee0585e59106 100644
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@@ -2,19 +2,19 @@
rustPlatform.buildRustPackage rec {
pname = "wasmtime";
- version = "25.0.2";
+ version = "26.0.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = pname;
rev = "v${version}";
- hash = "sha256-5Wu5gK3g7nkMDwUGkwnx400PRkb0jknX/GKeEAJ9Vgg=";
+ hash = "sha256-zcAYF/accq0Z0aKZLquFY+iDs1uh57sbZ/zXGqZ3KZI=";
fetchSubmodules = true;
};
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
auditable = false;
- cargoHash = "sha256-jLdVxWjfJSkfHcmw5i02gXI2uEUB7KxiEfdFtfc020U=";
+ cargoHash = "sha256-ufojfTrChL363AX/W8hT3pJYeYijqJ7azECuUGGmBx0=";
cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index 1e06af6cf931..6b83d72a9716 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "armadillo";
- version = "14.0.0";
+ version = "14.0.3";
src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
- hash = "sha256-ijWGszJ35tvDyPJ/T/9SIxwsb3YUGRwZDGb7m3i6mLU=";
+ hash = "sha256-69YhXusB7kEv7QeMip9/h9Th9hh+vNwbwJ9GCVpPQAM=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
index 976144b1b5ca..8d11ee2b7937 100644
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@@ -6,6 +6,7 @@
docutils,
bzip2,
zlib,
+ jitterentropy,
darwin,
static ? stdenv.hostPlatform.isStatic, # generates static libraries *only*
}:
@@ -56,7 +57,10 @@ let
CoreServices
Security
]
- );
+ )
+ ++ lib.optionals (lib.versionAtLeast version "3.6.0") [
+ jitterentropy
+ ];
buildTargets =
[ "cli" ]
@@ -81,6 +85,9 @@ let
]
++ lib.optionals stdenv.hostPlatform.isAarch64 [
"--cpu=aarch64"
+ ]
+ ++ lib.optionals (lib.versionAtLeast version "3.6.0") [
+ "--enable-modules=jitter_rng"
];
configurePhase = ''
@@ -117,8 +124,8 @@ let
in
{
botan3 = common {
- version = "3.5.0";
- hash = "sha256-Z+ja4cokaNkN5OYByH1fMf9JKzjoq4vL0C3fcQTtip8=";
+ version = "3.6.1";
+ hash = "sha256-fLhXXYjSMsdxdHadf54ku0REQWBYWYbuvWbnScuakIk=";
# this patch fixes build errors on MacOS with SDK 10.12, recheck to remove this again
patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./botan3-macos.patch ];
};
diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
index 9180457a3165..b9b067cd684e 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/pkgs/development/libraries/caf/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "actor-framework";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchFromGitHub {
owner = "actor-framework";
repo = "actor-framework";
rev = version;
- hash = "sha256-ANtqGFctgOAynDiZS9tmWRASVpB2RqRTG7JSXZIDmP8=";
+ hash = "sha256-1DJ8VYBTC4Kd6IQZoj4AjP3CoHhb+bmtBEozc5T0R/0=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/ctranslate2/default.nix b/pkgs/development/libraries/ctranslate2/default.nix
index b126cff5b24a..6d287b869ff3 100644
--- a/pkgs/development/libraries/ctranslate2/default.nix
+++ b/pkgs/development/libraries/ctranslate2/default.nix
@@ -24,13 +24,13 @@ let
in
stdenv.mkDerivation rec {
pname = "ctranslate2";
- version = "4.4.0";
+ version = "4.5.0";
src = fetchFromGitHub {
owner = "OpenNMT";
repo = "CTranslate2";
rev = "v${version}";
- hash = "sha256-E/ulk+Oo1zEP+sCKMZuMVSoO0MDjQ2opTflSwLmCJMw=";
+ hash = "sha256-2Znrt+TiQf/9YI1HYAikDfqbekAghOvxKoC05S18scQ=";
fetchSubmodules = true;
};
diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix
index 701e75ff5f2b..eeda204d6175 100644
--- a/pkgs/development/libraries/drogon/default.nix
+++ b/pkgs/development/libraries/drogon/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "drogon";
- version = "1.9.7";
+ version = "1.9.8";
src = fetchFromGitHub {
owner = "drogonframework";
repo = "drogon";
rev = "v${finalAttrs.version}";
- hash = "sha256-YmN02OvCllxADAIicWKaTevrbAsP/ZbnhBd/hjqqz7A=";
+ hash = "sha256-vQ9d3l++waYTYt+bvt/ShatBVxTfA7LmYIXV5VSraNQ=";
fetchSubmodules = true;
};
diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
deleted file mode 100644
index 17266481b27a..000000000000
--- a/pkgs/development/libraries/geis/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ lib, stdenv, fetchurl
-, pkg-config
-, python3Packages
-, wrapGAppsHook3
-, atk
-, dbus
-, evemu
-, frame
-, gdk-pixbuf
-, gobject-introspection
-, grail
-, gtk3
-, xorg
-, pango
-, xorgserver
-}:
-
-
-stdenv.mkDerivation rec {
- pname = "geis";
- version = "2.2.17";
-
- src = fetchurl {
- url = "https://launchpad.net/geis/trunk/${version}/+download/${pname}-${version}.tar.xz";
- sha256 = "1svhbjibm448ybq6gnjjzj0ak42srhihssafj0w402aj71lgaq4a";
- };
-
- env.NIX_CFLAGS_COMPILE = "-Wno-error=misleading-indentation -Wno-error=pointer-compare";
-
- hardeningDisable = [ "format" ];
-
- pythonPath = with python3Packages;
- [ pygobject3 ];
-
- nativeBuildInputs = [ pkg-config wrapGAppsHook3 python3Packages.wrapPython gobject-introspection ];
- buildInputs = [ atk dbus evemu frame gdk-pixbuf grail
- gtk3 xorg.libX11 xorg.libXext xorg.libXi xorg.libXtst pango python3Packages.python xorgserver
- ];
-
- patchPhase = ''
- substituteInPlace python/geis/geis_v2.py --replace \
- "ctypes.util.find_library(\"geis\")" "'$out/lib/libgeis.so'"
- '';
-
- preFixup = ''
- buildPythonPath "$out $pythonPath"
- gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH")
- '';
-
- meta = with lib; {
- description = "Library for input gesture recognition";
- homepage = "https://launchpad.net/geis";
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/development/libraries/gmp/5.1.3-CVE-2021-43618.patch b/pkgs/development/libraries/gmp/5.1.3-CVE-2021-43618.patch
deleted file mode 100644
index 13b9bc5f58cd..000000000000
--- a/pkgs/development/libraries/gmp/5.1.3-CVE-2021-43618.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Based on https://gmplib.org/repo/gmp-6.2/raw-rev/561a9c25298e,
-adapted for 5.x by ris
-
-diff -r e1fd9db13b47 -r 561a9c25298e mpz/inp_raw.c
---- a/mpz/inp_raw.c Tue Dec 22 23:49:51 2020 +0100
-+++ b/mpz/inp_raw.c Thu Oct 21 19:06:49 2021 +0200
-@@ -81,8 +81,11 @@
-
- abs_csize = ABS (csize);
-
-+ if (UNLIKELY (abs_csize > ~(mp_bitcnt_t) 0 / 8))
-+ return 0; /* Bit size overflows */
-+
- /* round up to a multiple of limbs */
-- abs_xsize = (abs_csize*8 + GMP_NUMB_BITS-1) / GMP_NUMB_BITS;
-+ abs_xsize = ((mp_bitcnt_t)abs_csize*8 + GMP_NUMB_BITS-1) / GMP_NUMB_BITS;
-
- if (abs_xsize != 0)
- {
-
diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix
deleted file mode 100644
index 43e3ca9759eb..000000000000
--- a/pkgs/development/libraries/gmp/5.1.x.nix
+++ /dev/null
@@ -1,87 +0,0 @@
-{ lib, stdenv, fetchurl, m4
-, cxx ? true
-, withStatic ? stdenv.hostPlatform.isStatic
-}:
-
-let inherit (lib) optional; in
-
-let self = stdenv.mkDerivation rec {
- pname = "gmp";
- version = "5.1.3";
-
- src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv
- urls = [ "mirror://gnu/gmp/gmp-${version}.tar.bz2" "ftp://ftp.gmplib.org/pub/gmp-${version}/gmp-${version}.tar.bz2" ];
- sha256 = "0q5i39pxrasgn9qdxzpfbwhh11ph80p57x6hf48m74261d97j83m";
- };
-
- #outputs TODO: split $cxx due to libstdc++ dependency
- # maybe let ghc use a version with *.so shared with rest of nixpkgs and *.a added
- # - see #5855 for related discussion
- outputs = [ "out" "dev" "info" ];
- passthru.static = self.out;
-
- nativeBuildInputs = [ m4 ];
-
- patches = [
- ./5.1.3-CVE-2021-43618.patch
- ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
- ./need-size-t.patch
- ];
-
- configureFlags = [
- "--with-pic"
- (lib.enableFeature cxx "cxx")
- # Build a "fat binary", with routines for several sub-architectures
- # (x86), except on Solaris where some tests crash with "Memory fault".
- # See , for instance.
- #
- # no darwin because gmp uses ASM that clang doesn't like
- (lib.enableFeature (!stdenv.hostPlatform.isSunOS && stdenv.hostPlatform.isx86) "fat")
- # The config.guess in GMP tries to runtime-detect various
- # ARM optimization flags via /proc/cpuinfo (and is also
- # broken on multicore CPUs). Avoid this impurity.
- "--build=${stdenv.buildPlatform.config}"
- ] ++ optional (cxx && stdenv.hostPlatform.isDarwin) "CPPFLAGS=-fexceptions"
- ++ optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.is64bit) "ABI=64"
- ;
-
- doCheck = true;
-
- dontDisableStatic = withStatic;
-
- enableParallelBuilding = true;
-
- meta = with lib; {
- homepage = "https://gmplib.org/";
- description = "GNU multiple precision arithmetic library";
- license = licenses.gpl3Plus;
-
- longDescription =
- '' GMP is a free library for arbitrary precision arithmetic, operating
- on signed integers, rational numbers, and floating point numbers.
- There is no practical limit to the precision except the ones implied
- by the available memory in the machine GMP runs on. GMP has a rich
- set of functions, and the functions have a regular interface.
-
- The main target applications for GMP are cryptography applications
- and research, Internet security applications, algebra systems,
- computational algebra research, etc.
-
- GMP is carefully designed to be as fast as possible, both for small
- operands and for huge operands. The speed is achieved by using
- fullwords as the basic arithmetic type, by using fast algorithms,
- with highly optimised assembly code for the most common inner loops
- for a lot of CPUs, and by a general emphasis on speed.
-
- GMP is faster than any other bignum library. The advantage for GMP
- increases with the operand sizes for many operations, since GMP uses
- asymptotically faster algorithms.
- '';
-
- platforms = platforms.all;
- badPlatforms = [ "x86_64-darwin" ];
- # never built on aarch64-darwin since first introduction in nixpkgs
- broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
- };
-};
- in self
diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix
index 35ee18f16257..4f3560fbd1c2 100644
--- a/pkgs/development/libraries/grilo-plugins/default.nix
+++ b/pkgs/development/libraries/grilo-plugins/default.nix
@@ -6,6 +6,7 @@
, pkg-config
, gettext
, gperf
+, glib
, sqlite
, libarchive
, libdmapsharing
@@ -52,6 +53,12 @@ stdenv.mkDerivation rec {
})
];
+ strictDeps = true;
+
+ depsBuildBuild = [
+ pkg-config
+ ];
+
nativeBuildInputs = [
meson
ninja
@@ -59,6 +66,7 @@ stdenv.mkDerivation rec {
gettext
itstool
gperf # for lua-factory
+ glib # glib-compile-resources
];
buildInputs = [
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index 948048895700..1dd516ec99cf 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -19,11 +19,19 @@
, arrow-cpp
}:
+# This package should be updated together with all related python grpc packages
+# to ensure compatibility.
+# nixpkgs-update: no auto update
stdenv.mkDerivation rec {
pname = "grpc";
version = "1.66.1"; # N.B: if you change this, please update:
- # pythonPackages.grpcio-tools
+ # pythonPackages.grpcio
+ # pythonPackages.grpcio-channelz
+ # pythonPackages.grpcio-health-checking
+ # pythonPackages.grpcio-reflection
# pythonPackages.grpcio-status
+ # pythonPackages.grpcio-testing
+ # pythonPackages.grpcio-tools
src = fetchFromGitHub {
owner = "grpc";
diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix
index 3e75bdecaecd..c49df7fd75fe 100644
--- a/pkgs/development/libraries/gusb/default.nix
+++ b/pkgs/development/libraries/gusb/default.nix
@@ -5,6 +5,8 @@
, meson
, ninja
, pkg-config
+, buildPackages
+, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
, gobject-introspection
, gi-docgen
, python3
@@ -25,7 +27,8 @@ stdenv.mkDerivation rec {
pname = "gusb";
version = "0.4.9";
- outputs = [ "bin" "out" "dev" "devdoc" ];
+ outputs = [ "bin" "out" "dev" ]
+ ++ lib.optionals withIntrospection [ "devdoc" ];
src = fetchFromGitHub {
owner = "hughsie";
@@ -51,6 +54,7 @@ stdenv.mkDerivation rec {
meson
ninja
pkg-config
+ ] ++ lib.optionals withIntrospection [
gobject-introspection
gi-docgen
vala
@@ -64,7 +68,10 @@ stdenv.mkDerivation rec {
];
mesonFlags = [
+ (lib.mesonBool "docs" withIntrospection)
+ (lib.mesonBool "introspection" withIntrospection)
(lib.mesonBool "tests" doCheck)
+ (lib.mesonBool "vapi" withIntrospection)
(lib.mesonOption "usb_ids" "${hwdata}/share/hwdata/usb.ids")
];
diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index e7ad912dc3bd..e5fc14bb9cc9 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -7,8 +7,8 @@ let
in
{
icu76 = make-icu {
- version = "76.1rc";
- hash = "sha256-HMY4hRYbF4Dsf1EGx+m0NRsCUA+Q/JGRpdGIgym/A5I=";
+ version = "76.1";
+ hash = "sha256-36y0a/5HR0EEcs4+EUS/KKEC/uqk44dbrJtMbPMPTz4=";
};
icu75 = make-icu {
version = "75.1";
diff --git a/pkgs/development/libraries/icu/make-icu.nix b/pkgs/development/libraries/icu/make-icu.nix
index 7e137003b030..d7fe46041607 100644
--- a/pkgs/development/libraries/icu/make-icu.nix
+++ b/pkgs/development/libraries/icu/make-icu.nix
@@ -8,9 +8,9 @@ let
pname = "icu4c";
- #release = lib.replaceStrings [ "." ] [ "-" ] version;
+ release = lib.replaceStrings [ "." ] [ "-" ] version;
# To test rc versions of ICU replace the line above with the line below.
- release = lib.replaceStrings [ "." ] [ "-" ] (if lib.hasSuffix "rc" version then lib.replaceStrings [ "1" ] [ "" ] version else version);
+ #release = lib.replaceStrings [ "." ] [ "-" ] (if lib.hasSuffix "rc" version then lib.replaceStrings [ "1" ] [ "" ] version else version);
baseAttrs = {
src = fetchurl {
diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix
index 4803f6ecf360..ded8e57cf165 100644
--- a/pkgs/development/libraries/intel-media-driver/default.nix
+++ b/pkgs/development/libraries/intel-media-driver/default.nix
@@ -16,7 +16,7 @@
stdenv.mkDerivation rec {
pname = "intel-media-driver";
- version = "24.2.5";
+ version = "24.3.4";
outputs = [ "out" "dev" ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
owner = "intel";
repo = "media-driver";
rev = "intel-media-${version}";
- hash = "sha256-nnaKfGMRNMZzrgMv7OgXj+11RaZSFijrxunnbGSWQlw=";
+ hash = "sha256-vgbWwL4mu8YZzfvBvxna8Ioz6ig29iA2RZHKuHdh5Ic=";
};
patches = [
diff --git a/pkgs/development/libraries/isa-l/default.nix b/pkgs/development/libraries/isa-l/default.nix
index 6ae04b0b267d..6a53990b7823 100644
--- a/pkgs/development/libraries/isa-l/default.nix
+++ b/pkgs/development/libraries/isa-l/default.nix
@@ -1,14 +1,14 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, nasm }:
+{ lib, stdenv, fetchFromGitHub, runCommand, autoreconfHook, nix, nasm }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "isa-l";
- version = "2.31.0";
+ version = "2.31.0-unstable-2024-04-25";
src = fetchFromGitHub {
owner = "intel";
repo = "isa-l";
- rev = "v${version}";
- sha256 = "sha256-xBBtpjtWyba0DogdLobtuWmiiAHTXMK4oRnjYuTUCNk=";
+ rev = "dbaf284e112bea1b90983772a3164e794b923aaf";
+ sha256 = "sha256-eM1K3uObb4eZq0nSfafltp5DuZIDwknUYj9CdLn14lY=";
};
nativeBuildInputs = [ nasm autoreconfHook ];
@@ -17,13 +17,48 @@ stdenv.mkDerivation rec {
export AS=nasm
'';
- meta = with lib; {
+ passthru = {
+ tests = {
+ igzip = runCommand "test-isa-l-igzip" {
+ nativeBuildInputs = [
+ finalAttrs.finalPackage
+ ];
+ sample = runCommand "nixpkgs-lib.nar" {
+ nativeBuildInputs = [ nix ];
+ } ''
+ nix nar --extra-experimental-features nix-command pack ${../../../../lib} > "$out"
+ '';
+ meta = {
+ description = "Cross validation of igzip provided by isa-l with gzip";
+ };
+ } ''
+ HASH_ORIGINAL="$(cat "$sample" | sha256sum | cut -d" " -f1)"
+ HASH_COMPRESSION_TEST="$(igzip -c "$sample" | gzip -d -c | sha256sum | cut -d" " -f1)"
+ HASH_DECOMPRESSION_TEST="$(gzip -c "$sample" | igzip -d -c | sha256sum | cut -d" " -f1)"
+ if [[ "$HASH_COMPRESSION_TEST" != "$HASH_ORIGINAL" ]] || [[ "$HASH_DECOMPRESSION_TEST" != "$HASH_ORIGINAL" ]]; then
+ if [[ "HASH_COMPRESSION_TEST" != "$HASH_ORIGINAL" ]]; then
+ echo "The igzip-compressed file does not decompress to the original file." 1>&2
+ fi
+ if [[ "HASH_DECOMPRESSION_TEST" != "$HASH_ORIGINAL" ]]; then
+ echo "igzip does not decompress the gzip-compressed archive to the original file." 1>&2
+ fi
+ echo "SHA256 checksums:" 1>&2
+ printf ' original file:\t%s\n' "$HASH_ORIGINAL" 1>&2
+ printf ' compression test:\t%s\n' "$HASH_COMPRESSION_TEST" 1>&2
+ printf ' decompression test:\t%s\n' "$HASH_DECOMPRESSION_TEST" 1>&2
+ exit 1
+ fi
+ touch "$out"
+ '';
+ };
+ };
+
+ meta = {
description = "Collection of optimised low-level functions targeting storage applications";
mainProgram = "igzip";
- license = licenses.bsd3;
+ license = lib.licenses.bsd3;
homepage = "https://github.com/intel/isa-l";
- maintainers = with maintainers; [ jbedo ];
- platforms = platforms.all;
- broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; # does not build on M1 mac (asm/hwcap.h file not found) maybe needs gcc not clang?
+ maintainers = with lib.maintainers; [ jbedo ];
+ platforms = lib.platforms.all;
};
-}
+})
diff --git a/pkgs/development/libraries/libcifpp/default.nix b/pkgs/development/libraries/libcifpp/default.nix
index 564c7690b378..ce9787c879c6 100644
--- a/pkgs/development/libraries/libcifpp/default.nix
+++ b/pkgs/development/libraries/libcifpp/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libcifpp";
- version = "7.0.4";
+ version = "7.0.7";
src = fetchFromGitHub {
owner = "PDB-REDO";
repo = "libcifpp";
rev = "refs/tags/v${finalAttrs.version}";
- hash = "sha256-/dX77KRYmTIj8jxRzQRlpG/ktqDL1jjySux/JqHnE3I=";
+ hash = "sha256-wyDdSUOVey1VKftLLRka9Fp4MT+qNEawZQ5iySl3dk8=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix
deleted file mode 100644
index 049b0c8f4fb8..000000000000
--- a/pkgs/development/libraries/libconfig/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, # this also disables building tests.
- # on static windows cross-compile they fail to build
- doCheck ? with stdenv.hostPlatform; !(isWindows && isStatic)
-}:
-
-stdenv.mkDerivation rec {
- pname = "libconfig";
- version = "1.7.3";
-
- src = fetchurl {
- url = "https://hyperrealm.github.io/${pname}/dist/${pname}-${version}.tar.gz";
- sha256 = "sha256-VFFm1srAN3RDgdHpzFpUBQlOe/rRakEWmbz/QLuzHuc=";
- };
-
- inherit doCheck;
-
- configureFlags = lib.optional (stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isStatic) "--disable-examples"
- ++ lib.optional (!doCheck) "--disable-tests";
-
- cmakeFlags = lib.optionals (!doCheck) [ "-DBUILD_TESTS:BOOL=OFF" ];
-
- meta = with lib; {
- homepage = "http://www.hyperrealm.com/libconfig";
- description = "Simple library for processing structured configuration files";
- license = licenses.lgpl3;
- maintainers = [ ];
- platforms = platforms.all;
- };
-}
diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix
index 85dbf3a72b9d..81a129587dd7 100644
--- a/pkgs/development/libraries/libdigidocpp/default.nix
+++ b/pkgs/development/libraries/libdigidocpp/default.nix
@@ -1,31 +1,51 @@
-{ lib, stdenv, fetchurl, cmake, minizip, pcsclite, opensc, openssl
-, xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }:
+{ lib
+, stdenv
+, fetchurl
+, cmake
+, libtool
+, libxml2
+, minizip
+, pcsclite
+, opensc
+, openssl
+, xercesc
+, pkg-config
+, xsd
+, zlib
+, xmlsec
+, xxd
+}:
stdenv.mkDerivation rec {
- version = "3.17.1";
+ version = "4.0.0";
pname = "libdigidocpp";
src = fetchurl {
- url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz";
- hash = "sha256-3qDsIAOiWMZDj2zLE+Os7BoeCPeC4JQ6p8jSBd7PdV0=";
+ url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz";
+ hash = "sha256-0G7cjJEgLJ24SwHRznKJ18cRY0m50lr6HXstfbYq9f8=";
};
nativeBuildInputs = [ cmake pkg-config xxd ];
buildInputs = [
- minizip pcsclite opensc openssl xercesc
- xml-security-c xsd zlib xalanc
+ libxml2
+ minizip
+ pcsclite
+ opensc
+ openssl
+ xercesc
+ xsd
+ zlib
+ xmlsec
];
outputs = [ "out" "lib" "dev" "bin" ];
- # Cherry-pick of
- # https://github.com/open-eid/libdigidocpp/commit/2b5db855ba3ceb9bae1f11589ea1aea22bb7595a
- # Fixes https://github.com/NixOS/nixpkgs/issues/334397
- postPatch = ''
- substituteInPlace CMakeLists.txt \
- --replace-fail 'TSA_URL "http://dd-at.ria.ee/tsa"' 'TSA_URL "https://eid-dd.ria.ee/ts"'
- '';
+ # This wants to link to ${CMAKE_DL_LIBS} (ltdl), and there doesn't seem to be
+ # a way to tell CMake where this should be pulled from.
+ # A cleaner fix would probably be to patch cmake to use
+ # `-L${libtool.lib}/lib -ltdl` for `CMAKE_DL_LIBS`, but that's a world rebuild.
+ env.NIX_LDFLAGS = "-L${libtool.lib}/lib";
# libdigidocpp.so's `PKCS11Signer::PKCS11Signer()` dlopen()s "opensc-pkcs11.so"
# itself, so add OpenSC to its DT_RUNPATH after the fixupPhase shrinked it.
diff --git a/pkgs/development/libraries/libieee1284/default.nix b/pkgs/development/libraries/libieee1284/default.nix
index c49e42523137..377d56957123 100644
--- a/pkgs/development/libraries/libieee1284/default.nix
+++ b/pkgs/development/libraries/libieee1284/default.nix
@@ -32,6 +32,11 @@ stdenv.mkDerivation rec {
configureFlags = [
"--without-python"
+ ] ++ lib.optionals (stdenv.hostPlatform.isMusl && !stdenv.hostPlatform.isx86) [
+ # musl always provides , even though the functionality
+ # is x86-specific.
+ # https://www.openwall.com/lists/musl/2024/10/25/2
+ "ac_cv_header_sys_io_h=no"
];
prePatch = ''
diff --git a/pkgs/development/libraries/libjxl/default.nix b/pkgs/development/libraries/libjxl/default.nix
index eb9283eb69eb..2bd30ddda8e2 100644
--- a/pkgs/development/libraries/libjxl/default.nix
+++ b/pkgs/development/libraries/libjxl/default.nix
@@ -18,7 +18,7 @@
, doxygen
, python3
, lcms2
-, enablePlugins ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
+, enablePlugins ? true
}:
let
@@ -131,6 +131,9 @@ stdenv.mkDerivation rec {
GDK_PIXBUF_MODULEDIR="$out/${gdk-pixbuf.moduleDir}" \
GDK_PIXBUF_MODULE_FILE="$out/${loadersPath}" \
gdk-pixbuf-query-loaders --update-cache
+ ''
+ # Cross-compiled gdk-pixbuf doesn't support thumbnailers
+ + lib.optionalString (enablePlugins && stdenv.hostPlatform == stdenv.buildPlatform) ''
mkdir -p "$out/bin"
makeWrapper ${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer "$out/libexec/gdk-pixbuf-thumbnailer-jxl" \
--set GDK_PIXBUF_MODULE_FILE "$out/${loadersPath}"
diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index e41369db79f5..15cfedbdae89 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -1,17 +1,19 @@
-{ lib, stdenv
-, fetchurl
-, autoreconfHook
-, docbook_xsl
-, docbook_xml_dtd_43
-, gtk-doc
-, lzip
-, libidn2
-, libunistring
-, libxslt
-, pkg-config
-, python3
-, buildPackages
-, publicsuffix-list
+{
+ lib,
+ stdenv,
+ fetchurl,
+ autoreconfHook,
+ docbook_xsl,
+ docbook_xml_dtd_43,
+ gtk-doc,
+ lzip,
+ libidn2,
+ libunistring,
+ libxslt,
+ pkg-config,
+ python3,
+ buildPackages,
+ publicsuffix-list,
}:
stdenv.mkDerivation rec {
@@ -23,7 +25,11 @@ stdenv.mkDerivation rec {
hash = "sha256-mp9qjG7bplDPnqVUdc0XLdKEhzFoBOnHMgLZdXLNOi0=";
};
- outputs = [ "out" "dev" ]
+ outputs =
+ [
+ "out"
+ "dev"
+ ]
# bin/psl-make-dafsa brings a large runtime closure through python3
++ lib.optional (!stdenv.hostPlatform.isStatic) "bin";
@@ -42,8 +48,10 @@ stdenv.mkDerivation rec {
libunistring
libxslt
] ++ lib.optional (
- !stdenv.hostPlatform.isStatic && (stdenv.hostPlatform.isDarwin -> stdenv.buildPlatform == stdenv.hostPlatform)
- ) python3;
+ !stdenv.hostPlatform.isStatic
+ && !stdenv.hostPlatform.isWindows
+ && (stdenv.hostPlatform.isDarwin -> stdenv.buildPlatform == stdenv.hostPlatform)
+ ) python3;
propagatedBuildInputs = [
publicsuffix-list
diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix
index 08454fe94de0..dd610989617b 100644
--- a/pkgs/development/libraries/libpwquality/default.nix
+++ b/pkgs/development/libraries/libpwquality/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
})
];
- nativeBuildInputs = [ autoreconfHook perl ] ++ lib.optionals enablePython [ python ];
+ nativeBuildInputs = [ autoreconfHook perl ] ++ lib.optionals enablePython [ (python.withPackages (ps: with ps; [ distutils ])) ];
buildInputs = [ cracklib ] ++ lib.optionals enablePAM [ pam ];
configureFlags = lib.optionals (!enablePython) [ "--disable-python-bindings" ];
diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index 5dc620fd5c01..ef311bdd0246 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -23,7 +23,7 @@ assert enablePython -> pythonPackages != null;
stdenv.mkDerivation rec {
pname = "librealsense";
- version = "2.56.1";
+ version = "2.56.2";
outputs = [ "out" "dev" ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
owner = "IntelRealSense";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-1ICSJqr5WRePLIHsD3T2L0Nxdn1LWaHqHDJrfTIRl88=";
+ sha256 = "sha256-7DO+AC9R6mnSs52ex/uIzEv7q+fS7FQ5FGYe5niap4Q=";
};
buildInputs = [
diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix
index 803189719272..46ac8f556f99 100644
--- a/pkgs/development/libraries/libsidplayfp/default.nix
+++ b/pkgs/development/libraries/libsidplayfp/default.nix
@@ -1,38 +1,35 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, makeFontsConf
-, nix-update-script
-, testers
-, autoreconfHook
-, docSupport ? true
-, doxygen
-, graphviz
-, libexsid
-, libgcrypt
-, perl
-, pkg-config
-, unittest-cpp
-, xa
+{
+ stdenv,
+ lib,
+ fetchFromGitHub,
+ makeFontsConf,
+ nix-update-script,
+ testers,
+ autoreconfHook,
+ docSupport ? true,
+ doxygen,
+ graphviz,
+ libexsid,
+ libgcrypt,
+ perl,
+ pkg-config,
+ unittest-cpp,
+ xa,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libsidplayfp";
- version = "2.9.0";
+ version = "2.10.1";
src = fetchFromGitHub {
owner = "libsidplayfp";
repo = "libsidplayfp";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
- hash = "sha256-m1bbbtNJvoY6l2+jMbEN/dR9V7LZ4f1lHHGnn0F4bmU=";
+ hash = "sha256-yZ2IiSzl78N/jrhKls/l2klnePJYKU1NCnZcBKUWiuU=";
};
- outputs = [
- "out"
- ] ++ lib.optionals docSupport [
- "doc"
- ];
+ outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ];
postPatch = ''
patchShebangs .
@@ -40,24 +37,24 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
- nativeBuildInputs = [
- autoreconfHook
- perl
- pkg-config
- xa
- ] ++ lib.optionals docSupport [
- doxygen
- graphviz
- ];
+ nativeBuildInputs =
+ [
+ autoreconfHook
+ perl
+ pkg-config
+ xa
+ ]
+ ++ lib.optionals docSupport [
+ doxygen
+ graphviz
+ ];
buildInputs = [
libexsid
libgcrypt
];
- checkInputs = [
- unittest-cpp
- ];
+ checkInputs = [ unittest-cpp ];
enableParallelBuilding = true;
@@ -69,18 +66,16 @@ stdenv.mkDerivation (finalAttrs: {
];
# Make Doxygen happy with the setup, reduce log noise
- FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf { fontDirectories = [ ]; });
+ env.FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf {
+ fontDirectories = [ ];
+ });
preBuild = ''
# Reduce noise from fontconfig during doc building
export XDG_CACHE_HOME=$TMPDIR
'';
- buildFlags = [
- "all"
- ] ++ lib.optionals docSupport [
- "doc"
- ];
+ buildFlags = [ "all" ] ++ lib.optionals docSupport [ "doc" ];
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
@@ -94,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
updateScript = nix-update-script { };
};
- meta = with lib; {
+ meta = {
description = "Library to play Commodore 64 music derived from libsidplay2";
longDescription = ''
libsidplayfp is a C64 music player library which integrates
@@ -103,9 +98,13 @@ stdenv.mkDerivation (finalAttrs: {
C64 system and the SID chips.
'';
homepage = "https://github.com/libsidplayfp/libsidplayfp";
- license = with licenses; [ gpl2Plus ];
- maintainers = with maintainers; [ ramkromberg OPNA2608 ];
- platforms = platforms.all;
+ changelog = "https://github.com/libsidplayfp/libsidplayfp/releases/tag/v${finalAttrs.version}";
+ license = with lib.licenses; [ gpl2Plus ];
+ maintainers = with lib.maintainers; [
+ ramkromberg
+ OPNA2608
+ ];
+ platforms = lib.platforms.all;
pkgConfigModules = [
"libsidplayfp"
"libstilview"
diff --git a/pkgs/development/libraries/libticonv/default.nix b/pkgs/development/libraries/libticonv/default.nix
index 0c075406dee2..9bc5528257f8 100644
--- a/pkgs/development/libraries/libticonv/default.nix
+++ b/pkgs/development/libraries/libticonv/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-iconv"
- ];
+ ] ++ lib.optional stdenv.hostPlatform.isDarwin "LDFLAGS=-liconv";
meta = with lib; {
changelog = "http://lpg.ticalc.org/prj_tilp/news.html";
diff --git a/pkgs/development/libraries/libvgm/default.nix b/pkgs/development/libraries/libvgm/default.nix
index 895a382c96a3..09d7ac023648 100644
--- a/pkgs/development/libraries/libvgm/default.nix
+++ b/pkgs/development/libraries/libvgm/default.nix
@@ -1,122 +1,130 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, unstableGitUpdater
-, cmake
-, libiconv
-, zlib
-, enableShared ? true
+{
+ stdenv,
+ lib,
+ fetchFromGitHub,
+ unstableGitUpdater,
+ testers,
+ cmake,
+ libiconv,
+ zlib,
+ enableShared ? (!stdenv.hostPlatform.isStatic),
-, enableAudio ? true
-, withWaveWrite ? true
-, withWinMM ? stdenv.hostPlatform.isWindows
-, withDirectSound ? stdenv.hostPlatform.isWindows
-, withXAudio2 ? stdenv.hostPlatform.isWindows
-, withWASAPI ? stdenv.hostPlatform.isWindows
-, withOSS ? stdenv.hostPlatform.isFreeBSD
-, withSADA ? stdenv.hostPlatform.isSunOS
-, withALSA ? stdenv.hostPlatform.isLinux
-, alsa-lib
-, withPulseAudio ? stdenv.hostPlatform.isLinux
-, libpulseaudio
-, withCoreAudio ? stdenv.hostPlatform.isDarwin
-, CoreAudio
-, AudioToolbox
-, withLibao ? true
-, libao
+ enableAudio ? true,
+ withWaveWrite ? true,
+ withWinMM ? stdenv.hostPlatform.isWindows,
+ withDirectSound ? stdenv.hostPlatform.isWindows,
+ withXAudio2 ? stdenv.hostPlatform.isWindows,
+ withWASAPI ? stdenv.hostPlatform.isWindows,
+ withOSS ? stdenv.hostPlatform.isFreeBSD,
+ withSADA ? stdenv.hostPlatform.isSunOS,
+ withALSA ? stdenv.hostPlatform.isLinux,
+ alsa-lib,
+ withPulseAudio ? stdenv.hostPlatform.isLinux,
+ libpulseaudio,
+ withCoreAudio ? stdenv.hostPlatform.isDarwin,
+ CoreAudio,
+ AudioToolbox,
+ withLibao ? true,
+ libao,
-, enableEmulation ? true
-, withAllEmulators ? true
-, emulators ? [ ]
+ enableEmulation ? true,
+ withAllEmulators ? true,
+ emulators ? [ ],
-, enableLibplayer ? true
+ enableLibplayer ? true,
-, enableTools ? false
+ enableTools ? false,
}:
assert enableTools -> enableAudio && enableEmulation && enableLibplayer;
-let
- inherit (lib) optional optionals;
- onOff = val: if val then "ON" else "OFF";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
pname = "libvgm";
- version = "0-unstable-2024-06-08";
+ version = "0-unstable-2024-10-17";
src = fetchFromGitHub {
owner = "ValleyBell";
repo = "libvgm";
- rev = "34c368cde98f33c42455fbbfbec07073ba79bf5c";
- hash = "sha256-eX2k2cUtapHhx8dLaFk63Si0Di1q0uDWvdOI0+FgqEY=";
+ rev = "7b694e53e42a75ce48b846c53d08e4a33f627842";
+ hash = "sha256-u+mBzmEixJT3rwuipITktFI4iVswnXftfF7syBw4t/w=";
};
outputs = [
"out"
"dev"
- ] ++ optional enableTools "bin";
+ ] ++ lib.optionals enableTools [ "bin" ];
- nativeBuildInputs = [
- cmake
- ];
+ nativeBuildInputs = [ cmake ];
- propagatedBuildInputs = [
- libiconv
- zlib
- ] ++ optionals withALSA [
- alsa-lib
- ] ++ optionals withPulseAudio [
- libpulseaudio
- ] ++ optionals withCoreAudio [
- CoreAudio
- AudioToolbox
- ] ++ optionals withLibao [
- libao
- ];
+ propagatedBuildInputs =
+ [
+ libiconv
+ zlib
+ ]
+ ++ lib.optionals withALSA [ alsa-lib ]
+ ++ lib.optionals withPulseAudio [ libpulseaudio ]
+ ++ lib.optionals withCoreAudio [
+ CoreAudio
+ AudioToolbox
+ ]
+ ++ lib.optionals withLibao [ libao ];
- cmakeFlags = [
- "-DBUILD_LIBAUDIO=${onOff enableAudio}"
- "-DBUILD_LIBEMU=${onOff enableEmulation}"
- "-DBUILD_LIBPLAYER=${onOff enableLibplayer}"
- "-DBUILD_TESTS=${onOff enableTools}"
- "-DBUILD_PLAYER=${onOff enableTools}"
- "-DBUILD_VGM2WAV=${onOff enableTools}"
- "-DLIBRARY_TYPE=${if enableShared then "SHARED" else "STATIC"}"
- "-DUSE_SANITIZERS=ON"
- ] ++ optionals enableAudio [
- "-DAUDIODRV_WAVEWRITE=${onOff withWaveWrite}"
- "-DAUDIODRV_WINMM=${onOff withWinMM}"
- "-DAUDIODRV_DSOUND=${onOff withDirectSound}"
- "-DAUDIODRV_XAUDIO2=${onOff withXAudio2}"
- "-DAUDIODRV_WASAPI=${onOff withWASAPI}"
- "-DAUDIODRV_OSS=${onOff withOSS}"
- "-DAUDIODRV_SADA=${onOff withSADA}"
- "-DAUDIODRV_ALSA=${onOff withALSA}"
- "-DAUDIODRV_PULSE=${onOff withPulseAudio}"
- "-DAUDIODRV_APPLE=${onOff withCoreAudio}"
- "-DAUDIODRV_LIBAO=${onOff withLibao}"
- ] ++ optionals enableEmulation ([
- "-DSNDEMU__ALL=${onOff withAllEmulators}"
- ] ++ optionals (!withAllEmulators)
- (lib.lists.forEach emulators (x: "-DSNDEMU_${x}=ON"))
- ) ++ optionals enableTools [
- "-DUTIL_CHARCNV_ICONV=ON"
- "-DUTIL_CHARCNV_WINAPI=${onOff stdenv.hostPlatform.isWindows}"
- ];
+ cmakeFlags =
+ [
+ (lib.cmakeBool "BUILD_LIBAUDIO" enableAudio)
+ (lib.cmakeBool "BUILD_LIBEMU" enableEmulation)
+ (lib.cmakeBool "BUILD_LIBPLAYER" enableLibplayer)
+ (lib.cmakeBool "BUILD_TESTS" enableTools)
+ (lib.cmakeBool "BUILD_PLAYER" enableTools)
+ (lib.cmakeBool "BUILD_VGM2WAV" enableTools)
+ (lib.cmakeFeature "LIBRARY_TYPE" (if enableShared then "SHARED" else "STATIC"))
+ (lib.cmakeBool "USE_SANITIZERS" true)
+ ]
+ ++ lib.optionals enableAudio [
+ (lib.cmakeBool "AUDIODRV_WAVEWRITE" withWaveWrite)
+ (lib.cmakeBool "AUDIODRV_WINMM" withWinMM)
+ (lib.cmakeBool "AUDIODRV_DSOUND" withDirectSound)
+ (lib.cmakeBool "AUDIODRV_XAUDIO2" withXAudio2)
+ (lib.cmakeBool "AUDIODRV_WASAPI" withWASAPI)
+ (lib.cmakeBool "AUDIODRV_OSS" withOSS)
+ (lib.cmakeBool "AUDIODRV_SADA" withSADA)
+ (lib.cmakeBool "AUDIODRV_ALSA" withALSA)
+ (lib.cmakeBool "AUDIODRV_PULSE" withPulseAudio)
+ (lib.cmakeBool "AUDIODRV_APPLE" withCoreAudio)
+ (lib.cmakeBool "AUDIODRV_LIBAO" withLibao)
+ ]
+ ++ lib.optionals enableEmulation (
+ [ (lib.cmakeBool "SNDEMU__ALL" withAllEmulators) ]
+ ++ lib.optionals (!withAllEmulators) (
+ lib.lists.forEach emulators (x: (lib.cmakeBool "SNDEMU_${x}" true))
+ )
+ )
+ ++ lib.optionals enableTools [
+ (lib.cmakeBool "UTIL_CHARCNV_ICONV" true)
+ (lib.cmakeBool "UTIL_CHARCNV_WINAPI" stdenv.hostPlatform.isWindows)
+ ];
- passthru.updateScript = unstableGitUpdater {
- url = "https://github.com/ValleyBell/libvgm.git";
+ passthru = {
+ tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+ updateScript = unstableGitUpdater { };
};
- meta = with lib; {
- homepage = "https://github.com/ValleyBell/libvgm";
+ meta = {
description = "More modular rewrite of most components from VGMPlay";
+ homepage = "https://github.com/ValleyBell/libvgm";
license =
- if (enableEmulation && (withAllEmulators || (lib.lists.any (core: core == "WSWAN_ALL") emulators))) then
- licenses.unfree # https://github.com/ValleyBell/libvgm/issues/43
+ if
+ (enableEmulation && (withAllEmulators || (lib.lists.any (core: core == "WSWAN_ALL") emulators)))
+ then
+ lib.licenses.unfree # https://github.com/ValleyBell/libvgm/issues/43
else
- licenses.gpl2Only;
- maintainers = with maintainers; [ OPNA2608 ];
- platforms = platforms.all;
+ lib.licenses.gpl2Only;
+ maintainers = with lib.maintainers; [ OPNA2608 ];
+ platforms = lib.platforms.all;
+ pkgConfigModules =
+ [ "vgm-utils" ]
+ ++ lib.optionals enableAudio [ "vgm-audio" ]
+ ++ lib.optionals enableEmulation [ "vgm-emu" ]
+ ++ lib.optionals enableLibplayer [ "vgm-player" ];
};
-}
+})
diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix
index af028888b23b..8cdcd9d19560 100644
--- a/pkgs/development/libraries/libwebsockets/default.nix
+++ b/pkgs/development/libraries/libwebsockets/default.nix
@@ -5,6 +5,7 @@
, openssl
, zlib
, libuv
+, removeReferencesTo
# External poll is required for e.g. mosquitto, but discouraged by the maintainer.
, withExternalPoll ? false
}:
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl zlib libuv ];
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake removeReferencesTo ];
cmakeFlags = [
"-DLWS_WITH_PLUGINS=ON"
@@ -42,6 +43,7 @@ stdenv.mkDerivation rec {
);
postInstall = ''
+ find "$out" -type f -exec remove-references-to -t ${stdenv.cc.cc} '{}' +
# Fix path that will be incorrect on move to "dev" output.
substituteInPlace "$out/lib/cmake/libwebsockets/LibwebsocketsTargets-release.cmake" \
--replace "\''${_IMPORT_PREFIX}" "$out"
diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix
index 143bb32a5677..a6c5e3dd4c2b 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.105";
- hash = "sha256-Nfd7u0sdGqUCznnUxEJQFs+QuRSb+b7rZrcvKryimOQ=";
+ version = "3.106";
+ hash = "sha256-j8B5RgEdBbtqPmIUniNF8ToGPIrPJ8gVTMplcv72fD0=";
}
diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix
index 9ac43cc4b1d3..a1bfe9dced1d 100644
--- a/pkgs/development/libraries/onnxruntime/default.nix
+++ b/pkgs/development/libraries/onnxruntime/default.nix
@@ -23,6 +23,7 @@
, protobuf_21
, pythonSupport ? true
, cudaSupport ? config.cudaSupport
+, ncclSupport ? config.cudaSupport
, cudaPackages ? {}
}@inputs:
@@ -160,8 +161,9 @@ effectiveStdenv.mkDerivation rec {
libcufft # cufft.h
cudnn # cudnn.h
cuda_cudart
+ ] ++ lib.optionals (cudaSupport && ncclSupport) (with cudaPackages; [
nccl
- ]);
+ ]));
nativeCheckInputs = [
gtest
@@ -198,7 +200,7 @@ effectiveStdenv.mkDerivation rec {
"-Donnxruntime_ENABLE_LTO=ON"
"-Donnxruntime_USE_FULL_PROTOBUF=OFF"
(lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport)
- (lib.cmakeBool "onnxruntime_USE_NCCL" cudaSupport)
+ (lib.cmakeBool "onnxruntime_USE_NCCL" (cudaSupport && ncclSupport))
] ++ lib.optionals pythonSupport [
"-Donnxruntime_ENABLE_PYTHON=ON"
] ++ lib.optionals cudaSupport [
diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix
index b13dc2bb8dd7..90dc1883eb9d 100644
--- a/pkgs/development/libraries/opencl-headers/default.nix
+++ b/pkgs/development/libraries/opencl-headers/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "opencl-headers";
- version = "2023.12.14";
+ version = "2024.05.08";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "OpenCL-Headers";
rev = "v${finalAttrs.version}";
- sha256 = "sha256-wF9KQjzYKJf6ulXRy80o53bp6lTtm8q1NubKbcH+RY0=";
+ sha256 = "sha256-FXDZa5umNilFPls3g/2aNqJvJOJX2JYfY08/Lfm1H1Q=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/openslide/default.nix b/pkgs/development/libraries/openslide/default.nix
index cc0b5ed98c61..799896f50f8f 100644
--- a/pkgs/development/libraries/openslide/default.nix
+++ b/pkgs/development/libraries/openslide/default.nix
@@ -1,28 +1,65 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook
-, pkg-config, cairo, glib, gdk-pixbuf, libjpeg
-, libpng, libtiff, libxml2, openjpeg, sqlite, zlib
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ meson,
+ ninja,
+ pkg-config,
+ cairo,
+ doxygen,
+ glib,
+ gdk-pixbuf,
+ libdicom,
+ libjpeg,
+ libpng,
+ libtiff,
+ libxml2,
+ openjpeg,
+ sqlite,
+ zlib,
+ zstd,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "openslide";
- version = "3.4.1";
+ version = "4.0.0";
src = fetchFromGitHub {
owner = "openslide";
repo = "openslide";
- rev = "v${version}";
- sha256 = "1g4hhjr4cbx754cwi9wl84k33bkg232w8ajic7aqhzm8x182hszp";
+ rev = "refs/tags/v${finalAttrs.version}";
+ hash = "sha256-9LvQ7FG/0E0WpFyIUyrL4Fvn60iYWejjbgdKHMVOFdI=";
};
- buildInputs = [ cairo glib gdk-pixbuf libjpeg libpng libtiff libxml2 openjpeg sqlite zlib ];
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkg-config
+ doxygen
+ ];
- nativeBuildInputs = [ autoreconfHook pkg-config ];
+ buildInputs = [
+ cairo
+ glib
+ gdk-pixbuf
+ libdicom
+ libjpeg
+ libpng
+ libtiff
+ libxml2
+ openjpeg
+ sqlite
+ zlib
+ zstd
+ ];
meta = with lib; {
homepage = "https://openslide.org";
description = "C library that provides a simple interface to read whole-slide images";
license = licenses.lgpl21;
+ changelog = "https://github.com/openslide/openslide/releases/tag/v${finalAttrs.version}";
platforms = platforms.unix;
maintainers = with maintainers; [ lromor ];
+ mainProgram = "slidetool";
};
-}
+})
diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix
index a3ccff5c1093..27c569ccad39 100644
--- a/pkgs/development/libraries/qrupdate/default.nix
+++ b/pkgs/development/libraries/qrupdate/default.nix
@@ -28,6 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
# https://savannah.gnu.org/bugs/?50339
"-fdefault-integer-8"
])}"
+ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ # prevent cmake from using Accelerate, which causes all tests to segfault
+ "-DBLA_VENDOR=Generic"
];
# https://github.com/mpimd-csc/qrupdate-ng/issues/4
diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix
index 5c1b7d1dab0a..086d6ae60c82 100644
--- a/pkgs/development/libraries/raylib/default.nix
+++ b/pkgs/development/libraries/raylib/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON"
++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON";
- passthru.tests = [ raylib-games ];
+ passthru.tests = { inherit raylib-games; };
patches = [
# Patch version in CMakeLists.txt to 5.0.0
diff --git a/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix b/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix
index ebc853c369b5..68f60e295347 100644
--- a/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix
+++ b/pkgs/development/libraries/science/chemistry/simple-dftd3/default.nix
@@ -15,13 +15,13 @@ assert !blas.isILP64;
stdenv.mkDerivation rec {
pname = "simple-dftd3";
- version = "1.1.1";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "dftd3";
repo = pname;
- rev = "v${version}";
- hash = "sha256-gN8uBc/Fk5U7wlBX1tkAWdxN9UW1Dv11GvaIBkEyBJw=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-Yisqd31SHMBuhZ4+VwKlkSW+gjqLttcbKzKjGvez+xE=";
};
nativeBuildInputs = [ gfortran meson ninja pkg-config ];
diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix
index f8e0dcff2bc1..ee24908eb512 100644
--- a/pkgs/development/libraries/science/math/libtorch/bin.nix
+++ b/pkgs/development/libraries/science/math/libtorch/bin.nix
@@ -19,7 +19,7 @@ let
# this derivation. However, we should ensure on version bumps
# that the CUDA toolkit for `passthru.tests` is still
# up-to-date.
- version = "2.3.0";
+ version = "2.5.0";
device = if cudaSupport then "cuda" else "cpu";
srcs = import ./binary-hashes.nix version;
unavailable = throw "libtorch is not available for this platform";
diff --git a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
index dd8104ad5f0d..4f6350d93116 100644
--- a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
+++ b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix
@@ -1,19 +1,19 @@
version: builtins.getAttr version {
- "2.3.0" = {
- aarch64-darwin-cpu = {
- name = "libtorch-macos-arm64-2.3.0.zip";
- url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-arm64-2.3.0.zip";
- hash = "sha256-l4qY1jbsECN5qm7dWJ2jSvKuQwQ/HI6G6Vq1Kh2rxkM=";
+ "2.5.0" = {
+ aarch64-darwin-cpu = {
+ name = "libtorch-macos-arm64-2.5.0.zip";
+ url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-arm64-2.5.0.zip";
+ hash = "sha256-4d9YKUuvAESBeG/WCUsQfEHwdB2z34grnlwWslj4970=";
};
x86_64-linux-cpu = {
- name = "libtorch-cxx11-abi-shared-with-deps-2.3.0-cpu.zip";
- url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.3.0%2Bcpu.zip";
- hash = "sha256-dKAk6UusK2eQIcP0oMXh9cnufMpy5Ph4SGPkIPPV6ds=";
+ name = "libtorch-cxx11-abi-shared-with-deps-2.5.0-cpu.zip";
+ url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.5.0%2Bcpu.zip";
+ hash = "sha256-gUzPhc4Z8rTPhIm89pPoLP0Ww17ono+/xgMW46E/Tro=";
};
x86_64-linux-cuda = {
- name = "libtorch-cxx11-abi-shared-with-deps-2.3.0-cu121.zip";
- url = "https://download.pytorch.org/libtorch/cu121/libtorch-cxx11-abi-shared-with-deps-2.3.0%2Bcu121.zip";
- hash = "sha256-6B+NF6q78I2WKFudn8bK+eNYDi1zQ7mdgv06fZbm2rE=";
+ name = "libtorch-cxx11-abi-shared-with-deps-2.5.0-cu124.zip";
+ url = "https://download.pytorch.org/libtorch/cu124/libtorch-cxx11-abi-shared-with-deps-2.5.0%2Bcu124.zip";
+ hash = "sha256-UaX47GAwyZ6UmzgY85TeAHmy3u52pBHhiyM5NAz7ens=";
};
};
}
diff --git a/pkgs/development/libraries/science/math/libtorch/prefetch.sh b/pkgs/development/libraries/science/math/libtorch/prefetch.sh
index 2682fe677976..d8680d3a60cf 100755
--- a/pkgs/development/libraries/science/math/libtorch/prefetch.sh
+++ b/pkgs/development/libraries/science/math/libtorch/prefetch.sh
@@ -6,11 +6,10 @@ set -eou pipefail
version=$1
bucket="https://download.pytorch.org/libtorch"
-CUDA_VERSION=cu121
+CUDA_VERSION=cu124
url_and_key_list=(
"aarch64-darwin-cpu $bucket/cpu/libtorch-macos-arm64-${version}.zip libtorch-macos-arm64-${version}.zip"
- "x86_64-darwin-cpu $bucket/cpu/libtorch-macos-x86_64-${version}.zip libtorch-macos-x86_64-${version}.zip"
"x86_64-linux-cpu $bucket/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip libtorch-cxx11-abi-shared-with-deps-${version}-cpu.zip"
"x86_64-linux-cuda $bucket/${CUDA_VERSION}/libtorch-cxx11-abi-shared-with-deps-${version}%2B${CUDA_VERSION}.zip libtorch-cxx11-abi-shared-with-deps-${version}-${CUDA_VERSION}.zip"
)
diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix
index 6e12e19d596a..0960229a8980 100644
--- a/pkgs/development/libraries/sentry-native/default.nix
+++ b/pkgs/development/libraries/sentry-native/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "sentry-native";
- version = "0.7.10";
+ version = "0.7.11";
src = fetchFromGitHub {
owner = "getsentry";
repo = "sentry-native";
rev = version;
- hash = "sha256-1Pro2BXflitUGVbzvjwdSFqwWM/EeuDC3eHEj+7qwm8=";
+ hash = "sha256-IDtymBIG5ilTHyFZ/EA2YJK72wvz7kHn2o9gbu7ejKM=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix
index 91a41ac35298..d53d22006036 100644
--- a/pkgs/development/libraries/stfl/default.nix
+++ b/pkgs/development/libraries/stfl/default.nix
@@ -1,17 +1,19 @@
-{ lib, stdenv, fetchurl, ncurses, libiconv }:
+{ lib, stdenv, fetchFromGitHub, ncurses }:
stdenv.mkDerivation rec {
pname = "stfl";
- version = "0.24";
+ version = "0.24-unstable-2021-11-29";
- src = fetchurl {
- url = "http://www.clifford.at/stfl/stfl-${version}.tar.gz";
- sha256 = "1460d5lc780p3q38l3wc9jfr2a7zlyrcra0li65aynj738cam9yl";
+ src = fetchFromGitHub {
+ owner ="newsboat";
+ repo = "stfl";
+ rev = "c2c10b8a50fef613c0aacdc5d06a0fa610bf79e9";
+ hash = "sha256-os1yQ6o4m7yBiEZQIPP64diRleIr7FtuQucUbWs4A6k=";
};
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
- buildInputs = [ ncurses libiconv ];
+ buildInputs = [ ncurses ];
# Silence warnings related to use of implicitly declared library functions and implicit ints.
# TODO: Remove and/or fix with patches the next time this package is updated.
@@ -20,6 +22,8 @@ stdenv.mkDerivation rec {
"-Wno-error=implicit-function-declaration"
"-Wno-error=implicit-int"
];
+ } // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+ NIX_LDFLAGS = "-liconv";
};
preBuild = ''
@@ -47,7 +51,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = "http://www.clifford.at/stfl/";
+ homepage = "https://web.archive.org/web/20211113222004/http://www.clifford.at/stfl/";
description = "Library which implements a curses-based widget set for text terminals";
maintainers = with lib.maintainers; [ lovek323 ];
license = lib.licenses.lgpl3;
diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix
index e328a4c0f632..3ae5b281e1fb 100644
--- a/pkgs/development/libraries/tdlib/default.nix
+++ b/pkgs/development/libraries/tdlib/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation {
pname = "tdlib";
- version = "1.8.37";
+ version = "1.8.38";
src = fetchFromGitHub {
owner = "tdlib";
@@ -11,8 +11,8 @@ stdenv.mkDerivation {
# The tdlib authors do not set tags for minor versions, but
# external programs depending on tdlib constrain the minor
# version, hence we set a specific commit with a known version.
- rev = "21e5ce0e977fe012e0cee4e6fcfe704b47b00774";
- hash = "sha256-gQFsdc/FXjuA1WdZ6iF7KxLQX/7+r1I5FcdEAyJSaqU=";
+ rev = "d321984b75fccdb76239529e8aadcf7f80b0e35a";
+ hash = "sha256-5QNcpwW0viWUtsW7b5oSq6X0tRyup6V5CT/BNhdv6lw=";
};
buildInputs = [ gperf openssl readline zlib ];
diff --git a/pkgs/development/libraries/tomlplusplus/default.nix b/pkgs/development/libraries/tomlplusplus/default.nix
deleted file mode 100644
index dda352d0769f..000000000000
--- a/pkgs/development/libraries/tomlplusplus/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib
-, stdenv
-, meson
-, cmake
-, ninja
-, fetchFromGitHub
-}:
-
-stdenv.mkDerivation (finalAttrs: {
- pname = "tomlplusplus";
- version = "3.4.0";
-
- src = fetchFromGitHub {
- owner = "marzer";
- repo = "tomlplusplus";
- rev = "v${finalAttrs.version}";
- hash = "sha256-h5tbO0Rv2tZezY58yUbyRVpsfRjY3i+5TPkkxr6La8M=";
- };
-
- nativeBuildInputs = [ meson cmake ninja ];
-
- meta = with lib; {
- homepage = "https://github.com/marzer/tomlplusplus";
- description = "Header-only TOML config file parser and serializer for C++17";
- license = licenses.mit;
- maintainers = with maintainers; [ Scrumplex ];
- platforms = platforms.unix;
- };
-})
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index e4c6afce8a61..4636921d60e1 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -1,5 +1,5 @@
{ lib
-, stdenv
+, clangStdenv
, buildPackages
, runCommand
, fetchurl
@@ -72,27 +72,28 @@
, enableGeoLocation ? true
, enableExperimental ? false
, withLibsecret ? true
-, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd
+, systemdSupport ? lib.meta.availableOn clangStdenv.hostPlatform systemd
, testers
}:
-stdenv.mkDerivation (finalAttrs: {
+# https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
+clangStdenv.mkDerivation (finalAttrs: {
pname = "webkitgtk";
- version = "2.46.1";
+ version = "2.46.2";
name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}";
outputs = [ "out" "dev" "devdoc" ];
# https://github.com/NixOS/nixpkgs/issues/153528
# Can't be linked within a 4GB address space.
- separateDebugInfo = stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.is32bit;
+ separateDebugInfo = clangStdenv.hostPlatform.isLinux && !clangStdenv.hostPlatform.is32bit;
src = fetchurl {
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
- hash = "sha256-KhT6rDWa/5QdC8REPrVTfjcCvK8xawoSng5l8/+OqsA=";
+ hash = "sha256-Wq4cXAow1enFgxZStvG978MddeCtgctAGFsK7ZLOebY=";
};
- patches = lib.optionals stdenv.hostPlatform.isLinux [
+ patches = lib.optionals clangStdenv.hostPlatform.isLinux [
(substituteAll {
src = ./fix-bubblewrap-paths.patch;
inherit (builtins) storeDir;
@@ -100,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
})
];
- preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ preConfigure = lib.optionalString (clangStdenv.hostPlatform != clangStdenv.buildPlatform) ''
# Ignore gettext in cmake_prefix_path so that find_program doesn't
# pick up the wrong gettext. TODO: Find a better solution for
# this, maybe make cmake not look up executables in
@@ -123,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
gi-docgen
glib # for gdbus-codegen
unifdef
- ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+ ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [
wayland-scanner
];
@@ -159,14 +160,14 @@ stdenv.mkDerivation (finalAttrs: {
p11-kit
sqlite
woff2
- ] ++ lib.optionals stdenv.hostPlatform.isBigEndian [
+ ] ++ lib.optionals clangStdenv.hostPlatform.isBigEndian [
# https://bugs.webkit.org/show_bug.cgi?id=274032
fontconfig
freetype
- ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ ] ++ lib.optionals clangStdenv.hostPlatform.isDarwin [
libedit
readline
- ] ++ lib.optional (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") (
+ ] ++ lib.optional (clangStdenv.hostPlatform.isDarwin && lib.versionOlder clangStdenv.hostPlatform.darwinSdkVersion "11.0") (
# this can likely be removed as:
# "libproc.h is included in the 10.12 SDK Libsystem and should be identical to this one."
# but the package is marked broken on darwin so unable to test
@@ -178,7 +179,7 @@ stdenv.mkDerivation (finalAttrs: {
runCommand "webkitgtk_headers" { } ''
install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h
''
- ) ++ lib.optionals stdenv.hostPlatform.isLinux [
+ ) ++ lib.optionals clangStdenv.hostPlatform.isLinux [
libseccomp
libmanette
wayland
@@ -211,12 +212,12 @@ stdenv.mkDerivation (finalAttrs: {
"-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}"
"-DUSE_LIBSECRET=${cmakeBool withLibsecret}"
"-DENABLE_EXPERIMENTAL_FEATURES=${cmakeBool enableExperimental}"
- ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+ ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [
# Have to be explicitly specified when cross.
# https://github.com/WebKit/WebKit/commit/a84036c6d1d66d723f217a4c29eee76f2039a353
"-DBWRAP_EXECUTABLE=${lib.getExe bubblewrap}"
"-DDBUS_PROXY_EXECUTABLE=${lib.getExe xdg-dbus-proxy}"
- ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ ] ++ lib.optionals clangStdenv.hostPlatform.isDarwin [
"-DENABLE_GAMEPAD=OFF"
"-DENABLE_GTKDOC=OFF"
"-DENABLE_MINIBROWSER=OFF"
@@ -255,6 +256,6 @@ stdenv.mkDerivation (finalAttrs: {
];
platforms = platforms.linux ++ platforms.darwin;
maintainers = teams.gnome.members;
- broken = stdenv.hostPlatform.isDarwin;
+ broken = clangStdenv.hostPlatform.isDarwin;
};
})
diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix
index 0bfb9c6326aa..adde4f0c3420 100644
--- a/pkgs/development/libraries/xapian/tools/omega/default.nix
+++ b/pkgs/development/libraries/xapian/tools/omega/default.nix
@@ -12,6 +12,11 @@ stdenv.mkDerivation rec {
buildInputs = [ xapian perl pcre2 zlib libmagic ];
nativeBuildInputs = [ pkg-config ];
+ postInstall = ''
+ mkdir -p $out/share/omega
+ cp -r templates $out/share/omega
+ '';
+
meta = with lib; {
description = "Indexer and CGI search front-end built on Xapian library";
homepage = "https://xapian.org/";
diff --git a/pkgs/development/lisp-modules/nix-cl.nix b/pkgs/development/lisp-modules/nix-cl.nix
index eb51c992dcbc..a1441d2e57ff 100644
--- a/pkgs/development/lisp-modules/nix-cl.nix
+++ b/pkgs/development/lisp-modules/nix-cl.nix
@@ -307,7 +307,7 @@ let
$out/bin/${o.program} \
--add-flags "${toString o.flags}" \
--set ASDF "${o.asdfFasl}/asdf.${o.faslExt}" \
- --prefix CL_SOURCE_REGISTRY : "$CL_SOURCE_REGISTRY" \
+ --prefix CL_SOURCE_REGISTRY : "$CL_SOURCE_REGISTRY''${CL_SOURCE_REGISTRY:+:}" \
--prefix ASDF_OUTPUT_TRANSLATIONS : "$(echo $CL_SOURCE_REGISTRY | sed s,//:,::,g):" \
--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
--prefix DYLD_LIBRARY_PATH : "$DYLD_LIBRARY_PATH" \
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 792af7848e6e..a7cded6a9758 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -555,14 +555,14 @@ buildLuarocksPackage {
fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
buildLuarocksPackage {
pname = "fzf-lua";
- version = "0.0.1476-1";
+ version = "0.0.1479-1";
knownRockspec = (fetchurl {
- url = "mirror://luarocks/fzf-lua-0.0.1476-1.rockspec";
- sha256 = "1k3qmxraf906652lkn0l0r9lh1j7hdxzrklr570dj1jai292n433";
+ url = "mirror://luarocks/fzf-lua-0.0.1479-1.rockspec";
+ sha256 = "1xj0vw2y9y0ff88gcsh1q8vg9lsrsak435pzx8bizpcxkpaqizc4";
}).outPath;
src = fetchzip {
- url = "https://github.com/ibhagwan/fzf-lua/archive/fc0f2b5781587d388b743c2c114127a7036d1a31.zip";
- sha256 = "08k9xmnkjian4mr5ak7fzbw5v14rlhr6zl6a9nk4xq155p5qlk2s";
+ url = "https://github.com/ibhagwan/fzf-lua/archive/ce1e24f2a48089b65deefcb0a71a9856839002b5.zip";
+ sha256 = "0nfihl95bxrjmkin8wj6d8sznch695fk2wxkwk6wd92v5dlapypx";
};
disabled = luaOlder "5.1";
@@ -853,16 +853,16 @@ buildLuarocksPackage {
llscheck = callPackage({ ansicolors, argparse, buildLuarocksPackage, fetchFromGitHub, fetchurl, lua-cjson, luaOlder, luafilesystem, penlight }:
buildLuarocksPackage {
pname = "llscheck";
- version = "0.5.0-1";
+ version = "0.6.0-1";
knownRockspec = (fetchurl {
- url = "mirror://luarocks/llscheck-0.5.0-1.rockspec";
- sha256 = "1bcyg1gphlgwmra8l1503yaw6wfihs1fksdvvp1y38zryhkvj0dy";
+ url = "mirror://luarocks/llscheck-0.6.0-1.rockspec";
+ sha256 = "1scgsjgsjbapqgwvwcd9l378sipin2w85mcjdi0fzgldsx87gwni";
}).outPath;
src = fetchFromGitHub {
owner = "jeffzi";
repo = "llscheck";
- rev = "v0.5.0";
- hash = "sha256-cG/FNzOwvLvrAEut4OvXI8WWSVzNEl4r3OgiSnp3S5c=";
+ rev = "v0.6.0";
+ hash = "sha256-XYfcVPiYCDrmuHyR1TN4QvsWIvbs86FN3UQYfrRHPiI=";
};
disabled = luaOlder "5.1";
@@ -1992,16 +1992,16 @@ buildLuarocksPackage {
luaprompt = callPackage({ argparse, buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }:
buildLuarocksPackage {
pname = "luaprompt";
- version = "0.8-1";
+ version = "0.9-1";
knownRockspec = (fetchurl {
- url = "mirror://luarocks/luaprompt-0.8-1.rockspec";
- sha256 = "17v7yqkvm4rxszqvqk3f6a6vqysh80p18l1ryif79bc7ic948br4";
+ url = "mirror://luarocks/luaprompt-0.9-1.rockspec";
+ sha256 = "0bh4fpfrqbg9bappnrfr6blvl3lzc99plq7jac67mhph1bjki7rk";
}).outPath;
src = fetchFromGitHub {
owner = "dpapavas";
repo = "luaprompt";
- rev = "v0.8";
- hash = "sha256-GdI5sj7FBeb9q23oxVOzT+yVhMYTnggaN8Xt/z/2xZo=";
+ rev = "v0.9";
+ hash = "sha256-S6bzlIY1KlMK3wy01wGuRujGFgPxcNWmCaISQ87EBGs=";
};
disabled = luaOlder "5.1";
@@ -2064,16 +2064,16 @@ buildLuarocksPackage {
luarocks-build-rust-mlua = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl }:
buildLuarocksPackage {
pname = "luarocks-build-rust-mlua";
- version = "0.2.2-1";
+ version = "0.2.3-1";
knownRockspec = (fetchurl {
- url = "mirror://luarocks/luarocks-build-rust-mlua-0.2.2-1.rockspec";
- sha256 = "0y9ms0cf0jp4b26m6qbxsj4s4ng4z112qq4wc79q7xm7zw9dha4p";
+ url = "mirror://luarocks/luarocks-build-rust-mlua-0.2.3-1.rockspec";
+ sha256 = "0vkbl2xcjjpi5gn7v2fr7nyyd7fg91zknrgm61cz91mwp4x5i3pf";
}).outPath;
src = fetchFromGitHub {
owner = "mlua-rs";
repo = "luarocks-build-rust-mlua";
- rev = "0.2.2";
- hash = "sha256-vyFX5LFGrC+RXjmwLgBdmVawOCNatJva53MFvKa7ozM=";
+ rev = "0.2.3";
+ hash = "sha256-SktU54lLaa9x6ntsyeaomsvCQJOtkJhIK/q5uDDFHqY=";
};
@@ -2492,14 +2492,14 @@ buildLuarocksPackage {
lz-n = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
buildLuarocksPackage {
pname = "lz.n";
- version = "2.9.0-1";
+ version = "2.9.1-1";
knownRockspec = (fetchurl {
- url = "mirror://luarocks/lz.n-2.9.0-1.rockspec";
- sha256 = "1014pjjkk0m1hki95gj8zk8nv8nzq3ikaf44i3byg44n84r2if80";
+ url = "mirror://luarocks/lz.n-2.9.1-1.rockspec";
+ sha256 = "0x2xgmgxj9zvpa9x57981j3g21wm3zsylpwidk0wsbln7nag6b92";
}).outPath;
src = fetchzip {
- url = "https://github.com/nvim-neorocks/lz.n/archive/v2.9.0.zip";
- sha256 = "1l9w5dkagk10nqskj25903mkzra3fr8ds0xfvqry9a1aly79wkvy";
+ url = "https://github.com/nvim-neorocks/lz.n/archive/v2.9.1.zip";
+ sha256 = "1xk4m8i61aiwcd9k5xp3wpn3frxkkjy5fk2921qkma1vsadd83yk";
};
disabled = luaOlder "5.1";
@@ -2515,14 +2515,14 @@ buildLuarocksPackage {
lze = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
buildLuarocksPackage {
pname = "lze";
- version = "0.1.1-1";
+ version = "0.1.4-1";
knownRockspec = (fetchurl {
- url = "mirror://luarocks/lze-0.1.1-1.rockspec";
- sha256 = "0rih9kgx846qhp1fmsqlnp8y08kv4hp8gl9dwykz4zr0zljy94j3";
+ url = "mirror://luarocks/lze-0.1.4-1.rockspec";
+ sha256 = "0j2ll2kcqmk7m78x4bwwm47hr0n8kgz027c4l2yhyfw747s70z1h";
}).outPath;
src = fetchzip {
- url = "https://github.com/BirdeeHub/lze/archive/v0.1.1.zip";
- sha256 = "1s6n61jabsv94s37xd5g0y7fxhficc4rwsklgsmzajravpgy60a8";
+ url = "https://github.com/BirdeeHub/lze/archive/v0.1.4.zip";
+ sha256 = "1rr8bsxvv53mhkvmc8vb1l6jvbrfzngr3kq8wj3gvpima3jdk1za";
};
disabled = luaOlder "5.1";
@@ -3072,14 +3072,14 @@ buildLuarocksPackage {
rocks-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, fzy, luaOlder, luarocks, nvim-nio, rtp-nvim, toml-edit }:
buildLuarocksPackage {
pname = "rocks.nvim";
- version = "2.40.5-1";
+ version = "2.41.0-1";
knownRockspec = (fetchurl {
- url = "mirror://luarocks/rocks.nvim-2.40.5-1.rockspec";
- sha256 = "0cbj6aqw4f36lc4y4jksr4s6dp0vhzw0pj3kd1fi0vclc8g77q1z";
+ url = "mirror://luarocks/rocks.nvim-2.41.0-1.rockspec";
+ sha256 = "1srhz85sfhkzlsy68mvwhdixvwz0awhrn530sny0287zhnrxrilp";
}).outPath;
src = fetchzip {
- url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.40.5.zip";
- sha256 = "1vkjd8dasz8vhpnyjvvvwfpkakrfri6si242ga34wwf9jfg9bfbz";
+ url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.41.0.zip";
+ sha256 = "0j44chcziimqn6jm2ckbwmn97nin0dwhnnrdpm87j754kbqsj21a";
};
disabled = luaOlder "5.1";
@@ -3338,8 +3338,8 @@ buildLuarocksPackage {
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
- rev = "df534c3042572fb958586facd02841e10186707c";
- hash = "sha256-HWNfj3/b+CUFgWR26IzAuMzlSCEuiK/7n8tWHwqAAik=";
+ rev = "37dc9233a473dd6c3f54456ef9994d8f77c80211";
+ hash = "sha256-zidYSt0WrnATuCpSGGhYuafNpPPN6dJ6hEuCgFytfEk=";
};
disabled = lua.luaversion != "5.1";
@@ -3406,21 +3406,21 @@ buildLuarocksPackage {
toml-edit = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, luarocks-build-rust-mlua }:
buildLuarocksPackage {
pname = "toml-edit";
- version = "0.4.1-1";
+ version = "0.5.0-1";
knownRockspec = (fetchurl {
- url = "mirror://luarocks/toml-edit-0.4.1-1.rockspec";
- sha256 = "180zdqrzffr7jr9xls895gj5hrx6pfs98rlxwzg71382jy1n79qi";
+ url = "mirror://luarocks/toml-edit-0.5.0-1.rockspec";
+ sha256 = "1d80s6jcdw7ny52vda7lx4xccmavnl7sji1bcchmbc7krbf6s7v0";
}).outPath;
src = fetchzip {
- url = "https://github.com/vhyrro/toml-edit.lua/archive/v0.4.1.zip";
- sha256 = "1322p490p6yza3lczfzmwf5nkfj4ra6m9g6hvr2qgay405wnpgy7";
+ url = "https://github.com/nvim-neorocks/toml-edit.lua/archive/v0.5.0.zip";
+ sha256 = "0cfsp9h7kjm52mrjf42jrp3np7akql8ynlnvq32m2ayshjdsdx6q";
};
disabled = luaOlder "5.1";
nativeBuildInputs = [ luarocks-build-rust-mlua ];
meta = {
- homepage = "https://github.com/vhyrro/toml-edit.lua";
+ homepage = "https://github.com/nvim-neorocks/toml-edit.lua";
description = "TOML Parser + Formatting and Comment-Preserving Editor";
maintainers = with lib.maintainers; [ mrcjkb ];
license.fullName = "MIT";
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index dd8e975d32c7..4f99dec11a40 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -356,7 +356,7 @@ in
luadbi-postgresql = prev.luadbi-postgresql.overrideAttrs (oa: {
buildInputs = oa.buildInputs ++ [
- postgresql
+ (lib.getDev postgresql)
];
});
@@ -831,7 +831,7 @@ in
cargoDeps = rustPlatform.fetchCargoTarball {
src = oa.src;
- hash = "sha256-PLihirhJshcUQI3L1eTcnQiZvocDl29eQHhdBwJQRU8=";
+ hash = "sha256-2WN5RoM1G2SE6H3g5pmEQvOoSCoaw3xMG8cDdfU2DAo=";
};
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin
diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix
index 74da4320deb5..5de9127f4e9f 100644
--- a/pkgs/development/misc/brev-cli/default.nix
+++ b/pkgs/development/misc/brev-cli/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "brev-cli";
- version = "0.6.293";
+ version = "0.6.295";
src = fetchFromGitHub {
owner = "brevdev";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-XRzwLPUNUSf88GqwdI8/WuodFVdoHuY8k6GYBgUco20=";
+ sha256 = "sha256-sdf74TsDVwCpL+2XQl64Z7tIIuM60XW9nLfAjuy5yZ0=";
};
- vendorHash = "sha256-oVs7CFnijmyaQAEoYuKf56n+i2q9YMjq4HatbpWympw=";
+ vendorHash = "sha256-ZlL4Ts+3lZhxSkg0QlCJHtl3bg3t3nQRVIDD6GaOJnE=";
CGO_ENABLED = 0;
subPackages = [ "." ];
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index eb94495aeba3..4123ca029664 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -3,9 +3,6 @@
{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
let
- # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
- utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
-
python = if nodejs ? python then nodejs.python else python2;
# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
@@ -499,7 +496,7 @@ let
stdenv.mkDerivation ({
name = "${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ]
- ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux
+ ++ lib.optional (stdenv.hostPlatform.isLinux) pkgs.util-linux
++ lib.optional (stdenv.hostPlatform.isDarwin) libtool
++ buildInputs;
@@ -591,7 +588,7 @@ let
name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ]
- ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux
+ ++ lib.optional (stdenv.hostPlatform.isLinux) pkgs.util-linux
++ lib.optional (stdenv.hostPlatform.isDarwin) libtool
++ buildInputs;
@@ -662,7 +659,7 @@ let
stdenv.mkDerivation ({
name = "node-shell-${name}${if version == null then "" else "-${version}"}";
- buildInputs = [ python nodejs ] ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux ++ buildInputs;
+ buildInputs = [ python nodejs ] ++ lib.optional (stdenv.hostPlatform.isLinux) pkgs.util-linux ++ buildInputs;
buildCommand = ''
mkdir -p $out/bin
cat > $out/bin/shell < [
+- qw( AUTH_PROTOCOL_NONE AUTH_PROTOCOL_HMACMD5 AUTH_PROTOCOL_HMACSHA )
++ qw( AUTH_PROTOCOL_NONE AUTH_PROTOCOL_HMACMD5 AUTH_PROTOCOL_HMACSHA
++ AUTH_PROTOCOL_HMACSHA224 AUTH_PROTOCOL_HMACSHA256
++ AUTH_PROTOCOL_HMACSHA384 AUTH_PROTOCOL_HMACSHA512 )
+ ],
+ levels => [
+ qw( SECURITY_LEVEL_NOAUTHNOPRIV SECURITY_LEVEL_AUTHNOPRIV
+@@ -64,9 +67,13 @@ $EXPORT_TAGS{ALL} = [ @EXPORT_OK ];
+
+ ## RCC 3414 - Authentication protocols
+
+-sub AUTH_PROTOCOL_NONE { '1.3.6.1.6.3.10.1.1.1' } # usmNoAuthProtocol
+-sub AUTH_PROTOCOL_HMACMD5 { '1.3.6.1.6.3.10.1.1.2' } # usmHMACMD5AuthProtocol
+-sub AUTH_PROTOCOL_HMACSHA { '1.3.6.1.6.3.10.1.1.3' } # usmHMACSHAAuthProtocol
++sub AUTH_PROTOCOL_NONE { '1.3.6.1.6.3.10.1.1.1' } # usmNoAuthProtocol
++sub AUTH_PROTOCOL_HMACMD5 { '1.3.6.1.6.3.10.1.1.2' } # usmHMACMD5AuthProtocol
++sub AUTH_PROTOCOL_HMACSHA { '1.3.6.1.6.3.10.1.1.3' } # usmHMACSHAAuthProtocol
++sub AUTH_PROTOCOL_HMACSHA224 { '1.3.6.1.6.3.10.1.1.4' } # usmHMAC128SHA224AuthProtocol
++sub AUTH_PROTOCOL_HMACSHA256 { '1.3.6.1.6.3.10.1.1.5' } # usmHMAC192SHA256AuthProtocol
++sub AUTH_PROTOCOL_HMACSHA384 { '1.3.6.1.6.3.10.1.1.6' } # usmHMAC256SHA384AuthProtocol
++sub AUTH_PROTOCOL_HMACSHA512 { '1.3.6.1.6.3.10.1.1.7' } # usmHMAC384SHA512AuthProtocol
+
+ ## RFC 3414 - Privacy protocols
+
+@@ -125,6 +132,7 @@ sub new
+ '_time_epoc' => time(), # snmpEngineBoots epoc
+ '_user_name' => q{}, # securityName
+ '_auth_data' => undef, # Authentication data
++ '_auth_maclen' => undef, # MAC length
+ '_auth_key' => undef, # authKey
+ '_auth_password' => undef, # Authentication password
+ '_auth_protocol' => AUTH_PROTOCOL_HMACMD5, # authProtocol
+@@ -281,10 +289,10 @@ sub generate_request_msg
+ if ($pdu->security_level() > SECURITY_LEVEL_NOAUTHNOPRIV) {
+
+ # Save the location to fill in msgAuthenticationParameters later
+- $auth_location = $msg->length() + 12 + length $pdu_buffer;
++ $auth_location = $msg->length() + $this->{_auth_maclen} + length $pdu_buffer;
+
+ # Set the msgAuthenticationParameters to all zeros
+- $auth_params = pack 'x12';
++ $auth_params = pack "x$this->{_auth_maclen}";
+ }
+
+ if (!defined $msg->prepare(OCTET_STRING, $auth_params)) {
+@@ -419,12 +427,12 @@ sub process_incoming_msg
+ # to compute the HMAC properly.
+
+ if (my $len = length $auth_params) {
+- if ($len != 12) {
++ if ($len != $this->{_auth_maclen}) {
+ return $this->_error(
+ 'The msgAuthenticationParameters length of %d is invalid', $len
+ );
+ }
+- substr ${$msg->reference}, ($msg->index() - 12), 12, pack 'x12';
++ substr ${$msg->reference}, ($msg->index() - $this->{_auth_maclen}), $this->{_auth_maclen}, pack "x$this->{_auth_maclen}";
+ }
+
+ # msgPrivacyParameters::=OCTET STRING
+@@ -748,6 +756,18 @@ sub _auth_password
+ quotemeta AUTH_PROTOCOL_HMACMD5, AUTH_PROTOCOL_HMACMD5,
+ '(?:hmac-)?sha(?:-?1|-96)?', AUTH_PROTOCOL_HMACSHA,
+ quotemeta AUTH_PROTOCOL_HMACSHA, AUTH_PROTOCOL_HMACSHA,
++ '(?:hmac-)?sha(?:-?224)', AUTH_PROTOCOL_HMACSHA224,
++ 'usmHMAC128SHA224AuthProtocol', AUTH_PROTOCOL_HMACSHA224,
++ quotemeta AUTH_PROTOCOL_HMACSHA224,AUTH_PROTOCOL_HMACSHA224,
++ '(?:hmac-)?sha(?:-?256)', AUTH_PROTOCOL_HMACSHA256,
++ 'usmHMAC192SHA256AuthProtocol', AUTH_PROTOCOL_HMACSHA256,
++ quotemeta AUTH_PROTOCOL_HMACSHA256,AUTH_PROTOCOL_HMACSHA256,
++ '(?:hmac-)?sha(?:-?384)', AUTH_PROTOCOL_HMACSHA384,
++ 'usmHMAC256SHA384AuthProtocol', AUTH_PROTOCOL_HMACSHA384,
++ quotemeta AUTH_PROTOCOL_HMACSHA384,AUTH_PROTOCOL_HMACSHA384,
++ '(?:hmac-)?sha(?:-?512)', AUTH_PROTOCOL_HMACSHA512,
++ 'usmHMAC384SHA512AuthProtocol', AUTH_PROTOCOL_HMACSHA512,
++ quotemeta AUTH_PROTOCOL_HMACSHA512,AUTH_PROTOCOL_HMACSHA512,
+ };
+
+ sub _auth_protocol
+@@ -1100,7 +1120,7 @@ sub _authenticate_outgoing_msg
+ }
+
+ # Set the msgAuthenticationParameters
+- substr ${$msg->reference}, -$auth_location, 12, $this->_auth_hmac($msg);
++ substr ${$msg->reference}, -$auth_location, $this->{_auth_maclen}, $this->_auth_hmac($msg);
+
+ return TRUE;
+ }
+@@ -1126,7 +1146,7 @@ sub _auth_hmac
+ return q{} if (!defined($this->{_auth_data}) || !defined $msg);
+
+ return substr
+- $this->{_auth_data}->reset()->add(${$msg->reference()})->digest(), 0, 12;
++ $this->{_auth_data}(${$msg->reference()}, $this->{_auth_key}), 0, $this->{_auth_maclen};
+ }
+
+ sub _auth_data_init
+@@ -1141,16 +1161,35 @@ sub _auth_data_init
+
+ if ($this->{_auth_protocol} eq AUTH_PROTOCOL_HMACMD5) {
+
+- $this->{_auth_data} =
+- Digest::HMAC_MD5->new($this->{_auth_key});
++ $this->{_auth_data} = \&hmac_md5;
++ $this->{_auth_maclen} = 12;
+
+ } elsif ($this->{_auth_protocol} eq AUTH_PROTOCOL_HMACSHA) {
+
+- $this->{_auth_data} =
+- Digest::HMAC_SHA1->new($this->{_auth_key});
++ $this->{_auth_data} = \&hmac_sha1;
++ $this->{_auth_maclen} = 12;
++
++ } elsif ($this->{_auth_protocol} eq AUTH_PROTOCOL_HMACSHA224) {
++
++ $this->{_auth_data} = \&hmac_sha224;
++ $this->{_auth_maclen} = 16;
++
++ } elsif ($this->{_auth_protocol} eq AUTH_PROTOCOL_HMACSHA256) {
++
++ $this->{_auth_data} = \&hmac_sha256;
++ $this->{_auth_maclen} = 24;
++
++ } elsif ($this->{_auth_protocol} eq AUTH_PROTOCOL_HMACSHA384) {
++
++ $this->{_auth_data} = \&hmac_sha384;
++ $this->{_auth_maclen} = 32;
++
++ } elsif ($this->{_auth_protocol} eq AUTH_PROTOCOL_HMACSHA512) {
++
++ $this->{_auth_data} = \&hmac_sha512;
++ $this->{_auth_maclen} = 48;
+
+ } else {
+-
+ return $this->_error(
+ 'The authProtocol "%s" is unknown', $this->{_auth_protocol}
+ );
+@@ -1628,6 +1667,10 @@ sub _auth_key_validate
+ {
+ AUTH_PROTOCOL_HMACMD5, [ 16, 'HMAC-MD5' ],
+ AUTH_PROTOCOL_HMACSHA, [ 20, 'HMAC-SHA1' ],
++ AUTH_PROTOCOL_HMACSHA224, [ 28, 'HMAC-SHA224' ],
++ AUTH_PROTOCOL_HMACSHA256, [ 32, 'HMAC-SHA256' ],
++ AUTH_PROTOCOL_HMACSHA384, [ 48, 'HMAC-SHA384' ],
++ AUTH_PROTOCOL_HMACSHA512, [ 64, 'HMAC-SHA512' ],
+ };
+
+ if (!exists $key_len->{$this->{_auth_protocol}}) {
+@@ -1783,8 +1826,12 @@ sub _password_localize
+
+ my $digests =
+ {
+- AUTH_PROTOCOL_HMACMD5, 'Digest::MD5',
+- AUTH_PROTOCOL_HMACSHA, 'Digest::SHA',
++ AUTH_PROTOCOL_HMACMD5, ['Digest::MD5', ],
++ AUTH_PROTOCOL_HMACSHA, ['Digest::SHA', 1],
++ AUTH_PROTOCOL_HMACSHA224, ['Digest::SHA', 224],
++ AUTH_PROTOCOL_HMACSHA256, ['Digest::SHA', 256],
++ AUTH_PROTOCOL_HMACSHA384, ['Digest::SHA', 384],
++ AUTH_PROTOCOL_HMACSHA512, ['Digest::SHA', 512],
+ };
+
+ if (!exists $digests->{$this->{_auth_protocol}}) {
+@@ -1793,7 +1840,12 @@ sub _password_localize
+ );
+ }
+
+- my $digest = $digests->{$this->{_auth_protocol}}->new;
++ my $digest;
++ if (!defined($digests->{$this->{_auth_protocol}}[1])) {
++ $digest = $digests->{$this->{_auth_protocol}}[0]->new;
++ } else {
++ $digest = $digests->{$this->{_auth_protocol}}[0]->new($digests->{$this->{_auth_protocol}}[1]);
++ }
+
+ # Create the initial digest using the password
+
+diff --git a/t/usm-sha224-aes.t b/t/usm-sha224-aes.t
+new file mode 100644
+index 0000000..e7d118e
+--- /dev/null
++++ b/t/usm-sha224-aes.t
+@@ -0,0 +1,169 @@
++# -*- mode: perl -*-
++# ============================================================================
++
++# Test of the SNMPv3 User-based Security Model.
++
++# Copyright (c) 2001-2009 David M. Town .
++# Copyright (c) 2024 Michal Josef Špaček .
++# All rights reserved.
++
++# This program is free software; you may redistribute it and/or modify it
++# under the same terms as the Perl 5 programming language system itself.
++
++# ============================================================================
++
++use strict;
++use Test;
++
++BEGIN
++{
++ $| = 1;
++ $^W = 1;
++ plan tests => 7
++}
++
++use Net::SNMP::Message qw(SEQUENCE OCTET_STRING FALSE);
++
++#
++# Load the Net::SNMP::Security::USM module
++#
++
++eval 'use Net::SNMP::Security::USM; use Crypt::Rijndael;';
++
++my $skip = ($@ =~ /locate (:?\S+\.pm)/) ? $@ : FALSE;
++
++#
++# 1. Create the Net::SNMP::Security::USM object
++#
++
++my ($u, $e);
++
++eval
++{
++ ($u, $e) = Net::SNMP::Security::USM->new(
++ -username => 'dtown',
++ -authpassword => 'maplesyrup',
++ -authprotocol => 'sha224',
++ -privpassword => 'maplesyrup',
++ -privprotocol => 'aes',
++ );
++
++ # "Perform" discovery...
++ $u->_engine_id_discovery(pack 'x11H2', '02');
++
++ # ...and synchronization
++ $u->_synchronize(10, time);
++};
++
++skip(
++ $skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Security::USM object'
++);
++
++#
++# 2. Check the localized authKey
++#
++
++eval
++{
++ $e = unpack 'H*', $u->auth_key();
++};
++
++skip(
++ $skip,
++ ($@ || $e),
++ '0bd8827c6e29f8065e08e09237f177e410f69b90e1782be682075674',
++ 'Invalid authKey calculated'
++);
++
++#
++# 3. Check the localized privKey
++#
++
++eval
++{
++ $e = unpack 'H*', $u->priv_key();
++};
++
++skip(
++ $skip,
++ ($@ || $e),
++ '0bd8827c6e29f8065e08e09237f177e4',
++ 'Invalid privKey calculated'
++);
++
++#
++# 4. Create and initialize a Message
++#
++
++my $m;
++
++eval
++{
++ ($m, $e) = Net::SNMP::Message->new();
++ $m->prepare(SEQUENCE, pack('H*', 'deadbeef') x 8);
++ $e = $m->error();
++};
++
++skip($skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Message object');
++
++#
++# 5. Calculate the HMAC
++#
++
++my $h;
++
++eval
++{
++ $h = unpack 'H*', $u->_auth_hmac($m);
++};
++
++skip($skip, $@, q{}, 'Calculate the HMAC failed');
++
++#
++# 6. Encrypt/descrypt the Message
++#
++
++my $henc;
++
++eval
++{
++ my $engine_boots = 0;
++ my $engine_time = 1710186219;
++ my $salt;
++ my $len = $m->length();
++ my $buff = $m->clear();
++ $u->{_engine_boots} = $engine_boots;
++ $u->{_engine_time} = $engine_time;
++ my $encrypted = $u->_encrypt_data($m, $salt, $buff);
++ $henc = unpack 'H*', $encrypted;
++ $m->append($encrypted);
++ substr $salt, 0, 0, pack 'NN', $engine_boots, $engine_time;
++ $u->_decrypt_data($m, $salt, $m->process(OCTET_STRING));
++ $e = $u->error();
++ # Remove padding if necessary
++ if ($len -= $m->length()) {
++ substr ${$m->reference()}, $len, -$len, q{};
++ }
++};
++
++skip(
++ $skip,
++ ($@ || $e || $henc),
++ '042228c5467793ab001f4be546de4b990f90998b09d43f2baaffb52a5d36457cef3b5ab7',
++ 'Privacy failed',
++);
++
++#
++# 7. Check the HMAC
++#
++
++my $h2;
++
++eval
++{
++ $h2 = unpack 'H*', $u->_auth_hmac($m);
++};
++
++skip($skip, ($@ || $h2), $h, 'Authentication failed');
++
++# ============================================================================
+diff --git a/t/usm-sha256-aes.t b/t/usm-sha256-aes.t
+new file mode 100644
+index 0000000..4521187
+--- /dev/null
++++ b/t/usm-sha256-aes.t
+@@ -0,0 +1,169 @@
++# -*- mode: perl -*-
++# ============================================================================
++
++# Test of the SNMPv3 User-based Security Model.
++
++# Copyright (c) 2001-2009 David M. Town .
++# Copyright (c) 2024 Michal Josef Špaček .
++# All rights reserved.
++
++# This program is free software; you may redistribute it and/or modify it
++# under the same terms as the Perl 5 programming language system itself.
++
++# ============================================================================
++
++use strict;
++use Test;
++
++BEGIN
++{
++ $| = 1;
++ $^W = 1;
++ plan tests => 7
++}
++
++use Net::SNMP::Message qw(SEQUENCE OCTET_STRING FALSE);
++
++#
++# Load the Net::SNMP::Security::USM module
++#
++
++eval 'use Net::SNMP::Security::USM; use Crypt::Rijndael;';
++
++my $skip = ($@ =~ /locate (:?\S+\.pm)/) ? $@ : FALSE;
++
++#
++# 1. Create the Net::SNMP::Security::USM object
++#
++
++my ($u, $e);
++
++eval
++{
++ ($u, $e) = Net::SNMP::Security::USM->new(
++ -username => 'dtown',
++ -authpassword => 'maplesyrup',
++ -authprotocol => 'sha256',
++ -privpassword => 'maplesyrup',
++ -privprotocol => 'aes',
++ );
++
++ # "Perform" discovery...
++ $u->_engine_id_discovery(pack 'x11H2', '02');
++
++ # ...and synchronization
++ $u->_synchronize(10, time);
++};
++
++skip(
++ $skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Security::USM object'
++);
++
++#
++# 2. Check the localized authKey
++#
++
++eval
++{
++ $e = unpack 'H*', $u->auth_key();
++};
++
++skip(
++ $skip,
++ ($@ || $e),
++ '8982e0e549e866db361a6b625d84cccc11162d453ee8ce3a6445c2d6776f0f8b',
++ 'Invalid authKey calculated'
++);
++
++#
++# 3. Check the localized privKey
++#
++
++eval
++{
++ $e = unpack 'H*', $u->priv_key();
++};
++
++skip(
++ $skip,
++ ($@ || $e),
++ '8982e0e549e866db361a6b625d84cccc',
++ 'Invalid privKey calculated'
++);
++
++#
++# 4. Create and initialize a Message
++#
++
++my $m;
++
++eval
++{
++ ($m, $e) = Net::SNMP::Message->new();
++ $m->prepare(SEQUENCE, pack('H*', 'deadbeef') x 8);
++ $e = $m->error();
++};
++
++skip($skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Message object');
++
++#
++# 5. Calculate the HMAC
++#
++
++my $h;
++
++eval
++{
++ $h = unpack 'H*', $u->_auth_hmac($m);
++};
++
++skip($skip, $@, q{}, 'Calculate the HMAC failed');
++
++#
++# 6. Encrypt/descrypt the Message
++#
++
++my $henc;
++
++eval
++{
++ my $engine_boots = 0;
++ my $engine_time = 1710186219;
++ my $salt;
++ my $len = $m->length();
++ my $buff = $m->clear();
++ $u->{_engine_boots} = $engine_boots;
++ $u->{_engine_time} = $engine_time;
++ my $encrypted = $u->_encrypt_data($m, $salt, $buff);
++ $henc = unpack 'H*', $encrypted;
++ $m->append($encrypted);
++ substr $salt, 0, 0, pack 'NN', $engine_boots, $engine_time;
++ $u->_decrypt_data($m, $salt, $m->process(OCTET_STRING));
++ $e = $u->error();
++ # Remove padding if necessary
++ if ($len -= $m->length()) {
++ substr ${$m->reference()}, $len, -$len, q{};
++ }
++};
++
++skip(
++ $skip,
++ ($@ || $e || $henc),
++ '0422863d06faf464369a298b66062e54374ba3b4a0f862162d25ba72130038f8befc9e21',
++ 'Privacy failed',
++);
++
++#
++# 7. Check the HMAC
++#
++
++my $h2;
++
++eval
++{
++ $h2 = unpack 'H*', $u->_auth_hmac($m);
++};
++
++skip($skip, ($@ || $h2), $h, 'Authentication failed');
++
++# ============================================================================
+diff --git a/t/usm-sha384-aes.t b/t/usm-sha384-aes.t
+new file mode 100644
+index 0000000..e88ca4a
+--- /dev/null
++++ b/t/usm-sha384-aes.t
+@@ -0,0 +1,169 @@
++# -*- mode: perl -*-
++# ============================================================================
++
++# Test of the SNMPv3 User-based Security Model.
++
++# Copyright (c) 2001-2009 David M. Town .
++# Copyright (c) 2024 Michal Josef Špaček .
++# All rights reserved.
++
++# This program is free software; you may redistribute it and/or modify it
++# under the same terms as the Perl 5 programming language system itself.
++
++# ============================================================================
++
++use strict;
++use Test;
++
++BEGIN
++{
++ $| = 1;
++ $^W = 1;
++ plan tests => 7
++}
++
++use Net::SNMP::Message qw(SEQUENCE OCTET_STRING FALSE);
++
++#
++# Load the Net::SNMP::Security::USM module
++#
++
++eval 'use Net::SNMP::Security::USM; use Crypt::Rijndael;';
++
++my $skip = ($@ =~ /locate (:?\S+\.pm)/) ? $@ : FALSE;
++
++#
++# 1. Create the Net::SNMP::Security::USM object
++#
++
++my ($u, $e);
++
++eval
++{
++ ($u, $e) = Net::SNMP::Security::USM->new(
++ -username => 'dtown',
++ -authpassword => 'maplesyrup',
++ -authprotocol => 'sha384',
++ -privpassword => 'maplesyrup',
++ -privprotocol => 'aes',
++ );
++
++ # "Perform" discovery...
++ $u->_engine_id_discovery(pack 'x11H2', '02');
++
++ # ...and synchronization
++ $u->_synchronize(10, time);
++};
++
++skip(
++ $skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Security::USM object'
++);
++
++#
++# 2. Check the localized authKey
++#
++
++eval
++{
++ $e = unpack 'H*', $u->auth_key();
++};
++
++skip(
++ $skip,
++ ($@ || $e),
++ '3b298f16164a11184279d5432bf169e2d2a48307de02b3d3f7e2b4f36eb6f0455a53689a3937eea07319a633d2ccba78',
++ 'Invalid authKey calculated'
++);
++
++#
++# 3. Check the localized privKey
++#
++
++eval
++{
++ $e = unpack 'H*', $u->priv_key();
++};
++
++skip(
++ $skip,
++ ($@ || $e),
++ '3b298f16164a11184279d5432bf169e2',
++ 'Invalid privKey calculated'
++);
++
++#
++# 4. Create and initialize a Message
++#
++
++my $m;
++
++eval
++{
++ ($m, $e) = Net::SNMP::Message->new();
++ $m->prepare(SEQUENCE, pack('H*', 'deadbeef') x 8);
++ $e = $m->error();
++};
++
++skip($skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Message object');
++
++#
++# 5. Calculate the HMAC
++#
++
++my $h;
++
++eval
++{
++ $h = unpack 'H*', $u->_auth_hmac($m);
++};
++
++skip($skip, $@, q{}, 'Calculate the HMAC failed');
++
++#
++# 6. Encrypt/descrypt the Message
++#
++
++my $henc;
++
++eval
++{
++ my $engine_boots = 0;
++ my $engine_time = 1710186219;
++ my $salt;
++ my $len = $m->length();
++ my $buff = $m->clear();
++ $u->{_engine_boots} = $engine_boots;
++ $u->{_engine_time} = $engine_time;
++ my $encrypted = $u->_encrypt_data($m, $salt, $buff);
++ $henc = unpack 'H*', $encrypted;
++ $m->append($encrypted);
++ substr $salt, 0, 0, pack 'NN', $engine_boots, $engine_time;
++ $u->_decrypt_data($m, $salt, $m->process(OCTET_STRING));
++ $e = $u->error();
++ # Remove padding if necessary
++ if ($len -= $m->length()) {
++ substr ${$m->reference()}, $len, -$len, q{};
++ }
++};
++
++skip(
++ $skip,
++ ($@ || $e || $henc),
++ '0422850967bbff81be49aefadf9b6ee3eedb9093609fcfc813a21bdf09b469965923bfc0',
++ 'Privacy failed',
++);
++
++#
++# 7. Check the HMAC
++#
++
++my $h2;
++
++eval
++{
++ $h2 = unpack 'H*', $u->_auth_hmac($m);
++};
++
++skip($skip, ($@ || $h2), $h, 'Authentication failed');
++
++# ============================================================================
+diff --git a/t/usm-sha512-aes.t b/t/usm-sha512-aes.t
+new file mode 100644
+index 0000000..c5eadf3
+--- /dev/null
++++ b/t/usm-sha512-aes.t
+@@ -0,0 +1,169 @@
++# -*- mode: perl -*-
++# ============================================================================
++
++# Test of the SNMPv3 User-based Security Model.
++
++# Copyright (c) 2001-2009 David M. Town .
++# Copyright (c) 2024 Michal Josef Špaček .
++# All rights reserved.
++
++# This program is free software; you may redistribute it and/or modify it
++# under the same terms as the Perl 5 programming language system itself.
++
++# ============================================================================
++
++use strict;
++use Test;
++
++BEGIN
++{
++ $| = 1;
++ $^W = 1;
++ plan tests => 7
++}
++
++use Net::SNMP::Message qw(SEQUENCE OCTET_STRING FALSE);
++
++#
++# Load the Net::SNMP::Security::USM module
++#
++
++eval 'use Net::SNMP::Security::USM; use Crypt::Rijndael;';
++
++my $skip = ($@ =~ /locate (:?\S+\.pm)/) ? $@ : FALSE;
++
++#
++# 1. Create the Net::SNMP::Security::USM object
++#
++
++my ($u, $e);
++
++eval
++{
++ ($u, $e) = Net::SNMP::Security::USM->new(
++ -username => 'dtown',
++ -authpassword => 'maplesyrup',
++ -authprotocol => 'sha512',
++ -privpassword => 'maplesyrup',
++ -privprotocol => 'aes',
++ );
++
++ # "Perform" discovery...
++ $u->_engine_id_discovery(pack 'x11H2', '02');
++
++ # ...and synchronization
++ $u->_synchronize(10, time);
++};
++
++skip(
++ $skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Security::USM object'
++);
++
++#
++# 2. Check the localized authKey
++#
++
++eval
++{
++ $e = unpack 'H*', $u->auth_key();
++};
++
++skip(
++ $skip,
++ ($@ || $e),
++ '22a5a36cedfcc085807a128d7bc6c2382167ad6c0dbc5fdff856740f3d84c099ad1ea87a8db096714d9788bd544047c9021e4229ce27e4c0a69250adfcffbb0b',
++ 'Invalid authKey calculated'
++);
++
++#
++# 3. Check the localized privKey
++#
++
++eval
++{
++ $e = unpack 'H*', $u->priv_key();
++};
++
++skip(
++ $skip,
++ ($@ || $e),
++ '22a5a36cedfcc085807a128d7bc6c238',
++ 'Invalid privKey calculated'
++);
++
++#
++# 4. Create and initialize a Message
++#
++
++my $m;
++
++eval
++{
++ ($m, $e) = Net::SNMP::Message->new();
++ $m->prepare(SEQUENCE, pack('H*', 'deadbeef') x 8);
++ $e = $m->error();
++};
++
++skip($skip, ($@ || $e), q{}, 'Failed to create Net::SNMP::Message object');
++
++#
++# 5. Calculate the HMAC
++#
++
++my $h;
++
++eval
++{
++ $h = unpack 'H*', $u->_auth_hmac($m);
++};
++
++skip($skip, $@, q{}, 'Calculate the HMAC failed');
++
++#
++# 6. Encrypt/descrypt the Message
++#
++
++my $henc;
++
++eval
++{
++ my $engine_boots = 0;
++ my $engine_time = 1710186219;
++ my $salt;
++ my $len = $m->length();
++ my $buff = $m->clear();
++ $u->{_engine_boots} = $engine_boots;
++ $u->{_engine_time} = $engine_time;
++ my $encrypted = $u->_encrypt_data($m, $salt, $buff);
++ $henc = unpack 'H*', $encrypted;
++ $m->append($encrypted);
++ substr $salt, 0, 0, pack 'NN', $engine_boots, $engine_time;
++ $u->_decrypt_data($m, $salt, $m->process(OCTET_STRING));
++ $e = $u->error();
++ # Remove padding if necessary
++ if ($len -= $m->length()) {
++ substr ${$m->reference()}, $len, -$len, q{};
++ }
++};
++
++skip(
++ $skip,
++ ($@ || $e || $henc),
++ '0422bae4cdb263a0936b189051e9b1759183b16d07c9a7d8bf633d6dd2e817a2ac2fe742',
++ 'Privacy failed',
++);
++
++#
++# 7. Check the HMAC
++#
++
++my $h2;
++
++eval
++{
++ $h2 = unpack 'H*', $u->_auth_hmac($m);
++};
++
++skip($skip, ($@ || $h2), $h, 'Authentication failed');
++
++# ============================================================================
diff --git a/pkgs/development/php-packages/parallel/default.nix b/pkgs/development/php-packages/parallel/default.nix
new file mode 100644
index 000000000000..abb5da0bb888
--- /dev/null
+++ b/pkgs/development/php-packages/parallel/default.nix
@@ -0,0 +1,20 @@
+{
+ buildPecl,
+ lib,
+ php,
+}:
+
+buildPecl {
+ pname = "parallel";
+ version = "1.2.4";
+ hash = "sha256-s9W9aZpQsJLdzZ/d2E1iGDsMTAAjeWbOgWeKP6nNp0A=";
+ meta = {
+ description = "Parallel concurrency API";
+ # parallel extension requires PHP with ZTS enabled
+ # we mark extension as broken if ZTS support isn't enabled
+ broken = !php.ztsSupport;
+ homepage = "https://pecl.php.net/package/parallel";
+ license = lib.licenses.php301;
+ maintainers = lib.teams.php.members;
+ };
+}
diff --git a/pkgs/development/php-packages/phing/composer.lock b/pkgs/development/php-packages/phing/composer.lock
deleted file mode 100644
index 6192f6283f9a..000000000000
--- a/pkgs/development/php-packages/phing/composer.lock
+++ /dev/null
@@ -1,7486 +0,0 @@
-{
- "_readme": [
- "This file locks the dependencies of your project to a known state",
- "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
- "This file is @generated automatically"
- ],
- "content-hash": "7e86eda0b257a035484cd3adbe76b555",
- "packages": [
- {
- "name": "psr/container",
- "version": "1.1.2",
- "source": {
- "type": "git",
- "url": "https://github.com/php-fig/container.git",
- "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
- "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
- "shasum": ""
- },
- "require": {
- "php": ">=7.4.0"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Psr\\Container\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "PHP-FIG",
- "homepage": "https://www.php-fig.org/"
- }
- ],
- "description": "Common Container Interface (PHP FIG PSR-11)",
- "homepage": "https://github.com/php-fig/container",
- "keywords": [
- "PSR-11",
- "container",
- "container-interface",
- "container-interop",
- "psr"
- ],
- "support": {
- "issues": "https://github.com/php-fig/container/issues",
- "source": "https://github.com/php-fig/container/tree/1.1.2"
- },
- "time": "2021-11-05T16:50:12+00:00"
- },
- {
- "name": "sebastian/version",
- "version": "3.0.2",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/version.git",
- "reference": "c6c1022351a901512170118436c764e473f6de8c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c",
- "reference": "c6c1022351a901512170118436c764e473f6de8c",
- "shasum": ""
- },
- "require": {
- "php": ">=7.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.0-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
- "description": "Library that helps with managing the version number of Git-hosted PHP projects",
- "homepage": "https://github.com/sebastianbergmann/version",
- "support": {
- "issues": "https://github.com/sebastianbergmann/version/issues",
- "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
- },
- "funding": [
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
- "time": "2020-09-28T06:39:44+00:00"
- },
- {
- "name": "symfony/console",
- "version": "v5.4.35",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/console.git",
- "reference": "dbdf6adcb88d5f83790e1efb57ef4074309d3931"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/dbdf6adcb88d5f83790e1efb57ef4074309d3931",
- "reference": "dbdf6adcb88d5f83790e1efb57ef4074309d3931",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2.5",
- "symfony/deprecation-contracts": "^2.1|^3",
- "symfony/polyfill-mbstring": "~1.0",
- "symfony/polyfill-php73": "^1.9",
- "symfony/polyfill-php80": "^1.16",
- "symfony/service-contracts": "^1.1|^2|^3",
- "symfony/string": "^5.1|^6.0"
- },
- "conflict": {
- "psr/log": ">=3",
- "symfony/dependency-injection": "<4.4",
- "symfony/dotenv": "<5.1",
- "symfony/event-dispatcher": "<4.4",
- "symfony/lock": "<4.4",
- "symfony/process": "<4.4"
- },
- "provide": {
- "psr/log-implementation": "1.0|2.0"
- },
- "require-dev": {
- "psr/log": "^1|^2",
- "symfony/config": "^4.4|^5.0|^6.0",
- "symfony/dependency-injection": "^4.4|^5.0|^6.0",
- "symfony/event-dispatcher": "^4.4|^5.0|^6.0",
- "symfony/lock": "^4.4|^5.0|^6.0",
- "symfony/process": "^4.4|^5.0|^6.0",
- "symfony/var-dumper": "^4.4|^5.0|^6.0"
- },
- "suggest": {
- "psr/log": "For using the console logger",
- "symfony/event-dispatcher": "",
- "symfony/lock": "",
- "symfony/process": ""
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\Console\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Eases the creation of beautiful and testable command line interfaces",
- "homepage": "https://symfony.com",
- "keywords": [
- "cli",
- "command-line",
- "console",
- "terminal"
- ],
- "support": {
- "source": "https://github.com/symfony/console/tree/v5.4.35"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2024-01-23T14:28:09+00:00"
- },
- {
- "name": "symfony/deprecation-contracts",
- "version": "v2.5.2",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/deprecation-contracts.git",
- "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
- "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
- "shasum": ""
- },
- "require": {
- "php": ">=7.1"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "2.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
- }
- },
- "autoload": {
- "files": [
- "function.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "A generic function and convention to trigger deprecation notices",
- "homepage": "https://symfony.com",
- "support": {
- "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2022-01-02T09:53:40+00:00"
- },
- {
- "name": "symfony/polyfill-ctype",
- "version": "v1.29.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
- "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
- "shasum": ""
- },
- "require": {
- "php": ">=7.1"
- },
- "provide": {
- "ext-ctype": "*"
- },
- "suggest": {
- "ext-ctype": "For best performance"
- },
- "type": "library",
- "extra": {
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
- }
- },
- "autoload": {
- "files": [
- "bootstrap.php"
- ],
- "psr-4": {
- "Symfony\\Polyfill\\Ctype\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Gert de Pagter",
- "email": "BackEndTea@gmail.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill for ctype functions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "ctype",
- "polyfill",
- "portable"
- ],
- "support": {
- "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2024-01-29T20:11:03+00:00"
- },
- {
- "name": "symfony/polyfill-intl-grapheme",
- "version": "v1.29.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
- "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f",
- "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f",
- "shasum": ""
- },
- "require": {
- "php": ">=7.1"
- },
- "suggest": {
- "ext-intl": "For best performance"
- },
- "type": "library",
- "extra": {
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
- }
- },
- "autoload": {
- "files": [
- "bootstrap.php"
- ],
- "psr-4": {
- "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill for intl's grapheme_* functions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "grapheme",
- "intl",
- "polyfill",
- "portable",
- "shim"
- ],
- "support": {
- "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2024-01-29T20:11:03+00:00"
- },
- {
- "name": "symfony/polyfill-intl-normalizer",
- "version": "v1.29.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
- "reference": "bc45c394692b948b4d383a08d7753968bed9a83d"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
- "reference": "bc45c394692b948b4d383a08d7753968bed9a83d",
- "shasum": ""
- },
- "require": {
- "php": ">=7.1"
- },
- "suggest": {
- "ext-intl": "For best performance"
- },
- "type": "library",
- "extra": {
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
- }
- },
- "autoload": {
- "files": [
- "bootstrap.php"
- ],
- "psr-4": {
- "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
- },
- "classmap": [
- "Resources/stubs"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill for intl's Normalizer class and related functions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "intl",
- "normalizer",
- "polyfill",
- "portable",
- "shim"
- ],
- "support": {
- "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2024-01-29T20:11:03+00:00"
- },
- {
- "name": "symfony/polyfill-mbstring",
- "version": "v1.29.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
- "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
- "shasum": ""
- },
- "require": {
- "php": ">=7.1"
- },
- "provide": {
- "ext-mbstring": "*"
- },
- "suggest": {
- "ext-mbstring": "For best performance"
- },
- "type": "library",
- "extra": {
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
- }
- },
- "autoload": {
- "files": [
- "bootstrap.php"
- ],
- "psr-4": {
- "Symfony\\Polyfill\\Mbstring\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill for the Mbstring extension",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "mbstring",
- "polyfill",
- "portable",
- "shim"
- ],
- "support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2024-01-29T20:11:03+00:00"
- },
- {
- "name": "symfony/polyfill-php73",
- "version": "v1.29.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php73.git",
- "reference": "21bd091060673a1177ae842c0ef8fe30893114d2"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2",
- "reference": "21bd091060673a1177ae842c0ef8fe30893114d2",
- "shasum": ""
- },
- "require": {
- "php": ">=7.1"
- },
- "type": "library",
- "extra": {
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
- }
- },
- "autoload": {
- "files": [
- "bootstrap.php"
- ],
- "psr-4": {
- "Symfony\\Polyfill\\Php73\\": ""
- },
- "classmap": [
- "Resources/stubs"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "shim"
- ],
- "support": {
- "source": "https://github.com/symfony/polyfill-php73/tree/v1.29.0"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2024-01-29T20:11:03+00:00"
- },
- {
- "name": "symfony/polyfill-php80",
- "version": "v1.29.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php80.git",
- "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
- "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
- "shasum": ""
- },
- "require": {
- "php": ">=7.1"
- },
- "type": "library",
- "extra": {
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
- }
- },
- "autoload": {
- "files": [
- "bootstrap.php"
- ],
- "psr-4": {
- "Symfony\\Polyfill\\Php80\\": ""
- },
- "classmap": [
- "Resources/stubs"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Ion Bazan",
- "email": "ion.bazan@gmail.com"
- },
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "shim"
- ],
- "support": {
- "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2024-01-29T20:11:03+00:00"
- },
- {
- "name": "symfony/service-contracts",
- "version": "v2.5.2",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/service-contracts.git",
- "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
- "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2.5",
- "psr/container": "^1.1",
- "symfony/deprecation-contracts": "^2.1|^3"
- },
- "conflict": {
- "ext-psr": "<1.1|>=2"
- },
- "suggest": {
- "symfony/service-implementation": ""
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "2.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Contracts\\Service\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Generic abstractions related to writing services",
- "homepage": "https://symfony.com",
- "keywords": [
- "abstractions",
- "contracts",
- "decoupling",
- "interfaces",
- "interoperability",
- "standards"
- ],
- "support": {
- "source": "https://github.com/symfony/service-contracts/tree/v2.5.2"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2022-05-30T19:17:29+00:00"
- },
- {
- "name": "symfony/string",
- "version": "v5.4.35",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/string.git",
- "reference": "c209c4d0559acce1c9a2067612cfb5d35756edc2"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/c209c4d0559acce1c9a2067612cfb5d35756edc2",
- "reference": "c209c4d0559acce1c9a2067612cfb5d35756edc2",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2.5",
- "symfony/polyfill-ctype": "~1.8",
- "symfony/polyfill-intl-grapheme": "~1.0",
- "symfony/polyfill-intl-normalizer": "~1.0",
- "symfony/polyfill-mbstring": "~1.0",
- "symfony/polyfill-php80": "~1.15"
- },
- "conflict": {
- "symfony/translation-contracts": ">=3.0"
- },
- "require-dev": {
- "symfony/error-handler": "^4.4|^5.0|^6.0",
- "symfony/http-client": "^4.4|^5.0|^6.0",
- "symfony/translation-contracts": "^1.1|^2",
- "symfony/var-exporter": "^4.4|^5.0|^6.0"
- },
- "type": "library",
- "autoload": {
- "files": [
- "Resources/functions.php"
- ],
- "psr-4": {
- "Symfony\\Component\\String\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way",
- "homepage": "https://symfony.com",
- "keywords": [
- "grapheme",
- "i18n",
- "string",
- "unicode",
- "utf-8",
- "utf8"
- ],
- "support": {
- "source": "https://github.com/symfony/string/tree/v5.4.35"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2024-01-23T13:51:25+00:00"
- },
- {
- "name": "symfony/yaml",
- "version": "v5.4.35",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/yaml.git",
- "reference": "e78db7f5c70a21f0417a31f414c4a95fe76c07e4"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/e78db7f5c70a21f0417a31f414c4a95fe76c07e4",
- "reference": "e78db7f5c70a21f0417a31f414c4a95fe76c07e4",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2.5",
- "symfony/deprecation-contracts": "^2.1|^3",
- "symfony/polyfill-ctype": "^1.8"
- },
- "conflict": {
- "symfony/console": "<5.3"
- },
- "require-dev": {
- "symfony/console": "^5.3|^6.0"
- },
- "suggest": {
- "symfony/console": "For validating YAML files using the lint command"
- },
- "bin": [
- "Resources/bin/yaml-lint"
- ],
- "type": "library",
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\Yaml\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Loads and dumps YAML files",
- "homepage": "https://symfony.com",
- "support": {
- "source": "https://github.com/symfony/yaml/tree/v5.4.35"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2024-01-23T13:51:25+00:00"
- }
- ],
- "packages-dev": [
- {
- "name": "aws/aws-crt-php",
- "version": "v1.2.4",
- "source": {
- "type": "git",
- "url": "https://github.com/awslabs/aws-crt-php.git",
- "reference": "eb0c6e4e142224a10b08f49ebf87f32611d162b2"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/eb0c6e4e142224a10b08f49ebf87f32611d162b2",
- "reference": "eb0c6e4e142224a10b08f49ebf87f32611d162b2",
- "shasum": ""
- },
- "require": {
- "php": ">=5.5"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.8.35||^5.6.3||^9.5",
- "yoast/phpunit-polyfills": "^1.0"
- },
- "suggest": {
- "ext-awscrt": "Make sure you install awscrt native extension to use any of the functionality."
- },
- "type": "library",
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "Apache-2.0"
- ],
- "authors": [
- {
- "name": "AWS SDK Common Runtime Team",
- "email": "aws-sdk-common-runtime@amazon.com"
- }
- ],
- "description": "AWS Common Runtime for PHP",
- "homepage": "https://github.com/awslabs/aws-crt-php",
- "keywords": [
- "amazon",
- "aws",
- "crt",
- "sdk"
- ],
- "support": {
- "issues": "https://github.com/awslabs/aws-crt-php/issues",
- "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.4"
- },
- "time": "2023-11-08T00:42:13+00:00"
- },
- {
- "name": "aws/aws-sdk-php",
- "version": "3.300.0",
- "source": {
- "type": "git",
- "url": "https://github.com/aws/aws-sdk-php.git",
- "reference": "67a0c22a70bdcc99ca41028b78be3d5496481c14"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/67a0c22a70bdcc99ca41028b78be3d5496481c14",
- "reference": "67a0c22a70bdcc99ca41028b78be3d5496481c14",
- "shasum": ""
- },
- "require": {
- "aws/aws-crt-php": "^1.2.3",
- "ext-json": "*",
- "ext-pcre": "*",
- "ext-simplexml": "*",
- "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",
- "guzzlehttp/promises": "^1.4.0 || ^2.0",
- "guzzlehttp/psr7": "^1.9.1 || ^2.4.5",
- "mtdowling/jmespath.php": "^2.6",
- "php": ">=7.2.5",
- "psr/http-message": "^1.0 || ^2.0"
- },
- "require-dev": {
- "andrewsville/php-token-reflection": "^1.4",
- "aws/aws-php-sns-message-validator": "~1.0",
- "behat/behat": "~3.0",
- "composer/composer": "^1.10.22",
- "dms/phpunit-arraysubset-asserts": "^0.4.0",
- "doctrine/cache": "~1.4",
- "ext-dom": "*",
- "ext-openssl": "*",
- "ext-pcntl": "*",
- "ext-sockets": "*",
- "nette/neon": "^2.3",
- "paragonie/random_compat": ">= 2",
- "phpunit/phpunit": "^5.6.3 || ^8.5 || ^9.5",
- "psr/cache": "^1.0",
- "psr/simple-cache": "^1.0",
- "sebastian/comparator": "^1.2.3 || ^4.0",
- "yoast/phpunit-polyfills": "^1.0"
- },
- "suggest": {
- "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications",
- "doctrine/cache": "To use the DoctrineCacheAdapter",
- "ext-curl": "To send requests using cURL",
- "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages",
- "ext-sockets": "To use client-side monitoring"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.0-dev"
- }
- },
- "autoload": {
- "files": [
- "src/functions.php"
- ],
- "psr-4": {
- "Aws\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "Apache-2.0"
- ],
- "authors": [
- {
- "name": "Amazon Web Services",
- "homepage": "http://aws.amazon.com"
- }
- ],
- "description": "AWS SDK for PHP - Use Amazon Web Services in your PHP project",
- "homepage": "http://aws.amazon.com/sdkforphp",
- "keywords": [
- "amazon",
- "aws",
- "cloud",
- "dynamodb",
- "ec2",
- "glacier",
- "s3",
- "sdk"
- ],
- "support": {
- "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
- "issues": "https://github.com/aws/aws-sdk-php/issues",
- "source": "https://github.com/aws/aws-sdk-php/tree/3.300.0"
- },
- "time": "2024-02-19T19:08:33+00:00"
- },
- {
- "name": "composer/pcre",
- "version": "3.1.1",
- "source": {
- "type": "git",
- "url": "https://github.com/composer/pcre.git",
- "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9",
- "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9",
- "shasum": ""
- },
- "require": {
- "php": "^7.4 || ^8.0"
- },
- "require-dev": {
- "phpstan/phpstan": "^1.3",
- "phpstan/phpstan-strict-rules": "^1.1",
- "symfony/phpunit-bridge": "^5"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "3.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Composer\\Pcre\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jordi Boggiano",
- "email": "j.boggiano@seld.be",
- "homepage": "http://seld.be"
- }
- ],
- "description": "PCRE wrapping library that offers type-safe preg_* replacements.",
- "keywords": [
- "PCRE",
- "preg",
- "regex",
- "regular expression"
- ],
- "support": {
- "issues": "https://github.com/composer/pcre/issues",
- "source": "https://github.com/composer/pcre/tree/3.1.1"
- },
- "funding": [
- {
- "url": "https://packagist.com",
- "type": "custom"
- },
- {
- "url": "https://github.com/composer",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/composer/composer",
- "type": "tidelift"
- }
- ],
- "time": "2023-10-11T07:11:09+00:00"
- },
- {
- "name": "composer/semver",
- "version": "3.4.0",
- "source": {
- "type": "git",
- "url": "https://github.com/composer/semver.git",
- "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32",
- "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32",
- "shasum": ""
- },
- "require": {
- "php": "^5.3.2 || ^7.0 || ^8.0"
- },
- "require-dev": {
- "phpstan/phpstan": "^1.4",
- "symfony/phpunit-bridge": "^4.2 || ^5"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "3.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Composer\\Semver\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nils Adermann",
- "email": "naderman@naderman.de",
- "homepage": "http://www.naderman.de"
- },
- {
- "name": "Jordi Boggiano",
- "email": "j.boggiano@seld.be",
- "homepage": "http://seld.be"
- },
- {
- "name": "Rob Bast",
- "email": "rob.bast@gmail.com",
- "homepage": "http://robbast.nl"
- }
- ],
- "description": "Semver library that offers utilities, version constraint parsing and validation.",
- "keywords": [
- "semantic",
- "semver",
- "validation",
- "versioning"
- ],
- "support": {
- "irc": "ircs://irc.libera.chat:6697/composer",
- "issues": "https://github.com/composer/semver/issues",
- "source": "https://github.com/composer/semver/tree/3.4.0"
- },
- "funding": [
- {
- "url": "https://packagist.com",
- "type": "custom"
- },
- {
- "url": "https://github.com/composer",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/composer/composer",
- "type": "tidelift"
- }
- ],
- "time": "2023-08-31T09:50:34+00:00"
- },
- {
- "name": "composer/xdebug-handler",
- "version": "3.0.3",
- "source": {
- "type": "git",
- "url": "https://github.com/composer/xdebug-handler.git",
- "reference": "ced299686f41dce890debac69273b47ffe98a40c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
- "reference": "ced299686f41dce890debac69273b47ffe98a40c",
- "shasum": ""
- },
- "require": {
- "composer/pcre": "^1 || ^2 || ^3",
- "php": "^7.2.5 || ^8.0",
- "psr/log": "^1 || ^2 || ^3"
- },
- "require-dev": {
- "phpstan/phpstan": "^1.0",
- "phpstan/phpstan-strict-rules": "^1.1",
- "symfony/phpunit-bridge": "^6.0"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Composer\\XdebugHandler\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "John Stevenson",
- "email": "john-stevenson@blueyonder.co.uk"
- }
- ],
- "description": "Restarts a process without Xdebug.",
- "keywords": [
- "Xdebug",
- "performance"
- ],
- "support": {
- "irc": "irc://irc.freenode.org/composer",
- "issues": "https://github.com/composer/xdebug-handler/issues",
- "source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
- },
- "funding": [
- {
- "url": "https://packagist.com",
- "type": "custom"
- },
- {
- "url": "https://github.com/composer",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/composer/composer",
- "type": "tidelift"
- }
- ],
- "time": "2022-02-25T21:32:43+00:00"
- },
- {
- "name": "cweagans/composer-patches",
- "version": "1.7.3",
- "source": {
- "type": "git",
- "url": "https://github.com/cweagans/composer-patches.git",
- "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/e190d4466fe2b103a55467dfa83fc2fecfcaf2db",
- "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db",
- "shasum": ""
- },
- "require": {
- "composer-plugin-api": "^1.0 || ^2.0",
- "php": ">=5.3.0"
- },
- "require-dev": {
- "composer/composer": "~1.0 || ~2.0",
- "phpunit/phpunit": "~4.6"
- },
- "type": "composer-plugin",
- "extra": {
- "class": "cweagans\\Composer\\Patches"
- },
- "autoload": {
- "psr-4": {
- "cweagans\\Composer\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Cameron Eagans",
- "email": "me@cweagans.net"
- }
- ],
- "description": "Provides a way to patch Composer packages.",
- "support": {
- "issues": "https://github.com/cweagans/composer-patches/issues",
- "source": "https://github.com/cweagans/composer-patches/tree/1.7.3"
- },
- "time": "2022-12-20T22:53:13+00:00"
- },
- {
- "name": "doctrine/instantiator",
- "version": "1.5.0",
- "source": {
- "type": "git",
- "url": "https://github.com/doctrine/instantiator.git",
- "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
- "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
- "shasum": ""
- },
- "require": {
- "php": "^7.1 || ^8.0"
- },
- "require-dev": {
- "doctrine/coding-standard": "^9 || ^11",
- "ext-pdo": "*",
- "ext-phar": "*",
- "phpbench/phpbench": "^0.16 || ^1",
- "phpstan/phpstan": "^1.4",
- "phpstan/phpstan-phpunit": "^1",
- "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
- "vimeo/psalm": "^4.30 || ^5.4"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Marco Pivetta",
- "email": "ocramius@gmail.com",
- "homepage": "https://ocramius.github.io/"
- }
- ],
- "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
- "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
- "keywords": [
- "constructor",
- "instantiate"
- ],
- "support": {
- "issues": "https://github.com/doctrine/instantiator/issues",
- "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
- },
- "funding": [
- {
- "url": "https://www.doctrine-project.org/sponsorship.html",
- "type": "custom"
- },
- {
- "url": "https://www.patreon.com/phpdoctrine",
- "type": "patreon"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
- "type": "tidelift"
- }
- ],
- "time": "2022-12-30T00:15:36+00:00"
- },
- {
- "name": "ergebnis/composer-normalize",
- "version": "2.42.0",
- "source": {
- "type": "git",
- "url": "https://github.com/ergebnis/composer-normalize.git",
- "reference": "02cf2b69ad2a74c6f11a8c3f5f054b8f949df910"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/ergebnis/composer-normalize/zipball/02cf2b69ad2a74c6f11a8c3f5f054b8f949df910",
- "reference": "02cf2b69ad2a74c6f11a8c3f5f054b8f949df910",
- "shasum": ""
- },
- "require": {
- "composer-plugin-api": "^2.0.0",
- "ergebnis/json": "^1.2.0",
- "ergebnis/json-normalizer": "^4.5.0",
- "ergebnis/json-printer": "^3.5.0",
- "ext-json": "*",
- "justinrainbow/json-schema": "^5.2.12",
- "localheinz/diff": "^1.1.1",
- "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
- },
- "require-dev": {
- "composer/composer": "^2.6.6",
- "ergebnis/license": "^2.4.0",
- "ergebnis/php-cs-fixer-config": "^6.20.0",
- "ergebnis/phpunit-slow-test-detector": "^2.9.0",
- "fakerphp/faker": "^1.23.1",
- "infection/infection": "~0.26.6",
- "phpunit/phpunit": "^9.6.16",
- "psalm/plugin-phpunit": "~0.18.4",
- "rector/rector": "~0.19.2",
- "symfony/filesystem": "^5.4.25",
- "vimeo/psalm": "^5.20.0"
- },
- "type": "composer-plugin",
- "extra": {
- "class": "Ergebnis\\Composer\\Normalize\\NormalizePlugin",
- "composer-normalize": {
- "indent-size": 2,
- "indent-style": "space"
- },
- "plugin-optional": true
- },
- "autoload": {
- "psr-4": {
- "Ergebnis\\Composer\\Normalize\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Andreas Möller",
- "email": "am@localheinz.com",
- "homepage": "https://localheinz.com"
- }
- ],
- "description": "Provides a composer plugin for normalizing composer.json.",
- "homepage": "https://github.com/ergebnis/composer-normalize",
- "keywords": [
- "composer",
- "normalize",
- "normalizer",
- "plugin"
- ],
- "support": {
- "issues": "https://github.com/ergebnis/composer-normalize/issues",
- "security": "https://github.com/ergebnis/composer-normalize/blob/main/.github/SECURITY.md",
- "source": "https://github.com/ergebnis/composer-normalize"
- },
- "time": "2024-01-30T11:54:02+00:00"
- },
- {
- "name": "ergebnis/json",
- "version": "1.2.0",
- "source": {
- "type": "git",
- "url": "https://github.com/ergebnis/json.git",
- "reference": "a457f25a5ba7ea11fc94f84d53678c5211abfce0"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/ergebnis/json/zipball/a457f25a5ba7ea11fc94f84d53678c5211abfce0",
- "reference": "a457f25a5ba7ea11fc94f84d53678c5211abfce0",
- "shasum": ""
- },
- "require": {
- "ext-json": "*",
- "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
- },
- "require-dev": {
- "ergebnis/data-provider": "^3.2.0",
- "ergebnis/license": "^2.4.0",
- "ergebnis/php-cs-fixer-config": "^6.20.0",
- "ergebnis/phpunit-slow-test-detector": "^2.9.0",
- "fakerphp/faker": "^1.23.1",
- "infection/infection": "~0.26.6",
- "phpunit/phpunit": "^9.6.16",
- "psalm/plugin-phpunit": "~0.18.4",
- "rector/rector": "~0.19.2",
- "vimeo/psalm": "^5.20.0"
- },
- "type": "library",
- "extra": {
- "composer-normalize": {
- "indent-size": 2,
- "indent-style": "space"
- }
- },
- "autoload": {
- "psr-4": {
- "Ergebnis\\Json\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Andreas Möller",
- "email": "am@localheinz.com",
- "homepage": "https://localheinz.com"
- }
- ],
- "description": "Provides a Json value object for representing a valid JSON string.",
- "homepage": "https://github.com/ergebnis/json",
- "keywords": [
- "json"
- ],
- "support": {
- "issues": "https://github.com/ergebnis/json/issues",
- "security": "https://github.com/ergebnis/json/blob/main/.github/SECURITY.md",
- "source": "https://github.com/ergebnis/json"
- },
- "time": "2024-01-29T15:09:24+00:00"
- },
- {
- "name": "ergebnis/json-normalizer",
- "version": "4.5.0",
- "source": {
- "type": "git",
- "url": "https://github.com/ergebnis/json-normalizer.git",
- "reference": "f0ee9e70739f121b27fac8b743e4a52b23de2152"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/ergebnis/json-normalizer/zipball/f0ee9e70739f121b27fac8b743e4a52b23de2152",
- "reference": "f0ee9e70739f121b27fac8b743e4a52b23de2152",
- "shasum": ""
- },
- "require": {
- "ergebnis/json": "^1.2.0",
- "ergebnis/json-pointer": "^3.4.0",
- "ergebnis/json-printer": "^3.5.0",
- "ergebnis/json-schema-validator": "^4.2.0",
- "ext-json": "*",
- "justinrainbow/json-schema": "^5.2.12",
- "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
- },
- "require-dev": {
- "composer/semver": "^3.4.0",
- "ergebnis/data-provider": "^3.2.0",
- "ergebnis/license": "^2.4.0",
- "ergebnis/php-cs-fixer-config": "^6.20.0",
- "ergebnis/phpunit-slow-test-detector": "^2.9.0",
- "fakerphp/faker": "^1.23.1",
- "infection/infection": "~0.26.6",
- "phpunit/phpunit": "^9.6.16",
- "psalm/plugin-phpunit": "~0.18.4",
- "rector/rector": "~0.19.4",
- "vimeo/psalm": "^5.20.0"
- },
- "suggest": {
- "composer/semver": "If you want to use ComposerJsonNormalizer or VersionConstraintNormalizer"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Ergebnis\\Json\\Normalizer\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Andreas Möller",
- "email": "am@localheinz.com",
- "homepage": "https://localheinz.com"
- }
- ],
- "description": "Provides generic and vendor-specific normalizers for normalizing JSON documents.",
- "homepage": "https://github.com/ergebnis/json-normalizer",
- "keywords": [
- "json",
- "normalizer"
- ],
- "support": {
- "issues": "https://github.com/ergebnis/json-normalizer/issues",
- "security": "https://github.com/ergebnis/json-normalizer/blob/main/.github/SECURITY.md",
- "source": "https://github.com/ergebnis/json-normalizer"
- },
- "time": "2024-01-30T09:10:15+00:00"
- },
- {
- "name": "ergebnis/json-pointer",
- "version": "3.4.0",
- "source": {
- "type": "git",
- "url": "https://github.com/ergebnis/json-pointer.git",
- "reference": "b654757d873050622c2166f55ab25d04685261c5"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/ergebnis/json-pointer/zipball/b654757d873050622c2166f55ab25d04685261c5",
- "reference": "b654757d873050622c2166f55ab25d04685261c5",
- "shasum": ""
- },
- "require": {
- "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
- },
- "require-dev": {
- "ergebnis/data-provider": "^3.2.0",
- "ergebnis/license": "^2.4.0",
- "ergebnis/php-cs-fixer-config": "^6.20.0",
- "ergebnis/phpunit-slow-test-detector": "^2.9.0",
- "fakerphp/faker": "^1.23.1",
- "infection/infection": "~0.26.6",
- "phpunit/phpunit": "^9.6.16",
- "psalm/plugin-phpunit": "~0.18.4",
- "rector/rector": "~0.19.2",
- "vimeo/psalm": "^5.20.0"
- },
- "type": "library",
- "extra": {
- "composer-normalize": {
- "indent-size": 2,
- "indent-style": "space"
- }
- },
- "autoload": {
- "psr-4": {
- "Ergebnis\\Json\\Pointer\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Andreas Möller",
- "email": "am@localheinz.com",
- "homepage": "https://localheinz.com"
- }
- ],
- "description": "Provides an abstraction of a JSON pointer.",
- "homepage": "https://github.com/ergebnis/json-pointer",
- "keywords": [
- "RFC6901",
- "json",
- "pointer"
- ],
- "support": {
- "issues": "https://github.com/ergebnis/json-pointer/issues",
- "security": "https://github.com/ergebnis/json-pointer/blob/main/.github/SECURITY.md",
- "source": "https://github.com/ergebnis/json-pointer"
- },
- "time": "2024-01-29T16:37:15+00:00"
- },
- {
- "name": "ergebnis/json-printer",
- "version": "3.5.0",
- "source": {
- "type": "git",
- "url": "https://github.com/ergebnis/json-printer.git",
- "reference": "549e16fe6de34b8c3aee7b421be12caa552f3ced"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/ergebnis/json-printer/zipball/549e16fe6de34b8c3aee7b421be12caa552f3ced",
- "reference": "549e16fe6de34b8c3aee7b421be12caa552f3ced",
- "shasum": ""
- },
- "require": {
- "ext-json": "*",
- "ext-mbstring": "*",
- "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
- },
- "require-dev": {
- "ergebnis/data-provider": "^3.2.0",
- "ergebnis/license": "^2.4.0",
- "ergebnis/php-cs-fixer-config": "^6.20.0",
- "ergebnis/phpunit-slow-test-detector": "^2.9.0",
- "fakerphp/faker": "^1.23.1",
- "infection/infection": "~0.26.6",
- "phpunit/phpunit": "^9.6.16",
- "psalm/plugin-phpunit": "~0.18.4",
- "rector/rector": "~0.19.2",
- "vimeo/psalm": "^5.20.0"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Ergebnis\\Json\\Printer\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Andreas Möller",
- "email": "am@localheinz.com",
- "homepage": "https://localheinz.com"
- }
- ],
- "description": "Provides a JSON printer, allowing for flexible indentation.",
- "homepage": "https://github.com/ergebnis/json-printer",
- "keywords": [
- "formatter",
- "json",
- "printer"
- ],
- "support": {
- "issues": "https://github.com/ergebnis/json-printer/issues",
- "security": "https://github.com/ergebnis/json-printer/blob/main/.github/SECURITY.md",
- "source": "https://github.com/ergebnis/json-printer"
- },
- "time": "2024-01-29T15:33:37+00:00"
- },
- {
- "name": "ergebnis/json-schema-validator",
- "version": "4.2.0",
- "source": {
- "type": "git",
- "url": "https://github.com/ergebnis/json-schema-validator.git",
- "reference": "10ed514fdc3f9b71f8a92c567afea21a2f6fa1ef"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/ergebnis/json-schema-validator/zipball/10ed514fdc3f9b71f8a92c567afea21a2f6fa1ef",
- "reference": "10ed514fdc3f9b71f8a92c567afea21a2f6fa1ef",
- "shasum": ""
- },
- "require": {
- "ergebnis/json": "^1.2.0",
- "ergebnis/json-pointer": "^3.4.0",
- "ext-json": "*",
- "justinrainbow/json-schema": "^5.2.12",
- "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
- },
- "require-dev": {
- "ergebnis/data-provider": "^3.2.0",
- "ergebnis/license": "^2.4.0",
- "ergebnis/php-cs-fixer-config": "^6.20.0",
- "ergebnis/phpunit-slow-test-detector": "^2.9.0",
- "fakerphp/faker": "^1.23.1",
- "infection/infection": "~0.26.6",
- "phpunit/phpunit": "^9.6.16",
- "psalm/plugin-phpunit": "~0.18.4",
- "rector/rector": "~0.19.2",
- "vimeo/psalm": "^5.20.0"
- },
- "type": "library",
- "extra": {
- "composer-normalize": {
- "indent-size": 2,
- "indent-style": "space"
- }
- },
- "autoload": {
- "psr-4": {
- "Ergebnis\\Json\\SchemaValidator\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Andreas Möller",
- "email": "am@localheinz.com",
- "homepage": "https://localheinz.com"
- }
- ],
- "description": "Provides a JSON schema validator, building on top of justinrainbow/json-schema.",
- "homepage": "https://github.com/ergebnis/json-schema-validator",
- "keywords": [
- "json",
- "schema",
- "validator"
- ],
- "support": {
- "issues": "https://github.com/ergebnis/json-schema-validator/issues",
- "security": "https://github.com/ergebnis/json-schema-validator/blob/main/.github/SECURITY.md",
- "source": "https://github.com/ergebnis/json-schema-validator"
- },
- "time": "2024-01-29T16:50:15+00:00"
- },
- {
- "name": "friendsofphp/php-cs-fixer",
- "version": "v3.49.0",
- "source": {
- "type": "git",
- "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
- "reference": "8742f7aa6f72a399688b65e4f58992c2d4681fc2"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/8742f7aa6f72a399688b65e4f58992c2d4681fc2",
- "reference": "8742f7aa6f72a399688b65e4f58992c2d4681fc2",
- "shasum": ""
- },
- "require": {
- "composer/semver": "^3.4",
- "composer/xdebug-handler": "^3.0.3",
- "ext-filter": "*",
- "ext-json": "*",
- "ext-tokenizer": "*",
- "php": "^7.4 || ^8.0",
- "sebastian/diff": "^4.0 || ^5.0",
- "symfony/console": "^5.4 || ^6.0 || ^7.0",
- "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0",
- "symfony/filesystem": "^5.4 || ^6.0 || ^7.0",
- "symfony/finder": "^5.4 || ^6.0 || ^7.0",
- "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0",
- "symfony/polyfill-mbstring": "^1.28",
- "symfony/polyfill-php80": "^1.28",
- "symfony/polyfill-php81": "^1.28",
- "symfony/process": "^5.4 || ^6.0 || ^7.0",
- "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0"
- },
- "require-dev": {
- "facile-it/paraunit": "^1.3 || ^2.0",
- "justinrainbow/json-schema": "^5.2",
- "keradus/cli-executor": "^2.1",
- "mikey179/vfsstream": "^1.6.11",
- "php-coveralls/php-coveralls": "^2.7",
- "php-cs-fixer/accessible-object": "^1.1",
- "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.4",
- "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.4",
- "phpunit/phpunit": "^9.6 || ^10.5.5",
- "symfony/yaml": "^5.4 || ^6.0 || ^7.0"
- },
- "suggest": {
- "ext-dom": "For handling output formats in XML",
- "ext-mbstring": "For handling non-UTF8 characters."
- },
- "bin": [
- "php-cs-fixer"
- ],
- "type": "application",
- "autoload": {
- "psr-4": {
- "PhpCsFixer\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Dariusz Rumiński",
- "email": "dariusz.ruminski@gmail.com"
- }
- ],
- "description": "A tool to automatically fix PHP code style",
- "keywords": [
- "Static code analysis",
- "fixer",
- "standards",
- "static analysis"
- ],
- "support": {
- "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
- "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.49.0"
- },
- "funding": [
- {
- "url": "https://github.com/keradus",
- "type": "github"
- }
- ],
- "time": "2024-02-02T00:41:40+00:00"
- },
- {
- "name": "guzzlehttp/guzzle",
- "version": "7.8.1",
- "source": {
- "type": "git",
- "url": "https://github.com/guzzle/guzzle.git",
- "reference": "41042bc7ab002487b876a0683fc8dce04ddce104"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104",
- "reference": "41042bc7ab002487b876a0683fc8dce04ddce104",
- "shasum": ""
- },
- "require": {
- "ext-json": "*",
- "guzzlehttp/promises": "^1.5.3 || ^2.0.1",
- "guzzlehttp/psr7": "^1.9.1 || ^2.5.1",
- "php": "^7.2.5 || ^8.0",
- "psr/http-client": "^1.0",
- "symfony/deprecation-contracts": "^2.2 || ^3.0"
- },
- "provide": {
- "psr/http-client-implementation": "1.0"
- },
- "require-dev": {
- "bamarni/composer-bin-plugin": "^1.8.2",
- "ext-curl": "*",
- "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
- "php-http/message-factory": "^1.1",
- "phpunit/phpunit": "^8.5.36 || ^9.6.15",
- "psr/log": "^1.1 || ^2.0 || ^3.0"
- },
- "suggest": {
- "ext-curl": "Required for CURL handler support",
- "ext-intl": "Required for Internationalized Domain Name (IDN) support",
- "psr/log": "Required for using the Log middleware"
- },
- "type": "library",
- "extra": {
- "bamarni-bin": {
- "bin-links": true,
- "forward-command": false
- }
- },
- "autoload": {
- "files": [
- "src/functions_include.php"
- ],
- "psr-4": {
- "GuzzleHttp\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Graham Campbell",
- "email": "hello@gjcampbell.co.uk",
- "homepage": "https://github.com/GrahamCampbell"
- },
- {
- "name": "Michael Dowling",
- "email": "mtdowling@gmail.com",
- "homepage": "https://github.com/mtdowling"
- },
- {
- "name": "Jeremy Lindblom",
- "email": "jeremeamia@gmail.com",
- "homepage": "https://github.com/jeremeamia"
- },
- {
- "name": "George Mponos",
- "email": "gmponos@gmail.com",
- "homepage": "https://github.com/gmponos"
- },
- {
- "name": "Tobias Nyholm",
- "email": "tobias.nyholm@gmail.com",
- "homepage": "https://github.com/Nyholm"
- },
- {
- "name": "Márk Sági-Kazár",
- "email": "mark.sagikazar@gmail.com",
- "homepage": "https://github.com/sagikazarmark"
- },
- {
- "name": "Tobias Schultze",
- "email": "webmaster@tubo-world.de",
- "homepage": "https://github.com/Tobion"
- }
- ],
- "description": "Guzzle is a PHP HTTP client library",
- "keywords": [
- "client",
- "curl",
- "framework",
- "http",
- "http client",
- "psr-18",
- "psr-7",
- "rest",
- "web service"
- ],
- "support": {
- "issues": "https://github.com/guzzle/guzzle/issues",
- "source": "https://github.com/guzzle/guzzle/tree/7.8.1"
- },
- "funding": [
- {
- "url": "https://github.com/GrahamCampbell",
- "type": "github"
- },
- {
- "url": "https://github.com/Nyholm",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
- "type": "tidelift"
- }
- ],
- "time": "2023-12-03T20:35:24+00:00"
- },
- {
- "name": "guzzlehttp/promises",
- "version": "2.0.2",
- "source": {
- "type": "git",
- "url": "https://github.com/guzzle/promises.git",
- "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223",
- "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223",
- "shasum": ""
- },
- "require": {
- "php": "^7.2.5 || ^8.0"
- },
- "require-dev": {
- "bamarni/composer-bin-plugin": "^1.8.2",
- "phpunit/phpunit": "^8.5.36 || ^9.6.15"
- },
- "type": "library",
- "extra": {
- "bamarni-bin": {
- "bin-links": true,
- "forward-command": false
- }
- },
- "autoload": {
- "psr-4": {
- "GuzzleHttp\\Promise\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Graham Campbell",
- "email": "hello@gjcampbell.co.uk",
- "homepage": "https://github.com/GrahamCampbell"
- },
- {
- "name": "Michael Dowling",
- "email": "mtdowling@gmail.com",
- "homepage": "https://github.com/mtdowling"
- },
- {
- "name": "Tobias Nyholm",
- "email": "tobias.nyholm@gmail.com",
- "homepage": "https://github.com/Nyholm"
- },
- {
- "name": "Tobias Schultze",
- "email": "webmaster@tubo-world.de",
- "homepage": "https://github.com/Tobion"
- }
- ],
- "description": "Guzzle promises library",
- "keywords": [
- "promise"
- ],
- "support": {
- "issues": "https://github.com/guzzle/promises/issues",
- "source": "https://github.com/guzzle/promises/tree/2.0.2"
- },
- "funding": [
- {
- "url": "https://github.com/GrahamCampbell",
- "type": "github"
- },
- {
- "url": "https://github.com/Nyholm",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises",
- "type": "tidelift"
- }
- ],
- "time": "2023-12-03T20:19:20+00:00"
- },
- {
- "name": "guzzlehttp/psr7",
- "version": "2.6.2",
- "source": {
- "type": "git",
- "url": "https://github.com/guzzle/psr7.git",
- "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221",
- "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221",
- "shasum": ""
- },
- "require": {
- "php": "^7.2.5 || ^8.0",
- "psr/http-factory": "^1.0",
- "psr/http-message": "^1.1 || ^2.0",
- "ralouphie/getallheaders": "^3.0"
- },
- "provide": {
- "psr/http-factory-implementation": "1.0",
- "psr/http-message-implementation": "1.0"
- },
- "require-dev": {
- "bamarni/composer-bin-plugin": "^1.8.2",
- "http-interop/http-factory-tests": "^0.9",
- "phpunit/phpunit": "^8.5.36 || ^9.6.15"
- },
- "suggest": {
- "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
- },
- "type": "library",
- "extra": {
- "bamarni-bin": {
- "bin-links": true,
- "forward-command": false
- }
- },
- "autoload": {
- "psr-4": {
- "GuzzleHttp\\Psr7\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Graham Campbell",
- "email": "hello@gjcampbell.co.uk",
- "homepage": "https://github.com/GrahamCampbell"
- },
- {
- "name": "Michael Dowling",
- "email": "mtdowling@gmail.com",
- "homepage": "https://github.com/mtdowling"
- },
- {
- "name": "George Mponos",
- "email": "gmponos@gmail.com",
- "homepage": "https://github.com/gmponos"
- },
- {
- "name": "Tobias Nyholm",
- "email": "tobias.nyholm@gmail.com",
- "homepage": "https://github.com/Nyholm"
- },
- {
- "name": "Márk Sági-Kazár",
- "email": "mark.sagikazar@gmail.com",
- "homepage": "https://github.com/sagikazarmark"
- },
- {
- "name": "Tobias Schultze",
- "email": "webmaster@tubo-world.de",
- "homepage": "https://github.com/Tobion"
- },
- {
- "name": "Márk Sági-Kazár",
- "email": "mark.sagikazar@gmail.com",
- "homepage": "https://sagikazarmark.hu"
- }
- ],
- "description": "PSR-7 message implementation that also provides common utility methods",
- "keywords": [
- "http",
- "message",
- "psr-7",
- "request",
- "response",
- "stream",
- "uri",
- "url"
- ],
- "support": {
- "issues": "https://github.com/guzzle/psr7/issues",
- "source": "https://github.com/guzzle/psr7/tree/2.6.2"
- },
- "funding": [
- {
- "url": "https://github.com/GrahamCampbell",
- "type": "github"
- },
- {
- "url": "https://github.com/Nyholm",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7",
- "type": "tidelift"
- }
- ],
- "time": "2023-12-03T20:05:35+00:00"
- },
- {
- "name": "jawira/plantuml-client",
- "version": "v1.0.3",
- "source": {
- "type": "git",
- "url": "https://github.com/jawira/plantuml-client.git",
- "reference": "28ca92b4e0825bd7f3a82fed10c7f3dbe0657fd5"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/jawira/plantuml-client/zipball/28ca92b4e0825bd7f3a82fed10c7f3dbe0657fd5",
- "reference": "28ca92b4e0825bd7f3a82fed10c7f3dbe0657fd5",
- "shasum": ""
- },
- "require": {
- "jawira/plantuml-encoding": "^1.0",
- "php": ">=7.4"
- },
- "require-dev": {
- "ergebnis/composer-normalize": "^2.13",
- "ext-fileinfo": "*",
- "jawira/skeleton": "^2.16",
- "phpstan/phpstan": "^1.8",
- "phpunit/phpunit": "^9.5"
- },
- "suggest": {
- "pds/skeleton": "Standard PHP package skeleton."
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Jawira\\PlantUmlClient\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jawira Portugal",
- "email": "dev@tugal.be"
- }
- ],
- "description": "Convert PlantUML diagrams into images.",
- "keywords": [
- "diagram",
- "image",
- "plantuml",
- "uml"
- ],
- "support": {
- "issues": "https://github.com/jawira/plantuml-client/issues",
- "source": "https://github.com/jawira/plantuml-client/tree/v1.0.3"
- },
- "time": "2022-11-08T23:48:25+00:00"
- },
- {
- "name": "jawira/plantuml-encoding",
- "version": "v1.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/jawira/plantuml-encoding.git",
- "reference": "cec097dfc062e7e13655d9594eacce5f9df639ad"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/jawira/plantuml-encoding/zipball/cec097dfc062e7e13655d9594eacce5f9df639ad",
- "reference": "cec097dfc062e7e13655d9594eacce5f9df639ad",
- "shasum": ""
- },
- "require": {
- "ext-zlib": "*",
- "php": ">=7.0"
- },
- "require-dev": {
- "jawira/skeleton": "^2.14",
- "phpstan/phpstan": "^1.0",
- "vimeo/psalm": "^4.0"
- },
- "type": "library",
- "autoload": {
- "files": [
- "src/plantuml_functions.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jawira Portugal",
- "homepage": "https://jawira.com"
- }
- ],
- "description": "PlantUML encoding functions",
- "keywords": [
- "encodep",
- "encoding",
- "functions",
- "plantuml",
- "uml"
- ],
- "support": {
- "issues": "https://github.com/jawira/plantuml-encoding/issues",
- "source": "https://github.com/jawira/plantuml-encoding/tree/v1.1.0"
- },
- "time": "2022-05-31T18:58:21+00:00"
- },
- {
- "name": "justinrainbow/json-schema",
- "version": "v5.2.13",
- "source": {
- "type": "git",
- "url": "https://github.com/justinrainbow/json-schema.git",
- "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793",
- "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "require-dev": {
- "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
- "json-schema/json-schema-test-suite": "1.2.0",
- "phpunit/phpunit": "^4.8.35"
- },
- "bin": [
- "bin/validate-json"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "5.0.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "JsonSchema\\": "src/JsonSchema/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Bruno Prieto Reis",
- "email": "bruno.p.reis@gmail.com"
- },
- {
- "name": "Justin Rainbow",
- "email": "justin.rainbow@gmail.com"
- },
- {
- "name": "Igor Wiedler",
- "email": "igor@wiedler.ch"
- },
- {
- "name": "Robert Schönthal",
- "email": "seroscho@googlemail.com"
- }
- ],
- "description": "A library to validate a json schema.",
- "homepage": "https://github.com/justinrainbow/json-schema",
- "keywords": [
- "json",
- "schema"
- ],
- "support": {
- "issues": "https://github.com/justinrainbow/json-schema/issues",
- "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13"
- },
- "time": "2023-09-26T02:20:38+00:00"
- },
- {
- "name": "localheinz/diff",
- "version": "1.1.1",
- "source": {
- "type": "git",
- "url": "https://github.com/localheinz/diff.git",
- "reference": "851bb20ea8358c86f677f5f111c4ab031b1c764c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/localheinz/diff/zipball/851bb20ea8358c86f677f5f111c4ab031b1c764c",
- "reference": "851bb20ea8358c86f677f5f111c4ab031b1c764c",
- "shasum": ""
- },
- "require": {
- "php": "^7.1 || ^8.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^7.5 || ^8.0",
- "symfony/process": "^4.2 || ^5"
- },
- "type": "library",
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- },
- {
- "name": "Kore Nordmann",
- "email": "mail@kore-nordmann.de"
- }
- ],
- "description": "Fork of sebastian/diff for use with ergebnis/composer-normalize",
- "homepage": "https://github.com/localheinz/diff",
- "keywords": [
- "diff",
- "udiff",
- "unidiff",
- "unified diff"
- ],
- "support": {
- "source": "https://github.com/localheinz/diff/tree/main"
- },
- "funding": [
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
- "time": "2020-07-06T04:49:32+00:00"
- },
- {
- "name": "mehr-als-nix/parallel",
- "version": "v1.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/MehrAlsNix/Parallel.git",
- "reference": "14a71eb1a8f851108bed4a5b32d1c1027976e8f3"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/MehrAlsNix/Parallel/zipball/14a71eb1a8f851108bed4a5b32d1c1027976e8f3",
- "reference": "14a71eb1a8f851108bed4a5b32d1c1027976e8f3",
- "shasum": ""
- },
- "require-dev": {
- "phpunit/phpunit": "^6.5"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "MehrAlsNix\\Parallel\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "siad007",
- "email": "siad.ardroumli@gmail.com"
- }
- ],
- "description": "This package is a port of PhpDumentor/Parallel",
- "support": {
- "source": "https://github.com/MehrAlsNix/Parallel/tree/master"
- },
- "time": "2017-12-10T12:33:51+00:00"
- },
- {
- "name": "mikey179/vfsstream",
- "version": "dev-master",
- "source": {
- "type": "git",
- "url": "https://github.com/bovigo/vfsStream.git",
- "reference": "dd9277d9d27b5406f903e6b06df99825c32ea3b2"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/dd9277d9d27b5406f903e6b06df99825c32ea3b2",
- "reference": "dd9277d9d27b5406f903e6b06df99825c32ea3b2",
- "shasum": ""
- },
- "require": {
- "php": "^7.2|^8.0"
- },
- "require-dev": {
- "bovigo/assert": "^6.2",
- "bovigo/callmap": "^6.2.1",
- "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
- "doctrine/coding-standard": "^8.2.1",
- "phpstan/phpstan": "^0.12.94",
- "phpstan/phpstan-deprecation-rules": "^0.12.6",
- "phpstan/phpstan-phpunit": "^0.12.21",
- "phpunit/phpunit": "^9.5.8",
- "squizlabs/php_codesniffer": "^3.6.0"
- },
- "default-branch": true,
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.0.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "bovigo\\vfs\\": "src",
- "org\\bovigo\\vfs\\": "org/bovigo/vfs"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Frank Kleine",
- "homepage": "http://frankkleine.de/",
- "role": "Developer"
- }
- ],
- "description": "Virtual file system to mock the real file system in unit tests.",
- "homepage": "http://vfs.bovigo.org/",
- "support": {
- "issues": "https://github.com/bovigo/vfsStream/issues",
- "source": "https://github.com/bovigo/vfsStream/tree/master",
- "wiki": "https://github.com/bovigo/vfsStream/wiki"
- },
- "time": "2022-07-26T07:37:46+00:00"
- },
- {
- "name": "monolog/monolog",
- "version": "2.9.2",
- "source": {
- "type": "git",
- "url": "https://github.com/Seldaek/monolog.git",
- "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
- "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2",
- "psr/log": "^1.0.1 || ^2.0 || ^3.0"
- },
- "provide": {
- "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0"
- },
- "require-dev": {
- "aws/aws-sdk-php": "^2.4.9 || ^3.0",
- "doctrine/couchdb": "~1.0@dev",
- "elasticsearch/elasticsearch": "^7 || ^8",
- "ext-json": "*",
- "graylog2/gelf-php": "^1.4.2 || ^2@dev",
- "guzzlehttp/guzzle": "^7.4",
- "guzzlehttp/psr7": "^2.2",
- "mongodb/mongodb": "^1.8",
- "php-amqplib/php-amqplib": "~2.4 || ^3",
- "phpspec/prophecy": "^1.15",
- "phpstan/phpstan": "^0.12.91",
- "phpunit/phpunit": "^8.5.14",
- "predis/predis": "^1.1 || ^2.0",
- "rollbar/rollbar": "^1.3 || ^2 || ^3",
- "ruflin/elastica": "^7",
- "swiftmailer/swiftmailer": "^5.3|^6.0",
- "symfony/mailer": "^5.4 || ^6",
- "symfony/mime": "^5.4 || ^6"
- },
- "suggest": {
- "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
- "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
- "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client",
- "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
- "ext-curl": "Required to send log messages using the IFTTTHandler, the LogglyHandler, the SendGridHandler, the SlackWebhookHandler or the TelegramBotHandler",
- "ext-mbstring": "Allow to work properly with unicode symbols",
- "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)",
- "ext-openssl": "Required to send log messages using SSL",
- "ext-sockets": "Allow sending log messages to a Syslog server (via UDP driver)",
- "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
- "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)",
- "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
- "rollbar/rollbar": "Allow sending log messages to Rollbar",
- "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "2.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Monolog\\": "src/Monolog"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jordi Boggiano",
- "email": "j.boggiano@seld.be",
- "homepage": "https://seld.be"
- }
- ],
- "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
- "homepage": "https://github.com/Seldaek/monolog",
- "keywords": [
- "log",
- "logging",
- "psr-3"
- ],
- "support": {
- "issues": "https://github.com/Seldaek/monolog/issues",
- "source": "https://github.com/Seldaek/monolog/tree/2.9.2"
- },
- "funding": [
- {
- "url": "https://github.com/Seldaek",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/monolog/monolog",
- "type": "tidelift"
- }
- ],
- "time": "2023-10-27T15:25:26+00:00"
- },
- {
- "name": "mtdowling/jmespath.php",
- "version": "2.7.0",
- "source": {
- "type": "git",
- "url": "https://github.com/jmespath/jmespath.php.git",
- "reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/bbb69a935c2cbb0c03d7f481a238027430f6440b",
- "reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b",
- "shasum": ""
- },
- "require": {
- "php": "^7.2.5 || ^8.0",
- "symfony/polyfill-mbstring": "^1.17"
- },
- "require-dev": {
- "composer/xdebug-handler": "^3.0.3",
- "phpunit/phpunit": "^8.5.33"
- },
- "bin": [
- "bin/jp.php"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.7-dev"
- }
- },
- "autoload": {
- "files": [
- "src/JmesPath.php"
- ],
- "psr-4": {
- "JmesPath\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Graham Campbell",
- "email": "hello@gjcampbell.co.uk",
- "homepage": "https://github.com/GrahamCampbell"
- },
- {
- "name": "Michael Dowling",
- "email": "mtdowling@gmail.com",
- "homepage": "https://github.com/mtdowling"
- }
- ],
- "description": "Declaratively specify how to extract elements from a JSON document",
- "keywords": [
- "json",
- "jsonpath"
- ],
- "support": {
- "issues": "https://github.com/jmespath/jmespath.php/issues",
- "source": "https://github.com/jmespath/jmespath.php/tree/2.7.0"
- },
- "time": "2023-08-25T10:54:48+00:00"
- },
- {
- "name": "myclabs/deep-copy",
- "version": "1.11.1",
- "source": {
- "type": "git",
- "url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
- "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
- "shasum": ""
- },
- "require": {
- "php": "^7.1 || ^8.0"
- },
- "conflict": {
- "doctrine/collections": "<1.6.8",
- "doctrine/common": "<2.13.3 || >=3,<3.2.2"
- },
- "require-dev": {
- "doctrine/collections": "^1.6.8",
- "doctrine/common": "^2.13.3 || ^3.2.2",
- "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
- },
- "type": "library",
- "autoload": {
- "files": [
- "src/DeepCopy/deep_copy.php"
- ],
- "psr-4": {
- "DeepCopy\\": "src/DeepCopy/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "description": "Create deep copies (clones) of your objects",
- "keywords": [
- "clone",
- "copy",
- "duplicate",
- "object",
- "object graph"
- ],
- "support": {
- "issues": "https://github.com/myclabs/DeepCopy/issues",
- "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
- },
- "funding": [
- {
- "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
- "type": "tidelift"
- }
- ],
- "time": "2023-03-08T13:26:56+00:00"
- },
- {
- "name": "nikic/php-parser",
- "version": "v5.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4a21235f7e56e713259a6f76bf4b5ea08502b9dc",
- "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc",
- "shasum": ""
- },
- "require": {
- "ext-ctype": "*",
- "ext-json": "*",
- "ext-tokenizer": "*",
- "php": ">=7.4"
- },
- "require-dev": {
- "ircmaxell/php-yacc": "^0.0.7",
- "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
- },
- "bin": [
- "bin/php-parse"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "5.0-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "PhpParser\\": "lib/PhpParser"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Nikita Popov"
- }
- ],
- "description": "A PHP parser written in PHP",
- "keywords": [
- "parser",
- "php"
- ],
- "support": {
- "issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.0"
- },
- "time": "2024-01-07T17:17:35+00:00"
- },
- {
- "name": "pdepend/pdepend",
- "version": "2.16.2",
- "source": {
- "type": "git",
- "url": "https://github.com/pdepend/pdepend.git",
- "reference": "f942b208dc2a0868454d01b29f0c75bbcfc6ed58"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/pdepend/pdepend/zipball/f942b208dc2a0868454d01b29f0c75bbcfc6ed58",
- "reference": "f942b208dc2a0868454d01b29f0c75bbcfc6ed58",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.7",
- "symfony/config": "^2.3.0|^3|^4|^5|^6.0|^7.0",
- "symfony/dependency-injection": "^2.3.0|^3|^4|^5|^6.0|^7.0",
- "symfony/filesystem": "^2.3.0|^3|^4|^5|^6.0|^7.0",
- "symfony/polyfill-mbstring": "^1.19"
- },
- "require-dev": {
- "easy-doc/easy-doc": "0.0.0|^1.2.3",
- "gregwar/rst": "^1.0",
- "squizlabs/php_codesniffer": "^2.0.0"
- },
- "bin": [
- "src/bin/pdepend"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "PDepend\\": "src/main/php/PDepend"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "description": "Official version of pdepend to be handled with Composer",
- "keywords": [
- "PHP Depend",
- "PHP_Depend",
- "dev",
- "pdepend"
- ],
- "support": {
- "issues": "https://github.com/pdepend/pdepend/issues",
- "source": "https://github.com/pdepend/pdepend/tree/2.16.2"
- },
- "funding": [
- {
- "url": "https://tidelift.com/funding/github/packagist/pdepend/pdepend",
- "type": "tidelift"
- }
- ],
- "time": "2023-12-17T18:09:59+00:00"
- },
- {
- "name": "pear/archive_tar",
- "version": "1.4.14",
- "source": {
- "type": "git",
- "url": "https://github.com/pear/Archive_Tar.git",
- "reference": "4d761c5334c790e45ef3245f0864b8955c562caa"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/4d761c5334c790e45ef3245f0864b8955c562caa",
- "reference": "4d761c5334c790e45ef3245f0864b8955c562caa",
- "shasum": ""
- },
- "require": {
- "pear/pear-core-minimal": "^1.10.0alpha2",
- "php": ">=5.2.0"
- },
- "require-dev": {
- "phpunit/phpunit": "*"
- },
- "suggest": {
- "ext-bz2": "Bz2 compression support.",
- "ext-xz": "Lzma2 compression support.",
- "ext-zlib": "Gzip compression support."
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.4.x-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Archive_Tar": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "include-path": [
- "./"
- ],
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Vincent Blavet",
- "email": "vincent@phpconcept.net"
- },
- {
- "name": "Greg Beaver",
- "email": "greg@chiaraquartet.net"
- },
- {
- "name": "Michiel Rook",
- "email": "mrook@php.net"
- }
- ],
- "description": "Tar file management class with compression support (gzip, bzip2, lzma2)",
- "homepage": "https://github.com/pear/Archive_Tar",
- "keywords": [
- "archive",
- "tar"
- ],
- "support": {
- "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Archive_Tar",
- "source": "https://github.com/pear/Archive_Tar"
- },
- "funding": [
- {
- "url": "https://github.com/mrook",
- "type": "github"
- },
- {
- "url": "https://www.patreon.com/michielrook",
- "type": "patreon"
- }
- ],
- "time": "2021-07-20T13:53:39+00:00"
- },
- {
- "name": "pear/console_getopt",
- "version": "v1.4.3",
- "source": {
- "type": "git",
- "url": "https://github.com/pear/Console_Getopt.git",
- "reference": "a41f8d3e668987609178c7c4a9fe48fecac53fa0"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/pear/Console_Getopt/zipball/a41f8d3e668987609178c7c4a9fe48fecac53fa0",
- "reference": "a41f8d3e668987609178c7c4a9fe48fecac53fa0",
- "shasum": ""
- },
- "type": "library",
- "autoload": {
- "psr-0": {
- "Console": "./"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "include-path": [
- "./"
- ],
- "license": [
- "BSD-2-Clause"
- ],
- "authors": [
- {
- "name": "Andrei Zmievski",
- "email": "andrei@php.net",
- "role": "Lead"
- },
- {
- "name": "Stig Bakken",
- "email": "stig@php.net",
- "role": "Developer"
- },
- {
- "name": "Greg Beaver",
- "email": "cellog@php.net",
- "role": "Helper"
- }
- ],
- "description": "More info available on: http://pear.php.net/package/Console_Getopt",
- "support": {
- "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Console_Getopt",
- "source": "https://github.com/pear/Console_Getopt"
- },
- "time": "2019-11-20T18:27:48+00:00"
- },
- {
- "name": "pear/mail",
- "version": "v1.6.0",
- "source": {
- "type": "git",
- "url": "https://github.com/pear/Mail.git",
- "reference": "4fda3292ac6bf226d8841cfd8ee3cf4e28395c01"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/pear/Mail/zipball/4fda3292ac6bf226d8841cfd8ee3cf4e28395c01",
- "reference": "4fda3292ac6bf226d8841cfd8ee3cf4e28395c01",
- "shasum": ""
- },
- "require": {
- "pear/pear-core-minimal": "~1.9",
- "php": ">=5.2.1"
- },
- "require-dev": {
- "pear/pear": "*"
- },
- "suggest": {
- "pear/net_smtp": "Install optionally via your project's composer.json"
- },
- "type": "library",
- "autoload": {
- "psr-0": {
- "Mail": "./"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "include-path": [
- "./"
- ],
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Chuck Hagenbuch",
- "email": "chuck@horde.org",
- "role": "Lead"
- },
- {
- "name": "Armin Graefe",
- "email": "schengawegga@gmail.com",
- "role": "Lead"
- },
- {
- "name": "Richard Heyes",
- "email": "richard@phpguru.org",
- "role": "Developer"
- },
- {
- "name": "Aleksander Machniak",
- "email": "alec@alec.pl",
- "role": "Developer"
- }
- ],
- "description": "Class that provides multiple interfaces for sending emails.",
- "homepage": "http://pear.php.net/package/Mail",
- "support": {
- "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Mail",
- "source": "https://github.com/pear/Mail"
- },
- "time": "2023-11-01T21:31:59+00:00"
- },
- {
- "name": "pear/mail_mime",
- "version": "1.10.11",
- "source": {
- "type": "git",
- "url": "https://github.com/pear/Mail_Mime.git",
- "reference": "d4fb9ce61201593d0f8c6db629c45e29c3409c14"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/pear/Mail_Mime/zipball/d4fb9ce61201593d0f8c6db629c45e29c3409c14",
- "reference": "d4fb9ce61201593d0f8c6db629c45e29c3409c14",
- "shasum": ""
- },
- "require": {
- "pear/pear-core-minimal": "*",
- "php": ">=5.2.0"
- },
- "type": "library",
- "autoload": {
- "psr-0": {
- "Mail": "./"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "include-path": [
- "./"
- ],
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Cipriano Groenendal",
- "email": "cipri@php.net",
- "role": "Lead"
- },
- {
- "name": "Aleksander Machniak",
- "email": "alec@php.net",
- "role": "Lead"
- }
- ],
- "description": "Mail_Mime provides classes to create MIME messages",
- "homepage": "http://pear.php.net/package/Mail_Mime",
- "support": {
- "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Mail_Mime",
- "source": "https://github.com/pear/Mail_Mime"
- },
- "time": "2021-09-05T08:42:45+00:00"
- },
- {
- "name": "pear/net_ftp",
- "version": "dev-master",
- "source": {
- "type": "git",
- "url": "https://github.com/pear/Net_FTP.git",
- "reference": "b5bd376359df4b9ef9c3140a21d2d2e790c9bdb7"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/pear/Net_FTP/zipball/b5bd376359df4b9ef9c3140a21d2d2e790c9bdb7",
- "reference": "b5bd376359df4b9ef9c3140a21d2d2e790c9bdb7",
- "shasum": ""
- },
- "require": {
- "pear/pear_exception": "*"
- },
- "require-dev": {
- "phpunit/phpunit": "*"
- },
- "default-branch": true,
- "type": "library",
- "autoload": {
- "psr-0": {
- "Net": "./"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "include-path": [
- "./"
- ],
- "license": [
- "PHP License"
- ],
- "authors": [
- {
- "name": "Jorrit Schippers",
- "email": "jschippers@php.net",
- "role": "Lead"
- },
- {
- "name": "Tobias Schlitt",
- "email": "toby@php.net",
- "role": "Lead"
- }
- ],
- "description": "More info available on: http://pear.php.net/package/Net_FTP",
- "support": {
- "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Net_FTP",
- "source": "https://github.com/pear/Net_FTP"
- },
- "time": "2023-10-18T12:09:44+00:00"
- },
- {
- "name": "pear/net_growl",
- "version": "dev-master",
- "source": {
- "type": "git",
- "url": "https://github.com/pear/Net_Growl.git",
- "reference": "9e828a6dde4f85337358209bd98bd260a558e4a9"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/pear/Net_Growl/zipball/9e828a6dde4f85337358209bd98bd260a558e4a9",
- "reference": "9e828a6dde4f85337358209bd98bd260a558e4a9",
- "shasum": ""
- },
- "require": {
- "pear/pear_exception": "*",
- "php": ">=5.6"
- },
- "require-dev": {
- "phpunit/phpunit": "<6.0"
- },
- "default-branch": true,
- "type": "library",
- "autoload": {
- "psr-0": {
- "Net": "./"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "include-path": [
- "./"
- ],
- "license": [
- "BSD License"
- ],
- "authors": [
- {
- "name": "Laurent Laville",
- "email": "pear@laurent-laville.org",
- "role": "Lead"
- },
- {
- "name": "Bertrand Mansion",
- "email": "bmansion@mamasam.com",
- "role": "Lead"
- },
- {
- "name": "Brian Dunnington",
- "role": "Helper"
- }
- ],
- "description": "More info available on: http://pear.php.net/package/Net_Growl",
- "support": {
- "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Net_Growl",
- "source": "https://github.com/pear/Net_Growl"
- },
- "time": "2019-03-05T14:25:46+00:00"
- },
- {
- "name": "pear/pear-core-minimal",
- "version": "v1.10.14",
- "source": {
- "type": "git",
- "url": "https://github.com/pear/pear-core-minimal.git",
- "reference": "a86fc145edb5caedbf96527214ce3cadc9de4a32"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/a86fc145edb5caedbf96527214ce3cadc9de4a32",
- "reference": "a86fc145edb5caedbf96527214ce3cadc9de4a32",
- "shasum": ""
- },
- "require": {
- "pear/console_getopt": "~1.4",
- "pear/pear_exception": "~1.0",
- "php": ">=5.4"
- },
- "replace": {
- "rsky/pear-core-min": "self.version"
- },
- "type": "library",
- "autoload": {
- "psr-0": {
- "": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "include-path": [
- "src/"
- ],
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Christian Weiske",
- "email": "cweiske@php.net",
- "role": "Lead"
- }
- ],
- "description": "Minimal set of PEAR core files to be used as composer dependency",
- "support": {
- "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR",
- "source": "https://github.com/pear/pear-core-minimal"
- },
- "time": "2023-11-26T16:15:38+00:00"
- },
- {
- "name": "pear/pear_exception",
- "version": "v1.0.2",
- "source": {
- "type": "git",
- "url": "https://github.com/pear/PEAR_Exception.git",
- "reference": "b14fbe2ddb0b9f94f5b24cf08783d599f776fff0"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/pear/PEAR_Exception/zipball/b14fbe2ddb0b9f94f5b24cf08783d599f776fff0",
- "reference": "b14fbe2ddb0b9f94f5b24cf08783d599f776fff0",
- "shasum": ""
- },
- "require": {
- "php": ">=5.2.0"
- },
- "require-dev": {
- "phpunit/phpunit": "<9"
- },
- "type": "class",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0.x-dev"
- }
- },
- "autoload": {
- "classmap": [
- "PEAR/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "include-path": [
- "."
- ],
- "license": [
- "BSD-2-Clause"
- ],
- "authors": [
- {
- "name": "Helgi Thormar",
- "email": "dufuz@php.net"
- },
- {
- "name": "Greg Beaver",
- "email": "cellog@php.net"
- }
- ],
- "description": "The PEAR Exception base class.",
- "homepage": "https://github.com/pear/PEAR_Exception",
- "keywords": [
- "exception"
- ],
- "support": {
- "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR_Exception",
- "source": "https://github.com/pear/PEAR_Exception"
- },
- "time": "2021-03-21T15:43:46+00:00"
- },
- {
- "name": "pear/versioncontrol_git",
- "version": "dev-master",
- "source": {
- "type": "git",
- "url": "https://github.com/pear/VersionControl_Git.git",
- "reference": "c32d75d237974297f052ceb781dfc2eb817f7b59"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/pear/VersionControl_Git/zipball/c32d75d237974297f052ceb781dfc2eb817f7b59",
- "reference": "c32d75d237974297f052ceb781dfc2eb817f7b59",
- "shasum": ""
- },
- "require": {
- "pear/pear-core-minimal": "^1.9",
- "pear/pear_exception": "~1.0.0",
- "php": "^7.3 || ^7.4 || ^8.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^9.5"
- },
- "default-branch": true,
- "type": "library",
- "autoload": {
- "psr-0": {
- "VersionControl": "./"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "include-path": [
- "./"
- ],
- "license": [
- "Apache-2.0"
- ],
- "authors": [
- {
- "name": "Kousuke Ebihara",
- "email": "ebihara@php.net",
- "role": "Lead"
- }
- ],
- "description": "VersionControl_Git is a library that provides OO interface to handle Git repository.",
- "support": {
- "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=VersionControl_Git",
- "source": "https://github.com/pear/VersionControl_Git"
- },
- "time": "2023-03-22T19:55:38+00:00"
- },
- {
- "name": "pear/versioncontrol_svn",
- "version": "0.7.0",
- "source": {
- "type": "git",
- "url": "https://github.com/pear/VersionControl_SVN.git",
- "reference": "226ec8cb136a88f5093f650193d9c1d2230d2938"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/pear/VersionControl_SVN/zipball/226ec8cb136a88f5093f650193d9c1d2230d2938",
- "reference": "226ec8cb136a88f5093f650193d9c1d2230d2938",
- "shasum": ""
- },
- "require": {
- "pear/pear-core-minimal": "^1.10",
- "pear/pear_exception": "*@dev",
- "php": ">=5.3.0"
- },
- "require-dev": {
- "phpunit/phpunit": "*"
- },
- "type": "library",
- "autoload": {
- "psr-0": {
- "VersionControl_": "./"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "include-path": [
- "./"
- ],
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Clay Loveless",
- "email": "clay@loveless.net",
- "role": "Lead"
- },
- {
- "name": "Michiel Rook",
- "email": "mrook@php.net",
- "role": "Lead"
- }
- ],
- "description": "More info available on: http://pear.php.net/package/VersionControl_SVN",
- "support": {
- "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=VersionControl_SVN",
- "source": "https://github.com/pear/VersionControl_SVN"
- },
- "funding": [
- {
- "url": "https://github.com/mrook",
- "type": "github"
- },
- {
- "url": "https://www.patreon.com/michielrook",
- "type": "patreon"
- }
- ],
- "time": "2021-06-01T12:01:18+00:00"
- },
- {
- "name": "phar-io/manifest",
- "version": "2.0.3",
- "source": {
- "type": "git",
- "url": "https://github.com/phar-io/manifest.git",
- "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
- "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
- "shasum": ""
- },
- "require": {
- "ext-dom": "*",
- "ext-phar": "*",
- "ext-xmlwriter": "*",
- "phar-io/version": "^3.0.1",
- "php": "^7.2 || ^8.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.0.x-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Arne Blankerts",
- "email": "arne@blankerts.de",
- "role": "Developer"
- },
- {
- "name": "Sebastian Heuer",
- "email": "sebastian@phpeople.de",
- "role": "Developer"
- },
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "Developer"
- }
- ],
- "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
- "support": {
- "issues": "https://github.com/phar-io/manifest/issues",
- "source": "https://github.com/phar-io/manifest/tree/2.0.3"
- },
- "time": "2021-07-20T11:28:43+00:00"
- },
- {
- "name": "phar-io/version",
- "version": "3.2.1",
- "source": {
- "type": "git",
- "url": "https://github.com/phar-io/version.git",
- "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
- "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
- "shasum": ""
- },
- "require": {
- "php": "^7.2 || ^8.0"
- },
- "type": "library",
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Arne Blankerts",
- "email": "arne@blankerts.de",
- "role": "Developer"
- },
- {
- "name": "Sebastian Heuer",
- "email": "sebastian@phpeople.de",
- "role": "Developer"
- },
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "Developer"
- }
- ],
- "description": "Library for handling version information and constraints",
- "support": {
- "issues": "https://github.com/phar-io/version/issues",
- "source": "https://github.com/phar-io/version/tree/3.2.1"
- },
- "time": "2022-02-21T01:04:05+00:00"
- },
- {
- "name": "phing/phing-composer-configurator",
- "version": "dev-master",
- "source": {
- "type": "git",
- "url": "https://github.com/phingofficial/phing-composer-configurator.git",
- "reference": "4ae5639bbecc82d849374139895092de528b8803"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phingofficial/phing-composer-configurator/zipball/4ae5639bbecc82d849374139895092de528b8803",
- "reference": "4ae5639bbecc82d849374139895092de528b8803",
- "shasum": ""
- },
- "require": {
- "composer-plugin-api": "^1.1|^2.0",
- "php": ">= 7.3"
- },
- "require-dev": {
- "composer/composer": "~2.1.9 || ~2.3.0 || ~2.5.0",
- "ergebnis/composer-normalize": "^2.0.2",
- "ergebnis/phpstan-rules": "^0.14.2|^0.15.0",
- "mikey179/vfsstream": "^1.6.8",
- "pepakriz/phpstan-exception-rules": "^0.10.1|^0.11.0",
- "phpstan/phpstan": "^0.12.4",
- "phpstan/phpstan-beberlei-assert": "^0.12.2",
- "phpstan/phpstan-deprecation-rules": "^0.12.1",
- "phpstan/phpstan-phpunit": "^0.12.5",
- "phpstan/phpstan-strict-rules": "^0.12.1",
- "phpunit/phpunit": "^8.5.0|^9.4.2",
- "roave/security-advisories": "dev-latest",
- "squizlabs/php_codesniffer": "^3.5.3"
- },
- "default-branch": true,
- "type": "composer-plugin",
- "extra": {
- "class": [
- "Phing\\PhingComposerConfigurator\\ExtensionInstallerPlugin"
- ]
- },
- "autoload": {
- "psr-4": {
- "Phing\\PhingComposerConfigurator\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "LGPL-3.0-only"
- ],
- "authors": [
- {
- "name": "Siad Ardroumli",
- "email": "siad.ardroumli@gmail.com"
- },
- {
- "name": "Phing Community",
- "homepage": "https://github.com/phingofficial/phing/blob/master/CREDITS.md"
- }
- ],
- "description": "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant.",
- "homepage": "https://www.phing.info/",
- "keywords": [
- "ant",
- "build",
- "build-automation",
- "build-tool",
- "make",
- "phing",
- "php",
- "task",
- "tool"
- ],
- "support": {
- "docs": "https://www.phing.info/docs/guide/stable/",
- "irc": "irc://irc.freenode.net/phing",
- "issues": "https://github.com/phingofficial/phing-composer-configurator/issues",
- "slack": "https://www.phing.info/slack",
- "source": "https://github.com/phingofficial/phing-composer-configurator/"
- },
- "time": "2022-12-20T14:31:40+00:00"
- },
- {
- "name": "phpmd/phpmd",
- "version": "2.15.0",
- "source": {
- "type": "git",
- "url": "https://github.com/phpmd/phpmd.git",
- "reference": "74a1f56e33afad4128b886e334093e98e1b5e7c0"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phpmd/phpmd/zipball/74a1f56e33afad4128b886e334093e98e1b5e7c0",
- "reference": "74a1f56e33afad4128b886e334093e98e1b5e7c0",
- "shasum": ""
- },
- "require": {
- "composer/xdebug-handler": "^1.0 || ^2.0 || ^3.0",
- "ext-xml": "*",
- "pdepend/pdepend": "^2.16.1",
- "php": ">=5.3.9"
- },
- "require-dev": {
- "easy-doc/easy-doc": "0.0.0 || ^1.3.2",
- "ext-json": "*",
- "ext-simplexml": "*",
- "gregwar/rst": "^1.0",
- "mikey179/vfsstream": "^1.6.8",
- "squizlabs/php_codesniffer": "^2.9.2 || ^3.7.2"
- },
- "bin": [
- "src/bin/phpmd"
- ],
- "type": "library",
- "autoload": {
- "psr-0": {
- "PHPMD\\": "src/main/php"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Manuel Pichler",
- "email": "github@manuel-pichler.de",
- "homepage": "https://github.com/manuelpichler",
- "role": "Project Founder"
- },
- {
- "name": "Marc Würth",
- "email": "ravage@bluewin.ch",
- "homepage": "https://github.com/ravage84",
- "role": "Project Maintainer"
- },
- {
- "name": "Other contributors",
- "homepage": "https://github.com/phpmd/phpmd/graphs/contributors",
- "role": "Contributors"
- }
- ],
- "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.",
- "homepage": "https://phpmd.org/",
- "keywords": [
- "dev",
- "mess detection",
- "mess detector",
- "pdepend",
- "phpmd",
- "pmd"
- ],
- "support": {
- "irc": "irc://irc.freenode.org/phpmd",
- "issues": "https://github.com/phpmd/phpmd/issues",
- "source": "https://github.com/phpmd/phpmd/tree/2.15.0"
- },
- "funding": [
- {
- "url": "https://tidelift.com/funding/github/packagist/phpmd/phpmd",
- "type": "tidelift"
- }
- ],
- "time": "2023-12-11T08:22:20+00:00"
- },
- {
- "name": "phpstan/phpstan",
- "version": "1.10.58",
- "source": {
- "type": "git",
- "url": "https://github.com/phpstan/phpstan.git",
- "reference": "a23518379ec4defd9e47cbf81019526861623ec2"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a23518379ec4defd9e47cbf81019526861623ec2",
- "reference": "a23518379ec4defd9e47cbf81019526861623ec2",
- "shasum": ""
- },
- "require": {
- "php": "^7.2|^8.0"
- },
- "conflict": {
- "phpstan/phpstan-shim": "*"
- },
- "bin": [
- "phpstan",
- "phpstan.phar"
- ],
- "type": "library",
- "autoload": {
- "files": [
- "bootstrap.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "description": "PHPStan - PHP Static Analysis Tool",
- "keywords": [
- "dev",
- "static analysis"
- ],
- "support": {
- "docs": "https://phpstan.org/user-guide/getting-started",
- "forum": "https://github.com/phpstan/phpstan/discussions",
- "issues": "https://github.com/phpstan/phpstan/issues",
- "security": "https://github.com/phpstan/phpstan/security/policy",
- "source": "https://github.com/phpstan/phpstan-src"
- },
- "funding": [
- {
- "url": "https://github.com/ondrejmirtes",
- "type": "github"
- },
- {
- "url": "https://github.com/phpstan",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
- "type": "tidelift"
- }
- ],
- "time": "2024-02-12T20:02:57+00:00"
- },
- {
- "name": "phpunit/php-code-coverage",
- "version": "9.2.30",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca2bd87d2f9215904682a9cb9bb37dda98e76089",
- "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089",
- "shasum": ""
- },
- "require": {
- "ext-dom": "*",
- "ext-libxml": "*",
- "ext-xmlwriter": "*",
- "nikic/php-parser": "^4.18 || ^5.0",
- "php": ">=7.3",
- "phpunit/php-file-iterator": "^3.0.3",
- "phpunit/php-text-template": "^2.0.2",
- "sebastian/code-unit-reverse-lookup": "^2.0.2",
- "sebastian/complexity": "^2.0",
- "sebastian/environment": "^5.1.2",
- "sebastian/lines-of-code": "^1.0.3",
- "sebastian/version": "^3.0.1",
- "theseer/tokenizer": "^1.2.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^9.3"
- },
- "suggest": {
- "ext-pcov": "PHP extension that provides line coverage",
- "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "9.2-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
- "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
- "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
- "keywords": [
- "coverage",
- "testing",
- "xunit"
- ],
- "support": {
- "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
- "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.30"
- },
- "funding": [
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
- "time": "2023-12-22T06:47:57+00:00"
- },
- {
- "name": "phpunit/php-file-iterator",
- "version": "3.0.6",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
- "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
- "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
- "shasum": ""
- },
- "require": {
- "php": ">=7.3"
- },
- "require-dev": {
- "phpunit/phpunit": "^9.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.0-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
- "description": "FilterIterator implementation that filters files based on a list of suffixes.",
- "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
- "keywords": [
- "filesystem",
- "iterator"
- ],
- "support": {
- "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
- "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
- },
- "funding": [
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
- "time": "2021-12-02T12:48:52+00:00"
- },
- {
- "name": "phpunit/php-invoker",
- "version": "3.1.1",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/php-invoker.git",
- "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
- "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
- "shasum": ""
- },
- "require": {
- "php": ">=7.3"
- },
- "require-dev": {
- "ext-pcntl": "*",
- "phpunit/phpunit": "^9.3"
- },
- "suggest": {
- "ext-pcntl": "*"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.1-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
- "description": "Invoke callables with a timeout",
- "homepage": "https://github.com/sebastianbergmann/php-invoker/",
- "keywords": [
- "process"
- ],
- "support": {
- "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
- "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
- },
- "funding": [
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
- "time": "2020-09-28T05:58:55+00:00"
- },
- {
- "name": "phpunit/php-text-template",
- "version": "2.0.4",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/php-text-template.git",
- "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
- "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
- "shasum": ""
- },
- "require": {
- "php": ">=7.3"
- },
- "require-dev": {
- "phpunit/phpunit": "^9.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.0-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
- "description": "Simple template engine.",
- "homepage": "https://github.com/sebastianbergmann/php-text-template/",
- "keywords": [
- "template"
- ],
- "support": {
- "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
- "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
- },
- "funding": [
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
- "time": "2020-10-26T05:33:50+00:00"
- },
- {
- "name": "phpunit/php-timer",
- "version": "5.0.3",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/php-timer.git",
- "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
- "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
- "shasum": ""
- },
- "require": {
- "php": ">=7.3"
- },
- "require-dev": {
- "phpunit/phpunit": "^9.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "5.0-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
- "description": "Utility class for timing",
- "homepage": "https://github.com/sebastianbergmann/php-timer/",
- "keywords": [
- "timer"
- ],
- "support": {
- "issues": "https://github.com/sebastianbergmann/php-timer/issues",
- "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
- },
- "funding": [
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
- "time": "2020-10-26T13:16:10+00:00"
- },
- {
- "name": "phpunit/phpunit",
- "version": "9.6.16",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3767b2c56ce02d01e3491046f33466a1ae60a37f",
- "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f",
- "shasum": ""
- },
- "require": {
- "doctrine/instantiator": "^1.3.1 || ^2",
- "ext-dom": "*",
- "ext-json": "*",
- "ext-libxml": "*",
- "ext-mbstring": "*",
- "ext-xml": "*",
- "ext-xmlwriter": "*",
- "myclabs/deep-copy": "^1.10.1",
- "phar-io/manifest": "^2.0.3",
- "phar-io/version": "^3.0.2",
- "php": ">=7.3",
- "phpunit/php-code-coverage": "^9.2.28",
- "phpunit/php-file-iterator": "^3.0.5",
- "phpunit/php-invoker": "^3.1.1",
- "phpunit/php-text-template": "^2.0.3",
- "phpunit/php-timer": "^5.0.2",
- "sebastian/cli-parser": "^1.0.1",
- "sebastian/code-unit": "^1.0.6",
- "sebastian/comparator": "^4.0.8",
- "sebastian/diff": "^4.0.3",
- "sebastian/environment": "^5.1.3",
- "sebastian/exporter": "^4.0.5",
- "sebastian/global-state": "^5.0.1",
- "sebastian/object-enumerator": "^4.0.3",
- "sebastian/resource-operations": "^3.0.3",
- "sebastian/type": "^3.2",
- "sebastian/version": "^3.0.2"
- },
- "suggest": {
- "ext-soap": "To be able to generate mocks based on WSDL files",
- "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
- },
- "bin": [
- "phpunit"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "9.6-dev"
- }
- },
- "autoload": {
- "files": [
- "src/Framework/Assert/Functions.php"
- ],
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
- "description": "The PHP Unit Testing framework.",
- "homepage": "https://phpunit.de/",
- "keywords": [
- "phpunit",
- "testing",
- "xunit"
- ],
- "support": {
- "issues": "https://github.com/sebastianbergmann/phpunit/issues",
- "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.16"
- },
- "funding": [
- {
- "url": "https://phpunit.de/sponsors.html",
- "type": "custom"
- },
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
- "type": "tidelift"
- }
- ],
- "time": "2024-01-19T07:03:14+00:00"
- },
- {
- "name": "psr/event-dispatcher",
- "version": "1.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/php-fig/event-dispatcher.git",
- "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
- "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Psr\\EventDispatcher\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
- }
- ],
- "description": "Standard interfaces for event handling.",
- "keywords": [
- "events",
- "psr",
- "psr-14"
- ],
- "support": {
- "issues": "https://github.com/php-fig/event-dispatcher/issues",
- "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
- },
- "time": "2019-01-08T18:20:26+00:00"
- },
- {
- "name": "psr/http-client",
- "version": "1.0.3",
- "source": {
- "type": "git",
- "url": "https://github.com/php-fig/http-client.git",
- "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
- "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
- "shasum": ""
- },
- "require": {
- "php": "^7.0 || ^8.0",
- "psr/http-message": "^1.0 || ^2.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Psr\\Http\\Client\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "PHP-FIG",
- "homepage": "https://www.php-fig.org/"
- }
- ],
- "description": "Common interface for HTTP clients",
- "homepage": "https://github.com/php-fig/http-client",
- "keywords": [
- "http",
- "http-client",
- "psr",
- "psr-18"
- ],
- "support": {
- "source": "https://github.com/php-fig/http-client"
- },
- "time": "2023-09-23T14:17:50+00:00"
- },
- {
- "name": "psr/http-factory",
- "version": "1.0.2",
- "source": {
- "type": "git",
- "url": "https://github.com/php-fig/http-factory.git",
- "reference": "e616d01114759c4c489f93b099585439f795fe35"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
- "reference": "e616d01114759c4c489f93b099585439f795fe35",
- "shasum": ""
- },
- "require": {
- "php": ">=7.0.0",
- "psr/http-message": "^1.0 || ^2.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Psr\\Http\\Message\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "PHP-FIG",
- "homepage": "https://www.php-fig.org/"
- }
- ],
- "description": "Common interfaces for PSR-7 HTTP message factories",
- "keywords": [
- "factory",
- "http",
- "message",
- "psr",
- "psr-17",
- "psr-7",
- "request",
- "response"
- ],
- "support": {
- "source": "https://github.com/php-fig/http-factory/tree/1.0.2"
- },
- "time": "2023-04-10T20:10:41+00:00"
- },
- {
- "name": "psr/http-message",
- "version": "1.1",
- "source": {
- "type": "git",
- "url": "https://github.com/php-fig/http-message.git",
- "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
- "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
- "shasum": ""
- },
- "require": {
- "php": "^7.2 || ^8.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Psr\\Http\\Message\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
- }
- ],
- "description": "Common interface for HTTP messages",
- "homepage": "https://github.com/php-fig/http-message",
- "keywords": [
- "http",
- "http-message",
- "psr",
- "psr-7",
- "request",
- "response"
- ],
- "support": {
- "source": "https://github.com/php-fig/http-message/tree/1.1"
- },
- "time": "2023-04-04T09:50:52+00:00"
- },
- {
- "name": "psr/log",
- "version": "1.1.4",
- "source": {
- "type": "git",
- "url": "https://github.com/php-fig/log.git",
- "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
- "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.1.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Psr\\Log\\": "Psr/Log/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "PHP-FIG",
- "homepage": "https://www.php-fig.org/"
- }
- ],
- "description": "Common interface for logging libraries",
- "homepage": "https://github.com/php-fig/log",
- "keywords": [
- "log",
- "psr",
- "psr-3"
- ],
- "support": {
- "source": "https://github.com/php-fig/log/tree/1.1.4"
- },
- "time": "2021-05-03T11:20:27+00:00"
- },
- {
- "name": "ralouphie/getallheaders",
- "version": "3.0.3",
- "source": {
- "type": "git",
- "url": "https://github.com/ralouphie/getallheaders.git",
- "reference": "120b605dfeb996808c31b6477290a714d356e822"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
- "reference": "120b605dfeb996808c31b6477290a714d356e822",
- "shasum": ""
- },
- "require": {
- "php": ">=5.6"
- },
- "require-dev": {
- "php-coveralls/php-coveralls": "^2.1",
- "phpunit/phpunit": "^5 || ^6.5"
- },
- "type": "library",
- "autoload": {
- "files": [
- "src/getallheaders.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Ralph Khattar",
- "email": "ralph.khattar@gmail.com"
- }
- ],
- "description": "A polyfill for getallheaders.",
- "support": {
- "issues": "https://github.com/ralouphie/getallheaders/issues",
- "source": "https://github.com/ralouphie/getallheaders/tree/develop"
- },
- "time": "2019-03-08T08:55:37+00:00"
- },
- {
- "name": "roave/security-advisories",
- "version": "dev-master",
- "source": {
- "type": "git",
- "url": "https://github.com/Roave/SecurityAdvisories.git",
- "reference": "624324975ceed0b788160bdec5b7f22125d8de14"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/624324975ceed0b788160bdec5b7f22125d8de14",
- "reference": "624324975ceed0b788160bdec5b7f22125d8de14",
- "shasum": ""
- },
- "conflict": {
- "3f/pygmentize": "<1.2",
- "admidio/admidio": "<4.2.13",
- "adodb/adodb-php": "<=5.20.20|>=5.21,<=5.21.3",
- "aheinze/cockpit": "<2.2",
- "aimeos/aimeos-typo3": "<19.10.12|>=20,<20.10.5",
- "airesvsg/acf-to-rest-api": "<=3.1",
- "akaunting/akaunting": "<2.1.13",
- "akeneo/pim-community-dev": "<5.0.119|>=6,<6.0.53",
- "alextselegidis/easyappointments": "<1.5",
- "alterphp/easyadmin-extension-bundle": ">=1.2,<1.2.11|>=1.3,<1.3.1",
- "amazing/media2click": ">=1,<1.3.3",
- "amphp/artax": "<1.0.6|>=2,<2.0.6",
- "amphp/http": "<1.0.1",
- "amphp/http-client": ">=4,<4.4",
- "anchorcms/anchor-cms": "<=0.12.7",
- "andreapollastri/cipi": "<=3.1.15",
- "andrewhaine/silverstripe-form-capture": ">=0.2,<=0.2.3|>=1,<1.0.2|>=2,<2.2.5",
- "apache-solr-for-typo3/solr": "<2.8.3",
- "apereo/phpcas": "<1.6",
- "api-platform/core": ">=2.2,<2.2.10|>=2.3,<2.3.6|>=2.6,<2.7.10|>=3,<3.0.12|>=3.1,<3.1.3",
- "appwrite/server-ce": "<=1.2.1",
- "arc/web": "<3",
- "area17/twill": "<1.2.5|>=2,<2.5.3",
- "artesaos/seotools": "<0.17.2",
- "asymmetricrypt/asymmetricrypt": "<9.9.99",
- "athlon1600/php-proxy": "<=5.1",
- "athlon1600/php-proxy-app": "<=3",
- "austintoddj/canvas": "<=3.4.2",
- "automad/automad": "<=1.10.9",
- "awesome-support/awesome-support": "<=6.0.7",
- "aws/aws-sdk-php": "<3.288.1",
- "azuracast/azuracast": "<0.18.3",
- "backdrop/backdrop": "<1.24.2",
- "backpack/crud": "<3.4.9",
- "bacula-web/bacula-web": "<8.0.0.0-RC2-dev",
- "badaso/core": "<2.7",
- "bagisto/bagisto": "<1.3.2",
- "barrelstrength/sprout-base-email": "<1.2.7",
- "barrelstrength/sprout-forms": "<3.9",
- "barryvdh/laravel-translation-manager": "<0.6.2",
- "barzahlen/barzahlen-php": "<2.0.1",
- "baserproject/basercms": "<4.8",
- "bassjobsen/bootstrap-3-typeahead": ">4.0.2",
- "bigfork/silverstripe-form-capture": ">=3,<3.1.1",
- "billz/raspap-webgui": "<2.9.5",
- "bk2k/bootstrap-package": ">=7.1,<7.1.2|>=8,<8.0.8|>=9,<9.0.4|>=9.1,<9.1.3|>=10,<10.0.10|>=11,<11.0.3",
- "bmarshall511/wordpress_zero_spam": "<5.2.13",
- "bolt/bolt": "<3.7.2",
- "bolt/core": "<=4.2",
- "bottelet/flarepoint": "<2.2.1",
- "bref/bref": "<2.1.13",
- "brightlocal/phpwhois": "<=4.2.5",
- "brotkrueml/codehighlight": "<2.7",
- "brotkrueml/schema": "<1.13.1|>=2,<2.5.1",
- "brotkrueml/typo3-matomo-integration": "<1.3.2",
- "buddypress/buddypress": "<7.2.1",
- "bugsnag/bugsnag-laravel": ">=2,<2.0.2",
- "bytefury/crater": "<6.0.2",
- "cachethq/cachet": "<2.5.1",
- "cakephp/cakephp": "<3.10.3|>=4,<4.0.10|>=4.1,<4.1.4|>=4.2,<4.2.12|>=4.3,<4.3.11|>=4.4,<4.4.10",
- "cakephp/database": ">=4.2,<4.2.12|>=4.3,<4.3.11|>=4.4,<4.4.10",
- "cardgate/magento2": "<2.0.33",
- "cardgate/woocommerce": "<=3.1.15",
- "cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4",
- "cartalyst/sentry": "<=2.1.6",
- "catfan/medoo": "<1.7.5",
- "cecil/cecil": "<7.47.1",
- "centreon/centreon": "<22.10.0.0-beta1",
- "cesnet/simplesamlphp-module-proxystatistics": "<3.1",
- "chriskacerguis/codeigniter-restserver": "<=2.7.1",
- "civicrm/civicrm-core": ">=4.2,<4.2.9|>=4.3,<4.3.3",
- "ckeditor/ckeditor": "<4.17",
- "cockpit-hq/cockpit": "<=2.6.3",
- "codeception/codeception": "<3.1.3|>=4,<4.1.22",
- "codeigniter/framework": "<3.1.9",
- "codeigniter4/framework": "<=4.4.2",
- "codeigniter4/shield": "<1.0.0.0-beta8",
- "codiad/codiad": "<=2.8.4",
- "composer/composer": "<1.10.27|>=2,<2.2.23|>=2.3,<2.7",
- "concrete5/concrete5": "<9.2.5",
- "concrete5/core": "<8.5.8|>=9,<9.1",
- "contao-components/mediaelement": ">=2.14.2,<2.21.1",
- "contao/contao": ">=4,<4.4.56|>=4.5,<4.9.40|>=4.10,<4.11.7|>=4.13,<4.13.21|>=5.1,<5.1.4",
- "contao/core": ">=2,<3.5.39",
- "contao/core-bundle": ">=3,<3.5.35|>=4,<4.9.42|>=4.10,<4.13.28|>=5,<5.1.10",
- "contao/listing-bundle": ">=4,<4.4.8",
- "contao/managed-edition": "<=1.5",
- "corveda/phpsandbox": "<1.3.5",
- "cosenary/instagram": "<=2.3",
- "craftcms/cms": "<4.6.2",
- "croogo/croogo": "<4",
- "cuyz/valinor": "<0.12",
- "czproject/git-php": "<4.0.3",
- "darylldoyle/safe-svg": "<1.9.10",
- "datadog/dd-trace": ">=0.30,<0.30.2",
- "datatables/datatables": "<1.10.10",
- "david-garcia/phpwhois": "<=4.3.1",
- "dbrisinajumi/d2files": "<1",
- "dcat/laravel-admin": "<=2.1.3.0-beta",
- "derhansen/fe_change_pwd": "<2.0.5|>=3,<3.0.3",
- "derhansen/sf_event_mgt": "<4.3.1|>=5,<5.1.1|>=7,<7.4",
- "desperado/xml-bundle": "<=0.1.7",
- "directmailteam/direct-mail": "<6.0.3|>=7,<7.0.3|>=8,<9.5.2",
- "doctrine/annotations": "<1.2.7",
- "doctrine/cache": ">=1,<1.3.2|>=1.4,<1.4.2",
- "doctrine/common": "<2.4.3|>=2.5,<2.5.1",
- "doctrine/dbal": ">=2,<2.0.8|>=2.1,<2.1.2|>=3,<3.1.4",
- "doctrine/doctrine-bundle": "<1.5.2",
- "doctrine/doctrine-module": "<=0.7.1",
- "doctrine/mongodb-odm": "<1.0.2",
- "doctrine/mongodb-odm-bundle": "<3.0.1",
- "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4",
- "dolibarr/dolibarr": "<18.0.2",
- "dompdf/dompdf": "<2.0.4",
- "doublethreedigital/guest-entries": "<3.1.2",
- "drupal/core": ">=6,<6.38|>=7,<7.96|>=8,<10.1.8|>=10.2,<10.2.2",
- "drupal/drupal": ">=5,<5.11|>=6,<6.38|>=7,<7.80|>=8,<8.9.16|>=9,<9.1.12|>=9.2,<9.2.4",
- "duncanmcclean/guest-entries": "<3.1.2",
- "dweeves/magmi": "<=0.7.24",
- "ec-cube/ec-cube": "<2.4.4",
- "ecodev/newsletter": "<=4",
- "ectouch/ectouch": "<=2.7.2",
- "elefant/cms": "<2.0.7",
- "elgg/elgg": "<3.3.24|>=4,<4.0.5",
- "elijaa/phpmemcacheadmin": "<=1.3",
- "encore/laravel-admin": "<=1.8.19",
- "endroid/qr-code-bundle": "<3.4.2",
- "enshrined/svg-sanitize": "<0.15",
- "erusev/parsedown": "<1.7.2",
- "ether/logs": "<3.0.4",
- "evolutioncms/evolution": "<=3.2.3",
- "exceedone/exment": "<4.4.3|>=5,<5.0.3",
- "exceedone/laravel-admin": "<2.2.3|==3",
- "ezsystems/demobundle": ">=5.4,<5.4.6.1-dev",
- "ezsystems/ez-support-tools": ">=2.2,<2.2.3",
- "ezsystems/ezdemo-ls-extension": ">=5.4,<5.4.2.1-dev",
- "ezsystems/ezfind-ls": ">=5.3,<5.3.6.1-dev|>=5.4,<5.4.11.1-dev|>=2017.12,<2017.12.0.1-dev",
- "ezsystems/ezplatform": "<=1.13.6|>=2,<=2.5.24",
- "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6|>=1.5,<1.5.29|>=2.3,<2.3.26",
- "ezsystems/ezplatform-admin-ui-assets": ">=4,<4.2.1|>=5,<5.0.1|>=5.1,<5.1.1",
- "ezsystems/ezplatform-graphql": ">=1.0.0.0-RC1-dev,<1.0.13|>=2.0.0.0-beta1,<2.3.12",
- "ezsystems/ezplatform-kernel": "<1.2.5.1-dev|>=1.3,<1.3.34",
- "ezsystems/ezplatform-rest": ">=1.2,<=1.2.2|>=1.3,<1.3.8",
- "ezsystems/ezplatform-richtext": ">=2.3,<2.3.7.1-dev",
- "ezsystems/ezplatform-solr-search-engine": ">=1.7,<1.7.12|>=2,<2.0.2|>=3.3,<3.3.15",
- "ezsystems/ezplatform-user": ">=1,<1.0.1",
- "ezsystems/ezpublish-kernel": "<6.13.8.2-dev|>=7,<7.5.31",
- "ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.6,<=2019.03.5.1",
- "ezsystems/platform-ui-assets-bundle": ">=4.2,<4.2.3",
- "ezsystems/repository-forms": ">=2.3,<2.3.2.1-dev|>=2.5,<2.5.15",
- "ezyang/htmlpurifier": "<4.1.1",
- "facade/ignition": "<1.16.15|>=2,<2.4.2|>=2.5,<2.5.2",
- "facturascripts/facturascripts": "<=2022.08",
- "feehi/cms": "<=2.1.1",
- "feehi/feehicms": "<=2.1.1",
- "fenom/fenom": "<=2.12.1",
- "filegator/filegator": "<7.8",
- "firebase/php-jwt": "<6",
- "fixpunkt/fp-masterquiz": "<2.2.1|>=3,<3.5.2",
- "fixpunkt/fp-newsletter": "<1.1.1|>=2,<2.1.2|>=2.2,<3.2.6",
- "flarum/core": "<1.8.5",
- "flarum/framework": "<1.8.5",
- "flarum/mentions": "<1.6.3",
- "flarum/sticky": ">=0.1.0.0-beta14,<=0.1.0.0-beta15",
- "flarum/tags": "<=0.1.0.0-beta13",
- "floriangaerber/magnesium": "<0.3.1",
- "fluidtypo3/vhs": "<5.1.1",
- "fof/byobu": ">=0.3.0.0-beta2,<1.1.7",
- "fof/upload": "<1.2.3",
- "foodcoopshop/foodcoopshop": ">=3.2,<3.6.1",
- "fooman/tcpdf": "<6.2.22",
- "forkcms/forkcms": "<5.11.1",
- "fossar/tcpdf-parser": "<6.2.22",
- "francoisjacquet/rosariosis": "<11",
- "frappant/frp-form-answers": "<3.1.2|>=4,<4.0.2",
- "friendsofsymfony/oauth2-php": "<1.3",
- "friendsofsymfony/rest-bundle": ">=1.2,<1.2.2",
- "friendsofsymfony/user-bundle": ">=1.2,<1.3.5",
- "friendsoftypo3/mediace": ">=7.6.2,<7.6.5",
- "friendsoftypo3/openid": ">=4.5,<4.5.31|>=4.7,<4.7.16|>=6,<6.0.11|>=6.1,<6.1.6",
- "froala/wysiwyg-editor": "<3.2.7|>=4.0.1,<=4.1.1",
- "froxlor/froxlor": "<=2.1.1",
- "fuel/core": "<1.8.1",
- "funadmin/funadmin": "<=3.2|>=3.3.2,<=3.3.3",
- "gaoming13/wechat-php-sdk": "<=1.10.2",
- "genix/cms": "<=1.1.11",
- "getgrav/grav": "<1.7.44",
- "getkirby/cms": "<3.5.8.3-dev|>=3.6,<3.6.6.3-dev|>=3.7,<3.7.5.2-dev|>=3.8,<3.8.4.1-dev|>=3.9,<3.9.6",
- "getkirby/kirby": "<=2.5.12",
- "getkirby/panel": "<2.5.14",
- "getkirby/starterkit": "<=3.7.0.2",
- "gilacms/gila": "<=1.15.4",
- "gleez/cms": "<=1.2|==2",
- "globalpayments/php-sdk": "<2",
- "gogentooss/samlbase": "<1.2.7",
- "google/protobuf": "<3.15",
- "gos/web-socket-bundle": "<1.10.4|>=2,<2.6.1|>=3,<3.3",
- "gree/jose": "<2.2.1",
- "gregwar/rst": "<1.0.3",
- "grumpydictator/firefly-iii": "<6.1.7",
- "gugoan/economizzer": "<=0.9.0.0-beta1",
- "guzzlehttp/guzzle": "<6.5.8|>=7,<7.4.5",
- "guzzlehttp/psr7": "<1.9.1|>=2,<2.4.5",
- "haffner/jh_captcha": "<=2.1.3|>=3,<=3.0.2",
- "harvesthq/chosen": "<1.8.7",
- "helloxz/imgurl": "<=2.31",
- "hhxsv5/laravel-s": "<3.7.36",
- "hillelcoren/invoice-ninja": "<5.3.35",
- "himiklab/yii2-jqgrid-widget": "<1.0.8",
- "hjue/justwriting": "<=1",
- "hov/jobfair": "<1.0.13|>=2,<2.0.2",
- "httpsoft/http-message": "<1.0.12",
- "hyn/multi-tenant": ">=5.6,<5.7.2",
- "ibexa/admin-ui": ">=4.2,<4.2.3",
- "ibexa/core": ">=4,<4.0.7|>=4.1,<4.1.4|>=4.2,<4.2.3|>=4.5,<4.5.4",
- "ibexa/graphql": ">=2.5,<2.5.31|>=3.3,<3.3.28|>=4.2,<4.2.3",
- "ibexa/post-install": "<=1.0.4",
- "ibexa/solr": ">=4.5,<4.5.4",
- "ibexa/user": ">=4,<4.4.3",
- "icecoder/icecoder": "<=8.1",
- "idno/known": "<=1.3.1",
- "illuminate/auth": "<5.5.10",
- "illuminate/cookie": ">=4,<=4.0.11|>=4.1,<=4.1.99999|>=4.2,<=4.2.99999|>=5,<=5.0.99999|>=5.1,<=5.1.99999|>=5.2,<=5.2.99999|>=5.3,<=5.3.99999|>=5.4,<=5.4.99999|>=5.5,<=5.5.49|>=5.6,<=5.6.99999|>=5.7,<=5.7.99999|>=5.8,<=5.8.99999|>=6,<6.18.31|>=7,<7.22.4",
- "illuminate/database": "<6.20.26|>=7,<7.30.5|>=8,<8.40",
- "illuminate/encryption": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.40|>=5.6,<5.6.15",
- "illuminate/view": "<6.20.42|>=7,<7.30.6|>=8,<8.75",
- "impresscms/impresscms": "<=1.4.5",
- "impresspages/impresspages": "<=1.0.12",
- "in2code/femanager": "<5.5.3|>=6,<6.3.4|>=7,<7.2.3",
- "in2code/ipandlanguageredirect": "<5.1.2",
- "in2code/lux": "<17.6.1|>=18,<24.0.2",
- "innologi/typo3-appointments": "<2.0.6",
- "intelliants/subrion": "<4.2.2",
- "islandora/islandora": ">=2,<2.4.1",
- "ivankristianto/phpwhois": "<=4.3",
- "jackalope/jackalope-doctrine-dbal": "<1.7.4",
- "james-heinrich/getid3": "<1.9.21",
- "james-heinrich/phpthumb": "<1.7.12",
- "jasig/phpcas": "<1.3.3",
- "jcbrand/converse.js": "<3.3.3",
- "joomla/application": "<1.0.13",
- "joomla/archive": "<1.1.12|>=2,<2.0.1",
- "joomla/filesystem": "<1.6.2|>=2,<2.0.1",
- "joomla/filter": "<1.4.4|>=2,<2.0.1",
- "joomla/framework": "<1.5.7|>=2.5.4,<=3.8.12",
- "joomla/input": ">=2,<2.0.2",
- "joomla/joomla-cms": ">=2.5,<3.9.12",
- "joomla/session": "<1.3.1",
- "joyqi/hyper-down": "<=2.4.27",
- "jsdecena/laracom": "<2.0.9",
- "jsmitty12/phpwhois": "<5.1",
- "juzaweb/cms": "<=3.4",
- "kazist/phpwhois": "<=4.2.6",
- "kelvinmo/simplexrd": "<3.1.1",
- "kevinpapst/kimai2": "<1.16.7",
- "khodakhah/nodcms": "<=3",
- "kimai/kimai": "<2.1",
- "kitodo/presentation": "<3.2.3|>=3.3,<3.3.4",
- "klaviyo/magento2-extension": ">=1,<3",
- "knplabs/knp-snappy": "<=1.4.2",
- "kohana/core": "<3.3.3",
- "krayin/laravel-crm": "<1.2.2",
- "kreait/firebase-php": ">=3.2,<3.8.1",
- "la-haute-societe/tcpdf": "<6.2.22",
- "laminas/laminas-diactoros": "<2.18.1|==2.19|==2.20|==2.21|==2.22|==2.23|>=2.24,<2.24.2|>=2.25,<2.25.2",
- "laminas/laminas-form": "<2.17.1|>=3,<3.0.2|>=3.1,<3.1.1",
- "laminas/laminas-http": "<2.14.2",
- "laravel/fortify": "<1.11.1",
- "laravel/framework": "<6.20.44|>=7,<7.30.6|>=8,<8.75",
- "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10",
- "latte/latte": "<2.10.8",
- "lavalite/cms": "<=9",
- "lcobucci/jwt": ">=3.4,<3.4.6|>=4,<4.0.4|>=4.1,<4.1.5",
- "league/commonmark": "<0.18.3",
- "league/flysystem": "<1.1.4|>=2,<2.1.1",
- "league/oauth2-server": ">=8.3.2,<8.4.2|>=8.5,<8.5.3",
- "lexik/jwt-authentication-bundle": "<2.10.7|>=2.11,<2.11.3",
- "librenms/librenms": "<2017.08.18",
- "liftkit/database": "<2.13.2",
- "limesurvey/limesurvey": "<3.27.19",
- "livehelperchat/livehelperchat": "<=3.91",
- "livewire/livewire": ">2.2.4,<2.2.6",
- "lms/routes": "<2.1.1",
- "localizationteam/l10nmgr": "<7.4|>=8,<8.7|>=9,<9.2",
- "luyadev/yii-helpers": "<1.2.1",
- "magento/community-edition": "<2.4.3.0-patch3|>=2.4.4,<2.4.5",
- "magento/core": "<=1.9.4.5",
- "magento/magento1ce": "<1.9.4.3-dev",
- "magento/magento1ee": ">=1,<1.14.4.3-dev",
- "magento/product-community-edition": ">=2,<2.2.10|>=2.3,<2.3.2.0-patch2",
- "magneto/core": "<1.9.4.4-dev",
- "maikuolan/phpmussel": ">=1,<1.6",
- "mainwp/mainwp": "<=4.4.3.3",
- "mantisbt/mantisbt": "<=2.25.7",
- "marcwillmann/turn": "<0.3.3",
- "matyhtf/framework": "<3.0.6",
- "mautic/core": "<4.3",
- "mediawiki/core": "<1.36.2",
- "mediawiki/matomo": "<2.4.3",
- "mediawiki/semantic-media-wiki": "<4.0.2",
- "melisplatform/melis-asset-manager": "<5.0.1",
- "melisplatform/melis-cms": "<5.0.1",
- "melisplatform/melis-front": "<5.0.1",
- "mezzio/mezzio-swoole": "<3.7|>=4,<4.3",
- "mgallegos/laravel-jqgrid": "<=1.3",
- "microsoft/microsoft-graph": ">=1.16,<1.109.1|>=2,<2.0.1",
- "microsoft/microsoft-graph-beta": "<2.0.1",
- "microsoft/microsoft-graph-core": "<2.0.2",
- "microweber/microweber": "<=2.0.4",
- "miniorange/miniorange-saml": "<1.4.3",
- "mittwald/typo3_forum": "<1.2.1",
- "mobiledetect/mobiledetectlib": "<2.8.32",
- "modx/revolution": "<=2.8.3.0-patch",
- "mojo42/jirafeau": "<4.4",
- "mongodb/mongodb": ">=1,<1.9.2",
- "monolog/monolog": ">=1.8,<1.12",
- "moodle/moodle": "<4.3.0.0-RC2-dev",
- "mos/cimage": "<0.7.19",
- "movim/moxl": ">=0.8,<=0.10",
- "mpdf/mpdf": "<=7.1.7",
- "munkireport/comment": "<4.1",
- "munkireport/managedinstalls": "<2.6",
- "munkireport/munkireport": ">=2.5.3,<5.6.3",
- "mustache/mustache": ">=2,<2.14.1",
- "namshi/jose": "<2.2",
- "neoan3-apps/template": "<1.1.1",
- "neorazorx/facturascripts": "<2022.04",
- "neos/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6",
- "neos/form": ">=1.2,<4.3.3|>=5,<5.0.9|>=5.1,<5.1.3",
- "neos/media-browser": "<7.3.19|>=8,<8.0.16|>=8.1,<8.1.11|>=8.2,<8.2.11|>=8.3,<8.3.9",
- "neos/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.9.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<5.3.10|>=7,<7.0.9|>=7.1,<7.1.7|>=7.2,<7.2.6|>=7.3,<7.3.4|>=8,<8.0.2",
- "neos/swiftmailer": ">=4.1,<4.1.99|>=5.4,<5.4.5",
- "netgen/tagsbundle": ">=3.4,<3.4.11|>=4,<4.0.15",
- "nette/application": ">=2,<2.0.19|>=2.1,<2.1.13|>=2.2,<2.2.10|>=2.3,<2.3.14|>=2.4,<2.4.16|>=3,<3.0.6",
- "nette/nette": ">=2,<2.0.19|>=2.1,<2.1.13",
- "nilsteampassnet/teampass": "<3.0.10",
- "nonfiction/nterchange": "<4.1.1",
- "notrinos/notrinos-erp": "<=0.7",
- "noumo/easyii": "<=0.9",
- "nukeviet/nukeviet": "<4.5.02",
- "nyholm/psr7": "<1.6.1",
- "nystudio107/craft-seomatic": "<3.4.12",
- "nzo/url-encryptor-bundle": ">=4,<4.3.2|>=5,<5.0.1",
- "october/backend": "<1.1.2",
- "october/cms": "<1.0.469|==1.0.469|==1.0.471|==1.1.1",
- "october/october": "<=3.4.4",
- "october/rain": "<1.0.472|>=1.1,<1.1.2",
- "october/system": "<1.0.476|>=1.1,<1.1.12|>=2,<2.2.34|>=3,<3.5.2",
- "omeka/omeka-s": "<4.0.3",
- "onelogin/php-saml": "<2.10.4",
- "oneup/uploader-bundle": ">=1,<1.9.3|>=2,<2.1.5",
- "open-web-analytics/open-web-analytics": "<1.7.4",
- "opencart/opencart": "<=3.0.3.7|>=4,<4.0.2.3-dev",
- "openid/php-openid": "<2.3",
- "openmage/magento-lts": "<20.2",
- "opensource-workshop/connect-cms": "<1.7.2|>=2,<2.3.2",
- "orchid/platform": ">=9,<9.4.4|>=14.0.0.0-alpha4,<14.5",
- "oro/calendar-bundle": ">=4.2,<=4.2.6|>=5,<=5.0.6|>=5.1,<5.1.1",
- "oro/commerce": ">=4.1,<5.0.11|>=5.1,<5.1.1",
- "oro/crm": ">=1.7,<1.7.4|>=3.1,<4.1.17|>=4.2,<4.2.7",
- "oro/crm-call-bundle": ">=4.2,<=4.2.5|>=5,<5.0.4|>=5.1,<5.1.1",
- "oro/customer-portal": ">=4.2,<=4.2.8|>=5,<5.0.11|>=5.1,<5.1.1",
- "oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<=4.2.10|>=5,<5.0.8",
- "oxid-esales/oxideshop-ce": "<4.5",
- "packbackbooks/lti-1-3-php-library": "<5",
- "padraic/humbug_get_contents": "<1.1.2",
- "pagarme/pagarme-php": "<3",
- "pagekit/pagekit": "<=1.0.18",
- "paragonie/random_compat": "<2",
- "passbolt/passbolt_api": "<2.11",
- "paypal/merchant-sdk-php": "<3.12",
- "pear/archive_tar": "<1.4.14",
- "pear/auth": "<1.2.4",
- "pear/crypt_gpg": "<1.6.7",
- "pear/pear": "<=1.10.1",
- "pegasus/google-for-jobs": "<1.5.1|>=2,<2.1.1",
- "personnummer/personnummer": "<3.0.2",
- "phanan/koel": "<5.1.4",
- "phenx/php-svg-lib": "<0.5.1",
- "php-mod/curl": "<2.3.2",
- "phpbb/phpbb": "<3.2.10|>=3.3,<3.3.1",
- "phpems/phpems": ">=6,<=6.1.3",
- "phpfastcache/phpfastcache": "<6.1.5|>=7,<7.1.2|>=8,<8.0.7",
- "phpmailer/phpmailer": "<6.5",
- "phpmussel/phpmussel": ">=1,<1.6",
- "phpmyadmin/phpmyadmin": "<5.2.1",
- "phpmyfaq/phpmyfaq": "<3.2.5",
- "phpoffice/phpexcel": "<1.8",
- "phpoffice/phpspreadsheet": "<1.16",
- "phpseclib/phpseclib": "<2.0.31|>=3,<3.0.34",
- "phpservermon/phpservermon": "<3.6",
- "phpsysinfo/phpsysinfo": "<3.4.3",
- "phpunit/phpunit": ">=4.8.19,<4.8.28|>=5.0.10,<5.6.3",
- "phpwhois/phpwhois": "<=4.2.5",
- "phpxmlrpc/extras": "<0.6.1",
- "phpxmlrpc/phpxmlrpc": "<4.9.2",
- "pi/pi": "<=2.5",
- "pimcore/admin-ui-classic-bundle": "<1.3.3",
- "pimcore/customer-management-framework-bundle": "<4.0.6",
- "pimcore/data-hub": "<1.2.4",
- "pimcore/demo": "<10.3",
- "pimcore/ecommerce-framework-bundle": "<1.0.10",
- "pimcore/perspective-editor": "<1.5.1",
- "pimcore/pimcore": "<11.1.1",
- "pixelfed/pixelfed": "<0.11.11",
- "plotly/plotly.js": "<2.25.2",
- "pocketmine/bedrock-protocol": "<8.0.2",
- "pocketmine/pocketmine-mp": "<=4.23|>=5,<5.3.1",
- "pocketmine/raklib": ">=0.14,<0.14.6|>=0.15,<0.15.1",
- "pressbooks/pressbooks": "<5.18",
- "prestashop/autoupgrade": ">=4,<4.10.1",
- "prestashop/blockreassurance": "<=5.1.3",
- "prestashop/blockwishlist": ">=2,<2.1.1",
- "prestashop/contactform": ">=1.0.1,<4.3",
- "prestashop/gamification": "<2.3.2",
- "prestashop/prestashop": "<8.1.3",
- "prestashop/productcomments": "<5.0.2",
- "prestashop/ps_emailsubscription": "<2.6.1",
- "prestashop/ps_facetedsearch": "<3.4.1",
- "prestashop/ps_linklist": "<3.1",
- "privatebin/privatebin": "<1.4",
- "processwire/processwire": "<=3.0.210",
- "propel/propel": ">=2.0.0.0-alpha1,<=2.0.0.0-alpha7",
- "propel/propel1": ">=1,<=1.7.1",
- "pterodactyl/panel": "<1.7",
- "ptheofan/yii2-statemachine": ">=2.0.0.0-RC1-dev,<=2",
- "ptrofimov/beanstalk_console": "<1.7.14",
- "pubnub/pubnub": "<6.1",
- "pusher/pusher-php-server": "<2.2.1",
- "pwweb/laravel-core": "<=0.3.6.0-beta",
- "pyrocms/pyrocms": "<=3.9.1",
- "rainlab/blog-plugin": "<1.4.1",
- "rainlab/debugbar-plugin": "<3.1",
- "rainlab/user-plugin": "<=1.4.5",
- "rankmath/seo-by-rank-math": "<=1.0.95",
- "rap2hpoutre/laravel-log-viewer": "<0.13",
- "react/http": ">=0.7,<1.9",
- "really-simple-plugins/complianz-gdpr": "<6.4.2",
- "remdex/livehelperchat": "<3.99",
- "reportico-web/reportico": "<=7.1.21",
- "rhukster/dom-sanitizer": "<1.0.7",
- "rmccue/requests": ">=1.6,<1.8",
- "robrichards/xmlseclibs": ">=1,<3.0.4",
- "roots/soil": "<4.1",
- "rudloff/alltube": "<3.0.3",
- "s-cart/core": "<6.9",
- "s-cart/s-cart": "<6.9",
- "sabberworm/php-css-parser": ">=1,<1.0.1|>=2,<2.0.1|>=3,<3.0.1|>=4,<4.0.1|>=5,<5.0.9|>=5.1,<5.1.3|>=5.2,<5.2.1|>=6,<6.0.2|>=7,<7.0.4|>=8,<8.0.1|>=8.1,<8.1.1|>=8.2,<8.2.1|>=8.3,<8.3.1",
- "sabre/dav": ">=1.6,<1.7.11|>=1.8,<1.8.9",
- "scheb/two-factor-bundle": "<3.26|>=4,<4.11",
- "sensiolabs/connect": "<4.2.3",
- "serluck/phpwhois": "<=4.2.6",
- "sfroemken/url_redirect": "<=1.2.1",
- "sheng/yiicms": "<=1.2",
- "shopware/core": "<=6.5.7.3",
- "shopware/platform": "<=6.5.7.3",
- "shopware/production": "<=6.3.5.2",
- "shopware/shopware": "<=5.7.17",
- "shopware/storefront": "<=6.4.8.1",
- "shopxo/shopxo": "<2.2.6",
- "showdoc/showdoc": "<2.10.4",
- "silverstripe-australia/advancedreports": ">=1,<=2",
- "silverstripe/admin": "<1.13.19|>=2,<2.1.8",
- "silverstripe/assets": ">=1,<1.11.1",
- "silverstripe/cms": "<4.11.3",
- "silverstripe/comments": ">=1.3,<1.9.99|>=2,<2.9.99|>=3,<3.1.1",
- "silverstripe/forum": "<=0.6.1|>=0.7,<=0.7.3",
- "silverstripe/framework": "<4.13.39|>=5,<5.1.11",
- "silverstripe/graphql": ">=2,<2.0.5|>=3,<3.8.2|>=4,<4.3.7|>=5,<5.1.3",
- "silverstripe/hybridsessions": ">=1,<2.4.1|>=2.5,<2.5.1",
- "silverstripe/recipe-cms": ">=4.5,<4.5.3",
- "silverstripe/registry": ">=2.1,<2.1.2|>=2.2,<2.2.1",
- "silverstripe/restfulserver": ">=1,<1.0.9|>=2,<2.0.4",
- "silverstripe/silverstripe-omnipay": "<2.5.2|>=3,<3.0.2|>=3.1,<3.1.4|>=3.2,<3.2.1",
- "silverstripe/subsites": ">=2,<2.6.1",
- "silverstripe/taxonomy": ">=1.3,<1.3.1|>=2,<2.0.1",
- "silverstripe/userforms": "<3",
- "silverstripe/versioned-admin": ">=1,<1.11.1",
- "simple-updates/phpwhois": "<=1",
- "simplesamlphp/saml2": "<1.10.6|>=2,<2.3.8|>=3,<3.1.4|==5.0.0.0-alpha12",
- "simplesamlphp/simplesamlphp": "<1.18.6",
- "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1",
- "simplesamlphp/simplesamlphp-module-openid": "<1",
- "simplesamlphp/simplesamlphp-module-openidprovider": "<0.9",
- "simplesamlphp/xml-security": "==1.6.11",
- "simplito/elliptic-php": "<1.0.6",
- "sitegeist/fluid-components": "<3.5",
- "sjbr/sr-freecap": "<2.4.6|>=2.5,<2.5.3",
- "slim/psr7": "<1.4.1|>=1.5,<1.5.1|>=1.6,<1.6.1",
- "slim/slim": "<2.6",
- "slub/slub-events": "<3.0.3",
- "smarty/smarty": "<3.1.48|>=4,<4.3.1",
- "snipe/snipe-it": "<=6.2.2",
- "socalnick/scn-social-auth": "<1.15.2",
- "socialiteproviders/steam": "<1.1",
- "spatie/browsershot": "<3.57.4",
- "spipu/html2pdf": "<5.2.8",
- "spoon/library": "<1.4.1",
- "spoonity/tcpdf": "<6.2.22",
- "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1",
- "ssddanbrown/bookstack": "<22.02.3",
- "statamic/cms": "<4.46",
- "stormpath/sdk": "<9.9.99",
- "studio-42/elfinder": "<2.1.62",
- "subhh/libconnect": "<7.0.8|>=8,<8.1",
- "sukohi/surpass": "<1",
- "sulu/sulu": "<1.6.44|>=2,<2.4.16|>=2.5,<2.5.12",
- "sumocoders/framework-user-bundle": "<1.4",
- "superbig/craft-audit": "<3.0.2",
- "swag/paypal": "<5.4.4",
- "swiftmailer/swiftmailer": ">=4,<5.4.5",
- "swiftyedit/swiftyedit": "<1.2",
- "sylius/admin-bundle": ">=1,<1.0.17|>=1.1,<1.1.9|>=1.2,<1.2.2",
- "sylius/grid": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1",
- "sylius/grid-bundle": "<1.10.1",
- "sylius/paypal-plugin": ">=1,<1.2.4|>=1.3,<1.3.1",
- "sylius/resource-bundle": ">=1,<1.3.14|>=1.4,<1.4.7|>=1.5,<1.5.2|>=1.6,<1.6.4",
- "sylius/sylius": "<1.9.10|>=1.10,<1.10.11|>=1.11,<1.11.2",
- "symbiote/silverstripe-multivaluefield": ">=3,<3.0.99",
- "symbiote/silverstripe-queuedjobs": ">=3,<3.0.2|>=3.1,<3.1.4|>=4,<4.0.7|>=4.1,<4.1.2|>=4.2,<4.2.4|>=4.3,<4.3.3|>=4.4,<4.4.3|>=4.5,<4.5.1|>=4.6,<4.6.4",
- "symbiote/silverstripe-seed": "<6.0.3",
- "symbiote/silverstripe-versionedfiles": "<=2.0.3",
- "symfont/process": ">=0",
- "symfony/cache": ">=3.1,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8",
- "symfony/dependency-injection": ">=2,<2.0.17|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7",
- "symfony/error-handler": ">=4.4,<4.4.4|>=5,<5.0.4",
- "symfony/form": ">=2.3,<2.3.35|>=2.4,<2.6.12|>=2.7,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.20|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1",
- "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7|>=5.3.14,<=5.3.14|>=5.4.3,<=5.4.3|>=6.0.3,<=6.0.3",
- "symfony/http-foundation": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7",
- "symfony/http-kernel": ">=2,<4.4.50|>=5,<5.4.20|>=6,<6.0.20|>=6.1,<6.1.12|>=6.2,<6.2.6",
- "symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13",
- "symfony/maker-bundle": ">=1.27,<1.29.2|>=1.30,<1.31.1",
- "symfony/mime": ">=4.3,<4.3.8",
- "symfony/phpunit-bridge": ">=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7",
- "symfony/polyfill": ">=1,<1.10",
- "symfony/polyfill-php55": ">=1,<1.10",
- "symfony/proxy-manager-bridge": ">=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7",
- "symfony/routing": ">=2,<2.0.19",
- "symfony/security": ">=2,<2.7.51|>=2.8,<3.4.49|>=4,<4.4.24|>=5,<5.2.8",
- "symfony/security-bundle": ">=2,<4.4.50|>=5,<5.4.20|>=6,<6.0.20|>=6.1,<6.1.12|>=6.2,<6.2.6",
- "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<3.4.49|>=4,<4.4.24|>=5,<5.2.9",
- "symfony/security-csrf": ">=2.4,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11",
- "symfony/security-guard": ">=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8",
- "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7|>=5.1,<5.2.8|>=5.3,<5.3.2|>=5.4,<5.4.31|>=6,<6.3.8",
- "symfony/serializer": ">=2,<2.0.11|>=4.1,<4.4.35|>=5,<5.3.12",
- "symfony/symfony": ">=2,<4.4.51|>=5,<5.4.31|>=6,<6.3.8",
- "symfony/translation": ">=2,<2.0.17",
- "symfony/twig-bridge": ">=2,<4.4.51|>=5,<5.4.31|>=6,<6.3.8",
- "symfony/ux-autocomplete": "<2.11.2",
- "symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3",
- "symfony/var-exporter": ">=4.2,<4.2.12|>=4.3,<4.3.8",
- "symfony/web-profiler-bundle": ">=2,<2.3.19|>=2.4,<2.4.9|>=2.5,<2.5.4",
- "symfony/webhook": ">=6.3,<6.3.8",
- "symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7|>=2.2.0.0-beta1,<2.2.0.0-beta2",
- "symphonycms/symphony-2": "<2.6.4",
- "t3/dce": "<0.11.5|>=2.2,<2.6.2",
- "t3g/svg-sanitizer": "<1.0.3",
- "t3s/content-consent": "<1.0.3|>=2,<2.0.2",
- "tastyigniter/tastyigniter": "<3.3",
- "tcg/voyager": "<=1.4",
- "tecnickcom/tcpdf": "<6.2.22",
- "terminal42/contao-tablelookupwizard": "<3.3.5",
- "thelia/backoffice-default-template": ">=2.1,<2.1.2",
- "thelia/thelia": ">=2.1,<2.1.3",
- "theonedemon/phpwhois": "<=4.2.5",
- "thinkcmf/thinkcmf": "<=5.1.7",
- "thorsten/phpmyfaq": "<3.2.2",
- "tikiwiki/tiki-manager": "<=17.1",
- "tinymce/tinymce": "<5.10.9|>=6,<6.7.3",
- "tinymighty/wiki-seo": "<1.2.2",
- "titon/framework": "<9.9.99",
- "tobiasbg/tablepress": "<=2.0.0.0-RC1",
- "topthink/framework": "<6.0.14",
- "topthink/think": "<=6.1.1",
- "topthink/thinkphp": "<=3.2.3",
- "tpwd/ke_search": "<4.0.3|>=4.1,<4.6.6|>=5,<5.0.2",
- "tribalsystems/zenario": "<=9.4.59197",
- "truckersmp/phpwhois": "<=4.3.1",
- "ttskch/pagination-service-provider": "<1",
- "twig/twig": "<1.44.7|>=2,<2.15.3|>=3,<3.4.3",
- "typo3/cms": "<9.5.29|>=10,<10.4.35|>=11,<11.5.23|>=12,<12.2",
- "typo3/cms-backend": "<4.1.14|>=4.2,<4.2.15|>=4.3,<4.3.7|>=4.4,<4.4.4|>=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1",
- "typo3/cms-core": "<=8.7.56|>=9,<=9.5.45|>=10,<=10.4.42|>=11,<=11.5.34|>=12,<=12.4.10|==13",
- "typo3/cms-extbase": "<6.2.24|>=7,<7.6.8|==8.1.1",
- "typo3/cms-fluid": "<4.3.4|>=4.4,<4.4.1",
- "typo3/cms-form": ">=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1",
- "typo3/cms-frontend": "<4.3.9|>=4.4,<4.4.5",
- "typo3/cms-install": "<4.1.14|>=4.2,<4.2.16|>=4.3,<4.3.9|>=4.4,<4.4.5|>=12.2,<12.4.8",
- "typo3/cms-rte-ckeditor": ">=9.5,<9.5.42|>=10,<10.4.39|>=11,<11.5.30",
- "typo3/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6",
- "typo3/html-sanitizer": ">=1,<=1.5.2|>=2,<=2.1.3",
- "typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.3.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<3.3.23|>=4,<4.0.17|>=4.1,<4.1.16|>=4.2,<4.2.12|>=4.3,<4.3.3",
- "typo3/phar-stream-wrapper": ">=1,<2.1.1|>=3,<3.1.1",
- "typo3/swiftmailer": ">=4.1,<4.1.99|>=5.4,<5.4.5",
- "typo3fluid/fluid": ">=2,<2.0.8|>=2.1,<2.1.7|>=2.2,<2.2.4|>=2.3,<2.3.7|>=2.4,<2.4.4|>=2.5,<2.5.11|>=2.6,<2.6.10",
- "ua-parser/uap-php": "<3.8",
- "uasoft-indonesia/badaso": "<=2.9.7",
- "unisharp/laravel-filemanager": "<2.6.4",
- "userfrosting/userfrosting": ">=0.3.1,<4.6.3",
- "usmanhalalit/pixie": "<1.0.3|>=2,<2.0.2",
- "uvdesk/community-skeleton": "<=1.1.1",
- "vanilla/safecurl": "<0.9.2",
- "verot/class.upload.php": "<=2.1.6",
- "vova07/yii2-fileapi-widget": "<0.1.9",
- "vrana/adminer": "<4.8.1",
- "waldhacker/hcaptcha": "<2.1.2",
- "wallabag/tcpdf": "<6.2.22",
- "wallabag/wallabag": "<2.6.7",
- "wanglelecc/laracms": "<=1.0.3",
- "web-auth/webauthn-framework": ">=3.3,<3.3.4",
- "webbuilders-group/silverstripe-kapost-bridge": "<0.4",
- "webcoast/deferred-image-processing": "<1.0.2",
- "webklex/laravel-imap": "<5.3",
- "webklex/php-imap": "<5.3",
- "webpa/webpa": "<3.1.2",
- "wikibase/wikibase": "<=1.39.3",
- "wikimedia/parsoid": "<0.12.2",
- "willdurand/js-translation-bundle": "<2.1.1",
- "winter/wn-backend-module": "<1.2.4",
- "winter/wn-system-module": "<1.2.4",
- "wintercms/winter": "<1.2.3",
- "woocommerce/woocommerce": "<6.6",
- "wp-cli/wp-cli": ">=0.12,<2.5",
- "wp-graphql/wp-graphql": "<=1.14.5",
- "wpanel/wpanel4-cms": "<=4.3.1",
- "wpcloud/wp-stateless": "<3.2",
- "wwbn/avideo": "<=12.4",
- "xataface/xataface": "<3",
- "xpressengine/xpressengine": "<3.0.15",
- "yeswiki/yeswiki": "<4.1",
- "yetiforce/yetiforce-crm": "<=6.4",
- "yidashi/yii2cmf": "<=2",
- "yii2mod/yii2-cms": "<1.9.2",
- "yiisoft/yii": "<1.1.29",
- "yiisoft/yii2": "<2.0.38",
- "yiisoft/yii2-authclient": "<2.2.15",
- "yiisoft/yii2-bootstrap": "<2.0.4",
- "yiisoft/yii2-dev": "<2.0.43",
- "yiisoft/yii2-elasticsearch": "<2.0.5",
- "yiisoft/yii2-gii": "<=2.2.4",
- "yiisoft/yii2-jui": "<2.0.4",
- "yiisoft/yii2-redis": "<2.0.8",
- "yikesinc/yikes-inc-easy-mailchimp-extender": "<6.8.6",
- "yoast-seo-for-typo3/yoast_seo": "<7.2.3",
- "yourls/yourls": "<=1.8.2",
- "yuan1994/tpadmin": "<=1.3.12",
- "zencart/zencart": "<=1.5.7.0-beta",
- "zendesk/zendesk_api_client_php": "<2.2.11",
- "zendframework/zend-cache": ">=2.4,<2.4.8|>=2.5,<2.5.3",
- "zendframework/zend-captcha": ">=2,<2.4.9|>=2.5,<2.5.2",
- "zendframework/zend-crypt": ">=2,<2.4.9|>=2.5,<2.5.2",
- "zendframework/zend-db": "<2.2.10|>=2.3,<2.3.5",
- "zendframework/zend-developer-tools": ">=1.2.2,<1.2.3",
- "zendframework/zend-diactoros": "<1.8.4",
- "zendframework/zend-feed": "<2.10.3",
- "zendframework/zend-form": ">=2,<2.2.7|>=2.3,<2.3.1",
- "zendframework/zend-http": "<2.8.1",
- "zendframework/zend-json": ">=2.1,<2.1.6|>=2.2,<2.2.6",
- "zendframework/zend-ldap": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.8|>=2.3,<2.3.3",
- "zendframework/zend-mail": ">=2,<2.4.11|>=2.5,<2.7.2",
- "zendframework/zend-navigation": ">=2,<2.2.7|>=2.3,<2.3.1",
- "zendframework/zend-session": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.9|>=2.3,<2.3.4",
- "zendframework/zend-validator": ">=2.3,<2.3.6",
- "zendframework/zend-view": ">=2,<2.2.7|>=2.3,<2.3.1",
- "zendframework/zend-xmlrpc": ">=2.1,<2.1.6|>=2.2,<2.2.6",
- "zendframework/zendframework": "<=3",
- "zendframework/zendframework1": "<1.12.20",
- "zendframework/zendopenid": "<2.0.2",
- "zendframework/zendrest": "<2.0.2",
- "zendframework/zendservice-amazon": "<2.0.3",
- "zendframework/zendservice-api": "<1",
- "zendframework/zendservice-audioscrobbler": "<2.0.2",
- "zendframework/zendservice-nirvanix": "<2.0.2",
- "zendframework/zendservice-slideshare": "<2.0.2",
- "zendframework/zendservice-technorati": "<2.0.2",
- "zendframework/zendservice-windowsazure": "<2.0.2",
- "zendframework/zendxml": ">=1,<1.0.1",
- "zenstruck/collection": "<0.2.1",
- "zetacomponents/mail": "<1.8.2",
- "zf-commons/zfc-user": "<1.2.2",
- "zfcampus/zf-apigility-doctrine": ">=1,<1.0.3",
- "zfr/zfr-oauth2-server-module": "<0.1.2",
- "zoujingli/thinkadmin": "<=6.1.53"
- },
- "type": "metapackage",
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Marco Pivetta",
- "email": "ocramius@gmail.com",
- "role": "maintainer"
- },
- {
- "name": "Ilya Tribusean",
- "email": "slash3b@gmail.com",
- "role": "maintainer"
- }
- ],
- "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it",
- "keywords": [
- "dev"
- ],
- "support": {
- "issues": "https://github.com/Roave/SecurityAdvisories/issues",
- "source": "https://github.com/Roave/SecurityAdvisories/tree/latest"
- },
- "funding": [
- {
- "url": "https://github.com/Ocramius",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/roave/security-advisories",
- "type": "tidelift"
- }
- ],
- "time": "2024-02-19T06:05:04+00:00"
- },
- {
- "name": "scssphp/scssphp",
- "version": "v1.11.1",
- "source": {
- "type": "git",
- "url": "https://github.com/scssphp/scssphp.git",
- "reference": "ace2503684bab0dcc817d7614c8a54b865122414"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/scssphp/scssphp/zipball/ace2503684bab0dcc817d7614c8a54b865122414",
- "reference": "ace2503684bab0dcc817d7614c8a54b865122414",
- "shasum": ""
- },
- "require": {
- "ext-ctype": "*",
- "ext-json": "*",
- "php": ">=5.6.0"
- },
- "require-dev": {
- "bamarni/composer-bin-plugin": "^1.4",
- "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3 || ^9.4",
- "sass/sass-spec": "*",
- "squizlabs/php_codesniffer": "~3.5",
- "symfony/phpunit-bridge": "^5.1",
- "thoughtbot/bourbon": "^7.0",
- "twbs/bootstrap": "~5.0",
- "twbs/bootstrap4": "4.6.1",
- "zurb/foundation": "~6.7.0"
- },
- "suggest": {
- "ext-iconv": "Can be used as fallback when ext-mbstring is not available",
- "ext-mbstring": "For best performance, mbstring should be installed as it is faster than ext-iconv"
- },
- "bin": [
- "bin/pscss"
- ],
- "type": "library",
- "extra": {
- "bamarni-bin": {
- "forward-command": false,
- "bin-links": false
- }
- },
- "autoload": {
- "psr-4": {
- "ScssPhp\\ScssPhp\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Anthon Pang",
- "email": "apang@softwaredevelopment.ca",
- "homepage": "https://github.com/robocoder"
- },
- {
- "name": "Cédric Morin",
- "email": "cedric@yterium.com",
- "homepage": "https://github.com/Cerdic"
- }
- ],
- "description": "scssphp is a compiler for SCSS written in PHP.",
- "homepage": "http://scssphp.github.io/scssphp/",
- "keywords": [
- "css",
- "less",
- "sass",
- "scss",
- "stylesheet"
- ],
- "support": {
- "issues": "https://github.com/scssphp/scssphp/issues",
- "source": "https://github.com/scssphp/scssphp/tree/v1.11.1"
- },
- "time": "2023-09-24T13:38:17+00:00"
- },
- {
- "name": "sebastian/cli-parser",
- "version": "1.0.1",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/cli-parser.git",
- "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
- "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
- "shasum": ""
- },
- "require": {
- "php": ">=7.3"
- },
- "require-dev": {
- "phpunit/phpunit": "^9.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
- "description": "Library for parsing CLI options",
- "homepage": "https://github.com/sebastianbergmann/cli-parser",
- "support": {
- "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
- "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
- },
- "funding": [
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
- "time": "2020-09-28T06:08:49+00:00"
- },
- {
- "name": "sebastian/code-unit",
- "version": "1.0.8",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/code-unit.git",
- "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120",
- "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120",
- "shasum": ""
- },
- "require": {
- "php": ">=7.3"
- },
- "require-dev": {
- "phpunit/phpunit": "^9.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
- "description": "Collection of value objects that represent the PHP code units",
- "homepage": "https://github.com/sebastianbergmann/code-unit",
- "support": {
- "issues": "https://github.com/sebastianbergmann/code-unit/issues",
- "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
- },
- "funding": [
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
- "time": "2020-10-26T13:08:54+00:00"
- },
- {
- "name": "sebastian/code-unit-reverse-lookup",
- "version": "2.0.3",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
- "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
- "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
- "shasum": ""
- },
- "require": {
- "php": ">=7.3"
- },
- "require-dev": {
- "phpunit/phpunit": "^9.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.0-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
- "description": "Looks up which function or method a line of code belongs to",
- "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
- "support": {
- "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
- "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
- },
- "funding": [
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
- "time": "2020-09-28T05:30:19+00:00"
- },
- {
- "name": "sebastian/comparator",
- "version": "4.0.8",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "fa0f136dd2334583309d32b62544682ee972b51a"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a",
- "reference": "fa0f136dd2334583309d32b62544682ee972b51a",
- "shasum": ""
- },
- "require": {
- "php": ">=7.3",
- "sebastian/diff": "^4.0",
- "sebastian/exporter": "^4.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^9.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "4.0-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- },
- {
- "name": "Jeff Welch",
- "email": "whatthejeff@gmail.com"
- },
- {
- "name": "Volker Dusch",
- "email": "github@wallbash.com"
- },
- {
- "name": "Bernhard Schussek",
- "email": "bschussek@2bepublished.at"
- }
- ],
- "description": "Provides the functionality to compare PHP values for equality",
- "homepage": "https://github.com/sebastianbergmann/comparator",
- "keywords": [
- "comparator",
- "compare",
- "equality"
- ],
- "support": {
- "issues": "https://github.com/sebastianbergmann/comparator/issues",
- "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8"
- },
- "funding": [
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
- "time": "2022-09-14T12:41:17+00:00"
- },
- {
- "name": "sebastian/complexity",
- "version": "2.0.3",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/complexity.git",
- "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a",
- "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a",
- "shasum": ""
- },
- "require": {
- "nikic/php-parser": "^4.18 || ^5.0",
- "php": ">=7.3"
- },
- "require-dev": {
- "phpunit/phpunit": "^9.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.0-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
- "description": "Library for calculating the complexity of PHP code units",
- "homepage": "https://github.com/sebastianbergmann/complexity",
- "support": {
- "issues": "https://github.com/sebastianbergmann/complexity/issues",
- "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3"
- },
- "funding": [
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
- "time": "2023-12-22T06:19:30+00:00"
- },
- {
- "name": "sebastian/diff",
- "version": "4.0.5",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/diff.git",
- "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
- "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
- "shasum": ""
- },
- "require": {
- "php": ">=7.3"
- },
- "require-dev": {
- "phpunit/phpunit": "^9.3",
- "symfony/process": "^4.2 || ^5"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "4.0-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- },
- {
- "name": "Kore Nordmann",
- "email": "mail@kore-nordmann.de"
- }
- ],
- "description": "Diff implementation",
- "homepage": "https://github.com/sebastianbergmann/diff",
- "keywords": [
- "diff",
- "udiff",
- "unidiff",
- "unified diff"
- ],
- "support": {
- "issues": "https://github.com/sebastianbergmann/diff/issues",
- "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5"
- },
- "funding": [
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
- "time": "2023-05-07T05:35:17+00:00"
- },
- {
- "name": "sebastian/environment",
- "version": "5.1.5",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
- "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
- "shasum": ""
- },
- "require": {
- "php": ">=7.3"
- },
- "require-dev": {
- "phpunit/phpunit": "^9.3"
- },
- "suggest": {
- "ext-posix": "*"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "5.1-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
- "description": "Provides functionality to handle HHVM/PHP environments",
- "homepage": "http://www.github.com/sebastianbergmann/environment",
- "keywords": [
- "Xdebug",
- "environment",
- "hhvm"
- ],
- "support": {
- "issues": "https://github.com/sebastianbergmann/environment/issues",
- "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5"
- },
- "funding": [
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
- "time": "2023-02-03T06:03:51+00:00"
- },
- {
- "name": "sebastian/exporter",
- "version": "4.0.5",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/exporter.git",
- "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
- "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
- "shasum": ""
- },
- "require": {
- "php": ">=7.3",
- "sebastian/recursion-context": "^4.0"
- },
- "require-dev": {
- "ext-mbstring": "*",
- "phpunit/phpunit": "^9.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "4.0-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- },
- {
- "name": "Jeff Welch",
- "email": "whatthejeff@gmail.com"
- },
- {
- "name": "Volker Dusch",
- "email": "github@wallbash.com"
- },
- {
- "name": "Adam Harvey",
- "email": "aharvey@php.net"
- },
- {
- "name": "Bernhard Schussek",
- "email": "bschussek@gmail.com"
- }
- ],
- "description": "Provides the functionality to export PHP variables for visualization",
- "homepage": "https://www.github.com/sebastianbergmann/exporter",
- "keywords": [
- "export",
- "exporter"
- ],
- "support": {
- "issues": "https://github.com/sebastianbergmann/exporter/issues",
- "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5"
- },
- "funding": [
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
- "time": "2022-09-14T06:03:37+00:00"
- },
- {
- "name": "sebastian/global-state",
- "version": "5.0.6",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/global-state.git",
- "reference": "bde739e7565280bda77be70044ac1047bc007e34"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34",
- "reference": "bde739e7565280bda77be70044ac1047bc007e34",
- "shasum": ""
- },
- "require": {
- "php": ">=7.3",
- "sebastian/object-reflector": "^2.0",
- "sebastian/recursion-context": "^4.0"
- },
- "require-dev": {
- "ext-dom": "*",
- "phpunit/phpunit": "^9.3"
- },
- "suggest": {
- "ext-uopz": "*"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "5.0-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
- "description": "Snapshotting of global state",
- "homepage": "http://www.github.com/sebastianbergmann/global-state",
- "keywords": [
- "global state"
- ],
- "support": {
- "issues": "https://github.com/sebastianbergmann/global-state/issues",
- "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6"
- },
- "funding": [
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
- "time": "2023-08-02T09:26:13+00:00"
- },
- {
- "name": "sebastian/lines-of-code",
- "version": "1.0.4",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/lines-of-code.git",
- "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5",
- "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5",
- "shasum": ""
- },
- "require": {
- "nikic/php-parser": "^4.18 || ^5.0",
- "php": ">=7.3"
- },
- "require-dev": {
- "phpunit/phpunit": "^9.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
- "description": "Library for counting the lines of code in PHP source code",
- "homepage": "https://github.com/sebastianbergmann/lines-of-code",
- "support": {
- "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
- "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4"
- },
- "funding": [
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
- "time": "2023-12-22T06:20:34+00:00"
- },
- {
- "name": "sebastian/object-enumerator",
- "version": "4.0.4",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/object-enumerator.git",
- "reference": "5c9eeac41b290a3712d88851518825ad78f45c71"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71",
- "reference": "5c9eeac41b290a3712d88851518825ad78f45c71",
- "shasum": ""
- },
- "require": {
- "php": ">=7.3",
- "sebastian/object-reflector": "^2.0",
- "sebastian/recursion-context": "^4.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^9.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "4.0-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
- "description": "Traverses array structures and object graphs to enumerate all referenced objects",
- "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
- "support": {
- "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
- "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
- },
- "funding": [
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
- "time": "2020-10-26T13:12:34+00:00"
- },
- {
- "name": "sebastian/object-reflector",
- "version": "2.0.4",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/object-reflector.git",
- "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
- "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
- "shasum": ""
- },
- "require": {
- "php": ">=7.3"
- },
- "require-dev": {
- "phpunit/phpunit": "^9.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.0-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
- "description": "Allows reflection of object attributes, including inherited and non-public ones",
- "homepage": "https://github.com/sebastianbergmann/object-reflector/",
- "support": {
- "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
- "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
- },
- "funding": [
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
- "time": "2020-10-26T13:14:26+00:00"
- },
- {
- "name": "sebastian/recursion-context",
- "version": "4.0.5",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/recursion-context.git",
- "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
- "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
- "shasum": ""
- },
- "require": {
- "php": ">=7.3"
- },
- "require-dev": {
- "phpunit/phpunit": "^9.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "4.0-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- },
- {
- "name": "Jeff Welch",
- "email": "whatthejeff@gmail.com"
- },
- {
- "name": "Adam Harvey",
- "email": "aharvey@php.net"
- }
- ],
- "description": "Provides functionality to recursively process PHP variables",
- "homepage": "https://github.com/sebastianbergmann/recursion-context",
- "support": {
- "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
- "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5"
- },
- "funding": [
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
- "time": "2023-02-03T06:07:39+00:00"
- },
- {
- "name": "sebastian/resource-operations",
- "version": "3.0.3",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/resource-operations.git",
- "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
- "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
- "shasum": ""
- },
- "require": {
- "php": ">=7.3"
- },
- "require-dev": {
- "phpunit/phpunit": "^9.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.0-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
- }
- ],
- "description": "Provides a list of PHP built-in functions that operate on resources",
- "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
- "support": {
- "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
- "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
- },
- "funding": [
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
- "time": "2020-09-28T06:45:17+00:00"
- },
- {
- "name": "sebastian/type",
- "version": "3.2.1",
- "source": {
- "type": "git",
- "url": "https://github.com/sebastianbergmann/type.git",
- "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
- "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
- "shasum": ""
- },
- "require": {
- "php": ">=7.3"
- },
- "require-dev": {
- "phpunit/phpunit": "^9.5"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.2-dev"
- }
- },
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de",
- "role": "lead"
- }
- ],
- "description": "Collection of value objects that represent the types of the PHP type system",
- "homepage": "https://github.com/sebastianbergmann/type",
- "support": {
- "issues": "https://github.com/sebastianbergmann/type/issues",
- "source": "https://github.com/sebastianbergmann/type/tree/3.2.1"
- },
- "funding": [
- {
- "url": "https://github.com/sebastianbergmann",
- "type": "github"
- }
- ],
- "time": "2023-02-03T06:13:03+00:00"
- },
- {
- "name": "siad007/versioncontrol_hg",
- "version": "v1.0.3",
- "source": {
- "type": "git",
- "url": "https://github.com/siad007/versioncontrol_hg.git",
- "reference": "bdeb5515f14a6ccd1abdc69e8d0c9e8e0bb75ec3"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/siad007/versioncontrol_hg/zipball/bdeb5515f14a6ccd1abdc69e8d0c9e8e0bb75ec3",
- "reference": "bdeb5515f14a6ccd1abdc69e8d0c9e8e0bb75ec3",
- "shasum": ""
- },
- "require": {
- "php": ">=5.4"
- },
- "require-dev": {
- "codeclimate/php-test-reporter": "dev-master",
- "mehr-als-nix/assumptions": "~1",
- "phpunit/phpunit": "~4"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Siad007\\VersionControl\\HG\\": "src",
- "Siad007\\VersionControl\\HG\\Tests\\": "tests"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Siad Ardroumli",
- "email": "siad.ardroumli@gmail.com",
- "role": "Lead"
- }
- ],
- "description": "VersionControl_HG is a library that provides an OO interface to handle Mercurial repositories.",
- "support": {
- "issues": "https://github.com/siad007/versioncontrol_hg/issues",
- "source": "https://github.com/siad007/versioncontrol_hg/tree/v1.0.3"
- },
- "time": "2021-01-22T20:43:06+00:00"
- },
- {
- "name": "smarty/smarty",
- "version": "v3.1.48",
- "source": {
- "type": "git",
- "url": "https://github.com/smarty-php/smarty.git",
- "reference": "2fc443806cdcaee4441be4d0bb09f8fa56a17f2c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/smarty-php/smarty/zipball/2fc443806cdcaee4441be4d0bb09f8fa56a17f2c",
- "reference": "2fc443806cdcaee4441be4d0bb09f8fa56a17f2c",
- "shasum": ""
- },
- "require": {
- "php": "^5.2 || ^7.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^7.5 || ^6.5 || ^5.7 || ^4.8",
- "smarty/smarty-lexer": "^3.1"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.1.x-dev"
- }
- },
- "autoload": {
- "classmap": [
- "libs/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "LGPL-3.0"
- ],
- "authors": [
- {
- "name": "Monte Ohrt",
- "email": "monte@ohrt.com"
- },
- {
- "name": "Uwe Tews",
- "email": "uwe.tews@googlemail.com"
- },
- {
- "name": "Rodney Rehm",
- "email": "rodney.rehm@medialize.de"
- }
- ],
- "description": "Smarty - the compiling PHP template engine",
- "homepage": "http://www.smarty.net",
- "keywords": [
- "templating"
- ],
- "support": {
- "forum": "http://www.smarty.net/forums/",
- "irc": "irc://irc.freenode.org/smarty",
- "issues": "https://github.com/smarty-php/smarty/issues",
- "source": "https://github.com/smarty-php/smarty/tree/v3.1.48"
- },
- "time": "2023-03-28T19:45:54+00:00"
- },
- {
- "name": "squizlabs/php_codesniffer",
- "version": "3.9.0",
- "source": {
- "type": "git",
- "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
- "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
- "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
- "shasum": ""
- },
- "require": {
- "ext-simplexml": "*",
- "ext-tokenizer": "*",
- "ext-xmlwriter": "*",
- "php": ">=5.4.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
- },
- "bin": [
- "bin/phpcbf",
- "bin/phpcs"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.x-dev"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Greg Sherwood",
- "role": "Former lead"
- },
- {
- "name": "Juliette Reinders Folmer",
- "role": "Current lead"
- },
- {
- "name": "Contributors",
- "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors"
- }
- ],
- "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
- "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
- "keywords": [
- "phpcs",
- "standards",
- "static analysis"
- ],
- "support": {
- "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues",
- "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy",
- "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
- "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki"
- },
- "funding": [
- {
- "url": "https://github.com/PHPCSStandards",
- "type": "github"
- },
- {
- "url": "https://github.com/jrfnl",
- "type": "github"
- },
- {
- "url": "https://opencollective.com/php_codesniffer",
- "type": "open_collective"
- }
- ],
- "time": "2024-02-16T15:06:51+00:00"
- },
- {
- "name": "symfony/config",
- "version": "v5.4.35",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/config.git",
- "reference": "6b763438a22a4f20885e994ad6702f6a3f25430e"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/config/zipball/6b763438a22a4f20885e994ad6702f6a3f25430e",
- "reference": "6b763438a22a4f20885e994ad6702f6a3f25430e",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2.5",
- "symfony/deprecation-contracts": "^2.1|^3",
- "symfony/filesystem": "^4.4|^5.0|^6.0",
- "symfony/polyfill-ctype": "~1.8",
- "symfony/polyfill-php80": "^1.16",
- "symfony/polyfill-php81": "^1.22"
- },
- "conflict": {
- "symfony/finder": "<4.4"
- },
- "require-dev": {
- "symfony/event-dispatcher": "^4.4|^5.0|^6.0",
- "symfony/finder": "^4.4|^5.0|^6.0",
- "symfony/messenger": "^4.4|^5.0|^6.0",
- "symfony/service-contracts": "^1.1|^2|^3",
- "symfony/yaml": "^4.4|^5.0|^6.0"
- },
- "suggest": {
- "symfony/yaml": "To use the yaml reference dumper"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\Config\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
- "homepage": "https://symfony.com",
- "support": {
- "source": "https://github.com/symfony/config/tree/v5.4.35"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2024-01-23T13:51:25+00:00"
- },
- {
- "name": "symfony/dependency-injection",
- "version": "v5.4.35",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/dependency-injection.git",
- "reference": "45474d527212ca67cdb93f6c5e6da68f4bc67118"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/45474d527212ca67cdb93f6c5e6da68f4bc67118",
- "reference": "45474d527212ca67cdb93f6c5e6da68f4bc67118",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2.5",
- "psr/container": "^1.1.1",
- "symfony/deprecation-contracts": "^2.1|^3",
- "symfony/polyfill-php80": "^1.16",
- "symfony/polyfill-php81": "^1.22",
- "symfony/service-contracts": "^1.1.6|^2"
- },
- "conflict": {
- "ext-psr": "<1.1|>=2",
- "symfony/config": "<5.3",
- "symfony/finder": "<4.4",
- "symfony/proxy-manager-bridge": "<4.4",
- "symfony/yaml": "<4.4.26"
- },
- "provide": {
- "psr/container-implementation": "1.0",
- "symfony/service-implementation": "1.0|2.0"
- },
- "require-dev": {
- "symfony/config": "^5.3|^6.0",
- "symfony/expression-language": "^4.4|^5.0|^6.0",
- "symfony/yaml": "^4.4.26|^5.0|^6.0"
- },
- "suggest": {
- "symfony/config": "",
- "symfony/expression-language": "For using expressions in service container configuration",
- "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required",
- "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
- "symfony/yaml": ""
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\DependencyInjection\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Allows you to standardize and centralize the way objects are constructed in your application",
- "homepage": "https://symfony.com",
- "support": {
- "source": "https://github.com/symfony/dependency-injection/tree/v5.4.35"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2024-01-29T20:37:36+00:00"
- },
- {
- "name": "symfony/event-dispatcher",
- "version": "v5.4.35",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "7a69a85c7ea5bdd1e875806a99c51a87d3a74b38"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7a69a85c7ea5bdd1e875806a99c51a87d3a74b38",
- "reference": "7a69a85c7ea5bdd1e875806a99c51a87d3a74b38",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2.5",
- "symfony/deprecation-contracts": "^2.1|^3",
- "symfony/event-dispatcher-contracts": "^2|^3",
- "symfony/polyfill-php80": "^1.16"
- },
- "conflict": {
- "symfony/dependency-injection": "<4.4"
- },
- "provide": {
- "psr/event-dispatcher-implementation": "1.0",
- "symfony/event-dispatcher-implementation": "2.0"
- },
- "require-dev": {
- "psr/log": "^1|^2|^3",
- "symfony/config": "^4.4|^5.0|^6.0",
- "symfony/dependency-injection": "^4.4|^5.0|^6.0",
- "symfony/error-handler": "^4.4|^5.0|^6.0",
- "symfony/expression-language": "^4.4|^5.0|^6.0",
- "symfony/http-foundation": "^4.4|^5.0|^6.0",
- "symfony/service-contracts": "^1.1|^2|^3",
- "symfony/stopwatch": "^4.4|^5.0|^6.0"
- },
- "suggest": {
- "symfony/dependency-injection": "",
- "symfony/http-kernel": ""
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\EventDispatcher\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
- "homepage": "https://symfony.com",
- "support": {
- "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.35"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2024-01-23T13:51:25+00:00"
- },
- {
- "name": "symfony/event-dispatcher-contracts",
- "version": "v2.5.2",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/event-dispatcher-contracts.git",
- "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1",
- "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2.5",
- "psr/event-dispatcher": "^1"
- },
- "suggest": {
- "symfony/event-dispatcher-implementation": ""
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "2.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Contracts\\EventDispatcher\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Generic abstractions related to dispatching event",
- "homepage": "https://symfony.com",
- "keywords": [
- "abstractions",
- "contracts",
- "decoupling",
- "interfaces",
- "interoperability",
- "standards"
- ],
- "support": {
- "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2022-01-02T09:53:40+00:00"
- },
- {
- "name": "symfony/filesystem",
- "version": "v5.4.35",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/filesystem.git",
- "reference": "5a553607d4ffbfa9c0ab62facadea296c9db7086"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/5a553607d4ffbfa9c0ab62facadea296c9db7086",
- "reference": "5a553607d4ffbfa9c0ab62facadea296c9db7086",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2.5",
- "symfony/polyfill-ctype": "~1.8",
- "symfony/polyfill-mbstring": "~1.8",
- "symfony/polyfill-php80": "^1.16"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\Filesystem\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Provides basic utilities for the filesystem",
- "homepage": "https://symfony.com",
- "support": {
- "source": "https://github.com/symfony/filesystem/tree/v5.4.35"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2024-01-23T13:51:25+00:00"
- },
- {
- "name": "symfony/finder",
- "version": "v5.4.35",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/finder.git",
- "reference": "abe6d6f77d9465fed3cd2d029b29d03b56b56435"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/abe6d6f77d9465fed3cd2d029b29d03b56b56435",
- "reference": "abe6d6f77d9465fed3cd2d029b29d03b56b56435",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2.5",
- "symfony/deprecation-contracts": "^2.1|^3",
- "symfony/polyfill-php80": "^1.16"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\Finder\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Finds files and directories via an intuitive fluent interface",
- "homepage": "https://symfony.com",
- "support": {
- "source": "https://github.com/symfony/finder/tree/v5.4.35"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2024-01-23T13:51:25+00:00"
- },
- {
- "name": "symfony/options-resolver",
- "version": "v5.4.21",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/options-resolver.git",
- "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9",
- "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2.5",
- "symfony/deprecation-contracts": "^2.1|^3",
- "symfony/polyfill-php73": "~1.0",
- "symfony/polyfill-php80": "^1.16"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\OptionsResolver\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Provides an improved replacement for the array_replace PHP function",
- "homepage": "https://symfony.com",
- "keywords": [
- "config",
- "configuration",
- "options"
- ],
- "support": {
- "source": "https://github.com/symfony/options-resolver/tree/v5.4.21"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2023-02-14T08:03:56+00:00"
- },
- {
- "name": "symfony/polyfill-php81",
- "version": "v1.29.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php81.git",
- "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d",
- "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d",
- "shasum": ""
- },
- "require": {
- "php": ">=7.1"
- },
- "type": "library",
- "extra": {
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
- }
- },
- "autoload": {
- "files": [
- "bootstrap.php"
- ],
- "psr-4": {
- "Symfony\\Polyfill\\Php81\\": ""
- },
- "classmap": [
- "Resources/stubs"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "shim"
- ],
- "support": {
- "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2024-01-29T20:11:03+00:00"
- },
- {
- "name": "symfony/process",
- "version": "v5.4.35",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/process.git",
- "reference": "cbc28e34015ad50166fc2f9c8962d28d0fe861eb"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/cbc28e34015ad50166fc2f9c8962d28d0fe861eb",
- "reference": "cbc28e34015ad50166fc2f9c8962d28d0fe861eb",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2.5",
- "symfony/polyfill-php80": "^1.16"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\Process\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Executes commands in sub-processes",
- "homepage": "https://symfony.com",
- "support": {
- "source": "https://github.com/symfony/process/tree/v5.4.35"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2024-01-23T13:51:25+00:00"
- },
- {
- "name": "symfony/stopwatch",
- "version": "v5.4.35",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/stopwatch.git",
- "reference": "887762aa99ff16f65dc8b48aafead415f942d407"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/stopwatch/zipball/887762aa99ff16f65dc8b48aafead415f942d407",
- "reference": "887762aa99ff16f65dc8b48aafead415f942d407",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2.5",
- "symfony/service-contracts": "^1|^2|^3"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\Stopwatch\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Provides a way to profile code",
- "homepage": "https://symfony.com",
- "support": {
- "source": "https://github.com/symfony/stopwatch/tree/v5.4.35"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2024-01-23T13:51:25+00:00"
- },
- {
- "name": "symplify/monorepo-builder",
- "version": "11.2.20",
- "source": {
- "type": "git",
- "url": "https://github.com/symplify/monorepo-builder.git",
- "reference": "444efe08701776cb1a03b9f3600e715697519aa6"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symplify/monorepo-builder/zipball/444efe08701776cb1a03b9f3600e715697519aa6",
- "reference": "444efe08701776cb1a03b9f3600e715697519aa6",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2"
- },
- "bin": [
- "bin/monorepo-builder"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "10.3-dev"
- }
- },
- "autoload": {
- "files": [
- "bootstrap.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "description": "Prefixed version of Not only Composer tools to build a Monorepo.",
- "support": {
- "issues": "https://github.com/symplify/monorepo-builder/issues",
- "source": "https://github.com/symplify/monorepo-builder/tree/11.2.20"
- },
- "funding": [
- {
- "url": "https://www.paypal.me/rectorphp",
- "type": "custom"
- },
- {
- "url": "https://github.com/tomasvotruba",
- "type": "github"
- }
- ],
- "time": "2023-11-17T08:30:16+00:00"
- },
- {
- "name": "tedivm/jshrink",
- "version": "v1.7.0",
- "source": {
- "type": "git",
- "url": "https://github.com/tedious/JShrink.git",
- "reference": "7a35f5a4651ca2ce77295eb8a3b4e133ba47e19e"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/tedious/JShrink/zipball/7a35f5a4651ca2ce77295eb8a3b4e133ba47e19e",
- "reference": "7a35f5a4651ca2ce77295eb8a3b4e133ba47e19e",
- "shasum": ""
- },
- "require": {
- "php": "^7.0|^8.0"
- },
- "require-dev": {
- "friendsofphp/php-cs-fixer": "^3.14",
- "php-coveralls/php-coveralls": "^2.5.0",
- "phpunit/phpunit": "^9|^10"
- },
- "type": "library",
- "autoload": {
- "psr-0": {
- "JShrink": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Robert Hafner",
- "email": "tedivm@tedivm.com"
- }
- ],
- "description": "Javascript Minifier built in PHP",
- "homepage": "http://github.com/tedious/JShrink",
- "keywords": [
- "javascript",
- "minifier"
- ],
- "support": {
- "issues": "https://github.com/tedious/JShrink/issues",
- "source": "https://github.com/tedious/JShrink/tree/v1.7.0"
- },
- "funding": [
- {
- "url": "https://github.com/tedivm",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/tedivm/jshrink",
- "type": "tidelift"
- }
- ],
- "time": "2023-10-04T17:23:23+00:00"
- },
- {
- "name": "theseer/tokenizer",
- "version": "1.2.2",
- "source": {
- "type": "git",
- "url": "https://github.com/theseer/tokenizer.git",
- "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
- "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
- "shasum": ""
- },
- "require": {
- "ext-dom": "*",
- "ext-tokenizer": "*",
- "ext-xmlwriter": "*",
- "php": "^7.2 || ^8.0"
- },
- "type": "library",
- "autoload": {
- "classmap": [
- "src/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Arne Blankerts",
- "email": "arne@blankerts.de",
- "role": "Developer"
- }
- ],
- "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
- "support": {
- "issues": "https://github.com/theseer/tokenizer/issues",
- "source": "https://github.com/theseer/tokenizer/tree/1.2.2"
- },
- "funding": [
- {
- "url": "https://github.com/theseer",
- "type": "github"
- }
- ],
- "time": "2023-11-20T00:12:19+00:00"
- }
- ],
- "aliases": [],
- "minimum-stability": "stable",
- "stability-flags": {
- "mikey179/vfsstream": 20,
- "pear/net_ftp": 20,
- "pear/net_growl": 20,
- "pear/versioncontrol_git": 20,
- "phing/phing-composer-configurator": 20,
- "roave/security-advisories": 20
- },
- "prefer-stable": true,
- "prefer-lowest": false,
- "platform": {
- "php": ">= 7.4",
- "ext-dom": "*",
- "ext-json": "*",
- "ext-libxml": "*",
- "ext-simplexml": "*",
- "ext-xml": "*"
- },
- "platform-dev": {
- "ext-curl": "*",
- "ext-iconv": "*",
- "ext-openssl": "*",
- "ext-pdo_sqlite": "*",
- "ext-phar": "*",
- "ext-sockets": "*",
- "ext-xsl": "*",
- "ext-zip": "*"
- },
- "platform-overrides": {
- "php": "7.4"
- },
- "plugin-api-version": "2.6.0"
-}
diff --git a/pkgs/development/php-packages/phing/default.nix b/pkgs/development/php-packages/phing/default.nix
index dfda99220f9b..de9de209f1ba 100644
--- a/pkgs/development/php-packages/phing/default.nix
+++ b/pkgs/development/php-packages/phing/default.nix
@@ -1,28 +1,26 @@
{
lib,
- fetchFromGitHub,
+ fetchgit,
php,
}:
-(php.withExtensions ({ enabled, all }: enabled ++ (with all; [ xsl ]))).buildComposerProject
+(php.withExtensions ({ enabled, all }: enabled ++ (with all; [ xsl ]))).buildComposerProject2
(finalAttrs: {
pname = "phing";
- version = "3.0.0-rc6";
+ version = "3.0.0";
- src = fetchFromGitHub {
- owner = "phingofficial";
- repo = "phing";
- rev = finalAttrs.version;
- hash = "sha256-pOt6uQaz69WuHKYZhq6FFbjyHGrEc+Bf0Sw9uCS3Nrc=";
+ # Upstream no longer provides the composer.lock in their release artifact
+ src = fetchgit {
+ url = "https://github.com/phingofficial/phing";
+ rev = "refs/tags/${finalAttrs.version}";
+ hash = "sha256-PEJuEsVl6H4tdqOUvkuazVmyvsRvhBD5AA7EWkMHmFk=";
};
- # TODO: Open a PR against https://github.com/phingofficial/phing
- # Their `composer.lock` is out of date therefore, we need to provide one
- composerLock = ./composer.lock;
- vendorHash = "sha256-ueTbbz3FGyRcRvlcJNirHdC77Tko4RKtYMFB3+4JdnQ=";
+ vendorHash = "sha256-P829cADIJ5Hl5gHXbgTkpWHGF1pCtUKvx1GMrbPLkik=";
meta = {
description = "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant";
+ changelog = "https://github.com/phingofficial/phing/releases/tag/${finalAttrs.version}";
homepage = "https://github.com/phingofficial/phing";
license = lib.licenses.lgpl3;
mainProgram = "phing";
diff --git a/pkgs/development/php-packages/php-cs-fixer/composer.lock b/pkgs/development/php-packages/php-cs-fixer/composer.lock
index d33ffb2e20a7..8efc933a551d 100644
--- a/pkgs/development/php-packages/php-cs-fixer/composer.lock
+++ b/pkgs/development/php-packages/php-cs-fixer/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "787d06b680629dbd19e87f55f7aa69b5",
+ "content-hash": "be2f5ad8d4924b5a637b10da80386f8e",
"packages": [
{
"name": "clue/ndjson-react",
@@ -72,30 +72,38 @@
},
{
"name": "composer/pcre",
- "version": "3.1.4",
+ "version": "3.3.1",
"source": {
"type": "git",
"url": "https://github.com/composer/pcre.git",
- "reference": "04229f163664973f68f38f6f73d917799168ef24"
+ "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/pcre/zipball/04229f163664973f68f38f6f73d917799168ef24",
- "reference": "04229f163664973f68f38f6f73d917799168ef24",
+ "url": "https://api.github.com/repos/composer/pcre/zipball/63aaeac21d7e775ff9bc9d45021e1745c97521c4",
+ "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4",
"shasum": ""
},
"require": {
"php": "^7.4 || ^8.0"
},
+ "conflict": {
+ "phpstan/phpstan": "<1.11.10"
+ },
"require-dev": {
- "phpstan/phpstan": "^1.3",
+ "phpstan/phpstan": "^1.11.10",
"phpstan/phpstan-strict-rules": "^1.1",
- "symfony/phpunit-bridge": "^5"
+ "phpunit/phpunit": "^8 || ^9"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "3.x-dev"
+ },
+ "phpstan": {
+ "includes": [
+ "extension.neon"
+ ]
}
},
"autoload": {
@@ -123,7 +131,7 @@
],
"support": {
"issues": "https://github.com/composer/pcre/issues",
- "source": "https://github.com/composer/pcre/tree/3.1.4"
+ "source": "https://github.com/composer/pcre/tree/3.3.1"
},
"funding": [
{
@@ -139,28 +147,28 @@
"type": "tidelift"
}
],
- "time": "2024-05-27T13:40:54+00:00"
+ "time": "2024-08-27T18:44:43+00:00"
},
{
"name": "composer/semver",
- "version": "3.4.0",
+ "version": "3.4.3",
"source": {
"type": "git",
"url": "https://github.com/composer/semver.git",
- "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32"
+ "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32",
- "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32",
+ "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12",
+ "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12",
"shasum": ""
},
"require": {
"php": "^5.3.2 || ^7.0 || ^8.0"
},
"require-dev": {
- "phpstan/phpstan": "^1.4",
- "symfony/phpunit-bridge": "^4.2 || ^5"
+ "phpstan/phpstan": "^1.11",
+ "symfony/phpunit-bridge": "^3 || ^7"
},
"type": "library",
"extra": {
@@ -204,7 +212,7 @@
"support": {
"irc": "ircs://irc.libera.chat:6697/composer",
"issues": "https://github.com/composer/semver/issues",
- "source": "https://github.com/composer/semver/tree/3.4.0"
+ "source": "https://github.com/composer/semver/tree/3.4.3"
},
"funding": [
{
@@ -220,7 +228,7 @@
"type": "tidelift"
}
],
- "time": "2023-08-31T09:50:34+00:00"
+ "time": "2024-09-19T14:15:21+00:00"
},
{
"name": "composer/xdebug-handler",
@@ -337,16 +345,16 @@
},
{
"name": "fidry/cpu-core-counter",
- "version": "1.1.0",
+ "version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/theofidry/cpu-core-counter.git",
- "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42"
+ "reference": "8520451a140d3f46ac33042715115e290cf5785f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/f92996c4d5c1a696a6a970e20f7c4216200fcc42",
- "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42",
+ "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/8520451a140d3f46ac33042715115e290cf5785f",
+ "reference": "8520451a140d3f46ac33042715115e290cf5785f",
"shasum": ""
},
"require": {
@@ -386,7 +394,7 @@
],
"support": {
"issues": "https://github.com/theofidry/cpu-core-counter/issues",
- "source": "https://github.com/theofidry/cpu-core-counter/tree/1.1.0"
+ "source": "https://github.com/theofidry/cpu-core-counter/tree/1.2.0"
},
"funding": [
{
@@ -394,7 +402,7 @@
"type": "github"
}
],
- "time": "2024-02-07T09:43:46+00:00"
+ "time": "2024-08-06T10:04:20+00:00"
},
{
"name": "psr/container",
@@ -702,28 +710,28 @@
},
{
"name": "react/dns",
- "version": "v1.12.0",
+ "version": "v1.13.0",
"source": {
"type": "git",
"url": "https://github.com/reactphp/dns.git",
- "reference": "c134600642fa615b46b41237ef243daa65bb64ec"
+ "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/reactphp/dns/zipball/c134600642fa615b46b41237ef243daa65bb64ec",
- "reference": "c134600642fa615b46b41237ef243daa65bb64ec",
+ "url": "https://api.github.com/repos/reactphp/dns/zipball/eb8ae001b5a455665c89c1df97f6fb682f8fb0f5",
+ "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5",
"shasum": ""
},
"require": {
"php": ">=5.3.0",
"react/cache": "^1.0 || ^0.6 || ^0.5",
"react/event-loop": "^1.2",
- "react/promise": "^3.0 || ^2.7 || ^1.2.1"
+ "react/promise": "^3.2 || ^2.7 || ^1.2.1"
},
"require-dev": {
"phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
- "react/async": "^4 || ^3 || ^2",
- "react/promise-timer": "^1.9"
+ "react/async": "^4.3 || ^3 || ^2",
+ "react/promise-timer": "^1.11"
},
"type": "library",
"autoload": {
@@ -766,7 +774,7 @@
],
"support": {
"issues": "https://github.com/reactphp/dns/issues",
- "source": "https://github.com/reactphp/dns/tree/v1.12.0"
+ "source": "https://github.com/reactphp/dns/tree/v1.13.0"
},
"funding": [
{
@@ -774,7 +782,7 @@
"type": "open_collective"
}
],
- "time": "2023-11-29T12:41:06+00:00"
+ "time": "2024-06-13T14:18:03+00:00"
},
{
"name": "react/event-loop",
@@ -923,31 +931,31 @@
},
{
"name": "react/socket",
- "version": "v1.15.0",
+ "version": "v1.16.0",
"source": {
"type": "git",
"url": "https://github.com/reactphp/socket.git",
- "reference": "216d3aec0b87f04a40ca04f481e6af01bdd1d038"
+ "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/reactphp/socket/zipball/216d3aec0b87f04a40ca04f481e6af01bdd1d038",
- "reference": "216d3aec0b87f04a40ca04f481e6af01bdd1d038",
+ "url": "https://api.github.com/repos/reactphp/socket/zipball/23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1",
+ "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1",
"shasum": ""
},
"require": {
"evenement/evenement": "^3.0 || ^2.0 || ^1.0",
"php": ">=5.3.0",
- "react/dns": "^1.11",
+ "react/dns": "^1.13",
"react/event-loop": "^1.2",
- "react/promise": "^3 || ^2.6 || ^1.2.1",
- "react/stream": "^1.2"
+ "react/promise": "^3.2 || ^2.6 || ^1.2.1",
+ "react/stream": "^1.4"
},
"require-dev": {
"phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
- "react/async": "^4 || ^3 || ^2",
+ "react/async": "^4.3 || ^3.3 || ^2",
"react/promise-stream": "^1.4",
- "react/promise-timer": "^1.10"
+ "react/promise-timer": "^1.11"
},
"type": "library",
"autoload": {
@@ -991,7 +999,7 @@
],
"support": {
"issues": "https://github.com/reactphp/socket/issues",
- "source": "https://github.com/reactphp/socket/tree/v1.15.0"
+ "source": "https://github.com/reactphp/socket/tree/v1.16.0"
},
"funding": [
{
@@ -999,20 +1007,20 @@
"type": "open_collective"
}
],
- "time": "2023-12-15T11:02:10+00:00"
+ "time": "2024-07-26T10:38:09+00:00"
},
{
"name": "react/stream",
- "version": "v1.3.0",
+ "version": "v1.4.0",
"source": {
"type": "git",
"url": "https://github.com/reactphp/stream.git",
- "reference": "6fbc9672905c7d5a885f2da2fc696f65840f4a66"
+ "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/reactphp/stream/zipball/6fbc9672905c7d5a885f2da2fc696f65840f4a66",
- "reference": "6fbc9672905c7d5a885f2da2fc696f65840f4a66",
+ "url": "https://api.github.com/repos/reactphp/stream/zipball/1e5b0acb8fe55143b5b426817155190eb6f5b18d",
+ "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d",
"shasum": ""
},
"require": {
@@ -1022,7 +1030,7 @@
},
"require-dev": {
"clue/stream-filter": "~1.2",
- "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35"
+ "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
},
"type": "library",
"autoload": {
@@ -1069,7 +1077,7 @@
],
"support": {
"issues": "https://github.com/reactphp/stream/issues",
- "source": "https://github.com/reactphp/stream/tree/v1.3.0"
+ "source": "https://github.com/reactphp/stream/tree/v1.4.0"
},
"funding": [
{
@@ -1077,33 +1085,33 @@
"type": "open_collective"
}
],
- "time": "2023-06-16T10:52:11+00:00"
+ "time": "2024-06-11T12:45:25+00:00"
},
{
"name": "sebastian/diff",
- "version": "5.1.1",
+ "version": "6.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
- "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e"
+ "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c41e007b4b62af48218231d6c2275e4c9b975b2e",
- "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e",
+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/b4ccd857127db5d41a5b676f24b51371d76d8544",
+ "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.2"
},
"require-dev": {
- "phpunit/phpunit": "^10.0",
- "symfony/process": "^6.4"
+ "phpunit/phpunit": "^11.0",
+ "symfony/process": "^4.2 || ^5"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "5.1-dev"
+ "dev-main": "6.0-dev"
}
},
"autoload": {
@@ -1136,7 +1144,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/diff/issues",
"security": "https://github.com/sebastianbergmann/diff/security/policy",
- "source": "https://github.com/sebastianbergmann/diff/tree/5.1.1"
+ "source": "https://github.com/sebastianbergmann/diff/tree/6.0.2"
},
"funding": [
{
@@ -1144,51 +1152,50 @@
"type": "github"
}
],
- "time": "2024-03-02T07:15:17+00:00"
+ "time": "2024-07-03T04:53:05+00:00"
},
{
"name": "symfony/console",
- "version": "v6.4.8",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "be5854cee0e8c7b110f00d695d11debdfa1a2a91"
+ "reference": "bb5192af6edc797cbab5c8e8ecfea2fe5f421e57"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/be5854cee0e8c7b110f00d695d11debdfa1a2a91",
- "reference": "be5854cee0e8c7b110f00d695d11debdfa1a2a91",
+ "url": "https://api.github.com/repos/symfony/console/zipball/bb5192af6edc797cbab5c8e8ecfea2fe5f421e57",
+ "reference": "bb5192af6edc797cbab5c8e8ecfea2fe5f421e57",
"shasum": ""
},
"require": {
- "php": ">=8.1",
- "symfony/deprecation-contracts": "^2.5|^3",
+ "php": ">=8.2",
"symfony/polyfill-mbstring": "~1.0",
"symfony/service-contracts": "^2.5|^3",
- "symfony/string": "^5.4|^6.0|^7.0"
+ "symfony/string": "^6.4|^7.0"
},
"conflict": {
- "symfony/dependency-injection": "<5.4",
- "symfony/dotenv": "<5.4",
- "symfony/event-dispatcher": "<5.4",
- "symfony/lock": "<5.4",
- "symfony/process": "<5.4"
+ "symfony/dependency-injection": "<6.4",
+ "symfony/dotenv": "<6.4",
+ "symfony/event-dispatcher": "<6.4",
+ "symfony/lock": "<6.4",
+ "symfony/process": "<6.4"
},
"provide": {
"psr/log-implementation": "1.0|2.0|3.0"
},
"require-dev": {
"psr/log": "^1|^2|^3",
- "symfony/config": "^5.4|^6.0|^7.0",
- "symfony/dependency-injection": "^5.4|^6.0|^7.0",
- "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+ "symfony/config": "^6.4|^7.0",
+ "symfony/dependency-injection": "^6.4|^7.0",
+ "symfony/event-dispatcher": "^6.4|^7.0",
"symfony/http-foundation": "^6.4|^7.0",
"symfony/http-kernel": "^6.4|^7.0",
- "symfony/lock": "^5.4|^6.0|^7.0",
- "symfony/messenger": "^5.4|^6.0|^7.0",
- "symfony/process": "^5.4|^6.0|^7.0",
- "symfony/stopwatch": "^5.4|^6.0|^7.0",
- "symfony/var-dumper": "^5.4|^6.0|^7.0"
+ "symfony/lock": "^6.4|^7.0",
+ "symfony/messenger": "^6.4|^7.0",
+ "symfony/process": "^6.4|^7.0",
+ "symfony/stopwatch": "^6.4|^7.0",
+ "symfony/var-dumper": "^6.4|^7.0"
},
"type": "library",
"autoload": {
@@ -1222,7 +1229,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v6.4.8"
+ "source": "https://github.com/symfony/console/tree/v7.1.6"
},
"funding": [
{
@@ -1238,7 +1245,7 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:49:08+00:00"
+ "time": "2024-10-09T08:46:59+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -1309,24 +1316,24 @@
},
{
"name": "symfony/event-dispatcher",
- "version": "v6.4.8",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "8d7507f02b06e06815e56bb39aa0128e3806208b"
+ "reference": "87254c78dd50721cfd015b62277a8281c5589702"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8d7507f02b06e06815e56bb39aa0128e3806208b",
- "reference": "8d7507f02b06e06815e56bb39aa0128e3806208b",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/87254c78dd50721cfd015b62277a8281c5589702",
+ "reference": "87254c78dd50721cfd015b62277a8281c5589702",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.2",
"symfony/event-dispatcher-contracts": "^2.5|^3"
},
"conflict": {
- "symfony/dependency-injection": "<5.4",
+ "symfony/dependency-injection": "<6.4",
"symfony/service-contracts": "<2.5"
},
"provide": {
@@ -1335,13 +1342,13 @@
},
"require-dev": {
"psr/log": "^1|^2|^3",
- "symfony/config": "^5.4|^6.0|^7.0",
- "symfony/dependency-injection": "^5.4|^6.0|^7.0",
- "symfony/error-handler": "^5.4|^6.0|^7.0",
- "symfony/expression-language": "^5.4|^6.0|^7.0",
- "symfony/http-foundation": "^5.4|^6.0|^7.0",
+ "symfony/config": "^6.4|^7.0",
+ "symfony/dependency-injection": "^6.4|^7.0",
+ "symfony/error-handler": "^6.4|^7.0",
+ "symfony/expression-language": "^6.4|^7.0",
+ "symfony/http-foundation": "^6.4|^7.0",
"symfony/service-contracts": "^2.5|^3",
- "symfony/stopwatch": "^5.4|^6.0|^7.0"
+ "symfony/stopwatch": "^6.4|^7.0"
},
"type": "library",
"autoload": {
@@ -1369,7 +1376,7 @@
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.8"
+ "source": "https://github.com/symfony/event-dispatcher/tree/v7.1.6"
},
"funding": [
{
@@ -1385,7 +1392,7 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:49:08+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
@@ -1465,25 +1472,25 @@
},
{
"name": "symfony/filesystem",
- "version": "v6.4.8",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "4d37529150e7081c51b3c5d5718c55a04a9503f3"
+ "reference": "c835867b3c62bb05c7fe3d637c871c7ae52024d4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/4d37529150e7081c51b3c5d5718c55a04a9503f3",
- "reference": "4d37529150e7081c51b3c5d5718c55a04a9503f3",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/c835867b3c62bb05c7fe3d637c871c7ae52024d4",
+ "reference": "c835867b3c62bb05c7fe3d637c871c7ae52024d4",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.2",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-mbstring": "~1.8"
},
"require-dev": {
- "symfony/process": "^5.4|^6.4|^7.0"
+ "symfony/process": "^6.4|^7.0"
},
"type": "library",
"autoload": {
@@ -1511,7 +1518,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/filesystem/tree/v6.4.8"
+ "source": "https://github.com/symfony/filesystem/tree/v7.1.6"
},
"funding": [
{
@@ -1527,27 +1534,27 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:49:08+00:00"
+ "time": "2024-10-25T15:11:02+00:00"
},
{
"name": "symfony/finder",
- "version": "v6.4.8",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "3ef977a43883215d560a2cecb82ec8e62131471c"
+ "reference": "2cb89664897be33f78c65d3d2845954c8d7a43b8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/3ef977a43883215d560a2cecb82ec8e62131471c",
- "reference": "3ef977a43883215d560a2cecb82ec8e62131471c",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/2cb89664897be33f78c65d3d2845954c8d7a43b8",
+ "reference": "2cb89664897be33f78c65d3d2845954c8d7a43b8",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.2"
},
"require-dev": {
- "symfony/filesystem": "^6.0|^7.0"
+ "symfony/filesystem": "^6.4|^7.0"
},
"type": "library",
"autoload": {
@@ -1575,7 +1582,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v6.4.8"
+ "source": "https://github.com/symfony/finder/tree/v7.1.6"
},
"funding": [
{
@@ -1591,24 +1598,24 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:49:08+00:00"
+ "time": "2024-10-01T08:31:23+00:00"
},
{
"name": "symfony/options-resolver",
- "version": "v6.4.8",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
- "reference": "22ab9e9101ab18de37839074f8a1197f55590c1b"
+ "reference": "85e95eeede2d41cd146146e98c9c81d9214cae85"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/options-resolver/zipball/22ab9e9101ab18de37839074f8a1197f55590c1b",
- "reference": "22ab9e9101ab18de37839074f8a1197f55590c1b",
+ "url": "https://api.github.com/repos/symfony/options-resolver/zipball/85e95eeede2d41cd146146e98c9c81d9214cae85",
+ "reference": "85e95eeede2d41cd146146e98c9c81d9214cae85",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.2",
"symfony/deprecation-contracts": "^2.5|^3"
},
"type": "library",
@@ -1642,7 +1649,7 @@
"options"
],
"support": {
- "source": "https://github.com/symfony/options-resolver/tree/v6.4.8"
+ "source": "https://github.com/symfony/options-resolver/tree/v7.1.6"
},
"funding": [
{
@@ -1658,24 +1665,24 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:49:08+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.29.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
+ "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
- "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+ "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"provide": {
"ext-ctype": "*"
@@ -1721,7 +1728,7 @@
"portable"
],
"support": {
- "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
},
"funding": [
{
@@ -1737,24 +1744,24 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-intl-grapheme",
- "version": "v1.29.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
- "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f"
+ "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f",
- "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
+ "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"suggest": {
"ext-intl": "For best performance"
@@ -1799,7 +1806,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0"
},
"funding": [
{
@@ -1815,24 +1822,24 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
- "version": "v1.29.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
- "reference": "bc45c394692b948b4d383a08d7753968bed9a83d"
+ "reference": "3833d7255cc303546435cb650316bff708a1c75c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
- "reference": "bc45c394692b948b4d383a08d7753968bed9a83d",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
+ "reference": "3833d7255cc303546435cb650316bff708a1c75c",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"suggest": {
"ext-intl": "For best performance"
@@ -1880,7 +1887,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0"
},
"funding": [
{
@@ -1896,24 +1903,24 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.29.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
+ "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
- "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
+ "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"provide": {
"ext-mbstring": "*"
@@ -1960,7 +1967,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
},
"funding": [
{
@@ -1976,24 +1983,24 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-php80",
- "version": "v1.29.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
- "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
+ "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
- "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+ "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
+ "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"type": "library",
"extra": {
@@ -2040,7 +2047,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0"
},
"funding": [
{
@@ -2056,24 +2063,24 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/polyfill-php81",
- "version": "v1.29.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php81.git",
- "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d"
+ "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d",
- "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d",
+ "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
+ "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": ">=7.2"
},
"type": "library",
"extra": {
@@ -2116,7 +2123,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0"
+ "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0"
},
"funding": [
{
@@ -2132,24 +2139,24 @@
"type": "tidelift"
}
],
- "time": "2024-01-29T20:11:03+00:00"
+ "time": "2024-09-09T11:45:10+00:00"
},
{
"name": "symfony/process",
- "version": "v6.4.8",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5"
+ "reference": "6aaa189ddb4ff6b5de8fa3210f2fb42c87b4d12e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/8d92dd79149f29e89ee0f480254db595f6a6a2c5",
- "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5",
+ "url": "https://api.github.com/repos/symfony/process/zipball/6aaa189ddb4ff6b5de8fa3210f2fb42c87b4d12e",
+ "reference": "6aaa189ddb4ff6b5de8fa3210f2fb42c87b4d12e",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.2"
},
"type": "library",
"autoload": {
@@ -2177,7 +2184,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/process/tree/v6.4.8"
+ "source": "https://github.com/symfony/process/tree/v7.1.6"
},
"funding": [
{
@@ -2193,7 +2200,7 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:49:08+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
"name": "symfony/service-contracts",
@@ -2280,20 +2287,20 @@
},
{
"name": "symfony/stopwatch",
- "version": "v6.4.8",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
- "reference": "63e069eb616049632cde9674c46957819454b8aa"
+ "reference": "8b4a434e6e7faf6adedffb48783a5c75409a1a05"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/stopwatch/zipball/63e069eb616049632cde9674c46957819454b8aa",
- "reference": "63e069eb616049632cde9674c46957819454b8aa",
+ "url": "https://api.github.com/repos/symfony/stopwatch/zipball/8b4a434e6e7faf6adedffb48783a5c75409a1a05",
+ "reference": "8b4a434e6e7faf6adedffb48783a5c75409a1a05",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.2",
"symfony/service-contracts": "^2.5|^3"
},
"type": "library",
@@ -2322,7 +2329,7 @@
"description": "Provides a way to profile code",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/stopwatch/tree/v6.4.8"
+ "source": "https://github.com/symfony/stopwatch/tree/v7.1.6"
},
"funding": [
{
@@ -2338,24 +2345,24 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:49:08+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
"name": "symfony/string",
- "version": "v6.4.8",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "a147c0f826c4a1f3afb763ab8e009e37c877a44d"
+ "reference": "61b72d66bf96c360a727ae6232df5ac83c71f626"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/a147c0f826c4a1f3afb763ab8e009e37c877a44d",
- "reference": "a147c0f826c4a1f3afb763ab8e009e37c877a44d",
+ "url": "https://api.github.com/repos/symfony/string/zipball/61b72d66bf96c360a727ae6232df5ac83c71f626",
+ "reference": "61b72d66bf96c360a727ae6232df5ac83c71f626",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.2",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-intl-grapheme": "~1.0",
"symfony/polyfill-intl-normalizer": "~1.0",
@@ -2365,11 +2372,12 @@
"symfony/translation-contracts": "<2.5"
},
"require-dev": {
- "symfony/error-handler": "^5.4|^6.0|^7.0",
- "symfony/http-client": "^5.4|^6.0|^7.0",
- "symfony/intl": "^6.2|^7.0",
+ "symfony/emoji": "^7.1",
+ "symfony/error-handler": "^6.4|^7.0",
+ "symfony/http-client": "^6.4|^7.0",
+ "symfony/intl": "^6.4|^7.0",
"symfony/translation-contracts": "^2.5|^3.0",
- "symfony/var-exporter": "^5.4|^6.0|^7.0"
+ "symfony/var-exporter": "^6.4|^7.0"
},
"type": "library",
"autoload": {
@@ -2408,7 +2416,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v6.4.8"
+ "source": "https://github.com/symfony/string/tree/v7.1.6"
},
"funding": [
{
@@ -2424,39 +2432,36 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:49:08+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
}
],
"packages-dev": [
{
"name": "colinodell/json5",
- "version": "v2.3.0",
+ "version": "v3.0.0",
"source": {
"type": "git",
"url": "https://github.com/colinodell/json5.git",
- "reference": "15b063f8cb5e6deb15f0cd39123264ec0d19c710"
+ "reference": "5724d21bc5c910c2560af1b8915f0cc0163579c8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/colinodell/json5/zipball/15b063f8cb5e6deb15f0cd39123264ec0d19c710",
- "reference": "15b063f8cb5e6deb15f0cd39123264ec0d19c710",
+ "url": "https://api.github.com/repos/colinodell/json5/zipball/5724d21bc5c910c2560af1b8915f0cc0163579c8",
+ "reference": "5724d21bc5c910c2560af1b8915f0cc0163579c8",
"shasum": ""
},
"require": {
"ext-json": "*",
"ext-mbstring": "*",
- "php": "^7.1.3|^8.0"
- },
- "conflict": {
- "scrutinizer/ocular": "1.7.*"
+ "php": "^8.0"
},
"require-dev": {
- "mikehaertl/php-shellcommand": "^1.2.5",
- "phpstan/phpstan": "^1.4",
- "scrutinizer/ocular": "^1.6",
- "squizlabs/php_codesniffer": "^2.3 || ^3.0",
- "symfony/finder": "^4.4|^5.4|^6.0",
- "symfony/phpunit-bridge": "^5.4|^6.0"
+ "mikehaertl/php-shellcommand": "^1.7.0",
+ "phpstan/phpstan": "^1.10.57",
+ "scrutinizer/ocular": "^1.9",
+ "squizlabs/php_codesniffer": "^3.8.1",
+ "symfony/finder": "^6.0|^7.0",
+ "symfony/phpunit-bridge": "^7.0.3"
},
"bin": [
"bin/json5"
@@ -2464,7 +2469,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.0-dev"
+ "dev-main": "4.0-dev"
}
},
"autoload": {
@@ -2497,7 +2502,7 @@
],
"support": {
"issues": "https://github.com/colinodell/json5/issues",
- "source": "https://github.com/colinodell/json5/tree/v2.3.0"
+ "source": "https://github.com/colinodell/json5/tree/v3.0.0"
},
"funding": [
{
@@ -2517,20 +2522,20 @@
"type": "patreon"
}
],
- "time": "2022-12-27T16:44:40+00:00"
+ "time": "2024-02-09T13:06:12+00:00"
},
{
"name": "facile-it/paraunit",
- "version": "2.3.3",
+ "version": "2.4.0",
"source": {
"type": "git",
"url": "https://github.com/facile-it/paraunit.git",
- "reference": "f43232db312b55f7f36f918cff4dc4e0b60b314f"
+ "reference": "032bb2d404e8449b672c489f826c207d6e52a282"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/facile-it/paraunit/zipball/f43232db312b55f7f36f918cff4dc4e0b60b314f",
- "reference": "f43232db312b55f7f36f918cff4dc4e0b60b314f",
+ "url": "https://api.github.com/repos/facile-it/paraunit/zipball/032bb2d404e8449b672c489f826c207d6e52a282",
+ "reference": "032bb2d404e8449b672c489f826c207d6e52a282",
"shasum": ""
},
"require": {
@@ -2538,8 +2543,8 @@
"ext-json": "*",
"jean85/pretty-package-versions": "^1.5.1||^2.0.1",
"php": "^8.1",
- "phpunit/php-code-coverage": "^10.0||11.0",
- "phpunit/php-file-iterator": "^4.0||5.0",
+ "phpunit/php-code-coverage": "^10.0||^11.0",
+ "phpunit/php-file-iterator": "^4.0||^5.0",
"phpunit/phpunit": "^10.5.4||^11.0",
"psr/event-dispatcher": "^1.0",
"symfony/console": "^4.4||^5.0||^6.0||^7.0",
@@ -2557,12 +2562,12 @@
"phpspec/prophecy": "dev-master as 1.19",
"phpspec/prophecy-phpunit": "dev-master#0604e27 as 2.2.1",
"phpstan/extension-installer": "^1.0",
- "phpstan/phpstan": "1.11.3",
+ "phpstan/phpstan": "1.12.4",
"phpstan/phpstan-phpunit": "^1.1",
"phpunit/php-invoker": "^4.0||^5.0",
"psalm/plugin-phpunit": "^0.19",
"psalm/plugin-symfony": "^5.0",
- "rector/rector": "1.1.0",
+ "rector/rector": "1.2.5",
"symfony/expression-language": "^4.4||^5.0||^6.0||^7.0",
"symfony/phpunit-bridge": "^6.4||^7.0",
"vimeo/psalm": "^5.5.0"
@@ -2608,28 +2613,28 @@
],
"support": {
"issues": "https://github.com/facile-it/paraunit/issues",
- "source": "https://github.com/facile-it/paraunit/tree/2.3.3"
+ "source": "https://github.com/facile-it/paraunit/tree/2.4.0"
},
- "time": "2024-06-06T12:44:27+00:00"
+ "time": "2024-09-25T13:11:25+00:00"
},
{
"name": "guzzlehttp/guzzle",
- "version": "7.8.1",
+ "version": "7.9.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
- "reference": "41042bc7ab002487b876a0683fc8dce04ddce104"
+ "reference": "d281ed313b989f213357e3be1a179f02196ac99b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104",
- "reference": "41042bc7ab002487b876a0683fc8dce04ddce104",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d281ed313b989f213357e3be1a179f02196ac99b",
+ "reference": "d281ed313b989f213357e3be1a179f02196ac99b",
"shasum": ""
},
"require": {
"ext-json": "*",
- "guzzlehttp/promises": "^1.5.3 || ^2.0.1",
- "guzzlehttp/psr7": "^1.9.1 || ^2.5.1",
+ "guzzlehttp/promises": "^1.5.3 || ^2.0.3",
+ "guzzlehttp/psr7": "^2.7.0",
"php": "^7.2.5 || ^8.0",
"psr/http-client": "^1.0",
"symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -2640,9 +2645,9 @@
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.2",
"ext-curl": "*",
- "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
+ "guzzle/client-integration-tests": "3.0.2",
"php-http/message-factory": "^1.1",
- "phpunit/phpunit": "^8.5.36 || ^9.6.15",
+ "phpunit/phpunit": "^8.5.39 || ^9.6.20",
"psr/log": "^1.1 || ^2.0 || ^3.0"
},
"suggest": {
@@ -2720,7 +2725,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
- "source": "https://github.com/guzzle/guzzle/tree/7.8.1"
+ "source": "https://github.com/guzzle/guzzle/tree/7.9.2"
},
"funding": [
{
@@ -2736,20 +2741,20 @@
"type": "tidelift"
}
],
- "time": "2023-12-03T20:35:24+00:00"
+ "time": "2024-07-24T11:22:20+00:00"
},
{
"name": "guzzlehttp/promises",
- "version": "2.0.2",
+ "version": "2.0.4",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
- "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223"
+ "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223",
- "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223",
+ "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
+ "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
"shasum": ""
},
"require": {
@@ -2757,7 +2762,7 @@
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.2",
- "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+ "phpunit/phpunit": "^8.5.39 || ^9.6.20"
},
"type": "library",
"extra": {
@@ -2803,7 +2808,7 @@
],
"support": {
"issues": "https://github.com/guzzle/promises/issues",
- "source": "https://github.com/guzzle/promises/tree/2.0.2"
+ "source": "https://github.com/guzzle/promises/tree/2.0.4"
},
"funding": [
{
@@ -2819,20 +2824,20 @@
"type": "tidelift"
}
],
- "time": "2023-12-03T20:19:20+00:00"
+ "time": "2024-10-17T10:06:22+00:00"
},
{
"name": "guzzlehttp/psr7",
- "version": "2.6.2",
+ "version": "2.7.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221"
+ "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221",
- "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
+ "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
"shasum": ""
},
"require": {
@@ -2847,8 +2852,8 @@
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.2",
- "http-interop/http-factory-tests": "^0.9",
- "phpunit/phpunit": "^8.5.36 || ^9.6.15"
+ "http-interop/http-factory-tests": "0.9.0",
+ "phpunit/phpunit": "^8.5.39 || ^9.6.20"
},
"suggest": {
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
@@ -2919,7 +2924,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
- "source": "https://github.com/guzzle/psr7/tree/2.6.2"
+ "source": "https://github.com/guzzle/psr7/tree/2.7.0"
},
"funding": [
{
@@ -2935,7 +2940,7 @@
"type": "tidelift"
}
],
- "time": "2023-12-03T20:05:35+00:00"
+ "time": "2024-07-18T11:15:46+00:00"
},
{
"name": "infection/abstract-testframework-adapter",
@@ -3116,20 +3121,20 @@
},
{
"name": "infection/infection",
- "version": "0.27.11",
+ "version": "0.29.7",
"source": {
"type": "git",
"url": "https://github.com/infection/infection.git",
- "reference": "6d55979c457eef2a5d0d80446c67ca533f201961"
+ "reference": "243d501ab48a028f714993bc0c217f023af7cdbc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/infection/infection/zipball/6d55979c457eef2a5d0d80446c67ca533f201961",
- "reference": "6d55979c457eef2a5d0d80446c67ca533f201961",
+ "url": "https://api.github.com/repos/infection/infection/zipball/243d501ab48a028f714993bc0c217f023af7cdbc",
+ "reference": "243d501ab48a028f714993bc0c217f023af7cdbc",
"shasum": ""
},
"require": {
- "colinodell/json5": "^2.2",
+ "colinodell/json5": "^2.2 || ^3.0",
"composer-runtime-api": "^2.0",
"composer/xdebug-handler": "^2.0 || ^3.0",
"ext-dom": "*",
@@ -3140,8 +3145,9 @@
"infection/abstract-testframework-adapter": "^0.5.0",
"infection/extension-installer": "^0.1.0",
"infection/include-interceptor": "^0.2.5",
- "justinrainbow/json-schema": "^5.2.10",
- "nikic/php-parser": "^4.15.1",
+ "infection/mutator": "^0.4",
+ "justinrainbow/json-schema": "^5.3",
+ "nikic/php-parser": "^5.0",
"ondram/ci-detector": "^4.1.0",
"php": "^8.1",
"sanmai/later": "^0.1.1",
@@ -3160,20 +3166,17 @@
"phpunit/php-code-coverage": ">9,<9.1.4 || >9.2.17,<9.2.21"
},
"require-dev": {
- "brianium/paratest": "^6.11",
"ext-simplexml": "*",
"fidry/makefile": "^1.0",
"helmich/phpunit-json-assert": "^3.0",
- "phpspec/prophecy": "^1.15",
- "phpspec/prophecy-phpunit": "^2.0",
"phpstan/extension-installer": "^1.1.0",
"phpstan/phpstan": "^1.10.15",
"phpstan/phpstan-phpunit": "^1.0.0",
"phpstan/phpstan-strict-rules": "^1.1.0",
"phpstan/phpstan-webmozart-assert": "^1.0.2",
- "phpunit/phpunit": "^9.6",
- "rector/rector": "^0.16.0",
- "sidz/phpstan-rules": "^0.4.0",
+ "phpunit/phpunit": "^10.5",
+ "rector/rector": "^1.0",
+ "sidz/phpstan-rules": "^0.4",
"symfony/yaml": "^5.4 || ^6.0 || ^7.0",
"thecodingmachine/phpstan-safe-rule": "^1.2.0"
},
@@ -3231,7 +3234,7 @@
],
"support": {
"issues": "https://github.com/infection/infection/issues",
- "source": "https://github.com/infection/infection/tree/0.27.11"
+ "source": "https://github.com/infection/infection/tree/0.29.7"
},
"funding": [
{
@@ -3243,7 +3246,60 @@
"type": "open_collective"
}
],
- "time": "2024-03-20T07:48:57+00:00"
+ "time": "2024-10-06T12:20:00+00:00"
+ },
+ {
+ "name": "infection/mutator",
+ "version": "0.4.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/infection/mutator.git",
+ "reference": "51d6d01a2357102030aee9d603063c4bad86b144"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/infection/mutator/zipball/51d6d01a2357102030aee9d603063c4bad86b144",
+ "reference": "51d6d01a2357102030aee9d603063c4bad86b144",
+ "shasum": ""
+ },
+ "require": {
+ "nikic/php-parser": "^5.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^9.6 || ^10"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Infection\\Mutator\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Maks Rafalko",
+ "email": "maks.rafalko@gmail.com"
+ }
+ ],
+ "description": "Mutator interface to implement custom mutators (mutation operators) for Infection",
+ "support": {
+ "issues": "https://github.com/infection/mutator/issues",
+ "source": "https://github.com/infection/mutator/tree/0.4.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/infection",
+ "type": "github"
+ },
+ {
+ "url": "https://opencollective.com/infection",
+ "type": "open_collective"
+ }
+ ],
+ "time": "2024-05-14T22:39:59+00:00"
},
{
"name": "jean85/pretty-package-versions",
@@ -3306,20 +3362,20 @@
},
{
"name": "justinrainbow/json-schema",
- "version": "v5.2.13",
+ "version": "5.3.0",
"source": {
"type": "git",
"url": "https://github.com/jsonrainbow/json-schema.git",
- "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793"
+ "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793",
- "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793",
+ "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8",
+ "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=7.1"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
@@ -3330,11 +3386,6 @@
"bin/validate-json"
],
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "5.0.x-dev"
- }
- },
"autoload": {
"psr-4": {
"JsonSchema\\": "src/JsonSchema/"
@@ -3370,9 +3421,9 @@
],
"support": {
"issues": "https://github.com/jsonrainbow/json-schema/issues",
- "source": "https://github.com/jsonrainbow/json-schema/tree/v5.2.13"
+ "source": "https://github.com/jsonrainbow/json-schema/tree/5.3.0"
},
- "time": "2023-09-26T02:20:38+00:00"
+ "time": "2024-07-06T21:00:26+00:00"
},
{
"name": "keradus/cli-executor",
@@ -3423,23 +3474,24 @@
},
{
"name": "mikey179/vfsstream",
- "version": "v1.6.11",
+ "version": "v1.6.12",
"source": {
"type": "git",
"url": "https://github.com/bovigo/vfsStream.git",
- "reference": "17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f"
+ "reference": "fe695ec993e0a55c3abdda10a9364eb31c6f1bf0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f",
- "reference": "17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f",
+ "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/fe695ec993e0a55c3abdda10a9364eb31c6f1bf0",
+ "reference": "fe695ec993e0a55c3abdda10a9364eb31c6f1bf0",
"shasum": ""
},
"require": {
- "php": ">=5.3.0"
+ "php": ">=7.1.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.5|^5.0"
+ "phpunit/phpunit": "^7.5||^8.5||^9.6",
+ "yoast/phpunit-polyfills": "^2.0"
},
"type": "library",
"extra": {
@@ -3470,20 +3522,20 @@
"source": "https://github.com/bovigo/vfsStream/tree/master",
"wiki": "https://github.com/bovigo/vfsStream/wiki"
},
- "time": "2022-02-23T02:02:42+00:00"
+ "time": "2024-08-29T18:43:31+00:00"
},
{
"name": "myclabs/deep-copy",
- "version": "1.11.1",
+ "version": "1.12.0",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
+ "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
- "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
+ "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
"shasum": ""
},
"require": {
@@ -3491,11 +3543,12 @@
},
"conflict": {
"doctrine/collections": "<1.6.8",
- "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+ "doctrine/common": "<2.13.3 || >=3 <3.2.2"
},
"require-dev": {
"doctrine/collections": "^1.6.8",
"doctrine/common": "^2.13.3 || ^3.2.2",
+ "phpspec/prophecy": "^1.10",
"phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
},
"type": "library",
@@ -3521,7 +3574,7 @@
],
"support": {
"issues": "https://github.com/myclabs/DeepCopy/issues",
- "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
+ "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0"
},
"funding": [
{
@@ -3529,29 +3582,31 @@
"type": "tidelift"
}
],
- "time": "2023-03-08T13:26:56+00:00"
+ "time": "2024-06-12T14:39:25+00:00"
},
{
"name": "nikic/php-parser",
- "version": "v4.19.1",
+ "version": "v5.3.1",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b"
+ "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b",
- "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
+ "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
"shasum": ""
},
"require": {
+ "ext-ctype": "*",
+ "ext-json": "*",
"ext-tokenizer": "*",
- "php": ">=7.1"
+ "php": ">=7.4"
},
"require-dev": {
"ircmaxell/php-yacc": "^0.0.7",
- "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+ "phpunit/phpunit": "^9.0"
},
"bin": [
"bin/php-parse"
@@ -3559,7 +3614,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.9-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
@@ -3583,9 +3638,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
},
- "time": "2024-03-17T08:10:35+00:00"
+ "time": "2024-10-08T18:51:32+00:00"
},
{
"name": "ondram/ci-detector",
@@ -4008,35 +4063,35 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "10.1.14",
+ "version": "11.0.7",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b"
+ "reference": "f7f08030e8811582cc459871d28d6f5a1a4d35ca"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
- "reference": "e3f51450ebffe8e0efdf7346ae966a656f7d5e5b",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f7f08030e8811582cc459871d28d6f5a1a4d35ca",
+ "reference": "f7f08030e8811582cc459871d28d6f5a1a4d35ca",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-libxml": "*",
"ext-xmlwriter": "*",
- "nikic/php-parser": "^4.18 || ^5.0",
- "php": ">=8.1",
- "phpunit/php-file-iterator": "^4.0",
- "phpunit/php-text-template": "^3.0",
- "sebastian/code-unit-reverse-lookup": "^3.0",
- "sebastian/complexity": "^3.0",
- "sebastian/environment": "^6.0",
- "sebastian/lines-of-code": "^2.0",
- "sebastian/version": "^4.0",
- "theseer/tokenizer": "^1.2.0"
+ "nikic/php-parser": "^5.3.1",
+ "php": ">=8.2",
+ "phpunit/php-file-iterator": "^5.1.0",
+ "phpunit/php-text-template": "^4.0.1",
+ "sebastian/code-unit-reverse-lookup": "^4.0.1",
+ "sebastian/complexity": "^4.0.1",
+ "sebastian/environment": "^7.2.0",
+ "sebastian/lines-of-code": "^3.0.1",
+ "sebastian/version": "^5.0.2",
+ "theseer/tokenizer": "^1.2.3"
},
"require-dev": {
- "phpunit/phpunit": "^10.1"
+ "phpunit/phpunit": "^11.4.1"
},
"suggest": {
"ext-pcov": "PHP extension that provides line coverage",
@@ -4045,7 +4100,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "10.1-dev"
+ "dev-main": "11.0.x-dev"
}
},
"autoload": {
@@ -4074,7 +4129,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
"security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.14"
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.7"
},
"funding": [
{
@@ -4082,32 +4137,32 @@
"type": "github"
}
],
- "time": "2024-03-12T15:33:41+00:00"
+ "time": "2024-10-09T06:21:38+00:00"
},
{
"name": "phpunit/php-file-iterator",
- "version": "4.1.0",
+ "version": "5.1.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
- "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c"
+ "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a95037b6d9e608ba092da1b23931e537cadc3c3c",
- "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/118cfaaa8bc5aef3287bf315b6060b1174754af6",
+ "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.2"
},
"require-dev": {
- "phpunit/phpunit": "^10.0"
+ "phpunit/phpunit": "^11.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "4.0-dev"
+ "dev-main": "5.0-dev"
}
},
"autoload": {
@@ -4135,7 +4190,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
"security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
- "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.1.0"
+ "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/5.1.0"
},
"funding": [
{
@@ -4143,28 +4198,28 @@
"type": "github"
}
],
- "time": "2023-08-31T06:24:48+00:00"
+ "time": "2024-08-27T05:02:59+00:00"
},
{
"name": "phpunit/php-invoker",
- "version": "4.0.0",
+ "version": "5.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-invoker.git",
- "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7"
+ "reference": "c1ca3814734c07492b3d4c5f794f4b0995333da2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
- "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/c1ca3814734c07492b3d4c5f794f4b0995333da2",
+ "reference": "c1ca3814734c07492b3d4c5f794f4b0995333da2",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.2"
},
"require-dev": {
"ext-pcntl": "*",
- "phpunit/phpunit": "^10.0"
+ "phpunit/phpunit": "^11.0"
},
"suggest": {
"ext-pcntl": "*"
@@ -4172,7 +4227,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "4.0-dev"
+ "dev-main": "5.0-dev"
}
},
"autoload": {
@@ -4198,7 +4253,8 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/php-invoker/issues",
- "source": "https://github.com/sebastianbergmann/php-invoker/tree/4.0.0"
+ "security": "https://github.com/sebastianbergmann/php-invoker/security/policy",
+ "source": "https://github.com/sebastianbergmann/php-invoker/tree/5.0.1"
},
"funding": [
{
@@ -4206,32 +4262,32 @@
"type": "github"
}
],
- "time": "2023-02-03T06:56:09+00:00"
+ "time": "2024-07-03T05:07:44+00:00"
},
{
"name": "phpunit/php-text-template",
- "version": "3.0.1",
+ "version": "4.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-text-template.git",
- "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748"
+ "reference": "3e0404dc6b300e6bf56415467ebcb3fe4f33e964"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748",
- "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/3e0404dc6b300e6bf56415467ebcb3fe4f33e964",
+ "reference": "3e0404dc6b300e6bf56415467ebcb3fe4f33e964",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.2"
},
"require-dev": {
- "phpunit/phpunit": "^10.0"
+ "phpunit/phpunit": "^11.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.0-dev"
+ "dev-main": "4.0-dev"
}
},
"autoload": {
@@ -4258,7 +4314,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/php-text-template/issues",
"security": "https://github.com/sebastianbergmann/php-text-template/security/policy",
- "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.1"
+ "source": "https://github.com/sebastianbergmann/php-text-template/tree/4.0.1"
},
"funding": [
{
@@ -4266,32 +4322,32 @@
"type": "github"
}
],
- "time": "2023-08-31T14:07:24+00:00"
+ "time": "2024-07-03T05:08:43+00:00"
},
{
"name": "phpunit/php-timer",
- "version": "6.0.0",
+ "version": "7.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-timer.git",
- "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d"
+ "reference": "3b415def83fbcb41f991d9ebf16ae4ad8b7837b3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/e2a2d67966e740530f4a3343fe2e030ffdc1161d",
- "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3b415def83fbcb41f991d9ebf16ae4ad8b7837b3",
+ "reference": "3b415def83fbcb41f991d9ebf16ae4ad8b7837b3",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.2"
},
"require-dev": {
- "phpunit/phpunit": "^10.0"
+ "phpunit/phpunit": "^11.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "6.0-dev"
+ "dev-main": "7.0-dev"
}
},
"autoload": {
@@ -4317,7 +4373,8 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/php-timer/issues",
- "source": "https://github.com/sebastianbergmann/php-timer/tree/6.0.0"
+ "security": "https://github.com/sebastianbergmann/php-timer/security/policy",
+ "source": "https://github.com/sebastianbergmann/php-timer/tree/7.0.1"
},
"funding": [
{
@@ -4325,20 +4382,20 @@
"type": "github"
}
],
- "time": "2023-02-03T06:57:52+00:00"
+ "time": "2024-07-03T05:09:35+00:00"
},
{
"name": "phpunit/phpunit",
- "version": "10.5.20",
+ "version": "11.4.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3"
+ "reference": "e8e8ed1854de5d36c088ec1833beae40d2dedd76"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/547d314dc24ec1e177720d45c6263fb226cc2ae3",
- "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e8e8ed1854de5d36c088ec1833beae40d2dedd76",
+ "reference": "e8e8ed1854de5d36c088ec1833beae40d2dedd76",
"shasum": ""
},
"require": {
@@ -4348,26 +4405,25 @@
"ext-mbstring": "*",
"ext-xml": "*",
"ext-xmlwriter": "*",
- "myclabs/deep-copy": "^1.10.1",
- "phar-io/manifest": "^2.0.3",
- "phar-io/version": "^3.0.2",
- "php": ">=8.1",
- "phpunit/php-code-coverage": "^10.1.5",
- "phpunit/php-file-iterator": "^4.0",
- "phpunit/php-invoker": "^4.0",
- "phpunit/php-text-template": "^3.0",
- "phpunit/php-timer": "^6.0",
- "sebastian/cli-parser": "^2.0",
- "sebastian/code-unit": "^2.0",
- "sebastian/comparator": "^5.0",
- "sebastian/diff": "^5.0",
- "sebastian/environment": "^6.0",
- "sebastian/exporter": "^5.1",
- "sebastian/global-state": "^6.0.1",
- "sebastian/object-enumerator": "^5.0",
- "sebastian/recursion-context": "^5.0",
- "sebastian/type": "^4.0",
- "sebastian/version": "^4.0"
+ "myclabs/deep-copy": "^1.12.0",
+ "phar-io/manifest": "^2.0.4",
+ "phar-io/version": "^3.2.1",
+ "php": ">=8.2",
+ "phpunit/php-code-coverage": "^11.0.7",
+ "phpunit/php-file-iterator": "^5.1.0",
+ "phpunit/php-invoker": "^5.0.1",
+ "phpunit/php-text-template": "^4.0.1",
+ "phpunit/php-timer": "^7.0.1",
+ "sebastian/cli-parser": "^3.0.2",
+ "sebastian/code-unit": "^3.0.1",
+ "sebastian/comparator": "^6.1.1",
+ "sebastian/diff": "^6.0.2",
+ "sebastian/environment": "^7.2.0",
+ "sebastian/exporter": "^6.1.3",
+ "sebastian/global-state": "^7.0.2",
+ "sebastian/object-enumerator": "^6.0.1",
+ "sebastian/type": "^5.1.0",
+ "sebastian/version": "^5.0.2"
},
"suggest": {
"ext-soap": "To be able to generate mocks based on WSDL files"
@@ -4378,7 +4434,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "10.5-dev"
+ "dev-main": "11.4-dev"
}
},
"autoload": {
@@ -4410,7 +4466,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.20"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/11.4.3"
},
"funding": [
{
@@ -4426,7 +4482,7 @@
"type": "tidelift"
}
],
- "time": "2024-04-24T06:32:35+00:00"
+ "time": "2024-10-28T13:07:50+00:00"
},
{
"name": "psr/http-client",
@@ -4698,16 +4754,16 @@
},
{
"name": "sanmai/pipeline",
- "version": "v6.10",
+ "version": "v6.11",
"source": {
"type": "git",
"url": "https://github.com/sanmai/pipeline.git",
- "reference": "cbd2ea30ba8bef596b8dad1adb9c92fb2987e430"
+ "reference": "a5fa2a6c6ca93efa37e7c24aab72f47448a6b110"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sanmai/pipeline/zipball/cbd2ea30ba8bef596b8dad1adb9c92fb2987e430",
- "reference": "cbd2ea30ba8bef596b8dad1adb9c92fb2987e430",
+ "url": "https://api.github.com/repos/sanmai/pipeline/zipball/a5fa2a6c6ca93efa37e7c24aab72f47448a6b110",
+ "reference": "a5fa2a6c6ca93efa37e7c24aab72f47448a6b110",
"shasum": ""
},
"require": {
@@ -4751,7 +4807,7 @@
"description": "General-purpose collections pipeline",
"support": {
"issues": "https://github.com/sanmai/pipeline/issues",
- "source": "https://github.com/sanmai/pipeline/tree/v6.10"
+ "source": "https://github.com/sanmai/pipeline/tree/v6.11"
},
"funding": [
{
@@ -4759,32 +4815,32 @@
"type": "github"
}
],
- "time": "2024-03-16T01:33:30+00:00"
+ "time": "2024-06-15T03:11:19+00:00"
},
{
"name": "sebastian/cli-parser",
- "version": "2.0.1",
+ "version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/cli-parser.git",
- "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084"
+ "reference": "15c5dd40dc4f38794d383bb95465193f5e0ae180"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/c34583b87e7b7a8055bf6c450c2c77ce32a24084",
- "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084",
+ "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/15c5dd40dc4f38794d383bb95465193f5e0ae180",
+ "reference": "15c5dd40dc4f38794d383bb95465193f5e0ae180",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.2"
},
"require-dev": {
- "phpunit/phpunit": "^10.0"
+ "phpunit/phpunit": "^11.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "2.0-dev"
+ "dev-main": "3.0-dev"
}
},
"autoload": {
@@ -4808,7 +4864,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/cli-parser/issues",
"security": "https://github.com/sebastianbergmann/cli-parser/security/policy",
- "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.1"
+ "source": "https://github.com/sebastianbergmann/cli-parser/tree/3.0.2"
},
"funding": [
{
@@ -4816,32 +4872,32 @@
"type": "github"
}
],
- "time": "2024-03-02T07:12:49+00:00"
+ "time": "2024-07-03T04:41:36+00:00"
},
{
"name": "sebastian/code-unit",
- "version": "2.0.0",
+ "version": "3.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/code-unit.git",
- "reference": "a81fee9eef0b7a76af11d121767abc44c104e503"
+ "reference": "6bb7d09d6623567178cf54126afa9c2310114268"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/a81fee9eef0b7a76af11d121767abc44c104e503",
- "reference": "a81fee9eef0b7a76af11d121767abc44c104e503",
+ "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/6bb7d09d6623567178cf54126afa9c2310114268",
+ "reference": "6bb7d09d6623567178cf54126afa9c2310114268",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.2"
},
"require-dev": {
- "phpunit/phpunit": "^10.0"
+ "phpunit/phpunit": "^11.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "2.0-dev"
+ "dev-main": "3.0-dev"
}
},
"autoload": {
@@ -4864,7 +4920,8 @@
"homepage": "https://github.com/sebastianbergmann/code-unit",
"support": {
"issues": "https://github.com/sebastianbergmann/code-unit/issues",
- "source": "https://github.com/sebastianbergmann/code-unit/tree/2.0.0"
+ "security": "https://github.com/sebastianbergmann/code-unit/security/policy",
+ "source": "https://github.com/sebastianbergmann/code-unit/tree/3.0.1"
},
"funding": [
{
@@ -4872,32 +4929,32 @@
"type": "github"
}
],
- "time": "2023-02-03T06:58:43+00:00"
+ "time": "2024-07-03T04:44:28+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
- "version": "3.0.0",
+ "version": "4.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
- "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d"
+ "reference": "183a9b2632194febd219bb9246eee421dad8d45e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/5e3a687f7d8ae33fb362c5c0743794bbb2420a1d",
- "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d",
+ "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/183a9b2632194febd219bb9246eee421dad8d45e",
+ "reference": "183a9b2632194febd219bb9246eee421dad8d45e",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.2"
},
"require-dev": {
- "phpunit/phpunit": "^10.0"
+ "phpunit/phpunit": "^11.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.0-dev"
+ "dev-main": "4.0-dev"
}
},
"autoload": {
@@ -4919,7 +4976,8 @@
"homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
"support": {
"issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
- "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/3.0.0"
+ "security": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/security/policy",
+ "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/4.0.1"
},
"funding": [
{
@@ -4927,36 +4985,36 @@
"type": "github"
}
],
- "time": "2023-02-03T06:59:15+00:00"
+ "time": "2024-07-03T04:45:54+00:00"
},
{
"name": "sebastian/comparator",
- "version": "5.0.1",
+ "version": "6.1.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "2db5010a484d53ebf536087a70b4a5423c102372"
+ "reference": "5ef523a49ae7a302b87b2102b72b1eda8918d686"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372",
- "reference": "2db5010a484d53ebf536087a70b4a5423c102372",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5ef523a49ae7a302b87b2102b72b1eda8918d686",
+ "reference": "5ef523a49ae7a302b87b2102b72b1eda8918d686",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-mbstring": "*",
- "php": ">=8.1",
- "sebastian/diff": "^5.0",
- "sebastian/exporter": "^5.0"
+ "php": ">=8.2",
+ "sebastian/diff": "^6.0",
+ "sebastian/exporter": "^6.0"
},
"require-dev": {
- "phpunit/phpunit": "^10.3"
+ "phpunit/phpunit": "^11.3"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "5.0-dev"
+ "dev-main": "6.1-dev"
}
},
"autoload": {
@@ -4996,7 +5054,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/comparator/issues",
"security": "https://github.com/sebastianbergmann/comparator/security/policy",
- "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.1"
+ "source": "https://github.com/sebastianbergmann/comparator/tree/6.1.1"
},
"funding": [
{
@@ -5004,33 +5062,33 @@
"type": "github"
}
],
- "time": "2023-08-14T13:18:12+00:00"
+ "time": "2024-10-18T15:00:48+00:00"
},
{
"name": "sebastian/complexity",
- "version": "3.2.0",
+ "version": "4.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/complexity.git",
- "reference": "68ff824baeae169ec9f2137158ee529584553799"
+ "reference": "ee41d384ab1906c68852636b6de493846e13e5a0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799",
- "reference": "68ff824baeae169ec9f2137158ee529584553799",
+ "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/ee41d384ab1906c68852636b6de493846e13e5a0",
+ "reference": "ee41d384ab1906c68852636b6de493846e13e5a0",
"shasum": ""
},
"require": {
- "nikic/php-parser": "^4.18 || ^5.0",
- "php": ">=8.1"
+ "nikic/php-parser": "^5.0",
+ "php": ">=8.2"
},
"require-dev": {
- "phpunit/phpunit": "^10.0"
+ "phpunit/phpunit": "^11.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.2-dev"
+ "dev-main": "4.0-dev"
}
},
"autoload": {
@@ -5054,7 +5112,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/complexity/issues",
"security": "https://github.com/sebastianbergmann/complexity/security/policy",
- "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0"
+ "source": "https://github.com/sebastianbergmann/complexity/tree/4.0.1"
},
"funding": [
{
@@ -5062,27 +5120,27 @@
"type": "github"
}
],
- "time": "2023-12-21T08:37:17+00:00"
+ "time": "2024-07-03T04:49:50+00:00"
},
{
"name": "sebastian/environment",
- "version": "6.1.0",
+ "version": "7.2.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "8074dbcd93529b357029f5cc5058fd3e43666984"
+ "reference": "855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/8074dbcd93529b357029f5cc5058fd3e43666984",
- "reference": "8074dbcd93529b357029f5cc5058fd3e43666984",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5",
+ "reference": "855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.2"
},
"require-dev": {
- "phpunit/phpunit": "^10.0"
+ "phpunit/phpunit": "^11.0"
},
"suggest": {
"ext-posix": "*"
@@ -5090,7 +5148,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "6.1-dev"
+ "dev-main": "7.2-dev"
}
},
"autoload": {
@@ -5118,7 +5176,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/environment/issues",
"security": "https://github.com/sebastianbergmann/environment/security/policy",
- "source": "https://github.com/sebastianbergmann/environment/tree/6.1.0"
+ "source": "https://github.com/sebastianbergmann/environment/tree/7.2.0"
},
"funding": [
{
@@ -5126,34 +5184,34 @@
"type": "github"
}
],
- "time": "2024-03-23T08:47:14+00:00"
+ "time": "2024-07-03T04:54:44+00:00"
},
{
"name": "sebastian/exporter",
- "version": "5.1.2",
+ "version": "6.1.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
- "reference": "955288482d97c19a372d3f31006ab3f37da47adf"
+ "reference": "c414673eee9a8f9d51bbf8d61fc9e3ef1e85b20e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/955288482d97c19a372d3f31006ab3f37da47adf",
- "reference": "955288482d97c19a372d3f31006ab3f37da47adf",
+ "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/c414673eee9a8f9d51bbf8d61fc9e3ef1e85b20e",
+ "reference": "c414673eee9a8f9d51bbf8d61fc9e3ef1e85b20e",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
- "php": ">=8.1",
- "sebastian/recursion-context": "^5.0"
+ "php": ">=8.2",
+ "sebastian/recursion-context": "^6.0"
},
"require-dev": {
- "phpunit/phpunit": "^10.0"
+ "phpunit/phpunit": "^11.2"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "5.1-dev"
+ "dev-main": "6.1-dev"
}
},
"autoload": {
@@ -5196,7 +5254,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/exporter/issues",
"security": "https://github.com/sebastianbergmann/exporter/security/policy",
- "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.2"
+ "source": "https://github.com/sebastianbergmann/exporter/tree/6.1.3"
},
"funding": [
{
@@ -5204,35 +5262,35 @@
"type": "github"
}
],
- "time": "2024-03-02T07:17:12+00:00"
+ "time": "2024-07-03T04:56:19+00:00"
},
{
"name": "sebastian/global-state",
- "version": "6.0.2",
+ "version": "7.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/global-state.git",
- "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9"
+ "reference": "3be331570a721f9a4b5917f4209773de17f747d7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
- "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9",
+ "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/3be331570a721f9a4b5917f4209773de17f747d7",
+ "reference": "3be331570a721f9a4b5917f4209773de17f747d7",
"shasum": ""
},
"require": {
- "php": ">=8.1",
- "sebastian/object-reflector": "^3.0",
- "sebastian/recursion-context": "^5.0"
+ "php": ">=8.2",
+ "sebastian/object-reflector": "^4.0",
+ "sebastian/recursion-context": "^6.0"
},
"require-dev": {
"ext-dom": "*",
- "phpunit/phpunit": "^10.0"
+ "phpunit/phpunit": "^11.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "6.0-dev"
+ "dev-main": "7.0-dev"
}
},
"autoload": {
@@ -5258,7 +5316,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/global-state/issues",
"security": "https://github.com/sebastianbergmann/global-state/security/policy",
- "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.2"
+ "source": "https://github.com/sebastianbergmann/global-state/tree/7.0.2"
},
"funding": [
{
@@ -5266,33 +5324,33 @@
"type": "github"
}
],
- "time": "2024-03-02T07:19:19+00:00"
+ "time": "2024-07-03T04:57:36+00:00"
},
{
"name": "sebastian/lines-of-code",
- "version": "2.0.2",
+ "version": "3.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/lines-of-code.git",
- "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0"
+ "reference": "d36ad0d782e5756913e42ad87cb2890f4ffe467a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0",
- "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0",
+ "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/d36ad0d782e5756913e42ad87cb2890f4ffe467a",
+ "reference": "d36ad0d782e5756913e42ad87cb2890f4ffe467a",
"shasum": ""
},
"require": {
- "nikic/php-parser": "^4.18 || ^5.0",
- "php": ">=8.1"
+ "nikic/php-parser": "^5.0",
+ "php": ">=8.2"
},
"require-dev": {
- "phpunit/phpunit": "^10.0"
+ "phpunit/phpunit": "^11.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "2.0-dev"
+ "dev-main": "3.0-dev"
}
},
"autoload": {
@@ -5316,7 +5374,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
"security": "https://github.com/sebastianbergmann/lines-of-code/security/policy",
- "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2"
+ "source": "https://github.com/sebastianbergmann/lines-of-code/tree/3.0.1"
},
"funding": [
{
@@ -5324,34 +5382,34 @@
"type": "github"
}
],
- "time": "2023-12-21T08:38:20+00:00"
+ "time": "2024-07-03T04:58:38+00:00"
},
{
"name": "sebastian/object-enumerator",
- "version": "5.0.0",
+ "version": "6.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/object-enumerator.git",
- "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906"
+ "reference": "f5b498e631a74204185071eb41f33f38d64608aa"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/202d0e344a580d7f7d04b3fafce6933e59dae906",
- "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906",
+ "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/f5b498e631a74204185071eb41f33f38d64608aa",
+ "reference": "f5b498e631a74204185071eb41f33f38d64608aa",
"shasum": ""
},
"require": {
- "php": ">=8.1",
- "sebastian/object-reflector": "^3.0",
- "sebastian/recursion-context": "^5.0"
+ "php": ">=8.2",
+ "sebastian/object-reflector": "^4.0",
+ "sebastian/recursion-context": "^6.0"
},
"require-dev": {
- "phpunit/phpunit": "^10.0"
+ "phpunit/phpunit": "^11.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "5.0-dev"
+ "dev-main": "6.0-dev"
}
},
"autoload": {
@@ -5373,7 +5431,8 @@
"homepage": "https://github.com/sebastianbergmann/object-enumerator/",
"support": {
"issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
- "source": "https://github.com/sebastianbergmann/object-enumerator/tree/5.0.0"
+ "security": "https://github.com/sebastianbergmann/object-enumerator/security/policy",
+ "source": "https://github.com/sebastianbergmann/object-enumerator/tree/6.0.1"
},
"funding": [
{
@@ -5381,32 +5440,32 @@
"type": "github"
}
],
- "time": "2023-02-03T07:08:32+00:00"
+ "time": "2024-07-03T05:00:13+00:00"
},
{
"name": "sebastian/object-reflector",
- "version": "3.0.0",
+ "version": "4.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/object-reflector.git",
- "reference": "24ed13d98130f0e7122df55d06c5c4942a577957"
+ "reference": "6e1a43b411b2ad34146dee7524cb13a068bb35f9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/24ed13d98130f0e7122df55d06c5c4942a577957",
- "reference": "24ed13d98130f0e7122df55d06c5c4942a577957",
+ "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/6e1a43b411b2ad34146dee7524cb13a068bb35f9",
+ "reference": "6e1a43b411b2ad34146dee7524cb13a068bb35f9",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.2"
},
"require-dev": {
- "phpunit/phpunit": "^10.0"
+ "phpunit/phpunit": "^11.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "3.0-dev"
+ "dev-main": "4.0-dev"
}
},
"autoload": {
@@ -5428,7 +5487,8 @@
"homepage": "https://github.com/sebastianbergmann/object-reflector/",
"support": {
"issues": "https://github.com/sebastianbergmann/object-reflector/issues",
- "source": "https://github.com/sebastianbergmann/object-reflector/tree/3.0.0"
+ "security": "https://github.com/sebastianbergmann/object-reflector/security/policy",
+ "source": "https://github.com/sebastianbergmann/object-reflector/tree/4.0.1"
},
"funding": [
{
@@ -5436,32 +5496,32 @@
"type": "github"
}
],
- "time": "2023-02-03T07:06:18+00:00"
+ "time": "2024-07-03T05:01:32+00:00"
},
{
"name": "sebastian/recursion-context",
- "version": "5.0.0",
+ "version": "6.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/recursion-context.git",
- "reference": "05909fb5bc7df4c52992396d0116aed689f93712"
+ "reference": "694d156164372abbd149a4b85ccda2e4670c0e16"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/05909fb5bc7df4c52992396d0116aed689f93712",
- "reference": "05909fb5bc7df4c52992396d0116aed689f93712",
+ "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/694d156164372abbd149a4b85ccda2e4670c0e16",
+ "reference": "694d156164372abbd149a4b85ccda2e4670c0e16",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.2"
},
"require-dev": {
- "phpunit/phpunit": "^10.0"
+ "phpunit/phpunit": "^11.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "5.0-dev"
+ "dev-main": "6.0-dev"
}
},
"autoload": {
@@ -5491,7 +5551,8 @@
"homepage": "https://github.com/sebastianbergmann/recursion-context",
"support": {
"issues": "https://github.com/sebastianbergmann/recursion-context/issues",
- "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.0"
+ "security": "https://github.com/sebastianbergmann/recursion-context/security/policy",
+ "source": "https://github.com/sebastianbergmann/recursion-context/tree/6.0.2"
},
"funding": [
{
@@ -5499,32 +5560,32 @@
"type": "github"
}
],
- "time": "2023-02-03T07:05:40+00:00"
+ "time": "2024-07-03T05:10:34+00:00"
},
{
"name": "sebastian/type",
- "version": "4.0.0",
+ "version": "5.1.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/type.git",
- "reference": "462699a16464c3944eefc02ebdd77882bd3925bf"
+ "reference": "461b9c5da241511a2a0e8f240814fb23ce5c0aac"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/462699a16464c3944eefc02ebdd77882bd3925bf",
- "reference": "462699a16464c3944eefc02ebdd77882bd3925bf",
+ "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/461b9c5da241511a2a0e8f240814fb23ce5c0aac",
+ "reference": "461b9c5da241511a2a0e8f240814fb23ce5c0aac",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.2"
},
"require-dev": {
- "phpunit/phpunit": "^10.0"
+ "phpunit/phpunit": "^11.3"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "4.0-dev"
+ "dev-main": "5.1-dev"
}
},
"autoload": {
@@ -5547,7 +5608,8 @@
"homepage": "https://github.com/sebastianbergmann/type",
"support": {
"issues": "https://github.com/sebastianbergmann/type/issues",
- "source": "https://github.com/sebastianbergmann/type/tree/4.0.0"
+ "security": "https://github.com/sebastianbergmann/type/security/policy",
+ "source": "https://github.com/sebastianbergmann/type/tree/5.1.0"
},
"funding": [
{
@@ -5555,29 +5617,29 @@
"type": "github"
}
],
- "time": "2023-02-03T07:10:45+00:00"
+ "time": "2024-09-17T13:12:04+00:00"
},
{
"name": "sebastian/version",
- "version": "4.0.1",
+ "version": "5.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/version.git",
- "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17"
+ "reference": "c687e3387b99f5b03b6caa64c74b63e2936ff874"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c51fa83a5d8f43f1402e3f32a005e6262244ef17",
- "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17",
+ "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c687e3387b99f5b03b6caa64c74b63e2936ff874",
+ "reference": "c687e3387b99f5b03b6caa64c74b63e2936ff874",
"shasum": ""
},
"require": {
- "php": ">=8.1"
+ "php": ">=8.2"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "4.0-dev"
+ "dev-main": "5.0-dev"
}
},
"autoload": {
@@ -5600,7 +5662,8 @@
"homepage": "https://github.com/sebastianbergmann/version",
"support": {
"issues": "https://github.com/sebastianbergmann/version/issues",
- "source": "https://github.com/sebastianbergmann/version/tree/4.0.1"
+ "security": "https://github.com/sebastianbergmann/version/security/policy",
+ "source": "https://github.com/sebastianbergmann/version/tree/5.0.2"
},
"funding": [
{
@@ -5608,38 +5671,38 @@
"type": "github"
}
],
- "time": "2023-02-07T11:34:05+00:00"
+ "time": "2024-10-09T05:16:32+00:00"
},
{
"name": "symfony/config",
- "version": "v6.4.8",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
- "reference": "12e7e52515ce37191b193cf3365903c4f3951e35"
+ "reference": "5c6152766251ff45a44b76affadd5287e253fb27"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/config/zipball/12e7e52515ce37191b193cf3365903c4f3951e35",
- "reference": "12e7e52515ce37191b193cf3365903c4f3951e35",
+ "url": "https://api.github.com/repos/symfony/config/zipball/5c6152766251ff45a44b76affadd5287e253fb27",
+ "reference": "5c6152766251ff45a44b76affadd5287e253fb27",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.2",
"symfony/deprecation-contracts": "^2.5|^3",
- "symfony/filesystem": "^5.4|^6.0|^7.0",
+ "symfony/filesystem": "^7.1",
"symfony/polyfill-ctype": "~1.8"
},
"conflict": {
- "symfony/finder": "<5.4",
+ "symfony/finder": "<6.4",
"symfony/service-contracts": "<2.5"
},
"require-dev": {
- "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
- "symfony/finder": "^5.4|^6.0|^7.0",
- "symfony/messenger": "^5.4|^6.0|^7.0",
+ "symfony/event-dispatcher": "^6.4|^7.0",
+ "symfony/finder": "^6.4|^7.0",
+ "symfony/messenger": "^6.4|^7.0",
"symfony/service-contracts": "^2.5|^3",
- "symfony/yaml": "^5.4|^6.0|^7.0"
+ "symfony/yaml": "^6.4|^7.0"
},
"type": "library",
"autoload": {
@@ -5667,7 +5730,7 @@
"description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/config/tree/v6.4.8"
+ "source": "https://github.com/symfony/config/tree/v7.1.6"
},
"funding": [
{
@@ -5683,44 +5746,43 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:49:08+00:00"
+ "time": "2024-10-25T15:11:02+00:00"
},
{
"name": "symfony/dependency-injection",
- "version": "v6.4.8",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "d3b618176e8c3a9e5772151c51eba0c52a0c771c"
+ "reference": "1f12f9d580ef8dd09e3b756aa111cc2d5f311bfd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/d3b618176e8c3a9e5772151c51eba0c52a0c771c",
- "reference": "d3b618176e8c3a9e5772151c51eba0c52a0c771c",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/1f12f9d580ef8dd09e3b756aa111cc2d5f311bfd",
+ "reference": "1f12f9d580ef8dd09e3b756aa111cc2d5f311bfd",
"shasum": ""
},
"require": {
- "php": ">=8.1",
+ "php": ">=8.2",
"psr/container": "^1.1|^2.0",
"symfony/deprecation-contracts": "^2.5|^3",
- "symfony/service-contracts": "^2.5|^3.0",
- "symfony/var-exporter": "^6.2.10|^7.0"
+ "symfony/service-contracts": "^3.5",
+ "symfony/var-exporter": "^6.4|^7.0"
},
"conflict": {
"ext-psr": "<1.1|>=2",
- "symfony/config": "<6.1",
- "symfony/finder": "<5.4",
- "symfony/proxy-manager-bridge": "<6.3",
- "symfony/yaml": "<5.4"
+ "symfony/config": "<6.4",
+ "symfony/finder": "<6.4",
+ "symfony/yaml": "<6.4"
},
"provide": {
"psr/container-implementation": "1.1|2.0",
"symfony/service-implementation": "1.1|2.0|3.0"
},
"require-dev": {
- "symfony/config": "^6.1|^7.0",
- "symfony/expression-language": "^5.4|^6.0|^7.0",
- "symfony/yaml": "^5.4|^6.0|^7.0"
+ "symfony/config": "^6.4|^7.0",
+ "symfony/expression-language": "^6.4|^7.0",
+ "symfony/yaml": "^6.4|^7.0"
},
"type": "library",
"autoload": {
@@ -5748,7 +5810,7 @@
"description": "Allows you to standardize and centralize the way objects are constructed in your application",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/dependency-injection/tree/v6.4.8"
+ "source": "https://github.com/symfony/dependency-injection/tree/v7.1.6"
},
"funding": [
{
@@ -5764,38 +5826,36 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:49:08+00:00"
+ "time": "2024-10-25T15:11:02+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "v6.4.8",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "ad23ca4312395f0a8a8633c831ef4c4ee542ed25"
+ "reference": "cb5bd55a6b8c2c1c7fb68b0aeae0e257948a720c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ad23ca4312395f0a8a8633c831ef4c4ee542ed25",
- "reference": "ad23ca4312395f0a8a8633c831ef4c4ee542ed25",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/cb5bd55a6b8c2c1c7fb68b0aeae0e257948a720c",
+ "reference": "cb5bd55a6b8c2c1c7fb68b0aeae0e257948a720c",
"shasum": ""
},
"require": {
- "php": ">=8.1",
- "symfony/deprecation-contracts": "^2.5|^3",
+ "php": ">=8.2",
"symfony/polyfill-mbstring": "~1.0"
},
"conflict": {
- "symfony/console": "<5.4"
+ "symfony/console": "<6.4"
},
"require-dev": {
"ext-iconv": "*",
- "symfony/console": "^5.4|^6.0|^7.0",
- "symfony/error-handler": "^6.3|^7.0",
- "symfony/http-kernel": "^5.4|^6.0|^7.0",
- "symfony/process": "^5.4|^6.0|^7.0",
- "symfony/uid": "^5.4|^6.0|^7.0",
- "twig/twig": "^2.13|^3.0.4"
+ "symfony/console": "^6.4|^7.0",
+ "symfony/http-kernel": "^6.4|^7.0",
+ "symfony/process": "^6.4|^7.0",
+ "symfony/uid": "^6.4|^7.0",
+ "twig/twig": "^3.0.4"
},
"bin": [
"Resources/bin/var-dump-server"
@@ -5833,7 +5893,7 @@
"dump"
],
"support": {
- "source": "https://github.com/symfony/var-dumper/tree/v6.4.8"
+ "source": "https://github.com/symfony/var-dumper/tree/v7.1.6"
},
"funding": [
{
@@ -5849,30 +5909,29 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:49:08+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
"name": "symfony/var-exporter",
- "version": "v6.4.8",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-exporter.git",
- "reference": "792ca836f99b340f2e9ca9497c7953948c49a504"
+ "reference": "90173ef89c40e7c8c616653241048705f84130ef"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-exporter/zipball/792ca836f99b340f2e9ca9497c7953948c49a504",
- "reference": "792ca836f99b340f2e9ca9497c7953948c49a504",
+ "url": "https://api.github.com/repos/symfony/var-exporter/zipball/90173ef89c40e7c8c616653241048705f84130ef",
+ "reference": "90173ef89c40e7c8c616653241048705f84130ef",
"shasum": ""
},
"require": {
- "php": ">=8.1",
- "symfony/deprecation-contracts": "^2.5|^3"
+ "php": ">=8.2"
},
"require-dev": {
"symfony/property-access": "^6.4|^7.0",
"symfony/serializer": "^6.4|^7.0",
- "symfony/var-dumper": "^5.4|^6.0|^7.0"
+ "symfony/var-dumper": "^6.4|^7.0"
},
"type": "library",
"autoload": {
@@ -5910,7 +5969,7 @@
"serialize"
],
"support": {
- "source": "https://github.com/symfony/var-exporter/tree/v6.4.8"
+ "source": "https://github.com/symfony/var-exporter/tree/v7.1.6"
},
"funding": [
{
@@ -5926,32 +5985,31 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:49:08+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
"name": "symfony/yaml",
- "version": "v6.4.8",
+ "version": "v7.1.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "52903de178d542850f6f341ba92995d3d63e60c9"
+ "reference": "3ced3f29e4f0d6bce2170ff26719f1fe9aacc671"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/52903de178d542850f6f341ba92995d3d63e60c9",
- "reference": "52903de178d542850f6f341ba92995d3d63e60c9",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/3ced3f29e4f0d6bce2170ff26719f1fe9aacc671",
+ "reference": "3ced3f29e4f0d6bce2170ff26719f1fe9aacc671",
"shasum": ""
},
"require": {
- "php": ">=8.1",
- "symfony/deprecation-contracts": "^2.5|^3",
+ "php": ">=8.2",
"symfony/polyfill-ctype": "^1.8"
},
"conflict": {
- "symfony/console": "<5.4"
+ "symfony/console": "<6.4"
},
"require-dev": {
- "symfony/console": "^5.4|^6.0|^7.0"
+ "symfony/console": "^6.4|^7.0"
},
"bin": [
"Resources/bin/yaml-lint"
@@ -5982,7 +6040,7 @@
"description": "Loads and dumps YAML files",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/yaml/tree/v6.4.8"
+ "source": "https://github.com/symfony/yaml/tree/v7.1.6"
},
"funding": [
{
@@ -5998,7 +6056,7 @@
"type": "tidelift"
}
],
- "time": "2024-05-31T14:49:08+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
"name": "thecodingmachine/safe",
@@ -6250,7 +6308,7 @@
],
"aliases": [],
"minimum-stability": "stable",
- "stability-flags": [],
+ "stability-flags": {},
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
@@ -6259,6 +6317,6 @@
"ext-json": "*",
"ext-tokenizer": "*"
},
- "platform-dev": [],
+ "platform-dev": {},
"plugin-api-version": "2.6.0"
}
diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix
index ffb58ccaccf2..782d1744ca63 100644
--- a/pkgs/development/php-packages/php-cs-fixer/default.nix
+++ b/pkgs/development/php-packages/php-cs-fixer/default.nix
@@ -4,21 +4,21 @@
php,
}:
-php.buildComposerProject (finalAttrs: {
+php.buildComposerProject2 (finalAttrs: {
pname = "php-cs-fixer";
- version = "3.58.1";
+ version = "3.64.0";
src = fetchFromGitHub {
owner = "PHP-CS-Fixer";
repo = "PHP-CS-Fixer";
rev = "v${finalAttrs.version}";
- hash = "sha256-MBNFTHhApANDeHY0tTKbIP2EfVDH7mxwA42PKihzPug=";
+ hash = "sha256-N2m3U0HjwQtm7loqYfEl7kstqljXC8evp6GEh+Cd9Hs=";
};
- # Missing `composer.lock` from the repository.
- # Issue open at https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7590
+ # Upstream doesn't provide a composer.lock.
+ # More info at https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7590
composerLock = ./composer.lock;
- vendorHash = "sha256-dryqtCUr2xkZgDRLKpQjyEpLGz8WiHtLY4fF/pCR10w=";
+ vendorHash = "sha256-cOKfvNjFl9QKwPZp81IHaRurRhmXgbydhdTWYknlGBM=";
meta = {
changelog = "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/tag/v${finalAttrs.version}";
diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix
index b95adda59d70..7cbe3449b831 100644
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "ailment";
- version = "9.2.124";
+ version = "9.2.126";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "angr";
repo = "ailment";
rev = "refs/tags/v${version}";
- hash = "sha256-wGpLRaoW6rZIT+vEpbjtjSJhBZbNNrpxt/+q6zTuJ9A=";
+ hash = "sha256-C5hOeMdZ0D8T61TyJ8uEhuy+VnVc/6GQ3PteuicUpzA=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix
index 00592ed89516..4cc00dd93d2b 100644
--- a/pkgs/development/python-modules/aiocoap/default.nix
+++ b/pkgs/development/python-modules/aiocoap/default.nix
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "aiocoap";
- version = "0.4.10";
+ version = "0.4.11";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "chrysn";
repo = "aiocoap";
rev = "refs/tags/${version}";
- hash = "sha256-sKDkbv8OyPewfQpunFxezP0wjy3EAQxsQ0UfUm0REPM=";
+ hash = "sha256-a2qhMDFkRbMK4+xvPc140i0lPaWbTWeFlpvdLaNtOxA=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index e021832f15d1..7988785382a4 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -6,6 +6,7 @@
fetchFromGitHub,
substituteAll,
python,
+ isPy310,
# build-system
cython,
@@ -113,6 +114,11 @@ buildPythonPackage rec {
# don't run benchmarks
"test_import_time"
]
+ # these tests fail with python310 but succeeds with 11+
+ ++ lib.optionals isPy310 [
+ "test_https_proxy_unsupported_tls_in_tls"
+ "test_tcp_connector_raise_connector_ssl_error"
+ ]
++ lib.optionals stdenv.hostPlatform.is32bit [ "test_cookiejar" ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
"test_addresses" # https://github.com/aio-libs/aiohttp/issues/3572, remove >= v4.0.0
diff --git a/pkgs/development/python-modules/aiokafka/default.nix b/pkgs/development/python-modules/aiokafka/default.nix
index c44bf8e44468..131f0c041323 100644
--- a/pkgs/development/python-modules/aiokafka/default.nix
+++ b/pkgs/development/python-modules/aiokafka/default.nix
@@ -15,16 +15,16 @@
buildPythonPackage rec {
pname = "aiokafka";
- version = "0.11.0";
+ version = "0.12.0";
pyproject = true;
- disabled = pythonOlder "3.8";
+ disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "aio-libs";
repo = "aiokafka";
rev = "refs/tags/v${version}";
- hash = "sha256-CeEPRCsf2SFI5J5FuQlCRRtlOPcCtRiGXJUIQOAbyCc=";
+ hash = "sha256-OU/Kept3TvMfGvVCjSthfZnfTX6/T0Fy3PS/ynrV3Cg=";
};
build-system = [
diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix
index fff4745000db..963ddc56eaad 100644
--- a/pkgs/development/python-modules/aioopenexchangerates/default.nix
+++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "aioopenexchangerates";
- version = "0.6.7";
+ version = "0.6.8";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "MartinHjelmare";
repo = "aioopenexchangerates";
rev = "refs/tags/v${version}";
- hash = "sha256-vXDgtoQWKWLadOFtZR+zsYvNAsdfMDqFBKz0tWOsMEE=";
+ hash = "sha256-O7Hq+dtonh527eJI4/YSIF58P3TWsdFlUYDd0vzA2yo=";
};
pythonRelaxDeps = [ "pydantic" ];
diff --git a/pkgs/development/python-modules/aiooui/default.nix b/pkgs/development/python-modules/aiooui/default.nix
index bc087915bf4f..ec2dfb2f035c 100644
--- a/pkgs/development/python-modules/aiooui/default.nix
+++ b/pkgs/development/python-modules/aiooui/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "aiooui";
- version = "0.1.6";
+ version = "0.1.7";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = "aiooui";
rev = "refs/tags/v${version}";
- hash = "sha256-dsMVKfY9o1krzp100/7JtClgPrpsFTVNwMnYMqOVFIU=";
+ hash = "sha256-vnO3Lh+d/8mES2i4jKTH4RviURUFqb3Vj6u5sxUGf1o=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix
index 378d17562cbe..24f53e3ea0f5 100644
--- a/pkgs/development/python-modules/aiortm/default.nix
+++ b/pkgs/development/python-modules/aiortm/default.nix
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "aiortm";
- version = "0.9.17";
+ version = "0.9.22";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "MartinHjelmare";
repo = "aiortm";
rev = "refs/tags/v${version}";
- hash = "sha256-mn0BXKfDbbLPt11uhF1laL2F/OA7+w1vHM5SaCQWJRw=";
+ hash = "sha256-n8wdHmWMnbgQF6I34ifmNFMv48XowE7JIOkX5kko/io=";
};
pythonRelaxDeps = [ "typer" ];
diff --git a/pkgs/development/python-modules/aioslimproto/default.nix b/pkgs/development/python-modules/aioslimproto/default.nix
index 0f6d21d3aefb..037c74bc9b99 100644
--- a/pkgs/development/python-modules/aioslimproto/default.nix
+++ b/pkgs/development/python-modules/aioslimproto/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "aioslimproto";
- version = "3.0.1";
+ version = "3.1.0";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "aioslimproto";
rev = "refs/tags/${version}";
- hash = "sha256-K7z34fT0PQ5qcV+66VbhYTUhCjqW/OjPnrygBFKIW1k=";
+ hash = "sha256-3soqvZld92ohCEwTFaMIOC+cvOjBQyVQOoLmKr53aMA=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/aiostreammagic/default.nix b/pkgs/development/python-modules/aiostreammagic/default.nix
index 112e84f2d469..cc8f71f1a851 100644
--- a/pkgs/development/python-modules/aiostreammagic/default.nix
+++ b/pkgs/development/python-modules/aiostreammagic/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aiostreammagic";
- version = "2.8.1";
+ version = "2.8.4";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "noahhusby";
repo = "aiostreammagic";
rev = "refs/tags/${version}";
- hash = "sha256-xXKI7qbIAyG957TTZHoA23sQvvom2TNDGSGSTlRcZUQ=";
+ hash = "sha256-TleCQjx1s8S1YTxh/d1T3oozQAwzPTCurzjLjDCebik=";
};
pythonRelaxDeps = [ "websockets" ];
diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix
index e6dd777a466e..e2c08fc5ba7c 100644
--- a/pkgs/development/python-modules/aioswitcher/default.nix
+++ b/pkgs/development/python-modules/aioswitcher/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "aioswitcher";
- version = "4.1.0";
+ version = "4.3.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "TomerFi";
repo = "aioswitcher";
rev = "refs/tags/${version}";
- hash = "sha256-iWEmKyg20qCww/Q+HjOj4Owp26xgY1kXQHVkmxFPfr4=";
+ hash = "sha256-NQm3mKjXsv+0xFuRY3w7f4RmMhOjdb8wGVYcXoto8ZE=";
};
__darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix
index 766e321f45ea..854ab37120a2 100644
--- a/pkgs/development/python-modules/airthings-ble/default.nix
+++ b/pkgs/development/python-modules/airthings-ble/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "airthings-ble";
- version = "0.9.1";
+ version = "0.9.2";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "vincegio";
repo = "airthings-ble";
rev = "refs/tags/${version}";
- hash = "sha256-pk/S0ufzirH4Xny0+nFVH366d0imqB2K6NvkGP7jAU4=";
+ hash = "sha256-m2jsXLrj2yS2Wi2dSwyxBv/nXmU738gd5iJ1JVfakUg=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/albucore/default.nix b/pkgs/development/python-modules/albucore/default.nix
index 07f2e3f4ce72..285c643038d7 100644
--- a/pkgs/development/python-modules/albucore/default.nix
+++ b/pkgs/development/python-modules/albucore/default.nix
@@ -7,21 +7,21 @@
pytestCheckHook,
numpy,
opencv4,
- typing-extensions,
+ stringzilla,
}:
buildPythonPackage rec {
pname = "albucore";
- version = "0.0.17";
+ version = "0.0.19";
pyproject = true;
- disabled = pythonOlder "3.8";
+ disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "albumentations-team";
repo = "albucore";
rev = "refs/tags/${version}";
- hash = "sha256-9fv5jewfL3JKhZyD0YS1WDNZ7wWt+8iF2DcygCOl168=";
+ hash = "sha256-GwT7Py7pKbpHxx4avj37/hRjSJXdH5uBU11nCITysVw=";
};
pythonRemoveDeps = [ "opencv-python" ];
@@ -31,7 +31,7 @@ buildPythonPackage rec {
dependencies = [
numpy
opencv4
- typing-extensions
+ stringzilla
];
pythonImportsCheck = [ "albucore" ];
diff --git a/pkgs/development/python-modules/albumentations/default.nix b/pkgs/development/python-modules/albumentations/default.nix
index 65a26d13baa0..a613b6340754 100644
--- a/pkgs/development/python-modules/albumentations/default.nix
+++ b/pkgs/development/python-modules/albumentations/default.nix
@@ -15,6 +15,7 @@
pydantic,
pyyaml,
scikit-image,
+ scipy,
# optional dependencies
huggingface-hub,
@@ -30,7 +31,7 @@
buildPythonPackage rec {
pname = "albumentations";
- version = "1.4.17";
+ version = "1.4.20";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -39,9 +40,13 @@ buildPythonPackage rec {
owner = "albumentations-team";
repo = "albumentations";
rev = "refs/tags/${version}";
- hash = "sha256-4JOqaSpBXSrAR3qrOeab+PvhXPcoEnblO0n9TSqW0bY=";
+ hash = "sha256-lyYbkO2J3kpZGk8Q3FYfRiQh+BdolCfeEcjlI3W/rIw=";
};
+ patches = [
+ ./dont-check-for-updates.patch
+ ];
+
pythonRemoveDeps = [ "opencv-python" ];
build-system = [ setuptools ];
@@ -54,6 +59,7 @@ buildPythonPackage rec {
pydantic
pyyaml
scikit-image
+ scipy
];
optional-dependencies = {
diff --git a/pkgs/development/python-modules/albumentations/dont-check-for-updates.patch b/pkgs/development/python-modules/albumentations/dont-check-for-updates.patch
new file mode 100644
index 000000000000..617ce259ca2b
--- /dev/null
+++ b/pkgs/development/python-modules/albumentations/dont-check-for-updates.patch
@@ -0,0 +1,12 @@
+diff --git a/albumentations/__init__.py b/albumentations/__init__.py
+index 0b3b531..7c69c65 100644
+--- a/albumentations/__init__.py
++++ b/albumentations/__init__.py
+@@ -7,7 +7,3 @@ from .augmentations import *
+ from .core.composition import *
+ from .core.serialization import *
+ from .core.transforms_interface import *
+-
+-# Perform the version check after all other initializations
+-if os.getenv("NO_ALBUMENTATIONS_UPDATE", "").lower() not in {"true", "1"}:
+- check_for_updates()
diff --git a/pkgs/development/python-modules/ancp-bids/default.nix b/pkgs/development/python-modules/ancp-bids/default.nix
index a595a57a5ed0..8dd6dc28eeec 100644
--- a/pkgs/development/python-modules/ancp-bids/default.nix
+++ b/pkgs/development/python-modules/ancp-bids/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "ancp-bids";
- version = "0.2.4";
+ version = "0.2.5";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "ANCPLabOldenburg";
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-c6X1gCYAezgZQP6xfQPfKW8V35F1cnTdbryEp3sZ4jw=";
+ hash = "sha256-bfHphFecPHKoVow8v+20LuQt6X1BGGtoTK4T9vhIkSc=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix
index c277a6e28993..5e1f96da1453 100644
--- a/pkgs/development/python-modules/androidtv/default.nix
+++ b/pkgs/development/python-modules/androidtv/default.nix
@@ -9,23 +9,26 @@
pure-python-adb,
pytestCheckHook,
pythonOlder,
+ setuptools,
}:
buildPythonPackage rec {
pname = "androidtv";
- version = "0.0.73";
- format = "setuptools";
+ version = "0.0.74";
+ pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "JeffLIrion";
repo = "python-androidtv";
- rev = "v${version}";
- hash = "sha256-FJUTJfS9jiC7KDf6XcGVRNXf75bVUOBPZe8y9M39Uak=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-aURHor+7E0Z4DyN/s1/BMBJo/FmvAlRsKs9Q0Thelyc=";
};
- propagatedBuildInputs = [
+ build-system = [ setuptools ];
+
+ dependencies = [
adb-shell
async-timeout
pure-python-adb
diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix
index 49cf0210b224..dc9e0a19a3bb 100644
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@@ -36,7 +36,7 @@
buildPythonPackage rec {
pname = "angr";
- version = "9.2.124";
+ version = "9.2.126";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -45,7 +45,7 @@ buildPythonPackage rec {
owner = "angr";
repo = "angr";
rev = "refs/tags/v${version}";
- hash = "sha256-tjopUg0EZved31bYfrxchqOfQwzEo7dKxX/uUhngJzc=";
+ hash = "sha256-M74RNmjld7nuybotPjNZ1bYMDlYnOn1c/clS2ZlMe/o=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/anitopy/default.nix b/pkgs/development/python-modules/anitopy/default.nix
index 95f3af2b7cb5..d7d3f2a0e56b 100644
--- a/pkgs/development/python-modules/anitopy/default.nix
+++ b/pkgs/development/python-modules/anitopy/default.nix
@@ -16,7 +16,6 @@ buildPythonPackage rec {
};
pythonImportsCheck = [ "anitopy" ];
- doCheck = true;
meta = with lib; {
description = "Python library for parsing anime video filenames";
diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix
index fc0e5f9ab36e..42b60a1b59f3 100644
--- a/pkgs/development/python-modules/ansible/core.nix
+++ b/pkgs/development/python-modules/ansible/core.nix
@@ -30,12 +30,12 @@
buildPythonPackage rec {
pname = "ansible-core";
- version = "2.17.4";
+ version = "2.17.5";
src = fetchPypi {
pname = "ansible_core";
inherit version;
- hash = "sha256-RKHzAHZ5ZTa6JFXK0Y025ihw8E5jLjyi6+lw176s8k0=";
+ hash = "sha256-rn9R/RPcnVfJvNQ+8j+cJVyo8Y9LXAARpPm3JNksWo4=";
};
# ansible_connection is already wrapped, so don't pass it through
diff --git a/pkgs/development/python-modules/apple-weatherkit/default.nix b/pkgs/development/python-modules/apple-weatherkit/default.nix
index 60cfd6d9e71e..d7d21ad746fc 100644
--- a/pkgs/development/python-modules/apple-weatherkit/default.nix
+++ b/pkgs/development/python-modules/apple-weatherkit/default.nix
@@ -11,8 +11,8 @@
buildPythonPackage rec {
pname = "apple-weatherkit";
- version = "1.1.2";
- format = "pyproject";
+ version = "1.1.3";
+ pyproject = true;
disabled = pythonOlder "3.11";
@@ -20,12 +20,12 @@ buildPythonPackage rec {
owner = "tjhorner";
repo = "python-weatherkit";
rev = "refs/tags/v${version}";
- hash = "sha256-w3KinicaF01I6fIidI7XYHpB8eq52RTUw/BMLrx6Grk=";
+ hash = "sha256-JvN8GmlTxz9VGttIFVG6q//c+BhP2pt1tBOhnJhNwJg=";
};
- nativeBuildInputs = [ poetry-core ];
+ build-system = [ poetry-core ];
- propagatedBuildInputs = [
+ dependencies = [
aiohttp
aiohttp-retry
pyjwt
diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix
index 01ed99cb621b..aa9fd60a8a4c 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.1.0";
+ version = "6.1.1";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "AppThreat";
repo = "vulnerability-db";
rev = "refs/tags/v${version}";
- hash = "sha256-phqlzL2t7wv1Fxi8ZdTospcpHRcS9Q+mlpKRP6VeB4o=";
+ hash = "sha256-FISV+wEpoRVfHNjN/fZw7aqFp5XDvB21ZhQhRQvCnHY=";
};
pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix
index 3f437b0b3210..47eb444d07b5 100644
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "archinfo";
- version = "9.2.124";
+ version = "9.2.126";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "angr";
repo = "archinfo";
rev = "refs/tags/v${version}";
- hash = "sha256-h0qZdFgDyowcr79YXkqww2dkUv+wRFCxY7gS4Nu2b6s=";
+ hash = "sha256-LMRZMZeQZVDnIUyqtE90WI9uFHIPSm5d0duWw5ew054=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/asteroid-filterbanks/default.nix b/pkgs/development/python-modules/asteroid-filterbanks/default.nix
index 9c4181642175..e7dc0cba9798 100644
--- a/pkgs/development/python-modules/asteroid-filterbanks/default.nix
+++ b/pkgs/development/python-modules/asteroid-filterbanks/default.nix
@@ -5,7 +5,6 @@
setuptools,
wheel,
black,
- codecov,
coverage,
librosa,
numpy,
@@ -34,7 +33,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [
black
- codecov
coverage
librosa
numpy
diff --git a/pkgs/development/python-modules/automower-ble/default.nix b/pkgs/development/python-modules/automower-ble/default.nix
new file mode 100644
index 000000000000..5a2dbd5d8c30
--- /dev/null
+++ b/pkgs/development/python-modules/automower-ble/default.nix
@@ -0,0 +1,39 @@
+{
+ lib,
+ bleak,
+ buildPythonPackage,
+ fetchFromGitHub,
+ setuptools,
+ pytestCheckHook,
+ pythonOlder,
+}:
+
+buildPythonPackage rec {
+ pname = "automower-ble";
+ version = "0.2.0";
+ pyproject = true;
+
+ disabled = pythonOlder "3.10";
+
+ src = fetchFromGitHub {
+ owner = "alistair23";
+ repo = "AutoMower-BLE";
+ rev = "refs/tags/${version}";
+ hash = "sha256-BWfRXz78e1Xq0fNOGJ2IFnjNqfH3oD5VIGMxyCPtEUw=";
+ };
+
+ build-system = [ setuptools ];
+
+ dependencies = [ bleak ];
+
+ nativeCheckInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "automower_ble" ];
+
+ meta = {
+ description = "Module to connect to Husqvarna Automower Connect";
+ homepage = "https://github.com/alistair23/AutoMower-BLE";
+ license = lib.licenses.gpl3Only;
+ maintainers = with lib.maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/avwx-engine/default.nix b/pkgs/development/python-modules/avwx-engine/default.nix
index 808530221781..aaae9c534eb7 100644
--- a/pkgs/development/python-modules/avwx-engine/default.nix
+++ b/pkgs/development/python-modules/avwx-engine/default.nix
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "avwx-engine";
- version = "1.9.0";
+ version = "1.9.1";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "avwx-rest";
repo = "avwx-engine";
rev = "refs/tags/${version}";
- hash = "sha256-CUnUz2SsXtWaqGzaB1PH+EoHqebSue6e8GXhRZRcXLs=";
+ hash = "sha256-gDhZlrxiIyj15nxMBFFzuCAHtkDfqYowDZc5g4pQ+i8=";
};
build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/aw-client/default.nix b/pkgs/development/python-modules/aw-client/default.nix
index 42c51ed2f806..bec43cbf2dbe 100644
--- a/pkgs/development/python-modules/aw-client/default.nix
+++ b/pkgs/development/python-modules/aw-client/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "aw-client";
- version = "0.5.13";
+ version = "0.5.14";
format = "pyproject";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "ActivityWatch";
repo = "aw-client";
rev = "v${version}";
- sha256 = "sha256-A9f1Wj4F6qRvCVj3iRQvsnILewJK1L5tfI2MnAXZ4nY=";
+ sha256 = "sha256-HTyhQz/RaNdCtJIV6YHEd6Yhu9VRJ8E9XdN7NcoO8ao=";
};
disabled = pythonOlder "3.8";
diff --git a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix
index 9fc23174d60d..d933f721da39 100644
--- a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix
@@ -11,20 +11,20 @@
buildPythonPackage rec {
pname = "azure-mgmt-appconfiguration";
- version = "3.0.0";
+ version = "3.1.0";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchPypi {
- inherit pname version;
- hash = "sha256-FJhuVgqNjdRIegP4vUISrAtHvvVle5VQFVITPm4HLEw=";
- extension = "zip";
+ pname = "azure_mgmt_appconfiguration";
+ inherit version;
+ hash = "sha256-BZbwnn54Qb6R3eHIGBNBALv6EkSG4GiJ0jndWHdEtHw=";
};
- nativeBuildInputs = [ setuptools ];
+ build-system = [ setuptools ];
- propagatedBuildInputs = [
+ dependencies = [
azure-common
azure-mgmt-core
isodate
diff --git a/pkgs/development/python-modules/azure-mgmt-automation/default.nix b/pkgs/development/python-modules/azure-mgmt-automation/default.nix
new file mode 100644
index 000000000000..8de27d0b7fcc
--- /dev/null
+++ b/pkgs/development/python-modules/azure-mgmt-automation/default.nix
@@ -0,0 +1,42 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchPypi,
+ setuptools,
+ msrest,
+ azure-common,
+ azure-mgmt-core,
+}:
+
+buildPythonPackage rec {
+ pname = "azure-mgmt-automation";
+ version = "1.0.0";
+ pyproject = true;
+
+ src = fetchPypi {
+ inherit pname version;
+ extension = "zip";
+ hash = "sha256-pJ0tQT/vVwEMs2Fh5bwFZgG418bQW9PLBaE1Eu8pHh4=";
+ };
+
+ build-system = [ setuptools ];
+
+ dependencies = [
+ msrest
+ azure-common
+ azure-mgmt-core
+ ];
+
+ # has no tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "azure.mgmt.automation" ];
+
+ meta = with lib; {
+ description = "This is the Microsoft Azure Automation Client Library";
+ homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/automation/azure-mgmt-automation";
+ changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-automation_${version}/sdk/automation/azure-mgmt-automation/CHANGELOG.md";
+ license = licenses.mit;
+ maintainers = with maintainers; [ wfdewith ];
+ };
+}
diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
index 876c7f25fdec..305f98a6459d 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "azure-mgmt-containerservice";
- version = "32.0.0";
+ version = "32.1.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "azure_mgmt_containerservice";
inherit version;
- hash = "sha256-zLWHR52Kk+x49xYlkK3ILk+6TeduStw0GfM60iXvspI=";
+ hash = "sha256-rxOS1MT1F0tbt+OyjpITfSmPOt1U5AJ3LfKvzPEmO6A=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/pkgs/development/python-modules/azure-mgmt-dns/default.nix
index b166ab5ea0f7..3fda65ab7524 100644
--- a/pkgs/development/python-modules/azure-mgmt-dns/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-dns/default.nix
@@ -1,43 +1,48 @@
{
lib,
- buildPythonPackage,
- fetchPypi,
- msrest,
- msrestazure,
azure-common,
azure-mgmt-core,
+ buildPythonPackage,
+ fetchPypi,
+ isodate,
+ pythonOlder,
+ setuptools,
+ typing-extensions,
}:
buildPythonPackage rec {
pname = "azure-mgmt-dns";
- version = "8.1.0";
- format = "setuptools";
+ version = "8.2.0";
+ pyproject = true;
+
+ disabled = pythonOlder "3.8";
src = fetchPypi {
- inherit pname version;
- extension = "zip";
- hash = "sha256-2DedS7kZS4G3nlKE2HX6bfgHBzRvLLtcVJGiDzUmb9A=";
+ pname = "azure_mgmt_dns";
+ inherit version;
+ hash = "sha256-Ynueo98L94qJWsrcUUjeyEwomAY7+qv/+LFLqpg7WW4=";
};
- propagatedBuildInputs = [
- msrest
- msrestazure
+ build-system = [ setuptools ];
+
+ dependencies = [
azure-common
azure-mgmt-core
+ isodate
+ typing-extensions
];
# this is still needed for when the version is overrided
pythonNamespaces = [ "azure.mgmt" ];
- # has no tests
+ # Tests are only available in the mono-repo
doCheck = false;
meta = with lib; {
description = "This is the Microsoft Azure DNS Management Client Library";
- homepage = "https://github.com/Azure/azure-sdk-for-python";
+ homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/network/azure-mgmt-dns";
+ changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-dns_${version}/sdk/network/azure-mgmt-dns/CHANGELOG.md";
license = licenses.mit;
- maintainers = with maintainers; [
- maxwilson
- ];
+ maintainers = with maintainers; [ maxwilson ];
};
}
diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
index 0a5ca8dcfefc..dfe2a9772b89 100644
--- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
@@ -11,14 +11,15 @@
buildPythonPackage rec {
pname = "azure-mgmt-netapp";
- version = "13.2.0";
+ version = "13.3.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
- inherit pname version;
- hash = "sha256-31wzzDeQrs04AL8Qsz050RY/AllvXwy+8Ng+QbUihjo=";
+ pname = "azure_mgmt_netapp";
+ inherit version;
+ hash = "sha256-N0Fnnigw6sk5M2Cx9T2CtMAe0S64WN73shukkWMkiEk=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/bambi/default.nix b/pkgs/development/python-modules/bambi/default.nix
index 4dec3ccfc4b9..e85ae6b888fa 100644
--- a/pkgs/development/python-modules/bambi/default.nix
+++ b/pkgs/development/python-modules/bambi/default.nix
@@ -1,17 +1,17 @@
{
lib,
- buildPythonPackage,
- pythonOlder,
- fetchFromGitHub,
- setuptools,
arviz,
+ blackjax,
+ buildPythonPackage,
+ fetchFromGitHub,
formulae,
graphviz,
+ numpyro,
pandas,
pymc,
- blackjax,
- numpyro,
pytestCheckHook,
+ pythonOlder,
+ setuptools-scm,
}:
buildPythonPackage rec {
@@ -19,7 +19,7 @@ buildPythonPackage rec {
version = "0.14.0";
pyproject = true;
- disabled = pythonOlder "3.8";
+ disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "bambinos";
@@ -28,9 +28,9 @@ buildPythonPackage rec {
hash = "sha256-kxrNNbZfC96/XHb1I7aUHYZdFJvGR80ZI8ell/0FQXc=";
};
- nativeBuildInputs = [ setuptools ];
+ build-system = [ setuptools-scm ];
- propagatedBuildInputs = [
+ dependencies = [
arviz
formulae
graphviz
@@ -38,9 +38,10 @@ buildPythonPackage rec {
pymc
];
- preCheck = ''
- export HOME=$(mktemp -d)
- '';
+ # bayeux-ml is not available in nixpkgs
+ # optional-dependencies = {
+ # jax = [ bayeux-ml ];
+ # };
nativeCheckInputs = [
blackjax
@@ -48,6 +49,10 @@ buildPythonPackage rec {
pytestCheckHook
];
+ preCheck = ''
+ export HOME=$(mktemp -d)
+ '';
+
disabledTests = [
# Tests require network access
"test_alias_equal_to_name"
@@ -65,29 +70,38 @@ buildPythonPackage rec {
"test_group_effects"
"test_hdi_prob"
"test_legend"
+ "test_model_with_group_specific_effects"
+ "test_model_with_intercept"
+ "test_model_without_intercept"
"test_non_distributional_model"
"test_normal_with_splines"
- "test_predict_offset"
- "test_predict_new_groups"
"test_predict_new_groups_fail"
+ "test_predict_new_groups"
+ "test_predict_offset"
"test_set_alias_warnings"
"test_subplot_kwargs"
"test_transforms"
"test_use_hdi"
- "test_with_groups"
"test_with_group_and_panel"
+ "test_with_groups"
"test_with_user_values"
];
+ disabledTestPaths = [
+ # bayeux-ml is not available
+ "tests/test_alternative_samplers.py"
+ # Tests require network access
+ "tests/test_interpret.py"
+ "tests/test_interpret_messages.py"
+ ];
+
pythonImportsCheck = [ "bambi" ];
meta = with lib; {
- homepage = "https://bambinos.github.io/bambi";
description = "High-level Bayesian model-building interface";
+ homepage = "https://bambinos.github.io/bambi";
changelog = "https://github.com/bambinos/bambi/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ bcdarwin ];
- # https://github.com/NixOS/nixpkgs/issues/310940
- broken = true;
};
}
diff --git a/pkgs/development/python-modules/basemap-data-hires/default.nix b/pkgs/development/python-modules/basemap-data-hires/default.nix
new file mode 100644
index 000000000000..44d352a8822a
--- /dev/null
+++ b/pkgs/development/python-modules/basemap-data-hires/default.nix
@@ -0,0 +1,30 @@
+{
+ lib,
+ buildPythonPackage,
+ setuptools,
+ basemap,
+}:
+
+buildPythonPackage rec {
+ pname = "basemap-data-hires";
+ pyproject = true;
+ inherit (basemap) version src;
+
+ sourceRoot = "${src.name}/packages/basemap_data_hires";
+
+ build-system = [
+ setuptools
+ ];
+
+ # no tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "mpl_toolkits.basemap_data" ];
+
+ meta = {
+ homepage = "https://matplotlib.org/basemap/";
+ description = "High-resolution data assets for matplotlib basemap";
+ license = lib.licenses.lgpl3Plus;
+ maintainers = with lib.maintainers; [ moraxyc ];
+ };
+}
diff --git a/pkgs/development/python-modules/beziers/default.nix b/pkgs/development/python-modules/beziers/default.nix
index 2af89a69c9fd..e0fdaaca9c0a 100644
--- a/pkgs/development/python-modules/beziers/default.nix
+++ b/pkgs/development/python-modules/beziers/default.nix
@@ -24,7 +24,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [ pyclipper ];
- doCheck = true;
nativeCheckInputs = [
dotmap
matplotlib
diff --git a/pkgs/development/python-modules/bilibili-api-python/default.nix b/pkgs/development/python-modules/bilibili-api-python/default.nix
index db63bdb44780..0d6cfd6f3bf3 100644
--- a/pkgs/development/python-modules/bilibili-api-python/default.nix
+++ b/pkgs/development/python-modules/bilibili-api-python/default.nix
@@ -14,7 +14,6 @@
pyyaml,
qrcode,
qrcode-terminal,
- requests,
rsa,
setuptools,
setuptools-scm,
@@ -27,7 +26,8 @@ buildPythonPackage rec {
pyproject = true;
src = fetchPypi {
- inherit pname version;
+ pname = "bilibili_api_python";
+ inherit version;
hash = "sha256-mwhyFc3b1qA7W76gaBcAup+Wca6gQAdRwZJaZXOHqCw=";
};
@@ -51,7 +51,6 @@ buildPythonPackage rec {
brotli
httpx
qrcode
- requests
apscheduler
rsa
pillow
diff --git a/pkgs/development/python-modules/biopandas/default.nix b/pkgs/development/python-modules/biopandas/default.nix
index 87565248bc79..49808c6ee686 100644
--- a/pkgs/development/python-modules/biopandas/default.nix
+++ b/pkgs/development/python-modules/biopandas/default.nix
@@ -8,7 +8,6 @@
numpy,
pandas,
pytestCheckHook,
- fetchpatch2,
}:
buildPythonPackage rec {
@@ -23,22 +22,6 @@ buildPythonPackage rec {
hash = "sha256-dUeGjDDz9VA1NrFLGKy0ebaa+MU4c1tHi5YYkAspLRk=";
};
- patches = [
- # Needed for below patch to apply properly
- (fetchpatch2 {
- name = "deprecate-mmtf-parsing.patch";
- url = "https://github.com/BioPandas/biopandas/commit/7a1517dbe76f2c70da8edb35f90c9fa69254e726.patch?full_index=1";
- hash = "sha256-RFtXFqUYl8GnZ319HsBwx5SUbfUDnR66Ppakdvtg/wI=";
- })
- # Remove nose as a dependency.
- (fetchpatch2 {
- name = "remove-nose.patch";
- url = "https://github.com/BioPandas/biopandas/commit/67aa2f237c70c826cd9ab59d6ae114582da2112f.patch?full_index=1";
- hash = "sha256-fVl57/vGuzlYX/MBZnma1ZFCVmIpjr1k8t3bUJnb/uI=";
- excludes = [ "setup.py" ];
- })
- ];
-
pythonRelaxDeps = [ "looseversion" ];
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/bite-parser/default.nix b/pkgs/development/python-modules/bite-parser/default.nix
index 76abaebf6364..1b00a055a1f2 100644
--- a/pkgs/development/python-modules/bite-parser/default.nix
+++ b/pkgs/development/python-modules/bite-parser/default.nix
@@ -2,7 +2,7 @@
lib,
buildPythonPackage,
pythonOlder,
- fetchPypi,
+ fetchFromGitHub,
poetry-core,
pytest-asyncio,
pytestCheckHook,
@@ -10,19 +10,19 @@
buildPythonPackage rec {
pname = "bite-parser";
- version = "0.2.4";
+ version = "0.2.5";
+ pyproject = true;
- disabled = pythonOlder "3.8";
+ disabled = pythonOlder "3.9";
- format = "pyproject";
-
- src = fetchPypi {
- pname = "bite_parser";
- inherit version;
- hash = "sha256-Uq2FDoo5gztMRqtdkKYX0RULhjFgy+DeujC6BTZ3CZI=";
+ src = fetchFromGitHub {
+ owner = "jgosmann";
+ repo = "bite-parser";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-C508csRbjCeLgkp66TwDuxUtMITTmub5/TFv8x80HLA=";
};
- nativeBuildInputs = [ poetry-core ];
+ build-system = [ poetry-core ];
nativeCheckInputs = [
pytest-asyncio
@@ -34,7 +34,7 @@ buildPythonPackage rec {
meta = {
description = "Asynchronous parser taking incremental bites out of your byte input stream";
homepage = "https://github.com/jgosmann/bite-parser";
- changelog = "https://github.com/jgosmann/bite-parser/blob/v${version}/CHANGELOG.rst";
+ changelog = "https://github.com/jgosmann/bite-parser/blob/${src.rev}/CHANGELOG.rst";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
};
diff --git a/pkgs/development/python-modules/bitsandbytes/default.nix b/pkgs/development/python-modules/bitsandbytes/default.nix
index aeb964964dbc..90dde389144e 100644
--- a/pkgs/development/python-modules/bitsandbytes/default.nix
+++ b/pkgs/development/python-modules/bitsandbytes/default.nix
@@ -1,31 +1,34 @@
{
lib,
+ torch,
+ symlinkJoin,
buildPythonPackage,
fetchFromGitHub,
- python,
- pythonOlder,
+ cmake,
setuptools,
- wheel,
- torch,
scipy,
- symlinkJoin,
}:
let
pname = "bitsandbytes";
- version = "0.43.3";
+ version = "0.44.1";
- inherit (torch) cudaCapabilities cudaPackages cudaSupport;
- inherit (cudaPackages) backendStdenv cudaVersion;
+ inherit (torch) cudaPackages cudaSupport;
+ inherit (cudaPackages) cudaVersion;
+
+ cudaVersionString = lib.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor cudaVersion);
# NOTE: torchvision doesn't use cudnn; torch does!
# For this reason it is not included.
cuda-common-redist = with cudaPackages; [
- cuda_cccl #
- libcublas # cublas_v2.h
+ (lib.getDev cuda_cccl) #
+ (lib.getDev libcublas) # cublas_v2.h
+ (lib.getLib libcublas)
libcurand
libcusolver # cusolverDn.h
- libcusparse # cusparse.h
+ (lib.getDev libcusparse) # cusparse.h
+ (lib.getLib libcusparse) # cusparse.h
+ (lib.getDev cuda_cudart) # cuda_runtime.h cuda_runtime_api.h
];
cuda-native-redist = symlinkJoin {
@@ -33,7 +36,9 @@ let
paths =
with cudaPackages;
[
- cuda_cudart # cuda_runtime.h cuda_runtime_api.h
+ (lib.getDev cuda_cudart) # cuda_runtime.h cuda_runtime_api.h
+ (lib.getLib cuda_cudart)
+ (lib.getStatic cuda_cudart)
cuda_nvcc
]
++ cuda-common-redist;
@@ -48,47 +53,55 @@ buildPythonPackage {
inherit pname version;
pyproject = true;
- disabled = pythonOlder "3.7";
-
src = fetchFromGitHub {
owner = "TimDettmers";
repo = "bitsandbytes";
rev = "refs/tags/${version}";
- hash = "sha256-JOB+WCrLFjjeJJHbsOei8+D5CMuFmyVLnoKRd05tYDU=";
+ hash = "sha256-yvxD5ymMK5p4Xg7Csx/90mPV3yxUC6QUuF/8BKO2p0k=";
};
- postPatch =
- ''
- substituteInPlace Makefile --replace "/usr/bin/g++" "g++" --replace "lib64" "lib"
- substituteInPlace bitsandbytes/cuda_setup/main.py \
- --replace "binary_path = package_dir / self.binary_name" \
- "binary_path = Path('$out/${python.sitePackages}/${pname}')/self.binary_name"
- ''
- + lib.optionalString torch.cudaSupport ''
- substituteInPlace bitsandbytes/cuda_setup/main.py \
- --replace "/usr/local/cuda/lib64" "${cuda-native-redist}/lib"
- '';
-
- CUDA_HOME = "${cuda-native-redist}";
-
- preBuild =
- if torch.cudaSupport then
- with torch.cudaPackages;
- let
- cudaVersion = lib.concatStrings (lib.splitVersion torch.cudaPackages.cudaMajorMinorVersion);
- in
- ''make CUDA_VERSION=${cudaVersion} cuda${cudaMajorVersion}x''
- else
- ''make CUDA_VERSION=CPU cpuonly'';
+ # By default, which library is loaded depends on the result of `torch.cuda.is_available()`.
+ # When `cudaSupport` is enabled, bypass this check and load the cuda library unconditionnally.
+ # Indeed, in this case, only `libbitsandbytes_cuda124.so` is built. `libbitsandbytes_cpu.so` is not.
+ # Also, hardcode the path to the previously built library instead of relying on
+ # `get_cuda_bnb_library_path(cuda_specs)` which relies on `torch.cuda` too.
+ #
+ # WARNING: The cuda library is currently named `libbitsandbytes_cudaxxy` for cuda version `xx.y`.
+ # This upstream convention could change at some point and thus break the following patch.
+ postPatch = lib.optionalString cudaSupport ''
+ substituteInPlace bitsandbytes/cextension.py \
+ --replace-fail "if cuda_specs:" "if True:" \
+ --replace-fail \
+ "cuda_binary_path = get_cuda_bnb_library_path(cuda_specs)" \
+ "cuda_binary_path = PACKAGE_DIR / 'libbitsandbytes_cuda${cudaVersionString}.so'"
+ '';
nativeBuildInputs = [
+ cmake
+ cudaPackages.cuda_nvcc
+ ];
+
+ build-system = [
setuptools
- wheel
- ] ++ lib.optionals torch.cudaSupport [ cuda-native-redist ];
+ ];
- buildInputs = lib.optionals torch.cudaSupport [ cuda-redist ];
+ buildInputs = lib.optionals cudaSupport [ cuda-redist ];
- propagatedBuildInputs = [
+ cmakeFlags = [
+ (lib.cmakeFeature "COMPUTE_BACKEND" (if cudaSupport then "cuda" else "cpu"))
+ ];
+ CUDA_HOME = "${cuda-native-redist}";
+ NVCC_PREPEND_FLAGS = lib.optionals cudaSupport [
+ "-I${cuda-native-redist}/include"
+ "-L${cuda-native-redist}/lib"
+ ];
+
+ preBuild = ''
+ make -j $NIX_BUILD_CORES
+ cd .. # leave /build/source/build
+ '';
+
+ dependencies = [
scipy
torch
];
@@ -97,11 +110,11 @@ buildPythonPackage {
pythonImportsCheck = [ "bitsandbytes" ];
- meta = with lib; {
+ meta = {
description = "8-bit CUDA functions for PyTorch";
homepage = "https://github.com/TimDettmers/bitsandbytes";
changelog = "https://github.com/TimDettmers/bitsandbytes/releases/tag/${version}";
- license = licenses.mit;
- maintainers = with maintainers; [ bcdarwin ];
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ bcdarwin ];
};
}
diff --git a/pkgs/development/python-modules/bokeh-sampledata/default.nix b/pkgs/development/python-modules/bokeh-sampledata/default.nix
new file mode 100644
index 000000000000..e4bba2b69f1c
--- /dev/null
+++ b/pkgs/development/python-modules/bokeh-sampledata/default.nix
@@ -0,0 +1,46 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchPypi,
+
+ # build-system
+ setuptools,
+ setuptools-git-versioning,
+
+ # dependencies
+ icalendar,
+ pandas,
+}:
+
+buildPythonPackage rec {
+ pname = "bokeh-sampledata";
+ version = "2024.2";
+ pyproject = true;
+
+ src = fetchPypi {
+ pname = "bokeh_sampledata";
+ inherit version;
+ hash = "sha256-5j2qluedVj7IuE8gZy/+lPkFshRV+rjYPuM05G2jNiQ=";
+ };
+
+ build-system = [
+ setuptools
+ setuptools-git-versioning
+ ];
+
+ dependencies = [
+ icalendar
+ pandas
+ ];
+
+ pythonImportsCheck = [
+ "bokeh_sampledata"
+ ];
+
+ meta = {
+ description = "Sample datasets for Bokeh examples";
+ homepage = "https://pypi.org/project/bokeh-sampledata";
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ doronbehar ];
+ };
+}
diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index 7e042f4bbaff..119c5345ef93 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -2,7 +2,7 @@
lib,
buildPythonPackage,
fetchPypi,
- poetry-core,
+ setuptools,
pythonOlder,
types-awscrt,
typing-extensions,
@@ -21,7 +21,7 @@ buildPythonPackage rec {
hash = "sha256-QNTPX8Un+604G+GM+DdADW8WiogOJu55TIwE+go+YsU=";
};
- nativeBuildInputs = [ poetry-core ];
+ nativeBuildInputs = [ setuptools ];
propagatedBuildInputs = [
types-awscrt
diff --git a/pkgs/development/python-modules/bytecode/default.nix b/pkgs/development/python-modules/bytecode/default.nix
index 7c7a86baca43..80fbbd0ced30 100644
--- a/pkgs/development/python-modules/bytecode/default.nix
+++ b/pkgs/development/python-modules/bytecode/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "bytecode";
- version = "0.15.1";
+ version = "0.16.0";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "vstinner";
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-Jzsh0m00SiJjTP7hXMDmuR4XHmsCYdURuFDkVopGyIE=";
+ hash = "sha256-Nj/GKZC+zZt1M4Qd7CMXQCLwTIu64aidasH4PwBLtzw=";
};
nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/cachier/default.nix b/pkgs/development/python-modules/cachier/default.nix
index 313b36781170..fc1bad68f3aa 100644
--- a/pkgs/development/python-modules/cachier/default.nix
+++ b/pkgs/development/python-modules/cachier/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "cachier";
- version = "3.1.0";
+ version = "3.1.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "python-cachier";
repo = "cachier";
rev = "refs/tags/v${version}";
- hash = "sha256-LphmYL8Jmry8Jmd5Eps68wD113JMWwyBl18pqdtl+DQ=";
+ hash = "sha256-LVGdPBDPj3c7eyOMt+JM0WynkJjmxzgsBlsfQCa8Wv0=";
};
pythonRemoveDeps = [ "setuptools" ];
diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix
index 5f7659b61346..79059c7d53f5 100644
--- a/pkgs/development/python-modules/cartopy/default.nix
+++ b/pkgs/development/python-modules/cartopy/default.nix
@@ -1,55 +1,50 @@
{
lib,
buildPythonPackage,
- pythonOlder,
+ cython,
fetchpatch,
fetchPypi,
- cython,
- setuptools-scm,
+ fontconfig,
+ gdal,
geos,
- proj,
matplotlib,
numpy,
- pyproj,
- pyshp,
- shapely,
owslib,
pillow,
- gdal,
- scipy,
- fontconfig,
+ proj,
+ pyproj,
+ pyshp,
pytest-mpl,
pytestCheckHook,
+ pythonOlder,
+ scipy,
+ setuptools-scm,
+ shapely,
}:
buildPythonPackage rec {
pname = "cartopy";
- version = "0.23.0";
+ version = "0.24.1";
+ pyproject = true;
- disabled = pythonOlder "3.8";
-
- format = "setuptools";
+ disabled = pythonOlder "3.10";
src = fetchPypi {
- inherit version;
- pname = "Cartopy";
- hash = "sha256-Ix83s1cB8rox2UlZzKdebaBMLuo6fxTOHHXuOw6udnY=";
+ inherit pname version;
+ hash = "sha256-AckQ1WNMaafv3sRuChfUc9Iyh2fwAdTcC1xLSOWFyL0=";
};
- patches = [
- # Some tests in the 0.23.0 release are failing due to missing network markers. Revisit after update.
- (fetchpatch {
- name = "mnt-add-missing-needs-network-markers.patch";
- url = "https://github.com/SciTools/cartopy/commit/2403847ea69c3d95e899ad5d0cab32ac6017df0e.patch";
- hash = "sha256-aGBUX4jFn7GgoqmHVC51DmS+ga3GcQGKfkut++x67Q0=";
- })
- ];
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace-fail "numpy>=2.0.0rc1" "numpy"
+ '';
+
+ build-system = [ setuptools-scm ];
nativeBuildInputs = [
cython
geos # for geos-config
proj
- setuptools-scm
];
buildInputs = [
@@ -57,7 +52,7 @@ buildPythonPackage rec {
proj
];
- propagatedBuildInputs = [
+ dependencies = [
matplotlib
numpy
pyproj
@@ -101,9 +96,10 @@ buildPythonPackage rec {
meta = with lib; {
description = "Process geospatial data to create maps and perform analyses";
- mainProgram = "feature_download";
- license = licenses.lgpl3Plus;
homepage = "https://scitools.org.uk/cartopy/docs/latest/";
+ changelog = "https://github.com/SciTools/cartopy/releases/tag/v${version}";
+ license = licenses.lgpl3Plus;
maintainers = with maintainers; [ ];
+ mainProgram = "feature_download";
};
}
diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix
index 8b15979cb2e5..7a3ba89b8041 100644
--- a/pkgs/development/python-modules/censys/default.nix
+++ b/pkgs/development/python-modules/censys/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "censys";
- version = "2.2.15";
+ version = "2.2.16";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "censys";
repo = "censys-python";
rev = "refs/tags/v${version}";
- hash = "sha256-LJX2hYqdSd6SgObrs1FsJ4oxYGs6Y4g2wyFi5pDY4z8=";
+ hash = "sha256-OP7+jSt4xS71Kcjy5hFzeZ5rlTPtDx22rPr3UwjI5dk=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix
index d19cc800c8c2..a182aaf8da47 100644
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "claripy";
- version = "9.2.124";
+ version = "9.2.126";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "angr";
repo = "claripy";
rev = "refs/tags/v${version}";
- hash = "sha256-N14I2wJ0wGbBniplC9Q0oMcR7m5qTX3SDtXSjfLmNM8=";
+ hash = "sha256-clS7O0WVY9jtuG1RF8c+14nlN9/U/29fEtVNnmGslQU=";
};
# z3 does not provide a dist-info, so python-runtime-deps-check will fail
diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix
index f525f44b27b2..1029b65c8b53 100644
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@@ -18,14 +18,14 @@
let
# The binaries are following the argr projects release cycle
- version = "9.2.124";
+ version = "9.2.126";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
owner = "angr";
repo = "binaries";
rev = "refs/tags/v${version}";
- hash = "sha256-eUx71aCk0DHtD735YmHS8+awcoN6WYZi1fA8+pS8mXo=";
+ hash = "sha256-EgkYynllp/UGMRJmshQRpnMdwhdOkYHgoMlTiqdtZO0=";
};
in
buildPythonPackage rec {
@@ -39,7 +39,7 @@ buildPythonPackage rec {
owner = "angr";
repo = "cle";
rev = "refs/tags/v${version}";
- hash = "sha256-qwItp8HHqvjzXJIGfEtGAM09eOhz0GEKPYwgbXJBdXw=";
+ hash = "sha256-aOt5ba/F05FMiH+HpTVHOD2sfQY/yFoO9A90MZlF7So=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/codecov/default.nix b/pkgs/development/python-modules/codecov/default.nix
deleted file mode 100644
index 8bac2ebf313c..000000000000
--- a/pkgs/development/python-modules/codecov/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{
- lib,
- buildPythonPackage,
- coverage,
- ddt,
- fetchFromGitHub,
- mock,
- pytestCheckHook,
- requests,
-}:
-
-buildPythonPackage rec {
- pname = "codecov";
- version = "2.1.13";
- format = "setuptools";
-
- src = fetchFromGitHub {
- owner = "codecov";
- repo = "codecov-python";
- rev = "refs/tags/v${version}";
- sha256 = "sha256-cZEpAw8uv/XGiGzdBZ9MnabNaTP0did2GT+BkKMJM/E=";
- };
-
- propagatedBuildInputs = [
- requests
- coverage
- ];
-
- nativeCheckInputs = [
- ddt
- mock
- pytestCheckHook
- ];
-
- pytestFlagsArray = [ "tests/test.py" ];
-
- disabledTests = [
- # No git repo available and network
- "test_bowerrc_none"
- "test_prefix"
- "test_send"
- ];
-
- pythonImportsCheck = [ "codecov" ];
-
- meta = with lib; {
- description = "Python report uploader for Codecov";
- mainProgram = "codecov";
- homepage = "https://codecov.io/";
- license = licenses.asl20;
- maintainers = with maintainers; [ fab ];
- };
-}
diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix
index 9c28b1abc040..283997da023f 100644
--- a/pkgs/development/python-modules/cohere/default.nix
+++ b/pkgs/development/python-modules/cohere/default.nix
@@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "cohere";
- version = "5.11.1";
+ version = "5.11.2";
pyproject = true;
src = fetchFromGitHub {
owner = "cohere-ai";
repo = "cohere-python";
rev = "refs/tags/${version}";
- hash = "sha256-3fYc0jOfmQ8wnKb5JZY+fXoN+8dXhJi5bj2TJHJaOEo=";
+ hash = "sha256-QwloUY22Zy+gu8ggpLReXHXw11sZ/P0/Ao75a85MKN4=";
};
build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
index bf8f0adbb492..cff80702d5fa 100644
--- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix
+++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "coinmetrics-api-client";
- version = "2024.10.4.15";
+ version = "2024.10.15.19";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "coinmetrics_api_client";
- hash = "sha256-4Ru614cCTMrAhelkVjDuHo7VcGYqaVeeAfaQkdBZr7k=";
+ hash = "sha256-TNpF8OihU0Z/mAUF/5hxpZgaqIBRUfX7zhwZAKd7OEo=";
};
pythonRelaxDeps = [ "typer" ];
diff --git a/pkgs/development/python-modules/collidoscope/default.nix b/pkgs/development/python-modules/collidoscope/default.nix
index a8bec5c5cdcd..2ad63e83c081 100644
--- a/pkgs/development/python-modules/collidoscope/default.nix
+++ b/pkgs/development/python-modules/collidoscope/default.nix
@@ -30,7 +30,6 @@ buildPythonPackage rec {
uharfbuzz
];
- doCheck = true;
nativeCheckInputs = [ unittestCheckHook ];
unittestFlagsArray = [
"-s"
diff --git a/pkgs/development/python-modules/commandlines/default.nix b/pkgs/development/python-modules/commandlines/default.nix
index b216858a584c..aa5da9c0d37f 100644
--- a/pkgs/development/python-modules/commandlines/default.nix
+++ b/pkgs/development/python-modules/commandlines/default.nix
@@ -18,7 +18,6 @@ buildPythonPackage rec {
hash = "sha256-x3iUeOTAaTKNW5Y5foMPMJcWVxu52uYZoY3Hhe3UvQ4=";
};
- doCheck = true;
nativeCheckInputs = [ pytestCheckHook ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/commitizen/default.nix b/pkgs/development/python-modules/commitizen/default.nix
index bdcb00d589c1..039880f363dd 100644
--- a/pkgs/development/python-modules/commitizen/default.nix
+++ b/pkgs/development/python-modules/commitizen/default.nix
@@ -31,7 +31,7 @@
buildPythonPackage rec {
pname = "commitizen";
- version = "3.29.1";
+ version = "3.30.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -40,7 +40,7 @@ buildPythonPackage rec {
owner = "commitizen-tools";
repo = "commitizen";
rev = "refs/tags/v${version}";
- hash = "sha256-qB0XP5y9NjD0AV9gVleq+MbL5l/7M5JBb57pgssbyo4=";
+ hash = "sha256-8ULIoFKrDAGHwz0EZzYJtl/4h6UVUECLUDbvTJbdD60=";
};
pythonRelaxDeps = [
@@ -77,8 +77,6 @@ buildPythonPackage rec {
pytest7CheckHook
];
- doCheck = true;
-
pythonImportsCheck = [ "commitizen" ];
# The tests require a functional git installation
diff --git a/pkgs/development/python-modules/craft-platforms/default.nix b/pkgs/development/python-modules/craft-platforms/default.nix
index 6a1a4936092a..8b5e5cc5b0f9 100644
--- a/pkgs/development/python-modules/craft-platforms/default.nix
+++ b/pkgs/development/python-modules/craft-platforms/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "craft-platforms";
- version = "0.3.1";
+ version = "0.4.0";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "canonical";
repo = "craft-platforms";
rev = "refs/tags/${version}";
- hash = "sha256-VDSwvBWoGHcjGCEA4RDVwRzQGNVaphwZu/iaktAweb0=";
+ hash = "sha256-MzHjnOvsloT1Vf5NjI5jyFBvCo3v5ovvpWuwOJ/O/0A=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/cryptg/default.nix b/pkgs/development/python-modules/cryptg/default.nix
index 11492f912a75..73d5258efbe3 100644
--- a/pkgs/development/python-modules/cryptg/default.nix
+++ b/pkgs/development/python-modules/cryptg/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "cryptg";
- version = "0.5";
+ version = "0.5.post0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,12 +23,12 @@ buildPythonPackage rec {
owner = "cher-nov";
repo = pname;
rev = "v${version}";
- hash = "sha256-uJfMetplTyRT95P/8ljz4H4ASYMXEM7jROWSpjftKjU=";
+ hash = "sha256-GCTVxCJQvpvHpzaU+OaFM/AKoRvxLyA0u6VIV+94UTY=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
- hash = "sha256-HDMztt7/ZpPlpy0IMGuWGGo4vwKhraFTmTTPr9tC+Ok=";
+ hash = "sha256-BqtswBTurZoKw7DR3S7woDKLqAqIjKdSS5TBwCI+Bps=";
};
build-system = [
diff --git a/pkgs/development/python-modules/ctap-keyring-device/default.nix b/pkgs/development/python-modules/ctap-keyring-device/default.nix
index 07cf1b616027..ce81bfa36bca 100644
--- a/pkgs/development/python-modules/ctap-keyring-device/default.nix
+++ b/pkgs/development/python-modules/ctap-keyring-device/default.nix
@@ -4,28 +4,40 @@
fetchPypi,
setuptools-scm,
# install requirements
+ six,
fido2,
keyring,
cryptography,
# test requirements
pytestCheckHook,
+ unittestCheckHook,
+ mock,
}:
let
fido2_0 = fido2.overridePythonAttrs (oldAttrs: rec {
version = "0.9.3";
- format = "setuptools";
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
hash = "sha256-tF6JphCc/Lfxu1E3dqotZAjpXEgi+DolORi5RAg0Zuw=";
};
+ postPatch = ''
+ substituteInPlace setup.py test/test_attestation.py \
+ --replace-fail "distutils.version" "setuptools._distutils.version"
+ '';
+ build-system = [ setuptools-scm ];
+ dependencies = oldAttrs.dependencies ++ [ six ];
+ nativeCheckInputs = [
+ unittestCheckHook
+ mock
+ ];
});
in
buildPythonPackage rec {
pname = "ctap-keyring-device";
version = "1.0.6";
- format = "setuptools";
+ pyproject = true;
src = fetchPypi {
inherit version pname;
@@ -38,16 +50,14 @@ buildPythonPackage rec {
--replace "--flake8 --black --cov" ""
'';
- nativeBuildInputs = [
- setuptools-scm
- ];
-
pythonRemoveDeps = [
# This is a darwin requirement missing pyobjc
"pyobjc-framework-LocalAuthentication"
];
- propagatedBuildInputs = [
+ build-system = [ setuptools-scm ];
+
+ dependencies = [
keyring
fido2_0
cryptography
@@ -55,7 +65,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "ctap_keyring_device" ];
- checkInputs = [ pytestCheckHook ];
+ nativeCheckInputs = [ pytestCheckHook ];
disabledTests = [
# Disabled tests that needs pyobjc or windows
diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix
index 4e9de770a193..5f66528967e0 100644
--- a/pkgs/development/python-modules/dask-expr/default.nix
+++ b/pkgs/development/python-modules/dask-expr/default.nix
@@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "dask-expr";
- version = "1.1.15";
+ version = "1.1.16";
pyproject = true;
src = fetchFromGitHub {
owner = "dask";
repo = "dask-expr";
rev = "refs/tags/v${version}";
- hash = "sha256-b5nY3srMADzYZ0GYCeyUfxhJLm7E4dTbM7qrsCR9d7A=";
+ hash = "sha256-HHoUQ6LfrlUnZNvvbPbQbNW6WLabGa88RsC9M8hlARI=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index e47ced4264ab..014f8947d35b 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -39,14 +39,14 @@
let
self = buildPythonPackage rec {
pname = "dask";
- version = "2024.9.1";
+ version = "2024.10.0";
pyproject = true;
src = fetchFromGitHub {
owner = "dask";
repo = "dask";
rev = "refs/tags/${version}";
- hash = "sha256-lbWV6qgLQ8itJsnz7ojrgfrO12+AwNe1/DJvxBo5A+Q=";
+ hash = "sha256-UB/LqgDRXnjJ/RjEke9eBDyVAy+Dtak7wYJB63xmDd4=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix
index 93292f7eec1e..57bf4844601c 100644
--- a/pkgs/development/python-modules/databricks-sdk/default.nix
+++ b/pkgs/development/python-modules/databricks-sdk/default.nix
@@ -12,6 +12,8 @@
requests,
# tests
+ langchain-openai,
+ openai,
pyfakefs,
pytestCheckHook,
pytest-mock,
@@ -20,14 +22,14 @@
buildPythonPackage rec {
pname = "databricks-sdk";
- version = "0.34.0";
+ version = "0.35.0";
pyproject = true;
src = fetchFromGitHub {
owner = "databricks";
repo = "databricks-sdk-py";
rev = "refs/tags/v${version}";
- hash = "sha256-pbOm1aTHtIAwk/TJ5CCT9/CqSTuHTWkRgJuflObkU54=";
+ hash = "sha256-CEv/+3E7KWV9LXzFPvDQIL1v8iFgbsS3/cTS/4obWas=";
};
build-system = [
@@ -44,6 +46,8 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
+ langchain-openai
+ openai
pyfakefs
pytestCheckHook
pytest-mock
diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix
index 29cf78eeed88..dbc9828c5803 100644
--- a/pkgs/development/python-modules/datasette/default.nix
+++ b/pkgs/development/python-modules/datasette/default.nix
@@ -6,17 +6,19 @@
asgi-csrf,
click,
click-default-group,
+ flexcache,
+ flexparser,
+ httpx,
+ hupper,
itsdangerous,
janus,
jinja2,
- hupper,
mergedeep,
- pint,
+ platformdirs,
pluggy,
- python-baseconv,
pyyaml,
+ typing-extensions,
uvicorn,
- httpx,
pytestCheckHook,
pytest-asyncio,
pytest-timeout,
@@ -30,8 +32,8 @@
buildPythonPackage rec {
pname = "datasette";
- version = "0.64.8";
- format = "setuptools";
+ version = "0.65";
+ pyproject = true;
disabled = pythonOlder "3.8";
@@ -39,7 +41,7 @@ buildPythonPackage rec {
owner = "simonw";
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-Nt/e0j1mF5Qkpp/dRa9W7En1WoGD2MsR3iREv9IQu5E=";
+ hash = "sha256-POdw2vB0D2B5SyrC/HkFqlsMlWtbdC3cRM/cfDhv7Z4=";
};
postPatch = ''
@@ -47,23 +49,31 @@ buildPythonPackage rec {
--replace '"pytest-runner"' ""
'';
- propagatedBuildInputs = [
+ build-system = [ setuptools ];
+
+ pythonRemoveDeps = [
+ "pip"
+ "setuptools"
+ ];
+
+ dependencies = [
aiofiles
asgi-csrf
asgiref
click
click-default-group
+ flexcache
+ flexparser
httpx
hupper
itsdangerous
janus
jinja2
mergedeep
- pint
+ platformdirs
pluggy
- python-baseconv
pyyaml
- setuptools
+ typing-extensions
uvicorn
];
diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix
index 4aac0b18701f..182afb3c296d 100644
--- a/pkgs/development/python-modules/dbt-common/default.nix
+++ b/pkgs/development/python-modules/dbt-common/default.nix
@@ -1,43 +1,55 @@
{
lib,
- agate,
+ fetchFromGitHub,
buildPythonPackage,
+ pythonOlder,
+
+ # build-system
+ hatchling,
+
+ # dependencies
+ agate,
colorama,
deepdiff,
- fetchPypi,
- hatchling,
isodate,
jinja2,
jsonschema,
mashumaro,
pathspec,
protobuf,
- pytest-mock,
- pytest-xdist,
- pytestCheckHook,
python-dateutil,
- pythonOlder,
requests,
typing-extensions,
+
+ # tests
+ pytestCheckHook,
+ pytest-mock,
+ pytest-xdist,
+ numpy,
}:
buildPythonPackage rec {
pname = "dbt-common";
- version = "1.10.0";
+ version = "1.11.0";
pyproject = true;
disabled = pythonOlder "3.8";
- src = fetchPypi {
- pname = "dbt_common";
- inherit version;
- hash = "sha256-z9n0bp3k+cLJXscCENG+U6xB4nkDjRinkoy7/T+bZ68=";
+ src = fetchFromGitHub {
+ owner = "dbt-labs";
+ repo = "dbt-common";
+ # Unfortunatly, upstream doesn't tag commits on GitHub, and the pypi source
+ # doesn't include tests. TODO: Write an update script that will detect the
+ # version from `dbt_common/__about__.py`.
+ rev = "ed11c6ceb4f29d4a79489469309d9ce9dd1757e6";
+ hash = "sha256-JA6hFQwF7h1tXyCxBVKGgyevdTxyYeN3I/Bwy9uoC0Y=";
};
build-system = [ hatchling ];
pythonRelaxDeps = [
"agate"
+ "deepdiff"
"protobuf"
];
@@ -56,15 +68,17 @@ buildPythonPackage rec {
typing-extensions
] ++ mashumaro.optional-dependencies.msgpack;
- # Upstream stopped to tag the source fo rnow
- doCheck = false;
-
nativeCheckInputs = [
- pytest-mock
- pytest-xdist
pytestCheckHook
+ pytest-xdist
+ pytest-mock
+ ];
+ disabledTests = [
+ # Assertion errors (TODO: Notify upstream)
+ "test_create_print_json"
+ "test_events"
+ "test_extra_dict_on_event"
];
-
pythonImportsCheck = [ "dbt_common" ];
meta = {
diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix
index c0442598e3f8..aa57d59ee42f 100644
--- a/pkgs/development/python-modules/dbt-core/default.nix
+++ b/pkgs/development/python-modules/dbt-core/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
version = "1.8.8";
pyproject = true;
- disabled = pythonOlder "3.8";
+ disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "dbt-labs";
@@ -47,6 +47,7 @@ buildPythonPackage rec {
"protobuf"
"agate"
"click"
+ "dbt-common"
"dbt-semantic-interfaces"
"logbook"
"mashumaro"
diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix
index ff583a572018..3b46cf4aac9c 100644
--- a/pkgs/development/python-modules/deepdiff/default.nix
+++ b/pkgs/development/python-modules/deepdiff/default.nix
@@ -2,10 +2,20 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ pythonOlder,
+
+ # build-system
+ setuptools,
+
+ # dependencies
click,
- ordered-set,
+ orderly-set,
orjson,
+
+ # optional-dependencies
clevercsv,
+
+ # tests
jsonpickle,
numpy,
pytestCheckHook,
@@ -13,13 +23,14 @@
pyyaml,
toml,
tomli-w,
- pythonOlder,
+ polars,
+ pandas,
}:
buildPythonPackage rec {
pname = "deepdiff";
- version = "7.0.1";
- format = "setuptools";
+ version = "8.0.1";
+ pyproject = true;
disabled = pythonOlder "3.7";
@@ -27,19 +38,24 @@ buildPythonPackage rec {
owner = "seperman";
repo = "deepdiff";
rev = "refs/tags/${version}";
- hash = "sha256-HqmAE5sLwyjyUahIUeRIJW0c5eliq/qEzE2FydHwc70=";
+ hash = "sha256-e6eTPSGoJ8r/4vGi/iGVFW/BruBADtVMtnO001Qs0IQ=";
};
- postPatch = ''
- substituteInPlace tests/test_command.py \
- --replace '/tmp/' "$TMPDIR/"
- '';
+ build-system = [
+ setuptools
+ ];
- propagatedBuildInputs = [
+ dependencies = [
click
- ordered-set
+ orderly-set
orjson
];
+ pythonRelaxDeps = [
+ # Upstream develops this package as well, and from some reason pins this
+ # dependency to a patch version below this one. No significant changes
+ # happend in that relase, so we shouldn't worry, especially if tests pass.
+ "orderly-set"
+ ];
optional-dependencies = {
cli = [
@@ -56,22 +72,30 @@ buildPythonPackage rec {
pytestCheckHook
python-dateutil
tomli-w
+ polars
+ pandas
] ++ optional-dependencies.cli;
disabledTests = [
# not compatible with pydantic 2.x
"test_pydantic1"
"test_pydantic2"
+ # Require pytest-benchmark
+ "test_cache_deeply_nested_a1"
+ "test_lfu"
];
pythonImportsCheck = [ "deepdiff" ];
- meta = with lib; {
+ meta = {
description = "Deep Difference and Search of any Python object/data";
mainProgram = "deep";
homepage = "https://github.com/seperman/deepdiff";
changelog = "https://github.com/seperman/deepdiff/releases/tag/${version}";
- license = licenses.mit;
- maintainers = with maintainers; [ mic92 ];
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [
+ mic92
+ doronbehar
+ ];
};
}
diff --git a/pkgs/development/python-modules/dehinter/default.nix b/pkgs/development/python-modules/dehinter/default.nix
index e621b2979bcc..55dc1c503fb4 100644
--- a/pkgs/development/python-modules/dehinter/default.nix
+++ b/pkgs/development/python-modules/dehinter/default.nix
@@ -21,7 +21,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [ fonttools ];
- doCheck = true;
nativeCheckInputs = [ pytestCheckHook ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix
index 5980eaff54db..57280fd95468 100644
--- a/pkgs/development/python-modules/dependency-injector/default.nix
+++ b/pkgs/development/python-modules/dependency-injector/default.nix
@@ -14,24 +14,24 @@
pythonOlder,
pyyaml,
scipy,
- six,
+ setuptools,
}:
buildPythonPackage rec {
pname = "dependency-injector";
- version = "4.41.0";
- format = "setuptools";
+ version = "4.42.0";
+ pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ets-labs";
repo = "python-dependency-injector";
- rev = version;
- hash = "sha256-U3U/L8UuYrfpm4KwVNmViTbam7QdZd2vp1p+ENtOJlw=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-ryPNmiIKQzR4WSjt7hi4C+iTsYvfj5TYGy+9PJxX+10=";
};
- propagatedBuildInputs = [ six ];
+ build-system = [ setuptools ];
optional-dependencies = {
aiohttp = [ aiohttp ];
@@ -40,20 +40,15 @@ buildPythonPackage rec {
yaml = [ pyyaml ];
};
- nativeCheckInputs =
- [
- fastapi
- httpx
- mypy-boto3-s3
- numpy
- pytest-asyncio
- pytestCheckHook
- scipy
- ]
- ++ optional-dependencies.aiohttp
- ++ optional-dependencies.pydantic
- ++ optional-dependencies.yaml
- ++ optional-dependencies.flask;
+ nativeCheckInputs = [
+ fastapi
+ httpx
+ mypy-boto3-s3
+ numpy
+ pytest-asyncio
+ pytestCheckHook
+ scipy
+ ] ++ lib.flatten (builtins.attrValues optional-dependencies);
pythonImportsCheck = [ "dependency_injector" ];
@@ -61,6 +56,8 @@ buildPythonPackage rec {
# Exclude tests for EOL Python releases
"tests/unit/ext/test_aiohttp_py35.py"
"tests/unit/wiring/test_*_py36.py"
+ "tests/unit/providers/configuration/test_from_pydantic_py36.py"
+ "tests/unit/providers/configuration/test_pydantic_settings_in_init_py36.py"
];
meta = with lib; {
diff --git a/pkgs/development/python-modules/diffenator2/default.nix b/pkgs/development/python-modules/diffenator2/default.nix
index 1b4837de4e3a..5dc3bbd3554a 100644
--- a/pkgs/development/python-modules/diffenator2/default.nix
+++ b/pkgs/development/python-modules/diffenator2/default.nix
@@ -27,14 +27,14 @@
buildPythonPackage rec {
pname = "diffenator2";
- version = "0.4.4";
+ version = "0.4.5";
pyproject = true;
src = fetchFromGitHub {
owner = "googlefonts";
repo = "diffenator2";
rev = "refs/tags/v${version}";
- hash = "sha256-FVdQW2iupAxHFmx6sC88yO2Vx3VvBhPJl55gA0fmvgo=";
+ hash = "sha256-Iu6ZA8s6XnOYSOwlt8WTmYW6oUTvcm4vLhYvVATOlBA=";
};
env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
diff --git a/pkgs/development/python-modules/dissect-jffs/default.nix b/pkgs/development/python-modules/dissect-jffs/default.nix
index a8c9fed87a46..aad42728587a 100644
--- a/pkgs/development/python-modules/dissect-jffs/default.nix
+++ b/pkgs/development/python-modules/dissect-jffs/default.nix
@@ -33,9 +33,6 @@ buildPythonPackage rec {
dissect-util
];
- # Test file handling fails
- doCheck = true;
-
pythonImportsCheck = [ "dissect.jffs" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/distrax/default.nix b/pkgs/development/python-modules/distrax/default.nix
index 83a4a16d650e..bae7ef5ffb93 100644
--- a/pkgs/development/python-modules/distrax/default.nix
+++ b/pkgs/development/python-modules/distrax/default.nix
@@ -74,6 +74,20 @@ buildPythonPackage rec {
"distrax/_src/distributions/transformed_test.py"
"distrax/_src/distributions/uniform_test.py"
"distrax/_src/utils/transformations_test.py"
+ # https://github.com/google-deepmind/distrax/pull/270
+ "distrax/_src/distributions/deterministic_test.py"
+ "distrax/_src/distributions/epsilon_greedy_test.py"
+ "distrax/_src/distributions/gamma_test.py"
+ "distrax/_src/distributions/greedy_test.py"
+ "distrax/_src/distributions/gumbel_test.py"
+ "distrax/_src/distributions/logistic_test.py"
+ "distrax/_src/distributions/log_stddev_normal_test.py"
+ "distrax/_src/distributions/mvn_diag_test.py"
+ "distrax/_src/distributions/mvn_full_covariance_test.py"
+ "distrax/_src/distributions/mvn_tri_test.py"
+ "distrax/_src/distributions/one_hot_categorical_test.py"
+ "distrax/_src/distributions/softmax_test.py"
+ "distrax/_src/utils/hmm_test.py"
];
meta = with lib; {
@@ -81,8 +95,5 @@ buildPythonPackage rec {
homepage = "https://github.com/deepmind/distrax";
license = licenses.asl20;
maintainers = with maintainers; [ onny ];
- # Several tests fail with:
- # AssertionError: [Chex] Assertion assert_type failed: Error in type compatibility check
- broken = true;
};
}
diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index 063d30ca405f..e652d8276034 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -28,14 +28,14 @@
buildPythonPackage rec {
pname = "distributed";
- version = "2024.9.1";
+ version = "2024.10.0";
pyproject = true;
src = fetchFromGitHub {
owner = "dask";
repo = "distributed";
rev = "refs/tags/${version}";
- hash = "sha256-UDfa59o+3RVN3QppoUamScdcH8XGOB+KAxArI5w7x6M=";
+ hash = "sha256-pdVqPzz66CueGuha66RTykrLtEGx9i6aScR+NHIYWg0=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/dj-database-url/default.nix b/pkgs/development/python-modules/dj-database-url/default.nix
index aee96dfd6cc7..542950750d62 100644
--- a/pkgs/development/python-modules/dj-database-url/default.nix
+++ b/pkgs/development/python-modules/dj-database-url/default.nix
@@ -10,16 +10,16 @@
buildPythonPackage rec {
pname = "dj-database-url";
- version = "2.2.0";
+ version = "2.3.0";
pyproject = true;
- disabled = pythonOlder "3.7";
+ disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "jazzband";
repo = "dj-database-url";
rev = "refs/tags/v${version}";
- hash = "sha256-i2btutob+5R+FFPlGwRSNF01MTfxVop8xaePDHxnqLE=";
+ hash = "sha256-Q0A9wA/k1xObw0e8+9qVTfpxBNL4W9rXisi0ge+R3DM=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix
index 0abd5d344e41..2e688abdfb07 100644
--- a/pkgs/development/python-modules/django-auth-ldap/default.nix
+++ b/pkgs/development/python-modules/django-auth-ldap/default.nix
@@ -52,6 +52,6 @@ buildPythonPackage rec {
homepage = "https://github.com/django-auth-ldap/django-auth-ldap";
license = licenses.bsd2;
maintainers = with maintainers; [ mmai ];
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/pkgs/development/python-modules/django-choices-field/default.nix b/pkgs/development/python-modules/django-choices-field/default.nix
new file mode 100644
index 000000000000..ea115e5c6258
--- /dev/null
+++ b/pkgs/development/python-modules/django-choices-field/default.nix
@@ -0,0 +1,46 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ poetry-core,
+ django,
+ typing-extensions,
+ pytestCheckHook,
+ pytest-cov-stub,
+ pytest-django,
+}:
+
+buildPythonPackage rec {
+ pname = "django-choices-field";
+ version = "2.3.0";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "bellini666";
+ repo = "django-choices-field";
+ rev = "v${version}";
+ hash = "sha256-2oLMUM/aE4aY0eEU+CLIjTNQJAMUt/GK5Fw26QN7t34=";
+ };
+
+ build-system = [ poetry-core ];
+
+ dependencies = [
+ django
+ typing-extensions
+ ];
+
+ nativeCheckInputs = [
+ pytestCheckHook
+ pytest-cov-stub
+ pytest-django
+ ];
+
+ pythonImportsCheck = [ "django_choices_field" ];
+
+ meta = {
+ description = "Django field that set/get django's new TextChoices/IntegerChoices enum";
+ homepage = "https://github.com/bellini666/django-choices-field";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ minijackson ];
+ };
+}
diff --git a/pkgs/development/python-modules/django-crossdomainmedia/default.nix b/pkgs/development/python-modules/django-crossdomainmedia/default.nix
new file mode 100644
index 000000000000..3f2134e42239
--- /dev/null
+++ b/pkgs/development/python-modules/django-crossdomainmedia/default.nix
@@ -0,0 +1,41 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ django,
+ pytestCheckHook,
+ pytest-django,
+ python,
+}:
+
+buildPythonPackage rec {
+ pname = "django-crossdomainmedia";
+ version = "0.0.4";
+ format = "setuptools";
+
+ src = fetchFromGitHub {
+ owner = "stefanw";
+ repo = "django-crossdomainmedia";
+ # Release is not tagged yet
+ # https://github.com/stefanw/django-crossdomainmedia/issues/1
+ # rev = "refs/tags/v${version}";
+ rev = "45af45a82e2630d99381758c7660fe9bdad06d2d";
+ hash = "sha256-nwFUm+cxokZ38c5D77z15gIO/kg49oRACOl6+eGGEtQ=";
+ };
+
+ dependencies = [ django ];
+
+ checkPhase = ''
+ ${python.interpreter} manage.py test
+ '';
+
+ # django.core.exceptions.ImproperlyConfigured: Requested setting DEBUG, but settings are not configured.
+ # pythonImportsCheck = [ "crossdomainmedia" ];
+
+ meta = {
+ description = "Django application to retrieve user's IP address";
+ homepage = "https://github.com/stefanw/django-crossdomainmedia";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.onny ];
+ };
+}
diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix
index f74215dd1e8d..1f551f8f1d5a 100644
--- a/pkgs/development/python-modules/django-haystack/default.nix
+++ b/pkgs/development/python-modules/django-haystack/default.nix
@@ -1,32 +1,26 @@
{
lib,
buildPythonPackage,
- pythonOlder,
- fetchPypi,
-
- # build dependencies
- setuptools,
- setuptools-scm,
-
- # dependencies
django,
- packaging,
-
- # tests
elasticsearch,
+ fetchPypi,
geopy,
+ packaging,
pysolr,
python-dateutil,
+ pythonOlder,
requests,
+ setuptools-scm,
+ setuptools,
whoosh,
}:
buildPythonPackage rec {
pname = "django-haystack";
version = "3.3.0";
- format = "pyproject";
+ pyproject = true;
- disabled = pythonOlder "3.5";
+ disabled = pythonOlder "3.8";
src = fetchPypi {
pname = "django_haystack";
@@ -40,7 +34,8 @@ buildPythonPackage rec {
];
buildInputs = [ django ];
- propagatedBuildInputs = [ packaging ];
+
+ dependencies = [ packaging ];
optional-dependencies = {
elasticsearch = [ elasticsearch ];
@@ -54,7 +49,6 @@ buildPythonPackage rec {
whoosh
] ++ optional-dependencies.elasticsearch;
-
checkPhase = ''
runHook preCheck
python test_haystack/run_tests.py
@@ -64,6 +58,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Pluggable search for Django";
homepage = "http://haystacksearch.org/";
+ changelog = "https://github.com/django-haystack/django-haystack/releases/tag/v${version}";
license = licenses.bsd3;
maintainers = [ ];
};
diff --git a/pkgs/development/python-modules/django-htmx/default.nix b/pkgs/development/python-modules/django-htmx/default.nix
new file mode 100644
index 000000000000..0e60a5ae5aef
--- /dev/null
+++ b/pkgs/development/python-modules/django-htmx/default.nix
@@ -0,0 +1,44 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ setuptools,
+ asgiref,
+ django,
+ pytestCheckHook,
+ pytest-django,
+}:
+
+buildPythonPackage rec {
+ pname = "django-htmx";
+ version = "1.19.0";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "adamchainz";
+ repo = "django-htmx";
+ rev = version;
+ hash = "sha256-nSutErUkFafKjBswhC+Lrn39MgCbCrzttAx1a+qt1so=";
+ };
+
+ build-system = [ setuptools ];
+
+ dependencies = [
+ asgiref
+ django
+ ];
+
+ nativeCheckInputs = [
+ pytestCheckHook
+ pytest-django
+ ];
+
+ pythonImportsCheck = [ "django_htmx" ];
+
+ meta = {
+ description = "Extensions for using Django with htmx";
+ homepage = "https://github.com/adamchainz/django-htmx";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ minijackson ];
+ };
+}
diff --git a/pkgs/development/python-modules/django-json-widget/default.nix b/pkgs/development/python-modules/django-json-widget/default.nix
new file mode 100644
index 000000000000..c42f778d61a6
--- /dev/null
+++ b/pkgs/development/python-modules/django-json-widget/default.nix
@@ -0,0 +1,51 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ django,
+ pythonOlder,
+ setuptools,
+ python,
+ pytestCheckHook,
+ pytest-django,
+}:
+
+buildPythonPackage rec {
+ pname = "django-json-widget";
+ version = "2.0.1";
+ pyproject = true;
+
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "jmrivas86";
+ repo = "django-json-widget";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-GY6rYY//n8kkWCJZk6OY+EOBv62ocNovNmE/ai8VCn4=";
+ };
+
+ build-system = [ setuptools ];
+
+ dependencies = [ django ];
+
+ nativeCheckInputs = [
+ pytest-django
+ pytestCheckHook
+ ];
+
+ preCheck = ''
+ export DJANGO_SETTINGS_MODULE=tests.settings
+ '';
+
+ pythonImportCheck = [ "django_json_widget" ];
+
+ meta = {
+ description = "Alternative widget that makes it easy to edit the jsonfield field of django";
+ homepage = "https://github.com/jmrivas86/django-json-widget";
+ changelog = "https://github.com/jmrivas86/django-json-widget/blob/v${version}/CHANGELOG.rst";
+ # Contradictory license specifications
+ # https://github.com/jmrivas86/django-json-widget/issues/93
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.onny ];
+ };
+}
diff --git a/pkgs/development/python-modules/django-mfa3/default.nix b/pkgs/development/python-modules/django-mfa3/default.nix
new file mode 100644
index 000000000000..c0ed1e4f287b
--- /dev/null
+++ b/pkgs/development/python-modules/django-mfa3/default.nix
@@ -0,0 +1,49 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ django,
+ setuptools,
+ pyotp,
+ fido2,
+ qrcode,
+ python,
+}:
+
+buildPythonPackage rec {
+ pname = "django-mfa3";
+ version = "0.13.0";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "xi";
+ repo = "django-mfa3";
+ rev = "refs/tags/${version}";
+ hash = "sha256-O8po7VevqyHlP2isnNnLbpgfs1p4sFezxIZKMTgnwuY=";
+ };
+
+ build-system = [ setuptools ];
+
+ dependencies = [
+ django
+ pyotp
+ fido2
+ qrcode
+ ];
+
+ # qrcode 8.0 not supported yet
+ # See https://github.com/xi/django-mfa3/pull/14
+ pythonRelaxDeps = [ "qrcode" ];
+
+ checkPhase = ''
+ ${python.interpreter} -m django test --settings tests.settings
+ '';
+
+ meta = {
+ description = "Multi factor authentication for Django";
+ homepage = "https://github.com/xi/django-mfa3";
+ changelog = "https://github.com/xi/django-mfa3/blob/${src.rev}/CHANGES.md";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.onny ];
+ };
+}
diff --git a/pkgs/development/python-modules/django-modelcluster/default.nix b/pkgs/development/python-modules/django-modelcluster/default.nix
index acb7fd370429..ed4f3a05a764 100644
--- a/pkgs/development/python-modules/django-modelcluster/default.nix
+++ b/pkgs/development/python-modules/django-modelcluster/default.nix
@@ -1,27 +1,22 @@
{
lib,
buildPythonPackage,
- fetchFromGitHub,
- pythonOlder,
-
- # dependencies
- django,
- pytz,
-
- # optionals
django-taggit,
-
- # tests
+ django,
+ fetchFromGitHub,
pytest-django,
pytestCheckHook,
+ pythonOlder,
+ pytz,
+ setuptools,
}:
buildPythonPackage rec {
pname = "django-modelcluster";
version = "6.3";
- format = "setuptools";
+ pyproject = true;
- disabled = pythonOlder "3.5";
+ disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "wagtail";
@@ -30,7 +25,9 @@ buildPythonPackage rec {
hash = "sha256-AUVl2aidjW7Uu//3HlAod7pxzj6Gs1Xd0uTt3NrrqAU=";
};
- propagatedBuildInputs = [
+ build-system = [ setuptools ];
+
+ dependencies = [
django
pytz
];
@@ -44,14 +41,12 @@ buildPythonPackage rec {
pytestCheckHook
] ++ optional-dependencies.taggit;
- # https://github.com/wagtail/django-modelcluster/issues/173
- disabledTests = lib.optionals (lib.versionAtLeast django.version "4.2") [
- "test_formfield_callback"
- ];
+ pythonImportsCheck = [ "modelcluster" ];
meta = with lib; {
description = "Django extension to allow working with 'clusters' of models as a single unit, independently of the database";
homepage = "https://github.com/torchbox/django-modelcluster/";
+ changelog = "https://github.com/wagtail/django-modelcluster/blob/v${version}/CHANGELOG.txt";
license = licenses.bsd2;
maintainers = with maintainers; [ desiderius ];
};
diff --git a/pkgs/development/python-modules/django-mptt/default.nix b/pkgs/development/python-modules/django-mptt/default.nix
index 419bb9c8eebc..404b6df1bc90 100644
--- a/pkgs/development/python-modules/django-mptt/default.nix
+++ b/pkgs/development/python-modules/django-mptt/default.nix
@@ -2,35 +2,34 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ hatchling,
django,
django-js-asset,
- python,
}:
buildPythonPackage rec {
pname = "django-mptt";
- version = "0.13.4";
- format = "setuptools";
+ version = "0.16";
+ pyproject = true;
src = fetchFromGitHub {
- owner = pname;
- repo = pname;
+ owner = "django-mptt";
+ repo = "django-mptt";
rev = version;
- sha256 = "12y3chxhqxk2yxin055f0f45nabj0s8hil12hw0lwzlbax6k9ss6";
+ hash = "sha256-vWnXKWzaa5AWoNaIc8NA1B2mnzKXRliQmi5VdrRMadE=";
};
- propagatedBuildInputs = [
+ build-system = [ hatchling ];
+
+ dependencies = [
django
django-js-asset
];
pythonImportsCheck = [ "mptt" ];
- checkPhase = ''
- runHook preCheck
- ${python.interpreter} tests/manage.py test
- runHook postCheck
- '';
+ # No pytest checks, since they depend on model_mommy, which is deprecated
+ doCheck = false;
meta = with lib; {
description = "Utilities for implementing a modified pre-order traversal tree in Django";
diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix
index b313276bbf6b..86bc344fd070 100644
--- a/pkgs/development/python-modules/django-polymorphic/default.nix
+++ b/pkgs/development/python-modules/django-polymorphic/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ fetchpatch,
python,
django,
dj-database-url,
@@ -19,10 +20,21 @@ buildPythonPackage rec {
hash = "sha256-JJY+FoMPSnWuSsNIas2JedGJpdm6RfPE3E1VIjGuXIc=";
};
+ patches = [
+ # Spelling of assertQuerySetEqual changed in Django >= 4.2
+ (fetchpatch {
+ url = "https://github.com/jazzband/django-polymorphic/commit/63d291f8771847e716a37652f239e3966a3360e1.patch";
+ hash = "sha256-rvvD9zfjm8bgH1460BA5K44Oobzv1FRAYq9Rgg291B8=";
+ })
+ ];
+
propagatedBuildInputs = [ django ];
nativeCheckInputs = [ dj-database-url ];
+ # Tests fail for Django >= 5.1.0
+ doCheck = lib.versionOlder django.version "5.1.0";
+
checkPhase = ''
${python.interpreter} runtests.py
'';
diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix
index 1014efc09e65..161012236047 100644
--- a/pkgs/development/python-modules/django-storages/default.nix
+++ b/pkgs/development/python-modules/django-storages/default.nix
@@ -15,6 +15,8 @@
pythonOlder,
rsa,
setuptools,
+ pynacl,
+ fetchpatch,
}:
buildPythonPackage rec {
@@ -31,9 +33,19 @@ buildPythonPackage rec {
hash = "sha256-nlM/XPot3auLzNsnHCVtog2WmiaibDRgbPOw9A5F9QI=";
};
- nativeBuildInputs = [ setuptools ];
+ patches = [
+ # Add Moto 5 support
+ # https://github.com/jschneier/django-storages/pull/1464
+ (fetchpatch {
+ url = "https://github.com/jschneier/django-storages/commit/e1aedcf2d137f164101d31f2f430f1594eedd78c.patch";
+ hash = "sha256-jSb/uJ0RXvPsXl+WUAzAgDvJl9Y3ad2F30X1SbsCc04=";
+ name = "add_moto_5_support.patch";
+ })
+ ];
- propagatedBuildInputs = [ django ];
+ build-system = [ setuptools ];
+
+ dependencies = [ django ];
optional-dependencies = {
azure = [ azure-storage-blob ];
@@ -52,26 +64,24 @@ buildPythonPackage rec {
rsa
] ++ lib.flatten (builtins.attrValues optional-dependencies);
+ checkInputs = [ pynacl ];
+
pythonImportsCheck = [ "storages" ];
env.DJANGO_SETTINGS_MODULE = "tests.settings";
disabledTests = [
# AttributeError: 'str' object has no attribute 'universe_domain'
+ # https://github.com/jschneier/django-storages/issues/1463
"test_storage_save_gzip"
];
- disabledTestPaths = [
- # ImportError: cannot import name 'mock_s3' from 'moto'
- "tests/test_s3.py"
- ];
-
- meta = with lib; {
+ meta = {
description = "Collection of custom storage backends for Django";
changelog = "https://github.com/jschneier/django-storages/blob/${version}/CHANGELOG.rst";
downloadPage = "https://github.com/jschneier/django-storages/";
homepage = "https://django-storages.readthedocs.io";
- license = licenses.bsd3;
- maintainers = with maintainers; [ mmai ];
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [ mmai ];
};
}
diff --git a/pkgs/development/python-modules/django-stubs-ext/default.nix b/pkgs/development/python-modules/django-stubs-ext/default.nix
index e899451185cc..d0caecd45776 100644
--- a/pkgs/development/python-modules/django-stubs-ext/default.nix
+++ b/pkgs/development/python-modules/django-stubs-ext/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "django-stubs-ext";
- version = "5.1.0";
+ version = "5.1.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "django_stubs_ext";
inherit version;
- hash = "sha256-7X1RwLcxZRh5/HXzMfsIBtmLZ7+rRk6W4nJNtrRu+SY=";
+ hash = "sha256-23Nk5PUK5+U2CZPb1Yo6V+pLLn5bqw+9UlzNs+eXXRw=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/django-tinymce/default.nix b/pkgs/development/python-modules/django-tinymce/default.nix
new file mode 100644
index 000000000000..a0eb660c1da9
--- /dev/null
+++ b/pkgs/development/python-modules/django-tinymce/default.nix
@@ -0,0 +1,45 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchPypi,
+ django,
+ pythonOlder,
+ setuptools,
+ pytestCheckHook,
+ pytest-django,
+}:
+
+buildPythonPackage rec {
+ pname = "django-tinymce";
+ version = "4.1.0";
+ pyproject = true;
+
+ disabled = pythonOlder "3.8";
+
+ src = fetchPypi {
+ inherit version;
+ pname = "django_tinymce";
+ hash = "sha256-AuO3DpQP0pnw++9DFa7lwYVmTh64zTlrF2ljlU5DV8k=";
+ };
+
+ build-system = [ setuptools ];
+
+ dependencies = [ django ];
+
+ DJANGO_SETTINGS_MODULE = "tests.settings";
+
+ checkInputs = [
+ pytest-django
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "tinymce" ];
+
+ meta = {
+ description = "Django application that contains a widget to render a form field as a TinyMCE editor";
+ homepage = "https://github.com/jazzband/django-tinymce";
+ changelog = "https://github.com/jazzband/django-tinymce/blob/${version}/CHANGELOG.rst";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.onny ];
+ };
+}
diff --git a/pkgs/development/python-modules/djangorestframework-guardian2/default.nix b/pkgs/development/python-modules/djangorestframework-guardian2/default.nix
index 4356d8226235..60991060b328 100644
--- a/pkgs/development/python-modules/djangorestframework-guardian2/default.nix
+++ b/pkgs/development/python-modules/djangorestframework-guardian2/default.nix
@@ -4,18 +4,19 @@
fetchFromGitHub,
django-guardian,
djangorestframework,
+ setuptools,
}:
buildPythonPackage rec {
pname = "djangorestframework-guardian2";
- version = "0.5.0";
- format = "setuptools";
+ version = "0.7.0";
+ pyproject = true;
src = fetchFromGitHub {
owner = "johnthagen";
repo = "django-rest-framework-guardian2";
- rev = "v${version}";
- hash = "sha256-aW20xEmVTAgwayWMJsabmyKNW65NftJyQANtT6JV74U=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-LrIhOoBWC3HttjAGbul4zof++OW35pGMyFGZzUpG1Tk=";
};
postPatch = ''
@@ -23,7 +24,9 @@ buildPythonPackage rec {
patchShebangs manage.py
'';
- propagatedBuildInputs = [
+ build-system = [ setuptools ];
+
+ dependencies = [
django-guardian
djangorestframework
];
diff --git a/pkgs/development/python-modules/dmgbuild/default.nix b/pkgs/development/python-modules/dmgbuild/default.nix
new file mode 100644
index 000000000000..e0a8f3ef1138
--- /dev/null
+++ b/pkgs/development/python-modules/dmgbuild/default.nix
@@ -0,0 +1,56 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ setuptools,
+ ds-store,
+ importlib-resources,
+ mac-alias,
+}:
+
+buildPythonPackage rec {
+ pname = "dmgbuild";
+ version = "1.6.2";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "dmgbuild";
+ repo = "dmgbuild";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-PozYxmXumFnptIgb4FM4b/Q5tx0MIS2bVw2kCuGucA8=";
+ };
+
+ postPatch = ''
+ # relax all deps
+ substituteInPlace pyproject.toml \
+ --replace-fail "==" ">="
+ '';
+
+ build-system = [
+ setuptools
+ ];
+
+ dependencies = [
+ ds-store
+ importlib-resources
+ mac-alias
+ ];
+
+ pythonImportsCheck = [
+ "dmgbuild"
+ ];
+
+ # require permissions to access TextEditor.app
+ # https://github.com/dmgbuild/dmgbuild/blob/refs/tags/v1.6.2/tests/examples/settings.py#L17
+ doCheck = false;
+
+ meta = {
+ description = "MacOS command line utility to build disk images";
+ homepage = "https://github.com/dmgbuild/dmgbuild";
+ changelog = "https://github.com/dmgbuild/dmgbuild/releases/tag/v${version}";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ moraxyc ];
+ mainProgram = "dmgbuild";
+ platforms = lib.platforms.darwin;
+ };
+}
diff --git a/pkgs/development/python-modules/doorbirdpy/default.nix b/pkgs/development/python-modules/doorbirdpy/default.nix
index acb4fab9c31b..b0ae8cfcea08 100644
--- a/pkgs/development/python-modules/doorbirdpy/default.nix
+++ b/pkgs/development/python-modules/doorbirdpy/default.nix
@@ -4,6 +4,7 @@
fetchFromGitLab,
setuptools,
aiohttp,
+ tenacity,
aioresponses,
pytest-asyncio,
pytestCheckHook,
@@ -11,19 +12,22 @@
buildPythonPackage rec {
pname = "doorbirdpy";
- version = "3.0.3";
+ version = "3.0.5";
pyproject = true;
src = fetchFromGitLab {
owner = "klikini";
repo = "doorbirdpy";
rev = "refs/tags/${version}";
- hash = "sha256-0UvzMFYKM/Sb9B2XwZwl+a9v7lTxAc1H59vR88VwDww=";
+ hash = "sha256-SVkprX9fMy1uGixsxsE7gbUJndvl+V/kle3Rq34S6Hs=";
};
build-system = [ setuptools ];
- dependencies = [ aiohttp ];
+ dependencies = [
+ aiohttp
+ tenacity
+ ];
nativeCheckInputs = [
aioresponses
@@ -31,6 +35,11 @@ buildPythonPackage rec {
pytestCheckHook
];
+ disabledTests = [
+ # connection error on mock host
+ "test_info_auth_fails"
+ ];
+
pythonImportsCheck = [ "doorbirdpy" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/dramatiq/default.nix b/pkgs/development/python-modules/dramatiq/default.nix
index b02da84182f7..6e7ff2f8afc8 100644
--- a/pkgs/development/python-modules/dramatiq/default.nix
+++ b/pkgs/development/python-modules/dramatiq/default.nix
@@ -10,25 +10,28 @@
pylibmc,
pytestCheckHook,
redis,
+ setuptools,
watchdog,
watchdog-gevent,
}:
buildPythonPackage rec {
pname = "dramatiq";
- version = "1.17.0";
- format = "setuptools";
+ version = "1.17.1";
+ pyproject = true;
- disabled = pythonOlder "3.7";
+ disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "Bogdanp";
repo = "dramatiq";
rev = "refs/tags/v${version}";
- hash = "sha256-xKHTBo2AirxDXe/CLSqo++3AgxP4pVkGTNdgS5CCZ3c=";
+ hash = "sha256-NeUGhG+H6r+JGd2qnJxRUbQ61G7n+3tsuDugTin3iJ4=";
};
- propagatedBuildInputs = [ prometheus-client ];
+ build-system = [ setuptools ];
+
+ dependencies = [ prometheus-client ];
optional-dependencies = {
all = [
diff --git a/pkgs/development/python-modules/drf-writable-nested/default.nix b/pkgs/development/python-modules/drf-writable-nested/default.nix
index 2211073b3235..1f62492ee483 100644
--- a/pkgs/development/python-modules/drf-writable-nested/default.nix
+++ b/pkgs/development/python-modules/drf-writable-nested/default.nix
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "drf-writable-nested";
- version = "0.7.0";
+ version = "0.7.1";
format = "setuptools";
src = fetchFromGitHub {
owner = "beda-software";
repo = "drf-writable-nested";
rev = "refs/tags/v${version}";
- hash = "sha256-/7MZAw0clzzlBdYchUVKldWT7WqtwdSe+016QAP0hqk=";
+ hash = "sha256-+I5HsqkjCrkF9MV90NGQuUhmLcDVsv20QIyDK9WxwdQ=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix
index 73a551a5c278..05ffb2f6c00d 100644
--- a/pkgs/development/python-modules/dropbox/default.nix
+++ b/pkgs/development/python-modules/dropbox/default.nix
@@ -52,8 +52,6 @@ buildPythonPackage rec {
--replace "'pytest-runner==5.2.0'," ""
'';
- doCheck = true;
-
pythonImportsCheck = [ "dropbox" ];
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/ducc0/default.nix b/pkgs/development/python-modules/ducc0/default.nix
index d42085999e85..1b8e6e733c40 100644
--- a/pkgs/development/python-modules/ducc0/default.nix
+++ b/pkgs/development/python-modules/ducc0/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "ducc0";
- version = "0.34.0";
+ version = "0.35.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "mtr";
repo = "ducc";
rev = "ducc0_${lib.replaceStrings [ "." ] [ "_" ] version}";
- hash = "sha256-lxNqB3Lt+n4vIH7cVW4DAwhjuPn49y+/3RLKVO8IuJM=";
+ hash = "sha256-LfN+rwJp5euVpR/5sUBG3XqBhF7/KbgW/485eufJtMQ=";
};
buildInputs = [ pybind11 ];
@@ -34,6 +34,8 @@ buildPythonPackage rec {
pytestFlagsArray = [ "python/test" ];
pythonImportsCheck = [ "ducc0" ];
+ DUCC0_OPTIMIZATION = "portable-strip";
+
meta = with lib; {
homepage = "https://gitlab.mpcdf.mpg.de/mtr/ducc";
description = "Efficient algorithms for Fast Fourier transforms and more";
diff --git a/pkgs/development/python-modules/easyocr/default.nix b/pkgs/development/python-modules/easyocr/default.nix
index a1ff17f2b360..a75434c018ae 100644
--- a/pkgs/development/python-modules/easyocr/default.nix
+++ b/pkgs/development/python-modules/easyocr/default.nix
@@ -2,10 +2,10 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ setuptools,
hdf5,
numpy,
- onnx,
- opencv4,
+ opencv-python-headless,
pillow,
pyaml,
pyclipper,
@@ -16,12 +16,13 @@
shapely,
torch,
torchvision,
+ python,
}:
buildPythonPackage rec {
pname = "easyocr";
version = "1.7.2";
- format = "setuptools";
+ pyproject = true;
disabled = pythonOlder "3.7";
@@ -32,16 +33,22 @@ buildPythonPackage rec {
hash = "sha256-9mrAxt2lphYtLW81lGO5SYHsnMnSA/VpHiY2NffD/Js=";
};
- postPatch = ''
- substituteInPlace requirements.txt \
- --replace "opencv-python-headless" "" \
- --replace "ninja" ""
- '';
+ build-system = [
+ setuptools
+ ];
- propagatedBuildInputs = [
+ pythonRelaxDeps = [
+ "torchvision"
+ ];
+
+ pythonRemoveDeps = [
+ "ninja"
+ ];
+
+ dependencies = [
hdf5
numpy
- opencv4
+ opencv-python-headless
pillow
pyaml
pyclipper
@@ -53,7 +60,19 @@ buildPythonPackage rec {
torchvision
];
- nativeCheckInputs = [ onnx ];
+ checkPhase = ''
+ runHook preCheck
+
+ export HOME="$(mktemp -d)"
+ pushd unit_test
+ ${python.interpreter} run_unit_test.py --easyocr "$out/${python.sitePackages}/easyocr"
+ popd
+
+ runHook postCheck
+ '';
+
+ # downloads detection model from the internet
+ doCheck = false;
pythonImportsCheck = [ "easyocr" ];
diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix
index d1844d34baed..cb4fcf18f263 100644
--- a/pkgs/development/python-modules/eigenpy/default.nix
+++ b/pkgs/development/python-modules/eigenpy/default.nix
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "eigenpy";
- version = "3.10.0";
+ version = "3.10.1";
pyproject = false; # Built with cmake
src = fetchFromGitHub {
owner = "stack-of-tasks";
repo = "eigenpy";
rev = "refs/tags/v${version}";
- hash = "sha256-ac667pEKXcbLLzCVGKYpyCQO805qhCEf8dCnC4QwxBs=";
+ hash = "sha256-9hKYCCKgPn1IJDezX/ARJHr5+0ridmGd1b3k/ZaVRG0=";
};
outputs = [
@@ -50,7 +50,6 @@ buildPythonPackage rec {
numpy
];
- doCheck = true;
pythonImportsCheck = [ "eigenpy" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/einx/default.nix b/pkgs/development/python-modules/einx/default.nix
new file mode 100644
index 000000000000..0f181b5051aa
--- /dev/null
+++ b/pkgs/development/python-modules/einx/default.nix
@@ -0,0 +1,46 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ setuptools,
+ wheel,
+ numpy,
+ sympy,
+ frozendict,
+}:
+
+buildPythonPackage rec {
+ pname = "einx";
+ version = "0.3.0";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "fferflo";
+ repo = "einx";
+ rev = "v${version}";
+ hash = "sha256-lbcf47h1tW1fj94NLG4iJPEs6ziGPkcX1Q+wn59PvS8=";
+ };
+
+ build-system = [
+ setuptools
+ wheel
+ ];
+
+ dependencies = [
+ numpy
+ sympy
+ frozendict
+ ];
+
+ pythonImportsCheck = [
+ "einx"
+ ];
+
+ meta = {
+ description = "Universal Tensor Operations in Einstein-Inspired Notation for Python";
+ homepage = "https://github.com/fferflo/einx";
+ changelog = "https://github.com/fferflo/einx/blob/${src.rev}/CHANGELOG.md";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ happysalada ];
+ };
+}
diff --git a/pkgs/development/python-modules/etcd3/default.nix b/pkgs/development/python-modules/etcd3/default.nix
index e105afb48ae4..366306d6302c 100644
--- a/pkgs/development/python-modules/etcd3/default.nix
+++ b/pkgs/development/python-modules/etcd3/default.nix
@@ -11,12 +11,13 @@
pytestCheckHook,
six,
tenacity,
+ setuptools,
}:
buildPythonPackage rec {
pname = "etcd3";
version = "0.12.0";
- format = "setuptools";
+ pyproject = true;
src = fetchFromGitHub {
owner = "kragniz";
@@ -25,7 +26,15 @@ buildPythonPackage rec {
hash = "sha256-YM72+fkCDYXl6DORJa/O0sqXqHDWQcFLv2ifQ9kEHBo=";
};
- propagatedBuildInputs = [
+ build-system = [ setuptools ];
+
+ env = {
+ # make protobuf compatible with old versions
+ # https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
+ PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+ };
+
+ dependencies = [
grpcio
protobuf
six
@@ -49,10 +58,10 @@ buildPythonPackage rec {
pythonImportsCheck = [ "etcd3" ];
- meta = with lib; {
+ meta = {
description = "Python client for the etcd API v3";
homepage = "https://github.com/kragniz/python-etcd3";
- license = licenses.asl20;
- maintainers = [ ];
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ moraxyc ];
};
}
diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix
index 0f925eadb23a..6b853fd9d9bf 100644
--- a/pkgs/development/python-modules/etils/default.nix
+++ b/pkgs/development/python-modules/etils/default.nix
@@ -29,14 +29,14 @@
buildPythonPackage rec {
pname = "etils";
- version = "1.9.4";
+ version = "1.10.0";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchPypi {
inherit pname version;
- hash = "sha256-+tlQQU8KHKWMcMcJFbABT5lT3ZvPiqlRoPdf+b7L6yQ=";
+ hash = "sha256-Tqqdckj9Tut15E1HyimHWlzOoETMFKF0NXlL+KwRagU=";
};
nativeBuildInputs = [ flit-core ];
diff --git a/pkgs/development/python-modules/extract-msg/default.nix b/pkgs/development/python-modules/extract-msg/default.nix
index 45959765581f..5fd8e5ff6df7 100644
--- a/pkgs/development/python-modules/extract-msg/default.nix
+++ b/pkgs/development/python-modules/extract-msg/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "extract-msg";
- version = "0.50.1";
+ version = "0.52.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "TeamMsgExtractor";
repo = "msg-extractor";
rev = "refs/tags/v${version}";
- hash = "sha256-MWqJYdv+P87n5KtrtSJnyY59uuLtHL9EG8WyYRdfSTw=";
+ hash = "sha256-4jvzZkGa/xI5Sl9TBIm/BD3tGl+MZvwir6m/zrvA4tQ=";
};
pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/extractcode/default.nix b/pkgs/development/python-modules/extractcode/default.nix
index 350ff622f6c2..6d9ff4548eb4 100644
--- a/pkgs/development/python-modules/extractcode/default.nix
+++ b/pkgs/development/python-modules/extractcode/default.nix
@@ -10,13 +10,14 @@
pythonOlder,
setuptools-scm,
six,
+ setuptools,
typecode,
}:
buildPythonPackage rec {
pname = "extractcode";
version = "31.0.0";
- format = "setuptools";
+ pyproject = true;
disabled = pythonOlder "3.6";
@@ -33,9 +34,9 @@ buildPythonPackage rec {
dontConfigure = true;
- nativeBuildInputs = [ setuptools-scm ];
+ build-system = [ setuptools-scm ];
- propagatedBuildInputs = [
+ dependencies = [
typecode
patch
extractcode-libarchive
@@ -67,16 +68,18 @@ buildPythonPackage rec {
"test_patch_info_patch_patches_windows_plugin_explorer_patch"
# AssertionError: assert [['linux-2.6...._end;', ...]]] == [['linux-2.6...._end;', ...]]]
"test_patch_info_patch_patches_misc_linux_st710x_patches_motorola_rootdisk_c_patch"
+ # extractcode.libarchive2.ArchiveErrorRetryable: Damaged tar archive
+ "test_extract_python_testtar_tar_archive_with_special_files"
];
pythonImportsCheck = [ "extractcode" ];
meta = with lib; {
description = "Universal archive extractor using z7zip, libarchive, other libraries and the Python standard library";
- mainProgram = "extractcode";
- homepage = "https://github.com/nexB/extractcode";
- changelog = "https://github.com/nexB/extractcode/releases/tag/v${version}";
+ homepage = "https://github.com/aboutcode-org/extractcode";
+ changelog = "https://github.com/aboutcode-org/extractcode/releases/tag/v${version}";
license = licenses.asl20;
maintainers = [ ];
+ mainProgram = "extractcode";
};
}
diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix
index 138c7ab0980d..3d15da8d064b 100644
--- a/pkgs/development/python-modules/fake-useragent/default.nix
+++ b/pkgs/development/python-modules/fake-useragent/default.nix
@@ -27,22 +27,25 @@ buildPythonPackage rec {
sed -i '/addopts/d' pytest.ini
'';
- nativeBuildInputs = [ setuptools ];
+ build-system = [ setuptools ];
- propagatedBuildInputs =
- [ ]
- ++ lib.optionals (pythonOlder "3.10") [ importlib-resources ]
+ dependencies =
+ lib.optionals (pythonOlder "3.10") [ importlib-resources ]
++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "fake_useragent" ];
- meta = with lib; {
+ disabledTests = lib.optionals (pythonOlder "3.12") [
+ "test_utils_load_pkg_resource_fallback"
+ ];
+
+ meta = {
+ changelog = "https://github.com/fake-useragent/fake-useragent/releases/tag/${version}";
description = "Up to date simple useragent faker with real world database";
homepage = "https://github.com/hellysmile/fake-useragent";
- changelog = "https://github.com/fake-useragent/fake-useragent/releases/tag/${version}";
- license = licenses.asl20;
- maintainers = with maintainers; [ evanjs ];
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ evanjs ];
};
}
diff --git a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix
index a9ce3ef4a451..0eec5c5cb6e0 100644
--- a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix
+++ b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "faraday-agent-parameters-types";
- version = "1.7.1";
+ version = "1.7.2";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "faraday_agent_parameters_types";
inherit version;
- hash = "sha256-ypr5/6mnATFswZPX4aeusH8PoYRa+yVL1gk+pdz7r0w=";
+ hash = "sha256-9+scGbRITK25XLJOMsMzPj/y5Wi05mB0dcXDhon9Cf4=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix
index 130c767c39f4..c0239f2a6c86 100644
--- a/pkgs/development/python-modules/flask-compress/default.nix
+++ b/pkgs/development/python-modules/flask-compress/default.nix
@@ -6,6 +6,7 @@
setuptools,
setuptools-scm,
flask,
+ flask-caching,
zstandard,
brotli,
brotlicffi,
@@ -13,7 +14,7 @@
}:
buildPythonPackage rec {
- version = "1.15";
+ version = "1.17";
pname = "flask-compress";
pyproject = true;
@@ -21,7 +22,7 @@ buildPythonPackage rec {
owner = "colour-science";
repo = "flask-compress";
rev = "refs/tags/v${version}";
- hash = "sha256-J7d/OIUsDWM6DoXS0P4EOE3k6txXKm6m4Yq/EJk6FRE=";
+ hash = "sha256-87fjJxaS7eJbOkSUljnhqFIeahoS4L2tAOhmv4ryVUM=";
};
build-system = [
@@ -34,7 +35,10 @@ buildPythonPackage rec {
zstandard
] ++ lib.optionals (!isPyPy) [ brotli ] ++ lib.optionals isPyPy [ brotlicffi ];
- nativeCheckInputs = [ pytestCheckHook ];
+ nativeCheckInputs = [
+ pytestCheckHook
+ flask-caching
+ ];
pythonImportsCheck = [ "flask_compress" ];
diff --git a/pkgs/development/python-modules/flask-session-captcha/default.nix b/pkgs/development/python-modules/flask-session-captcha/default.nix
index 675afdcb2b38..b1ef27fb3c67 100644
--- a/pkgs/development/python-modules/flask-session-captcha/default.nix
+++ b/pkgs/development/python-modules/flask-session-captcha/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "flask-session-captcha";
- version = "1.4.2";
+ version = "1.5.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "Tethik";
repo = "flask-session-captcha";
rev = "refs/tags/v${version}";
- hash = "sha256-hf6ifTrsWvgvUHFAPdS8ns8aKN02zquLGCq5ouQF0ck=";
+ hash = "sha256-2JPJx8yQIl0bbcbshONJtja7BnSiieHzHi64A6jLpc0=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix
index 8be25eafc613..d8e2e317dbba 100644
--- a/pkgs/development/python-modules/folium/default.nix
+++ b/pkgs/development/python-modules/folium/default.nix
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "folium";
- version = "0.17.0";
+ version = "0.18.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "python-visualization";
repo = "folium";
rev = "refs/tags/v${version}";
- hash = "sha256-uKT6WqT3pI3rqfV/3CA+mXBk3F7h4RWW1h2FPIy0JH4=";
+ hash = "sha256-TNj3javEETjWpI3xs1y/AuKHqFwnTBmWORZK2fafKqI=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/font-v/default.nix b/pkgs/development/python-modules/font-v/default.nix
index 4f1a22a640d0..945f77698ef7 100644
--- a/pkgs/development/python-modules/font-v/default.nix
+++ b/pkgs/development/python-modules/font-v/default.nix
@@ -26,7 +26,6 @@ buildPythonPackage rec {
gitpython
];
- doCheck = true;
nativeCheckInputs = [
git
pytestCheckHook
diff --git a/pkgs/development/python-modules/fontfeatures/default.nix b/pkgs/development/python-modules/fontfeatures/default.nix
index b6a4482b4ba4..11943c36e05b 100644
--- a/pkgs/development/python-modules/fontfeatures/default.nix
+++ b/pkgs/development/python-modules/fontfeatures/default.nix
@@ -31,7 +31,6 @@ buildPythonPackage rec {
youseedee
];
- doCheck = true;
nativeCheckInputs = [ pytestCheckHook ];
disabledTestPaths = [
# These tests require babelfont but we have to leave it out and skip them
diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
index d51041828a64..ec5aca9062a6 100644
--- a/pkgs/development/python-modules/ftfy/default.nix
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -1,11 +1,11 @@
{
lib,
buildPythonPackage,
- fetchPypi,
+ fetchFromGitHub,
pythonOlder,
# build-system
- poetry-core,
+ hatchling,
# dependencies
wcwidth,
@@ -17,17 +17,19 @@
buildPythonPackage rec {
pname = "ftfy";
- version = "6.2.3";
+ version = "6.3.1";
pyproject = true;
- disabled = pythonOlder "3.7";
+ disabled = pythonOlder "3.9";
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-ebUFmI8p1XelipBpr+dVU6AqRuQt5gkcBmDNxngSutw=";
+ src = fetchFromGitHub {
+ owner = "rspeer";
+ repo = "python-ftfy";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-TmwDJeUDcF+uOB2X5tMmnf9liCI9rP6dYJVmJoaqszo=";
};
- build-system = [ poetry-core ];
+ build-system = [ hatchling ];
dependencies = [ wcwidth ];
@@ -42,12 +44,8 @@ buildPythonPackage rec {
export PATH=$out/bin:$PATH
'';
- disabledTestPaths = [
- # Calls poetry and fails to match output exactly
- "tests/test_cli.py"
- ];
-
meta = with lib; {
+ changelog = "https://github.com/rspeer/python-ftfy/blob/${src.rev}/CHANGELOG.md";
description = "Given Unicode text, make its representation consistent and possibly less broken";
mainProgram = "ftfy";
homepage = "https://github.com/LuminosoInsight/python-ftfy";
diff --git a/pkgs/development/python-modules/fyta-cli/default.nix b/pkgs/development/python-modules/fyta-cli/default.nix
index b5199a74ca28..ad3a255e58c0 100644
--- a/pkgs/development/python-modules/fyta-cli/default.nix
+++ b/pkgs/development/python-modules/fyta-cli/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "fyta-cli";
- version = "0.6.7";
+ version = "0.6.10";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "dontinelli";
repo = "fyta_cli";
rev = "refs/tags/v${version}";
- hash = "sha256-KdrDRiPpkG8SDPWtGKU7A14WtQuuA4823t47uWHdGko=";
+ hash = "sha256-sPbN6gMPtNzYTYQ5F8w59m5DKobx/TV6v5v8Q9u1rXQ=";
};
build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/gardena-bluetooth/default.nix b/pkgs/development/python-modules/gardena-bluetooth/default.nix
index 45cbdea0d546..b80c83d774c7 100644
--- a/pkgs/development/python-modules/gardena-bluetooth/default.nix
+++ b/pkgs/development/python-modules/gardena-bluetooth/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "gardena-bluetooth";
- version = "1.4.3";
+ version = "1.4.4";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "elupus";
repo = "gardena-bluetooth";
rev = "refs/tags/${version}";
- hash = "sha256-H2v96G/mu17puq8jNyk6L9iuWUvRombPd+s6byNQ4Zw=";
+ hash = "sha256-BV4chGkVp9H7gJQGKQZ0e4IiizMjCbDAU5MMf7hS9mE=";
};
build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/git-filter-repo/default.nix b/pkgs/development/python-modules/git-filter-repo/default.nix
index 5591d87dd5a3..af9b80ad38b6 100644
--- a/pkgs/development/python-modules/git-filter-repo/default.nix
+++ b/pkgs/development/python-modules/git-filter-repo/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
docs_version = "71d71d4be238628bf9cb9b27be79b8bb824ed1a9";
pyproject = true;
- disabled = pythonOlder "3.5";
+ disabled = pythonOlder "3.9";
src = fetchPypi {
pname = "git_filter_repo";
@@ -34,10 +34,9 @@ buildPythonPackage rec {
installManPage ${docs}/man1/git-filter-repo.1
'';
- nativeBuildInputs = [
- setuptools-scm
- installShellFiles
- ];
+ build-system = [ setuptools-scm ];
+
+ nativeBuildInputs = [ installShellFiles ];
# Project has no tests
doCheck = false;
diff --git a/pkgs/development/python-modules/go2rtc-client/default.nix b/pkgs/development/python-modules/go2rtc-client/default.nix
new file mode 100644
index 000000000000..e370d262b090
--- /dev/null
+++ b/pkgs/development/python-modules/go2rtc-client/default.nix
@@ -0,0 +1,67 @@
+{
+ lib,
+ aiohttp,
+ aioresponses,
+ awesomeversion,
+ buildPythonPackage,
+ fetchFromGitHub,
+ hatchling,
+ mashumaro,
+ orjson,
+ pytest-asyncio,
+ pytest-cov-stub,
+ pytestCheckHook,
+ pythonOlder,
+ syrupy,
+ webrtc-models,
+}:
+
+buildPythonPackage rec {
+ pname = "go2rtc-client";
+ version = "0.0.1b2";
+ pyproject = true;
+
+ disabled = pythonOlder "3.12";
+
+ src = fetchFromGitHub {
+ owner = "home-assistant-libs";
+ repo = "python-go2rtc-client";
+ rev = "refs/tags/${version}";
+ hash = "sha256-q1NDHauYy8C3tlIpt6J0iMj0TNtBv2j9aU/IE5CgBjg=";
+ };
+
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace-fail 'version = "0.0.0"' 'version = "${version}"'
+ '';
+
+ pythonRelaxDeps = [ "orjson" ];
+
+ build-system = [ hatchling ];
+
+ dependencies = [
+ aiohttp
+ awesomeversion
+ mashumaro
+ orjson
+ webrtc-models
+ ];
+
+ nativeCheckInputs = [
+ aioresponses
+ pytest-asyncio
+ pytest-cov-stub
+ pytestCheckHook
+ syrupy
+ ];
+
+ pythonImportsCheck = [ "go2rtc_client" ];
+
+ meta = {
+ description = "Module for interacting with go2rtc";
+ homepage = "https://github.com/home-assistant-libs/python-go2rtc-client";
+ changelog = "https://github.com/home-assistant-libs/python-go2rtc-client/releases/tag/${version}";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ ];
+ };
+}
diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix
index 5f6c9c54f2b4..f692306f62d8 100644
--- a/pkgs/development/python-modules/google-cloud-asset/default.nix
+++ b/pkgs/development/python-modules/google-cloud-asset/default.nix
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "google-cloud-asset";
- version = "3.26.4";
+ version = "3.27.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_asset";
inherit version;
- hash = "sha256-c/xmHAD8zXdi+2ifs4bHWPS2B49Fcnr4RqLfrpGwQzs=";
+ hash = "sha256-AuFuc3Qu1N2iWtNlYKhNQX2ETwjLB2e8ydrGO9ozR+E=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix
index 83e861edd52d..e78652373f0c 100644
--- a/pkgs/development/python-modules/google-cloud-automl/default.nix
+++ b/pkgs/development/python-modules/google-cloud-automl/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "google-cloud-automl";
- version = "2.13.5";
+ version = "2.14.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_automl";
inherit version;
- hash = "sha256-ypmK9Gq7HF2ozS6OFbAJZDPiW8sngucN86b5FHLuiTE=";
+ hash = "sha256-CpVwnxU1DAdU7VGY1LjkOlv5ki2ZxlA0sWd9vsR5rkI=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix
index 25b517fef06a..218d0fe52c0c 100644
--- a/pkgs/development/python-modules/google-cloud-container/default.nix
+++ b/pkgs/development/python-modules/google-cloud-container/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-container";
- version = "2.52.0";
+ version = "2.53.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_container";
inherit version;
- hash = "sha256-ei+sdoCmpbsndrSUof0eLmTkk1ZDsqAfuTu40btzsO8=";
+ hash = "sha256-vgvcpw8DrBwRbpVkywpNYZGXagpNhV2BO9+CSt1LFVA=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
index 74cce025116a..ac8e29c31132 100644
--- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
+++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "google-cloud-datacatalog";
- version = "3.20.1";
+ version = "3.21.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_datacatalog";
inherit version;
- hash = "sha256-ggzQ85PzgEk4nnD9ykYd1VGPmtf2T6guAzv51SLlkmI=";
+ hash = "sha256-JH3WW8v1VrTebNyEy7EDL9nvMaRf2gQTf6fnWbqMbCA=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix
index cd8eab718411..3a2bdd3b850e 100644
--- a/pkgs/development/python-modules/google-cloud-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-logging/default.nix
@@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "google-cloud-logging";
- version = "3.11.2";
+ version = "3.11.3";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_logging";
inherit version;
- hash = "sha256-SJdEHCt09u2pGBwjqIFyI7YUWUMxSoIdZLcp0wdmyys=";
+ hash = "sha256-CnPNlBGIdTh9RTU3HZ6UJoYe3vjkT7oSYehngtW41U8=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix
index eaa3d4e435e0..e36b0cc2fab3 100644
--- a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix
+++ b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-network-connectivity";
- version = "2.4.5";
+ version = "2.5.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit version;
pname = "google_cloud_network_connectivity";
- hash = "sha256-g2N39pKk0HG8f9NkSh/iOmDQNapnTyMf85mPBM0LIe4=";
+ hash = "sha256-+qCSCQJCsmtRtyEu6m9TnOa40bZGKISw/7+yHUMSXD0=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix
index ab2af5b45cbf..a7ab5c1aec0e 100644
--- a/pkgs/development/python-modules/google-cloud-os-config/default.nix
+++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "google-cloud-os-config";
- version = "1.17.5";
+ version = "1.18.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_os_config";
inherit version;
- hash = "sha256-O4yGoidanx9zdMb+KhjTljEjaXTC0A2kbejzL0VWTCg=";
+ hash = "sha256-Xx83zfz+zBUtlZKGqO4gBbRmy/8F1TE5AvizqHEIF7M=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix
index 7944da13d932..a3f45ce57f5d 100644
--- a/pkgs/development/python-modules/google-cloud-redis/default.nix
+++ b/pkgs/development/python-modules/google-cloud-redis/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "google-cloud-redis";
- version = "2.15.5";
+ version = "2.16.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_redis";
inherit version;
- hash = "sha256-0k3Ww3mznGAUQ4uQMAA+/5gTr71a8rj730cz3GXzZ2A=";
+ hash = "sha256-bQjLUjstRlekL8/kMt41zfjq+XnnUUhPHaJ6lwRpAZY=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
index d1dd18cd342a..5ae9acb7e4bd 100644
--- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
+++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-resource-manager";
- version = "1.12.5";
+ version = "1.13.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_resource_manager";
inherit version;
- hash = "sha256-t69CVEAe1O+jq6OpKcs924A/prr5GnhIXkVYNZfeWJE=";
+ hash = "sha256-rkv2lEPxSzcAfU2EFQEVsJQuiwFlD9eh/G/03Bdg5cQ=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
index c89f4d0576fa..86f2378b0929 100644
--- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
+++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "google-cloud-secret-manager";
- version = "2.20.2";
+ version = "2.21.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_secret_manager";
inherit version;
- hash = "sha256-u+JIJeM0+eZ56CXnDZMhGKf/U25nwc6wSNpEERyHpFw=";
+ hash = "sha256-0a6E7PmM/DGcmj8QEjVc69GTF7ZizJ3/Giw2I0WAgHs=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
index fb6365ec61b2..c70c830aaae6 100644
--- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
+++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "google-cloud-securitycenter";
- version = "1.34.0";
+ version = "1.35.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_securitycenter";
inherit version;
- hash = "sha256-GDvl7W6gFe3c8MHtAOyjzDw/ByNnkxHe2NjgviP10LI=";
+ hash = "sha256-hTOh2RpiRls+nrcEcOewZ0EvGoljBj5tm3iGLbnP7do=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-shell/default.nix b/pkgs/development/python-modules/google-cloud-shell/default.nix
index 1e9bbb918ff1..21a97ef6593f 100644
--- a/pkgs/development/python-modules/google-cloud-shell/default.nix
+++ b/pkgs/development/python-modules/google-cloud-shell/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-shell";
- version = "1.9.5";
+ version = "1.10.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_shell";
inherit version;
- hash = "sha256-UpDomrWUTrsiI+OdrI5nJKC/J+eaZiNDmMt0QgcP5Fw==";
+ hash = "sha256-xhwDKKtksCVXrLEiefPg6aYgWZlNZ2QYFs1AmBIJNjw=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix
index 38e430bca5dd..443d3ebb48b0 100644
--- a/pkgs/development/python-modules/google-cloud-speech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-speech/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "google-cloud-speech";
- version = "2.27.0";
+ version = "2.28.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_speech";
inherit version;
- hash = "sha256-YXTTIcyBpYs2veboOZ11MdUBI5OVOHKkaMtmTkKGg4U=";
+ hash = "sha256-cGvKg647ru1cz1HM+7BkIqyUTPfjepPdm/KygwXqdEU=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix
index a5388a85cf08..22e3c2454ade 100644
--- a/pkgs/development/python-modules/google-cloud-tasks/default.nix
+++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-tasks";
- version = "2.16.5";
+ version = "2.17.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_tasks";
inherit version;
- hash = "sha256-i9wpSgnjRkfhIKLkDdfsIIcwJNX04JOLL/DDn/N07aw=";
+ hash = "sha256-5tcJsIrzsXO2w/uA/wK2bi1ZVPkulNVHTYCzA4R6OME=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix
index c1c89e10081b..354a822af121 100644
--- a/pkgs/development/python-modules/google-cloud-vision/default.nix
+++ b/pkgs/development/python-modules/google-cloud-vision/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "google-cloud-vision";
- version = "3.7.4";
+ version = "3.8.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_vision";
inherit version;
- hash = "sha256-gLZ/Ci3Fh6MddILT0mkqdz8l+9CUaP2d5F0AtnGq2Zk=";
+ hash = "sha256-WRydHKJjCPEFV/0LH+zOuqemUZn3Ant33HMRggQAcgs=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix
index 8bdcc432a84b..20ce956e2cf2 100644
--- a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix
+++ b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-vpc-access";
- version = "1.10.5";
+ version = "1.11.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_vpc_access";
inherit version;
- hash = "sha256-ee0O0MDo3VEUuansbm0Io35g/8aRA2ShoZh+IfwQAww=";
+ hash = "sha256-WtgnMVuQHXSpSKSP9mRT9gXkjszF/bOjcdiJlxFUZiE=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-webrisk/default.nix b/pkgs/development/python-modules/google-cloud-webrisk/default.nix
index 0a11573eb682..97f5ced69221 100644
--- a/pkgs/development/python-modules/google-cloud-webrisk/default.nix
+++ b/pkgs/development/python-modules/google-cloud-webrisk/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-webrisk";
- version = "1.14.5";
+ version = "1.15.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_webrisk";
inherit version;
- hash = "sha256-zlJhVcoqagtodRCVUVlWZODH+C7/H1KIj7vBYkZUs2A=";
+ hash = "sha256-7nTkIgAfn7c9XGJFnq7fNRExNV4Kfdjv4Trrc+nRW6k=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
index 880802fdbd6f..63ae6795e081 100644
--- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "google-cloud-websecurityscanner";
- version = "1.14.5";
+ version = "1.15.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_websecurityscanner";
inherit version;
- hash = "sha256-H2yBAljtBaJ23+Y0AAi9wu5mC6sohvuJSOTNqtvGAjs=";
+ hash = "sha256-6D3OcAe5KUqExfvJHL7LJv8rPn4XUyyqhoB+fJXVwCo=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-workflows/default.nix b/pkgs/development/python-modules/google-cloud-workflows/default.nix
index 9d77226951ea..8ce558e29d4e 100644
--- a/pkgs/development/python-modules/google-cloud-workflows/default.nix
+++ b/pkgs/development/python-modules/google-cloud-workflows/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "google-cloud-workflows";
- version = "1.14.5";
+ version = "1.15.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_workflows";
inherit version;
- hash = "sha256-HNur2TEVRf8+sg6r8qmE62ZsOP0lF2ma1Fpp85lmfoM=";
+ hash = "sha256-rR3VbImKo4Vk0TxQeEUCy3faAnH74os0nN0sTs0DPyw=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-workstations/default.nix b/pkgs/development/python-modules/google-cloud-workstations/default.nix
index 7fb70589b718..ffcfcb48ca0f 100644
--- a/pkgs/development/python-modules/google-cloud-workstations/default.nix
+++ b/pkgs/development/python-modules/google-cloud-workstations/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "google-cloud-workstations";
- version = "0.5.8";
+ version = "0.5.9";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_workstations";
inherit version;
- hash = "sha256-Xu7oL5R/K3oHMea1xCwRLPoxgPNMFRSMYCQ73K9sMgQ=";
+ hash = "sha256-9bxYupNFRYenfGUOOAeeWIIkUEh3o9umnMzijXesQyE=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix
index cd6ce736d2a6..9399e547a050 100644
--- a/pkgs/development/python-modules/gpapi/default.nix
+++ b/pkgs/development/python-modules/gpapi/default.nix
@@ -6,34 +6,51 @@
protobuf,
pycryptodome,
requests,
+ protobuf_27,
+ setuptools,
}:
buildPythonPackage rec {
version = "0.4.4";
- format = "setuptools";
pname = "gpapi";
+ pyproject = true;
src = fetchPypi {
inherit version pname;
- sha256 = "0ampvsv97r3hy1cakif4kmyk1ynf3scbvh4fbk02x7xrxn4kl38w";
+ sha256 = "sha256-HA06ie25ny7AXI7AvZgezvowfZ3ExalY8HDkk7betyo=";
};
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace-fail 'PROTOC_EXEC = "protoc"' 'PROTOC_EXEC = "${lib.getExe protobuf_27}"'
+ '';
+
+ build-system = [ setuptools ];
+
+ buildInputs = [
+ protobuf_27
+ ];
+
+ dependencies = [
+ cryptography
+ protobuf
+ pycryptodome
+ requests
+ ];
+
+ preBuild = ''
+ export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION="python"
+ '';
+
# package doesn't contain unit tests
# scripts in ./test require networking
doCheck = false;
pythonImportsCheck = [ "gpapi.googleplay" ];
- propagatedBuildInputs = [
- cryptography
- protobuf
- pycryptodome
- requests
- ];
-
- meta = with lib; {
+ meta = {
homepage = "https://github.com/NoMore201/googleplay-api";
- license = licenses.gpl3Only;
+ license = lib.licenses.gpl3Only;
description = "Google Play Unofficial Python API";
maintainers = [ ];
};
diff --git a/pkgs/development/python-modules/graph-tool/default.nix b/pkgs/development/python-modules/graph-tool/default.nix
index 4d639639e3fe..ff0ab4f62787 100644
--- a/pkgs/development/python-modules/graph-tool/default.nix
+++ b/pkgs/development/python-modules/graph-tool/default.nix
@@ -34,12 +34,12 @@ let
in
buildPythonPackage rec {
pname = "graph-tool";
- version = "2.77";
+ version = "2.78";
format = "other";
src = fetchurl {
url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
- hash = "sha256-mu/6r1Uo836ZTxuIL3UdsKvuUz+H1FZY9Y3ZbEBK0LQ=";
+ hash = "sha256-gG9TWKRJISOowRIXI1/ROTIwrVwhxFtMOextXqN6KiU=";
};
# Remove error messages about tput during build process without adding ncurses,
diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix
index 4d5662509e06..75c3ade1b51d 100644
--- a/pkgs/development/python-modules/grpcio-channelz/default.nix
+++ b/pkgs/development/python-modules/grpcio-channelz/default.nix
@@ -7,6 +7,9 @@
protobuf,
}:
+# This package should be updated together with the main grpc package and other
+# related python grpc packages.
+# nixpkgs-update: no auto update
buildPythonPackage rec {
pname = "grpcio-channelz";
version = "1.66.2";
diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix
index e7b6f49f158b..c96b71d3f5fc 100644
--- a/pkgs/development/python-modules/grpcio-health-checking/default.nix
+++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix
@@ -6,6 +6,9 @@
protobuf,
}:
+# This package should be updated together with the main grpc package and other
+# related python grpc packages.
+# nixpkgs-update: no auto update
buildPythonPackage rec {
pname = "grpcio-health-checking";
version = "1.66.2";
diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix
index 35fb1faaeaef..c37492ccf476 100644
--- a/pkgs/development/python-modules/grpcio-reflection/default.nix
+++ b/pkgs/development/python-modules/grpcio-reflection/default.nix
@@ -7,6 +7,9 @@
protobuf,
}:
+# This package should be updated together with the main grpc package and other
+# related python grpc packages.
+# nixpkgs-update: no auto update
buildPythonPackage rec {
pname = "grpcio-reflection";
version = "1.66.2";
diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix
index 89c02c344dd7..1d203369e10b 100644
--- a/pkgs/development/python-modules/grpcio-status/default.nix
+++ b/pkgs/development/python-modules/grpcio-status/default.nix
@@ -8,6 +8,9 @@
pythonOlder,
}:
+# This package should be updated together with the main grpc package and other
+# related python grpc packages.
+# nixpkgs-update: no auto update
buildPythonPackage rec {
pname = "grpcio-status";
version = "1.66.2";
diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix
index cabad7a8cfbe..0d38efffbc14 100644
--- a/pkgs/development/python-modules/grpcio-testing/default.nix
+++ b/pkgs/development/python-modules/grpcio-testing/default.nix
@@ -8,6 +8,9 @@
setuptools,
}:
+# This package should be updated together with the main grpc package and other
+# related python grpc packages.
+# nixpkgs-update: no auto update
buildPythonPackage rec {
pname = "grpcio-testing";
version = "1.66.2";
diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
index 50b243cdf3d2..c256496573fd 100644
--- a/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -7,6 +7,9 @@
setuptools,
}:
+# This package should be updated together with the main grpc package and other
+# related python grpc packages.
+# nixpkgs-update: no auto update
buildPythonPackage rec {
pname = "grpcio-tools";
version = "1.66.2";
diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix
index 8cff17c81eb4..ed425b7125df 100644
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@@ -16,6 +16,9 @@
zlib,
}:
+# This package should be updated together with the main grpc package and other
+# related python grpc packages.
+# nixpkgs-update: no auto update
buildPythonPackage rec {
pname = "grpcio";
format = "setuptools";
diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix
index e0b270c95c07..28c9a5aa3d25 100644
--- a/pkgs/development/python-modules/gsd/default.nix
+++ b/pkgs/development/python-modules/gsd/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "gsd";
- version = "3.3.2";
+ version = "3.4.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "glotzerlab";
repo = "gsd";
rev = "refs/tags/v${version}";
- hash = "sha256-4NxZPu4DrwQW6qHeYairefabfN7J0+48tvVwi6ti4vk=";
+ hash = "sha256-4HJZZ5UUENHhKePfau6KT4E4qA9YCGpe/IMLyf5egsk=";
};
build-system = [
diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index ab476729c66f..5c0b7f3146e7 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -53,8 +53,6 @@ buildPythonPackage rec {
"-Dpython=${python.pythonOnBuildForHost.interpreter}"
];
- doCheck = true;
-
# TODO: Meson setup hook does not like buildPythonPackage
# https://github.com/NixOS/nixpkgs/issues/47390
installCheckPhase = "meson test --print-errorlogs";
diff --git a/pkgs/development/python-modules/gymnasium/default.nix b/pkgs/development/python-modules/gymnasium/default.nix
index d7642559e537..b730ef5c5a9d 100644
--- a/pkgs/development/python-modules/gymnasium/default.nix
+++ b/pkgs/development/python-modules/gymnasium/default.nix
@@ -1,48 +1,53 @@
{
lib,
+ stdenv,
buildPythonPackage,
fetchFromGitHub,
+
+ # build-system
setuptools,
- numpy,
+
+ # dependencies
cloudpickle,
- gym-notices,
- jax-jumpy,
- typing-extensions,
farama-notifications,
- importlib-metadata,
+ numpy,
+ typing-extensions,
pythonOlder,
- ffmpeg,
+ importlib-metadata,
+
+ # tests
+ dill,
+ flax,
jax,
jaxlib,
matplotlib,
+ mujoco,
moviepy,
opencv4,
pybox2d,
pygame,
pytestCheckHook,
scipy,
- stdenv,
}:
buildPythonPackage rec {
pname = "gymnasium";
- version = "0.29.1";
- format = "pyproject";
+ version = "1.0.0";
+
+ pyproject = true;
src = fetchFromGitHub {
owner = "Farama-Foundation";
repo = "gymnasium";
rev = "refs/tags/v${version}";
- hash = "sha256-L7fn9FaJzXwQhjDKwI9hlFpbPuQdwynU+Xjd8bbjxiw=";
+ hash = "sha256-Qchuz08yJ0giVrtKLC9vBgr28JrHQyAOCuoS239ivVw=";
};
- nativeBuildInputs = [ setuptools ];
+ build-system = [ setuptools ];
- propagatedBuildInputs = [
+ dependencies = [
cloudpickle
farama-notifications
- gym-notices
- jax-jumpy
numpy
typing-extensions
] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
@@ -50,11 +55,13 @@ buildPythonPackage rec {
pythonImportsCheck = [ "gymnasium" ];
nativeCheckInputs = [
- ffmpeg
+ dill
+ flax
jax
jaxlib
matplotlib
moviepy
+ mujoco
opencv4
pybox2d
pygame
@@ -69,20 +76,30 @@ buildPythonPackage rec {
doCheck = !stdenv.hostPlatform.isDarwin;
disabledTestPaths = [
- # mujoco is required for those tests but the mujoco python bindings are not packaged in nixpkgs.
+ # Unpackaged `mujoco-py` (Openai's mujoco) is required for these tests.
"tests/envs/mujoco/test_mujoco_custom_env.py"
+ "tests/envs/mujoco/test_mujoco_rendering.py"
+ "tests/envs/mujoco/test_mujoco_v5.py"
- # Those tests need to write on the filesystem which cause them to fail.
- "tests/experimental/wrappers/test_record_video.py"
+ # Rendering tests failing in the sandbox
+ "tests/wrappers/vector/test_human_rendering.py"
+
+ # These tests need to write on the filesystem which cause them to fail.
"tests/utils/test_save_video.py"
"tests/wrappers/test_record_video.py"
- "tests/wrappers/test_video_recorder.py"
];
- meta = with lib; {
+ disabledTests = [
+ # Succeeds for most environments but `test_render_modes[Reacher-v4]` fails because it requires
+ # OpenGL access which is not possible inside the sandbox.
+ "test_render_mode"
+ ];
+
+ meta = {
description = "Standard API for reinforcement learning and a diverse set of reference environments (formerly Gym)";
homepage = "https://github.com/Farama-Foundation/Gymnasium";
- license = licenses.mit;
- maintainers = with maintainers; [ GaetanLepage ];
+ changelog = "https://github.com/Farama-Foundation/Gymnasium/releases/tag/v${version}";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ GaetanLepage ];
};
}
diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix
index 68de99e2656a..b9f8513459f4 100644
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "hahomematic";
- version = "2024.10.8";
+ version = "2024.10.14";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = "hahomematic";
rev = "refs/tags/${version}";
- hash = "sha256-NFDh6XA6c1IWTHYjXB19V2kEW3ZkjFU/mz5XduzXj+g=";
+ hash = "sha256-1AOSKFcLzJn8nlFHj0Bl/XH6nvJRvGMmJoBFJjRRkVA=";
};
__darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/hakuin/default.nix b/pkgs/development/python-modules/hakuin/default.nix
index d8b9ff2441d0..6aab63e498fa 100644
--- a/pkgs/development/python-modules/hakuin/default.nix
+++ b/pkgs/development/python-modules/hakuin/default.nix
@@ -3,24 +3,27 @@
aiohttp,
buildPythonPackage,
fetchFromGitHub,
+ hatchling,
jinja2,
nltk,
- setuptools,
+ pythonOlder,
}:
buildPythonPackage rec {
pname = "hakuin";
- version = "0-unstable-2024-03-31";
+ version = "0.1.10";
pyproject = true;
+ disabled = pythonOlder "3.11";
+
src = fetchFromGitHub {
owner = "pruzko";
repo = "hakuin";
- rev = "3b7b76dcbfb8ab2b98e6dee08df02158327af772";
- hash = "sha256-tRjo9a0ZCBjKxbXTkiKFzfL4pL5awF5vXmsJlYxwoIw=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-l5YnGRPUZUQqOaRvQd4l4eowWGpuPBignjkDDT9q7fg=";
};
- build-system = [ setuptools ];
+ build-system = [ hatchling ];
dependencies = [
aiohttp
diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix
index b1e3f2badaf1..dfadc6952ea4 100644
--- a/pkgs/development/python-modules/holoviews/default.nix
+++ b/pkgs/development/python-modules/holoviews/default.nix
@@ -1,16 +1,25 @@
{
lib,
buildPythonPackage,
- colorcet,
fetchPypi,
+ pythonOlder,
+
+ # build-system
hatch-vcs,
hatchling,
+
+ # dependencies
+ colorcet,
numpy,
pandas,
panel,
param,
- pythonOlder,
pyviz-comms,
+
+ # tests
+ pytestCheckHook,
+ pytest-cov,
+ flaky,
}:
buildPythonPackage rec {
@@ -39,16 +48,32 @@ buildPythonPackage rec {
pyviz-comms
];
- # tests not fully included with pypi release
- doCheck = false;
+ nativeCheckInputs = [
+ pytestCheckHook
+ pytest-cov
+ flaky
+ ];
+
+ disabledTests = [
+ # All the below fail due to some change in flaky API
+ "test_periodic_param_fn_non_blocking"
+ "test_callback_cleanup"
+ "test_poly_edit_callback"
+ "test_launch_server_with_complex_plot"
+ "test_launch_server_with_stream"
+ "test_launch_simple_server"
+ "test_server_dynamicmap_with_dims"
+ "test_server_dynamicmap_with_stream"
+ "test_server_dynamicmap_with_stream_dims"
+ ];
pythonImportsCheck = [ "holoviews" ];
- meta = with lib; {
+ meta = {
description = "Python data analysis and visualization seamless and simple";
mainProgram = "holoviews";
homepage = "https://www.holoviews.org/";
- license = licenses.bsd3;
+ license = lib.licenses.bsd3;
maintainers = [ ];
};
}
diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix
index 4c2a46563665..00fab837e3ce 100644
--- a/pkgs/development/python-modules/huggingface-hub/default.nix
+++ b/pkgs/development/python-modules/huggingface-hub/default.nix
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "huggingface-hub";
- version = "0.26.1";
+ version = "0.26.2";
pyproject = true;
src = fetchFromGitHub {
owner = "huggingface";
repo = "huggingface_hub";
rev = "refs/tags/v${version}";
- hash = "sha256-tro4Cvjyjc1vfAvYnfeKjh8ej83Z8l4cKe8SqIBVLXg=";
+ hash = "sha256-F2E8P0Hq3Ee+RXUEN4t2JtfBtK36aMsHQCnid9VWdLk=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix
index f31b50b572a9..4831f14335c0 100644
--- a/pkgs/development/python-modules/hvplot/default.nix
+++ b/pkgs/development/python-modules/hvplot/default.nix
@@ -1,28 +1,45 @@
{
lib,
- bokeh,
buildPythonPackage,
- colorcet,
fetchPypi,
+ pythonOlder,
+
+ # build-system
+ setuptools-scm,
+
+ # dependencies
+ bokeh,
+ colorcet,
holoviews,
pandas,
- pythonOlder,
- setuptools-scm,
+
+ # tests
+ pytestCheckHook,
+ dask,
+ xarray,
+ bokeh-sampledata,
+ parameterized,
+ selenium,
+ matplotlib,
+ scipy,
+ plotly,
}:
buildPythonPackage rec {
pname = "hvplot";
- version = "0.11.0";
+ version = "0.11.1";
pyproject = true;
disabled = pythonOlder "3.9";
src = fetchPypi {
inherit pname version;
- hash = "sha256-8796HdWF5P2j6XhUUxxD+5IBV7LFALnmPdNkAf/igDQ=";
+ hash = "sha256-mJ7QOJGJrcR+3NJgHS6rGL82bnSwf14oc+AhMjxKFLs=";
};
- build-system = [ setuptools-scm ];
+ build-system = [
+ setuptools-scm
+ ];
dependencies = [
bokeh
@@ -31,16 +48,34 @@ buildPythonPackage rec {
pandas
];
- # Many tests require a network connection
- doCheck = false;
+ nativeCheckInputs = [
+ pytestCheckHook
+ dask
+ xarray
+ bokeh-sampledata
+ parameterized
+ selenium
+ matplotlib
+ scipy
+ plotly
+ ];
+
+ disabledTestPaths = [
+ # All of the following below require xarray.tutorial files that require
+ # downloading files from the internet (not possible in the sandbox).
+ "hvplot/tests/testgeo.py"
+ "hvplot/tests/testinteractive.py"
+ "hvplot/tests/testui.py"
+ "hvplot/tests/testutil.py"
+ ];
pythonImportsCheck = [ "hvplot.pandas" ];
- meta = with lib; {
+ meta = {
description = "High-level plotting API for the PyData ecosystem built on HoloViews";
homepage = "https://hvplot.pyviz.org";
changelog = "https://github.com/holoviz/hvplot/releases/tag/v${version}";
- license = licenses.bsd3;
+ license = lib.licenses.bsd3;
maintainers = [ ];
};
}
diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix
index 9feccf84613e..80acaeb1f10d 100644
--- a/pkgs/development/python-modules/ifcopenshell/default.nix
+++ b/pkgs/development/python-modules/ifcopenshell/default.nix
@@ -54,7 +54,7 @@ let
in
buildPythonPackage rec {
pname = "ifcopenshell";
- version = "0.7.10";
+ version = "0.8.0";
pyproject = false;
src = fetchFromGitHub {
@@ -62,7 +62,7 @@ buildPythonPackage rec {
repo = "IfcOpenShell";
rev = "refs/tags/ifcopenshell-python-${version}";
fetchSubmodules = true;
- hash = "sha256-cRzv07T5VN5aTjMtAlLGbvI3c4SL0lfzCn/W6f/vdBY=";
+ hash = "sha256-tnj14lBEkUZNDM9J1sRhNA7OkWTWa5JPTSF8hui3q7k=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/imagehash/default.nix b/pkgs/development/python-modules/imagehash/default.nix
index 782aab2360d4..c53243e48f00 100644
--- a/pkgs/development/python-modules/imagehash/default.nix
+++ b/pkgs/development/python-modules/imagehash/default.nix
@@ -2,41 +2,52 @@
lib,
buildPythonPackage,
fetchFromGitHub,
- pytestCheckHook,
numpy,
- six,
- scipy,
pillow,
+ pytestCheckHook,
+ pythonOlder,
pywavelets,
+ scipy,
+ setuptools,
+ six,
}:
buildPythonPackage rec {
pname = "imagehash";
- version = "4.3.1";
- format = "setuptools";
+ version = "4.3.2";
+ pyproject = true;
+
+ disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "JohannesBuchner";
repo = "imagehash";
- rev = "v${version}";
- hash = "sha256-Tsq10TZqnzNTuO4goKjdylN4Eqy7DNbHLjr5n3+nidM=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-/kYINT26ROlB3fIcyyR79nHKg9FsJRQsXQx0Bvl14ec=";
};
- propagatedBuildInputs = [
+ build-system = [ setuptools ];
+
+ dependencies = [
numpy
- six
scipy
pillow
pywavelets
];
- nativeCheckInputs = [ pytestCheckHook ];
+ nativeCheckInputs = [
+ pytestCheckHook
+ six
+ ];
+
+ pythonImportsCheck = [ "imagehash" ];
meta = with lib; {
description = "Python Perceptual Image Hashing Module";
- mainProgram = "find_similar_images.py";
homepage = "https://github.com/JohannesBuchner/imagehash";
+ changelog = "https://github.com/JohannesBuchner/imagehash/releases/tag/v${version}";
license = licenses.bsd2;
maintainers = with maintainers; [ e1mo ];
+ mainProgram = "find_similar_images.py";
};
}
diff --git a/pkgs/development/python-modules/insightface/default.nix b/pkgs/development/python-modules/insightface/default.nix
index 4b4787d0a418..41be9460fded 100644
--- a/pkgs/development/python-modules/insightface/default.nix
+++ b/pkgs/development/python-modules/insightface/default.nix
@@ -7,6 +7,7 @@
fetchPypi,
insightface,
matplotlib,
+ mxnet,
numpy,
onnx,
onnxruntime,
@@ -45,6 +46,7 @@ buildPythonPackage rec {
albumentations
easydict
matplotlib
+ mxnet # used in insightface/commands/rec_add_mask_param.py
numpy
onnx
onnxruntime
@@ -58,20 +60,26 @@ buildPythonPackage rec {
tqdm
];
+ # aarch64-linux tries to get cpu information from /sys, which isn't available
+ # inside the nix build sandbox.
+ dontUsePythonImportsCheck = stdenv.buildPlatform.system == "aarch64-linux";
+
+ passthru.tests = lib.optionalAttrs (stdenv.buildPlatform.system != "aarch64-linux") {
+ version = testers.testVersion {
+ package = insightface;
+ command = "insightface-cli --help";
+ # Doesn't support --version but we still want to make sure the cli is executable
+ # and returns the help output
+ version = "help";
+ };
+ };
+
pythonImportsCheck = [
"insightface"
"insightface.app"
"insightface.data"
];
- passthru.tests.version = testers.testVersion {
- package = insightface;
- command = "insightface-cli --help";
- # Doesn't support --version but we still want to make sure the cli is executable
- # and returns the help output
- version = "help";
- };
-
doCheck = false; # Upstream has no tests
meta = {
@@ -80,7 +88,5 @@ buildPythonPackage rec {
homepage = "https://github.com/deepinsight/insightface";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ oddlama ];
- # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException'
- broken = stdenv.system == "aarch64-linux";
};
}
diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix
index 7ee914aca70f..1422752b3230 100644
--- a/pkgs/development/python-modules/intake/default.nix
+++ b/pkgs/development/python-modules/intake/default.nix
@@ -1,7 +1,7 @@
{
lib,
stdenv,
- appdirs,
+ platformdirs,
bokeh,
buildPythonPackage,
dask,
@@ -19,7 +19,9 @@
pytestCheckHook,
python-snappy,
pythonOlder,
+ pythonAtLeast,
pyyaml,
+ networkx,
requests,
setuptools,
setuptools-scm,
@@ -28,7 +30,7 @@
buildPythonPackage rec {
pname = "intake";
- version = "2.0.3";
+ version = "2.0.7";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -37,7 +39,7 @@ buildPythonPackage rec {
owner = "intake";
repo = "intake";
rev = "refs/tags/${version}";
- hash = "sha256-Fyv85HkoE9OPOoSHR1sgCG0iAFuSiQMT7cyZcQyLvv0=";
+ hash = "sha256-F13jbAQP3G3cKeAegM1w/t32xyC0BgL9/67aIlzA4SE=";
};
nativeBuildInputs = [
@@ -46,7 +48,7 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
- appdirs
+ platformdirs
dask
entrypoints
fsspec
@@ -54,6 +56,7 @@ buildPythonPackage rec {
jinja2
pandas
pyyaml
+ networkx
];
nativeCheckInputs = [
@@ -124,12 +127,18 @@ buildPythonPackage rec {
# Timing-based, flaky on darwin and possibly others
"test_idle_timer"
]
- ++ lib.optionals
- (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13")
- [
- # Flaky with older low-res mtime on darwin < 10.13 (#143987)
- "test_second_load_timestamp"
- ];
+ ++ lib.optionals (pythonAtLeast "3.12") [
+ # Require deprecated distutils
+ "test_which"
+ "test_load"
+ ]
+ ++
+ lib.optionals
+ (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13")
+ [
+ # Flaky with older low-res mtime on darwin < 10.13 (#143987)
+ "test_second_load_timestamp"
+ ];
pythonImportsCheck = [ "intake" ];
diff --git a/pkgs/development/python-modules/intbitset/default.nix b/pkgs/development/python-modules/intbitset/default.nix
index 4c3d1d477c5a..3e275c3c1308 100644
--- a/pkgs/development/python-modules/intbitset/default.nix
+++ b/pkgs/development/python-modules/intbitset/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "intbitset";
- version = "3.1.0";
+ version = "4.0.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-boPFun/aJSCqhWVCi7r4Qt63KT1mXzzYKByzklTS/3E=";
+ hash = "sha256-wUHtqhwXuRwph1N+Jp2VWra9w5Zq89624eDSDtvQndI=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/itemloaders/default.nix b/pkgs/development/python-modules/itemloaders/default.nix
index bd6e8b884ac1..de2b1e902702 100644
--- a/pkgs/development/python-modules/itemloaders/default.nix
+++ b/pkgs/development/python-modules/itemloaders/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "itemloaders";
- version = "1.3.1";
+ version = "1.3.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "scrapy";
repo = "itemloaders";
rev = "refs/tags/v${version}";
- hash = "sha256-u0/WsvLn2YlYd/FuH26T9qEGRGscipnOQbV9uPv4F+M=";
+ hash = "sha256-Hs3FodJAWZGeo+kMmcto5WW433RekwVuucaJl8TKc+0=";
};
nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/iwlib/default.nix b/pkgs/development/python-modules/iwlib/default.nix
index 01f83b80a003..08348a6de3ab 100644
--- a/pkgs/development/python-modules/iwlib/default.nix
+++ b/pkgs/development/python-modules/iwlib/default.nix
@@ -23,7 +23,6 @@ buildPythonPackage rec {
nativeBuildInputs = [ pytest ];
pythonImportsCheck = [ "iwlib" ];
- doCheck = true;
checkInputs = [ pytest ];
checkPhase = "python iwlib/_iwlib_build.py; pytest -v";
diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix
index c539c052d4b5..1ab347130ae1 100644
--- a/pkgs/development/python-modules/jupyterlab-git/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-git/default.nix
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "jupyterlab-git";
- version = "0.50.1";
+ version = "0.50.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "jupyterlab_git";
inherit version;
- hash = "sha256-v08Go/vCsquE6l1SMmqg4LjM9OmjNX+jGKEZVg4cak0=";
+ hash = "sha256-zu/chWMsr0maBItDRFnQO15iFmWAHp23GXvUhvXTNDM=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/kinparse/default.nix b/pkgs/development/python-modules/kinparse/default.nix
index a925347da318..8ddde08f68d8 100644
--- a/pkgs/development/python-modules/kinparse/default.nix
+++ b/pkgs/development/python-modules/kinparse/default.nix
@@ -19,7 +19,6 @@ buildPythonPackage {
sha256 = "1nrjnybwzy93c79yylcwmb4lvkx7hixavnjwffslz0zwn32l0kx3";
};
- doCheck = true;
pythonImportsCheck = [ "kinparse" ];
nativeCheckInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/knocki/default.nix b/pkgs/development/python-modules/knocki/default.nix
index c5c5442fdfe7..bcdc986033e8 100644
--- a/pkgs/development/python-modules/knocki/default.nix
+++ b/pkgs/development/python-modules/knocki/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "knocki";
- version = "0.3.5";
+ version = "0.4.1";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "swan-solutions";
repo = "knocki-homeassistant";
rev = "refs/tags/v${version}";
- hash = "sha256-Fb3skFttY5gtm80k1LCUQ4Z7/TQGClCNcWt1k6bLQoI=";
+ hash = "sha256-Eh/ykTbR2NMZ9Mjgcc53OU3+2EsX6FWV93DmwCDvsRg=";
};
postPatch = ''
@@ -54,6 +54,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Asynchronous Python client for Knocki vibration / door sensors";
homepage = "https://github.com/swan-solutions/knocki-homeassistant";
+ changelog = "https://github.com/swan-solutions/knocki-homeassistant/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ mindstorms6 ];
};
diff --git a/pkgs/development/python-modules/kurbopy/default.nix b/pkgs/development/python-modules/kurbopy/default.nix
index 3542fb60b281..3ced53fcde02 100644
--- a/pkgs/development/python-modules/kurbopy/default.nix
+++ b/pkgs/development/python-modules/kurbopy/default.nix
@@ -29,7 +29,6 @@ buildPythonPackage rec {
hash = "sha256-W0BebCXC1wqwtQP+zHjISxSJjXHD9U6p9eNS12Nfb2Y=";
};
- doCheck = true;
nativeCheckInputs = [ pytestCheckHook ];
preCheck = ''
# pytestCheckHook puts . at the front of Python's sys.path, due to:
diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix
index 060b8d94441e..b81962cd7d9d 100644
--- a/pkgs/development/python-modules/labelbox/default.nix
+++ b/pkgs/development/python-modules/labelbox/default.nix
@@ -10,7 +10,7 @@
nbconvert,
nbformat,
numpy,
- opencv4,
+ opencv-python-headless,
pillow,
pydantic,
pyproj,
@@ -45,9 +45,10 @@ buildPythonPackage rec {
sourceRoot = "${src.name}/libs/labelbox";
- pythonRelaxDeps = [ "python-dateutil" ];
-
- pythonRemoveDeps = [ "opencv-python-headless" ];
+ pythonRelaxDeps = [
+ "mypy"
+ "python-dateutil"
+ ];
build-system = [ hatchling ];
@@ -67,7 +68,7 @@ buildPythonPackage rec {
shapely
numpy
pillow
- opencv4
+ opencv-python-headless
typeguard
imagesize
pyproj
diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix
index a263fa60c152..e59214a373e5 100644
--- a/pkgs/development/python-modules/lacuscore/default.nix
+++ b/pkgs/development/python-modules/lacuscore/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "lacuscore";
- version = "1.11.0";
+ version = "1.11.3";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "ail-project";
repo = "LacusCore";
rev = "refs/tags/v${version}";
- hash = "sha256-O9nB+hxMrIJDeK6BrxmX/yr0OoIXxshKJxz9fU6b2V0=";
+ hash = "sha256-eVcfJXkjrS752T18wKrIwfwEkCuR1eIoVZERMk/stgQ=";
};
pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix
index 2dba0399cb17..0ec1aec1d3d2 100644
--- a/pkgs/development/python-modules/langchain-aws/default.nix
+++ b/pkgs/development/python-modules/langchain-aws/default.nix
@@ -45,6 +45,11 @@ buildPythonPackage rec {
numpy
];
+ pythonRelaxDeps = [
+ # Boto @ 1.35 has outstripped the version requirement
+ "boto3"
+ ];
+
nativeCheckInputs = [
langchain-standard-tests
pytest-asyncio
diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix
index 2193ea848820..cccbca601e32 100644
--- a/pkgs/development/python-modules/langchain-community/default.nix
+++ b/pkgs/development/python-modules/langchain-community/default.nix
@@ -52,7 +52,10 @@ buildPythonPackage rec {
build-system = [ poetry-core ];
- pythonRelaxDeps = [ "pydantic-settings" ];
+ pythonRelaxDeps = [
+ "pydantic-settings"
+ "tenacity"
+ ];
dependencies = [
aiohttp
diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix
index 3ba1fcb50f95..49ad6cf3c7a1 100644
--- a/pkgs/development/python-modules/langchain-core/default.nix
+++ b/pkgs/development/python-modules/langchain-core/default.nix
@@ -34,20 +34,22 @@
buildPythonPackage rec {
pname = "langchain-core";
- version = "0.3.7";
+ version = "0.3.12";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
rev = "refs/tags/langchain-core==${version}";
- hash = "sha256-s2tqBJpWJNy0SnHWt0RQowmRbBD+7zqFEeDuFrUzr2U=";
+ hash = "sha256-WWzEIP/JirA4btYVy4+U7PSg6S8VnkZqxPLgLriWbTY=";
};
sourceRoot = "${src.name}/libs/core";
build-system = [ poetry-core ];
+ pythonRelaxDeps = [ "tenacity" ];
+
dependencies = [
jsonpatch
langsmith
@@ -117,6 +119,15 @@ buildPythonPackage rec {
# TypeError: exceptions must be derived from Warning, not
"test_chat_prompt_template_variable_names"
"test_create_model_v2"
+
+ # Comparison with magic strings
+ "test_prompt_with_chat_model"
+ "test_prompt_with_chat_model_async"
+ "test_prompt_with_llm"
+ "test_prompt_with_llm_parser"
+ "test_prompt_with_llm_and_async_lambda"
+ "test_prompt_with_chat_model_and_parser"
+ "test_combining_sequences"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Langchain-core the following tests due to the test comparing execution time with magic values.
diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix
index 49b268e97acc..3d0ae4b72f48 100644
--- a/pkgs/development/python-modules/langchain/default.nix
+++ b/pkgs/development/python-modules/langchain/default.nix
@@ -42,14 +42,14 @@
buildPythonPackage rec {
pname = "langchain";
- version = "0.3.1";
+ version = "0.3.4";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langchain";
rev = "refs/tags/langchain==${version}";
- hash = "sha256-Zg+9ZwzTDKCyfz4T/tVIGfRUUmkE939hocxSWpFRngQ=";
+ hash = "sha256-MRpXR4nQDobzofhzkU5Y2OiEsi+VdjCcF/vcxcG/144=";
};
sourceRoot = "${src.name}/libs/langchain";
@@ -58,6 +58,8 @@ buildPythonPackage rec {
buildInputs = [ bash ];
+ pythonRelaxDeps = [ "tenacity" ];
+
dependencies = [
aiohttp
langchain-core
diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix
index 2a76b9e8e8dd..8319c140be52 100644
--- a/pkgs/development/python-modules/langfuse/default.nix
+++ b/pkgs/development/python-modules/langfuse/default.nix
@@ -17,14 +17,14 @@
buildPythonPackage rec {
pname = "langfuse";
- version = "2.51.5";
+ version = "2.53.3";
pyproject = true;
src = fetchFromGitHub {
owner = "langfuse";
repo = "langfuse-python";
rev = "refs/tags/v${version}";
- hash = "sha256-2zcEpSXpW67ltB87LIqH6+DCKvNK1gstJU+/JHDJoPE=";
+ hash = "sha256-uhbCLDjOU13KAJcCXz03IPNICG5ZI16KIShY2sXPkp4=";
};
build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
index b2091019084d..0161609fdd08 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "langgraph-checkpoint-postgres";
- version = "2.0.0";
+ version = "2.0.1";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "langchain-ai";
repo = "langgraph";
rev = "refs/tags/checkpointpostgres==${version}";
- hash = "sha256-piBWr6F1YWML9D8+Bk4KvReQJhgb1Z7Xf5q8bcVUeEQ=";
+ hash = "sha256-5gKgCd0hl2iPLBfh94n8kMojECknhd0r+W4gt3m4g+M=";
};
postgresqlTestSetupPost = ''
diff --git a/pkgs/development/python-modules/langgraph-checkpoint/default.nix b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
index b25b03b420c9..b895ab501eb1 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "langgraph-checkpoint";
- version = "2.0.0";
+ version = "2.0.1";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "langchain-ai";
repo = "langgraph";
rev = "refs/tags/checkpoint==${version}";
- hash = "sha256-LBIQyDWKmT89OgYUk3LFIZ5VDXX9KQXFkR9A8XHOCBQ=";
+ hash = "sha256-BDuc6PpziOFIsPpDets7OM2Z+VJ6ekxKpkAuoavDdmI=";
};
sourceRoot = "${src.name}/libs/checkpoint";
diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix
index 824c92900180..3e53fd0b28aa 100644
--- a/pkgs/development/python-modules/langgraph-sdk/default.nix
+++ b/pkgs/development/python-modules/langgraph-sdk/default.nix
@@ -40,12 +40,11 @@ buildPythonPackage rec {
pythonImportsCheck = [ "langgraph_sdk" ];
passthru = {
- # python3Packages.langgraph-sdk depends on python3Packages.langgraph. langgraph-cli is independent of both.
updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p nix-update
- set -eu -o pipefail
+ set -eu -o pipefail +e
nix-update --commit --version-regex '(.*)' python3Packages.langgraph
nix-update --commit --version-regex 'sdk==(.*)' python3Packages.langgraph-sdk
nix-update --commit --version-regex 'checkpoint==(.*)' python3Packages.langgraph-checkpoint
diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix
index 20e8b241033d..6ddb731aab37 100644
--- a/pkgs/development/python-modules/langgraph/default.nix
+++ b/pkgs/development/python-modules/langgraph/default.nix
@@ -10,6 +10,7 @@
# dependencies
langchain-core,
langgraph-checkpoint,
+ langgraph-sdk,
# tests
aiosqlite,
@@ -29,21 +30,18 @@
syrupy,
postgresql,
postgresqlTestHook,
-
- # passthru
- langgraph-sdk,
}:
buildPythonPackage rec {
pname = "langgraph";
- version = "0.2.34";
+ version = "0.2.39";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langgraph";
rev = "refs/tags/${version}";
- hash = "sha256-5Suyj6pEslgR383MkYGGz7IC2A0A++02YooZmi8YtyM=";
+ hash = "sha256-VZRGlE3MSOzur1TWC6swQjf/o5M62LsYncx2g8dtS+o=";
};
postgresqlTestSetupPost = ''
@@ -58,6 +56,7 @@ buildPythonPackage rec {
dependencies = [
langchain-core
langgraph-checkpoint
+ langgraph-sdk
];
pythonImportsCheck = [ "langgraph" ];
diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix
index 2a9d8446fb55..83c78c9bbc07 100644
--- a/pkgs/development/python-modules/langsmith/default.nix
+++ b/pkgs/development/python-modules/langsmith/default.nix
@@ -8,16 +8,17 @@
poetry-core,
# dependencies
+ httpx,
orjson,
pydantic,
requests,
+ requests-toolbelt,
# tests
anthropic,
dataclasses-json,
fastapi,
freezegun,
- httpx,
instructor,
pytest-asyncio,
pytestCheckHook,
@@ -27,14 +28,14 @@
buildPythonPackage rec {
pname = "langsmith";
- version = "0.1.129";
+ version = "0.1.137";
pyproject = true;
src = fetchFromGitHub {
owner = "langchain-ai";
repo = "langsmith-sdk";
rev = "refs/tags/v${version}";
- hash = "sha256-GIWDGr6zd/YaSgcSrIw0a1Ul9RxdmtJBMTEbGapudtw=";
+ hash = "sha256-nR3fb3MHBxFvI4qrsTpElLWTDUESZ8J78GsVoCGTIyQ=";
};
sourceRoot = "${src.name}/python";
@@ -44,9 +45,11 @@ buildPythonPackage rec {
build-system = [ poetry-core ];
dependencies = [
+ httpx
orjson
pydantic
requests
+ requests-toolbelt
];
nativeCheckInputs = [
@@ -54,7 +57,6 @@ buildPythonPackage rec {
dataclasses-json
fastapi
freezegun
- httpx
instructor
pytest-asyncio
pytestCheckHook
diff --git a/pkgs/development/python-modules/latexrestricted/default.nix b/pkgs/development/python-modules/latexrestricted/default.nix
index 1abc58cbd3cc..dfccf69e0563 100644
--- a/pkgs/development/python-modules/latexrestricted/default.nix
+++ b/pkgs/development/python-modules/latexrestricted/default.nix
@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "latexrestricted";
- version = "0.5.0";
+ version = "0.6.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-PwhVKgoXujiLC+3FPAtUdvBEgeNwD6aBK+I5p8xeLwo=";
+ hash = "sha256-/N5eC32OVN6qxWZAwAUlCIrMV2ARitiX3gaCPiSCRHs=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/lcov-cobertura/default.nix b/pkgs/development/python-modules/lcov-cobertura/default.nix
index f17dfec5900a..d04302c6a18e 100644
--- a/pkgs/development/python-modules/lcov-cobertura/default.nix
+++ b/pkgs/development/python-modules/lcov-cobertura/default.nix
@@ -22,7 +22,6 @@ buildPythonPackage rec {
build-system = [ setuptools ];
dependencies = [ distutils ];
- doCheck = true;
pythonImportsCheck = [ "lcov_cobertura" ];
meta = {
diff --git a/pkgs/development/python-modules/leaone-ble/default.nix b/pkgs/development/python-modules/leaone-ble/default.nix
new file mode 100644
index 000000000000..5df616e5f8d6
--- /dev/null
+++ b/pkgs/development/python-modules/leaone-ble/default.nix
@@ -0,0 +1,52 @@
+{
+ lib,
+ bluetooth-data-tools,
+ bluetooth-sensor-state-data,
+ buildPythonPackage,
+ fetchFromGitHub,
+ home-assistant-bluetooth,
+ poetry-core,
+ pytest-cov-stub,
+ pytestCheckHook,
+ pythonOlder,
+ sensor-state-data,
+}:
+
+buildPythonPackage rec {
+ pname = "leaone-ble";
+ version = "0.1.0";
+ pyproject = true;
+
+ disabled = pythonOlder "3.11";
+
+ src = fetchFromGitHub {
+ owner = "bluetooth-devices";
+ repo = "leaone-ble";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-usFjI0zU89dEAbmx9mVemoxlYS8mmLTKIMhH26Rvkeg=";
+ };
+
+ build-system = [ poetry-core ];
+
+ dependencies = [
+ bluetooth-data-tools
+ bluetooth-sensor-state-data
+ home-assistant-bluetooth
+ sensor-state-data
+ ];
+
+ nativeCheckInputs = [
+ pytest-cov-stub
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "leaone_ble" ];
+
+ meta = {
+ description = "Bluetooth parser for LeaOne devices";
+ homepage = "https://github.com/bluetooth-devices/leaone-ble";
+ changelog = "https://github.com/bluetooth-devices/leaone-ble/blob/${src.rev}/CHANGELOG.md";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/libretranslate/default.nix b/pkgs/development/python-modules/libretranslate/default.nix
index 39a2b99ddf0d..dc02429a68f6 100644
--- a/pkgs/development/python-modules/libretranslate/default.nix
+++ b/pkgs/development/python-modules/libretranslate/default.nix
@@ -30,14 +30,14 @@
buildPythonPackage rec {
pname = "libretranslate";
- version = "1.6.1";
+ version = "1.6.2";
pyproject = true;
src = fetchFromGitHub {
owner = "LibreTranslate";
repo = "LibreTranslate";
rev = "refs/tags/v${version}";
- hash = "sha256-c/MbO8KST2QnP32Y2FfXjJcfh6O7hqQFcZOn1U0FqRM=";
+ hash = "sha256-u0m9dTxwSGU50YplV24daSO+WY/At648OpIEZYMmqqo=";
};
build-system = [
diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix
index 7e2233034389..c94dbe57e0fa 100644
--- a/pkgs/development/python-modules/license-expression/default.nix
+++ b/pkgs/development/python-modules/license-expression/default.nix
@@ -10,16 +10,16 @@
buildPythonPackage rec {
pname = "license-expression";
- version = "30.3.1";
+ version = "30.4.0";
pyproject = true;
- disabled = pythonOlder "3.7";
+ disabled = pythonOlder "3.9";
src = fetchFromGitHub {
- owner = "nexB";
+ owner = "aboutcode-org";
repo = "license-expression";
rev = "refs/tags/v${version}";
- hash = "sha256-+hINYDfUrNsCmXOIa4XO/ML1fJoB8/n6iQ4UGdw5ClE=";
+ hash = "sha256-RAgGg0Xekcw5H13YHmkgfL7eybK+4tA8EAvVTuWFRck=";
};
dontConfigure = true;
@@ -34,8 +34,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Utility library to parse, normalize and compare License expressions";
- homepage = "https://github.com/nexB/license-expression";
- changelog = "https://github.com/nexB/license-expression/blob/v${version}/CHANGELOG.rst";
+ homepage = "https://github.com/aboutcode-org/license-expression";
+ changelog = "https://github.com/aboutcode-org/license-expression/blob/v${version}/CHANGELOG.rst";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/lifelines/default.nix b/pkgs/development/python-modules/lifelines/default.nix
index ec823cf5fbf4..1543ce87a885 100644
--- a/pkgs/development/python-modules/lifelines/default.nix
+++ b/pkgs/development/python-modules/lifelines/default.nix
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "lifelines";
- version = "0.29.0";
+ version = "0.30.0";
format = "setuptools";
disabled = pythonOlder "3.9";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "CamDavidsonPilon";
repo = "lifelines";
rev = "refs/tags/v${version}";
- hash = "sha256-9ZmecbFjUnWGNf4P3yphiMqG+/ktOYyvMtoZ6sEp1xY=";
+ hash = "sha256-rbt0eON8Az5jDvj97RDn3ppWyjbrSa/xumbwhq21g6g=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix
index b7b634d38b1e..d1f78b740643 100644
--- a/pkgs/development/python-modules/limits/default.nix
+++ b/pkgs/development/python-modules/limits/default.nix
@@ -90,6 +90,12 @@ buildPythonPackage rec {
async-etcd = [ aetcd ];
};
+ env = {
+ # make protobuf compatible with old versions
+ # https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
+ PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+ };
+
doCheck = pythonOlder "3.12"; # SystemError in protobuf
nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/linear-garage-door/default.nix b/pkgs/development/python-modules/linear-garage-door/default.nix
index 1a8bfb796410..f3ea213b038b 100644
--- a/pkgs/development/python-modules/linear-garage-door/default.nix
+++ b/pkgs/development/python-modules/linear-garage-door/default.nix
@@ -23,14 +23,10 @@ buildPythonPackage rec {
hash = "sha256-ibOCqy7krIVC7N75SwEyUII3Tknb60nwA+zGbjOENv4=";
};
- postPatch = ''
- sed -i pyproject.toml \
- -e "/--cov/d" \
- -e "/--no-cov/d"
- '';
-
build-system = [ poetry-core ];
+ pythonRelaxDeps = [ "tenacity" ];
+
dependencies = [
aiohttp
dnspython
diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix
index 5a3084ae84cf..226fe1878de2 100644
--- a/pkgs/development/python-modules/mail-parser/default.nix
+++ b/pkgs/development/python-modules/mail-parser/default.nix
@@ -4,33 +4,45 @@
python,
glibcLocales,
fetchFromGitHub,
+ pytest-cov-stub,
+ pytestCheckHook,
+ setuptools,
six,
- simplejson,
}:
buildPythonPackage rec {
pname = "mail-parser";
- version = "3.15.0";
- format = "setuptools";
+ version = "4.0.0";
+ pyproject = true;
src = fetchFromGitHub {
owner = "SpamScope";
- repo = pname;
- rev = "v${version}";
- sha256 = "0da2qr4p8jnjw6jdhbagm6slfcjnjyyjkszwfcfqvcywh1zm1sdw";
+ repo = "mail-parser";
+ rev = "refs/tags/${version}";
+ hash = "sha256-WpV1WJFwzAquPXimew86YpEp++dnkIiBe5E4lMBDl7w=";
};
LC_ALL = "en_US.utf-8";
nativeBuildInputs = [ glibcLocales ];
- propagatedBuildInputs = [
- simplejson
+
+ build-system = [ setuptools ];
+
+ pythonRemoveDeps = [ "ipaddress" ];
+
+ dependencies = [
six
];
+ pythonImportsCheck = [ "mailparser" ];
+
+ nativeCheckInputs = [
+ pytest-cov-stub
+ pytestCheckHook
+ ];
+
# Taken from .travis.yml
- checkPhase = ''
- ${python.interpreter} tests/test_main.py
+ postCheck = ''
${python.interpreter} -m mailparser -v
${python.interpreter} -m mailparser -h
${python.interpreter} -m mailparser -f tests/mails/mail_malformed_3 -j
diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix
index 0cab2ca8dd70..2b28c29da244 100644
--- a/pkgs/development/python-modules/mashumaro/default.nix
+++ b/pkgs/development/python-modules/mashumaro/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "mashumaro";
- version = "3.13.1";
+ version = "3.14";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -27,12 +27,12 @@ buildPythonPackage rec {
owner = "Fatal1ty";
repo = "mashumaro";
rev = "refs/tags/v${version}";
- hash = "sha256-Km3RuDU77L3N2RQBhpcEztOjYtQhTXFZoGKu70g5EPU=";
+ hash = "sha256-0THj22KdMvD5O3dNwXKxs2wRIJziPmojLo4BPa3fZ3Y=";
};
- nativeBuildInputs = [ setuptools ];
+ build-system = [ setuptools ];
- propagatedBuildInputs = [ typing-extensions ];
+ dependencies = [ typing-extensions ];
optional-dependencies = {
orjson = [ orjson ];
diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix
index d7cf61de83b7..91b5772901db 100644
--- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix
+++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "mdformat-mkdocs";
- version = "3.0.0";
+ version = "3.0.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "KyleKing";
repo = "mdformat-mkdocs";
rev = "refs/tags/v${version}";
- hash = "sha256-Af15Xs8K/QSeIxQNgi1n8xZ+SyyzNs5JL3wse0+LoyE=";
+ hash = "sha256-MO/YMvvpsEarc8CjELByHUqR5xFtYqhkKkJrFy0PNvU=";
};
nativeBuildInputs = [ flit-core ];
diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix
index d034595d03e4..1608a5e67ec9 100644
--- a/pkgs/development/python-modules/meep/default.nix
+++ b/pkgs/development/python-modules/meep/default.nix
@@ -122,7 +122,6 @@ buildPythonPackage rec {
(calls `sim.run()`), as only then MPI will be initialised and MPI linking
errors can be caught.
*/
- doCheck = true;
nativeCheckInputs = [
mpiCheckPhaseHook
openssh
diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix
index 59252dddc7c1..c0e12faa851f 100644
--- a/pkgs/development/python-modules/meilisearch/default.nix
+++ b/pkgs/development/python-modules/meilisearch/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "meilisearch";
- version = "0.31.5";
+ version = "0.31.6";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "meilisearch";
repo = "meilisearch-python";
rev = "refs/tags/v${version}";
- hash = "sha256-br+FnUnwDt64dvZAMEK/oqESCWZuOUt9Lp9HGcIPqxc=";
+ hash = "sha256-YMKspKryhcxecIDLg3PiKHJoRtQBsIi8N//ZtAMBvMg=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/melnor-bluetooth/default.nix b/pkgs/development/python-modules/melnor-bluetooth/default.nix
new file mode 100644
index 000000000000..649433f99795
--- /dev/null
+++ b/pkgs/development/python-modules/melnor-bluetooth/default.nix
@@ -0,0 +1,64 @@
+{
+ lib,
+ aioconsole,
+ bleak-retry-connector,
+ bleak,
+ buildPythonPackage,
+ deprecated,
+ fetchFromGitHub,
+ freezegun,
+ poetry-core,
+ poetry-dynamic-versioning,
+ pytest-asyncio,
+ pytestCheckHook,
+ pythonOlder,
+ syrupy,
+ tzdata,
+ tzlocal,
+}:
+
+buildPythonPackage rec {
+ pname = "melnor-bluetooth";
+ version = "0.0.25";
+ pyproject = true;
+
+ disabled = pythonOlder "3.9";
+
+ src = fetchFromGitHub {
+ owner = "vanstinator";
+ repo = "melnor-bluetooth";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-BQKXQrPT/+qm9cRO7pfScPwW0iwdhliTfX4XJ/kRQG0=";
+ };
+
+ build-system = [
+ poetry-core
+ poetry-dynamic-versioning
+ ];
+
+ dependencies = [
+ aioconsole
+ bleak
+ bleak-retry-connector
+ deprecated
+ tzdata
+ tzlocal
+ ];
+
+ nativeCheckInputs = [
+ freezegun
+ pytest-asyncio
+ pytestCheckHook
+ syrupy
+ ];
+
+ pythonImportsCheck = [ "melnor_bluetooth" ];
+
+ meta = {
+ description = "Module to interact with Melnor and Eden bluetooth watering timers";
+ homepage = "https://github.com/vanstinator/melnor-bluetooth";
+ changelog = "https://github.com/vanstinator/melnor-bluetooth/releases/tag/v${version}";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/microsoft-security-utilities-secret-masker/default.nix b/pkgs/development/python-modules/microsoft-security-utilities-secret-masker/default.nix
new file mode 100644
index 000000000000..ef2012371dd3
--- /dev/null
+++ b/pkgs/development/python-modules/microsoft-security-utilities-secret-masker/default.nix
@@ -0,0 +1,35 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchPypi,
+ setuptools,
+ wheel,
+}:
+
+buildPythonPackage rec {
+ pname = "microsoft-security-utilities-secret-masker";
+ version = "1.0.0b3";
+ pyproject = true;
+
+ src = fetchPypi {
+ pname = "microsoft_security_utilities_secret_masker";
+ inherit version;
+ hash = "sha256-0EVIIwxno70stGCyjnH+bKwWj0jwbXapadnKR732c0M=";
+ };
+
+ build-system = [
+ setuptools
+ wheel
+ ];
+
+ pythonImportsCheck = [
+ "microsoft_security_utilities_secret_masker"
+ ];
+
+ meta = {
+ description = "A tool for detecting and masking secrets";
+ homepage = "https://pypi.org/project/microsoft-security-utilities-secret-masker/";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ ];
+ };
+}
diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix
index 2cf9cd45c03c..51b70234dde1 100644
--- a/pkgs/development/python-modules/minio/default.nix
+++ b/pkgs/development/python-modules/minio/default.nix
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "minio";
- version = "7.2.9";
+ version = "7.2.10";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "minio";
repo = "minio-py";
rev = "refs/tags/${version}";
- hash = "sha256-ObbU0skqNBebkmX5gtJ9/QHlSZFB3tvaFnitmD+lKBc=";
+ hash = "sha256-vPIMYaCt2f1OXPUtaw0OXMEADHNCv4DxpueZSyJiYqA=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix
index 45b5018b784a..0c4e95b98d3a 100644
--- a/pkgs/development/python-modules/mitogen/default.nix
+++ b/pkgs/development/python-modules/mitogen/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "mitogen";
- version = "0.3.14";
+ version = "0.3.15";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "mitogen-hq";
repo = "mitogen";
rev = "refs/tags/v${version}";
- hash = "sha256-Gacn3EjyNq5LtjfbCczO+fqlq6+KgzxFs4d/K2xttHE=";
+ hash = "sha256-Zj5hVkIvKdyKLCUyXwhfDy5idH3jehmgIJNahmDdvJ4=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix
index 92ced96774e0..4e985885890a 100644
--- a/pkgs/development/python-modules/mizani/default.nix
+++ b/pkgs/development/python-modules/mizani/default.nix
@@ -1,7 +1,6 @@
{
lib,
buildPythonPackage,
- pythonOlder,
fetchFromGitHub,
# build-system
@@ -13,22 +12,20 @@
pandas,
scipy,
- # checks
+ # tests
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "mizani";
- version = "0.12.2";
+ version = "0.13.0";
pyproject = true;
- disabled = pythonOlder "3.10";
-
src = fetchFromGitHub {
owner = "has2k1";
repo = "mizani";
rev = "refs/tags/v${version}";
- hash = "sha256-aTc8LC/2zLrrTfOXABWs049m752PctpvlguA6qhyhp8=";
+ hash = "sha256-UzedAhYGgGLOMUyZe3ew4a2gh1UgYHaLsIe9k85rOkg=";
};
build-system = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix
index 42455ed84cc6..c71d16a7b238 100644
--- a/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix
+++ b/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "mkdocs-rss-plugin";
- version = "1.15.0";
+ version = "1.16.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "Guts";
repo = "mkdocs-rss-plugin";
rev = "refs/tags/${version}";
- hash = "sha256-sGm6uWlZeW65uorfTK8pk8ZT2AE9nmsZhe+UYVrSr+8=";
+ hash = "sha256-6FTOJQqK9lKYt6cVpKvMcNUrhSwX26032Vr4JyZ6sI8=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
index 36863323f968..bc00f655059a 100644
--- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
+++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "mkdocs-swagger-ui-tag";
- version = "0.6.10";
+ version = "0.6.11";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Blueswen";
repo = "mkdocs-swagger-ui-tag";
rev = "refs/tags/v${version}";
- hash = "sha256-Wfctu8rqj2HxPgXYMeL5Hovet8yjol7RfLH233Gl+v4=";
+ hash = "sha256-hxf7onjH26QsdB19r71NSC/67u+pEYdJo3e4OvWGgtI=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix
index 47b9e1bf4e67..efb5e612e0a7 100644
--- a/pkgs/development/python-modules/mkdocstrings-python/default.nix
+++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "mkdocstrings-python";
- version = "1.12.0";
+ version = "1.12.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "mkdocstrings";
repo = "python";
rev = "refs/tags/${version}";
- hash = "sha256-Dwh1MQuOjN/quxKlOMIadZ5MR8BrS/s6l4mwSBTfXQE=";
+ hash = "sha256-dc9RXbrwZS/7eAF0BrGS2kJxG62rB5RLxf3yNZ6+g4Q=";
};
build-system = [ pdm-backend ];
diff --git a/pkgs/development/python-modules/modelcif/default.nix b/pkgs/development/python-modules/modelcif/default.nix
index 47c167237836..04f94f5810cf 100644
--- a/pkgs/development/python-modules/modelcif/default.nix
+++ b/pkgs/development/python-modules/modelcif/default.nix
@@ -3,34 +3,33 @@
buildPythonPackage,
fetchFromGitHub,
setuptools,
- wheel,
ihm,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "modelcif";
- version = "1.1";
+ version = "1.2";
pyproject = true;
src = fetchFromGitHub {
owner = "ihmwg";
repo = "python-modelcif";
rev = "refs/tags/${version}";
- hash = "sha256-HUS9MW6jbwjK3I6egmmsH+Bx+nNgszWc3t3QRo/EWpc=";
+ hash = "sha256-sduhRLtuJ/0BNsqmrhCr0lSrLMaOfE+TCWN4zj62aCQ=";
};
- nativeBuildInputs = [
+ build-system = [
setuptools
- wheel
];
- propagatedBuildInputs = [ ihm ];
+ dependencies = [ ihm ];
nativeCheckInputs = [ pytestCheckHook ];
disabledTests = [
# require network access
+ "test_associated_example"
"test_validate_mmcif_example"
"test_validate_modbase_example"
];
diff --git a/pkgs/development/python-modules/monai/default.nix b/pkgs/development/python-modules/monai/default.nix
index d190facc17e7..1119f0b7993c 100644
--- a/pkgs/development/python-modules/monai/default.nix
+++ b/pkgs/development/python-modules/monai/default.nix
@@ -5,8 +5,8 @@
fetchpatch,
pythonOlder,
ninja,
- ignite,
numpy,
+ packaging,
pybind11,
torch,
which,
@@ -14,41 +14,38 @@
buildPythonPackage rec {
pname = "monai";
- version = "1.3.2";
+ version = "1.4.0";
pyproject = true;
- disabled = pythonOlder "3.8";
+
+ disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "Project-MONAI";
repo = "MONAI";
rev = "refs/tags/${version}";
- hash = "sha256-wm4n3FuIXbE99RRLsGnZDeHtR/Tmj6C0s29pvflZg+o=";
+ hash = "sha256-PovYyRLgoYwxqGeCBpWxX/kdClYtYK1bgy8yRa9eue8=";
+ # note: upstream consistently seems to modify the tag shortly after release,
+ # so best to wait a few days before updating
};
- patches = [
- (fetchpatch {
- name = "remove-distutils";
- url = "https://github.com/Project-MONAI/MONAI/commit/87862f0d5730d42d282e779fc1450f18b4869863.patch";
- hash = "sha256-wApYfugDPWcuxwmd91peNqc0+l+SoMlT8hhx99oI2Co=";
- })
- ];
-
preBuild = ''
export MAX_JOBS=$NIX_BUILD_CORES;
'';
- nativeBuildInputs = [
+ build-system = [
ninja
which
];
+
buildInputs = [ pybind11 ];
- propagatedBuildInputs = [
+
+ dependencies = [
numpy
+ packaging
torch
- ignite
];
- BUILD_MONAI = 1;
+ env.BUILD_MONAI = 1;
doCheck = false; # takes too long; tries to download data
diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
index 1aba82440888..dd6781fbfa2c 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -12,16 +12,14 @@
buildPythonPackage rec {
pname = "mpi4py";
- # See https://github.com/mpi4py/mpi4py/issues/386 . Part of the changes since
- # the last release include Python 3.12 fixes.
- version = "3.1.6-unstable-2024-07-08";
+ version = "4.0.1";
pyproject = true;
src = fetchFromGitHub {
repo = "mpi4py";
owner = "mpi4py";
- rev = "e9a59719bbce1b9c351e1e30ecd3be3b459e97cd";
- hash = "sha256-C/nidWGr8xsLV73u7HRtnXoQgYmoRJkD45DFrdXXTPI=";
+ rev = version;
+ hash = "sha256-pH4z+hyoFOSAUlXv9EKO54/SM5HyLxv7B+18xBidH2Q=";
};
build-system = [
@@ -40,10 +38,7 @@ buildPythonPackage rec {
openssh
mpiCheckPhaseHook
];
- # Most tests pass, (besides `test_spawn.py`), but when reaching ~80% tests
- # progress, an orted process hangs and the tests don't finish. This issue is
- # probably due to the sandbox.
- doCheck = false;
+ doCheck = true;
disabledTestPaths = [
# Almost all tests in this file fail (TODO: Report about this upstream..)
"test/test_spawn.py"
diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix
index c2e9a8b653d0..717c03e50ea6 100644
--- a/pkgs/development/python-modules/msgraph-core/default.nix
+++ b/pkgs/development/python-modules/msgraph-core/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "msgraph-core";
- version = "1.1.5";
+ version = "1.1.6";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "microsoftgraph";
repo = "msgraph-sdk-python-core";
rev = "refs/tags/v${version}";
- hash = "sha256-cyqhNpV3gowSDmZhdI3NbbJ1VOwnrJTXZYR/rYNnFVE=";
+ hash = "sha256-W1tttt4jWGftW8zzklHV3SrAyugi6XZv0PYGs3T5gZ4=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/mss/default.nix b/pkgs/development/python-modules/mss/default.nix
index c60c4d51ec8a..8be69129140f 100644
--- a/pkgs/development/python-modules/mss/default.nix
+++ b/pkgs/development/python-modules/mss/default.nix
@@ -3,12 +3,28 @@
buildPythonPackage,
fetchPypi,
pythonOlder,
+ stdenv,
+ substituteAll,
+
+ # build-system
+ hatchling,
+
+ # native dependencies
+ xorg,
+
+ # tests
+ lsof,
+ pillow,
+ pytest-cov-stub,
+ pytest,
+ pyvirtualdisplay,
+ xvfb-run,
}:
buildPythonPackage rec {
pname = "mss";
version = "9.0.2";
- format = "setuptools";
+ pyproject = true;
disabled = pythonOlder "3.6";
@@ -17,13 +33,33 @@ buildPythonPackage rec {
hash = "sha256-yWpOxzIk2n2yK8B+88+qGPi4aQDRhy4pETu87wCToh4=";
};
- prePatch = ''
- # By default it attempts to build Windows-only functionality
- rm src/mss/windows.py
- '';
+ patches = lib.optionals stdenv.isLinux [
+ (substituteAll {
+ src = ./linux-paths.patch;
+ x11 = "${xorg.libX11}/lib/libX11.so";
+ xfixes = "${xorg.libXfixes}/lib/libXfixes.so";
+ xrandr = "${xorg.libXrandr}/lib/libXrandr.so";
+ })
+ ];
- # Skipping tests due to most relying on DISPLAY being set
- doCheck = false;
+ build-system = [ hatchling ];
+
+ doCheck = stdenv.isLinux;
+
+ nativeCheckInputs = [
+ lsof
+ pillow
+ pytest-cov-stub
+ pytest
+ pyvirtualdisplay
+ xvfb-run
+ ];
+
+ checkPhase = ''
+ runHook preCheck
+ xvfb-run pytest -k "not test_grab_with_tuple and not test_grab_with_tuple_percents and not test_resource_leaks"
+ runHook postCheck
+ '';
pythonImportsCheck = [ "mss" ];
diff --git a/pkgs/development/python-modules/mss/linux-paths.patch b/pkgs/development/python-modules/mss/linux-paths.patch
new file mode 100644
index 000000000000..e8727d80b20f
--- /dev/null
+++ b/pkgs/development/python-modules/mss/linux-paths.patch
@@ -0,0 +1,17 @@
+diff --git a/src/mss/linux.py b/src/mss/linux.py
+index 6dac52b..c90bd93 100644
+--- a/src/mss/linux.py
++++ b/src/mss/linux.py
+@@ -185,9 +185,9 @@ class XWindowAttributes(Structure):
+
+
+ _ERROR = {}
+-_X11 = find_library("X11")
+-_XFIXES = find_library("Xfixes")
+-_XRANDR = find_library("Xrandr")
++_X11 = "@x11@"
++_XFIXES = "@xfixes@"
++_XRANDR = "@xrandr@"
+
+
+ @CFUNCTYPE(c_int, POINTER(Display), POINTER(XErrorEvent))
diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix
index 9ee368551103..3b9f692d7205 100644
--- a/pkgs/development/python-modules/mxnet/default.nix
+++ b/pkgs/development/python-modules/mxnet/default.nix
@@ -2,6 +2,8 @@
lib,
buildPythonPackage,
pkgs,
+ setuptools,
+ distutils,
requests,
numpy,
graphviz,
@@ -12,16 +14,23 @@
buildPythonPackage {
inherit (pkgs.mxnet) pname version src;
+ pyproject = true;
- format = "setuptools";
+ build-system = [ setuptools ];
buildInputs = [ pkgs.mxnet ];
- propagatedBuildInputs = [
+
+ dependencies = [
+ distutils
requests
numpy
graphviz
];
+ pythonRelaxDeps = [
+ "graphviz"
+ ];
+
LD_LIBRARY_PATH = lib.makeLibraryPath [ pkgs.mxnet ];
doCheck = !isPy3k;
@@ -29,9 +38,7 @@ buildPythonPackage {
postPatch = ''
# Required to support numpy >=1.24 where np.bool is removed in favor of just bool
substituteInPlace python/mxnet/numpy/utils.py \
- --replace "bool = onp.bool" "bool = bool"
- substituteInPlace python/setup.py \
- --replace "graphviz<0.9.0," "graphviz"
+ --replace-fail "bool = onp.bool" "bool = bool"
'';
preConfigure = ''
diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 552429e9edc5..80f729e231cb 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -90,8 +90,8 @@ rec {
"sha256-yZy38db9vBO64Bw01X2iDEQFb4dBGik+3qLntaG4538=";
mypy-boto3-appconfig =
- buildMypyBoto3Package "appconfig" "1.35.8"
- "sha256-YLoxt3nGjbgDjjyfyRX/qQamX5LpuXhCU6i9msGl/aI=";
+ buildMypyBoto3Package "appconfig" "1.35.48"
+ "sha256-rNPWvmbvopDcCfY2ntjpZYG/fL6xu8dHejtKcp4Gsm4=";
mypy-boto3-appconfigdata =
buildMypyBoto3Package "appconfigdata" "1.35.0"
@@ -134,8 +134,8 @@ rec {
"sha256-HK2Eh7uNihu+st+A51z+3uYlPacOkpp7Ic3+xIWHhJ0=";
mypy-boto3-appsync =
- buildMypyBoto3Package "appsync" "1.35.12"
- "sha256-mHIUStFvFUTvHYWdZUNcIIOI//vNACI0veXXNLAAOVY=";
+ buildMypyBoto3Package "appsync" "1.35.52"
+ "sha256-KT61EeM5e0ZioxRrWW0EbKdmDuEgsWbuZoWz9FGLIt0=";
mypy-boto3-arc-zonal-shift =
buildMypyBoto3Package "arc-zonal-shift" "1.35.0"
@@ -210,8 +210,8 @@ rec {
"sha256-O7mrqn+S0rDcOnhxXI10mB/NHzI+f23HqNXoO5gxiPc=";
mypy-boto3-cleanrooms =
- buildMypyBoto3Package "cleanrooms" "1.35.0"
- "sha256-+RAqaRHKax8sUaOoIaaT+HvW/EGir2daS+aqDWNoDwA=";
+ buildMypyBoto3Package "cleanrooms" "1.35.51"
+ "sha256-InSA/7IwpeCcIaPa/S+a3l+POGmcL1O5RG+ANPFfqrE=";
mypy-boto3-cloud9 =
buildMypyBoto3Package "cloud9" "1.35.0"
@@ -266,8 +266,8 @@ rec {
"sha256-wCjyRnd7RlnLRQrADd2Xmh74IsQxBfUgLIJuaZW7kjw=";
mypy-boto3-codebuild =
- buildMypyBoto3Package "codebuild" "1.35.41"
- "sha256-TP+a2iM+KEy2erXCTQ3NgwE/Qy3XWoJKRhSA0XOAJKE=";
+ buildMypyBoto3Package "codebuild" "1.35.49"
+ "sha256-KsO/4MFJA3J53FMrbodO8bIw8FV3PmwZOaADxoo5bjI=";
mypy-boto3-codecatalyst =
buildMypyBoto3Package "codecatalyst" "1.35.0"
@@ -338,8 +338,8 @@ rec {
"sha256-1pS2EkJapoNVi5lUEftaxbdoN4fd7XSFjWyLXH1noL0=";
mypy-boto3-connect =
- buildMypyBoto3Package "connect" "1.35.33"
- "sha256-I0bSjAcWbx0Y8SUoFbXxAamxTqwaBh96CdUhhZiwhn0=";
+ buildMypyBoto3Package "connect" "1.35.52"
+ "sha256-Y9vBiRNCWaZBjKUyxWVEwsws6pFBdXJBKe6jEiH9AhU=";
mypy-boto3-connect-contact-lens =
buildMypyBoto3Package "connect-contact-lens" "1.35.0"
@@ -382,8 +382,8 @@ rec {
"sha256-JlarWblBOzB64JV7866QjxIWqQH17qH4Lcig2g7WsAw=";
mypy-boto3-datasync =
- buildMypyBoto3Package "datasync" "1.35.0"
- "sha256-lUzOmIoPNgEbJC54tre1m5ddhca05GyTSPOG4uIfumk=";
+ buildMypyBoto3Package "datasync" "1.35.52"
+ "sha256-KPDVvfCr9qffzjjyxhI49YIDVzNraiarljFaJLfsbeI=";
mypy-boto3-dax =
buildMypyBoto3Package "dax" "1.35.0"
@@ -446,8 +446,8 @@ rec {
"sha256-wBJ7PnAlsi88AZIRPoNgbzOhPwUAJBegtwk+tw1lOwU=";
mypy-boto3-ec2 =
- buildMypyBoto3Package "ec2" "1.35.45"
- "sha256-j/hg6HA48HKlSdEExcvPsalA5p0ReOYstBDw1xEdyHM=";
+ buildMypyBoto3Package "ec2" "1.35.52"
+ "sha256-nvj7AYDTPDNLpAOcWOl5vGbtfEscLDwhVHTdCtK9X5g=";
mypy-boto3-ec2-instance-connect =
buildMypyBoto3Package "ec2-instance-connect" "1.35.0"
@@ -462,8 +462,8 @@ rec {
"sha256-KXtN44KAIDXjMgv3ICG8rXYfEjcZ85pQ+qdvN2Yiq3g=";
mypy-boto3-ecs =
- buildMypyBoto3Package "ecs" "1.35.43"
- "sha256-KG94nsbTrwpvoitQ3gdcJPDAWp6MIWDMAmupjB8xwtg=";
+ buildMypyBoto3Package "ecs" "1.35.52"
+ "sha256-hSTuuzjGARNBBmT+s1tzQKZLz7nIYttbtCb1w+cgqWQ=";
mypy-boto3-efs =
buildMypyBoto3Package "efs" "1.35.0"
@@ -614,8 +614,8 @@ rec {
"sha256-wHm7wHBhEX3c29MwZtbZPXH1su5MsAzLmj5h8V3/3V0=";
mypy-boto3-imagebuilder =
- buildMypyBoto3Package "imagebuilder" "1.35.0"
- "sha256-yL54l1/+3Lz4C0Um47rsybbYujc1nde2jirX/DUeSIY=";
+ buildMypyBoto3Package "imagebuilder" "1.35.46"
+ "sha256-eWIWfLQql7QVkg1CfOrfs46h3UqIQxpmpn4+yYsUZRQ=";
mypy-boto3-importexport =
buildMypyBoto3Package "importexport" "1.35.0"
@@ -674,8 +674,8 @@ rec {
"sha256-Hse02blZttIxqJovJ3h6yCEi+jN3e+pfznIXjBAid1k=";
mypy-boto3-iotfleetwise =
- buildMypyBoto3Package "iotfleetwise" "1.35.38"
- "sha256-vkQmyoPMcf2ZBnJ1TJba2uNJL3GaVVZI9h3R75C3uR8=";
+ buildMypyBoto3Package "iotfleetwise" "1.35.51"
+ "sha256-ZfS7CCrU0ZJipWUuyle1uws3IgN27XWOOwR4SAAO+zg=";
mypy-boto3-iotsecuretunneling =
buildMypyBoto3Package "iotsecuretunneling" "1.35.0"
@@ -726,8 +726,8 @@ rec {
"sha256-lBZ9MJQsuM0vRyrDcelDXTIhP9sex6CjnRjYY3qjIdE=";
mypy-boto3-keyspaces =
- buildMypyBoto3Package "keyspaces" "1.35.0"
- "sha256-ZtixXownfAnqUfNY53sVGbDZTQ2Q+Hhzgs1Txuyn3gM=";
+ buildMypyBoto3Package "keyspaces" "1.35.52"
+ "sha256-R3DERqUmmKGjXyJROJDYU+JTIzmrjiXmYCau0rpWujQ=";
mypy-boto3-kinesis =
buildMypyBoto3Package "kinesis" "1.35.26"
@@ -770,8 +770,8 @@ rec {
"sha256-d6dz+lqK8RJ4kwDvK8WYf5U3N9oic5s+4KJgW08/3oU=";
mypy-boto3-lambda =
- buildMypyBoto3Package "lambda" "1.35.28"
- "sha256-hHPXHug6yoAJ0xflfNIJSjVeyQx8U2zyblLbcbL3Uos=";
+ buildMypyBoto3Package "lambda" "1.35.49"
+ "sha256-7TPYB348lSMXAxZuDR2uhGCyUA6zqFiKDvBQuh3M5uE=";
mypy-boto3-lex-models =
buildMypyBoto3Package "lex-models" "1.35.0"
@@ -810,8 +810,8 @@ rec {
"sha256-6Vs5eRibHCZvDDIcIEThPa6T1OmfJXjLg4GAZlworsM=";
mypy-boto3-logs =
- buildMypyBoto3Package "logs" "1.35.12"
- "sha256-H+B1dxaGAAwAqWU5/WKKYz1HT9wKmvjVEg57kGvTDh0=";
+ buildMypyBoto3Package "logs" "1.35.51"
+ "sha256-MOzamNfZJdX4R/NO/1dEwErSdsCfFw8ZwGje5Ocb7oY=";
mypy-boto3-lookoutequipment =
buildMypyBoto3Package "lookoutequipment" "1.35.0"
@@ -826,8 +826,8 @@ rec {
"sha256-0Tz/X8RIuLvbDRXmZ+g0aEOcO7Qyg7ZKDLW1bN4yfJA=";
mypy-boto3-m2 =
- buildMypyBoto3Package "m2" "1.35.0"
- "sha256-rn9xCU8qtkR/zRzi5MM9dNInJOa30VrYRj2hBLN9Zao=";
+ buildMypyBoto3Package "m2" "1.35.46"
+ "sha256-l/wsUpF+LBX9AZWBGgMzry9LdO/zuPq/fEm2do16YcY=";
mypy-boto3-machinelearning =
buildMypyBoto3Package "machinelearning" "1.35.0"
@@ -878,8 +878,8 @@ rec {
"sha256-ur1A0iPMGgfI0XNSOiXX4VF5nR6XJcnpk0KM62Ujp/0=";
mypy-boto3-mediapackagev2 =
- buildMypyBoto3Package "mediapackagev2" "1.35.33"
- "sha256-KUiz6fz0AZVZNFo6FpsfMYZHEFIXHzrvsSbulUWhARQ=";
+ buildMypyBoto3Package "mediapackagev2" "1.35.50"
+ "sha256-kvY0A+v7yJ/NUiqy8HnA4EmGOnbqlQI8lj70S4k5+dk=";
mypy-boto3-mediastore =
buildMypyBoto3Package "mediastore" "1.35.0"
@@ -950,8 +950,8 @@ rec {
"sha256-Epx+p5M+3x0plFaXdc8Rsz+p18ZnxbNlr4IhH5STvZM=";
mypy-boto3-network-firewall =
- buildMypyBoto3Package "network-firewall" "1.35.0"
- "sha256-41zAgq4F07hIl7I6S+M7ngxdFOKjmUB3BFhncLel7ZI=";
+ buildMypyBoto3Package "network-firewall" "1.35.52"
+ "sha256-i4h13QqDO65bSTlxdt5hN6iXag578jc3Mv7bOHBZkpQ=";
mypy-boto3-networkmanager =
buildMypyBoto3Package "networkmanager" "1.35.0"
@@ -970,12 +970,12 @@ rec {
"sha256-CwD0stU2217XD+SXTp+WRyf/qH3EOA5PuBSdTWcXOGU=";
mypy-boto3-opensearch =
- buildMypyBoto3Package "opensearch" "1.35.0"
- "sha256-AQLU4or4flXLxTrZJy0XHIn9MFRTmgHjUWjLzuP2pXA=";
+ buildMypyBoto3Package "opensearch" "1.35.52"
+ "sha256-6a9zygN6Al1yEaOwUvO2Hq/swESKrLW315diz/sgH6c=";
mypy-boto3-opensearchserverless =
- buildMypyBoto3Package "opensearchserverless" "1.35.2"
- "sha256-df8udPQOjXo5GEo6Gk5G6oKx7pBW4c0A82wkC1PA0BI=";
+ buildMypyBoto3Package "opensearchserverless" "1.35.52"
+ "sha256-d7SehQ8mnD17WsZhucdKnEE2v+sI/cdoaMhYCBkj7nY=";
mypy-boto3-opsworks =
buildMypyBoto3Package "opsworks" "1.35.0"
@@ -1086,24 +1086,24 @@ rec {
"sha256-85yUjKQ8oiECUYHhmmYrDssyFSQb6itfIRY2iuwCZdo=";
mypy-boto3-rds =
- buildMypyBoto3Package "rds" "1.35.43"
- "sha256-TxyamNf02uzH31iZzcSZJbGe0g+oVtq1vo+QE4KO/so=";
+ buildMypyBoto3Package "rds" "1.35.50"
+ "sha256-doZ8u+pU5akzuLCa1T+qns/fxOakvsJR5Fj4TsrraBs=";
mypy-boto3-rds-data =
buildMypyBoto3Package "rds-data" "1.35.28"
"sha256-XPb/7sVSVFkDjPQ2x6w7tJmIBiS1YH10805lv/eGsyw=";
mypy-boto3-redshift =
- buildMypyBoto3Package "redshift" "1.35.41"
- "sha256-+BwE/phcHGdn8RLD46/gzTKH9g6+AMt5dF8WyRmMTUI=";
+ buildMypyBoto3Package "redshift" "1.35.52"
+ "sha256-quOZw+mVY3pNXvhWRN4eU9LySeFsrJzSK6FwS0h5Z3E=";
mypy-boto3-redshift-data =
- buildMypyBoto3Package "redshift-data" "1.35.10"
- "sha256-LP5RjvMCfCsFD6z/0mIZJEWN3y+z35aZzboz6KaFlZQ=";
+ buildMypyBoto3Package "redshift-data" "1.35.51"
+ "sha256-wCF9VqKH8GBgmKHsJZfAbNefu/zLw2piSJpuOaQ4nMo=";
mypy-boto3-redshift-serverless =
- buildMypyBoto3Package "redshift-serverless" "1.35.0"
- "sha256-uHY9c+p407QBVS18N0lEshdB1mXV+LONhTXSIr+NiV4=";
+ buildMypyBoto3Package "redshift-serverless" "1.35.52"
+ "sha256-/7yPEPa19Vyhfsb/WBrSXid/VlOwdaqu2SugU4GccDI=";
mypy-boto3-rekognition =
buildMypyBoto3Package "rekognition" "1.35.0"
@@ -1134,8 +1134,8 @@ rec {
"sha256-Ss85x4OJ+RtOmP7LzIIMcikxjMvMyi3VUT9WLvxODSM=";
mypy-boto3-route53 =
- buildMypyBoto3Package "route53" "1.35.4"
- "sha256-gPor5Roaoo3i0zJa4xXIIb1SOar80KQvVi5h003vGZM=";
+ buildMypyBoto3Package "route53" "1.35.52"
+ "sha256-O6P/xxxzAxBhmm5MTsK162moBRno/EhdUvrF12ZQR18=";
mypy-boto3-route53-recovery-cluster =
buildMypyBoto3Package "route53-recovery-cluster" "1.35.0"
@@ -1162,8 +1162,8 @@ rec {
"sha256-RwPNNFntNChLqbr86wd1bwp6OqWvs3oj3V+4X71J3Hw=";
mypy-boto3-s3 =
- buildMypyBoto3Package "s3" "1.35.45"
- "sha256-IA0bZfS9q+F1vkIwucqQ6UiEGs4e75GSpzLaGmHyKII=";
+ buildMypyBoto3Package "s3" "1.35.46"
+ "sha256-8Ah6N2XRA7LbVlzYBl68Kw9w8t1OksEy9kuJRd2GmUA=";
mypy-boto3-s3control =
buildMypyBoto3Package "s3control" "1.35.12"
@@ -1174,8 +1174,8 @@ rec {
"sha256-P2Yg3qvcdAcjY+uwPg2DpTgT6ZXb1XYCOeu4bVfgFKI=";
mypy-boto3-sagemaker =
- buildMypyBoto3Package "sagemaker" "1.35.32"
- "sha256-Wz0q0r66Fd6d/T25BiY+AwvLqlihrHEE16gTBydQk0o=";
+ buildMypyBoto3Package "sagemaker" "1.35.52"
+ "sha256-i2XQmwv5AP0qSN6Bc1xM22XLaNSgo3FTbX8UIgOsFBQ=";
mypy-boto3-sagemaker-a2i-runtime =
buildMypyBoto3Package "sagemaker-a2i-runtime" "1.35.0"
@@ -1322,12 +1322,12 @@ rec {
"sha256-aTKMQz0w0d0WOWHGU3HIqSb3z6PvbuSqtX+saBIIRog=";
mypy-boto3-stepfunctions =
- buildMypyBoto3Package "stepfunctions" "1.35.9"
- "sha256-wIirZ3Ueg3xdtAWT1su3BQXI5W4OBPsyoCQeebsigSs=";
+ buildMypyBoto3Package "stepfunctions" "1.35.46"
+ "sha256-crU3Xc5EkSSrhBqNVS/LIQa4ssiMNtI1gNoCvhBedWs=";
mypy-boto3-storagegateway =
- buildMypyBoto3Package "storagegateway" "1.35.18"
- "sha256-RiAqxt45cMOkbGjWVWufiqZcCKQm++RE3FOdZ5BFkuE=";
+ buildMypyBoto3Package "storagegateway" "1.35.50"
+ "sha256-60qxUQtbi+Dl2osn7zkSmpTuXf8DjTKDa3XXVsJynKE=";
mypy-boto3-sts =
buildMypyBoto3Package "sts" "1.35.0"
@@ -1354,8 +1354,8 @@ rec {
"sha256-i0NmNRPwEypr4m0vNtJDXHEAbCcqdxTexY3MDaltvh8=";
mypy-boto3-timestream-query =
- buildMypyBoto3Package "timestream-query" "1.35.0"
- "sha256-sOjhGZ2h77NOLcoQX2AdLae9cB2VbBYSx+W8ge9oqwA=";
+ buildMypyBoto3Package "timestream-query" "1.35.46"
+ "sha256-kdbDOZuuccSC9k+X0VXRkCUkdpKyeD9ge3bj/JxLBlQ=";
mypy-boto3-timestream-write =
buildMypyBoto3Package "timestream-write" "1.35.0"
@@ -1418,8 +1418,8 @@ rec {
"sha256-AgK4Xg1dloJmA+h4+mcBQQVTvYKjLCk5tPDbl/ItCVQ=";
mypy-boto3-workmail =
- buildMypyBoto3Package "workmail" "1.35.0"
- "sha256-1hjejKCAu9pNPzJ0gaz8mbyQLFkzEUB0mO7g7Da06mk=";
+ buildMypyBoto3Package "workmail" "1.35.52"
+ "sha256-bYfSCYypmTs/NVbLtazSZBgWWotLl+t0B7vm1tdaiZI=";
mypy-boto3-workmailmessageflow =
buildMypyBoto3Package "workmailmessageflow" "1.35.0"
diff --git a/pkgs/development/python-modules/netbox-bgp/default.nix b/pkgs/development/python-modules/netbox-bgp/default.nix
new file mode 100644
index 000000000000..0cc1d41fcc5f
--- /dev/null
+++ b/pkgs/development/python-modules/netbox-bgp/default.nix
@@ -0,0 +1,42 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ setuptools,
+ netbox,
+ pytestCheckHook,
+ python,
+}:
+
+buildPythonPackage rec {
+ pname = "netbox-bgp";
+ version = "0.14.0";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "netbox-community";
+ repo = "netbox-bgp";
+ rev = "v${version}";
+ hash = "sha256-O/kvohyQRhAkDKN5smygyrldINkTQX6yY4eTHn7zSPU";
+ };
+
+ build-system = [ setuptools ];
+
+ nativeCheckInputs = [ netbox ];
+
+ preFixup = ''
+ export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH
+ '';
+
+ dontUsePythonImportsCheck = python.pythonVersion != netbox.python.pythonVersion;
+
+ pythonImportsCheck = [ "netbox_bgp" ];
+
+ meta = {
+ description = "NetBox plugin for BGP related objects documentation";
+ homepage = "https://github.com/netbox-community/netbox-bgp";
+ changelog = "https://github.com/netbox-community/netbox-bgp/releases/tag/${src.rev}";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ felbinger ];
+ };
+}
diff --git a/pkgs/development/python-modules/netbox-reorder-rack/default.nix b/pkgs/development/python-modules/netbox-reorder-rack/default.nix
index 6fa034e0cb32..27dd562480d2 100644
--- a/pkgs/development/python-modules/netbox-reorder-rack/default.nix
+++ b/pkgs/development/python-modules/netbox-reorder-rack/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "netbox-reorder-rack";
- version = "1.1.1";
+ version = "1.1.2";
pyproject = true;
src = fetchFromGitHub {
owner = "netbox-community";
repo = "netbox-reorder-rack";
rev = "refs/tags/v${version}";
- hash = "sha256-rmGByfh/rX/1wMN8cHBhvuntId2wLn2rYgPDzQqvxBM=";
+ hash = "sha256-0572pj1OA08Zxl4vhMmFHvQA/K24hG/GhKEbo+hbW5Q=";
};
build-system = [
diff --git a/pkgs/development/python-modules/nexusformat/default.nix b/pkgs/development/python-modules/nexusformat/default.nix
index 7a9ea2e698be..ae685948c3a0 100644
--- a/pkgs/development/python-modules/nexusformat/default.nix
+++ b/pkgs/development/python-modules/nexusformat/default.nix
@@ -2,31 +2,28 @@
lib,
buildPythonPackage,
fetchPypi,
-
- # build-system
- setuptools,
- setuptools-scm,
-
- # tests
- pytestCheckHook,
-
- # dependencies
h5py,
hdf5plugin,
numpy,
+ pytestCheckHook,
+ pythonOlder,
scipy,
+ setuptools-scm,
+ setuptools,
}:
buildPythonPackage rec {
pname = "nexusformat";
- version = "1.0.6";
+ version = "1.0.7";
+ pyproject = true;
+
+ disabled = pythonOlder "3.10";
+
src = fetchPypi {
inherit pname version;
- hash = "sha256-UxU3PA/2r/uamdysbfC0L2JinHgfkXhssHIo2hf3zlA=";
+ hash = "sha256-SSS6LTOdqLTHNGpBRO7UELF9qJb/sG8EwrE/azxk7wM=";
};
- pyproject = true;
-
build-system = [
setuptools
setuptools-scm
@@ -39,14 +36,14 @@ buildPythonPackage rec {
scipy
];
- pythonImportsCheck = [ "nexusformat.nexus" ];
-
nativeCheckInputs = [ pytestCheckHook ];
+ pythonImportsCheck = [ "nexusformat.nexus" ];
+
meta = with lib; {
description = "Python API to open, create, and manipulate NeXus data written in the HDF5 format";
homepage = "https://github.com/nexpy/nexusformat";
- changelog = "https://github.com/nexpy/nexusformat/releases/tag/${version}";
+ changelog = "https://github.com/nexpy/nexusformat/releases/tag/v${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ oberth-effect ];
};
diff --git a/pkgs/development/python-modules/niaaml/default.nix b/pkgs/development/python-modules/niaaml/default.nix
index 30197c168339..e457b9c79b4c 100644
--- a/pkgs/development/python-modules/niaaml/default.nix
+++ b/pkgs/development/python-modules/niaaml/default.nix
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
+ loguru,
niapy,
numpy,
pandas,
@@ -10,6 +11,7 @@
pythonOlder,
scikit-learn,
toml-adapt,
+ typer,
}:
buildPythonPackage rec {
@@ -34,10 +36,12 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
+ loguru
niapy
numpy
pandas
scikit-learn
+ typer
];
# create scikit-learn and niapy deps version consistent
diff --git a/pkgs/development/python-modules/niapy/default.nix b/pkgs/development/python-modules/niapy/default.nix
index f7cfecd8a5c1..575ee5043044 100644
--- a/pkgs/development/python-modules/niapy/default.nix
+++ b/pkgs/development/python-modules/niapy/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "niapy";
- version = "2.3.1";
+ version = "2.5.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "NiaOrg";
repo = "NiaPy";
rev = "refs/tags/v${version}";
- hash = "sha256-cT5CU1r3LZ9ValJwRUA0PaISmF6kXAz40alXbWYogGA=";
+ hash = "sha256-+5tXwubKdhkcv5NjO/DglK+WJfsJ3AzVx/Y/byDBmGo=";
};
build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index 6169a0f69da3..a6a7a45edef1 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -29,7 +29,6 @@
simplejson,
traits,
xvfbwrapper,
- codecov,
# other dependencies
which,
bash,
@@ -56,7 +55,6 @@ buildPythonPackage rec {
--replace "/usr/bin/env bash" "${bash}/bin/bash"
'';
-
pythonRelaxDeps = [ "traits" ];
propagatedBuildInputs = [
@@ -83,7 +81,6 @@ buildPythonPackage rec {
nativeCheckInputs = [
pybids
- codecov
glibcLocales
mock
pytest
diff --git a/pkgs/development/python-modules/nitrokey/default.nix b/pkgs/development/python-modules/nitrokey/default.nix
index 7be8de78302f..b39d6d344061 100644
--- a/pkgs/development/python-modules/nitrokey/default.nix
+++ b/pkgs/development/python-modules/nitrokey/default.nix
@@ -18,12 +18,12 @@
buildPythonPackage rec {
pname = "nitrokey";
- version = "0.2.1";
+ version = "0.2.2";
pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-Hn/CYvuPRkT9NYzfB8skN3Z732xfmHu6xDTVI/nDbqU=";
+ hash = "sha256-tG6+diyrauJEzpPG33+S5o1ik3n44/443szR7vXH4gE=";
};
disabled = pythonOlder "3.9";
diff --git a/pkgs/development/python-modules/nutpie/default.nix b/pkgs/development/python-modules/nutpie/default.nix
new file mode 100644
index 000000000000..6c31d823c625
--- /dev/null
+++ b/pkgs/development/python-modules/nutpie/default.nix
@@ -0,0 +1,98 @@
+{
+ lib,
+ stdenv,
+ buildPythonPackage,
+ fetchFromGitHub,
+ rustPlatform,
+
+ # build-system
+ cargo,
+ rustc,
+
+ # buildInputs
+ libiconv,
+
+ # dependencies
+ arviz,
+ pandas,
+ pyarrow,
+ xarray,
+
+ # tests
+ # bridgestan, (not packaged)
+ jax,
+ jaxlib,
+ numba,
+ pymc,
+ pytestCheckHook,
+ setuptools,
+}:
+
+buildPythonPackage rec {
+ pname = "nutpie";
+ version = "0.13.2";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "pymc-devs";
+ repo = "nutpie";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-XyUMCnHm5V7oFaf3W+nGpcHfq1ZFppeGMIMCU5OB87s=";
+ };
+
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ name = "${pname}-${version}";
+ hash = "sha256-9lM1S42Bmnlb0opstZN2aOKYhBnP87Frq+fQxk0ez+c=";
+ };
+
+ build-system = [
+ cargo
+ rustPlatform.bindgenHook
+ rustPlatform.cargoSetupHook
+ rustPlatform.maturinBuildHook
+ rustc
+ ];
+
+ buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+ libiconv
+ ];
+
+ dependencies = [
+ arviz
+ pandas
+ pyarrow
+ xarray
+ ];
+
+ pythonImportsCheck = [ "nutpie" ];
+
+ nativeCheckInputs = [
+ # bridgestan
+ numba
+ jax
+ jaxlib
+ pymc
+ pytestCheckHook
+ setuptools
+ ];
+
+ disabledTestPaths = [
+ # Require unpackaged bridgestan
+ "tests/test_stan.py"
+
+ # KeyError: "duplicate registration for "
+ "tests/test_pymc.py"
+ ];
+
+ # Currently, no test are working...
+ doCheck = false;
+
+ meta = {
+ description = "Python wrapper for nuts-rs";
+ homepage = "https://github.com/pymc-devs/nutpie";
+ changelog = "https://github.com/pymc-devs/nutpie/blob/${src.rev}/CHANGELOG.md";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ GaetanLepage ];
+ };
+}
diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix
index c971467d17a1..95d9a582587a 100644
--- a/pkgs/development/python-modules/oauthenticator/default.nix
+++ b/pkgs/development/python-modules/oauthenticator/default.nix
@@ -22,14 +22,14 @@
buildPythonPackage rec {
pname = "oauthenticator";
- version = "17.0.0";
+ version = "17.1.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-0eRfcuI+GuhgF0myZPy8ZcL4kBCLv6PcGEk+92J+GZ0=";
+ hash = "sha256-2RWsrS+W09AY9wWvvM/pYzsM0xzqcwWZYSv4BCsegiw=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/okonomiyaki/default.nix b/pkgs/development/python-modules/okonomiyaki/default.nix
index d8b909b9a571..bdcddc59c7a7 100644
--- a/pkgs/development/python-modules/okonomiyaki/default.nix
+++ b/pkgs/development/python-modules/okonomiyaki/default.nix
@@ -1,64 +1,86 @@
{
- buildPythonPackage,
- stdenv,
- fetchFromGitHub,
lib,
+ stdenv,
attrs,
+ buildPythonPackage,
distro,
+ fetchFromGitHub,
+ parameterized,
jsonschema,
- six,
- zipfile2,
- hypothesis,
mock,
packaging,
+ pytestCheckHook,
+ pythonOlder,
+ setuptools,
testfixtures,
- pythonAtLeast,
+ zipfile2,
}:
buildPythonPackage rec {
pname = "okonomiyaki";
- version = "1.4.0";
- format = "setuptools";
+ version = "2.0.0";
+ pyproject = true;
+
+ disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "enthought";
- repo = pname;
+ repo = "okonomiyaki";
rev = "refs/tags/${version}";
- hash = "sha256-MEll1H7l41m8uz2/WK/Ilm7Dubg0uqYwe+ZgakO1aXQ=";
+ hash = "sha256-JQZhw0H4iSdxoyS6ODICJz1vAZsOISQitX7wTgSS1xc=";
};
- propagatedBuildInputs = [
- distro
- attrs
- jsonschema
- six
- zipfile2
- ];
+ postPatch = ''
+ # Fixed for >= 2.0.0
+ substituteInPlace setup.cfg \
+ --replace-fail "long_description_content_type = rst" "long_description_content_type = text/x-rst"
+ '';
+
+ build-system = [ setuptools ];
+
+ optional-dependencies = {
+ all = [
+ attrs
+ distro
+ jsonschema
+ zipfile2
+ ];
+ platforms = [
+ attrs
+ distro
+ ];
+ formats = [
+ attrs
+ distro
+ jsonschema
+ zipfile2
+ ];
+ };
+
+ nativeCheckInputs = [
+ packaging
+ parameterized
+ pytestCheckHook
+ testfixtures
+ ] ++ lib.flatten (builtins.attrValues optional-dependencies);
preCheck =
''
substituteInPlace okonomiyaki/runtimes/tests/test_runtime.py \
- --replace 'runtime_info = PythonRuntime.from_running_python()' 'raise unittest.SkipTest() #'
+ --replace-fail 'runtime_info = PythonRuntime.from_running_python()' 'raise unittest.SkipTest() #'
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace okonomiyaki/platforms/tests/test_pep425.py \
- --replace 'self.assertEqual(platform_tag, self.tag.platform)' 'raise unittest.SkipTest()'
+ --replace-fail 'self.assertEqual(platform_tag, self.tag.platform)' 'raise unittest.SkipTest()'
'';
- checkInputs = [
- hypothesis
- mock
- packaging
- testfixtures
- ];
-
pythonImportsCheck = [ "okonomiyaki" ];
meta = with lib; {
- homepage = "https://github.com/enthought/okonomiyaki";
description = "Experimental library aimed at consolidating a lot of low-level code used for Enthought's eggs";
+ homepage = "https://github.com/enthought/okonomiyaki";
+ changelog = "https://github.com/enthought/okonomiyaki/releases/tag/${version}";
maintainers = with maintainers; [ genericnerdyusername ];
license = licenses.bsd3;
- broken = pythonAtLeast "3.12"; # multiple tests are failing
};
}
diff --git a/pkgs/development/python-modules/okta/default.nix b/pkgs/development/python-modules/okta/default.nix
index 42d459d56230..dc75dfd84b56 100644
--- a/pkgs/development/python-modules/okta/default.nix
+++ b/pkgs/development/python-modules/okta/default.nix
@@ -18,6 +18,7 @@
python-jose,
pythonOlder,
pyyaml,
+ setuptools,
xmltodict,
yarl,
}:
@@ -25,7 +26,7 @@
buildPythonPackage rec {
pname = "okta";
version = "2.9.8";
- format = "setuptools";
+ pyproject = true;
disabled = pythonOlder "3.7";
@@ -34,7 +35,11 @@ buildPythonPackage rec {
hash = "sha256-RDnRiPsc4p5yI9jFzOtRI+r00tvska8x4uCSjl+cWvo=";
};
- propagatedBuildInputs = [
+ pythonRelaxDeps = [ "aenum" ];
+
+ build-system = [ setuptools ];
+
+ dependencies = [
aenum
aiohttp
flatdict
@@ -66,6 +71,7 @@ buildPythonPackage rec {
"test_update_org_contact_user"
"test_get_role_subscription"
"test_subscribe_unsubscribe"
+ "test_client_invalid_url"
];
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/open-clip-torch/default.nix b/pkgs/development/python-modules/open-clip-torch/default.nix
index fd90c13e6c2a..3299a577305c 100644
--- a/pkgs/development/python-modules/open-clip-torch/default.nix
+++ b/pkgs/development/python-modules/open-clip-torch/default.nix
@@ -29,14 +29,14 @@
}:
buildPythonPackage rec {
pname = "open-clip-torch";
- version = "2.28.0";
+ version = "2.29.0";
pyproject = true;
src = fetchFromGitHub {
owner = "mlfoundations";
repo = "open_clip";
rev = "refs/tags/v${version}";
- hash = "sha256-wHqSADiKlRyJXf3CCrXlSj6tpVVSdO8GVsKInl+OMrc=";
+ hash = "sha256-X5nOWdGhIv+HiiauIezIkPh3G1Odtxr0HPygRp/D184=";
};
build-system = [ pdm-backend ];
diff --git a/pkgs/development/python-modules/opencv-python-headless/default.nix b/pkgs/development/python-modules/opencv-python-headless/default.nix
new file mode 100644
index 000000000000..7a379d39b879
--- /dev/null
+++ b/pkgs/development/python-modules/opencv-python-headless/default.nix
@@ -0,0 +1,14 @@
+{
+ mkPythonMetaPackage,
+ opencv4,
+}:
+
+mkPythonMetaPackage {
+ pname = "opencv-python-headless";
+ inherit (opencv4) version;
+ dependencies = [ opencv4 ];
+ optional-dependencies = opencv4.optional-dependencies or { };
+ meta = {
+ inherit (opencv4.meta) description homepage;
+ };
+}
diff --git a/pkgs/development/python-modules/openrgb-python/default.nix b/pkgs/development/python-modules/openrgb-python/default.nix
index 8c0991ee7e4d..48ac9a55aedc 100644
--- a/pkgs/development/python-modules/openrgb-python/default.nix
+++ b/pkgs/development/python-modules/openrgb-python/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "openrgb-python";
- version = "0.3.1";
+ version = "0.3.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-hzuLNbMuF4LR8fkS6ByULdF37qYwL9smaVAP2G2E+Us=";
+ hash = "sha256-euWcot6OfGOSzueA3B4L3h+G2Gv97ZZUiSTABQh8kSc=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/openslide/default.nix b/pkgs/development/python-modules/openslide/default.nix
new file mode 100644
index 000000000000..9878366a7250
--- /dev/null
+++ b/pkgs/development/python-modules/openslide/default.nix
@@ -0,0 +1,48 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ setuptools,
+ openslide,
+ pillow,
+ pytestCheckHook,
+ pythonOlder,
+}:
+
+buildPythonPackage rec {
+ pname = "openslide";
+ version = "1.3.1";
+ pyproject = true;
+
+ disabled = pythonOlder "3.9";
+
+ src = fetchFromGitHub {
+ owner = "openslide";
+ repo = "openslide-python";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-GokWpRuon8lnxNzxsYGYrQBQDhGPxl8HDaO7fR+2Ldo=";
+ };
+
+ postPatch = ''
+ substituteInPlace openslide/lowlevel.py \
+ --replace-fail "return cdll.LoadLibrary(name)" "return cdll.LoadLibrary(f'${lib.getLib openslide}/lib/{name}')"
+ '';
+
+ build-system = [ setuptools ];
+
+ dependencies = [ pillow ];
+
+ pythonImportsCheck = [ "openslide" ];
+
+ nativeCheckInputs = [ pytestCheckHook ];
+
+ preCheck = ''rm -rf openslide/'';
+
+ meta = {
+ description = "Python bindings to the OpenSlide library for reading whole-slide microscopy images";
+ homepage = "https://github.com/openslide/openslide-python";
+ changelog = "https://github.com/openslide/openslide-python/blob/${src.rev}/CHANGELOG.md";
+ license = lib.licenses.lgpl21Only;
+ maintainers = with lib.maintainers; [ bcdarwin ];
+ };
+}
diff --git a/pkgs/development/python-modules/openstackdocstheme/default.nix b/pkgs/development/python-modules/openstackdocstheme/default.nix
index b316a7aaeee2..7391fb37ba7a 100644
--- a/pkgs/development/python-modules/openstackdocstheme/default.nix
+++ b/pkgs/development/python-modules/openstackdocstheme/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "openstackdocstheme";
- version = "3.3.0";
+ version = "3.4.0";
pyproject = true;
# breaks on import due to distutils import through pbr.packaging
@@ -19,13 +19,11 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- hash = "sha256-wmZJmX5bQKM1uwqWxynkY5jPJaBn+Y2eqSRkE2Ub0qM=";
+ hash = "sha256-YA3nY7Q6UM9sviGRUh08EwwLEjneO2KAh4Hsr/hn25U=";
};
postPatch = ''
- # only a small portion of the listed packages are actually needed for running the tests
- # so instead of removing them one by one remove everything
- rm test-requirements.txt
+ patchShebangs bin/
'';
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/opentypespec/default.nix b/pkgs/development/python-modules/opentypespec/default.nix
index ea4f2ca3530d..81fc60e5dc55 100644
--- a/pkgs/development/python-modules/opentypespec/default.nix
+++ b/pkgs/development/python-modules/opentypespec/default.nix
@@ -15,7 +15,6 @@ buildPythonPackage rec {
hash = "sha256-fOEHmtlCkFhn1jyIA+CsHIfud7x3PPb7UWQsnrVyDqY=";
};
- doCheck = true;
nativeCheckInputs = [ unittestCheckHook ];
unittestFlagsArray = [
"-s"
diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix
index 265adff8273d..7c3d47dffe03 100644
--- a/pkgs/development/python-modules/opower/default.nix
+++ b/pkgs/development/python-modules/opower/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "opower";
- version = "0.8.4";
+ version = "0.8.6";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "tronikos";
repo = "opower";
rev = "refs/tags/v${version}";
- hash = "sha256-UwiEUHLeGK7WsQ8RPmHAjPVXgFf6N5upJIKMp54NSjs=";
+ hash = "sha256-3GzShdYNfaBxu1azPW8eUR5rDn8rrGiE/MhTmwzLOg8=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/orderly-set/default.nix b/pkgs/development/python-modules/orderly-set/default.nix
new file mode 100644
index 000000000000..93f164a5b603
--- /dev/null
+++ b/pkgs/development/python-modules/orderly-set/default.nix
@@ -0,0 +1,56 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ fetchpatch,
+
+ # build-system
+ setuptools,
+
+ # tests
+ pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+ pname = "orderly-set";
+ version = "5.2.2";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "seperman";
+ repo = "orderly-set";
+ rev = "refs/tags/${version}";
+ hash = "sha256-ZDo5fSHD0lCn9CRQtWK10QeZoOhuXG3LR3KA/to9gpE=";
+ };
+ patches = [
+ # https://github.com/seperman/orderly-set/pull/5
+ (fetchpatch {
+ name = "do-not-import-mypy.patch";
+ url = "https://github.com/seperman/orderly-set/commit/34362084868a081b8ebaaf1f13c93a7a798ef557.patch";
+ hash = "sha256-eKbnA31ykm5fH0om6cfOaMpy+ZNNWRDkHieaUIHF8OM=";
+ })
+ ];
+
+ build-system = [
+ setuptools
+ ];
+
+ pythonImportsCheck = [
+ "orderly_set"
+ ];
+ nativeCheckInputs = [
+ pytestCheckHook
+ ];
+ disabledTests = [
+ # Statically analyzes types, can be disabled so that mypy won't be needed.
+ "test_typing_mypy"
+ ];
+
+ meta = {
+ description = "Orderly Set previously known as Ordered Set";
+ homepage = "https://github.com/seperman/orderly-set";
+ changelog = "https://github.com/seperman/orderly-set/blob/${src.rev}/CHANGELOG.md";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ doronbehar ];
+ };
+}
diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix
index dab2af567be3..578e2dfdbf9a 100644
--- a/pkgs/development/python-modules/oslo-utils/default.nix
+++ b/pkgs/development/python-modules/oslo-utils/default.nix
@@ -15,7 +15,7 @@
pbr,
pyparsing,
pytz,
- qemu,
+ qemu-utils,
setuptools,
stestr,
testscenarios,
@@ -64,7 +64,7 @@ buildPythonPackage rec {
eventlet
fixtures
oslotest
- qemu
+ qemu-utils
stestr
testscenarios
pyyaml
diff --git a/pkgs/development/python-modules/osxphotos/default.nix b/pkgs/development/python-modules/osxphotos/default.nix
index 0af996f622a8..f22e7e34d9aa 100644
--- a/pkgs/development/python-modules/osxphotos/default.nix
+++ b/pkgs/development/python-modules/osxphotos/default.nix
@@ -77,6 +77,7 @@ buildPythonPackage rec {
"more-itertools"
"objexplore"
"textx"
+ "tenacity"
];
pythonImportsCheck = [ "osxphotos" ];
diff --git a/pkgs/development/python-modules/ots-python/default.nix b/pkgs/development/python-modules/ots-python/default.nix
index 7aba8368fd8b..9c0ae3625c21 100644
--- a/pkgs/development/python-modules/ots-python/default.nix
+++ b/pkgs/development/python-modules/ots-python/default.nix
@@ -32,7 +32,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [ opentype-sanitizer ];
nativeBuildInputs = [ setuptools-scm ];
- doCheck = true;
nativeCheckInputs = [ pytestCheckHook ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix
index 53f7f9f24e07..4d2d4f24071e 100644
--- a/pkgs/development/python-modules/owslib/default.nix
+++ b/pkgs/development/python-modules/owslib/default.nix
@@ -2,46 +2,48 @@
lib,
buildPythonPackage,
fetchFromGitHub,
-
lxml,
- pyproj,
+ pytest-cov-stub,
pytestCheckHook,
python-dateutil,
pythonOlder,
- pytz,
pyyaml,
requests,
+ setuptools,
}:
buildPythonPackage rec {
pname = "owslib";
- version = "0.31.0";
- format = "setuptools";
+ version = "0.32.0";
+ pyproject = true;
- disabled = pythonOlder "3.7";
+ disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "geopython";
repo = "OWSLib";
- rev = version;
- hash = "sha256-vjJsLavVOqTTrVtYbtA0G+nl0HanKeGtzNFFj92Frw8=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-q2O9FNBszNWfL1ekcohSd1RbdLFu8c+zxi+UFeQ7/mk=";
};
postPatch = ''
substituteInPlace tox.ini \
- --replace " --doctest-modules --doctest-glob 'tests/**/*.txt' --cov-report term-missing --cov owslib" ""
+ --replace-fail " --doctest-modules --doctest-glob 'tests/**/*.txt'" ""
'';
- propagatedBuildInputs = [
+ build-system = [ setuptools ];
+
+ dependencies = [
lxml
- pyproj
python-dateutil
- pytz
pyyaml
requests
];
- nativeCheckInputs = [ pytestCheckHook ];
+ nativeCheckInputs = [
+ pytest-cov-stub
+ pytestCheckHook
+ ];
pythonImportsCheck = [ "owslib" ];
@@ -51,10 +53,15 @@ buildPythonPackage rec {
'';
pytestFlagsArray = [
- # disable tests which require network access
+ # Disable tests which require network access
"-m 'not online'"
];
+ disabledTestPaths = [
+ # Tests requires network access
+ "tests/test_ogcapi_connectedsystems_osh.py"
+ ];
+
meta = with lib; {
description = "Client for Open Geospatial Consortium web service interface standards";
homepage = "https://www.osgeo.org/projects/owslib/";
diff --git a/pkgs/development/python-modules/packageurl-python/default.nix b/pkgs/development/python-modules/packageurl-python/default.nix
index 03ffee785ce9..c3d4e4e792ba 100644
--- a/pkgs/development/python-modules/packageurl-python/default.nix
+++ b/pkgs/development/python-modules/packageurl-python/default.nix
@@ -9,15 +9,15 @@
buildPythonPackage rec {
pname = "packageurl-python";
- version = "0.15.6";
+ version = "0.16.0";
pyproject = true;
- disabled = pythonOlder "3.7";
+ disabled = pythonOlder "3.8";
src = fetchPypi {
pname = "packageurl_python";
inherit version;
- hash = "sha256-y8ia/RXV9NBdtPG2EpfluXpD9h8oeZ9tKCr/Rn7S7pY=";
+ hash = "sha256-aeO/ijky/pwkAPVqrrn4aRHs7i+TmNvhtY7DQ0C+Nl0=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/packvers/default.nix b/pkgs/development/python-modules/packvers/default.nix
index 50bdaff9db6f..4f7cc686d9e6 100644
--- a/pkgs/development/python-modules/packvers/default.nix
+++ b/pkgs/development/python-modules/packvers/default.nix
@@ -6,23 +6,26 @@
pyparsing,
pytestCheckHook,
pythonOlder,
+ setuptools,
}:
buildPythonPackage rec {
pname = "packvers";
version = "21.5";
- format = "setuptools";
+ pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "nexB";
- repo = pname;
+ repo = "packvers";
rev = "refs/tags/${version}";
hash = "sha256-nCSYL0g7mXi9pGFt24pOXbmmYsaRuB+rRZrygf8DTLE=";
};
- propagatedBuildInputs = [ pyparsing ];
+ build-system = [ setuptools ];
+
+ dependencies = [ pyparsing ];
nativeCheckInputs = [
pretend
@@ -31,9 +34,14 @@ buildPythonPackage rec {
pythonImportsCheck = [ "packvers" ];
+ disabledTests = [
+ # Failed: DID NOT RAISE
+ "test_invalid_file_urls"
+ ];
+
meta = with lib; {
description = "Module for version handling of modules";
- homepage = "https://github.com/nexB/dparse2";
+ homepage = "https://github.com/aboutcode-org/packvers";
changelog = "https://github.com/nexB/packvers/blob/${version}/CHANGELOG.rst";
license = with licenses; [
asl20 # and
diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix
index ee1eaa064505..7bbd361cb2b1 100644
--- a/pkgs/development/python-modules/passlib/default.nix
+++ b/pkgs/development/python-modules/passlib/default.nix
@@ -8,6 +8,7 @@
pytestCheckHook,
pythonOlder,
pytest-xdist,
+ setuptools,
}:
buildPythonPackage rec {
@@ -22,6 +23,8 @@ buildPythonPackage rec {
hash = "sha256-3v1Q9ytlxUAqssVzgwppeOXyAq0NmEeTyN3ixBUuvgQ";
};
+ dependencies = [ setuptools ];
+
optional-dependencies = {
argon2 = [ argon2-cffi ];
bcrypt = [ bcrypt ];
diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix
index e1c9505b40df..422f427c6ed6 100644
--- a/pkgs/development/python-modules/peewee/default.nix
+++ b/pkgs/development/python-modules/peewee/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "peewee";
- version = "3.17.6";
+ version = "3.17.7";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "coleifer";
repo = "peewee";
rev = "refs/tags/${version}";
- hash = "sha256-HluoCXblqwaOb+gtAhvaYshTj9CtHoegn0QUaq0V+eA=";
+ hash = "sha256-j10c3mnrHISk04l65ieUB11jt3a3iiQsroTt/L0tKaw=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/peft/default.nix b/pkgs/development/python-modules/peft/default.nix
index 60f91eb7245f..bd9fffeffc80 100644
--- a/pkgs/development/python-modules/peft/default.nix
+++ b/pkgs/development/python-modules/peft/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "peft";
- version = "0.13.0";
+ version = "0.13.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "huggingface";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-LvAZrMEHzaQie641Xk7vsYRdHfq4eRP0Sr8ancRpW58=";
+ hash = "sha256-LKVrkNFY5Ar5Zl1q3heU+Z0ZKNnMz7VBR/WLrYkAg6Y=";
};
nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/pepit/default.nix b/pkgs/development/python-modules/pepit/default.nix
new file mode 100644
index 000000000000..37017f445e9e
--- /dev/null
+++ b/pkgs/development/python-modules/pepit/default.nix
@@ -0,0 +1,53 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ setuptools,
+ cvxpy,
+ numpy,
+ pandas,
+ scipy,
+ matplotlib,
+ pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+ pname = "pepit";
+ version = "0.3.2";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "PerformanceEstimation";
+ repo = "PEPit";
+ rev = version;
+ hash = "sha256-Gdymdfi0Iv9KXBNSbAEWGYIQ4k5EONnbyWs+99L5D/A=";
+ };
+
+ build-system = [
+ setuptools
+ ];
+
+ dependencies = [
+ cvxpy
+ numpy
+ pandas
+ scipy
+ matplotlib
+ ];
+
+ nativeCheckInputs = [
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [
+ "PEPit"
+ ];
+
+ meta = {
+ description = "Performance Estimation in Python";
+ changelog = "https://pepit.readthedocs.io/en/latest/whatsnew/${version}.html";
+ homepage = "https://pepit.readthedocs.io/";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ wegank ];
+ };
+}
diff --git a/pkgs/development/python-modules/pid/default.nix b/pkgs/development/python-modules/pid/default.nix
index b0bb834a302f..0add8799be8b 100644
--- a/pkgs/development/python-modules/pid/default.nix
+++ b/pkgs/development/python-modules/pid/default.nix
@@ -29,8 +29,6 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
- doCheck = true;
-
meta = with lib; {
description = "Pidfile featuring stale detection and file-locking";
homepage = "https://github.com/trbs/pid/";
diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix
index 51ef03ffc7dd..1339b39505a9 100644
--- a/pkgs/development/python-modules/pint/default.nix
+++ b/pkgs/development/python-modules/pint/default.nix
@@ -25,7 +25,7 @@
buildPythonPackage rec {
pname = "pint";
- version = "0.24.1";
+ version = "0.24.3";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -34,7 +34,7 @@ buildPythonPackage rec {
owner = "hgrecco";
repo = "pint";
rev = "refs/tags/${version}";
- hash = "sha256-PQAQvjMi7pFgNhUbw20vc306aTyEbCQNHGef/pxxpXo=";
+ hash = "sha256-PJEgwshTBIqmKMEro+IT+7v4dab3qD7I45OuTOJloR0=";
};
build-system = [
diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix
index 29a5c749ab98..a1ecf82c6309 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 = "24.0.0";
+ version = "27.0.0";
pyproject = true;
disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "plaid_python";
inherit version;
- hash = "sha256-0LtYs2S1fGunmmPFl3cGa/lMtE7Ng+Xb4FruowjdWGM=";
+ hash = "sha256-nMDAJs9W2L3/wB7lOP5hMYF0ytqMVgDLOYzn9UsUVEw=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix
index 5cf06d322fd1..adcb9eec8d09 100644
--- a/pkgs/development/python-modules/playwrightcapture/default.nix
+++ b/pkgs/development/python-modules/playwrightcapture/default.nix
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "playwrightcapture";
- version = "1.26.2";
+ version = "1.26.3";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "Lookyloo";
repo = "PlaywrightCapture";
rev = "refs/tags/v${version}";
- hash = "sha256-JSgWOHMwjxStwMxRe4sFYLeRRgOkfWXlIpqeDfGDSNQ=";
+ hash = "sha256-lZ0zteLZFKSeFBXWxUnPwlC9VVjUPulUCUocPGOUmuI=";
};
pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix
index f94ac77898f3..a402babb71bc 100644
--- a/pkgs/development/python-modules/plotnine/default.nix
+++ b/pkgs/development/python-modules/plotnine/default.nix
@@ -2,31 +2,34 @@
lib,
buildPythonPackage,
fetchFromGitHub,
- geopandas,
+
+ # build-system
+ setuptools-scm,
+
+ # dependencies
matplotlib,
mizani,
pandas,
patsy,
- pytestCheckHook,
- pythonOlder,
- scikit-misc,
scipy,
- setuptools-scm,
statsmodels,
+
+ # tests
+ geopandas,
+ pytestCheckHook,
+ scikit-misc,
}:
buildPythonPackage rec {
pname = "plotnine";
- version = "0.13.6";
+ version = "0.14.0";
pyproject = true;
- disabled = pythonOlder "3.9";
-
src = fetchFromGitHub {
owner = "has2k1";
repo = "plotnine";
rev = "refs/tags/v${version}";
- hash = "sha256-/yxRYK3ZTrYj+l3TQhFllyICnJjCZPd4ebNurCLZAYg=";
+ hash = "sha256-4x7euxf+G/HaqC3LVD7TCQEVcihdb/FSMqRvMWAqhgo=";
};
postPatch = ''
@@ -36,8 +39,6 @@ buildPythonPackage rec {
build-system = [ setuptools-scm ];
- pythonRelaxDeps = [ "mizani" ];
-
dependencies = [
matplotlib
mizani
diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix
index c2e34a316578..cab8bc38092f 100644
--- a/pkgs/development/python-modules/praw/default.nix
+++ b/pkgs/development/python-modules/praw/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "praw";
- version = "7.8.0";
+ version = "7.8.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "praw-dev";
repo = "praw";
rev = "refs/tags/v${version}";
- hash = "sha256-oJkpFGJswG//5dnfdwkUdAkn8FOuqT/tDoTT5UncOGA=";
+ hash = "sha256-jxF7rlMwKIKwyYv35vYWAdtClsVhnIkywoyMQeggGBc=";
};
build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix
index 9a5c0cf60fdc..f196ef52a1ea 100644
--- a/pkgs/development/python-modules/psd-tools/default.nix
+++ b/pkgs/development/python-modules/psd-tools/default.nix
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "psd-tools";
- version = "1.10.0";
+ version = "1.10.2";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
owner = "psd-tools";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-H3Szd8/NjXCkWyG/q+6O5L0Iq5u/g4UNdEmhDqQsAY8=";
+ hash = "sha256-vBDFKWNksF8/h5Jp1VOxVWgAzPdOLhv0iDrNDVXzm54=";
};
build-system = [
diff --git a/pkgs/development/python-modules/pwlf/default.nix b/pkgs/development/python-modules/pwlf/default.nix
index 95dbc3ac83b8..c5341cd1cd75 100644
--- a/pkgs/development/python-modules/pwlf/default.nix
+++ b/pkgs/development/python-modules/pwlf/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pwlf";
- version = "2.2.1";
+ version = "2.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "cjekel";
repo = "piecewise_linear_fit_py";
- rev = "v${version}";
- hash = "sha256-gjdahulpHjBmOlKOCPF9WmrWe4jn/+0oVI4o09EX7qE=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-FAH38mSaABdNR8lpxxA/YVo5ec2WYOMEsAQqravbM9k=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/py-aosmith/default.nix b/pkgs/development/python-modules/py-aosmith/default.nix
index 5b504e647ea6..199011b934b1 100644
--- a/pkgs/development/python-modules/py-aosmith/default.nix
+++ b/pkgs/development/python-modules/py-aosmith/default.nix
@@ -22,9 +22,11 @@ buildPythonPackage rec {
hash = "sha256-TjBjyWxBPrZEY/o1DZ+GiFTHTW37WwFN0oyJSyGru28=";
};
- nativeBuildInputs = [ poetry-core ];
+ build-system = [ poetry-core ];
- propagatedBuildInputs = [
+ pythonRelaxDeps = [ "tenacity" ];
+
+ dependencies = [
aiohttp
tenacity
];
diff --git a/pkgs/development/python-modules/py-improv-ble-client/default.nix b/pkgs/development/python-modules/py-improv-ble-client/default.nix
new file mode 100644
index 000000000000..7f983cf534c5
--- /dev/null
+++ b/pkgs/development/python-modules/py-improv-ble-client/default.nix
@@ -0,0 +1,50 @@
+{
+ lib,
+ bleak-retry-connector,
+ bleak,
+ buildPythonPackage,
+ fetchFromGitHub,
+ pythonOlder,
+ setuptools,
+}:
+
+buildPythonPackage rec {
+ pname = "py-improv-ble-client";
+ version = "1.0.4";
+ pyproject = true;
+
+ disabled = pythonOlder "3.11";
+
+ src = fetchFromGitHub {
+ owner = "home-assistant-libs";
+ repo = "py-improv-ble-client";
+ rev = "refs/tags/${version}";
+ hash = "sha256-leYSDB5/jFqlvX78OYzlFkkVxIkJ7iOUoLHBuVj7tAo=";
+ };
+
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace-fail "setuptools~=65.6" "setuptools" \
+ --replace-fail "wheel~=0.37.1" "wheel"
+ '';
+
+ build-system = [ setuptools ];
+
+ dependencies = [
+ bleak
+ bleak-retry-connector
+ ];
+
+ # Module has no tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "improv_ble_client" ];
+
+ meta = {
+ description = "Module to provision devices which implement Improv via BLE";
+ homepage = "https://github.com/home-assistant-libs/py-improv-ble-client";
+ changelog = "https://github.com/home-assistant-libs/py-improv-ble-client/releases/tag/${version}";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/py-madvr2/default.nix b/pkgs/development/python-modules/py-madvr2/default.nix
index 05799d43226a..32eb2a7c6667 100644
--- a/pkgs/development/python-modules/py-madvr2/default.nix
+++ b/pkgs/development/python-modules/py-madvr2/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "py-madvr2";
- version = "1.6.32";
+ version = "1.6.33";
pyproject = true;
src = fetchFromGitHub {
owner = "iloveicedgreentea";
repo = "py-madvr";
- rev = "refs/tags/${version}";
- hash = "sha256-yD8DNhYG9oauEGKnX8Qnh0oSwG/AZa8FIRtHVq4DyTE=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-z+PVLz9eApGJ94I/Jp0MyqNpKQwIemk8j+OyqFmIbgI=";
};
build-system = [ setuptools ];
@@ -28,11 +28,8 @@ buildPythonPackage rec {
pytestCheckHook
];
- # https://github.com/iloveicedgreentea/py-madvr/issues/12
- doCheck = false;
-
meta = {
- changelog = "https://github.com/iloveicedgreentea/py-madvr/releases/tag/${version}";
+ changelog = "https://github.com/iloveicedgreentea/py-madvr/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
description = "Control MadVR Envy over IP";
homepage = "https://github.com/iloveicedgreentea/py-madvr";
license = lib.licenses.mit;
diff --git a/pkgs/development/python-modules/py-opensonic/default.nix b/pkgs/development/python-modules/py-opensonic/default.nix
index 22f3ebe7ecc8..114c1814007d 100644
--- a/pkgs/development/python-modules/py-opensonic/default.nix
+++ b/pkgs/development/python-modules/py-opensonic/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "py-opensonic";
- version = "5.1.1";
+ version = "5.2.0";
pyproject = true;
src = fetchFromGitHub {
owner = "khers";
repo = "py-opensonic";
- rev = "v${version}";
- hash = "sha256-wXTXuX+iIMEoALxsciopucmvBxAyEeiOgjJPrbD63gM=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-8QhYzGZ9b2pyzhl5vyAWhjxtvF/vaEa6Qcw+RBGzkTQ=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/py3dns/default.nix b/pkgs/development/python-modules/py3dns/default.nix
index 14ad16771655..a036ba2707cf 100644
--- a/pkgs/development/python-modules/py3dns/default.nix
+++ b/pkgs/development/python-modules/py3dns/default.nix
@@ -2,24 +2,20 @@
lib,
buildPythonPackage,
fetchPypi,
+ flit-core,
}:
buildPythonPackage rec {
pname = "py3dns";
- version = "3.2.1";
- format = "setuptools";
+ version = "4.0.2";
+ pyproject = true;
src = fetchPypi {
inherit pname version;
- sha256 = "1r25f0ys5p37bhld7m7n4gb0lrysaym3w318w2f8bncq7r3d81qz";
+ hash = "sha256-mGUugOzsFDxg948OazQWMcqadWDt2N3fyGTAKQJhijk=";
};
- preConfigure = ''
- sed -i \
- -e '/import DNS/d' \
- -e 's/DNS.__version__/"${version}"/g' \
- setup.py
- '';
+ build-system = [ flit-core ];
doCheck = false;
diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix
index e22429f0716f..ba171e372c8b 100644
--- a/pkgs/development/python-modules/pyarrow/default.nix
+++ b/pkgs/development/python-modules/pyarrow/default.nix
@@ -80,7 +80,6 @@ buildPythonPackage rec {
PARQUET_HOME = arrow-cpp;
ARROW_TEST_DATA = lib.optionalString doCheck arrow-cpp.ARROW_TEST_DATA;
-
doCheck = true;
dontUseCmakeConfigure = true;
diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix
index caca2f9f3d0a..65768bdc806f 100644
--- a/pkgs/development/python-modules/pycangjie/default.nix
+++ b/pkgs/development/python-modules/pycangjie/default.nix
@@ -43,8 +43,6 @@ buildPythonPackage {
configureScript = "./autogen.sh";
- doCheck = true;
-
meta = with lib; {
description = "Python wrapper to libcangjie";
homepage = "http://cangjians.github.io/projects/pycangjie/";
diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix
index 7b499f82d061..dba7ba778363 100644
--- a/pkgs/development/python-modules/pychromecast/default.nix
+++ b/pkgs/development/python-modules/pychromecast/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pychromecast";
- version = "14.0.3";
+ version = "14.0.5";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "PyChromecast";
inherit version;
- hash = "sha256-SwNXwJywl0r5trcQNH73Iu9ZZijlMj4slyeBint/x5c=";
+ hash = "sha256-qGce5OpKcJXi4GcOIhUUXsHj4KoHN/901kiuTcJosrE=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock
index 8acdc7ca2112..efdd3eec91de 100644
--- a/pkgs/development/python-modules/pycrdt/Cargo.lock
+++ b/pkgs/development/python-modules/pycrdt/Cargo.lock
@@ -223,9 +223,9 @@ dependencies = [
[[package]]
name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
[[package]]
name = "portable-atomic"
@@ -235,16 +235,16 @@ checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
[[package]]
name = "proc-macro2"
-version = "1.0.88"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
dependencies = [
"unicode-ident",
]
[[package]]
name = "pycrdt"
-version = "0.10.4"
+version = "0.10.6"
dependencies = [
"pyo3",
"yrs",
@@ -345,18 +345,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "serde"
-version = "1.0.210"
+version = "1.0.213"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.210"
+version = "1.0.213"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5"
dependencies = [
"proc-macro2",
"quote",
@@ -392,9 +392,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
[[package]]
name = "syn"
-version = "2.0.82"
+version = "2.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021"
+checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
dependencies = [
"proc-macro2",
"quote",
@@ -409,18 +409,18 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "thiserror"
-version = "1.0.64"
+version = "1.0.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.64"
+version = "1.0.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
dependencies = [
"proc-macro2",
"quote",
@@ -566,9 +566,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "yrs"
-version = "0.21.2"
+version = "0.21.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7744baf8d4f74beba8f47ca3a611c512766c82023f271167b14d21216559b014"
+checksum = "81de5913bca29f43a1d12ca92a7b39a2945e9420e01602a7563917c7bfc60f70"
dependencies = [
"arc-swap",
"async-lock",
diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix
index 37730c78fb84..a7704735a3cb 100644
--- a/pkgs/development/python-modules/pycrdt/default.nix
+++ b/pkgs/development/python-modules/pycrdt/default.nix
@@ -23,14 +23,14 @@
buildPythonPackage rec {
pname = "pycrdt";
- version = "0.10.4";
+ version = "0.10.6";
pyproject = true;
src = fetchFromGitHub {
owner = "jupyter-server";
repo = "pycrdt";
rev = "refs/tags/${version}";
- hash = "sha256-nKjXEXvEIGtwbSoabz7UBsx4nfsCgUXm+JdSL5Z/b38=";
+ hash = "sha256-TKSBTpOvAr1/HBn3HnwNdEwM1hgbvPdice8bcVhVmH0=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/pyct/default.nix b/pkgs/development/python-modules/pyct/default.nix
index 5509173bd985..96aad663367f 100644
--- a/pkgs/development/python-modules/pyct/default.nix
+++ b/pkgs/development/python-modules/pyct/default.nix
@@ -2,41 +2,57 @@
lib,
buildPythonPackage,
fetchPypi,
- param,
- pytestCheckHook,
pythonAtLeast,
+
+ # build-system
+ setuptools,
+
+ # dependencies
+ param,
pyyaml,
requests,
+
+ # tests
+ pytestCheckHook,
}:
buildPythonPackage rec {
pname = "pyct";
version = "0.5.0";
- format = "setuptools";
-
- disabled = pythonAtLeast "3.12";
+ pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-3Z9KxcvY43w1LAQDYGLTxfZ+/sdtQEdh7xawy/JqpqA=";
};
- propagatedBuildInputs = [
+ build-system = [
+ setuptools
+ ];
+
+ dependencies = [
param
pyyaml
requests
];
- nativeCheckInputs = [ pytestCheckHook ];
+ nativeCheckInputs = [
+ pytestCheckHook
+ ];
+ # Only the command line doesn't work on with Python 3.12, due to usage of
+ # deprecated distutils module. Not disabling it totally.
+ disabledTestPaths = lib.optionals (pythonAtLeast "3.12") [
+ "pyct/tests/test_cmd.py"
+ ];
pythonImportsCheck = [ "pyct" ];
- meta = with lib; {
+ meta = {
description = "ClI for Python common tasks for users";
mainProgram = "pyct";
homepage = "https://github.com/pyviz/pyct";
changelog = "https://github.com/pyviz-dev/pyct/releases/tag/v${version}";
- license = licenses.bsd3;
+ license = lib.licenses.bsd3;
maintainers = [ ];
};
}
diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix
index c36540a96f25..2d18e7110a7b 100644
--- a/pkgs/development/python-modules/pycurl/default.nix
+++ b/pkgs/development/python-modules/pycurl/default.nix
@@ -96,6 +96,8 @@ buildPythonPackage rec {
"test_proxy_tlsauth"
# AssertionError: 'Москва' != '\n...
"test_encoded_unicode_header"
+ # https://github.com/pycurl/pycurl/issues/856
+ "test_multi_info_read"
]
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
# Fatal Python error: Segmentation fault
diff --git a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix
index 1cd06c0d2be6..6bb1c8386bce 100644
--- a/pkgs/development/python-modules/pydata-sphinx-theme/default.nix
+++ b/pkgs/development/python-modules/pydata-sphinx-theme/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pydata-sphinx-theme";
- version = "0.15.4";
+ version = "0.16.0";
format = "wheel";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
dist = "py3";
python = "py3";
pname = "pydata_sphinx_theme";
- hash = "sha256-ITatDpUA0JSflhZ+Y/PimGIAQK6o+cdGIZWe2l1M+OY=";
+ hash = "sha256-GMgQ7k5n4FKB43HhVsH7W7D6HydHJARhsiUnL32NV9g=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pydeako/default.nix b/pkgs/development/python-modules/pydeako/default.nix
new file mode 100644
index 000000000000..6fabf92f5f84
--- /dev/null
+++ b/pkgs/development/python-modules/pydeako/default.nix
@@ -0,0 +1,49 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ mock,
+ pytest-asyncio,
+ pytestCheckHook,
+ pythonOlder,
+ setuptools,
+ zeroconf,
+}:
+
+buildPythonPackage rec {
+ pname = "pydeako";
+ version = "0.5.4";
+ pyproject = true;
+
+ disabled = pythonOlder "3.11";
+
+ src = fetchFromGitHub {
+ owner = "DeakoLights";
+ repo = "pydeako";
+ rev = "refs/tags/${version}";
+ hash = "sha256-Z0H5VhWfjmvvCGTX//hds9dwk2wJSPXckNac1PkQZNA=";
+ };
+
+ build-system = [ setuptools ];
+
+ dependencies = [ zeroconf ];
+
+ # Module has no tests
+ #doCheck = false;
+
+ nativeCheckInputs = [
+ mock
+ pytest-asyncio
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "pydeako" ];
+
+ meta = {
+ description = "Module used to discover and communicate with Deako devices over the network locally";
+ homepage = "https://github.com/DeakoLights/pydeako";
+ changelog = "https://github.com/DeakoLights/pydeako/releases/tag/${version}";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/pyeclib/default.nix b/pkgs/development/python-modules/pyeclib/default.nix
index d1fec7764784..9cad362d2243 100644
--- a/pkgs/development/python-modules/pyeclib/default.nix
+++ b/pkgs/development/python-modules/pyeclib/default.nix
@@ -12,21 +12,17 @@
buildPythonPackage rec {
pname = "pyeclib";
- version = "1.6.1";
+ version = "1.6.2";
pyproject = true;
src = fetchFromGitHub {
owner = "openstack";
repo = "pyeclib";
rev = "refs/tags/${version}";
- hash = "sha256-pa3majZ68+DQGtgGCpZVRshof+w9jvpxreo4dkckLXk=";
+ hash = "sha256-LZQNJU7QEoHo+RWvHnQkNxBg6t322u/c3PyBhy1eVZc=";
};
postPatch = ''
- # patch dlopen call
- substituteInPlace src/c/pyeclib_c/pyeclib_c.c \
- --replace-fail "liberasurecode.so" "${liberasurecode}/lib/liberasurecode.so"
-
# python's platform.platform() doesn't return "Darwin" (anymore?)
substituteInPlace setup.py \
--replace-fail '"Darwin"' '"macOS"'
diff --git a/pkgs/development/python-modules/pyevtk/default.nix b/pkgs/development/python-modules/pyevtk/default.nix
index 16081d1cc613..2164ffb9e118 100644
--- a/pkgs/development/python-modules/pyevtk/default.nix
+++ b/pkgs/development/python-modules/pyevtk/default.nix
@@ -1,7 +1,7 @@
{
lib,
buildPythonPackage,
- fetchFromGitHub,
+ fetchPypi,
setuptools,
numpy,
pytestCheckHook,
@@ -10,14 +10,13 @@
buildPythonPackage rec {
pname = "pyevtk";
- version = "1.2.0";
+ version = "1.6.0";
pyproject = true;
- src = fetchFromGitHub {
- owner = "pyscience-projects";
- repo = "pyevtk";
- rev = "refs/tags/v${version}";
- hash = "sha256-HrodoVxjREZiutgRJ3ZUrART29+gAZfpR9f4A4SRh4Q=";
+ src = fetchPypi {
+ inherit pname version;
+
+ hash = "sha256-H2vnh2o6AFyCWIYVUdpP5+RP8aLn/yqT1txR3u39pfQ=";
};
postPatch = ''
@@ -38,7 +37,6 @@ buildPythonPackage rec {
meta = {
description = "Exports data to binary VTK files for visualization/analysis";
homepage = "https://github.com/pyscience-projects/pyevtk";
- changelog = "https://github.com/pyscience-projects/pyevtk/blob/${src.rev}/CHANGES.txt";
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ sigmanificient ];
};
diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix
index a23a0ce879e8..3456c6262dab 100644
--- a/pkgs/development/python-modules/pyexploitdb/default.nix
+++ b/pkgs/development/python-modules/pyexploitdb/default.nix
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pyexploitdb";
- version = "0.2.40";
+ version = "0.2.53";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyExploitDb";
inherit version;
- hash = "sha256-3o4KnWau2Sxkj18ZoY6EsSszm0Z0Z1Gz/KWr1ZH7FTs=";
+ hash = "sha256-NebM8nhIo4Hgf7iwSV2utcrqR1kLh+cpmqV1Gc9r8cw=";
};
build-system = [ setuptools ];
@@ -35,8 +35,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library to fetch the most recent exploit-database";
- homepage = "https://github.com/GoVanguard/pyExploitDb";
- changelog = "https://github.com/GoVanguard/pyExploitDb/blob/master/ChangeLog.md";
+ homepage = "https://github.com/Hackman238/pyExploitDb/pyExploitDb";
+ changelog = "https://github.com/Hackman238/pyExploitDb/pyExploitDb/blob/master/ChangeLog.md";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/pygame-ce/default.nix b/pkgs/development/python-modules/pygame-ce/default.nix
index 5c9e2432c822..80c0d153b72d 100644
--- a/pkgs/development/python-modules/pygame-ce/default.nix
+++ b/pkgs/development/python-modules/pygame-ce/default.nix
@@ -24,11 +24,13 @@
SDL2_mixer,
SDL2_ttf,
numpy,
+
+ pygame-gui,
}:
buildPythonPackage rec {
pname = "pygame-ce";
- version = "2.5.1";
+ version = "2.5.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -37,7 +39,7 @@ buildPythonPackage rec {
owner = "pygame-community";
repo = "pygame-ce";
rev = "refs/tags/${version}";
- hash = "sha256-bt/6ukXZU79CWFqov9JON9ktQ/c4NKLxhX4Jif3Enxs=";
+ hash = "sha256-9e02ZfBfk18jsVDKKhMwEJiTGMG7VdBEgVh4unMJguY=";
# Unicode file cause different checksums on HFS+ vs. other filesystems
postFetch = "rm -rf $out/docs/reST";
};
@@ -67,10 +69,10 @@ buildPythonPackage rec {
''
# cython was pinned to fix windows build hangs (pygame-community/pygame-ce/pull/3015)
substituteInPlace pyproject.toml \
- --replace-fail '"cython<=3.0.10",' '"cython",' \
- --replace-fail '"meson<=1.5.0",' '"meson",' \
- --replace-fail '"sphinx<=7.2.6",' "" \
- --replace-fail '"ninja<=1.11.1.1",' ""
+ --replace-fail '"meson<=1.5.1",' '"meson",' \
+ --replace-fail '"ninja<=1.11.1.1",' "" \
+ --replace-fail '"cython<=3.0.11",' '"cython",' \
+ --replace-fail '"sphinx<=7.2.6",' ""
substituteInPlace buildconfig/config_{unix,darwin}.py \
--replace-fail 'from distutils' 'from setuptools._distutils'
substituteInPlace src_py/sysfont.py \
@@ -151,12 +153,16 @@ buildPythonPackage rec {
"pygame.version"
];
- meta = with lib; {
+ passthru.tests = {
+ inherit pygame-gui;
+ };
+
+ meta = {
description = "Pygame Community Edition (CE) - library for multimedia application built on SDL";
homepage = "https://pyga.me/";
changelog = "https://github.com/pygame-community/pygame-ce/releases/tag/${version}";
- license = licenses.lgpl21Plus;
- maintainers = with maintainers; [ pbsds ];
- platforms = platforms.unix;
+ license = lib.licenses.lgpl21Plus;
+ maintainers = [ lib.maintainers.pbsds ];
+ platforms = lib.platforms.unix;
};
}
diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix
index 5906a6f9a9cb..6c8261a06b3a 100644
--- a/pkgs/development/python-modules/pygame-gui/default.nix
+++ b/pkgs/development/python-modules/pygame-gui/default.nix
@@ -1,6 +1,7 @@
{
lib,
pkgs,
+ stdenv,
buildPythonPackage,
nix-update-script,
fetchFromGitHub,
@@ -53,6 +54,11 @@ buildPythonPackage rec {
"test_process_event_text_ctrl_v_select_range"
"test_process_event_text_ctrl_a"
"test_process_event_text_ctrl_x"
+ ]
+ ++ lib.optionals stdenv.hostPlatform.isDarwin [
+ # fails to determine "/" as an existing path
+ # https://github.com/MyreMylar/pygame_gui/issues/644
+ "test_process_event"
];
disabledTestPaths = [ "tests/test_performance/test_text_performance.py" ];
diff --git a/pkgs/development/python-modules/pygmars/default.nix b/pkgs/development/python-modules/pygmars/default.nix
index 11bd26ee9531..634788bdf9a1 100644
--- a/pkgs/development/python-modules/pygmars/default.nix
+++ b/pkgs/development/python-modules/pygmars/default.nix
@@ -9,16 +9,16 @@
buildPythonPackage rec {
pname = "pygmars";
- version = "0.8.1";
+ version = "0.9.0";
pyproject = true;
- disabled = pythonOlder "3.7";
+ disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "nexB";
repo = "pygmars";
rev = "refs/tags/v${version}";
- hash = "sha256-RwAZ1ZLh0zgGshSv7LleBHMotKapDFtD69ptqQnr0EA=";
+ hash = "sha256-OhmTD83p/4tCMoCXy35/0fy8Tw1usn27dJyzpOeGlkU=";
};
dontConfigure = true;
@@ -32,7 +32,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python lexing and parsing library";
homepage = "https://github.com/nexB/pygmars";
- changelog = "https://github.com/nexB/pygmars/releases/tag/v${version}";
+ changelog = "https://github.com/aboutcode-org/pygmars/blob/v${version}/CHANGELOG.rst";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
};
diff --git a/pkgs/development/python-modules/pykcs11/default.nix b/pkgs/development/python-modules/pykcs11/default.nix
index b4fdeb938147..fe3cd809bcca 100644
--- a/pkgs/development/python-modules/pykcs11/default.nix
+++ b/pkgs/development/python-modules/pykcs11/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "pykcs11";
- version = "1.5.16";
+ version = "1.5.17";
pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-Q9dGsGd/Q8xjS598Tastm6axqDuTHiWYJHBi+P9kHgc=";
+ hash = "sha256-e2Z+lZ+gtq0HULA+IIGgWcvppieJdmFD5Q+QmIoziZQ=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix
index 1563bcf88dd4..d3c81344d2b9 100644
--- a/pkgs/development/python-modules/pylance/default.nix
+++ b/pkgs/development/python-modules/pylance/default.nix
@@ -55,6 +55,7 @@ buildPythonPackage rec {
nativeBuildInputs = [
pkg-config
+ protobuf # for protoc
rustPlatform.cargoSetupHook
];
diff --git a/pkgs/development/python-modules/pylint-venv/default.nix b/pkgs/development/python-modules/pylint-venv/default.nix
index 47d294f15317..de5daa466fdf 100644
--- a/pkgs/development/python-modules/pylint-venv/default.nix
+++ b/pkgs/development/python-modules/pylint-venv/default.nix
@@ -8,19 +8,19 @@
buildPythonPackage rec {
pname = "pylint-venv";
- version = "3.0.3";
- format = "pyproject";
+ version = "3.0.4";
+ pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "jgosmann";
- repo = pname;
+ repo = "pylint-venv";
rev = "refs/tags/v${version}";
- hash = "sha256-dsVEHJawsTNKVCVmeOa61wOU5GPeyzAU/eUDFrK9PPg=";
+ hash = "sha256-dJWVfltze4zT0CowBZSn3alqR2Y8obKUCmO8Nfw+ahs=";
};
- nativeBuildInputs = [ poetry-core ];
+ build-system = [ poetry-core ];
# Module has no tests
doCheck = false;
@@ -31,7 +31,7 @@ buildPythonPackage rec {
description = "Module to make pylint respect virtual environments";
homepage = "https://github.com/jgosmann/pylint-venv/";
changelog = "https://github.com/jgosmann/pylint-venv/blob/v${version}/CHANGES.md";
- license = with licenses; [ mit ];
+ license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}
diff --git a/pkgs/development/python-modules/pylsl/default.nix b/pkgs/development/python-modules/pylsl/default.nix
new file mode 100644
index 000000000000..f58a67956e36
--- /dev/null
+++ b/pkgs/development/python-modules/pylsl/default.nix
@@ -0,0 +1,43 @@
+{
+ lib,
+ liblsl,
+ fetchFromGitHub,
+ buildPythonPackage,
+ setuptools,
+ wheel,
+}:
+
+buildPythonPackage rec {
+ pname = "pylsl";
+ version = "1.16.2";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "labstreaminglayer";
+ repo = "pylsl";
+ rev = "v${version}";
+ hash = "sha256-rReoPirf1rdQppKEBfHMk3J2htdsnFfIdlNQIprOoUg=";
+ };
+
+ postPatch = ''
+ substituteInPlace pylsl/pylsl.py \
+ --replace "def find_liblsl_libraries(verbose=False):" "$(echo -e "def find_liblsl_libraries(verbose=False):\n yield '${liblsl}/lib/liblsl.so'")"
+ '';
+
+ nativeBuildInputs = [
+ setuptools
+ wheel
+ ];
+
+ buildImputs = [ liblsl ];
+
+ pythonImportsCheck = [ "pylsl" ];
+
+ meta = with lib; {
+ description = "Python bindings (pylsl) for liblsl";
+ homepage = "https://github.com/labstreaminglayer/pylsl";
+ license = licenses.mit;
+ maintainers = with maintainers; [ abcsds ];
+ mainProgram = "pylsl";
+ };
+}
diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix
index beb8ab6461ef..7b145228b4cf 100644
--- a/pkgs/development/python-modules/pymavlink/default.nix
+++ b/pkgs/development/python-modules/pymavlink/default.nix
@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "pymavlink";
- version = "2.4.41";
+ version = "2.4.42";
format = "setuptools";
src = fetchPypi {
inherit pname version;
- hash = "sha256-7TIlzphdBhA6qyUa/Ig9BKmKHW21xzmV595MqssfZs0=";
+ hash = "sha256-3+BECLV0JeJlOKa0vZd/dyObyM5hiGF0VnsaJD98PXY=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pymilter/default.nix b/pkgs/development/python-modules/pymilter/default.nix
index 6f0c4291d4d5..634f437b810f 100644
--- a/pkgs/development/python-modules/pymilter/default.nix
+++ b/pkgs/development/python-modules/pymilter/default.nix
@@ -4,7 +4,7 @@
fetchFromGitHub,
libmilter,
berkeleydb,
- pydns,
+ py3dns,
iana-etc,
libredirect,
pyasyncore,
@@ -30,7 +30,7 @@ buildPythonPackage rec {
nativeCheckInputs = [ pyasyncore ];
dependencies = [
berkeleydb
- pydns
+ py3dns
];
preBuild = ''
diff --git a/pkgs/development/python-modules/pymilvus/default.nix b/pkgs/development/python-modules/pymilvus/default.nix
index 61d3ae31cb98..c9f706ca4a95 100644
--- a/pkgs/development/python-modules/pymilvus/default.nix
+++ b/pkgs/development/python-modules/pymilvus/default.nix
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "pymilvus";
- version = "2.4.7";
+ version = "2.3.6";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "milvus-io";
repo = "pymilvus";
rev = "refs/tags/v${version}";
- hash = "sha256-z4Gg9TCiIwcDxnsEDyafsoMjmPYxLjg1XWH41rTA3nU=";
+ hash = "sha256-K7k3MTOEm9+HDwMps9C8Al0Jmp1ptJw3pN1LEBOUz0U=";
};
pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/pymoo/default.nix b/pkgs/development/python-modules/pymoo/default.nix
index 3121f48b1ab3..86eb3e81b294 100644
--- a/pkgs/development/python-modules/pymoo/default.nix
+++ b/pkgs/development/python-modules/pymoo/default.nix
@@ -70,7 +70,6 @@ buildPythonPackage rec {
scipy
];
- doCheck = true;
preCheck = ''
substituteInPlace pymoo/config.py \
--replace-fail "https://raw.githubusercontent.com/anyoptimization/pymoo-data/main/" \
diff --git a/pkgs/development/python-modules/pymumble/default.nix b/pkgs/development/python-modules/pymumble/default.nix
index bc15652d7027..e6214b6a9023 100644
--- a/pkgs/development/python-modules/pymumble/default.nix
+++ b/pkgs/development/python-modules/pymumble/default.nix
@@ -7,29 +7,28 @@
pytestCheckHook,
pycrypto,
pythonOlder,
+ setuptools,
}:
-buildPythonPackage rec {
+buildPythonPackage {
pname = "pymumble";
- version = "1.6.1"; # Don't upgrade to 1.7, version was yanked
- format = "setuptools";
+ version = "unstable-2024-10-20";
+ pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
- owner = "azlux";
+ owner = "tjni";
repo = "pymumble";
- rev = "refs/tags/${version}";
- hash = "sha256-+sT5pqdm4A2rrUcUUmvsH+iazg80+/go0zM1vr9oeuE=";
+ rev = "3241e84e5ce162a20597e4df6a9c443122357fec";
+ hash = "sha256-9lfWvfrS+vUFTf9jo4T+VHkm9u/hVjsDszLBQIEZVcQ=";
};
- postPatch = ''
- # Changes all `library==x.y.z` statements to just `library`
- # So that we aren't constrained to a specific version
- sed -i 's/\(.*\)==.*/\1/' requirements.txt
- '';
+ build-system = [
+ setuptools
+ ];
- propagatedBuildInputs = [
+ dependencies = [
opuslib
protobuf
];
@@ -46,9 +45,11 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library to create mumble bots";
- homepage = "https://github.com/azlux/pymumble";
- changelog = "https://github.com/azlux/pymumble/releases/tag/${version}";
+ homepage = "https://github.com/tjni/pymumble";
license = licenses.gpl3Only;
- maintainers = with maintainers; [ thelegy ];
+ maintainers = with maintainers; [
+ thelegy
+ tjni
+ ];
};
}
diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix
index 14ce4a0de929..e7ff03c15a49 100644
--- a/pkgs/development/python-modules/pynetbox/default.nix
+++ b/pkgs/development/python-modules/pynetbox/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pynetbox";
- version = "7.4.0";
+ version = "7.4.1";
pyproject = true;
src = fetchFromGitHub {
owner = "netbox-community";
repo = "pynetbox";
rev = "refs/tags/v${version}";
- hash = "sha256-JOUgQvOtvXRDM79Sp472OHPh1YEoA82T3R9aZFes8SI=";
+ hash = "sha256-pP4DEHf4Dj3sQ7qx7tU0B0PaMCuzUM9R2pIYRI1Fpso=";
};
build-system = [
diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix
index 6356eeb9637f..b1bf34abd489 100644
--- a/pkgs/development/python-modules/pyqt/6.x.nix
+++ b/pkgs/development/python-modules/pyqt/6.x.nix
@@ -130,7 +130,6 @@ buildPythonPackage rec {
dontConfigure = true;
# Checked using pythonImportsCheck, has no tests
- doCheck = true;
pythonImportsCheck =
[
diff --git a/pkgs/development/python-modules/pyqt6-webengine/default.nix b/pkgs/development/python-modules/pyqt6-webengine/default.nix
index 5ea0b8b1941d..59a2a1eeab86 100644
--- a/pkgs/development/python-modules/pyqt6-webengine/default.nix
+++ b/pkgs/development/python-modules/pyqt6-webengine/default.nix
@@ -73,7 +73,6 @@ buildPythonPackage rec {
dontConfigure = true;
# Checked using pythonImportsCheck, has no tests
- doCheck = true;
pythonImportsCheck = [
"PyQt6.QtWebEngineCore"
diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix
index 667ba0390323..54a79bff3909 100644
--- a/pkgs/development/python-modules/pysc2/default.nix
+++ b/pkgs/development/python-modules/pysc2/default.nix
@@ -3,7 +3,6 @@
lib,
fetchFromGitHub,
absl-py,
- enum34,
future,
mock,
mpyq,
@@ -40,7 +39,6 @@ buildPythonPackage {
propagatedBuildInputs = [
absl-py
- enum34
future
mock
mpyq
diff --git a/pkgs/development/python-modules/pyspf/default.nix b/pkgs/development/python-modules/pyspf/default.nix
index 8e69a942665f..cdedf35b93a5 100644
--- a/pkgs/development/python-modules/pyspf/default.nix
+++ b/pkgs/development/python-modules/pyspf/default.nix
@@ -2,7 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
- pydns,
+ py3dns,
}:
buildPythonPackage rec {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "0bmimlmwrq9glnjc4i6pwch30n3y5wyqmkjfyayxqxkfrixqwydi";
};
- propagatedBuildInputs = [ pydns ];
+ propagatedBuildInputs = [ py3dns ];
# requires /etc/resolv.conf to exist
doCheck = false;
diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix
index 1cc1d8f5d180..7cec1417bfc8 100644
--- a/pkgs/development/python-modules/pytapo/default.nix
+++ b/pkgs/development/python-modules/pytapo/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pytapo";
- version = "3.3.30";
+ version = "3.3.32";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-zSeDeGD/78bIoKm6B8BN4qWQE1ivNgyvnrGtgsekM3M=";
+ hash = "sha256-OYRcgX30O0/F+0H4x2jbPyVNh6xVeBSdfqbtuqUgoNE=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pytest-ruff/default.nix b/pkgs/development/python-modules/pytest-ruff/default.nix
new file mode 100644
index 000000000000..0d9239e7114f
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-ruff/default.nix
@@ -0,0 +1,55 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+
+ # build-system
+ poetry-core,
+ poetry-dynamic-versioning,
+
+ # dependencies
+ pytest,
+ ruff,
+
+ # tests
+ pytestCheckHook,
+ pytest-mock,
+}:
+
+buildPythonPackage rec {
+ pname = "pytest-ruff";
+ version = "0.4.1";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "businho";
+ repo = "pytest-ruff";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-Ol+W5mDGMCwptuBa0b+Plkm64UUBf9bmr9YBo8g93Ok=";
+ };
+
+ build-system = [
+ poetry-core
+ poetry-dynamic-versioning
+ ];
+
+ dependencies = [
+ pytest
+ ruff
+ ];
+
+ nativeCheckInputs = [
+ pytestCheckHook
+ pytest-mock
+ ];
+
+ pythonImportsCheck = [ "pytest_ruff" ];
+
+ meta = {
+ description = "A pytest plugin to run ruff";
+ homepage = "https://github.com/businho/pytest-ruff";
+ changelog = "https://github.com/businho/pytest-ruff/releases/tag/v${version}";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ baloo ];
+ };
+}
diff --git a/pkgs/development/python-modules/python-barbicanclient/default.nix b/pkgs/development/python-modules/python-barbicanclient/default.nix
index 7188c8381605..9c65649a2336 100644
--- a/pkgs/development/python-modules/python-barbicanclient/default.nix
+++ b/pkgs/development/python-modules/python-barbicanclient/default.nix
@@ -60,8 +60,6 @@ buildPythonPackage rec {
requests
];
- doCheck = true;
-
nativeCheckInputs = [
requests-mock
stestr
diff --git a/pkgs/development/python-modules/python-glanceclient/default.nix b/pkgs/development/python-modules/python-glanceclient/default.nix
index ad872d465fa9..dc456f383e11 100644
--- a/pkgs/development/python-modules/python-glanceclient/default.nix
+++ b/pkgs/development/python-modules/python-glanceclient/default.nix
@@ -24,12 +24,20 @@ let
pname = "python-glanceclient";
version = "4.7.0";
+ # Skip tests which require networking.
disabledTests = [
"test_http_chunked_response"
"test_v1_download_has_no_stray_output_to_stdout"
"test_v2_requests_valid_cert_verification"
"test_download_has_no_stray_output_to_stdout"
+ "test_v1_requests_cert_verification_no_compression"
+ "test_v1_requests_cert_verification"
"test_v2_download_has_no_stray_output_to_stdout"
+ "test_v2_requests_bad_ca"
+ "test_v2_requests_bad_cert"
+ "test_v2_requests_cert_verification_no_compression"
+ "test_v2_requests_cert_verification"
+ "test_v2_requests_valid_cert_no_key"
"test_v2_requests_valid_cert_verification_no_compression"
"test_log_request_id_once"
];
diff --git a/pkgs/development/python-modules/python-linkplay/default.nix b/pkgs/development/python-modules/python-linkplay/default.nix
index 7a0cc917a6bc..3efb6a31b201 100644
--- a/pkgs/development/python-modules/python-linkplay/default.nix
+++ b/pkgs/development/python-modules/python-linkplay/default.nix
@@ -15,20 +15,18 @@
buildPythonPackage rec {
pname = "python-linkplay";
- version = "0.0.15";
+ version = "0.0.16";
pyproject = true;
src = fetchFromGitHub {
owner = "Velleman";
repo = "python-linkplay";
rev = "refs/tags/v${version}";
- hash = "sha256-PDkDZchAXxrmjg7G/dbbUyZUS8dNrOppH96mLLdwK1s=";
+ hash = "sha256-YjsRjzkYac3IDuAq5s73INELNfWO6EhU5BMM7xQO7pk=";
};
build-system = [ setuptools ];
- pythonRelaxDeps = [ "aiofiles" ];
-
dependencies = [
aiofiles
aiohttp
diff --git a/pkgs/development/python-modules/python-musicpd/default.nix b/pkgs/development/python-modules/python-musicpd/default.nix
index 0d75cc30454f..e5ed4cd9b2b3 100644
--- a/pkgs/development/python-modules/python-musicpd/default.nix
+++ b/pkgs/development/python-modules/python-musicpd/default.nix
@@ -18,8 +18,6 @@ buildPythonPackage rec {
build-system = [ setuptools ];
- doCheck = true;
-
meta = with lib; {
description = "MPD (Music Player Daemon) client library written in pure Python";
homepage = "https://gitlab.com/kaliko/python-musicpd";
diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix
index 3fa1de5b4e21..2933fa619b55 100644
--- a/pkgs/development/python-modules/python-openstackclient/default.nix
+++ b/pkgs/development/python-modules/python-openstackclient/default.nix
@@ -22,6 +22,7 @@
python-watcherclient,
python-zaqarclient,
python-zunclient,
+ pythonOlder,
requests-mock,
requests,
setuptools,
@@ -33,12 +34,14 @@
buildPythonPackage rec {
pname = "python-openstackclient";
- version = "7.1.2";
+ version = "7.2.0";
pyproject = true;
+ disabled = pythonOlder "3.9";
+
src = fetchPypi {
inherit pname version;
- hash = "sha256-hLbxcm/LkqMU2dyTMYhIB12iR7eYMUhC0bFS8zZEGl0=";
+ hash = "sha256-9je3W78PU3iZJjzVMSPXPxBZ0vMYY5xSLJA9zBJ7O5I=";
};
build-system = [
diff --git a/pkgs/development/python-modules/python-poppler/default.nix b/pkgs/development/python-modules/python-poppler/default.nix
new file mode 100644
index 000000000000..85609035f009
--- /dev/null
+++ b/pkgs/development/python-modules/python-poppler/default.nix
@@ -0,0 +1,58 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchPypi,
+ pythonOlder,
+ pytestCheckHook,
+ setuptools,
+ meson-python,
+ ninja,
+ meson,
+ poppler,
+ pkg-config,
+ pybind11,
+}:
+
+buildPythonPackage rec {
+ pname = "python-poppler";
+ version = "0.4.1";
+ pyproject = true;
+
+ disabled = pythonOlder "3.6";
+
+ src = fetchPypi {
+ inherit version;
+ pname = "python_poppler";
+ hash = "sha256-5spcI+wCNQvyzvhaa/nxsmF5ZDbbR4F2+dJPsU7uzGo=";
+ };
+
+ patches = [
+ # Prevent Meson from downloading pybind11, use system version instead
+ ./use_system_pybind11.patch
+ ];
+
+ build-system = [ meson-python ];
+
+ buildInputs = [ pybind11 ];
+
+ nativeBuildInputs = [
+ ninja
+ pkg-config
+ ];
+
+ propagatedBuildInputs = [ poppler ];
+
+ nativeCheckInputs = [ pytestCheckHook ];
+
+ pythonImportCheck = [ "poppler" ];
+
+ meta = {
+ description = "Python binding to poppler-cpp";
+ homepage = "https://github.com/cbrunet/python-poppler";
+ changelog = "https://cbrunet.net/python-poppler/changelog.html";
+ # Contradictory license definition
+ # https://github.com/cbrunet/python-poppler/issues/90
+ license = lib.licenses.gpl2Plus;
+ maintainers = [ lib.maintainers.onny ];
+ };
+}
diff --git a/pkgs/development/python-modules/python-poppler/use_system_pybind11.patch b/pkgs/development/python-modules/python-poppler/use_system_pybind11.patch
new file mode 100644
index 000000000000..a84d26e85a23
--- /dev/null
+++ b/pkgs/development/python-modules/python-poppler/use_system_pybind11.patch
@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index c1ac57a..1d1ad1f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -13,7 +13,6 @@ poppler_dep = dependency('poppler-cpp', version: '>=0.26.0')
+ python_mod = import('python')
+ python3 = python_mod.find_installation('python3', pure: false)
+
+-pybind11_proj = subproject('pybind11')
+-pybind11_dep = pybind11_proj.get_variable('pybind11_dep')
++pybind11_dep = dependency('pybind11')
+
+ subdir('src')
diff --git a/pkgs/development/python-modules/python-troveclient/default.nix b/pkgs/development/python-modules/python-troveclient/default.nix
index 891a907e55bf..05d5ce033cea 100644
--- a/pkgs/development/python-modules/python-troveclient/default.nix
+++ b/pkgs/development/python-modules/python-troveclient/default.nix
@@ -20,11 +20,12 @@
sphinxcontrib-apidoc,
sphinxHook,
stestr,
+ stevedore,
}:
buildPythonPackage rec {
pname = "python-troveclient";
- version = "8.5.0";
+ version = "8.6.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -33,7 +34,7 @@ buildPythonPackage rec {
owner = "openstack";
repo = "python-troveclient";
rev = "refs/tags/${version}";
- hash = "sha256-lfnAmQ/IxEdc+XxC0dYxK2FgY7csNewGPuQuq0dNffM=";
+ hash = "sha256-6JviPG2ikKRqvW/eqPIHMvpV6GjqbaXYHhcOOpaIS4U=";
};
env.PBR_VERSION = version;
@@ -61,6 +62,7 @@ buildPythonPackage rec {
python-openstackclient
python-swiftclient
requests
+ stevedore
];
nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/python-watcherclient/default.nix b/pkgs/development/python-modules/python-watcherclient/default.nix
index b3cc4267f30c..05b2d315d2af 100644
--- a/pkgs/development/python-modules/python-watcherclient/default.nix
+++ b/pkgs/development/python-modules/python-watcherclient/default.nix
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "python-watcherclient";
- version = "4.4.0";
+ version = "4.5.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -66,7 +66,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "watcherclient" ];
meta = {
- homepage = "https://opendev.org/openstack/python-watcherclient";
+ homepage = "https://github.com/openstack/python-watcherclient";
description = "Client library for OpenStack Watcher API";
license = lib.licenses.asl20;
mainProgram = "watcher";
diff --git a/pkgs/development/python-modules/python-zaqarclient/default.nix b/pkgs/development/python-modules/python-zaqarclient/default.nix
index ee8c99b6b642..84c70240cc7d 100644
--- a/pkgs/development/python-modules/python-zaqarclient/default.nix
+++ b/pkgs/development/python-modules/python-zaqarclient/default.nix
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "python-zaqarclient";
- version = "2.7.0";
+ version = "2.8.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "openstack";
repo = "python-zaqarclient";
rev = "refs/tags/${version}";
- hash = "sha256-WphTlqhrwxg5g88NH1W4b3uLAxLImnS34hDrlJjWeEU=";
+ hash = "sha256-vfu1GYd9eoVpmBtlnRTiqpiqlgxqPnwpFC9YC1UuvLM=";
};
env.PBR_VERSION = version;
@@ -74,7 +74,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "zaqarclient" ];
meta = {
- homepage = "https://opendev.org/openstack/python-zaqarclient";
+ homepage = "https://github.com/openstack/python-zaqarclient";
description = "Client library for OpenStack Zaqar API";
license = lib.licenses.asl20;
maintainers = lib.teams.openstack.members;
diff --git a/pkgs/development/python-modules/python-zunclient/default.nix b/pkgs/development/python-modules/python-zunclient/default.nix
index f538cdbac638..a9f62457090d 100644
--- a/pkgs/development/python-modules/python-zunclient/default.nix
+++ b/pkgs/development/python-modules/python-zunclient/default.nix
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "python-zunclient";
- version = "5.0.0";
+ version = "5.1.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "openstack";
repo = "python-zunclient";
rev = "refs/tags/${version}";
- hash = "sha256-EVfrxSc/eHYZR0FGFnNAxFCiXangt8uRkAC2zpwWqcA=";
+ hash = "sha256-2gC2aMaMI//QKIpbDNT9cii17680g4X1c0rgrgPbAsg=";
};
env.PBR_VERSION = version;
@@ -83,7 +83,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "zunclient" ];
meta = {
- homepage = "https://opendev.org/openstack/python-zunclient";
+ homepage = "https://github.com/openstack/python-zunclient";
description = "Client library for OpenStack Zun API";
license = lib.licenses.asl20;
mainProgram = "zun";
diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix
index 94810bfac05d..1b7af821ade9 100644
--- a/pkgs/development/python-modules/pytibber/default.nix
+++ b/pkgs/development/python-modules/pytibber/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pytibber";
- version = "0.30.2";
+ version = "0.30.3";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pyTibber";
rev = "refs/tags/${version}";
- hash = "sha256-9Tnn68RxKwEruYEGo2pZQTQTlYnVMfa3MRzA55HlBRc=";
+ hash = "sha256-4MkREdeYqAA+MpM9JQyiVVDPpefVTNT0x0ptR33K6yU=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pytorch3d/default.nix b/pkgs/development/python-modules/pytorch3d/default.nix
new file mode 100644
index 000000000000..2a92a51ec8bf
--- /dev/null
+++ b/pkgs/development/python-modules/pytorch3d/default.nix
@@ -0,0 +1,71 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ setuptools,
+ wheel,
+ torch,
+ iopath,
+ cudaPackages,
+ config,
+ cudaSupport ? config.cudaSupport,
+}:
+
+assert cudaSupport -> torch.cudaSupport;
+
+buildPythonPackage rec {
+ pname = "pytorch3d";
+ version = "0.7.8";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "facebookresearch";
+ repo = "pytorch3d";
+ rev = "V${version}";
+ hash = "sha256-DEEWWfjwjuXGc0WQInDTmtnWSIDUifyByxdg7hpdHlo=";
+ };
+
+ nativeBuildInputs = lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
+ build-system = [
+ setuptools
+ wheel
+ ];
+ dependencies = [
+ torch
+ iopath
+ ];
+ buildInputs = [ (lib.getOutput "cxxdev" torch) ];
+
+ env =
+ {
+ FORCE_CUDA = cudaSupport;
+ }
+ // lib.optionalAttrs cudaSupport {
+ TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" torch.cudaCapabilities}";
+ };
+
+ pythonImportsCheck = [ "pytorch3d" ];
+
+ passthru.tests.rotations-cuda =
+ cudaPackages.writeGpuTestPython { libraries = ps: [ ps.pytorch3d ]; }
+ ''
+ import pytorch3d.transforms as p3dt
+
+ M = p3dt.random_rotations(n=10, device="cuda")
+ assert "cuda" in M.device.type
+ angles = p3dt.matrix_to_euler_angles(M, "XYZ")
+ assert "cuda" in angles.device.type
+ assert angles.shape == (10, 3), angles.shape
+ print(angles)
+ '';
+
+ meta = {
+ description = "FAIR's library of reusable components for deep learning with 3D data";
+ homepage = "https://github.com/facebookresearch/pytorch3d";
+ license = lib.licenses.bsd3;
+ maintainers = with lib.maintainers; [
+ pbsds
+ SomeoneSerge
+ ];
+ };
+}
diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index 8a415a02344d..eb0b5a212c60 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyvex";
- version = "9.2.124";
+ version = "9.2.126";
pyproject = true;
disabled = pythonOlder "3.11";
src = fetchPypi {
inherit pname version;
- hash = "sha256-8hjgwsJz1jj9POnHj5Im30Hjxi4wYmCwIv5wcu6SY8c=";
+ hash = "sha256-bi4DKqT+MFLCJgVN+EegED0d6XbUuZ2GS/vsHU6FMgw=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyvirtualdisplay/default.nix b/pkgs/development/python-modules/pyvirtualdisplay/default.nix
index 0574c5706338..fcbb8c0de00b 100644
--- a/pkgs/development/python-modules/pyvirtualdisplay/default.nix
+++ b/pkgs/development/python-modules/pyvirtualdisplay/default.nix
@@ -1,16 +1,28 @@
{
lib,
+ stdenv,
buildPythonPackage,
fetchPypi,
+ substituteAll,
+ xorg,
+
+ # build-system
+ setuptools,
+
+ # tests
easyprocess,
+ entrypoint2,
+ pillow,
+ psutil,
+ pytest-xdist,
+ pytestCheckHook,
+ vncdo,
}:
buildPythonPackage rec {
pname = "pyvirtualdisplay";
version = "3.0";
- format = "setuptools";
-
- propagatedBuildInputs = [ easyprocess ];
+ pyproject = true;
src = fetchPypi {
pname = "PyVirtualDisplay";
@@ -18,8 +30,30 @@ buildPythonPackage rec {
hash = "sha256-CXVbw86263JfsH7KVCX0PyNY078I4A0qm3kqGu3RYVk=";
};
- # requires X server
- doCheck = false;
+ patches = lib.optionals stdenv.isLinux [
+ (substituteAll {
+ src = ./paths.patch;
+ xauth = lib.getExe xorg.xauth;
+ xdpyinfo = lib.getExe xorg.xdpyinfo;
+ })
+ ];
+
+ build-system = [ setuptools ];
+
+ doCheck = stdenv.isLinux;
+
+ nativeCheckInputs = [
+ easyprocess
+ entrypoint2
+ pillow
+ psutil
+ pytest-xdist
+ pytestCheckHook
+ (vncdo.overridePythonAttrs { doCheck = false; })
+ xorg.xorgserver
+ xorg.xmessage
+ xorg.xvfb
+ ];
meta = with lib; {
description = "Python wrapper for Xvfb, Xephyr and Xvnc";
diff --git a/pkgs/development/python-modules/pyvirtualdisplay/paths.patch b/pkgs/development/python-modules/pyvirtualdisplay/paths.patch
new file mode 100644
index 000000000000..d447cd622802
--- /dev/null
+++ b/pkgs/development/python-modules/pyvirtualdisplay/paths.patch
@@ -0,0 +1,35 @@
+diff --git a/pyvirtualdisplay/abstractdisplay.py b/pyvirtualdisplay/abstractdisplay.py
+index dd93943..c694209 100644
+--- a/pyvirtualdisplay/abstractdisplay.py
++++ b/pyvirtualdisplay/abstractdisplay.py
+@@ -242,7 +242,7 @@ class AbstractDisplay(object):
+
+ try:
+ xdpyinfo = subprocess.Popen(
+- ["xdpyinfo"],
++ ["@xdpyinfo@"],
+ env=self._env(),
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE,
+diff --git a/pyvirtualdisplay/xauth.py b/pyvirtualdisplay/xauth.py
+index ce0f804..7734e21 100644
+--- a/pyvirtualdisplay/xauth.py
++++ b/pyvirtualdisplay/xauth.py
+@@ -14,7 +14,7 @@ def is_installed():
+ """
+ try:
+ xauth = subprocess.Popen(
+- ["xauth", "-V"],
++ ["@xauth@", "-V"],
+ # env=self._env(),
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE,
+@@ -43,7 +43,7 @@ def call(*args):
+ Call xauth with the given args.
+ """
+ xauth = subprocess.Popen(
+- ["xauth"] + list(args),
++ ["@xauth@"] + list(args),
+ # env=self._env(),
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE,
diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix
index f5f79271998c..fbab09765810 100644
--- a/pkgs/development/python-modules/pyvo/default.nix
+++ b/pkgs/development/python-modules/pyvo/default.nix
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "pyvo";
- version = "1.5.2";
+ version = "1.5.3";
pyproject = true;
disabled = pythonOlder "3.8"; # according to setup.cfg
src = fetchPypi {
inherit pname version;
- hash = "sha256-uKJMRNrOXGB7HZOv0CV9FfoQnx6GV3I0fqlJ7qAcj3E=";
+ hash = "sha256-/ShNDoT1KucV4YVUeUz8BP33nsQF4YlpvbFs6vCxmH4=";
};
build-system = [
diff --git a/pkgs/development/python-modules/pyytlounge/default.nix b/pkgs/development/python-modules/pyytlounge/default.nix
index 2ec7c3255562..bbb3ba23163f 100644
--- a/pkgs/development/python-modules/pyytlounge/default.nix
+++ b/pkgs/development/python-modules/pyytlounge/default.nix
@@ -13,6 +13,7 @@
buildPythonPackage rec {
pname = "pyytlounge";
version = "2.1.1";
+ pyproject = true;
src = fetchFromGitHub {
owner = "FabioGNR";
@@ -21,10 +22,6 @@ buildPythonPackage rec {
hash = "sha256-0QPa3EzOBv5fuw3FGgmoN4KiC4KHo1Z+Svjcneoe0pc=";
};
- pyproject = true;
-
- doCheck = true;
-
build-system = [ hatchling ];
dependencies = [ aiohttp ];
diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix
index 34984ec5755e..9d903f4fe064 100644
--- a/pkgs/development/python-modules/qcs-api-client/default.nix
+++ b/pkgs/development/python-modules/qcs-api-client/default.nix
@@ -50,6 +50,7 @@ buildPythonPackage rec {
"httpx"
"iso8601"
"pydantic"
+ "tenacity"
];
build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/quadprog/default.nix b/pkgs/development/python-modules/quadprog/default.nix
index d592c443e1d5..17faac7d13d4 100644
--- a/pkgs/development/python-modules/quadprog/default.nix
+++ b/pkgs/development/python-modules/quadprog/default.nix
@@ -12,16 +12,16 @@
buildPythonPackage rec {
pname = "quadprog";
- version = "0.1.12";
+ version = "0.1.13";
pyproject = true;
- disabled = pythonOlder "3.8";
+ disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "quadprog";
repo = "quadprog";
rev = "v${version}";
- hash = "sha256-3S846PaNfZ4j3r6Vi2o6+Jk+2kC/P7tMSQQiB/Kx8nI=";
+ hash = "sha256-8gPuqDY3ajw/+B6kJdtpq+HL+Oq2Nsy/O7m+IWzxP38=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/quart/default.nix b/pkgs/development/python-modules/quart/default.nix
index 0388b58a34c9..17c7a65ec387 100644
--- a/pkgs/development/python-modules/quart/default.nix
+++ b/pkgs/development/python-modules/quart/default.nix
@@ -32,14 +32,14 @@
buildPythonPackage rec {
pname = "quart";
- version = "0.19.6";
+ version = "0.19.8";
pyproject = true;
src = fetchFromGitHub {
owner = "pallets";
repo = "quart";
rev = "refs/tags/${version}";
- hash = "sha256-oR03Qu93F+pcWywbdYgMKIAdohBNezlGz04ws3yGAxs=";
+ hash = "sha256-A23+25bDzK2GlGNTCul6HbsjNujrnhpzTxdnV3Ig028=";
};
build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/radios/default.nix b/pkgs/development/python-modules/radios/default.nix
index 241e95a18985..ee5d92533524 100644
--- a/pkgs/development/python-modules/radios/default.nix
+++ b/pkgs/development/python-modules/radios/default.nix
@@ -15,12 +15,13 @@
yarl,
aresponses,
pytest-asyncio,
+ pytest-cov-stub,
pytestCheckHook,
}:
buildPythonPackage rec {
pname = "radios";
- version = "0.3.1";
+ version = "0.3.2";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -28,23 +29,20 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "frenck";
repo = "python-radios";
- rev = "v${version}";
- hash = "sha256-c0zfpfEdZvjvKtwGcNLLgEkBihhtz/wouHuYRLCxtBY=";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-GXiLwwjZ/pN3HquzLLWq/2EfhmrJyCXq0sovIGRB3uQ=";
};
postPatch = ''
substituteInPlace pyproject.toml \
- --replace "0.0.0" "${version}" \
- --replace "--cov" ""
+ --replace-fail 'version = "0.0.0"' 'version = "${version}"'
'';
- nativeBuildInputs = [
+ build-system = [
poetry-core
];
- pythonRelaxDeps = [ "pycountry" ];
-
- propagatedBuildInputs = [
+ dependencies = [
aiodns
aiohttp
awesomeversion
@@ -59,6 +57,7 @@ buildPythonPackage rec {
nativeCheckInputs = [
aresponses
pytest-asyncio
+ pytest-cov-stub
pytestCheckHook
];
diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix
index abbd2eef7ef5..30dd05cffbdd 100644
--- a/pkgs/development/python-modules/rasterio/default.nix
+++ b/pkgs/development/python-modules/rasterio/default.nix
@@ -86,8 +86,6 @@ buildPythonPackage rec {
shapely
];
- doCheck = true;
-
preCheck = ''
rm -r rasterio # prevent importing local rasterio
'';
diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix
index 248f212f0abe..ec98f19c271f 100644
--- a/pkgs/development/python-modules/rdkit/default.nix
+++ b/pkgs/development/python-modules/rdkit/default.nix
@@ -30,8 +30,8 @@ let
yaehmop = fetchFromGitHub {
owner = "greglandrum";
repo = "yaehmop";
- rev = "v2023.03.1";
- hash = "sha256-K9//cDN69U4sLETfIZq9NUaBE3RXOReH53qfiCzutqM=";
+ rev = "v2024.03.1";
+ hash = "sha256-rhR7Ev+9Fk/Ks7R2x2SjWu1L/48a4zHDHUBohx1Dw/M=";
};
freesasa = fetchFromGitHub {
owner = "mittinatten";
@@ -39,11 +39,18 @@ let
rev = "2.0.3";
hash = "sha256-7E+imvfDAJFnXQRWb5hNaSu+Xrf9NXeIKc9fl+o3yHQ=";
};
+ pubchem-align3d = fetchFromGitHub {
+ owner = "ncbi";
+ repo = "pubchem-align3d";
+ rev = "daefab3dd0c90ca56da9d3d5e375fe4d651e6be3";
+ hash = "sha256-tQB4wqza9rlSoy4Uj9bA99ddawjxGyN9G7DYbcv/Qdo=";
+ };
};
+ boost' = boost.override { enableNumpy = true; };
in
buildPythonPackage rec {
pname = "rdkit";
- version = "2023.09.5";
+ version = "2024.09.1";
pyproject = false;
src =
@@ -51,10 +58,10 @@ buildPythonPackage rec {
versionTag = lib.replaceStrings [ "." ] [ "_" ] version;
in
fetchFromGitHub {
- owner = pname;
- repo = pname;
+ owner = "rdkit";
+ repo = "rdkit";
rev = "Release_${versionTag}";
- hash = "sha256-ZYNAHNBHQPx8rBJSvEWFEpdSpYyXcoqJ+nBA7tpHwQs=";
+ hash = "sha256-UsyPlAJ8FISblF8szEmRqWansunIhW/gbEBZx13YM+A=";
};
unpackPhase = ''
@@ -74,6 +81,7 @@ buildPythonPackage rec {
chmod +w External/FreeSASA/freesasa/src
cp External/FreeSASA/freesasa2.c External/FreeSASA/freesasa/src
+ ln -s ${external.pubchem-align3d} External/pubchem_shape/pubchem-align3d
ln -s ${rapidjson} External/rapidjson-1.1.0
ln -s ${comic-neue}/share/fonts/truetype/ComicNeue-Regular.ttf Data/Fonts/
'';
@@ -81,12 +89,16 @@ buildPythonPackage rec {
nativeBuildInputs = [ cmake ];
buildInputs = [
- boost
+ boost'
cairo
catch2_3
+ coordgenlibs
+ eigen
+ inchi
+ maeparser
] ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook ];
- propagatedBuildInputs = [
+ dependencies = [
numpy
pandas
pillow
@@ -94,45 +106,29 @@ buildPythonPackage rec {
hardeningDisable = [ "format" ]; # required by yaehmop
- dontUseSetuptoolsBuild = true;
- dontUsePipInstall = true;
- dontUseSetuptoolsCheck = true;
-
- preConfigure = ''
- # Since we can't expand with bash in cmakeFlags
- appendToVar cmakeFlags "-DPYTHON_NUMPY_INCLUDE_PATH=$(${python}/bin/python -c 'import numpy; print(numpy.get_include())')"
- appendToVar cmakeFlags "-DFREESASA_DIR=$PWD/External/FreeSASA/freesasa"
- appendToVar cmakeFlags "-DFREESASA_SRC_DIR=$PWD/External/FreeSASA/freesasa"
- appendToVar cmakeFlags "-DAVALONTOOLS_DIR=$PWD/External/AvalonTools/avalon"
- '';
-
cmakeFlags = [
- "-DINCHI_LIBRARY=${inchi}/lib/libinchi.so"
- "-DINCHI_LIBRARIES=${inchi}/lib/libinchi.so"
- "-DINCHI_INCLUDE_DIR=${inchi}/include/inchi"
- "-DEIGEN3_INCLUDE_DIR=${eigen}/include/eigen3"
- "-DRDK_INSTALL_INTREE=OFF"
- "-DRDK_INSTALL_STATIC_LIBS=OFF"
- "-DRDK_BUILD_INCHI_SUPPORT=ON"
- "-DRDK_BUILD_AVALON_SUPPORT=ON"
- "-DRDK_BUILD_FREESASA_SUPPORT=ON"
- "-DRDK_BUILD_YAEHMOP_SUPPORT=ON"
- "-DRDK_BUILD_MAEPARSER_SUPPORT=ON"
- "-DMAEPARSER_DIR=${maeparser}"
- "-DRDK_BUILD_COORDGEN_SUPPORT=ON"
- "-DCOORDGEN_DIR=${coordgenlibs}"
- "-DRDK_USE_URF=OFF"
- "-DRDK_USE_FLEXBISON=OFF"
- "-DRDK_BUILD_CAIRO_SUPPORT=ON"
- "-DRDK_BUILD_THREADSAFE_SSS=ON"
- "-DRDK_TEST_MULTITHREADED=ON"
- "-DRDK_BUILD_CPP_TESTS=ON"
- "-DRDK_TEST_MULTITHREADED=ON"
- "-DPYTHON_EXECUTABLE=${python}/bin/python"
- "-DBOOST_ROOT=${boost}"
- "-DBoost_NO_SYSTEM_PATHS=ON"
- "-DBoost_NO_BOOST_CMAKE=TRUE"
- "-DCMAKE_SKIP_BUILD_RPATH=ON" # fails to find libs in pythonImportsCheckPhase otherwise
+ (lib.cmakeBool "Boost_NO_BOOST_CMAKE" true)
+ (lib.cmakeBool "Boost_NO_SYSTEM_PATHS" true)
+ (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) # fails to find libs in pythonImportsCheckPhase otherwise
+ (lib.cmakeBool "RDK_BUILD_AVALON_SUPPORT" true)
+ (lib.cmakeBool "RDK_BUILD_CAIRO_SUPPORT" true)
+ (lib.cmakeBool "RDK_BUILD_COORDGEN_SUPPORT" true)
+ (lib.cmakeBool "RDK_BUILD_CPP_TESTS" true)
+ (lib.cmakeBool "RDK_BUILD_FREESASA_SUPPORT" true)
+ (lib.cmakeBool "RDK_BUILD_INCHI_SUPPORT" true)
+ (lib.cmakeBool "RDK_BUILD_MAEPARSER_SUPPORT" true)
+ (lib.cmakeBool "RDK_BUILD_THREADSAFE_SSS" true)
+ (lib.cmakeBool "RDK_BUILD_YAEHMOP_SUPPORT" true)
+ (lib.cmakeBool "RDK_INSTALL_INTREE" false)
+ (lib.cmakeBool "RDK_INSTALL_STATIC_LIBS" false)
+ (lib.cmakeBool "RDK_TEST_MULTITHREADED" true)
+ (lib.cmakeBool "RDK_TEST_MULTITHREADED" true)
+ (lib.cmakeBool "RDK_USE_FLEXBISON" false)
+ (lib.cmakeBool "RDK_USE_URF" false)
+ (lib.cmakeFeature "AVALONTOOLS_DIR" "avalon")
+ (lib.cmakeFeature "FREESASA_SRC_DIR" "freesasa")
+ (lib.cmakeFeature "INCHI_INCLUDE_DIR" "${inchi}/include/inchi")
+ (lib.cmakeFeature "PUBCHEMSHAPE_DIR" "External/pubchem_shape/pubchem-align3d")
];
checkPhase = ''
diff --git a/pkgs/development/python-modules/reflex-chakra/default.nix b/pkgs/development/python-modules/reflex-chakra/default.nix
index 49b893a9b2bb..866aa775b7f5 100644
--- a/pkgs/development/python-modules/reflex-chakra/default.nix
+++ b/pkgs/development/python-modules/reflex-chakra/default.nix
@@ -8,16 +8,16 @@
buildPythonPackage rec {
pname = "reflex-chakra";
- version = "0.6.1";
+ version = "0.6.2";
pyproject = true;
- disabled = pythonOlder "3.8";
+ disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "reflex-dev";
repo = "reflex-chakra";
rev = "refs/tags/v${version}";
- hash = "sha256-nmZ41V/1TbslAQIkJQLgdLfWS2qSVrAnVqbv8sajL5c=";
+ hash = "sha256-VMFCaJh7HA/bsOV1ONuPJCzhzpQrcppOnPIcIIpeaSs=";
};
pythonRemoveDeps = [
diff --git a/pkgs/development/python-modules/remctl/default.nix b/pkgs/development/python-modules/remctl/default.nix
new file mode 100644
index 000000000000..3e672e9e56d2
--- /dev/null
+++ b/pkgs/development/python-modules/remctl/default.nix
@@ -0,0 +1,21 @@
+{
+ lib,
+ buildPythonPackage,
+ pythonOlder,
+ remctl-c, # remctl from pkgs, not from pythonPackages
+ typing,
+}:
+
+buildPythonPackage {
+ inherit (remctl-c)
+ meta
+ pname
+ src
+ version
+ ;
+ setSourceRoot = "sourceRoot=$(echo */python)";
+
+ buildInputs = [ remctl-c ];
+
+ propagatedBuildInputs = lib.optionals (pythonOlder "3.5") [ typing ];
+}
diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix
index bdbf3209d74e..5c38529984da 100644
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@@ -13,16 +13,16 @@
buildPythonPackage rec {
pname = "reolink-aio";
- version = "0.10.0";
+ version = "0.10.1";
pyproject = true;
- disabled = pythonOlder "3.10";
+ disabled = pythonOlder "3.11";
src = fetchFromGitHub {
owner = "starkillerOG";
repo = "reolink_aio";
rev = "refs/tags/${version}";
- hash = "sha256-SuNY+H21rjO+iotDJymLI7JccQRoMnLX/YL05wQqlmc=";
+ hash = "sha256-xWufHYPXOSsW3DVg4GhvdiEtOZmdtpkPelg8d/3goh8=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/retry2/default.nix b/pkgs/development/python-modules/retry2/default.nix
new file mode 100644
index 000000000000..f0724f472a3c
--- /dev/null
+++ b/pkgs/development/python-modules/retry2/default.nix
@@ -0,0 +1,42 @@
+{
+ lib,
+ buildPythonPackage,
+ decorator,
+ fetchFromGitHub,
+ pbr,
+ pytestCheckHook,
+ pythonOlder,
+}:
+
+buildPythonPackage rec {
+ pname = "retry2";
+ version = "0.9.5";
+ pyproject = true;
+
+ disabled = pythonOlder "3.10";
+
+ src = fetchFromGitHub {
+ owner = "eSAMTrade";
+ repo = "retry";
+ rev = "refs/tags/${version}";
+ hash = "sha256-RxOEekkmMRl2OQW2scFWbMQiFXcH0sbd+k9R8uul0uY=";
+ };
+
+ env.PBR_VERSION = version;
+
+ build-system = [ pbr ];
+
+ dependencies = [ decorator ];
+
+ nativeCheckInputs = [ pytestCheckHook ];
+
+ pythonImportsCheck = [ "retry" ];
+
+ meta = {
+ description = "Retry decorator";
+ homepage = "https://github.com/eSAMTrade/retry";
+ changelog = "https://github.com/eSAMTrade/retry/blob/${src.rev}/ChangeLog";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/rouge-score/default.nix b/pkgs/development/python-modules/rouge-score/default.nix
index adc543b1d907..59d05016720c 100644
--- a/pkgs/development/python-modules/rouge-score/default.nix
+++ b/pkgs/development/python-modules/rouge-score/default.nix
@@ -52,8 +52,6 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
- doCheck = true;
-
disabledTests = [
# https://github.com/google-research/google-research/issues/1203
"testRougeLSumSentenceSplitting"
diff --git a/pkgs/development/python-modules/rstr/default.nix b/pkgs/development/python-modules/rstr/default.nix
index 7bf0eb244fb9..cf2a5ef42212 100644
--- a/pkgs/development/python-modules/rstr/default.nix
+++ b/pkgs/development/python-modules/rstr/default.nix
@@ -23,7 +23,6 @@ buildPythonPackage rec {
setuptools-scm
];
- doCheck = true;
nativeCheckInputs = [ unittestCheckHook ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/rtfde/default.nix b/pkgs/development/python-modules/rtfde/default.nix
index d436f19a45eb..6c8be8f8f5b7 100644
--- a/pkgs/development/python-modules/rtfde/default.nix
+++ b/pkgs/development/python-modules/rtfde/default.nix
@@ -26,6 +26,8 @@ buildPythonPackage rec {
build-system = [ setuptools ];
+ pythonRelaxDeps = [ "lark" ];
+
dependencies = [
lark
oletools
@@ -39,15 +41,15 @@ buildPythonPackage rec {
pythonImportsCheck = [ "RTFDE" ];
disabledTests = [
- # Content mismatch
- "test_bin_data_captured"
+ # Malformed encapsulated RTF discovered
+ "test_encoded_bytes_stay_encoded_character"
];
- meta = with lib; {
+ meta = {
+ changelog = "https://github.com/seamustuohy/RTFDE/releases/tag/${version}";
description = "Library for extracting encapsulated HTML and plain text content from the RTF bodies";
homepage = "https://github.com/seamustuohy/RTFDE";
- changelog = "https://github.com/seamustuohy/RTFDE/releases/tag/${version}";
- license = licenses.lgpl3Only;
- maintainers = with maintainers; [ fab ];
+ license = lib.licenses.lgpl3Only;
+ maintainers = with lib.maintainers; [ fab ];
};
}
diff --git a/pkgs/development/python-modules/ruff-api/Cargo.lock b/pkgs/development/python-modules/ruff-api/Cargo.lock
index e6be1c5b10f6..e6aabc596990 100644
--- a/pkgs/development/python-modules/ruff-api/Cargo.lock
+++ b/pkgs/development/python-modules/ruff-api/Cargo.lock
@@ -1548,7 +1548,7 @@ dependencies = [
[[package]]
name = "ruff-api"
-version = "0.0.8"
+version = "0.1.0"
dependencies = [
"glob",
"pyo3",
diff --git a/pkgs/development/python-modules/ruff-api/default.nix b/pkgs/development/python-modules/ruff-api/default.nix
index a363c4c7d32a..eb4e1234a57b 100644
--- a/pkgs/development/python-modules/ruff-api/default.nix
+++ b/pkgs/development/python-modules/ruff-api/default.nix
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "ruff-api";
- version = "0.0.8";
+ version = "0.1.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "amyreese";
repo = "ruff-api";
rev = "refs/tags/v${version}";
- hash = "sha256-BW/qXq4HemqxhvjIKrrn07eqGJwAbYei7e+I+oHxujU=";
+ hash = "sha256-1XULyxu3XujhAcFnvqI5zMiXOc0axx1LS4EevjhoGDc=";
};
cargoDeps = rustPlatform.importCargoLock {
diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix
index 4c9a40d06dc8..911ddc0d8936 100644
--- a/pkgs/development/python-modules/safety/default.nix
+++ b/pkgs/development/python-modules/safety/default.nix
@@ -26,7 +26,7 @@
buildPythonPackage rec {
pname = "safety";
- version = "3.2.8";
+ version = "3.2.9";
disabled = pythonOlder "3.7";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
owner = "pyupio";
repo = "safety";
rev = "refs/tags/${version}";
- hash = "sha256-H8YF9rax6dM6KCLGiRk7bIHhYVw0RNkH/B9VTZRHe9c=";
+ hash = "sha256-etA/S/i87w4ihsqQo5JJjt6hWC7Jt9/q8vhqyo+DTek=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix
index 2ae837fa6e40..262f1ff3673f 100644
--- a/pkgs/development/python-modules/sagemaker-core/default.nix
+++ b/pkgs/development/python-modules/sagemaker-core/default.nix
@@ -25,14 +25,14 @@
buildPythonPackage rec {
pname = "sagemaker-core";
- version = "1.0.10";
+ version = "1.0.11";
pyproject = true;
src = fetchFromGitHub {
owner = "aws";
repo = "sagemaker-core";
rev = "refs/tags/v${version}";
- hash = "sha256-UloQJ5B10XXPbwsktVZzjcW7BLW8wCAw3wGmAkSl6wc=";
+ hash = "sha256-6r8roHMJ4s/+mGiPeMVZ9wagdXNJQ3+tUFZ/7T+NQBc=";
};
build-system = [
diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix
index 66a712372986..ff6e5c978465 100644
--- a/pkgs/development/python-modules/schema-salad/default.nix
+++ b/pkgs/development/python-modules/schema-salad/default.nix
@@ -22,21 +22,21 @@
buildPythonPackage rec {
pname = "schema-salad";
- version = "8.7.20240905150001";
+ version = "8.7.20241021092521";
pyproject = true;
- disabled = pythonOlder "3.8";
+ disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "common-workflow-language";
repo = "schema_salad";
rev = "refs/tags/${version}";
- hash = "sha256-hPqUD9gYO78NnG/QdD32uRkRPpN5UIhfzNHpUXnNOgE=";
+ hash = "sha256-1V73y+sp94QwoCz8T2LCMnf5iq8MtL9cvrhF949R+08=";
};
postPatch = ''
substituteInPlace pyproject.toml \
- --replace-fail "black>=19.10b0,<23.12" "black>=19.10b0"
+ --replace-fail "mypy[mypyc]==1.12.1" "mypy"
'';
build-system = [ setuptools-scm ];
@@ -57,7 +57,6 @@ buildPythonPackage rec {
++ cachecontrol.optional-dependencies.filecache
++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
-
nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.pycodegen;
preCheck = ''
diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix
index f5ddb753ffaf..f9695701602c 100644
--- a/pkgs/development/python-modules/scikits-odes/default.nix
+++ b/pkgs/development/python-modules/scikits-odes/default.nix
@@ -38,7 +38,6 @@ buildPythonPackage rec {
scipy
] ++ lib.optionals (!isPy3k) [ enum34 ];
- doCheck = true;
nativeCheckInputs = [ pytest ];
checkPhase = ''
diff --git a/pkgs/development/python-modules/segyio/default.nix b/pkgs/development/python-modules/segyio/default.nix
index 9e221db8cfe7..574354ea44a0 100644
--- a/pkgs/development/python-modules/segyio/default.nix
+++ b/pkgs/development/python-modules/segyio/default.nix
@@ -42,7 +42,6 @@ buildPythonPackage rec {
scikit-build
];
- doCheck = true;
# I'm not modifying the checkPhase nor adding a pytestCheckHook because the pytest is called
# within the cmake test phase
nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix
index 7afee8a3ab1b..14d7ca023884 100644
--- a/pkgs/development/python-modules/shap/default.nix
+++ b/pkgs/development/python-modules/shap/default.nix
@@ -13,7 +13,6 @@
matplotlib,
numba,
numpy,
- oldest-supported-numpy,
opencv4,
pandas,
pyspark,
@@ -43,13 +42,18 @@ buildPythonPackage rec {
hash = "sha256-qW36/Xw5oaYKmaMfE5euzkED9CKkjl2O55aO0OpCkfI=";
};
- nativeBuildInputs = [
- oldest-supported-numpy
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace-fail "numpy>=2.0" "numpy"
+ '';
+
+ build-system = [
+ numpy
setuptools
setuptools-scm
];
- propagatedBuildInputs = [
+ dependencies = [
cloudpickle
numba
numpy
diff --git a/pkgs/development/python-modules/shimmy/default.nix b/pkgs/development/python-modules/shimmy/default.nix
index b50135e517bf..eb19b4e16398 100644
--- a/pkgs/development/python-modules/shimmy/default.nix
+++ b/pkgs/development/python-modules/shimmy/default.nix
@@ -1,12 +1,17 @@
{
lib,
buildPythonPackage,
- pythonOlder,
fetchFromGitHub,
+ fetchpatch,
+
+ # build-system
setuptools,
- wheel,
+
+ # dependencies
gymnasium,
numpy,
+
+ # tests
ale-py,
bsuite,
dm-control,
@@ -18,21 +23,32 @@
buildPythonPackage rec {
pname = "shimmy";
- version = "1.3.0";
+ version = "2.0.0";
pyproject = true;
- disabled = pythonOlder "3.8";
-
src = fetchFromGitHub {
owner = "Farama-Foundation";
repo = "Shimmy";
rev = "refs/tags/v${version}";
- hash = "sha256-rYBbGyMSFF/iIGruKn2JXKAVIZIfJDEHUEZUESiUg/k=";
+ hash = "sha256-/wIXjOGb3UeMQdeifYagd7OcxbBcdGPS09mjvkFsWmk=";
};
+ patches = [
+ # Shimmy tries to register some environments from `dm-control` that require unpackaged `labmaze`.
+ # This prevents from importing `shimmy` itself by crashing with a `ModuleNotFoundError`.
+ # This patch imports those environments lazily.
+ #
+ # TODO: get rid of this patch at the next release as the issue has been fixed upstream:
+ # https://github.com/Farama-Foundation/Shimmy/pull/125
+ (fetchpatch {
+ name = "prevent-labmaze-import-crash";
+ url = "https://github.com/Farama-Foundation/Shimmy/commit/095d576f6aae15a09a1e426138629ce9f43a3c04.patch";
+ hash = "sha256-rr9l3tHunYFk0j7hfo9IaSRlogAtwXoXcQ0zuU/TL8c=";
+ })
+ ];
+
build-system = [
setuptools
- wheel
];
dependencies = [
@@ -58,10 +74,6 @@ buildPythonPackage rec {
# Requires unpackaged pyspiel
"tests/test_openspiel.py"
-
- # Broken since ale-py v0.9.0 due to API change
- # https://github.com/Farama-Foundation/Shimmy/issues/120
- "tests/test_atari.py"
];
preCheck = ''
diff --git a/pkgs/development/python-modules/simplesat/default.nix b/pkgs/development/python-modules/simplesat/default.nix
index 7358829f349f..35359c29396d 100644
--- a/pkgs/development/python-modules/simplesat/default.nix
+++ b/pkgs/development/python-modules/simplesat/default.nix
@@ -1,33 +1,24 @@
{
- buildPythonPackage,
- fetchFromGitHub,
- writeText,
lib,
attrs,
+ buildPythonPackage,
+ fetchFromGitHub,
mock,
okonomiyaki,
pytestCheckHook,
+ pythonOlder,
pyyaml,
setuptools,
six,
}:
-let
- version = "0.9.1";
- versionFile = writeText "simplesat_ver" ''
- version = '${version}'
- full_version = '${version}'
- git_revision = '0000000000000000000000000000000000000000'
- is_released = True
- msi_version = '${version}.000'
- version_info = (${lib.versions.major version}, ${lib.versions.minor version}, ${lib.versions.patch version}, 'final', 0)
- '';
-in
buildPythonPackage rec {
pname = "simplesat";
- inherit version;
+ version = "0.9.1";
pyproject = true;
+ disabled = pythonOlder "3.9";
+
src = fetchFromGitHub {
owner = "enthought";
repo = "sat-solver";
@@ -35,8 +26,9 @@ buildPythonPackage rec {
hash = "sha256-/fBnpf1DtaF+wQYZztcB8Y20/ZMYxrF3fH5qRsMucL0=";
};
- preConfigure = ''
- cp ${versionFile} simplesat/_version.py
+ postPatch = ''
+ substituteInPlace setup.cfg \
+ --replace-fail "version = file: VERSION" "version = ${version}"
'';
build-system = [ setuptools ];
@@ -47,20 +39,26 @@ buildPythonPackage rec {
six
];
- pythonImportsCheck = [ "simplesat" ];
-
nativeCheckInputs = [
mock
pytestCheckHook
pyyaml
];
+ pythonImportsCheck = [ "simplesat" ];
+
+ preCheck = ''
+ substituteInPlace simplesat/tests/test_pool.py \
+ --replace-fail "assertRaisesRegexp" "assertRaisesRegex"
+ '';
+
pytestFlagsArray = [ "simplesat/tests" ];
meta = with lib; {
- homepage = "https://github.com/enthought/sat-solver";
description = "Prototype for SAT-based dependency handling";
- maintainers = with maintainers; [ genericnerdyusername ];
+ homepage = "https://github.com/enthought/sat-solver";
+ changelog = "https://github.com/enthought/sat-solver/blob/v${version}/CHANGES.rst";
license = licenses.bsd3;
+ maintainers = with maintainers; [ genericnerdyusername ];
};
}
diff --git a/pkgs/development/python-modules/sip/4.x.nix b/pkgs/development/python-modules/sip/4.x.nix
index e9305188ca6b..8dc26ddfdc0d 100644
--- a/pkgs/development/python-modules/sip/4.x.nix
+++ b/pkgs/development/python-modules/sip/4.x.nix
@@ -57,8 +57,6 @@ buildPythonPackage rec {
"sipconfig"
];
- doCheck = true;
-
meta = with lib; {
description = "Creates C++ bindings for Python modules";
mainProgram = "sip";
diff --git a/pkgs/development/python-modules/skyfield/default.nix b/pkgs/development/python-modules/skyfield/default.nix
index 8fe675eb5bed..b917cf214890 100644
--- a/pkgs/development/python-modules/skyfield/default.nix
+++ b/pkgs/development/python-modules/skyfield/default.nix
@@ -49,8 +49,6 @@ buildPythonPackage rec {
assay
];
- doCheck = true;
-
checkPhase = ''
runHook preCheck
diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix
index 2f4c2d0f0081..9a6bafea9c9d 100644
--- a/pkgs/development/python-modules/slack-sdk/default.nix
+++ b/pkgs/development/python-modules/slack-sdk/default.nix
@@ -4,7 +4,6 @@
aiohttp,
boto3,
buildPythonPackage,
- codecov,
fetchFromGitHub,
flake8,
flask-sockets,
@@ -21,7 +20,7 @@
buildPythonPackage rec {
pname = "slack-sdk";
- version = "3.33.1";
+ version = "3.33.2";
pyproject = true;
disabled = pythonOlder "3.6";
@@ -30,7 +29,7 @@ buildPythonPackage rec {
owner = "slackapi";
repo = "python-slack-sdk";
rev = "refs/tags/v${version}";
- hash = "sha256-OcGzpYwa8Ouf1ojQS9KnqlL37EYCZo5yjNeXXrkd0B4=";
+ hash = "sha256-6Uvp7hVFgHVavJO6Un5L793pOOOBtaT4+eywS3rRWUU=";
};
postPatch = ''
@@ -50,7 +49,6 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
- codecov
flake8
flask-sockets
moto
diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix
index 0dd9835e617b..f20779b9b6d4 100644
--- a/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -30,7 +30,7 @@
buildPythonPackage rec {
pname = "snowflake-connector-python";
- version = "3.12.2";
+ version = "3.12.3";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -39,7 +39,7 @@ buildPythonPackage rec {
owner = "snowflakedb";
repo = "snowflake-connector-python";
rev = "refs/tags/v${version}";
- hash = "sha256-A6QnKCROd1vJpFCTrLEoHVo43xojdjpgYS3qQm64gcY=";
+ hash = "sha256-Rv4/zGoSBA3Pdu67d96sgZLgZae6yfpLsJzwsm2A690=";
};
build-system = [
diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix
index 34255f9cf51e..f90e2f7a3064 100644
--- a/pkgs/development/python-modules/sounddevice/default.nix
+++ b/pkgs/development/python-modules/sounddevice/default.nix
@@ -4,6 +4,7 @@
buildPythonPackage,
fetchPypi,
isPy27,
+ setuptools,
cffi,
numpy,
portaudio,
@@ -12,21 +13,25 @@
buildPythonPackage rec {
pname = "sounddevice";
- version = "0.5.0";
- format = "setuptools";
+ version = "0.5.1";
+ pyproject = true;
disabled = isPy27;
src = fetchPypi {
inherit pname version;
- hash = "sha256-DelSd2VLPUA9nBXe08bO3zB+myfMnOe9mVookdDJVa8=";
+ hash = "sha256-CcqZHa7ajOS+mskeFamoHI+B76a2laNIyRceoMFssEE=";
};
- propagatedBuildInputs = [
+ build-system = [ setuptools ];
+
+ dependencies = [
cffi
numpy
portaudio
];
+ nativeBuildInputs = [ cffi ];
+
# No tests included nor upstream available.
doCheck = false;
diff --git a/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch b/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch
index a5761764fdbb..6ec399e25d5f 100644
--- a/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch
+++ b/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch
@@ -1,11 +1,11 @@
-diff --git i/sounddevice.py w/sounddevice.py
-index c7c1d62..aabcb12 100644
---- i/sounddevice.py
-+++ w/sounddevice.py
-@@ -58,29 +58,7 @@ from ctypes.util import find_library as _find_library
+diff --git a/sounddevice.py b/sounddevice.py
+index 0974289..2d56c28 100644
+--- a/sounddevice.py
++++ b/sounddevice.py
+@@ -58,32 +58,7 @@ from ctypes.util import find_library as _find_library
from _sounddevice import ffi as _ffi
-
-
+
+
-try:
- for _libname in (
- 'portaudio', # Default name on POSIX systems
@@ -22,7 +22,10 @@ index c7c1d62..aabcb12 100644
- if _platform.system() == 'Darwin':
- _libname = 'libportaudio.dylib'
- elif _platform.system() == 'Windows':
-- _libname = 'libportaudio' + _platform.architecture()[0] + '.dll'
+- if 'SD_ENABLE_ASIO' in _os.environ:
+- _libname = 'libportaudio' + _platform.architecture()[0] + '-asio.dll'
+- else:
+- _libname = 'libportaudio' + _platform.architecture()[0] + '.dll'
- else:
- raise
- import _sounddevice_data
@@ -30,6 +33,6 @@ index c7c1d62..aabcb12 100644
- next(iter(_sounddevice_data.__path__)), 'portaudio-binaries', _libname)
- _lib = _ffi.dlopen(_libname)
+_lib = _ffi.dlopen('@portaudio@')
-
+
_sampleformats = {
'float32': _lib.paFloat32,
diff --git a/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix b/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix
index d6d1094447d2..3205238b742b 100644
--- a/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix
+++ b/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix
@@ -17,7 +17,6 @@ stdenv.mkDerivation {
dontConfigure = true;
dontBuild = true;
- doCheck = true;
nativeCheckInputs = [
pytest
diff --git a/pkgs/development/python-modules/spacy/annotation-test/default.nix b/pkgs/development/python-modules/spacy/annotation-test/default.nix
index cb8a97aa568f..5f5f8f3ca0a7 100644
--- a/pkgs/development/python-modules/spacy/annotation-test/default.nix
+++ b/pkgs/development/python-modules/spacy/annotation-test/default.nix
@@ -17,7 +17,6 @@ stdenv.mkDerivation {
dontConfigure = true;
dontBuild = true;
- doCheck = true;
nativeCheckInputs = [
pytest
diff --git a/pkgs/development/python-modules/speechbrain/default.nix b/pkgs/development/python-modules/speechbrain/default.nix
index 670f1e004aae..309d7a6af048 100644
--- a/pkgs/development/python-modules/speechbrain/default.nix
+++ b/pkgs/development/python-modules/speechbrain/default.nix
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "speechbrain";
- version = "1.0.1";
+ version = "1.0.2";
pyproject = true;
src = fetchFromGitHub {
owner = "speechbrain";
repo = "speechbrain";
rev = "refs/tags/v${version}";
- hash = "sha256-5ZMS1g74G4w83kNrXyt9IUsXe5uYS1qC+MwleQrjhTY=";
+ hash = "sha256-Un7RPxMq1sD7uD3jcw3Bjp+Oo8ld+XC5g2I89gF6jxs=";
};
dependencies = [
diff --git a/pkgs/development/python-modules/sphinx-lv2-theme/default.nix b/pkgs/development/python-modules/sphinx-lv2-theme/default.nix
new file mode 100644
index 000000000000..47689da31158
--- /dev/null
+++ b/pkgs/development/python-modules/sphinx-lv2-theme/default.nix
@@ -0,0 +1,33 @@
+{
+ buildPythonPackage,
+ lib,
+ fetchFromGitLab,
+ setuptools,
+ sphinx,
+}:
+
+buildPythonPackage rec {
+ pname = "sphinx-lv2-theme";
+ version = "1.4.2";
+ pyproject = true;
+
+ src = fetchFromGitLab {
+ owner = "LV2";
+ repo = "sphinx_lv2_theme";
+ rev = "v${version}";
+ hash = "sha256-x3h2hOQIyzOmnh58WMHjuOARdML1sDiVAf7m0YghhJ4=";
+ };
+
+ build-system = [ setuptools ];
+
+ dependencies = [ sphinx ];
+
+ pythonImportsCheck = [ "sphinx_lv2_theme" ];
+
+ meta = {
+ description = "Sphinx theme in the style of the LV2 plugin";
+ homepage = "https://gitlab.com/lv2/sphinx_lv2_theme";
+ license = lib.licenses.isc;
+ maintainers = with lib.maintainers; [ samueltardieu ];
+ };
+}
diff --git a/pkgs/development/python-modules/sre-yield/default.nix b/pkgs/development/python-modules/sre-yield/default.nix
index 04cc12184090..fdd8cc8b4b05 100644
--- a/pkgs/development/python-modules/sre-yield/default.nix
+++ b/pkgs/development/python-modules/sre-yield/default.nix
@@ -19,7 +19,6 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools ];
- doCheck = true;
nativeCheckInputs = [ unittestCheckHook ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/stix2-patterns/default.nix b/pkgs/development/python-modules/stix2-patterns/default.nix
index 4ca5ee040a75..16898cb624d4 100644
--- a/pkgs/development/python-modules/stix2-patterns/default.nix
+++ b/pkgs/development/python-modules/stix2-patterns/default.nix
@@ -1,5 +1,6 @@
{
lib,
+ antlr4_9,
antlr4-python3-runtime,
buildPythonPackage,
fetchFromGitHub,
@@ -23,15 +24,10 @@ buildPythonPackage rec {
hash = "sha256-lFgnvI5a7U7/Qj4Pqjr3mx4TNDnC2/Ru7tVG7VggR7Y=";
};
- postPatch = ''
- substituteInPlace setup.py \
- --replace-fail "antlr4-python3-runtime~=" "antlr4-python3-runtime>="
- '';
-
build-system = [ setuptools ];
dependencies = [
- antlr4-python3-runtime
+ (antlr4-python3-runtime.override { antlr4 = antlr4_9; })
six
];
@@ -39,14 +35,6 @@ buildPythonPackage rec {
pythonImportsCheck = [ "stix2patterns" ];
- disabledTestPaths = [
- # Exception: Could not deserialize ATN with version (expected 4)
- "stix2patterns/test/v20/test_inspector.py"
- "stix2patterns/test/v21/test_inspector.py"
- "stix2patterns/test/v20/test_validator.py"
- "stix2patterns/test/v21/test_validator.py"
- ];
-
meta = with lib; {
description = "Validate patterns used to express cyber observable content in STIX Indicators";
mainProgram = "validate-patterns";
diff --git a/pkgs/development/python-modules/stravaweblib/default.nix b/pkgs/development/python-modules/stravaweblib/default.nix
new file mode 100644
index 000000000000..210b62755add
--- /dev/null
+++ b/pkgs/development/python-modules/stravaweblib/default.nix
@@ -0,0 +1,44 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+
+ # setuptools
+ setuptools,
+ setuptools-scm,
+
+ # dependencies
+ stravalib,
+ beautifulsoup4,
+}:
+
+buildPythonPackage rec {
+ pname = "stravaweblib";
+ version = "0.0.8";
+
+ src = fetchFromGitHub {
+ owner = "pR0Ps";
+ repo = "stravaweblib";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-v54UeRjhoH0GN2AVFKRjqKJ6BYUXVATe2qoDk9P48oU=";
+ };
+
+ build-system = [
+ setuptools
+ setuptools-scm
+ ];
+
+ dependencies = [
+ stravalib
+ beautifulsoup4
+ ];
+
+ pythonImportsCheck = [ "stravaweblib" ];
+
+ meta = {
+ description = "Python library for extending the Strava v3 API using web scraping";
+ homepage = "https://github.com/pR0Ps/stravaweblib";
+ license = lib.licenses.mpl20;
+ maintainers = with lib.maintainers; [ stv0g ];
+ };
+}
diff --git a/pkgs/development/python-modules/strawberry-django/default.nix b/pkgs/development/python-modules/strawberry-django/default.nix
new file mode 100644
index 000000000000..ea6326714e57
--- /dev/null
+++ b/pkgs/development/python-modules/strawberry-django/default.nix
@@ -0,0 +1,79 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ poetry-core,
+ setuptools,
+ asgiref,
+ django,
+ strawberry-graphql,
+ django-debug-toolbar,
+ django-choices-field,
+
+ # check inputs
+ pytestCheckHook,
+ django-guardian,
+ django-mptt,
+ django-polymorphic,
+ factory-boy,
+ pillow,
+ psycopg2,
+ pytest-cov-stub,
+ pytest-django,
+ pytest-mock,
+ pytest-snapshot,
+}:
+
+buildPythonPackage rec {
+ pname = "strawberry-django";
+ version = "0.47.1";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "strawberry-graphql";
+ repo = "strawberry-django";
+ rev = "v${version}";
+ hash = "sha256-N7/EJ1AQ2xUJCEX6/xtyH1o/CuDzlvrUtpoDLq+H1WU=";
+ };
+
+ build-system = [
+ poetry-core
+ setuptools
+ ];
+
+ dependencies = [
+ asgiref
+ django
+ strawberry-graphql
+ ];
+
+ nativeCheckInputs = [
+ pytestCheckHook
+
+ django-guardian
+ django-mptt
+ django-polymorphic
+ factory-boy
+ pillow
+ psycopg2
+ pytest-cov-stub
+ pytest-django
+ pytest-mock
+ pytest-snapshot
+ ] ++ optional-dependencies.debug-toolbar ++ optional-dependencies.enum;
+
+ pythonImportsCheck = [ "strawberry_django" ];
+
+ optional-dependencies = {
+ debug-toolbar = [ django-debug-toolbar ];
+ enum = [ django-choices-field ];
+ };
+
+ meta = {
+ description = "Strawberry GraphQL Django extension";
+ homepage = "https://github.com/strawberry-graphql/strawberry-django";
+ changelog = "https://github.com/strawberry-graphql/strawberry-django/blob/${src.rev}/CHANGELOG.md";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ minijackson ];
+ };
+}
diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix
index 25f0b39369f8..19db050f392b 100644
--- a/pkgs/development/python-modules/strawberry-graphql/default.nix
+++ b/pkgs/development/python-modules/strawberry-graphql/default.nix
@@ -5,7 +5,6 @@
buildPythonPackage,
chalice,
channels,
- click,
daphne,
django,
email-validator,
@@ -40,6 +39,8 @@
starlette,
typing-extensions,
uvicorn,
+ typer,
+ graphlib-backport,
}:
buildPythonPackage rec {
@@ -92,7 +93,7 @@ buildPythonPackage rec {
libcst
];
debug-server = [
- click
+ typer
libcst
pygments
python-multipart
@@ -125,10 +126,11 @@ buildPythonPackage rec {
];
chalice = [ chalice ];
cli = [
- click
pygments
rich
libcst
+ typer
+ graphlib-backport
];
# starlite = [ starlite ];
# litestar = [ litestar ];
diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix
index 71ce1b81aa9a..d3862776309a 100644
--- a/pkgs/development/python-modules/streamlit/default.nix
+++ b/pkgs/development/python-modules/streamlit/default.nix
@@ -33,14 +33,14 @@
buildPythonPackage rec {
pname = "streamlit";
- version = "1.38.0";
+ version = "1.39.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
- hash = "sha256-xL82s++HFJntRZRXSDRYMRP5Pwd90wNdUW0pV4byrWM=";
+ hash = "sha256-/vneeYPE7mXAjoVgfX/8y1awBIKxBB+mL5DkgV053zo=";
};
build-system = [
diff --git a/pkgs/development/python-modules/stringzilla/default.nix b/pkgs/development/python-modules/stringzilla/default.nix
new file mode 100644
index 000000000000..7fc432e3ea19
--- /dev/null
+++ b/pkgs/development/python-modules/stringzilla/default.nix
@@ -0,0 +1,59 @@
+{
+ buildPythonPackage,
+ cargo,
+ fetchFromGitHub,
+ lib,
+ numpy,
+ pytest-repeat,
+ pytestCheckHook,
+ rustPlatform,
+ rustc,
+ setuptools,
+}:
+
+buildPythonPackage rec {
+ pname = "stringzilla";
+ version = "3.10.5";
+ pyproject = true;
+
+ src = fetchFromGitHub {
+ owner = "ashvardanian";
+ repo = "stringzilla";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-E7w6s813OGCld/GRTHMbjVAReTGb37HlB687gP9N9FA=";
+ };
+
+ cargoDeps = rustPlatform.fetchCargoTarball {
+ inherit src;
+ name = "${pname}-${version}";
+ hash = "sha256-36LN9AoAWA//pldmQZtKMrck4EoGUW9G2vzdsRw08SA=";
+ };
+
+ build-system = [
+ setuptools
+ ];
+
+ nativeBuildInputs = [
+ cargo
+ rustPlatform.cargoSetupHook
+ rustc
+ ];
+
+ pythonImportsCheck = [ "stringzilla" ];
+
+ nativeCheckInputs = [
+ numpy
+ pytest-repeat
+ pytestCheckHook
+ ];
+
+ pytestFlagsArray = [ "scripts/test.py" ];
+
+ meta = {
+ changelog = "https://github.com/ashvardanian/StringZilla/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
+ description = "SIMD-accelerated string search, sort, hashes, fingerprints, & edit distances";
+ homepage = "https://github.com/ashvardanian/stringzilla";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/development/python-modules/sudachidict/default.nix b/pkgs/development/python-modules/sudachidict/default.nix
index 1035f42bff84..1677ab112926 100644
--- a/pkgs/development/python-modules/sudachidict/default.nix
+++ b/pkgs/development/python-modules/sudachidict/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "WorksApplications";
repo = "SudachiDict";
rev = "refs/tags/v${version}";
- hash = "sha256-xJ/iPywOZA2kzHaVU43Bc8TUboj3OpDg1kLFMIc/T90=";
+ hash = "sha256-axa7eQ0jTo8GXJA5lwcvMyZLw9T573yeSo9xuvIm/gY=";
};
sourceRoot = "${src.name}/python";
diff --git a/pkgs/development/python-modules/telegraph/default.nix b/pkgs/development/python-modules/telegraph/default.nix
index 80a4d12c7b16..3dd1ce594efb 100644
--- a/pkgs/development/python-modules/telegraph/default.nix
+++ b/pkgs/development/python-modules/telegraph/default.nix
@@ -34,8 +34,6 @@ buildPythonPackage rec {
disabledTests = [ "test_get_page" ];
- doCheck = true;
-
pythonImportsCheck = [ "telegraph" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix
index 63ed58fca0b9..976b9e0a2035 100644
--- a/pkgs/development/python-modules/tempest/default.nix
+++ b/pkgs/development/python-modules/tempest/default.nix
@@ -34,14 +34,14 @@
buildPythonPackage rec {
pname = "tempest";
- version = "40.0.0";
+ version = "41.0.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
- hash = "sha256-s2EvD1TDoRoKrvpRc6h3P7xRyT941nW1hveucXDLB4w=";
+ hash = "sha256-e0cxWm0ZNQl2bJnVzcMiiN+Wadd65nJZoLJnBRr2Qqw=";
};
pythonRelaxDeps = [ "defusedxml" ];
diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix
index dbdf78f12524..0def5a032243 100644
--- a/pkgs/development/python-modules/tenacity/default.nix
+++ b/pkgs/development/python-modules/tenacity/default.nix
@@ -2,7 +2,6 @@
lib,
buildPythonPackage,
fetchPypi,
- pbr,
pytest-asyncio,
pytestCheckHook,
pythonOlder,
@@ -13,20 +12,17 @@
buildPythonPackage rec {
pname = "tenacity";
- version = "8.5.0";
- format = "pyproject";
+ version = "9.0.0";
+ pyproject = true;
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- hash = "sha256-i8bAyKCbMebK0TxHr77RpWdRglCpoXFBhYLtjZwgyng=";
+ hash = "sha256-gH83ypfWKqNhJk1Jew4x6SuAJwRJQr+nVhYNkIMg1zs=";
};
- nativeBuildInputs = [
- pbr
- setuptools-scm
- ];
+ build-system = [ setuptools-scm ];
nativeCheckInputs = [
pytest-asyncio
@@ -39,6 +35,7 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://github.com/jd/tenacity";
+ changelog = "https://github.com/jd/tenacity/releases/tag/${version}";
description = "Retrying library for Python";
license = licenses.asl20;
maintainers = with maintainers; [ jakewaksbaum ];
diff --git a/pkgs/development/python-modules/tensorflow/binary-hashes.nix b/pkgs/development/python-modules/tensorflow/binary-hashes.nix
index 2a6a31b540b2..d3813066c879 100644
--- a/pkgs/development/python-modules/tensorflow/binary-hashes.nix
+++ b/pkgs/development/python-modules/tensorflow/binary-hashes.nix
@@ -1,72 +1,72 @@
{
- version = "2.17.0";
- version_jetson = "2.16.1+nv24.07";
+ version = "2.18.0";
+ version_jetson = "2.16.1+nv24.08";
x86_64-linux_39 = {
- url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow_cpu-2.17.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
- sha256 = "1aacn68b88bnnmpl1q0irih0avzm2lfyhwr3wldg144n5zljlrbx";
+ url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow_cpu-2.18.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
+ sha256 = "1b60b3lx7kf5jbh6md3hx9fx99jzcjvghsvnas6lypr1wcmi7p62";
};
x86_64-linux_310 = {
- url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow_cpu-2.17.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
- sha256 = "0swhlncyaxdhygml1z246799lihfp72yxym845n46z4gm0s3hb86";
+ url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow_cpu-2.18.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
+ sha256 = "1whqqmf405q8mlg6plvh5sbvpwd4m2lv228knwwpsc2avrpld64z";
};
x86_64-linux_311 = {
- url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow_cpu-2.17.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
- sha256 = "11a2i78hdlmzfkzxpr3g07n6cr2l8jmjdz5h73ipvmjkw7zq7wz7";
+ url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow_cpu-2.18.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
+ sha256 = "0zkgjdm075xzbng7lcry64vqb75rnf21yh2kr8fmisk0d5s737h8";
};
x86_64-linux_312 = {
- url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow_cpu-2.17.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
- sha256 = "0v31jwlhbbv5aby3zlr1lk5gjwqq6y41vpf4mnwlj69jj0wlv3qw";
+ url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow_cpu-2.18.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
+ sha256 = "14dqf075nqw7zci4a9grqsskyn4b2l7anh9ddqyidr15s4d45g9r";
};
x86_64-linux_39_gpu = {
- url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
- sha256 = "0xa1brn4207c0rcilnjmadmnmyyg5zb2dfh2p43whbpbdmsfds2a";
+ url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
+ sha256 = "157bv97pqrp7fpf75p5qji609r17g6vw2y3kxr44gcvm1hlzg8dd";
};
x86_64-linux_310_gpu = {
- url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
- sha256 = "1v5l57rqpl6i00mzx2ksvdh1dx2gfis6vhnkcl550znbskg96z0l";
+ url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
+ sha256 = "029ppxdm7m43hq17p1bxrj4dcz6929skrcni4qkl96fna2p7zdqy";
};
x86_64-linux_311_gpu = {
- url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
- sha256 = "0ll55lwn6igja9xyin3ilf0v1yv5drw6y6d8vbx8zgay3dxpffc3";
+ url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
+ sha256 = "0xirxjhwg7zyr0dzglk3r3bzkq84p3mrwlmbcv7by01nz9qdvf3h";
};
x86_64-linux_312_gpu = {
- url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
- sha256 = "1977hcs0rk1z2sjh7h8497m6r1yskzgj8nya50wyskgvdbmbzmqa";
+ url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl";
+ sha256 = "11k2gj0ibz9m35l673r12zk7w991ssfm53fp7ll68h06gvm6bpdz";
};
aarch64-linux_39 = {
- url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
- sha256 = "0ird9r7s7pib89k9d66wdblkibh1n02li57a5vxbh8pdfkzprqyx";
+ url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
+ sha256 = "0khcq43fy799x69ii8nkhyvq8m71vafdiknhn8ambyg89l9k5zdw";
};
aarch64-linux_310 = {
- url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
- sha256 = "05bgybxgwwrqvxcrvlrx3wdxy03vags2pis8lp1sn85g52n86rmk";
+ url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
+ sha256 = "0lv3knwpvs47q36lz4vx55z6fmvpm56dlipry2d2xaywkgxl54sq";
};
aarch64-linux_311 = {
- url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
- sha256 = "17cxqqpz1dk3iddi36c91arkanxb5xnfnsfcikhck9lglf7gk0na";
+ url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
+ sha256 = "0j0bs0yqfgw5cnvgajs0sn6lbq6i7h4qcbmm2yqjklznk8vfgwc5";
};
aarch64-linux_312 = {
- url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
- sha256 = "1zrscms9qkfpiscnl8c7ibfipwpw8jrdfvwh4wb69p9rxvqgxbbj";
+ url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
+ sha256 = "1xd1yh7sxivv597scb54xhn3bhfgj7qzxr8gbz1akn2r6m5r08j8";
};
aarch64-linux_310_jetson = {
- url = "https://developer.download.nvidia.com/compute/redist/jp/v60/tensorflow/tensorflow-2.16.1+nv24.07-cp310-cp310-linux_aarch64.whl";
- sha256 = "1ymdknl5v41z6z0wg068diici30am8vysg6b6sqxr8w6yk4aib42";
+ url = "https://developer.download.nvidia.com/compute/redist/jp/v61/tensorflow/tensorflow-2.16.1+nv24.08-cp310-cp310-linux_aarch64.whl";
+ sha256 = "0z18zdcjc2dingl94kivhd5cpzbvkjp9j12q57acjppp4hyd6g7f";
};
aarch64-darwin_39 = {
- url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp39-cp39-macosx_12_0_arm64.whl";
- sha256 = "01a3hjnrgjp2i0ciwyy0gki41cy32prvjhr20zhlcjwbssarxy4p";
+ url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp39-cp39-macosx_12_0_arm64.whl";
+ sha256 = "0xjpi60qliql9z7wk959ag8p6l0n86jzd4k2xq7w4af1g3isqv1k";
};
aarch64-darwin_310 = {
- url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp310-cp310-macosx_12_0_arm64.whl";
- sha256 = "10ypfpmgppvvf3h7hl0m9i8ndjpk2n2v04jlaw907icviapfapsi";
+ url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp310-cp310-macosx_12_0_arm64.whl";
+ sha256 = "1vj04f4gzvw07mwgjrvk7sxzzyhhb0mhsn96sq0dvxm1i29hmacd";
};
aarch64-darwin_311 = {
- url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp311-cp311-macosx_12_0_arm64.whl";
- sha256 = "0kd62x53fzv6zcxh4bggakiczxd8ghjrjr9hn6fi7yyc4in6vlp8";
+ url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp311-cp311-macosx_12_0_arm64.whl";
+ sha256 = "1rsiz0k4caygl266az7if4vd6s8mrz5whdpv2rix4bx0703bcg25";
};
aarch64-darwin_312 = {
- url = "https://storage.googleapis.com/tensorflow/versions/2.17.0/tensorflow-2.17.0-cp312-cp312-macosx_12_0_arm64.whl";
- sha256 = "0482xdh9mj65iz4651llfznbc268yqm0j9dvx9rfii97svyb867f";
+ url = "https://storage.googleapis.com/tensorflow/versions/2.18.0/tensorflow-2.18.0-cp312-cp312-macosx_12_0_arm64.whl";
+ sha256 = "1l3i9zz37riyhwjak7sdhz3znflxawafkjz757li94y52ni36hgc";
};
}
diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/pkgs/development/python-modules/tensorflow/prefetcher.sh
index 912977ecc42a..594e4d82ec50 100755
--- a/pkgs/development/python-modules/tensorflow/prefetcher.sh
+++ b/pkgs/development/python-modules/tensorflow/prefetcher.sh
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
-version="2.17.0"
-version_jetson="2.16.1+nv24.07"
+version="2.18.0"
+version_jetson="2.16.1+nv24.08"
bucket="https://storage.googleapis.com/tensorflow/versions/${version}"
-bucket_jetson="https://developer.download.nvidia.com/compute/redist/jp/v60/tensorflow"
+bucket_jetson="https://developer.download.nvidia.com/compute/redist/jp/v61/tensorflow"
# List of binary wheels for Tensorflow. The most recent versions can be found
# on the following page:
diff --git a/pkgs/development/python-modules/thinqconnect/default.nix b/pkgs/development/python-modules/thinqconnect/default.nix
index 0b269d0ff3d7..ec85761f7d05 100644
--- a/pkgs/development/python-modules/thinqconnect/default.nix
+++ b/pkgs/development/python-modules/thinqconnect/default.nix
@@ -10,8 +10,8 @@
}:
buildPythonPackage rec {
- pname = "pythinqconnect";
- version = "0.9.7-unstable-2024-09-09";
+ pname = "thinqconnect";
+ version = "0.9.9";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -19,9 +19,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "thinq-connect";
repo = "pythinqconnect";
- # https://github.com/thinq-connect/pythinqconnect/issues/1
- rev = "39d535a2a5d1067a110eea37ae92002d0793b7e9";
- hash = "sha256-+nQAUqg5rB2eJgPBJJR8NsQ1O2Wb4UsbBQVPir1jyAU=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-G6fg+mXrUnSkfpeJAvDXEu57UgkYEObErEnds2PK13Y=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/throttler/default.nix b/pkgs/development/python-modules/throttler/default.nix
index 4dc15bffedae..629ec3784559 100644
--- a/pkgs/development/python-modules/throttler/default.nix
+++ b/pkgs/development/python-modules/throttler/default.nix
@@ -4,7 +4,6 @@
fetchFromGitHub,
pytestCheckHook,
aiohttp,
- codecov,
flake8,
pytest,
pytest-asyncio,
@@ -25,7 +24,6 @@ buildPythonPackage rec {
checkInputs = [
aiohttp
- codecov
flake8
pytest
pytest-asyncio
diff --git a/pkgs/development/python-modules/tinygrad/default.nix b/pkgs/development/python-modules/tinygrad/default.nix
index bb0c6065f0a6..ae55395b2ca2 100644
--- a/pkgs/development/python-modules/tinygrad/default.nix
+++ b/pkgs/development/python-modules/tinygrad/default.nix
@@ -9,14 +9,17 @@
rocmSupport ? config.rocmSupport,
cudaPackages,
ocl-icd,
- stdenv,
rocmPackages,
+ stdenv,
# build-system
setuptools,
# dependencies
+ llvmlite,
numpy,
+ triton,
+ unicorn,
# tests
blobfile,
@@ -25,9 +28,9 @@
hexdump,
hypothesis,
librosa,
+ networkx,
onnx,
pillow,
- pydot,
pytest-xdist,
pytestCheckHook,
safetensors,
@@ -101,6 +104,12 @@ buildPythonPackage rec {
# pyobjc-framework-metal
];
+ optional-dependencies = {
+ llvm = [ llvmlite ];
+ arm = [ unicorn ];
+ triton = [ triton ];
+ };
+
pythonImportsCheck =
[
"tinygrad"
@@ -116,9 +125,9 @@ buildPythonPackage rec {
hexdump
hypothesis
librosa
+ networkx
onnx
pillow
- pydot
pytest-xdist
pytestCheckHook
safetensors
@@ -127,7 +136,7 @@ buildPythonPackage rec {
torch
tqdm
transformers
- ];
+ ] ++ networkx.optional-dependencies.extra;
preCheck = ''
export HOME=$(mktemp -d)
diff --git a/pkgs/development/python-modules/toptica-lasersdk/default.nix b/pkgs/development/python-modules/toptica-lasersdk/default.nix
new file mode 100644
index 000000000000..6c7ccb9c252e
--- /dev/null
+++ b/pkgs/development/python-modules/toptica-lasersdk/default.nix
@@ -0,0 +1,44 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchPypi,
+
+ # build-system
+ setuptools,
+
+ # dependencies
+ ifaddr,
+ pyserial,
+}:
+
+buildPythonPackage rec {
+ pname = "toptica-lasersdk";
+ version = "3.2.0";
+ pyproject = true;
+
+ src = fetchPypi {
+ pname = "toptica_lasersdk";
+ inherit version;
+ hash = "sha256-UNazng4Za3CZeG7eDq0b+l7gmESEXIU8WMLWGGysmBg=";
+ };
+
+ build-system = [
+ setuptools
+ ];
+
+ dependencies = [
+ ifaddr
+ pyserial
+ ];
+
+ pythonImportsCheck = [
+ "toptica.lasersdk.dlcpro.v2_2_0"
+ ];
+
+ meta = {
+ description = "TOPTICA Python Laser SDK";
+ homepage = "https://toptica.github.io/python-lasersdk/";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ doronbehar ];
+ };
+}
diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix
index 3023380920c7..990e4df76be4 100644
--- a/pkgs/development/python-modules/torchrl/default.nix
+++ b/pkgs/development/python-modules/torchrl/default.nix
@@ -1,7 +1,6 @@
{
lib,
buildPythonPackage,
- pythonOlder,
fetchFromGitHub,
# build-system
@@ -44,8 +43,6 @@
pytestCheckHook,
pyyaml,
scipy,
-
- stdenv,
}:
buildPythonPackage rec {
@@ -53,8 +50,6 @@ buildPythonPackage rec {
version = "0.5.0";
pyproject = true;
- disabled = pythonOlder "3.8";
-
src = fetchFromGitHub {
owner = "pytorch";
repo = "rl";
@@ -138,6 +133,11 @@ buildPythonPackage rec {
++ optional-dependencies.rendering;
disabledTests = [
+ # torchrl is incompatible with gymnasium>=1.0
+ # https://github.com/pytorch/rl/discussions/2483
+ "test_resetting_strategies"
+ "test_torchrl_to_gym"
+
# mujoco.FatalError: an OpenGL platform library has not been loaded into this process, this most likely means that a valid OpenGL context has not been created before mjr_makeContext was called
"test_vecenvs_env"
@@ -175,6 +175,5 @@ buildPythonPackage rec {
changelog = "https://github.com/pytorch/rl/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ GaetanLepage ];
- # ~3k tests fail with: RuntimeError: internal error
};
}
diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix
index 1176b90d9653..fe5a361f9d8b 100644
--- a/pkgs/development/python-modules/tpm2-pytss/default.nix
+++ b/pkgs/development/python-modules/tpm2-pytss/default.nix
@@ -37,9 +37,6 @@ buildPythonPackage rec {
[
# Fix hardcoded `fapi-config.json` configuration path
./fapi-config.patch
- # Backport for https://github.com/tpm2-software/tpm2-pytss/pull/576
- # This is likely to be dropped with the next major release (>= 2.3)
- ./pr576-backport.patch
]
++ lib.optionals isCross [
# pytss will regenerate files from headers of tpm2-tss.
@@ -81,8 +78,6 @@ buildPythonPackage rec {
pyyaml
];
- doCheck = true;
-
nativeCheckInputs = [
pytestCheckHook
tpm2-tools
diff --git a/pkgs/development/python-modules/tpm2-pytss/pr576-backport.patch b/pkgs/development/python-modules/tpm2-pytss/pr576-backport.patch
deleted file mode 100644
index ee04701f3931..000000000000
--- a/pkgs/development/python-modules/tpm2-pytss/pr576-backport.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-Backport for https://github.com/tpm2-software/tpm2-pytss/pull/576 on 2.2.1
-
-diff --git a/scripts/prepare_headers.py b/scripts/prepare_headers.py
-index 6ca9b64..a7529b3 100644
---- a/scripts/prepare_headers.py
-+++ b/scripts/prepare_headers.py
-@@ -32,6 +32,7 @@ def remove_common_guards(s):
-
- # Restructure #defines with ...
- s = re.sub("(#define [A-Za-z0-9_]+) +\(\(.*?\) \(.*?\)\)", "\g<1>...", s)
-+ s = re.sub("(#define [A-Za-z0-9_]+) +\(\(\(.*?\) .*\)", "\g<1>...", s)
- s = re.sub("(#define [A-Za-z0-9_]+) +\(\(.*?\).*?\) ", "\g<1>...", s)
- s = re.sub(
- "(#define [A-Za-z0-9_]+) .*\n.*?.*\)\)", "\g<1>...", s, flags=re.MULTILINE
-diff --git a/src/tpm2_pytss/internal/crypto.py b/src/tpm2_pytss/internal/crypto.py
-index 42030c5..f9d8c34 100644
---- a/src/tpm2_pytss/internal/crypto.py
-+++ b/src/tpm2_pytss/internal/crypto.py
-@@ -25,6 +25,7 @@ from cryptography.hazmat.backends import default_backend
- from cryptography.exceptions import UnsupportedAlgorithm, InvalidSignature
- from typing import Tuple, Type, Any
- import secrets
-+import inspect
- import sys
-
- _curvetable = (
-diff --git a/test/test_encoding.py b/test/test_encoding.py
-index 1f58562..8cf4b51 100644
---- a/test/test_encoding.py
-+++ b/test/test_encoding.py
-@@ -1406,7 +1406,7 @@ class ToolsTest(TSS2_BaseTest):
- def test_tools_decode_tpm2b_name(self):
- if not self.has_tools:
- self.skipTest("tools not in path")
-- key = ec.generate_private_key(ec.SECP256R1).public_key()
-+ key = ec.generate_private_key(ec.SECP256R1()).public_key()
- kb = key.public_bytes(
- serialization.Encoding.PEM, serialization.PublicFormat.SubjectPublicKeyInfo
- )
-diff --git a/test/test_fapi.py b/test/test_fapi.py
-index f702fc9..6b77c66 100644
---- a/test/test_fapi.py
-+++ b/test/test_fapi.py
-@@ -13,7 +13,7 @@ from cryptography.hazmat.primitives.asymmetric.padding import PSS
-
- from tpm2_pytss import *
-
--from tpm2_pytss.internal.utils import is_bug_fixed, _lib_version_atleast
-+from tpm2_pytss.internal.utils import is_bug_fixed
-
- from .TSS2_BaseTest import TpmSimulator
- from tpm2_pytss.TSS2_Exception import TSS2_Exception
-@@ -614,8 +614,7 @@ class Common:
- self.fapi.sign(key_path, b"\x22" * 32)
-
- @pytest.mark.skipif(
-- _lib_version_atleast("tss2-fapi", "4.0.1-170")
-- or not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]),
-+ not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]),
- reason="tpm2-tss bug, see #2084",
- )
- def test_write_authorize_nv(self, esys):
-@@ -662,8 +661,7 @@ class Common:
- self.fapi.quote(path=key_path, pcrs=[7, 9])
-
- @pytest.mark.skipif(
-- _lib_version_atleast("tss2-fapi", "4.0.1-170")
-- or not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]),
-+ not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]),
- reason="tpm2-tss bug, see #2084",
- )
- def test_authorize_policy(self, sign_key):
-@@ -728,9 +726,7 @@ class Common:
- self.fapi.quote(path=key_path, pcrs=[7, 9])
-
- @pytest.mark.skipif(
-- _lib_version_atleast("tss2-fapi", "4.0.1-170")
-- or not is_bug_fixed(fixed_in="3.2"),
-- reason="tpm2-tss bug, see #2080",
-+ not is_bug_fixed(fixed_in="3.2"), reason="tpm2-tss bug, see #2080"
- )
- def test_policy_signed(self, cryptography_key):
- # create external signing key used by the signing authority external to the TPM
-@@ -792,10 +788,6 @@ class Common:
- with pytest.raises(TSS2_Exception):
- self.fapi.sign(path=key_path, digest=b"\x11" * 32)
-
-- @pytest.mark.skipif(
-- _lib_version_atleast("tss2-fapi", "4.0.1-170"),
-- reason="issue on master branch.",
-- )
- def test_policy_branched(self):
- pcr_index = 15
- pcr_data = b"ABCDEF"
-@@ -913,8 +905,7 @@ class Common:
- self.fapi.delete(path=nv_path)
-
- @pytest.mark.skipif(
-- _lib_version_atleast("tss2-fapi", "4.0.1-170")
-- or not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]),
-+ not is_bug_fixed(fixed_in="3.2", backports=["2.4.7", "3.0.5", "3.1.1"]),
- reason="tpm2-tss bug, see #2089",
- )
- def test_policy_action(self):
-diff --git a/test/test_policy.py b/test/test_policy.py
-index f18aa8a..5f56e21 100644
---- a/test/test_policy.py
-+++ b/test/test_policy.py
-@@ -47,7 +47,7 @@ class TestPolicy(TSS2_EsapiTest):
- super().setUp()
- self._has_secp192r1 = True
- try:
-- ec.generate_private_key(ec.SECP192R1)
-+ ec.generate_private_key(ec.SECP192R1())
- except Exception:
- self._has_secp192r1 = False
-
diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix
index 944ccabe161e..f3dc2897f798 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@@ -58,14 +58,14 @@
buildPythonPackage rec {
pname = "transformers";
- version = "4.46.0";
+ version = "4.46.1";
pyproject = true;
src = fetchFromGitHub {
owner = "huggingface";
repo = "transformers";
rev = "refs/tags/v${version}";
- hash = "sha256-R+uHo98K+uOXbxE4Axam/FONZgeFyyPfe0IZiOCpFF4=";
+ hash = "sha256-lVpzOjBb92EZpNLSPBSWrpkENgdovCDSoMp6R13nzsM=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/ttls/default.nix b/pkgs/development/python-modules/ttls/default.nix
index bf1379dd2bcc..53a0566eaaf2 100644
--- a/pkgs/development/python-modules/ttls/default.nix
+++ b/pkgs/development/python-modules/ttls/default.nix
@@ -2,33 +2,29 @@
lib,
aiohttp,
buildPythonPackage,
- colour,
fetchFromGitHub,
poetry-core,
pythonOlder,
- setuptools,
}:
buildPythonPackage rec {
pname = "ttls";
- version = "1.8.3";
- format = "pyproject";
+ version = "1.9.0";
+ pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "jschlyter";
- repo = pname;
+ repo = "ttls";
rev = "refs/tags/v${version}";
- hash = "sha256-1RctamOSnpZ+bcfwnCsj4OAR7KYzf0XQtSe7MTFMGy4=";
+ hash = "sha256-itGXZbQZ+HYpiwySLeGN3mPy3fgsxx0A9byOxIVpRBc=";
};
- nativeBuildInputs = [ poetry-core ];
+ build-system = [ poetry-core ];
- propagatedBuildInputs = [
+ dependencies = [
aiohttp
- colour
- setuptools
];
# Module has no tests
diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix
index 700f97a68b5f..653ba4ad7171 100644
--- a/pkgs/development/python-modules/ttp/default.nix
+++ b/pkgs/development/python-modules/ttp/default.nix
@@ -64,6 +64,9 @@ buildPythonPackage rec {
disabledTests = [
# data structure mismatches
+ "test_global_output_deepdiff_with_var_before"
+ "test_group_specific_output_deepdiff_with_var_before"
+ "test_group_specific_output_deepdiff_with_var_before_with_add_field"
"test_yangson_validate"
"test_yangson_validate_yang_lib_in_output_tag_data"
"test_yangson_validate_multiple_inputs_mode_per_input_with_yang_lib_in_file"
diff --git a/pkgs/development/python-modules/turnt/default.nix b/pkgs/development/python-modules/turnt/default.nix
index abed46cc766e..8d9af7740283 100644
--- a/pkgs/development/python-modules/turnt/default.nix
+++ b/pkgs/development/python-modules/turnt/default.nix
@@ -24,8 +24,6 @@ buildPythonPackage rec {
tomli
];
- doCheck = true;
-
checkPhase = ''
runHook preCheck
$out/bin/turnt test/*/*.t
diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix
index 894fb118e01c..7faf26909ea9 100644
--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/pkgs/development/python-modules/twilio/default.nix
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "twilio";
- version = "9.3.4";
+ version = "9.3.6";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "twilio";
repo = "twilio-python";
rev = "refs/tags/${version}";
- hash = "sha256-74tJt3BfSKfsl0A1gz7XVzlvumQ8H++Nfp+SEknMYcY=";
+ hash = "sha256-H/MBRiGU2EnrhspX2ilVvnxdr7A50q+snCM2inobrcs=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix
index 230615d276d0..e7272708faea 100644
--- a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix
+++ b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix
@@ -60,1392 +60,1392 @@ let
in
rec {
types-aiobotocore-accessanalyzer =
- buildTypesAiobotocorePackage "accessanalyzer" "2.15.1"
- "sha256-DALSwzPriQHPReCA4DxiqDE4egt1d0kVadDLqXSEV6k=";
+ buildTypesAiobotocorePackage "accessanalyzer" "2.15.2"
+ "sha256-phl4/2H/Eca6fAEMRwF243B2tuzXYOofiWCFBmX8zAk=";
types-aiobotocore-account =
- buildTypesAiobotocorePackage "account" "2.15.1"
- "sha256-7VNgcslaFFeprI+G9Owfj24o8CFmGxqct4QWSGgxwI8=";
+ buildTypesAiobotocorePackage "account" "2.15.2"
+ "sha256-k66NAKboMyLeFnpnsDTY6i2BP7GRRWgALmva/JRtOzo=";
types-aiobotocore-acm =
- buildTypesAiobotocorePackage "acm" "2.15.1"
- "sha256-ItdsLbXVs92zb9JDwuHHvYVKArUAAeDUdt6tPxNikV0=";
+ buildTypesAiobotocorePackage "acm" "2.15.2"
+ "sha256-eLo4G5qHs9BxcuYxJUszMHxSFegzAiMmsFZO1DdVnQk=";
types-aiobotocore-acm-pca =
- buildTypesAiobotocorePackage "acm-pca" "2.15.1"
- "sha256-JSvY8qqA91SUMXs7ajfVQ6wZFNHc2XisO2haiygJg8o=";
+ buildTypesAiobotocorePackage "acm-pca" "2.15.2"
+ "sha256-Q2LW9rHXP78eKyfNN9b7c7YDeM/f/GnzbeGZJ4TDWGA=";
types-aiobotocore-alexaforbusiness =
buildTypesAiobotocorePackage "alexaforbusiness" "2.13.0"
"sha256-+w/InoQR2aZ5prieGhgEEp7auBiSSghG5zIIHY5Kyao=";
types-aiobotocore-amp =
- buildTypesAiobotocorePackage "amp" "2.15.1"
- "sha256-RJKzIa6b/ov0xpayGBgDVW2DUjIo0xNfDDh2hAvK918=";
+ buildTypesAiobotocorePackage "amp" "2.15.2"
+ "sha256-Qit4RmUHdSIcbOEQOsSZW6ARdx/S/b9qpfJxgMCP6uM=";
types-aiobotocore-amplify =
- buildTypesAiobotocorePackage "amplify" "2.15.1"
- "sha256-TNhrmgAjuJLBLXU2dlp+Ri8pJ+swgjXu1lJFGUnLEfQ=";
+ buildTypesAiobotocorePackage "amplify" "2.15.2"
+ "sha256-Omrz8qlW74Yv69ElHjCpab0X4PAQ9vWc/L9JIyM6uwk=";
types-aiobotocore-amplifybackend =
- buildTypesAiobotocorePackage "amplifybackend" "2.15.1"
- "sha256-T2mqIUobrEepz6vS/VLWq8OpUZTYRMme0SgWv+UtxmQ=";
+ buildTypesAiobotocorePackage "amplifybackend" "2.15.2"
+ "sha256-amNBmVDOA6sIEWU0K/wpQWh9q1QzNLpuqf7vEzRvouE=";
types-aiobotocore-amplifyuibuilder =
- buildTypesAiobotocorePackage "amplifyuibuilder" "2.15.1"
- "sha256-oFgte9lbXb9IM3Ezn0Jmd5djrLwgJLqeDePdBb5OZrI=";
+ buildTypesAiobotocorePackage "amplifyuibuilder" "2.15.2"
+ "sha256-uCh6W8IWBmDIYCxqdbt5PBmd/iId5u5GGUG9tjL7W2w=";
types-aiobotocore-apigateway =
- buildTypesAiobotocorePackage "apigateway" "2.15.1"
- "sha256-3gDSD6Z28yicogEeDv2i/rcmh7X9nRWrwxRL0YFZIpc=";
+ buildTypesAiobotocorePackage "apigateway" "2.15.2"
+ "sha256-+8fuio9+dP2IqQJn+t2dshAdNyayQypdQNjefhDhRjo=";
types-aiobotocore-apigatewaymanagementapi =
- buildTypesAiobotocorePackage "apigatewaymanagementapi" "2.15.1"
- "sha256-3NC66/pp4F8GsH40z0mBoaLqIKyPHGpgEAGgOnOOAGI=";
+ buildTypesAiobotocorePackage "apigatewaymanagementapi" "2.15.2"
+ "sha256-Z/ib8krZwZ03DoQS/zyB6jKet0+gmTBkOHUew/i0A+4=";
types-aiobotocore-apigatewayv2 =
- buildTypesAiobotocorePackage "apigatewayv2" "2.15.1"
- "sha256-qsiFXNECUVFDrreYOi2MLa655WAECXuPqi11z8liVN4=";
+ buildTypesAiobotocorePackage "apigatewayv2" "2.15.2"
+ "sha256-6Y8A/y30axUzYREdgLWH92gIG4pWvNkWKOxoTfYRQVw=";
types-aiobotocore-appconfig =
- buildTypesAiobotocorePackage "appconfig" "2.15.1"
- "sha256-QPhmF5urmZBb+e7KAIJihDujuDAopgQqrBspAxD6YJ4=";
+ buildTypesAiobotocorePackage "appconfig" "2.15.2"
+ "sha256-I8fTll4jIngD0UHqRx4WhM+WPXuvepHvXByYlgHSrDE=";
types-aiobotocore-appconfigdata =
- buildTypesAiobotocorePackage "appconfigdata" "2.15.1"
- "sha256-1rQCSuTShglGMwqcxiVULSbmgzpUZmubTgqlum5EeqE=";
+ buildTypesAiobotocorePackage "appconfigdata" "2.15.2"
+ "sha256-KfmKk/d1ZXcGeYvzqlJh43uHiQvsXzbyytybvEUcVbI=";
types-aiobotocore-appfabric =
- buildTypesAiobotocorePackage "appfabric" "2.15.1"
- "sha256-l/dJepTAEpsV3eJWzMbw43SrqgWuL1I3IVlVQQzZPSM=";
+ buildTypesAiobotocorePackage "appfabric" "2.15.2"
+ "sha256-+BNkaM4f+DRqiSmY0uHksGTTbU7pBuJt+y8S2GRUkdg=";
types-aiobotocore-appflow =
- buildTypesAiobotocorePackage "appflow" "2.15.1"
- "sha256-v30RZvCTHOMxsypX+Id5W7VEPC4QFYvRklPu9zaJ9x4=";
+ buildTypesAiobotocorePackage "appflow" "2.15.2"
+ "sha256-aVprs4EiYNo4+VdzQAPE8/UYMebQDYDcTjEBGAN+PdQ=";
types-aiobotocore-appintegrations =
- buildTypesAiobotocorePackage "appintegrations" "2.15.1"
- "sha256-ceiFklxI0RK06gj2ZQcvpGyW903SOxXA654MzRy3A7U=";
+ buildTypesAiobotocorePackage "appintegrations" "2.15.2"
+ "sha256-BbhuY9g4oUnBBhoo75bVpNZRWeGDYCl5kwKlW7X3Ek0=";
types-aiobotocore-application-autoscaling =
- buildTypesAiobotocorePackage "application-autoscaling" "2.15.1"
- "sha256-P9XULdNPREbu2xksZXIIxZUEggYlU3j0Jo7RzFKMawk=";
+ buildTypesAiobotocorePackage "application-autoscaling" "2.15.2"
+ "sha256-ggg7zdytM3/Gz5mTQCFCHG8NVfj+q79Wt0B/LEgSfvA=";
types-aiobotocore-application-insights =
- buildTypesAiobotocorePackage "application-insights" "2.15.1"
- "sha256-nvNJsUkMwJd41vlj7pKEn37f1Ab4l4WAJbYGqfxCmZw=";
+ buildTypesAiobotocorePackage "application-insights" "2.15.2"
+ "sha256-uGVDVNNBV7vzhsBStrEGq4EKvhp/pbcS00becWLM35E=";
types-aiobotocore-applicationcostprofiler =
- buildTypesAiobotocorePackage "applicationcostprofiler" "2.15.1"
- "sha256-/rMS/1K9dGzW89Rzd6sg9o/L56kNAO0bkDUTNKsKxxI=";
+ buildTypesAiobotocorePackage "applicationcostprofiler" "2.15.2"
+ "sha256-FvfKD+vSV4jYk62NFDqHwXNaScqQL7uxv9QhnJ5zNEI=";
types-aiobotocore-appmesh =
- buildTypesAiobotocorePackage "appmesh" "2.15.1"
- "sha256-yPEPmU3CVzddnsFd2CQp+eAji1+/bH/Vvhv6D2JbjvM=";
+ buildTypesAiobotocorePackage "appmesh" "2.15.2"
+ "sha256-t96fm5t8s6XeeyUcAF93aVdU+Zu9flGKTQBtR0wsQ1Y=";
types-aiobotocore-apprunner =
- buildTypesAiobotocorePackage "apprunner" "2.15.1"
- "sha256-gzzXHrMC0MF9RykwGmZiUtgufuRPrmGekVicXzdlFw8=";
+ buildTypesAiobotocorePackage "apprunner" "2.15.2"
+ "sha256-irCvrU+nnmWTvP+r4kVnSTz8QEFJvPCJ9MKXECikMgs=";
types-aiobotocore-appstream =
- buildTypesAiobotocorePackage "appstream" "2.15.1"
- "sha256-qbiOK2G95NdBTt1AmrQsDJbz885ugrdRBXMb9ZQcssE=";
+ buildTypesAiobotocorePackage "appstream" "2.15.2"
+ "sha256-iGmu1EKY9YXFIzLqoya+oTc0CjGw4zoKdnmZG5OTYX0=";
types-aiobotocore-appsync =
- buildTypesAiobotocorePackage "appsync" "2.15.1"
- "sha256-WYgJ2GLOxy/Va+ZY7DwwX7pBFF4zv1iQ8rptFoOlFsA=";
+ buildTypesAiobotocorePackage "appsync" "2.15.2"
+ "sha256-82XUaNGcXO6P9w1ai0yg788yn3eTZ5G5+U1CiIEMvhQ=";
types-aiobotocore-arc-zonal-shift =
- buildTypesAiobotocorePackage "arc-zonal-shift" "2.15.1"
- "sha256-9lToTikNN5kH9TCGSeQDnm6g2iM+1OGbtSpN4f6M7FM=";
+ buildTypesAiobotocorePackage "arc-zonal-shift" "2.15.2"
+ "sha256-h96kwgdTwldKgyBxy/K2nO0eRp+dsx/Zms9ZJm2jgoA=";
types-aiobotocore-athena =
- buildTypesAiobotocorePackage "athena" "2.15.1"
- "sha256-8NEZDefM/mP11YPnOCn11QfbWAMaCB5Yh2R9zQRtPpw=";
+ buildTypesAiobotocorePackage "athena" "2.15.2"
+ "sha256-L6dfltBPK+6TBs5bfrQtYoaXEzTp4h7Z1YGpThrU2mU=";
types-aiobotocore-auditmanager =
- buildTypesAiobotocorePackage "auditmanager" "2.15.1"
- "sha256-JU7s8pqfJQptll0Kh3KPDeFULM2cga0nYZSvhLk2ul4=";
+ buildTypesAiobotocorePackage "auditmanager" "2.15.2"
+ "sha256-zaO6TuUySzlKPc5SizuSFtK25LjCQCyDF/oUcfYSb9Q=";
types-aiobotocore-autoscaling =
- buildTypesAiobotocorePackage "autoscaling" "2.15.1"
- "sha256-PddQSNJ9KNGL8LQDD82+IeD4cVCR7huBkSWTqbYQfUk=";
+ buildTypesAiobotocorePackage "autoscaling" "2.15.2"
+ "sha256-L/EIaJrRPfNzwOEeJaR+E4c1niLpjBcnFYsWxcyfnkM=";
types-aiobotocore-autoscaling-plans =
- buildTypesAiobotocorePackage "autoscaling-plans" "2.15.1"
- "sha256-hUEFUNC1WdPpdu+9AQFWLvFhvBrmy3Xg7Xl4LlB4z6k=";
+ buildTypesAiobotocorePackage "autoscaling-plans" "2.15.2"
+ "sha256-X5Qi6TWVeKi5URcHkEyi1AzyFuZADgNxUFJmtbeRqrQ=";
types-aiobotocore-backup =
- buildTypesAiobotocorePackage "backup" "2.15.1"
- "sha256-E8LmUYpLqVF0WooWUXtqv4nhst1o050tx3/sRDBhd+w=";
+ buildTypesAiobotocorePackage "backup" "2.15.2"
+ "sha256-56zIY48+BtCInvbY9qtOVgIijam4suphFS8EHQak+iE=";
types-aiobotocore-backup-gateway =
- buildTypesAiobotocorePackage "backup-gateway" "2.15.1"
- "sha256-Yx/e2UIEzn47L4mQ61S0PkHBuDbz7uqc5yIw/6XrBkI=";
+ buildTypesAiobotocorePackage "backup-gateway" "2.15.2"
+ "sha256-1UIYMYwvmTlGqRoKSoLb7A3W4Ll/WfL7wm3G+kI1GJs=";
types-aiobotocore-backupstorage =
buildTypesAiobotocorePackage "backupstorage" "2.13.0"
"sha256-YUKtBdBrdwL2yqDqOovvzDPbcv/sD8JLRnKz3Oh7iSU=";
types-aiobotocore-batch =
- buildTypesAiobotocorePackage "batch" "2.15.1"
- "sha256-vZJddKOLsljDKP4WrUDZrc4hkk01FtN3wL8MXKpfuII=";
+ buildTypesAiobotocorePackage "batch" "2.15.2"
+ "sha256-iu0r4+edD0r5ZJEngGp9W+DiFYiyBXiPdQJk8bRzpU8=";
types-aiobotocore-billingconductor =
- buildTypesAiobotocorePackage "billingconductor" "2.15.1"
- "sha256-sbgwQEs21yd+xl2AuEiYEzc0Lgx7Uo/Ctibd2SEHY0c=";
+ buildTypesAiobotocorePackage "billingconductor" "2.15.2"
+ "sha256-KGnqy6p/63nN613xm8gBGtFHrGEo21kmD1q/GngIStM=";
types-aiobotocore-braket =
- buildTypesAiobotocorePackage "braket" "2.15.1"
- "sha256-CThsP2a03VbAIFr4x2x0L2fLgIxvqFV1MuMLp1eoo6A=";
+ buildTypesAiobotocorePackage "braket" "2.15.2"
+ "sha256-NAcGzPa4k+aAuSReMXK33wKMyaiPP4OCdyCfKmG//Ao=";
types-aiobotocore-budgets =
- buildTypesAiobotocorePackage "budgets" "2.15.1"
- "sha256-b1M6ZdlrG/AM3h5iM/mMAW7SrwrjApF/K0kgbFpAM14=";
+ buildTypesAiobotocorePackage "budgets" "2.15.2"
+ "sha256-NA0KUMPOrSgXU3ZQ7BcM+gYzfCPbYZecEmckOaWNJKQ=";
types-aiobotocore-ce =
- buildTypesAiobotocorePackage "ce" "2.15.1"
- "sha256-MV6dma7+hf1ITv3HJ4cJZyfpimMT5MBuspTCEjMix7I=";
+ buildTypesAiobotocorePackage "ce" "2.15.2"
+ "sha256-F8Ve+ImFP00125yzh/wQJGFlXMi7ruP+SLg8dgwFleg=";
types-aiobotocore-chime =
- buildTypesAiobotocorePackage "chime" "2.15.1"
- "sha256-24ukZo0shYVOz0HlrIj0g/xsfKz48fZHlUqcuTFvSoE=";
+ buildTypesAiobotocorePackage "chime" "2.15.2"
+ "sha256-dtMLfqQNQNJibTPaZI/quovDdWtAKdB3SS2e7PIs7Gk=";
types-aiobotocore-chime-sdk-identity =
- buildTypesAiobotocorePackage "chime-sdk-identity" "2.15.1"
- "sha256-/R22nTYf7XQBH9u8R10jHqHA4+s2iliX5+pFUyWdaG0=";
+ buildTypesAiobotocorePackage "chime-sdk-identity" "2.15.2"
+ "sha256-5UFetlbvMPN1VN862HV5sFvOVcrY2z71ZS31OEXb5uY=";
types-aiobotocore-chime-sdk-media-pipelines =
- buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "2.15.1"
- "sha256-UGogN6rRabJuNokJPeQUol9DOMBbc/pkPL+lRg5GYk0=";
+ buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "2.15.2"
+ "sha256-KMmwUEJfNZ0iNMPPm2+s0aKDB5EmWxT9urrLDiyZEhM=";
types-aiobotocore-chime-sdk-meetings =
- buildTypesAiobotocorePackage "chime-sdk-meetings" "2.15.1"
- "sha256-EDQ5H7R5U9AQnLy2rkRzSSAkFVzfZiWCqlLqP24wv2g=";
+ buildTypesAiobotocorePackage "chime-sdk-meetings" "2.15.2"
+ "sha256-7jXpLCcTd5qG6UI8zyZN5ml9D3DsSHWc0KqXhhsyZNI=";
types-aiobotocore-chime-sdk-messaging =
- buildTypesAiobotocorePackage "chime-sdk-messaging" "2.15.1"
- "sha256-7iJ+npfPI64WtlKYPLQUkJsJvhjSKCDbYBWWrv5dHwo=";
+ buildTypesAiobotocorePackage "chime-sdk-messaging" "2.15.2"
+ "sha256-vkA6I/++bwJ77FBGMrrAuvAp6AEMs/t3nJBVr2/pzD8=";
types-aiobotocore-chime-sdk-voice =
- buildTypesAiobotocorePackage "chime-sdk-voice" "2.15.1"
- "sha256-BCj6/x6lnNdUx/FjP8mLzv7zLukjwDQw2/tWrFSuU0A=";
+ buildTypesAiobotocorePackage "chime-sdk-voice" "2.15.2"
+ "sha256-fxjfPjiKcmvFJ15ukaP0HNU/PUM6mZROighcq6nuTO4=";
types-aiobotocore-cleanrooms =
- buildTypesAiobotocorePackage "cleanrooms" "2.15.1"
- "sha256-GbRu1vn7S1bILtKKf75+bR4y7OYQ6WnlUVt0HQqr/8s=";
+ buildTypesAiobotocorePackage "cleanrooms" "2.15.2"
+ "sha256-/TD2BimSLmEFw4LfZL6Tve1pBjX4uWlcl/la1S3Gg+c=";
types-aiobotocore-cloud9 =
- buildTypesAiobotocorePackage "cloud9" "2.15.1"
- "sha256-7r/W5Hbv4J58aqpedt3ehe3E99U74sFiMHo5YnIPvh8=";
+ buildTypesAiobotocorePackage "cloud9" "2.15.2"
+ "sha256-2ClX7W0zE2+UHZiqjaYdfixO0DxXZ9SuzSwkauvgV7A=";
types-aiobotocore-cloudcontrol =
- buildTypesAiobotocorePackage "cloudcontrol" "2.15.1"
- "sha256-TwBEzvuYmKyL5Bx2VCZwK0przb4MWhDVqOfl1RF3uog=";
+ buildTypesAiobotocorePackage "cloudcontrol" "2.15.2"
+ "sha256-jPndHm2SNwvMB1qkSk5sjdqjbnHZK4zE8XMOEJoMjcw=";
types-aiobotocore-clouddirectory =
- buildTypesAiobotocorePackage "clouddirectory" "2.15.1"
- "sha256-ApxmZb2xwj0Leynjqi5YC4stEt0qcWQoSq3HffbvL3k=";
+ buildTypesAiobotocorePackage "clouddirectory" "2.15.2"
+ "sha256-qq1iH1BAG4P/4hVyniMOiUdq1JUzYS1n/Oo/fmbiGXg=";
types-aiobotocore-cloudformation =
- buildTypesAiobotocorePackage "cloudformation" "2.15.1"
- "sha256-ngI/9VlHFOpAjcXi04JX+MVEdjs1cxC2UT+9MQTblGo=";
+ buildTypesAiobotocorePackage "cloudformation" "2.15.2"
+ "sha256-nGq1j9tMJw881JOtWtuDSJk36Nl3gkJD0Zi3Pouo0Bc=";
types-aiobotocore-cloudfront =
- buildTypesAiobotocorePackage "cloudfront" "2.15.1"
- "sha256-+y931CL0UdxZd5dnkSkNBAOmyuXqSb9XdIwQUKoXDTQ=";
+ buildTypesAiobotocorePackage "cloudfront" "2.15.2"
+ "sha256-gM3Q02aUPpwbNJbm17BayCPeSA7W1LRqNRyU1T7JYRo=";
types-aiobotocore-cloudhsm =
- buildTypesAiobotocorePackage "cloudhsm" "2.15.1"
- "sha256-Mv6fm2JLK4QVL1dTlVCIM1TaehUSlXTBATHvXHO26uM=";
+ buildTypesAiobotocorePackage "cloudhsm" "2.15.2"
+ "sha256-MPSf4e7fvmV7HF0FUNOfaaun7EVKfR/WSz3tu0bdREI=";
types-aiobotocore-cloudhsmv2 =
- buildTypesAiobotocorePackage "cloudhsmv2" "2.15.1"
- "sha256-9koftVpoxrFkg/WWYoLZPEf1nnWxqwEeAzeMIJB+n8A=";
+ buildTypesAiobotocorePackage "cloudhsmv2" "2.15.2"
+ "sha256-fM4YaHOSjPBL6b6mtulrmliAfi6RaWX4RT01NbE82bY=";
types-aiobotocore-cloudsearch =
- buildTypesAiobotocorePackage "cloudsearch" "2.15.1"
- "sha256-1s+EM9O5Hfsa0qKK+HFrif2dH+C7+V51MkqvuKeYwyw=";
+ buildTypesAiobotocorePackage "cloudsearch" "2.15.2"
+ "sha256-UnjA0HGzLRSag2BK5g3a2f3Ocv5D5qQaSF/BWVv6t5U=";
types-aiobotocore-cloudsearchdomain =
- buildTypesAiobotocorePackage "cloudsearchdomain" "2.15.1"
- "sha256-lDC8Za+QGc622FVrsNKPCuitYzU521BC20g7ZGUZMAI=";
+ buildTypesAiobotocorePackage "cloudsearchdomain" "2.15.2"
+ "sha256-Kzj6sgsKpqCbuR/Bqvlbj+2k3PSHYPNVs5Ijywir+B8=";
types-aiobotocore-cloudtrail =
- buildTypesAiobotocorePackage "cloudtrail" "2.15.1"
- "sha256-911ynsQTCCv9kd4TgeWR5Hv8ulz/kCnYxnw9PWk41IY=";
+ buildTypesAiobotocorePackage "cloudtrail" "2.15.2"
+ "sha256-D3pSFLhphO5LJuAMpR+YMc9LEr6PreuF0jiCblgx+eg=";
types-aiobotocore-cloudtrail-data =
- buildTypesAiobotocorePackage "cloudtrail-data" "2.15.1"
- "sha256-dh/wbIJ6VTU8++QGXa/IDUCcGpdzBB4jfaizyn9jfyo=";
+ buildTypesAiobotocorePackage "cloudtrail-data" "2.15.2"
+ "sha256-Ysfo0oRA28j4vYL2p/XSSlPDka1hWOwIFWaozAxjs4Q=";
types-aiobotocore-cloudwatch =
- buildTypesAiobotocorePackage "cloudwatch" "2.15.1"
- "sha256-nnyLWvv9esKWKlyZs9j+hUHTCBs55qC8PX5st0OHBxg=";
+ buildTypesAiobotocorePackage "cloudwatch" "2.15.2"
+ "sha256-OyeSm/UKHTET9Lcp6pgIDknKJqmDkVwqyC3x2yO1d+E=";
types-aiobotocore-codeartifact =
- buildTypesAiobotocorePackage "codeartifact" "2.15.1"
- "sha256-f8xrPRkEOrw1fFI/q0U//LjzDCymhPOBpqrGPas5te4=";
+ buildTypesAiobotocorePackage "codeartifact" "2.15.2"
+ "sha256-PAQ5Vck8tG2x7BK1HBSCwchxubdoTJXduXb4fqSKewQ=";
types-aiobotocore-codebuild =
- buildTypesAiobotocorePackage "codebuild" "2.15.1"
- "sha256-9lTVbw1mtKgIiDsI7pc2Lmd7W/1OjMBZtvWTL1mNqxM=";
+ buildTypesAiobotocorePackage "codebuild" "2.15.2"
+ "sha256-gi8JQlea6kD/k7C+Vd0KwNU9bfiHFfCdkc/VMqdLsNI=";
types-aiobotocore-codecatalyst =
- buildTypesAiobotocorePackage "codecatalyst" "2.15.1"
- "sha256-hEASqSTOFl8Pc+qBZ0Xqf36JivPVgHbZ2yZszo5Z9Uo=";
+ buildTypesAiobotocorePackage "codecatalyst" "2.15.2"
+ "sha256-A4tsBdng6gf4MdZcB86nOeW7jyBgee7L81Pz4m/rp9s=";
types-aiobotocore-codecommit =
- buildTypesAiobotocorePackage "codecommit" "2.15.1"
- "sha256-1L7UGZNkl89ULZV5LiajDZxQmLpelTsjNSvUzUzwk+I=";
+ buildTypesAiobotocorePackage "codecommit" "2.15.2"
+ "sha256-Nmr4IFs+HgkkSHct2m//k/6QPX+uMrBZxpGCQu/ktms=";
types-aiobotocore-codedeploy =
- buildTypesAiobotocorePackage "codedeploy" "2.15.1"
- "sha256-HaO/GSX14cKdKlwYmowzgWPfTDrUXyiyNlhz23lPyT8=";
+ buildTypesAiobotocorePackage "codedeploy" "2.15.2"
+ "sha256-Oo0U/ymzZx4pm47GnlRsMwXO5WQSKPHKCVLVZ73o+FM=";
types-aiobotocore-codeguru-reviewer =
- buildTypesAiobotocorePackage "codeguru-reviewer" "2.15.1"
- "sha256-0vNZTr6RNUv2TjQJ9GZIwe6jTFJH1KgJW82fVERSFIw=";
+ buildTypesAiobotocorePackage "codeguru-reviewer" "2.15.2"
+ "sha256-I8W1gWK+HCR1cX+4jRN0bk8IpgACUByK9UCfqKf2H0I=";
types-aiobotocore-codeguru-security =
- buildTypesAiobotocorePackage "codeguru-security" "2.15.1"
- "sha256-Mk5xbw1OhHcBDhohKu7emIz7c4BkxFA+LRtHrLL/LoQ=";
+ buildTypesAiobotocorePackage "codeguru-security" "2.15.2"
+ "sha256-RZkI3thRIWLZgcaupwlyzF1zd0LuLvNv/yDZphoTHT0=";
types-aiobotocore-codeguruprofiler =
- buildTypesAiobotocorePackage "codeguruprofiler" "2.15.1"
- "sha256-i/a6O3B69uPMsJsjW2hxMdLm/q2nvRwTlcpvqg0zcnQ=";
+ buildTypesAiobotocorePackage "codeguruprofiler" "2.15.2"
+ "sha256-6cB4PY0c8fB2IbLIa3pw5/0gKs9uc+TvqR20i3eiEbw=";
types-aiobotocore-codepipeline =
- buildTypesAiobotocorePackage "codepipeline" "2.15.1"
- "sha256-2i5cZ7cCy0zt71bTmAZHPCKR8GVutVR2TXeGJIlTQ54=";
+ buildTypesAiobotocorePackage "codepipeline" "2.15.2"
+ "sha256-NhB4WUrYN7noWIVGiZX5NVQ7jmr/KbZ/gaIGMwQyCtc=";
types-aiobotocore-codestar =
buildTypesAiobotocorePackage "codestar" "2.13.3"
"sha256-Z1ewx2RjmxbOQZ7wXaN54PVOuRs6LP3rMpsrVTacwjo=";
types-aiobotocore-codestar-connections =
- buildTypesAiobotocorePackage "codestar-connections" "2.15.1"
- "sha256-Qcz4JHpT34WKY0+/CRDavwiI99GCwxA/SBftb6Wi9J0=";
+ buildTypesAiobotocorePackage "codestar-connections" "2.15.2"
+ "sha256-6bP69xyRpdGzVeyH1tn7u1hLlTNNhBrNtEEXD28bXzU=";
types-aiobotocore-codestar-notifications =
- buildTypesAiobotocorePackage "codestar-notifications" "2.15.1"
- "sha256-qdVJ+6ELs5YKqIV/26Ar2FW4KC3DGofHJ/+xo5xzT3M=";
+ buildTypesAiobotocorePackage "codestar-notifications" "2.15.2"
+ "sha256-4q4DTYuoKawQXcPfzupceFTaJfYs7eQZR4T2UBIZTJo=";
types-aiobotocore-cognito-identity =
- buildTypesAiobotocorePackage "cognito-identity" "2.15.1"
- "sha256-wlpdAHtWZd1l8jYduPT0Dc0LIWxOiiA05uXTpL8fQWo=";
+ buildTypesAiobotocorePackage "cognito-identity" "2.15.2"
+ "sha256-7HHA+d6rI6phyN9vj8v8ySfUwRdFtHey3ORUtREDegc=";
types-aiobotocore-cognito-idp =
- buildTypesAiobotocorePackage "cognito-idp" "2.15.1"
- "sha256-zpuLoNTgcbYQJ0DF52qoPVm7nspMiITQczoREaCtlCI=";
+ buildTypesAiobotocorePackage "cognito-idp" "2.15.2"
+ "sha256-rm/slcrINl8WpprLdkZq3TP7LVHqXLFOwa6hHoZqIuQ=";
types-aiobotocore-cognito-sync =
- buildTypesAiobotocorePackage "cognito-sync" "2.15.1"
- "sha256-XYPt1jgk+BEjDpNH2XHNf0hoOwzewoxqxy+2qjv2dMw=";
+ buildTypesAiobotocorePackage "cognito-sync" "2.15.2"
+ "sha256-hwUY83vHarKtrDhBWUQjvEWkjzT98QgIsoWzmSCOZVw=";
types-aiobotocore-comprehend =
- buildTypesAiobotocorePackage "comprehend" "2.15.1"
- "sha256-XbQ3BYHXGNb4aKFo+WegaZ8613FiVRdthZ0zU7borjQ=";
+ buildTypesAiobotocorePackage "comprehend" "2.15.2"
+ "sha256-MplEELAL+rKGyMxJKEPTFEESi4EP1M48pSAXjFP50rA=";
types-aiobotocore-comprehendmedical =
- buildTypesAiobotocorePackage "comprehendmedical" "2.15.1"
- "sha256-3cifXhAhIxxZVRdE0Pt3SmaWwoj75iIpp6ThnLeL+BM=";
+ buildTypesAiobotocorePackage "comprehendmedical" "2.15.2"
+ "sha256-B+vdbBPeANdozCD3G4l2qyQi/IiGePBtV1uC/L8YDL8=";
types-aiobotocore-compute-optimizer =
- buildTypesAiobotocorePackage "compute-optimizer" "2.15.1"
- "sha256-8awRuy2iD9mYSuLaMrbpu0bZ1HlY9kIrF4/ZY7kECbQ=";
+ buildTypesAiobotocorePackage "compute-optimizer" "2.15.2"
+ "sha256-l3wWbiLHsIg4sg8Ktv4P6uOk1qy9v/uI8iC+jyEv0GY=";
types-aiobotocore-config =
- buildTypesAiobotocorePackage "config" "2.15.1"
- "sha256-n8RP98EO8AB0a3zqKlc7TZBttT7bHRV2EFYBy999q4g=";
+ buildTypesAiobotocorePackage "config" "2.15.2"
+ "sha256-GjC2wY6iIVssYrZi4Ql03bOgI4azJ8toRMhVmqdaF6g=";
types-aiobotocore-connect =
- buildTypesAiobotocorePackage "connect" "2.15.1"
- "sha256-9AfqyTav6mIPiBrMGP6Rh+ytAS92LdLg/4VdTaSKB6I=";
+ buildTypesAiobotocorePackage "connect" "2.15.2"
+ "sha256-18PRUxRrcwq/Nz9eWfrWO1uv7RqfgWrdrzTGpf+Y5KA=";
types-aiobotocore-connect-contact-lens =
- buildTypesAiobotocorePackage "connect-contact-lens" "2.15.1"
- "sha256-qTq+tsvlPDq9LDTNgZuwa1zva17PDm1zBMnDX5nLR1g=";
+ buildTypesAiobotocorePackage "connect-contact-lens" "2.15.2"
+ "sha256-FK3HnkkWA8B0PlY/DZUGXPVxpxD25JB3ZNDWMuMJvSA=";
types-aiobotocore-connectcampaigns =
- buildTypesAiobotocorePackage "connectcampaigns" "2.15.1"
- "sha256-kIF+sS4RpsmhiuttzwFViHaOLZ5B69O//hwEYGrMfr8=";
+ buildTypesAiobotocorePackage "connectcampaigns" "2.15.2"
+ "sha256-gumozHCg1SpV7NUYJ+SJhsSVlSvb0VQsPSCYLxhV8pA=";
types-aiobotocore-connectcases =
- buildTypesAiobotocorePackage "connectcases" "2.15.1"
- "sha256-hTUDhtsv5KWOiM9jYrT4/IW+GmnCmWnhMZpoQIClQ3k=";
+ buildTypesAiobotocorePackage "connectcases" "2.15.2"
+ "sha256-EIcgQ/i9U0nXJY3S0Cw+T3NdELyy3B1mZ640jn10BCw=";
types-aiobotocore-connectparticipant =
- buildTypesAiobotocorePackage "connectparticipant" "2.15.1"
- "sha256-ffSs8Z/TQatJDUKmjdclI5DYMf5/EI/uEi8r4EnKFds=";
+ buildTypesAiobotocorePackage "connectparticipant" "2.15.2"
+ "sha256-6ieIdjDnzr3CZqYeXhvoEXN5giZBUfab/xLjQYxMESw=";
types-aiobotocore-controltower =
- buildTypesAiobotocorePackage "controltower" "2.15.1"
- "sha256-5Sa+K+DTpM2YwTfhlufD9MxTk4pv+K1wE9PYKM1zAxw=";
+ buildTypesAiobotocorePackage "controltower" "2.15.2"
+ "sha256-les6NCF44cG768lwj7h3GVYGPW3pF7EozUP04DXB3vI=";
types-aiobotocore-cur =
- buildTypesAiobotocorePackage "cur" "2.15.1"
- "sha256-NfY/cGT+ft8bWitgYHbySblXNdYj/c/4p5jr2yOs5+c=";
+ buildTypesAiobotocorePackage "cur" "2.15.2"
+ "sha256-9tc5TZx6t46Ppd8gljnFAMu1/mt0asdpMEvHUReTgJ8=";
types-aiobotocore-customer-profiles =
- buildTypesAiobotocorePackage "customer-profiles" "2.15.1"
- "sha256-fQONh48vGKkr+ICjI3EqKW+jNXH/DSm0a96pTf4JQmk=";
+ buildTypesAiobotocorePackage "customer-profiles" "2.15.2"
+ "sha256-5FL2ySDWbh3lUspkWDjk3NNJsknW8iweQub3P/i/vik=";
types-aiobotocore-databrew =
- buildTypesAiobotocorePackage "databrew" "2.15.1"
- "sha256-DNayl61Eorza7nIjjbxbFzs+lIN3oUwpDIImJEMHX7Y=";
+ buildTypesAiobotocorePackage "databrew" "2.15.2"
+ "sha256-2hfisDJAqw4fwtrmzil0sr77khsbFUxxCDMg+fr5Y2k=";
types-aiobotocore-dataexchange =
- buildTypesAiobotocorePackage "dataexchange" "2.15.1"
- "sha256-v9bq7ub+8q2NrZtaqWqQh2MSKoGfDBdTVW1qKTSooug=";
+ buildTypesAiobotocorePackage "dataexchange" "2.15.2"
+ "sha256-SfQXMRIr07Ig/W9PZxvsYdwyuL7BPCTSLrgcR7KYosI=";
types-aiobotocore-datapipeline =
- buildTypesAiobotocorePackage "datapipeline" "2.15.1"
- "sha256-9hBxeCltGrxtMGuTKTwVp/aHHccnfDKuI0QXv50uKNA=";
+ buildTypesAiobotocorePackage "datapipeline" "2.15.2"
+ "sha256-9jC8u1JuVEOXzS4glOhSUHkkHDMUT/IpvOCOlgXORXc=";
types-aiobotocore-datasync =
- buildTypesAiobotocorePackage "datasync" "2.15.1"
- "sha256-z7t65Ioz0NtiToPkTIbYcBjWlJg1rcTIj0u/qmPkhMA=";
+ buildTypesAiobotocorePackage "datasync" "2.15.2"
+ "sha256-GpFc9Jp8lpBnVv7KiP+m4opXlbT2GZD/E+FuJIIuM2Q=";
types-aiobotocore-dax =
- buildTypesAiobotocorePackage "dax" "2.15.1"
- "sha256-/NyvlFx8/nOWClB3ZPqTt67yGN2ssYojWukw0S3v274=";
+ buildTypesAiobotocorePackage "dax" "2.15.2"
+ "sha256-8+YMDXMzMA5cdOKtLROJMFr9f/GNoVZcq8DPmQGaGyw=";
types-aiobotocore-detective =
- buildTypesAiobotocorePackage "detective" "2.15.1"
- "sha256-DWf6HTvFyMYRiOLQrawp5GwhXniNS9mhwPNyprCYrt0=";
+ buildTypesAiobotocorePackage "detective" "2.15.2"
+ "sha256-mhrEwfwNVvz1s//HXYy/afTHgJaM4jKdK2Juo5SDrlU=";
types-aiobotocore-devicefarm =
- buildTypesAiobotocorePackage "devicefarm" "2.15.1"
- "sha256-05IkwZCPZvQGkRya7TdN1huFpMxuR1zxB+b8JSFI/oM=";
+ buildTypesAiobotocorePackage "devicefarm" "2.15.2"
+ "sha256-o1MUk2hR7gwZS700rIJcjjUYoBHkO1S1Q2jeXlfT01I=";
types-aiobotocore-devops-guru =
- buildTypesAiobotocorePackage "devops-guru" "2.15.1"
- "sha256-n62US1ENdO1MFljx5zeLx+LblbiJyxefhN2+nlxu2GA=";
+ buildTypesAiobotocorePackage "devops-guru" "2.15.2"
+ "sha256-FMt/z56MiTwVuqgC1mfUeGiiv060jAwJ9zRHX3S1Pls=";
types-aiobotocore-directconnect =
- buildTypesAiobotocorePackage "directconnect" "2.15.1"
- "sha256-knhkLyC1uPX4KjiFcgFf9ys2hCz38++q55nbnUM3n/Q=";
+ buildTypesAiobotocorePackage "directconnect" "2.15.2"
+ "sha256-tMYlYP5grEjERDEIgJf5uW2tOvKQuIZ9i82/27W/1bI=";
types-aiobotocore-discovery =
- buildTypesAiobotocorePackage "discovery" "2.15.1"
- "sha256-JG/1ZQ9cSCMzqF6CVTIu7EIm0ORbLn3gM8gcCCSRhsQ=";
+ buildTypesAiobotocorePackage "discovery" "2.15.2"
+ "sha256-HecRhn7WhVtnhyf2p3/DfR8GZFe7E+FXOB6Tfo4FhQ0=";
types-aiobotocore-dlm =
- buildTypesAiobotocorePackage "dlm" "2.15.1"
- "sha256-Pyi45ZWBuEsb3GoumJkX+c8QnX3J6HobLFqwkm7I0ng=";
+ buildTypesAiobotocorePackage "dlm" "2.15.2"
+ "sha256-GPDMhuEywSHsZEb5c75luMAaJ7ezveedU9lNQkLGOzc=";
types-aiobotocore-dms =
- buildTypesAiobotocorePackage "dms" "2.15.1"
- "sha256-wius84bAUyldt84o8qUeBSzajkY8mLco85rI4NAIQcc=";
+ buildTypesAiobotocorePackage "dms" "2.15.2"
+ "sha256-ENyOPp9mO5gnHt/93OFdxAZ0j3qnTdrKHhB0wMLTb6I=";
types-aiobotocore-docdb =
- buildTypesAiobotocorePackage "docdb" "2.15.1"
- "sha256-MF8CGeObwgB5LW1o1ynwahm9GZHTvxjlgNXDyFRjpWM=";
+ buildTypesAiobotocorePackage "docdb" "2.15.2"
+ "sha256-eR5tTx2QfrujGb2f4m29Ip31DWNqgalboYDVrGFNLmA=";
types-aiobotocore-docdb-elastic =
- buildTypesAiobotocorePackage "docdb-elastic" "2.15.1"
- "sha256-+gyO2dno529rxF5Uj1pyQ0+fH1CJK7LJs/U4WIpRIX4=";
+ buildTypesAiobotocorePackage "docdb-elastic" "2.15.2"
+ "sha256-q+jMIMYoxDEC+WDY2pqFpyJE8tnc1imKBU0fin17NAg=";
types-aiobotocore-drs =
- buildTypesAiobotocorePackage "drs" "2.15.1"
- "sha256-qtMwQ17MpJ0K7zbKr4dyAGWEfHqfM+wXQe22raG/i1E=";
+ buildTypesAiobotocorePackage "drs" "2.15.2"
+ "sha256-kKoZ3i8/bXkoJ5pbj0HVBsYSVwB4eAccmCaPyIPjpp4=";
types-aiobotocore-ds =
- buildTypesAiobotocorePackage "ds" "2.15.1"
- "sha256-qU+5PMZqxbskuB/ubXeigzS5t+A5m0WW0e4NVQjFLO4=";
+ buildTypesAiobotocorePackage "ds" "2.15.2"
+ "sha256-tVONjcSBiwyW8Rok6pm+uzU1chwhrlCSVMsIw0Weh1Q=";
types-aiobotocore-dynamodb =
- buildTypesAiobotocorePackage "dynamodb" "2.15.1"
- "sha256-hQt2Htye+VubSHw+2Iz5E8IgzHGwAwmyYEkNI0br7eU=";
+ buildTypesAiobotocorePackage "dynamodb" "2.15.2"
+ "sha256-0VYAb1ZzBc23YJ1oKwlWRE0Wb8SBltWBNODxckUEtRU=";
types-aiobotocore-dynamodbstreams =
- buildTypesAiobotocorePackage "dynamodbstreams" "2.15.1"
- "sha256-n2NZxFSH9ymucBLagUAaWDgAN4kDsfKqB2W2ir6aEC8=";
+ buildTypesAiobotocorePackage "dynamodbstreams" "2.15.2"
+ "sha256-egDbhJ2SAaw6EQQXGI75x98CBLc+bUyfl8a82RMEmzY=";
types-aiobotocore-ebs =
- buildTypesAiobotocorePackage "ebs" "2.15.1"
- "sha256-nzm7mnREUd6MEHan4cTc0MaorGo/X+eKbGH1/giG16w=";
+ buildTypesAiobotocorePackage "ebs" "2.15.2"
+ "sha256-GTCz/fv3NWAD57dhqeGJYYLqQlTYx9eHGCwhKF3xKTQ=";
types-aiobotocore-ec2 =
- buildTypesAiobotocorePackage "ec2" "2.15.1"
- "sha256-QzPGQirl2zA5m2yqqXjUC8MIsUDbOg1yl252KJU+Ipc=";
+ buildTypesAiobotocorePackage "ec2" "2.15.2"
+ "sha256-13MWHHnHn17FW8NLfIxyCRwjk09xBG4rKhOn27IFB4M=";
types-aiobotocore-ec2-instance-connect =
- buildTypesAiobotocorePackage "ec2-instance-connect" "2.15.1"
- "sha256-A5OdqOTax+3/v6GG3IzU771A4l3OXQhqlowknE0DnNU=";
+ buildTypesAiobotocorePackage "ec2-instance-connect" "2.15.2"
+ "sha256-k+nxNJHuQouSxGSG/nigyvlx7qz0KvWnApGSvLPgOjQ=";
types-aiobotocore-ecr =
- buildTypesAiobotocorePackage "ecr" "2.15.1"
- "sha256-3b5SI5qHhvVIa8hqLp/YZu9b3DDpZm5ogRv0I0NuI0Y=";
+ buildTypesAiobotocorePackage "ecr" "2.15.2"
+ "sha256-MSh/z9Wzj6VUFz40U3QHe7ABj8d0HZqEidkG/lIDb6U=";
types-aiobotocore-ecr-public =
- buildTypesAiobotocorePackage "ecr-public" "2.15.1"
- "sha256-enLMc0Vg+RwO3SBzvDd/nKQvNbCllMJMS4BBKGUNWuQ=";
+ buildTypesAiobotocorePackage "ecr-public" "2.15.2"
+ "sha256-9jRWoSdETNAU8a4kTGj+4Gj+8CU3Y2m3RJSQ2Tlw4fg=";
types-aiobotocore-ecs =
- buildTypesAiobotocorePackage "ecs" "2.15.1"
- "sha256-GOUkXglekGMNDlWdz9dyGvZpgSTfnZAh3e80CMvzumA=";
+ buildTypesAiobotocorePackage "ecs" "2.15.2"
+ "sha256-ZO4pKMnUf7g4DdKGvEuEzDM3hBEDe5yOSPPXhWDSLiU=";
types-aiobotocore-efs =
- buildTypesAiobotocorePackage "efs" "2.15.1"
- "sha256-+KZQnRFKF+0nmOqec1jHa0ewAcfLBoW9mrMVNZn6q78=";
+ buildTypesAiobotocorePackage "efs" "2.15.2"
+ "sha256-BdXAO/Q7ymBnDbFccevpxTsNs5zcY5VZQtODBmbGEcI=";
types-aiobotocore-eks =
- buildTypesAiobotocorePackage "eks" "2.15.1"
- "sha256-4d/rL6L/W2zfZ1naceSfH/E1y2DUNMcQ2tJaaKsRjLw=";
+ buildTypesAiobotocorePackage "eks" "2.15.2"
+ "sha256-qKOpyzUhdoKIB253zg/iLeByAYJVsKMZ0hytwY0kU8o=";
types-aiobotocore-elastic-inference =
- buildTypesAiobotocorePackage "elastic-inference" "2.15.1"
- "sha256-AOhrrWLtKq5Wr79TcFNa+A3/MhHMnAPMIPEgcum2/ZA=";
+ buildTypesAiobotocorePackage "elastic-inference" "2.15.2"
+ "sha256-gnZqnLwqGbup02Gaqo/JbAtSMlEl6Rlcm7+3MNQ7MTs=";
types-aiobotocore-elasticache =
- buildTypesAiobotocorePackage "elasticache" "2.15.1"
- "sha256-Psxy6JILUzvwmUj9QP2wTeIgt/nbtpbG3LUozN9ltek=";
+ buildTypesAiobotocorePackage "elasticache" "2.15.2"
+ "sha256-DpTquyKW0+uGZZLDnG6+N3k/aEBWaBCd6gx2RiQZ3fk=";
types-aiobotocore-elasticbeanstalk =
- buildTypesAiobotocorePackage "elasticbeanstalk" "2.15.1"
- "sha256-3Jt67THyNfn92g6L/GZwPi0HLb6bpLuoDAkuXKPZu1Y=";
+ buildTypesAiobotocorePackage "elasticbeanstalk" "2.15.2"
+ "sha256-DV7tOZxA63kA04q+0vUpoTP7QVJ9C3D3NodvcTJJfLg=";
types-aiobotocore-elastictranscoder =
- buildTypesAiobotocorePackage "elastictranscoder" "2.15.1"
- "sha256-mGNHO2T129nPrODffC8Y9+R+XKjVVUnFrw1yDkJ0g/A=";
+ buildTypesAiobotocorePackage "elastictranscoder" "2.15.2"
+ "sha256-eFBKfNePfk9+765pfX7HVfusysU6shBHA+RFrAXKI4Y=";
types-aiobotocore-elb =
- buildTypesAiobotocorePackage "elb" "2.15.1"
- "sha256-wceBAH30EypOqb4GqTP6aL6Ribm4l6b082+vB4sRDMs=";
+ buildTypesAiobotocorePackage "elb" "2.15.2"
+ "sha256-yzE/hHLfuEO/XJF7PfRxdnxYORfFiJjWeO0RKYXKH1o=";
types-aiobotocore-elbv2 =
- buildTypesAiobotocorePackage "elbv2" "2.15.1"
- "sha256-4si+dqz/nPdXAF+eUkTICZQ8JaT+DcxEbmrxKZcF5G0=";
+ buildTypesAiobotocorePackage "elbv2" "2.15.2"
+ "sha256-sG42uIpI2QoHgo+Uuik2cQnKoINQmFXyaSZ1bVilZtA=";
types-aiobotocore-emr =
- buildTypesAiobotocorePackage "emr" "2.15.1"
- "sha256-4Ak5F+RnUlOnMvEhVTXrHXkQQzWSo7iRIojrwYifMnA=";
+ buildTypesAiobotocorePackage "emr" "2.15.2"
+ "sha256-0dBL/3beR2OKwCpxBjS5SnFx93QnHAc6c2LsvTQXI7Y=";
types-aiobotocore-emr-containers =
- buildTypesAiobotocorePackage "emr-containers" "2.15.1"
- "sha256-Q1ZGZfpub4fceqFyBTLxj5G27ByHYPRH8KvEMyFZWyQ=";
+ buildTypesAiobotocorePackage "emr-containers" "2.15.2"
+ "sha256-xNAW2n4skTQgHzrSgyfhYdPRFjvB/yYyo78rTKqoc6c=";
types-aiobotocore-emr-serverless =
- buildTypesAiobotocorePackage "emr-serverless" "2.15.1"
- "sha256-lHSPS5/HAW2NFg6zCKXARznJ1UjTWIn/YDR9XlMa1ag=";
+ buildTypesAiobotocorePackage "emr-serverless" "2.15.2"
+ "sha256-rlomQa/70HGPRCG4uf4UCAv5V/TbQ22yUNh9FsFrHGA=";
types-aiobotocore-entityresolution =
- buildTypesAiobotocorePackage "entityresolution" "2.15.1"
- "sha256-QXAAHqiq1ThUvS5Y59SXA0OKQza0IrxPUyGwpZ1Ft1U=";
+ buildTypesAiobotocorePackage "entityresolution" "2.15.2"
+ "sha256-NYKSykt5nfe5ML1b3vOBOUaHdFoEJVt+g29BRJbELhs=";
types-aiobotocore-es =
- buildTypesAiobotocorePackage "es" "2.15.1"
- "sha256-lHKKWM984zvnbcO2ord+XkbFm91y2OAJlddm3dongo8=";
+ buildTypesAiobotocorePackage "es" "2.15.2"
+ "sha256-ACWSJlnd6IjQez53QIKmrV1dtqI13yuohsMw6LC+vzI=";
types-aiobotocore-events =
- buildTypesAiobotocorePackage "events" "2.15.1"
- "sha256-3XQ9EjRu2qfpvHAWbM7XHodvMCR5PXOzM5ttes7ggEM=";
+ buildTypesAiobotocorePackage "events" "2.15.2"
+ "sha256-70GCA4DvVUz2e1oXNKrd+sDUO4FYRI2fA1Q9zg6Yw4Y=";
types-aiobotocore-evidently =
- buildTypesAiobotocorePackage "evidently" "2.15.1"
- "sha256-DR+GYAUdE7Nfn0X0sp3IshbfKjcrtFVCk3KObFlQbdM=";
+ buildTypesAiobotocorePackage "evidently" "2.15.2"
+ "sha256-5/+S+GXnUQOyu4u5NsirkbakGcq8mRzl8ss578BbMfs=";
types-aiobotocore-finspace =
- buildTypesAiobotocorePackage "finspace" "2.15.1"
- "sha256-kIg535sFaySMannjaMHmVEZqx7Lh1OnGpBc/CxMqWzY=";
+ buildTypesAiobotocorePackage "finspace" "2.15.2"
+ "sha256-TygJjwA7xBxxEFZ0vcqn3+XsOBMJLpyGnWELj0V7Ifk=";
types-aiobotocore-finspace-data =
- buildTypesAiobotocorePackage "finspace-data" "2.15.1"
- "sha256-rGvEfMJt7mmrned4uLGaN58ZGgFJzNPwxFCRu3SghWg=";
+ buildTypesAiobotocorePackage "finspace-data" "2.15.2"
+ "sha256-rVleSTHqz08/5zBhzZQio733uy0rXRtFneqtjzQjHGs=";
types-aiobotocore-firehose =
- buildTypesAiobotocorePackage "firehose" "2.15.1"
- "sha256-gkBhNs6Cpy7dL4o/SyOxwF7eCwlnHaGxbSjO0FvPxpM=";
+ buildTypesAiobotocorePackage "firehose" "2.15.2"
+ "sha256-+2rDM4qMi1AE4FZQ77Gir1VhONaq/H2NRfiwqhr4s38=";
types-aiobotocore-fis =
- buildTypesAiobotocorePackage "fis" "2.15.1"
- "sha256-BKyTNVhRzYjQDXwhTpo9rblgEonzPubmJIOrCnwaEus=";
+ buildTypesAiobotocorePackage "fis" "2.15.2"
+ "sha256-C805H2eghE45jQFdabaYl9JGTjGzKdbpJOvPUT+9etE=";
types-aiobotocore-fms =
- buildTypesAiobotocorePackage "fms" "2.15.1"
- "sha256-9v2x/BYM6tiPWPC/c7ZNJufl5EStBRq7dSW9S3jaWTc=";
+ buildTypesAiobotocorePackage "fms" "2.15.2"
+ "sha256-njmD/gMffz9BMGHaFtiLkBfQJs2qMk9fuibvbjEXdpQ=";
types-aiobotocore-forecast =
- buildTypesAiobotocorePackage "forecast" "2.15.1"
- "sha256-7B24s2z0hwaXZzj/ryhfIqbiFPaiFuC8GOn5MaYsB0U=";
+ buildTypesAiobotocorePackage "forecast" "2.15.2"
+ "sha256-CzK4VMvhuGfSygAKpJOL4zBZuKSiFoHzFmu7DDXwWhs=";
types-aiobotocore-forecastquery =
- buildTypesAiobotocorePackage "forecastquery" "2.15.1"
- "sha256-Z/Ul3IhUDhYjijXU9fFCOsG2r927wvl3pOWP+SxZ7rE=";
+ buildTypesAiobotocorePackage "forecastquery" "2.15.2"
+ "sha256-wW/e5dWz9NaWGQUcx5E51lsxMp8frgFO0d1dFpr69PA=";
types-aiobotocore-frauddetector =
- buildTypesAiobotocorePackage "frauddetector" "2.15.1"
- "sha256-ZNnWPccp4nnNAUk6tsAfV6xYS0U98rh17bTXG9+NjBY=";
+ buildTypesAiobotocorePackage "frauddetector" "2.15.2"
+ "sha256-TL/Dvkfj1i+cvBuOiyGUwFLZp4AG1VpSfEPzBAkkS24=";
types-aiobotocore-fsx =
- buildTypesAiobotocorePackage "fsx" "2.15.1"
- "sha256-72IyOCvtGPR2JNpIIy0rgiACfmDfxKlV/wo5AvzTdf4=";
+ buildTypesAiobotocorePackage "fsx" "2.15.2"
+ "sha256-smCufroBQ6UNbfOTfnr8sJbwRMLcr1d5XO3Fmsr8oF4=";
types-aiobotocore-gamelift =
- buildTypesAiobotocorePackage "gamelift" "2.15.1"
- "sha256-jFgO3ks0u/1YMjeQXHvMYoa4O35+VrvpeXWIAeJRj2I=";
+ buildTypesAiobotocorePackage "gamelift" "2.15.2"
+ "sha256-yu7KH5q1KWa0XZpX4jwtWdYItOjyK2NU824c8RawGC0=";
types-aiobotocore-gamesparks =
buildTypesAiobotocorePackage "gamesparks" "2.7.0"
"sha256-oVbKtuLMPpCQcZYx/cH1Dqjv/t6/uXsveflfFVqfN+8=";
types-aiobotocore-glacier =
- buildTypesAiobotocorePackage "glacier" "2.15.1"
- "sha256-5BewcGF6cDdPnTqyKLHlJIYuiv5N4GSuIlouRCEMeAQ=";
+ buildTypesAiobotocorePackage "glacier" "2.15.2"
+ "sha256-uvVtYnhswWmCCngRxzSucyWMD8IiUMv51TYH+KvePOo=";
types-aiobotocore-globalaccelerator =
- buildTypesAiobotocorePackage "globalaccelerator" "2.15.1"
- "sha256-fh2RP530haUdEOM7noDiBmiHf5Cv+YvF8S4Xoh84K20=";
+ buildTypesAiobotocorePackage "globalaccelerator" "2.15.2"
+ "sha256-EG+Mub4z9+e1FSOYM9TymEBLkptdBCORAzq5f+FgDb8=";
types-aiobotocore-glue =
- buildTypesAiobotocorePackage "glue" "2.15.1"
- "sha256-z4fe7DbzI2AIkCa4qBS4kGyPcgti1d/CPJCqe82OuR4=";
+ buildTypesAiobotocorePackage "glue" "2.15.2"
+ "sha256-Yt9Bdj97pjBNjzAs4yfhPVXumdZBMR8K6fh9RMVE44U=";
types-aiobotocore-grafana =
- buildTypesAiobotocorePackage "grafana" "2.15.1"
- "sha256-V6uqUzVntsISmOUH9Mjy5DjLxiYkPN9k6BtQFwer4wM=";
+ buildTypesAiobotocorePackage "grafana" "2.15.2"
+ "sha256-9SxJCAQTFvkyLLMUjZa8Sw8gmvA7CEmq8plCL2Im2vI=";
types-aiobotocore-greengrass =
- buildTypesAiobotocorePackage "greengrass" "2.15.1"
- "sha256-C/W6eBJauG9QI8MMc7hFzkN4A21RRMH6kSU5Wq/qXus=";
+ buildTypesAiobotocorePackage "greengrass" "2.15.2"
+ "sha256-o2zx53sUfII3M2riAnSof/W0zjP1aDUMnRmZmFPuQZg=";
types-aiobotocore-greengrassv2 =
- buildTypesAiobotocorePackage "greengrassv2" "2.15.1"
- "sha256-00hMhRWJ4W91I6cG5IXyyNqjyxPFrwmbHp69EWIIkMg=";
+ buildTypesAiobotocorePackage "greengrassv2" "2.15.2"
+ "sha256-gFUVkGUva3v9BgvOiSZTJlLEmR8xJPdbtraUXc3uDvE=";
types-aiobotocore-groundstation =
- buildTypesAiobotocorePackage "groundstation" "2.15.1"
- "sha256-++YYod+5UlCzknDJ/0l3hwPNukO9o2M0CoZR0lyOTnA=";
+ buildTypesAiobotocorePackage "groundstation" "2.15.2"
+ "sha256-j8tHv3buQXMUNcu13zEqYEgh9y32qvZtGf7RwL/Ded0=";
types-aiobotocore-guardduty =
- buildTypesAiobotocorePackage "guardduty" "2.15.1"
- "sha256-+fJrH77TQKCBoio2R3LEJLmUOtSXd9oaf+PaN0YyEdA=";
+ buildTypesAiobotocorePackage "guardduty" "2.15.2"
+ "sha256-mvlSXeVh+aqX5nCBiDmLfVY3YzT8S3JGHqTmBECxijQ=";
types-aiobotocore-health =
- buildTypesAiobotocorePackage "health" "2.15.1"
- "sha256-KNaHkgFc1W6cK7nwt7ZibmeL3zMmO2/6O1OlRkrUERY=";
+ buildTypesAiobotocorePackage "health" "2.15.2"
+ "sha256-5aQSWo0L9uonXTWh5tZzukj5Jka2iJQF7Pn55tOR4to=";
types-aiobotocore-healthlake =
- buildTypesAiobotocorePackage "healthlake" "2.15.1"
- "sha256-JtP47qVkcTMtafPT/YbEu/CFOh4yp1VLICTVzB2LeV4=";
+ buildTypesAiobotocorePackage "healthlake" "2.15.2"
+ "sha256-MbPcf35D3xDJsReScEoRsMEbNcxCNqP6awnZ3wzEnK4=";
types-aiobotocore-honeycode =
buildTypesAiobotocorePackage "honeycode" "2.13.0"
"sha256-DeeheoQeFEcDH21DSNs2kSR1rjnPLtTgz0yNCFnE+Io=";
types-aiobotocore-iam =
- buildTypesAiobotocorePackage "iam" "2.15.1"
- "sha256-CKNmGY362fvOEdm9+UvElI9U3dZhjY4sTDnuzBaPJyw=";
+ buildTypesAiobotocorePackage "iam" "2.15.2"
+ "sha256-gj0mnoKF4hCs6oWAil9XS6V/8YnmGVEu6dvh4l3Gl9o=";
types-aiobotocore-identitystore =
- buildTypesAiobotocorePackage "identitystore" "2.15.1"
- "sha256-LIEyxMseTo/G44R9gUeWFOoR/k1aZ1a6nLA8uuoti70=";
+ buildTypesAiobotocorePackage "identitystore" "2.15.2"
+ "sha256-OFIHUrjhNBztSEhictiFeLCcIITmihIIs337DT2z6IM=";
types-aiobotocore-imagebuilder =
- buildTypesAiobotocorePackage "imagebuilder" "2.15.1"
- "sha256-YromFw8hMXBV3v9rAfmAFg/1MWMSsBR8jCjgnN3Qjdc=";
+ buildTypesAiobotocorePackage "imagebuilder" "2.15.2"
+ "sha256-iVa8PY/Ymt8C8x0uWlLAvKcMWhxm/i0Fjy8+wq+vBAs=";
types-aiobotocore-importexport =
- buildTypesAiobotocorePackage "importexport" "2.15.1"
- "sha256-UvwCZclRwoDaAMhY6CdhCADFs0m258Z34FVTH95CrZ8=";
+ buildTypesAiobotocorePackage "importexport" "2.15.2"
+ "sha256-XODBb05MkRhTPkK44G1dF5PCObngkR0JIenShPg/SEM=";
types-aiobotocore-inspector =
- buildTypesAiobotocorePackage "inspector" "2.15.1"
- "sha256-5vgqzDYe/y3vHvKFuYfhArZfmLHRPDuhGaSBRHWUiis=";
+ buildTypesAiobotocorePackage "inspector" "2.15.2"
+ "sha256-W6cJuqZoOgrSHKWvYnLmNpyfswjJbB/pYfSyUYcN5Qg=";
types-aiobotocore-inspector2 =
- buildTypesAiobotocorePackage "inspector2" "2.15.1"
- "sha256-2CPWpQt1jylh05MtxFIoig4DVoSBkHYVKEl0j/2s1v0=";
+ buildTypesAiobotocorePackage "inspector2" "2.15.2"
+ "sha256-toUQmdF8Tdakr6cIfAty6mIyHQ7lHyYheEbkrVDsD3g=";
types-aiobotocore-internetmonitor =
- buildTypesAiobotocorePackage "internetmonitor" "2.15.1"
- "sha256-aXAhRpaoJC0BR/KqG/0FF139mLFBTaqQdr0m5B8vz/k=";
+ buildTypesAiobotocorePackage "internetmonitor" "2.15.2"
+ "sha256-w8XaOTpY69HY4Y9HXHRzs/UNYVLEJ+OY4vL7K9CYZlU=";
types-aiobotocore-iot =
- buildTypesAiobotocorePackage "iot" "2.15.1"
- "sha256-iVdmdRpw4/gj6Lsy6gP8C6HwvIKhKmKHpvR5HoB4jE8=";
+ buildTypesAiobotocorePackage "iot" "2.15.2"
+ "sha256-KV3EkKI3KoPCwK0lGDyCRF3QzKgdt3VP0mzm0S1Urko=";
types-aiobotocore-iot-data =
- buildTypesAiobotocorePackage "iot-data" "2.15.1"
- "sha256-WVcWtkcrV0jTqCuygnDi6CZFVt/xuReFy6ji+BAjylQ=";
+ buildTypesAiobotocorePackage "iot-data" "2.15.2"
+ "sha256-j7Kffix+aoo6N0IKNtKuD1cmIxk/yeNXgQUvTwAOFNI=";
types-aiobotocore-iot-jobs-data =
- buildTypesAiobotocorePackage "iot-jobs-data" "2.15.1"
- "sha256-Ym5Pxg3N++/QRdLNzHAOZQmObdroyhgO6tPHLmGfCPY=";
+ buildTypesAiobotocorePackage "iot-jobs-data" "2.15.2"
+ "sha256-rbNjx7Moa6xY8aQRNF54hurpbr/jLhDfR0IXZNKaZXg=";
types-aiobotocore-iot-roborunner =
buildTypesAiobotocorePackage "iot-roborunner" "2.12.2"
"sha256-O/nGvYfUibI4EvHgONtkYHFv/dZSpHCehXjietPiMJo=";
types-aiobotocore-iot1click-devices =
- buildTypesAiobotocorePackage "iot1click-devices" "2.15.1"
- "sha256-OJmSfZaKAfiq7UImpgF/wKTzYaqxlhqrkOAbk7OchrM=";
+ buildTypesAiobotocorePackage "iot1click-devices" "2.15.2"
+ "sha256-OK7Yw0t1rSXQz2BJrP0zYorMjGGdac2SS9IpKNrF6y4=";
types-aiobotocore-iot1click-projects =
- buildTypesAiobotocorePackage "iot1click-projects" "2.15.1"
- "sha256-8Q6P8K87YIs+UsR5Vyyx9IMBW0fLAMqCu/LkqkUQYEU=";
+ buildTypesAiobotocorePackage "iot1click-projects" "2.15.2"
+ "sha256-kNEVudATczB+qs0XyihgJbmH/02Ds8tGuzKWQ5IDj4M=";
types-aiobotocore-iotanalytics =
- buildTypesAiobotocorePackage "iotanalytics" "2.15.1"
- "sha256-HkzZSHFbEWv67uQRIH6W/CsAFI1HpsFeNLvbqjQEJsQ=";
+ buildTypesAiobotocorePackage "iotanalytics" "2.15.2"
+ "sha256-scMpD4ZGJyTA97b70t80fE/mQkS5LwumJCWD2v7ul9w=";
types-aiobotocore-iotdeviceadvisor =
- buildTypesAiobotocorePackage "iotdeviceadvisor" "2.15.1"
- "sha256-SMNXQLSk9rFAXgEKXk23cjWRRvhnUcskkQyeSetngcE=";
+ buildTypesAiobotocorePackage "iotdeviceadvisor" "2.15.2"
+ "sha256-XLS46QND2ZNbm0pB73gGrkJVS8ulEoBPAf2EucNQqNA=";
types-aiobotocore-iotevents =
- buildTypesAiobotocorePackage "iotevents" "2.15.1"
- "sha256-vRnjkeGogwcdtRFybEuqB4FjR89N0KR8pdDWs4caa8I=";
+ buildTypesAiobotocorePackage "iotevents" "2.15.2"
+ "sha256-b21od8f3xlkyMebl6QFNKqhGCO4FcioMWX8odrKolnk=";
types-aiobotocore-iotevents-data =
- buildTypesAiobotocorePackage "iotevents-data" "2.15.1"
- "sha256-j9yAFJUVBUtViPCO3DBCo1tC9AcLO2Uy4I2lfThBV+I=";
+ buildTypesAiobotocorePackage "iotevents-data" "2.15.2"
+ "sha256-laNqog/9QdCDOtNhmBwki2hfJur9M+M6rqdVVZZKRyk=";
types-aiobotocore-iotfleethub =
- buildTypesAiobotocorePackage "iotfleethub" "2.15.1"
- "sha256-k7D8o7sxTlyjmlCBmt2uY/FKC6KUWmx9LL9k2zedszU=";
+ buildTypesAiobotocorePackage "iotfleethub" "2.15.2"
+ "sha256-cXdG48rRVvZtvg0nnPcl6lDmyukhQpGH2tHyMhp6KpA=";
types-aiobotocore-iotfleetwise =
- buildTypesAiobotocorePackage "iotfleetwise" "2.15.1"
- "sha256-lozZuY4r9CkPi+SD9p/T35HyjiHVMmJ33GKNEZ/htPc=";
+ buildTypesAiobotocorePackage "iotfleetwise" "2.15.2"
+ "sha256-Qokco8UgSqsRZ03NawYHvyCx9qc+/q2mYPUEp+OhqOA=";
types-aiobotocore-iotsecuretunneling =
- buildTypesAiobotocorePackage "iotsecuretunneling" "2.15.1"
- "sha256-3Bw3N2aIUzKNLyMGnHsxQB8bofonIcqJANariAKqXsI=";
+ buildTypesAiobotocorePackage "iotsecuretunneling" "2.15.2"
+ "sha256-Iq6WU6a7bfb8+ob0feMoVbJr0J3tQI7L0nsV7X7E3rM=";
types-aiobotocore-iotsitewise =
- buildTypesAiobotocorePackage "iotsitewise" "2.15.1"
- "sha256-WZqYRDV21kkgBMb5z+6KKTlGxDJKXmMl1u3RlTPavl4=";
+ buildTypesAiobotocorePackage "iotsitewise" "2.15.2"
+ "sha256-9XjABgFHnbEIztv7CiS2QX/dUgawqic3XEJ5CSt0oEk=";
types-aiobotocore-iotthingsgraph =
- buildTypesAiobotocorePackage "iotthingsgraph" "2.15.1"
- "sha256-/ArOj+prhHoDPRymOW4NN8IXNkWuE/wZJuRAXMVmzpg=";
+ buildTypesAiobotocorePackage "iotthingsgraph" "2.15.2"
+ "sha256-pbVgFQOcfnEjPRYsXz+XHEh9Xa0aAZvTD7coaYt2uR0=";
types-aiobotocore-iottwinmaker =
- buildTypesAiobotocorePackage "iottwinmaker" "2.15.1"
- "sha256-gE3/juMs0BFJZEq291UGWAh41NCRHWHmZY+KcZ9IFJE=";
+ buildTypesAiobotocorePackage "iottwinmaker" "2.15.2"
+ "sha256-hyyW7WVaxyvus78zPDvy9g8J1/ZY3r0RbjhcgApVx0E=";
types-aiobotocore-iotwireless =
- buildTypesAiobotocorePackage "iotwireless" "2.15.1"
- "sha256-PRORLAzdQ0QmYSPYWrQaPSwW8JaeTyzg8Z+N8/Hqjz8=";
+ buildTypesAiobotocorePackage "iotwireless" "2.15.2"
+ "sha256-+vc1U5s8yLnpBsrB1rzuwZj1z/ECe4NTUfIcuO5FRdk=";
types-aiobotocore-ivs =
- buildTypesAiobotocorePackage "ivs" "2.15.1"
- "sha256-OIvBSFt9S+SmZIjdw/zcC/FC/3d9Huce5jQXgj5D+ik=";
+ buildTypesAiobotocorePackage "ivs" "2.15.2"
+ "sha256-lkDOjzhDWTFECa+hxb8EIVpxd+j9FSHGb9L9fRePNRo=";
types-aiobotocore-ivs-realtime =
- buildTypesAiobotocorePackage "ivs-realtime" "2.15.1"
- "sha256-Eh5fuYJawPwAFuQl0/wLq+gTJ02C5wFZsETDsOSi3LU=";
+ buildTypesAiobotocorePackage "ivs-realtime" "2.15.2"
+ "sha256-hFFPTJHySEHbcNwgg6YnU8GJBDA8y2F1pyAY2jpw8CE=";
types-aiobotocore-ivschat =
- buildTypesAiobotocorePackage "ivschat" "2.15.1"
- "sha256-jk6zZ3zX94kIfld9oXd6zW7ILhaa01XOt7c+/5pn8kk=";
+ buildTypesAiobotocorePackage "ivschat" "2.15.2"
+ "sha256-/nKK+JmeOr6zG8OEeNvBT1cWUTD55gK/LCFze3/P4p8=";
types-aiobotocore-kafka =
- buildTypesAiobotocorePackage "kafka" "2.15.1"
- "sha256-NJv1QF3qBn5LJ7yhKcSmy6W3OJ8kenfzQ4RkSRx8iTo=";
+ buildTypesAiobotocorePackage "kafka" "2.15.2"
+ "sha256-H+1xCc+/5RZ684yMxhzqUTysj9QvUMMVMcd+kI9PGZQ=";
types-aiobotocore-kafkaconnect =
- buildTypesAiobotocorePackage "kafkaconnect" "2.15.1"
- "sha256-7EDrF3TxDgLeAnbUeLQj7SpFPLB+uMjqc/sQxWaXYlU=";
+ buildTypesAiobotocorePackage "kafkaconnect" "2.15.2"
+ "sha256-JH+0rJQmzsJ/LBWMSp/UsjtFpD6FmMtkfr0+9tJKKoY=";
types-aiobotocore-kendra =
- buildTypesAiobotocorePackage "kendra" "2.15.1"
- "sha256-8k/FEmIfl2dKDt4JrCWdrLskYuj+A2VEHm0jqHWfUp8=";
+ buildTypesAiobotocorePackage "kendra" "2.15.2"
+ "sha256-+gQGQmC8lgxAF0Pyo7mloBLN/iSfqvM67KyntXFU4wg=";
types-aiobotocore-kendra-ranking =
- buildTypesAiobotocorePackage "kendra-ranking" "2.15.1"
- "sha256-ZaDBuYlm35DRaiKv+xV2L+e/E5x1rGN59UTL2U5bRp8=";
+ buildTypesAiobotocorePackage "kendra-ranking" "2.15.2"
+ "sha256-Qg/EN+M3YqqnYkYBFm34YoDnxfEFbmA7YUId/+YmEME=";
types-aiobotocore-keyspaces =
- buildTypesAiobotocorePackage "keyspaces" "2.15.1"
- "sha256-UgzrxIq3vh8dfw80VCue7gf8l19TqRUmRuAS/cW/G1M=";
+ buildTypesAiobotocorePackage "keyspaces" "2.15.2"
+ "sha256-QjwiOj8YhfmCjmM+7C4WP5kPtQcpLb7TbXam/+XMH0U=";
types-aiobotocore-kinesis =
- buildTypesAiobotocorePackage "kinesis" "2.15.1"
- "sha256-MF7n5Z70BFUAXaFuTDWIzFuiZ3u1fpYoZrBfRQR97Qw=";
+ buildTypesAiobotocorePackage "kinesis" "2.15.2"
+ "sha256-1kwvF+RK4CjpEyv/BAi7u6R4kdL2y6PiWrp4pWt38yw=";
types-aiobotocore-kinesis-video-archived-media =
- buildTypesAiobotocorePackage "kinesis-video-archived-media" "2.15.1"
- "sha256-bEZV3TDr3l6Ogn49kFW/3IcFi/4NjQQnaC1LrDChlcI=";
+ buildTypesAiobotocorePackage "kinesis-video-archived-media" "2.15.2"
+ "sha256-vudWpiyA9u3f5v191Ajh/K5EvZJLeaKxqjo5oPjRbuk=";
types-aiobotocore-kinesis-video-media =
- buildTypesAiobotocorePackage "kinesis-video-media" "2.15.1"
- "sha256-PPT89cO2FukHtnXQHgcNZie3vPCDBmbrfRDiZCZaJ1E=";
+ buildTypesAiobotocorePackage "kinesis-video-media" "2.15.2"
+ "sha256-t2FvtZiKBLfD/RADQ3+6ZzfUXUnq/PYMAMHj1YQmobU=";
types-aiobotocore-kinesis-video-signaling =
- buildTypesAiobotocorePackage "kinesis-video-signaling" "2.15.1"
- "sha256-Fez2At/MFggTu7ZtfKLWCm7iELH6gumBhn3t7KdJzVA=";
+ buildTypesAiobotocorePackage "kinesis-video-signaling" "2.15.2"
+ "sha256-ImrtDqLs6k8nQBtXa0gEH34kFlBorZSrX1hCRqV130o=";
types-aiobotocore-kinesis-video-webrtc-storage =
- buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "2.15.1"
- "sha256-5h9x9Rgb1Sb8wIQwRcjkonc2070QahwPkKXfQ/lFFI8=";
+ buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "2.15.2"
+ "sha256-Jb1oWeQgXmLP7fFSWG5ZgNLzUaZRITNGhVWWMlfQLQc=";
types-aiobotocore-kinesisanalytics =
- buildTypesAiobotocorePackage "kinesisanalytics" "2.15.1"
- "sha256-JEye+bOxLrRJDToMs5jQZ2wcHy1K/2C5oPFUIRrtO5g=";
+ buildTypesAiobotocorePackage "kinesisanalytics" "2.15.2"
+ "sha256-LXVmEz3iHWl3Svg5F3X06CJvStcQdwOlSS8m+uQj+Hk=";
types-aiobotocore-kinesisanalyticsv2 =
- buildTypesAiobotocorePackage "kinesisanalyticsv2" "2.15.1"
- "sha256-j2gcnHFfWTVD3NatfJXsp3hRVEsy4930OclgR5IPbDM=";
+ buildTypesAiobotocorePackage "kinesisanalyticsv2" "2.15.2"
+ "sha256-RCz0ySwc+gWzyVDKTFT2pXkqy9PEmg6uF8BOoLHzvmA=";
types-aiobotocore-kinesisvideo =
- buildTypesAiobotocorePackage "kinesisvideo" "2.15.1"
- "sha256-mnKzF2lgYtHTNEwecoqs4qt9hQ5m2xLo79/kZHFyF5I=";
+ buildTypesAiobotocorePackage "kinesisvideo" "2.15.2"
+ "sha256-m1movOOFQVLCzKSCWSoYv03Ig9D0qJ17O73tk4XaTX0=";
types-aiobotocore-kms =
- buildTypesAiobotocorePackage "kms" "2.15.1"
- "sha256-CCyhwWkjtI7wp5CN1MCK0M//bOu4ZGttbHJSUcidjUA=";
+ buildTypesAiobotocorePackage "kms" "2.15.2"
+ "sha256-9EXCtfSVjSuyszl3H8Llk5j/KYmU9HSUFP/k1Btrlv4=";
types-aiobotocore-lakeformation =
- buildTypesAiobotocorePackage "lakeformation" "2.15.1"
- "sha256-+BlDjTPv+fmKmUInm6FpOQFt5H5atz7BWKhrt56A3Co=";
+ buildTypesAiobotocorePackage "lakeformation" "2.15.2"
+ "sha256-zYavyl1U94TCsmjyVhedtexjl0B+2FN3jo6Dg2adePo=";
types-aiobotocore-lambda =
- buildTypesAiobotocorePackage "lambda" "2.15.1"
- "sha256-hCTL2KBMt5p51YwnOYNcpGvzG2wvZjt23kK3FX4Qp5U=";
+ buildTypesAiobotocorePackage "lambda" "2.15.2"
+ "sha256-vRsrDk4dzT7wsCeaNE2dnf8blwM/Unb3lAN8Dc0x7SA=";
types-aiobotocore-lex-models =
- buildTypesAiobotocorePackage "lex-models" "2.15.1"
- "sha256-A8BAADavGEB7sa+fh9SRahoqN3mne7ABZjcnZI9YfBk=";
+ buildTypesAiobotocorePackage "lex-models" "2.15.2"
+ "sha256-jSO3wtWRgXuPCHFfFgBDw0lMsOYb1IjqzCmo1WX6Gr4=";
types-aiobotocore-lex-runtime =
- buildTypesAiobotocorePackage "lex-runtime" "2.15.1"
- "sha256-QVYHr4fbnZPozVghHOZVsyChTuP2S0Ys+876slONaEc=";
+ buildTypesAiobotocorePackage "lex-runtime" "2.15.2"
+ "sha256-BdaqbSjKpsFeDTh7ttj1j48YDSMP651UpgmqmM82KpI=";
types-aiobotocore-lexv2-models =
- buildTypesAiobotocorePackage "lexv2-models" "2.15.1"
- "sha256-uqZrNG/mOCnfYjNF5FQofjSUeXhnidunT1754yame7E=";
+ buildTypesAiobotocorePackage "lexv2-models" "2.15.2"
+ "sha256-sJZcOkCK9x7RsFo6mVR7FGmictWprwVUlPpzuMbQEn4=";
types-aiobotocore-lexv2-runtime =
- buildTypesAiobotocorePackage "lexv2-runtime" "2.15.1"
- "sha256-hQGTDbhJNiJc5dORzg7XJ4p+ZatNcI0qoT70qtMHzHc=";
+ buildTypesAiobotocorePackage "lexv2-runtime" "2.15.2"
+ "sha256-dmn/Q2ljn4+AIryiIcytMGxAS92Q0vZdv2yuuA3/0vo=";
types-aiobotocore-license-manager =
- buildTypesAiobotocorePackage "license-manager" "2.15.1"
- "sha256-4whyQ2X/R2eMdQ7DOygNQFqMgLA+w+6ydyN8s7yxgB4=";
+ buildTypesAiobotocorePackage "license-manager" "2.15.2"
+ "sha256-HfsmPqnNEoBM/Q6d5GbhV1qykXlO2KE9DURQi7cEnBo=";
types-aiobotocore-license-manager-linux-subscriptions =
- buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "2.15.1"
- "sha256-uD/N/ueijWNwibOrivY0r2HiQjYOuHQUONcW3iRCVUY=";
+ buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "2.15.2"
+ "sha256-u4pZBE0deFVSfZ4B5LXXXOBDb/SkpnCTi1pHQ7ZVyb0=";
types-aiobotocore-license-manager-user-subscriptions =
- buildTypesAiobotocorePackage "license-manager-user-subscriptions" "2.15.1"
- "sha256-wWghsiPCvWY7VX5XV0ad65nnG9bI5F+E5xEUzOGDdnY=";
+ buildTypesAiobotocorePackage "license-manager-user-subscriptions" "2.15.2"
+ "sha256-Ldd8K7DIjE0cNqvdWWVno2ehVzmtdt9IyLdUKuM1k5k=";
types-aiobotocore-lightsail =
- buildTypesAiobotocorePackage "lightsail" "2.15.1"
- "sha256-dcGUPUxGvD/ZEyoo193VVOhSJhoFkgwSjpOV1kX/vMM=";
+ buildTypesAiobotocorePackage "lightsail" "2.15.2"
+ "sha256-Odx5WGYh8Xlv6ahMuNjj3XzXftrKQdILAoGMoDz9aBQ=";
types-aiobotocore-location =
- buildTypesAiobotocorePackage "location" "2.15.1"
- "sha256-4rTqmcRB3HjskWJZLbQaPDyNQGHXmVVJqb5LK+EPH6Y=";
+ buildTypesAiobotocorePackage "location" "2.15.2"
+ "sha256-KjQ02j1x55qp+6RA1pWe4z53rUgd0Z59dp4vjHVSwlY=";
types-aiobotocore-logs =
- buildTypesAiobotocorePackage "logs" "2.15.1"
- "sha256-CRluCc0/byuRlGr3uQyWg/MfCpPnoiS5inNLiYkhwCY=";
+ buildTypesAiobotocorePackage "logs" "2.15.2"
+ "sha256-4cxlv7ZSVy92Ewm5jgjqAXRKjFOczaYhl74zR+wGltU=";
types-aiobotocore-lookoutequipment =
- buildTypesAiobotocorePackage "lookoutequipment" "2.15.1"
- "sha256-q5ExCn4HAdAGISDIRckrnlmQ+J1RDNgBa5hmYSJHtVc=";
+ buildTypesAiobotocorePackage "lookoutequipment" "2.15.2"
+ "sha256-gEmhfU9rLE2hFRumda25SSBqhgOgZFza0lPiN+z6sGs=";
types-aiobotocore-lookoutmetrics =
- buildTypesAiobotocorePackage "lookoutmetrics" "2.15.1"
- "sha256-SvJor9naL/MzyTtHjOn2QMNnLYXnmHYH11DuWg0+y/U=";
+ buildTypesAiobotocorePackage "lookoutmetrics" "2.15.2"
+ "sha256-VN3E+UkX8wvQqY3J5SSIfCcpDM/wfuqMvX6KbMUfFkU=";
types-aiobotocore-lookoutvision =
- buildTypesAiobotocorePackage "lookoutvision" "2.15.1"
- "sha256-68PGFV+fSjjwAq4SoiOAaJXw1jKdQegFgz2UeHV9iL8=";
+ buildTypesAiobotocorePackage "lookoutvision" "2.15.2"
+ "sha256-6Tpk8lEKtYjIiXNI1VgH65RkCc6/Cp9qhB/5NHtl0ok=";
types-aiobotocore-m2 =
- buildTypesAiobotocorePackage "m2" "2.15.1"
- "sha256-TrP432QWYmAmnka3CiWklZh3g/xrLhGJVw8iWLR5f8E=";
+ buildTypesAiobotocorePackage "m2" "2.15.2"
+ "sha256-ZK+mMbIaY2BmeZU0P4GTMcbTcUOJ1k0ErkRTDu/LdeQ=";
types-aiobotocore-machinelearning =
- buildTypesAiobotocorePackage "machinelearning" "2.15.1"
- "sha256-0+nIbuZeuKIhQiC2+kSaDztMLOUe9rZ+guDROGM+YI4=";
+ buildTypesAiobotocorePackage "machinelearning" "2.15.2"
+ "sha256-CkcJc43D+K24tN+MO48iIpkWINQ5v39Us6XiAerY5ug=";
types-aiobotocore-macie =
buildTypesAiobotocorePackage "macie" "2.7.0"
"sha256-hJJtGsK2b56nKX1ZhiarC+ffyjHYWRiC8II4oyDZWWw=";
types-aiobotocore-macie2 =
- buildTypesAiobotocorePackage "macie2" "2.15.1"
- "sha256-lJq53Sxg+RpZSeQKG+nu0EhRQEEUSPoWqiORJUcoqEI=";
+ buildTypesAiobotocorePackage "macie2" "2.15.2"
+ "sha256-XVUlAYWbCKlIHDD0KnAf1x5aIzPQOwDF/MUf2Cn0w2E=";
types-aiobotocore-managedblockchain =
- buildTypesAiobotocorePackage "managedblockchain" "2.15.1"
- "sha256-RZUktF80I0PXhIPEZJav1i1a4FyFSyHODTeUsIcDHGE=";
+ buildTypesAiobotocorePackage "managedblockchain" "2.15.2"
+ "sha256-bS54O33UB62+P6Lz+u4zzBDMP/dGG0EQYzJwabrLEzE=";
types-aiobotocore-managedblockchain-query =
- buildTypesAiobotocorePackage "managedblockchain-query" "2.15.1"
- "sha256-xmPCGjlO0EThkhUWy+VlHLplAx7f7+zXKzr5hb/1e6A=";
+ buildTypesAiobotocorePackage "managedblockchain-query" "2.15.2"
+ "sha256-tI0WjxdRupLqL437/Q9W7Yd6PEzU2GBsfAGU/3UssG8=";
types-aiobotocore-marketplace-catalog =
- buildTypesAiobotocorePackage "marketplace-catalog" "2.15.1"
- "sha256-OJeNrERgHfCYfgpn+DMmo7ZgUujg5G3bQpedipAxbX4=";
+ buildTypesAiobotocorePackage "marketplace-catalog" "2.15.2"
+ "sha256-L23ZQ4bGhQtHat3xWT/IIbrTr4UnZ1wY2Cco9Z4ae4s=";
types-aiobotocore-marketplace-entitlement =
- buildTypesAiobotocorePackage "marketplace-entitlement" "2.15.1"
- "sha256-0tSQ1wnz7R7KaRVsoNGeUcbmf4cRBrUMArCEEDJRrtc=";
+ buildTypesAiobotocorePackage "marketplace-entitlement" "2.15.2"
+ "sha256-7SXKNz2Lz2aewLAcKVvuIZShdGCRHZbwyKy2araKo3A=";
types-aiobotocore-marketplacecommerceanalytics =
- buildTypesAiobotocorePackage "marketplacecommerceanalytics" "2.15.1"
- "sha256-gq//bvGswyJgLHypO0vC0rUruMvr5DH0TQPgxb6Xkrc=";
+ buildTypesAiobotocorePackage "marketplacecommerceanalytics" "2.15.2"
+ "sha256-qbAaQevFItdsIk7Je5ng9EMrTgVRfMmSmCeYSH7BXMY=";
types-aiobotocore-mediaconnect =
- buildTypesAiobotocorePackage "mediaconnect" "2.15.1"
- "sha256-E0hjBGm+mIW0wG8kdLAhXc4BzMzJK4gESiyS2xVIEpU=";
+ buildTypesAiobotocorePackage "mediaconnect" "2.15.2"
+ "sha256-DwyW/Lz2TcJUpS21SZAJCZR9nySSFN7/k4Hwea51QDo=";
types-aiobotocore-mediaconvert =
- buildTypesAiobotocorePackage "mediaconvert" "2.15.1"
- "sha256-bHWlDRHqZ6vYcsM01peSdcQ5oqvSGiG/UHWlOinT1QQ=";
+ buildTypesAiobotocorePackage "mediaconvert" "2.15.2"
+ "sha256-xEi7pQSuq7vkcGrZx7/LSHDiGc0yRy5yDLB+R1Sw9i4=";
types-aiobotocore-medialive =
- buildTypesAiobotocorePackage "medialive" "2.15.1"
- "sha256-PrQPNUQI065kb8+ihArJOroydrAbOhFdS2yzq55nTKw=";
+ buildTypesAiobotocorePackage "medialive" "2.15.2"
+ "sha256-XejVpsX2j0u2TTB7y/ZkwCeBhKLQOpCuJm0BL88ocAg=";
types-aiobotocore-mediapackage =
- buildTypesAiobotocorePackage "mediapackage" "2.15.1"
- "sha256-2/pUMsZsuW44TpNCdtciCJ9z+Z7aREyBMBIFdV80lgU=";
+ buildTypesAiobotocorePackage "mediapackage" "2.15.2"
+ "sha256-SxNd+WdyHA0ijqV3urXldQXeMew19EUydNArzMdHSZk=";
types-aiobotocore-mediapackage-vod =
- buildTypesAiobotocorePackage "mediapackage-vod" "2.15.1"
- "sha256-QIaQ06qrpPa4nb7PgOyhbYH1Oz1KL1dwwy6/D60tgKk=";
+ buildTypesAiobotocorePackage "mediapackage-vod" "2.15.2"
+ "sha256-OaJv/gY2yhR6rMstJx88NQY/IBO9NxqleUY4gfq5dd0=";
types-aiobotocore-mediapackagev2 =
- buildTypesAiobotocorePackage "mediapackagev2" "2.15.1"
- "sha256-+YxeyUt3GqsliHI/T8ZMxfweAhnAXWHLxBZSNbmPVDg=";
+ buildTypesAiobotocorePackage "mediapackagev2" "2.15.2"
+ "sha256-8mQbc9Wp8PvcyHocdcR9VS1jyJYGnwCuB4qk1iGq4DA=";
types-aiobotocore-mediastore =
- buildTypesAiobotocorePackage "mediastore" "2.15.1"
- "sha256-09o+YQysUdNGoNT+IXaPIOCSHUxYFXezjxTvqPPWBNo=";
+ buildTypesAiobotocorePackage "mediastore" "2.15.2"
+ "sha256-HvMe5b/WoUL6osOakD4z3fGfC5dPWphZFXijpqVL4tk=";
types-aiobotocore-mediastore-data =
- buildTypesAiobotocorePackage "mediastore-data" "2.15.1"
- "sha256-yDovPCnikCe4qHPCyZPZEu7UlIHLW59EySO3xValmgw=";
+ buildTypesAiobotocorePackage "mediastore-data" "2.15.2"
+ "sha256-FqbPAwpzikmawdrNa1/R0SGj0G4WqGRxBT6xceJHX1A=";
types-aiobotocore-mediatailor =
- buildTypesAiobotocorePackage "mediatailor" "2.15.1"
- "sha256-BnrpdnphOkjk9D3MuhMEEBFL08NZE140o4+VR1Rp4O4=";
+ buildTypesAiobotocorePackage "mediatailor" "2.15.2"
+ "sha256-iHjBmnvn2Rzo62Ep1bjJoZKNVGArtwxdOZoT1+SneqE=";
types-aiobotocore-medical-imaging =
- buildTypesAiobotocorePackage "medical-imaging" "2.15.1"
- "sha256-6ona+KE489SPJSlokzwpiqERuBgWjqIYofh1rUmeKwo=";
+ buildTypesAiobotocorePackage "medical-imaging" "2.15.2"
+ "sha256-UXzTpoFnuJQRwJfahcWSfYO9lWuEP9W+CZWiGdiupPQ=";
types-aiobotocore-memorydb =
- buildTypesAiobotocorePackage "memorydb" "2.15.1"
- "sha256-lYBb737JcKQa5cKm94O1C/psjuRNFFNftn3dctUeOnQ=";
+ buildTypesAiobotocorePackage "memorydb" "2.15.2"
+ "sha256-lFetqAmP6lwKTmJEhS1wcydBgePh4/hhkq/ngHAqxHw=";
types-aiobotocore-meteringmarketplace =
- buildTypesAiobotocorePackage "meteringmarketplace" "2.15.1"
- "sha256-9Z5s03sTVEzzXO43CTuf+YICuXisAZ/OGFyH44KOuF8=";
+ buildTypesAiobotocorePackage "meteringmarketplace" "2.15.2"
+ "sha256-wT3cz2FprMmyhag/0ZODuHFiB+qKD6LKvehs8PWP8m4=";
types-aiobotocore-mgh =
- buildTypesAiobotocorePackage "mgh" "2.15.1"
- "sha256-Oqi4SM+L1FQLs0jfyWXILG/XHs5X5K+5jvGcIr76OeY=";
+ buildTypesAiobotocorePackage "mgh" "2.15.2"
+ "sha256-uxukwGScWYD2oCXu8vPu6o2BJiLtnMuIXIgqXFF5VGA=";
types-aiobotocore-mgn =
- buildTypesAiobotocorePackage "mgn" "2.15.1"
- "sha256-RqvU6K50yGzVQBSzS90htrFOScpondnyceN3ISshYlI=";
+ buildTypesAiobotocorePackage "mgn" "2.15.2"
+ "sha256-lXlNAFEQbteRMGiOfSpBF1AF12UYjc64sXaOVN6KZRg=";
types-aiobotocore-migration-hub-refactor-spaces =
- buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "2.15.1"
- "sha256-j4LVmlaI8tuJxjkweiZRWgnYlR5p/M2u8JSkMg3Yufs=";
+ buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "2.15.2"
+ "sha256-Ndj1DdPIam1NG5zAzKJkilE0TDHGykywc2hpxvWNyPY=";
types-aiobotocore-migrationhub-config =
- buildTypesAiobotocorePackage "migrationhub-config" "2.15.1"
- "sha256-yQDw0I8jlsVpL8MSerOV66yRdCE5ik7R/v+rkBAzKrk=";
+ buildTypesAiobotocorePackage "migrationhub-config" "2.15.2"
+ "sha256-LXu7VQkVpgqIMD7ucMV4Kj/Zv6FoFDvLX8rYjtO2ijg=";
types-aiobotocore-migrationhuborchestrator =
- buildTypesAiobotocorePackage "migrationhuborchestrator" "2.15.1"
- "sha256-2XxADXGruMbzM50bElDkwlKQZ/r+6HPhMOjj8InGOlM=";
+ buildTypesAiobotocorePackage "migrationhuborchestrator" "2.15.2"
+ "sha256-Te1jZDw3UjMBM6DlCj38Nn42xRt86WzHGaJnjbobDMs=";
types-aiobotocore-migrationhubstrategy =
- buildTypesAiobotocorePackage "migrationhubstrategy" "2.15.1"
- "sha256-+VYnuMVf16mrgMJ5DMqdy6CPLGavuA0gUW1kv9Uu9rs=";
+ buildTypesAiobotocorePackage "migrationhubstrategy" "2.15.2"
+ "sha256-IkE/I9X6FXqNBsMUM2/lQ2SVIIaY8PtAyx0d4XA94BE=";
types-aiobotocore-mobile =
buildTypesAiobotocorePackage "mobile" "2.13.2"
"sha256-OxB91BCAmYnY72JBWZaBlEkpAxN2Q5aY4i1Pt3eD9hc=";
types-aiobotocore-mq =
- buildTypesAiobotocorePackage "mq" "2.15.1"
- "sha256-2WEJoWXSfDmFl9liWtIaviLnAHgRA5dAamQx1YfXgzE=";
+ buildTypesAiobotocorePackage "mq" "2.15.2"
+ "sha256-VY6tLjwGYbJte8xoit/gIVuMSGkygYhpGrCVwmkcD+c=";
types-aiobotocore-mturk =
- buildTypesAiobotocorePackage "mturk" "2.15.1"
- "sha256-TK9wWp3GEHhn4jypBdQEeJZp31IvKFFTuSLKxqxZoNU=";
+ buildTypesAiobotocorePackage "mturk" "2.15.2"
+ "sha256-wmnepAFZGXOk6+/G0XToAQBxPyrtmyGIl9DYcaQIwrI=";
types-aiobotocore-mwaa =
- buildTypesAiobotocorePackage "mwaa" "2.15.1"
- "sha256-E1sWcLfHIlFelP3vb0yfhRpcyboyIutPrF3ByCNJITQ=";
+ buildTypesAiobotocorePackage "mwaa" "2.15.2"
+ "sha256-sjXYuZf6yffeiu4A/FYXebGTFr408e7QKNmML2y2yTA=";
types-aiobotocore-neptune =
- buildTypesAiobotocorePackage "neptune" "2.15.1"
- "sha256-EtmxI6j5SlZZcv+YYsDki6VcMdRhZWEoJVT5VDFV/0g=";
+ buildTypesAiobotocorePackage "neptune" "2.15.2"
+ "sha256-hpnEfol8cLYk8AuIaBRitNIJoEMv1jvWzNED1b4xqfA=";
types-aiobotocore-network-firewall =
- buildTypesAiobotocorePackage "network-firewall" "2.15.1"
- "sha256-xiDYqvt2e7MiAe8nCQR51q5Ov8B94eYJhQgN+lvFDuA=";
+ buildTypesAiobotocorePackage "network-firewall" "2.15.2"
+ "sha256-rMaMUBlbxJKeRIX/eEKtYrO0mXiDdWyZ0x4GfoDw2iY=";
types-aiobotocore-networkmanager =
- buildTypesAiobotocorePackage "networkmanager" "2.15.1"
- "sha256-0SFOWAIckxRoWupRztC50CkOKqtUuxdNnM44SnPLYwQ=";
+ buildTypesAiobotocorePackage "networkmanager" "2.15.2"
+ "sha256-JbN4suHNPpgGnkz4HnEmZXF4HMVnzMDd9DO6/xnzOgo=";
types-aiobotocore-nimble =
- buildTypesAiobotocorePackage "nimble" "2.15.1"
- "sha256-Hz6tsIdCcx5vzwD0PDmPKSpjqYEYENAiZz7WuZC9Ago=";
+ buildTypesAiobotocorePackage "nimble" "2.15.2"
+ "sha256-PChX5Jbgr0d1YaTZU9AbX3cM7NrhkyunK6/X3l+I8Q0=";
types-aiobotocore-oam =
- buildTypesAiobotocorePackage "oam" "2.15.1"
- "sha256-abqiY/pGLnV7UzoojcX5aaUtKC//y5UFYG8XoS9hJgM=";
+ buildTypesAiobotocorePackage "oam" "2.15.2"
+ "sha256-VYimOD1qzkRxpieACK1D5Flm1jTMLEkbiRhOczOPiCw=";
types-aiobotocore-omics =
- buildTypesAiobotocorePackage "omics" "2.15.1"
- "sha256-5k0LPHH0qUlEEAV6ASredhR65Phs0133c37N+YB+tcY=";
+ buildTypesAiobotocorePackage "omics" "2.15.2"
+ "sha256-NjwwQvLdS4yaH+0lWiO3WdCbYkEm7Xy+WDZ0fZv0iO4=";
types-aiobotocore-opensearch =
- buildTypesAiobotocorePackage "opensearch" "2.15.1"
- "sha256-4VqaoYwKkNckmb4BZDbWPLeEVa7tCxBD8g6pGQrr0Ng=";
+ buildTypesAiobotocorePackage "opensearch" "2.15.2"
+ "sha256-P/5KsryA4IRZ2B8Jvyb4UyhBwIrxAdR1Z1C0KfPgurQ=";
types-aiobotocore-opensearchserverless =
- buildTypesAiobotocorePackage "opensearchserverless" "2.15.1"
- "sha256-80E81Kv3FzkgGQvpVHxmYqnNIRtureOvIDmKdnUo7z4=";
+ buildTypesAiobotocorePackage "opensearchserverless" "2.15.2"
+ "sha256-kshUKyoAIgVyIMntWuCrAD+WZ9usxXH1k78y/DqTWvc=";
types-aiobotocore-opsworks =
- buildTypesAiobotocorePackage "opsworks" "2.15.1"
- "sha256-bAAgU0b33CNXVK0Q9ynyPGbL5KBiQq6sT/mL1pWJpD0=";
+ buildTypesAiobotocorePackage "opsworks" "2.15.2"
+ "sha256-KJfyFi4FHoqicPmLnsknrR0Bs2rXiM5fNneR2i9SG6E=";
types-aiobotocore-opsworkscm =
- buildTypesAiobotocorePackage "opsworkscm" "2.15.1"
- "sha256-nVywDMlzkITUEW7K6FWoYz953wAqCiUemT0tu48yO6M=";
+ buildTypesAiobotocorePackage "opsworkscm" "2.15.2"
+ "sha256-T+JObJ+jB48uaS39I68YyDxggoWiMj/8Di1PzDCQChU=";
types-aiobotocore-organizations =
- buildTypesAiobotocorePackage "organizations" "2.15.1"
- "sha256-N7VzNLh+LCFrfdgmO982cau3B/d5uGoGO43vMMpTNBs=";
+ buildTypesAiobotocorePackage "organizations" "2.15.2"
+ "sha256-6TYjbdnUOCc29kWZ3RsdscEK40uS0q5fcwhVAZ46yKQ=";
types-aiobotocore-osis =
- buildTypesAiobotocorePackage "osis" "2.15.1"
- "sha256-NpjX3LpbF1CajlqY9ow4GqCVjlrTBVT1U/Gn3wHSQTE=";
+ buildTypesAiobotocorePackage "osis" "2.15.2"
+ "sha256-zRFrveWqmZ67/Cb8vnmgUCwVgt9oUn9qS8YegKqKwCw=";
types-aiobotocore-outposts =
- buildTypesAiobotocorePackage "outposts" "2.15.1"
- "sha256-lFRMsg9LhjizD8NsSyK209h+xtvYgTmJf5lc3OQyqdY=";
+ buildTypesAiobotocorePackage "outposts" "2.15.2"
+ "sha256-+Pa7Gy+7aend87amJsaob24WXQWdrpA+Tj17dnrEFaQ=";
types-aiobotocore-panorama =
- buildTypesAiobotocorePackage "panorama" "2.15.1"
- "sha256-mdhrS+4Cg2VgH5AWroB2i5Pe6LEFfn9J9rEe+UQovxQ=";
+ buildTypesAiobotocorePackage "panorama" "2.15.2"
+ "sha256-7BW09/NkN4AFwR8qhvTs8nYSflG9cozyPFIpS8/Y6FQ=";
types-aiobotocore-payment-cryptography =
- buildTypesAiobotocorePackage "payment-cryptography" "2.15.1"
- "sha256-Lddnm936PSivXBygA44rgyd5wyPoPDns5XIYbQfQ91g=";
+ buildTypesAiobotocorePackage "payment-cryptography" "2.15.2"
+ "sha256-4tNGI26K1ejnLwfsCOU0Iy8JiQyjMmDsn6JP9RMG5MI=";
types-aiobotocore-payment-cryptography-data =
- buildTypesAiobotocorePackage "payment-cryptography-data" "2.15.1"
- "sha256-jTgsyYOLrTYNEfyhotGbbTrlQkTKqmd/0uKOMvmm06U=";
+ buildTypesAiobotocorePackage "payment-cryptography-data" "2.15.2"
+ "sha256-ZXVhYvin2ZjjusSXkg3byqW5QHtFEyd1uufi9nWvutM=";
types-aiobotocore-personalize =
- buildTypesAiobotocorePackage "personalize" "2.15.1"
- "sha256-RULc20Hv5VUT+MO1/hj+LlsdL88c1KuChWjzYY150Xs=";
+ buildTypesAiobotocorePackage "personalize" "2.15.2"
+ "sha256-3CPcx8rP6N59eoooZej/qcySZYIiRl7j8B96KB9CD7s=";
types-aiobotocore-personalize-events =
- buildTypesAiobotocorePackage "personalize-events" "2.15.1"
- "sha256-3gl7NVGwfh1jy8VewE76+Pe/cPKQitdnC3JAau1S9dE=";
+ buildTypesAiobotocorePackage "personalize-events" "2.15.2"
+ "sha256-jW4ZIOw2dPuebRyaQzl/aV5X5g3d+HyR96nK15KabKA=";
types-aiobotocore-personalize-runtime =
- buildTypesAiobotocorePackage "personalize-runtime" "2.15.1"
- "sha256-XnuLw62YOZN+EwJ6b1ZQCOwhIqzE8ntkrgmuqTY62vw=";
+ buildTypesAiobotocorePackage "personalize-runtime" "2.15.2"
+ "sha256-hQiddMrXRgWmQjIiytIIk3S3hYAyiSyM5wfGQ/PQtuo=";
types-aiobotocore-pi =
- buildTypesAiobotocorePackage "pi" "2.15.1"
- "sha256-g8pzgnV5puJSLogXJrQn1zhYiOB7446R4xkxOQCwqSY=";
+ buildTypesAiobotocorePackage "pi" "2.15.2"
+ "sha256-S+Zf7VW+F1x4gnWVYJyTyvA/31mfBlHvVtDiSokuCEo=";
types-aiobotocore-pinpoint =
- buildTypesAiobotocorePackage "pinpoint" "2.15.1"
- "sha256-gZJM4c3tSilImlxeKWU3szTmpnXxpS6kAvF/zKXglFQ=";
+ buildTypesAiobotocorePackage "pinpoint" "2.15.2"
+ "sha256-ajqWceNuGO3+ABzNi5rFook4tdWo7diCkfYIaNnCnqI=";
types-aiobotocore-pinpoint-email =
- buildTypesAiobotocorePackage "pinpoint-email" "2.15.1"
- "sha256-eXcDiAQjLAObgX3gfGtlVL6BNK8fq81f70tPNNcKJJ8=";
+ buildTypesAiobotocorePackage "pinpoint-email" "2.15.2"
+ "sha256-pMgodwm9Ihz99d/C+hP5Z5ZxSA9WQ5sOJu407j6w+9s=";
types-aiobotocore-pinpoint-sms-voice =
- buildTypesAiobotocorePackage "pinpoint-sms-voice" "2.15.1"
- "sha256-OPJiALIiUDioRjXkeLtksPBMlmsUpIRsZtuoTESnKpU=";
+ buildTypesAiobotocorePackage "pinpoint-sms-voice" "2.15.2"
+ "sha256-8E6frTBvs14nYtfhaWi+/5HTDhNGWcHMAktQ+DhARdY=";
types-aiobotocore-pinpoint-sms-voice-v2 =
- buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "2.15.1"
- "sha256-SN3dXMpqcuJcWnpeUi4Jwtat9erU0KdSjfEbyf8pHXc=";
+ buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "2.15.2"
+ "sha256-WWwFEhAEls6dVX9WNZrWywV4egtd1bt5n3pOCEb1p00=";
types-aiobotocore-pipes =
- buildTypesAiobotocorePackage "pipes" "2.15.1"
- "sha256-Ru3j6tm6I+wtpKzkxBSFCfAleI52WnOSqgvlCIla9fE=";
+ buildTypesAiobotocorePackage "pipes" "2.15.2"
+ "sha256-5QD0FgHLNbU9BnppJtB7RKMg9cdOz0ILkF/gkR7igs4=";
types-aiobotocore-polly =
- buildTypesAiobotocorePackage "polly" "2.15.1"
- "sha256-U9FwTzLVdE0UbAMTjMjrIMlRVlkuQRzKiIEd7ZepOWA=";
+ buildTypesAiobotocorePackage "polly" "2.15.2"
+ "sha256-r6onIkXMgieQ9xtjuaGsQqq52OOq6k/DUz3jO5uYi6U=";
types-aiobotocore-pricing =
- buildTypesAiobotocorePackage "pricing" "2.15.1"
- "sha256-FEzR+YjEGFKWbihsat2gaDp87fdIPDCmeRv79U08fFo=";
+ buildTypesAiobotocorePackage "pricing" "2.15.2"
+ "sha256-5IvT+CsBX3WBfz0f2CVGAtal+SprCAqO7CGKOwSLpLQ=";
types-aiobotocore-privatenetworks =
- buildTypesAiobotocorePackage "privatenetworks" "2.15.1"
- "sha256-7OB4PIbZDsnXqLp+9cXd5ER5QIkUpjtJk+A+jT0286Y=";
+ buildTypesAiobotocorePackage "privatenetworks" "2.15.2"
+ "sha256-gfnx+RgpiZCtLmIPWuc3Lz5JM+IgxMsAKvOqxiwJmew=";
types-aiobotocore-proton =
- buildTypesAiobotocorePackage "proton" "2.15.1"
- "sha256-MBUaIQIThP+JZHbVAU5r0yCHQs13wLAU87y1gRECFHU=";
+ buildTypesAiobotocorePackage "proton" "2.15.2"
+ "sha256-MGL3z4ULEon/EjSCLuN2sB6tAepic+ZG+vVAani6qpQ=";
types-aiobotocore-qldb =
- buildTypesAiobotocorePackage "qldb" "2.15.1"
- "sha256-yES1WELzrI3Xz0F4S7y3NajtNTQO10S3hi+pQsZ4KVE=";
+ buildTypesAiobotocorePackage "qldb" "2.15.2"
+ "sha256-dX2wLRIg977khlZoVYd9y1UzRMLDorIBHvOhXX2r+KI=";
types-aiobotocore-qldb-session =
- buildTypesAiobotocorePackage "qldb-session" "2.15.1"
- "sha256-ISAoyu08TEXIr2VONRLIvRDaAOazDPEtPp66/CnmHv8=";
+ buildTypesAiobotocorePackage "qldb-session" "2.15.2"
+ "sha256-omOG7aWjTBdIHElYE14X7DyQKBNGY5yfOg4IeiL0ooo=";
types-aiobotocore-quicksight =
- buildTypesAiobotocorePackage "quicksight" "2.15.1"
- "sha256-eruqWUL7Yje7OJlV1arhKInqnXChEmI49nq75j4ZOrg=";
+ buildTypesAiobotocorePackage "quicksight" "2.15.2"
+ "sha256-U+151xlZAGz+JgIJD/mU9C1z85UCimqOubaX3x/0nhg=";
types-aiobotocore-ram =
- buildTypesAiobotocorePackage "ram" "2.15.1"
- "sha256-/7+C/b51gkVW8QXyXg/5b1vzvTtZXS5ts9K6PWXAZU4=";
+ buildTypesAiobotocorePackage "ram" "2.15.2"
+ "sha256-lp2oA2JBXSgniu5MJR6F+HeSczlc+w4wj7zyPggA6dY=";
types-aiobotocore-rbin =
- buildTypesAiobotocorePackage "rbin" "2.15.1"
- "sha256-/joJicKfFNQhy24zZp6vM/EmGZGBTwPTQ8w8KHv6CF0=";
+ buildTypesAiobotocorePackage "rbin" "2.15.2"
+ "sha256-sFrrTWJkFCMkF4gxH3nQvctzMag234P3gN0tKyvvZrE=";
types-aiobotocore-rds =
- buildTypesAiobotocorePackage "rds" "2.15.1"
- "sha256-btYigxx5bnWll5u0IHDVpciY4ZV9dOxPDKReEv1i0AM=";
+ buildTypesAiobotocorePackage "rds" "2.15.2"
+ "sha256-lz03bzDbmAvjc0s5hKeuOohycOcj1wAZsePeWYGp5ts=";
types-aiobotocore-rds-data =
- buildTypesAiobotocorePackage "rds-data" "2.15.1"
- "sha256-Kn4uM9F1UkiWGshjX62WD5qROnnTw6TgG4bPv9EWz4A=";
+ buildTypesAiobotocorePackage "rds-data" "2.15.2"
+ "sha256-WTb2V9H5MmEtDsboJmQPoRLRNWCL1Ot+myoRRBpDphw=";
types-aiobotocore-redshift =
- buildTypesAiobotocorePackage "redshift" "2.15.1"
- "sha256-cOu5LEVvs1VdXyfgtM7PYzIUsNN1l//gHTiY0ArmFf0=";
+ buildTypesAiobotocorePackage "redshift" "2.15.2"
+ "sha256-ErKPn+GGiujvvRps8FIY+QRo0ycQQ4t8tYE64iwqrw8=";
types-aiobotocore-redshift-data =
- buildTypesAiobotocorePackage "redshift-data" "2.15.1"
- "sha256-9A4p2lohJEhOcL868mMJcmmjYSS8Gd/5ShbkvTunDQs=";
+ buildTypesAiobotocorePackage "redshift-data" "2.15.2"
+ "sha256-bxQv1ESSEBG3elReQbKurlEv3jMrfdztBbn7kIwrlJk=";
types-aiobotocore-redshift-serverless =
- buildTypesAiobotocorePackage "redshift-serverless" "2.15.1"
- "sha256-s+maghPzS18nSG+ozOp/hKQJRHZHwPhsASqUXaOs6Pk=";
+ buildTypesAiobotocorePackage "redshift-serverless" "2.15.2"
+ "sha256-EyciPvrLkG0maSoyVFRkV1gA30vPF+MybM0j4gtwjwA=";
types-aiobotocore-rekognition =
- buildTypesAiobotocorePackage "rekognition" "2.15.1"
- "sha256-aLCYGd8+LIgHxsR8Qr+rrruL5JERkn1etCL3o/A8sZw=";
+ buildTypesAiobotocorePackage "rekognition" "2.15.2"
+ "sha256-dqoAVV2zwCwgfIBb72gLSXminPq4FgPYYzZlzxumkrY=";
types-aiobotocore-resiliencehub =
- buildTypesAiobotocorePackage "resiliencehub" "2.15.1"
- "sha256-e8WN5g/vbWaYSNMZS43GOkdx6AFL15cPUvZn0Ufsvqk=";
+ buildTypesAiobotocorePackage "resiliencehub" "2.15.2"
+ "sha256-o8TBetwKqzHJj7ISkhgX9iPpt8CvZ5M3LFYmfEqmCDI=";
types-aiobotocore-resource-explorer-2 =
- buildTypesAiobotocorePackage "resource-explorer-2" "2.15.1"
- "sha256-/WiO9zp/YK8+2p97cbY5GwQcb1XB5i86QBlXERTDxk8=";
+ buildTypesAiobotocorePackage "resource-explorer-2" "2.15.2"
+ "sha256-hQ+Jc8m4q7Q7zHSJyCL62ugAMNeFLbEA8LJ6VQ9LVHo=";
types-aiobotocore-resource-groups =
- buildTypesAiobotocorePackage "resource-groups" "2.15.1"
- "sha256-hGUdTC5ksWqneEqIROSc3XqYANVrtL2caM+OqTVnlcw=";
+ buildTypesAiobotocorePackage "resource-groups" "2.15.2"
+ "sha256-T1gIcrRPXWbfzYReB/MBLcYUjUhiDqbcah/kGKx6g9s=";
types-aiobotocore-resourcegroupstaggingapi =
- buildTypesAiobotocorePackage "resourcegroupstaggingapi" "2.15.1"
- "sha256-zJvPU3lXoxxw1LF0HkPTfO7d62Q0mTCuqGKQT/8LbPQ=";
+ buildTypesAiobotocorePackage "resourcegroupstaggingapi" "2.15.2"
+ "sha256-fa/EoxdXi5Vd0R2eHexVx9PSiesVyw/0okGpHIGd7I8=";
types-aiobotocore-robomaker =
- buildTypesAiobotocorePackage "robomaker" "2.15.1"
- "sha256-X1hQ7pzhlsD9AcD2JdM/1u9W8PGRFnJaWhArHhZLPrk=";
+ buildTypesAiobotocorePackage "robomaker" "2.15.2"
+ "sha256-ShnMPJzy/isQNqwYiBBb3B7tEr/ydi6weW/J+Bu6XoU=";
types-aiobotocore-rolesanywhere =
- buildTypesAiobotocorePackage "rolesanywhere" "2.15.1"
- "sha256-VjjHrGv8GuQ+4Fd8meBih98YxFpVChvusBZDKJ7jvAA=";
+ buildTypesAiobotocorePackage "rolesanywhere" "2.15.2"
+ "sha256-Td97qtNPStvbV/1vILYZ/TTtpngndk/7s1wAORakKeQ=";
types-aiobotocore-route53 =
- buildTypesAiobotocorePackage "route53" "2.15.1"
- "sha256-p1N0+9s+QDRoSkgiRtsmyGrxmse405CDwuPW10r2TFY=";
+ buildTypesAiobotocorePackage "route53" "2.15.2"
+ "sha256-olwrQiY0EOvIJMFX/wQKT1dKzIGDlOEMrqvx2cVxOCA=";
types-aiobotocore-route53-recovery-cluster =
- buildTypesAiobotocorePackage "route53-recovery-cluster" "2.15.1"
- "sha256-L27J6hqxLMwxm8r2DK3xc7LrtNOgt5HSBE/YsjqH9c8=";
+ buildTypesAiobotocorePackage "route53-recovery-cluster" "2.15.2"
+ "sha256-T1kYpmeMmvQOZkxqeCDbab2HNFBcX7I7wc28gB66UHU=";
types-aiobotocore-route53-recovery-control-config =
- buildTypesAiobotocorePackage "route53-recovery-control-config" "2.15.1"
- "sha256-njXhqJ+7xnxabYnNqknXA67I2J88jxHk9oErziic1FU=";
+ buildTypesAiobotocorePackage "route53-recovery-control-config" "2.15.2"
+ "sha256-/yWRQIwfwZjkDooNl3GmbGrlxD1vSTk/2NrrQpG3IJc=";
types-aiobotocore-route53-recovery-readiness =
- buildTypesAiobotocorePackage "route53-recovery-readiness" "2.15.1"
- "sha256-U0jzrXqfz/X/Dg1S03/is/xkQwIO9ICwg5s/YYImBf4=";
+ buildTypesAiobotocorePackage "route53-recovery-readiness" "2.15.2"
+ "sha256-1+TJUQ5LPWnHDcR41at5C5lKf92euYVer6BXLfs8r3A=";
types-aiobotocore-route53domains =
- buildTypesAiobotocorePackage "route53domains" "2.15.1"
- "sha256-PL1oQYboRsEDlCACZ/f+WORfaj/3pv05XyyZf118cl0=";
+ buildTypesAiobotocorePackage "route53domains" "2.15.2"
+ "sha256-xsAKhJBxAWzhCP2lUwcQ9jp4M/Av0nOae+ToMG4p1hQ=";
types-aiobotocore-route53resolver =
- buildTypesAiobotocorePackage "route53resolver" "2.15.1"
- "sha256-P4Iq5h9zo7y0UIcwLml8cCjjP5wKgtxP2EX3KTVPobw=";
+ buildTypesAiobotocorePackage "route53resolver" "2.15.2"
+ "sha256-JNzO/R8OfmPhpPBCt2YIS420mXAuKadpB+/h8r1VccY=";
types-aiobotocore-rum =
- buildTypesAiobotocorePackage "rum" "2.15.1"
- "sha256-3WO3zTqIDqRR+bkAdsEg8KxruV43uUKGV86c+7jAKgw=";
+ buildTypesAiobotocorePackage "rum" "2.15.2"
+ "sha256-KEjeiHaU2MjBHxDJzFgIZtsfnj/7vEzlixeAu8+KRm4=";
types-aiobotocore-s3 =
- buildTypesAiobotocorePackage "s3" "2.15.1"
- "sha256-nm1iUImUWba9BNV0JUKC1uYWxiFTKLCw3vUBsuqd188=";
+ buildTypesAiobotocorePackage "s3" "2.15.2"
+ "sha256-Hr7IrJ3+a7+7OT6zTSkEdnBfq3aNKVjG0h2dv7dScs4=";
types-aiobotocore-s3control =
- buildTypesAiobotocorePackage "s3control" "2.15.1"
- "sha256-VDIAA8d4/zv5pI1frk6tFZJ9qWtC29b9rZdIYN0YYLA=";
+ buildTypesAiobotocorePackage "s3control" "2.15.2"
+ "sha256-4kWotne4SnLV1rEvWJLw/jP+ZiL1BmHQ4uxj/QW2Hb4=";
types-aiobotocore-s3outposts =
- buildTypesAiobotocorePackage "s3outposts" "2.15.1"
- "sha256-3IyAJHmya+ycc0do6H4NZnhn3Duhj/ITiW+b90x7d8o=";
+ buildTypesAiobotocorePackage "s3outposts" "2.15.2"
+ "sha256-Dfp04DBqhQBWEokBwtw/ALimFq6ZgzrrV5bZfgG9aQw=";
types-aiobotocore-sagemaker =
- buildTypesAiobotocorePackage "sagemaker" "2.15.1"
- "sha256-kwB5VOix83ehKTJ6cXvR5aHO5ogYQvg3+CAnWEFll1k=";
+ buildTypesAiobotocorePackage "sagemaker" "2.15.2"
+ "sha256-jEAVncpRneLhQ7MN5sdwvRexiTXHBRLD1gfRng2LtXk=";
types-aiobotocore-sagemaker-a2i-runtime =
- buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "2.15.1"
- "sha256-qGMnLC7fZA+OEwZNbfCQMJFiwO0mf/1chvMFi0CpIco=";
+ buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "2.15.2"
+ "sha256-4pAalrOg0umvRj/3xRDsziWl/wHPf+37NhOurtvLJd8=";
types-aiobotocore-sagemaker-edge =
- buildTypesAiobotocorePackage "sagemaker-edge" "2.15.1"
- "sha256-oDvjSp0rQFBDclkyLifawL/hobIcT3RuNXS3IuJmG+4=";
+ buildTypesAiobotocorePackage "sagemaker-edge" "2.15.2"
+ "sha256-rCEEed2WVtd506aeYG+KX+ADuqwc3TuYIBO9aGzBjGM=";
types-aiobotocore-sagemaker-featurestore-runtime =
- buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "2.15.1"
- "sha256-ynKSN7dB42JJw6DQOpLjwZXSrNvIgqfYrlEaXKE+agw=";
+ buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "2.15.2"
+ "sha256-y/5KuNWy3832PAvvPxcTFYrGeTS0SOA3cFM6oaQFGD8=";
types-aiobotocore-sagemaker-geospatial =
- buildTypesAiobotocorePackage "sagemaker-geospatial" "2.15.1"
- "sha256-GW0b2GWrahRsWM9p/sS896CLotC4NlHC+Tyya4AbANs=";
+ buildTypesAiobotocorePackage "sagemaker-geospatial" "2.15.2"
+ "sha256-joXbxcuxaBX4Nl18oFhhSz5AXme0zVcpmw/vWoziNu4=";
types-aiobotocore-sagemaker-metrics =
- buildTypesAiobotocorePackage "sagemaker-metrics" "2.15.1"
- "sha256-xT0K4NB2r9ajVEDgTr8tAPtUQLVwZj4/q/9lFxNoRy4=";
+ buildTypesAiobotocorePackage "sagemaker-metrics" "2.15.2"
+ "sha256-LgQn2sOOv7dV2XP87XcD5dz8ZulGK5Ny3wl/YLAAguU=";
types-aiobotocore-sagemaker-runtime =
- buildTypesAiobotocorePackage "sagemaker-runtime" "2.15.1"
- "sha256-EKfd1G+A7T5A/7h+ZfWm+feD7VCEUU+RohAM8804Th8=";
+ buildTypesAiobotocorePackage "sagemaker-runtime" "2.15.2"
+ "sha256-YMgZ7YH3iTjE26HrcOCLLqs3FF+0f8Dil8t5bTA+gRo=";
types-aiobotocore-savingsplans =
- buildTypesAiobotocorePackage "savingsplans" "2.15.1"
- "sha256-fpMpgVdydbNYhse3LemZWeu6pvLuXWYy7Nt3+CSedl0=";
+ buildTypesAiobotocorePackage "savingsplans" "2.15.2"
+ "sha256-FQaInT6mcJ+f0YooDo4vVJA7ZKrJv2w3Jg29L1GUe7U=";
types-aiobotocore-scheduler =
- buildTypesAiobotocorePackage "scheduler" "2.15.1"
- "sha256-786gr8xrz39LVOuU0EYtyBhUxDbo3YEH5UXzmY4+xSo=";
+ buildTypesAiobotocorePackage "scheduler" "2.15.2"
+ "sha256-9HbcEJfpfXXSQvTtYXCN5cQSwisIk57OsF+MYecLFh0=";
types-aiobotocore-schemas =
- buildTypesAiobotocorePackage "schemas" "2.15.1"
- "sha256-JUC3Sa94XRotK9rTelvMVG4TUQyrnVQ9Mdd+byd4A3w=";
+ buildTypesAiobotocorePackage "schemas" "2.15.2"
+ "sha256-SvenxkkMais2m/zfzdAehy6Dl5uOZpuBEWq8SWg1z6Q=";
types-aiobotocore-sdb =
- buildTypesAiobotocorePackage "sdb" "2.15.1"
- "sha256-EV0eNjxdjT/JNuTip75SuCVDZfvQz71UbIgUHWfbakc=";
+ buildTypesAiobotocorePackage "sdb" "2.15.2"
+ "sha256-/RPhNimi1jEbPiHvJmtkvL/t1dlnYguQsQ2C3uvM9pA=";
types-aiobotocore-secretsmanager =
- buildTypesAiobotocorePackage "secretsmanager" "2.15.1"
- "sha256-GW4y+JyGelERL39KPMOcF/7+pwGBuPwKhNwecBi5BBg=";
+ buildTypesAiobotocorePackage "secretsmanager" "2.15.2"
+ "sha256-js9F7mkNtanyv2AVZPFGs88b21Ng99yQ7Yrc/UP4LKA=";
types-aiobotocore-securityhub =
- buildTypesAiobotocorePackage "securityhub" "2.15.1"
- "sha256-ONJsSG+d2fSaoPyrchl+oosIeVSjwoN5d0BPolDhhbk=";
+ buildTypesAiobotocorePackage "securityhub" "2.15.2"
+ "sha256-yrI7hTvxsInp64WWMfMvqBx0qkpoYF8fryV2WC7HrCU=";
types-aiobotocore-securitylake =
- buildTypesAiobotocorePackage "securitylake" "2.15.1"
- "sha256-ggAfufDDaW+LdNindZoAR1xeWr+hQKr1ImTl+nGE0B8=";
+ buildTypesAiobotocorePackage "securitylake" "2.15.2"
+ "sha256-DwJsoRR3NZEVQ3uvploTO3eRqGvMpET96CJm5Gx2kDc=";
types-aiobotocore-serverlessrepo =
- buildTypesAiobotocorePackage "serverlessrepo" "2.15.1"
- "sha256-zUBoLdhvpvI/tTza9abj//Hkc59gMe70kqEF1SEW+FE=";
+ buildTypesAiobotocorePackage "serverlessrepo" "2.15.2"
+ "sha256-X0o4l4pcJmVnLkA1huf520RqMEFbkMqqs09ZqlFvl8w=";
types-aiobotocore-service-quotas =
- buildTypesAiobotocorePackage "service-quotas" "2.15.1"
- "sha256-M1elV0BE1RyFOo2XlKVIt5gH1M4bIU7rld77+cGCptg=";
+ buildTypesAiobotocorePackage "service-quotas" "2.15.2"
+ "sha256-Pbj9G+3rPMNyJ5Z3wQT4Zvqeb7N2H3ui+9CxcpU1oHU=";
types-aiobotocore-servicecatalog =
- buildTypesAiobotocorePackage "servicecatalog" "2.15.1"
- "sha256-fgFgmDsx68FgZHOXTrJEB6OqVOlaVWgSer29dKwiBJo=";
+ buildTypesAiobotocorePackage "servicecatalog" "2.15.2"
+ "sha256-uSkuoDBkYXzGDBLtIX/4tmfFhRFfiWJGHmz5OpJhLek=";
types-aiobotocore-servicecatalog-appregistry =
- buildTypesAiobotocorePackage "servicecatalog-appregistry" "2.15.1"
- "sha256-NG2E4XxicGVtpLqi8n/j2C+BsxdMyWb554XX/HlnExI=";
+ buildTypesAiobotocorePackage "servicecatalog-appregistry" "2.15.2"
+ "sha256-qxjPzRVuya2L2yedaMejt8S0iNQkec0mRteahClNFDQ=";
types-aiobotocore-servicediscovery =
- buildTypesAiobotocorePackage "servicediscovery" "2.15.1"
- "sha256-/6OTsZUTgwYXFzTf1G8hkngaN32L8dPJzgdNMSXisfo=";
+ buildTypesAiobotocorePackage "servicediscovery" "2.15.2"
+ "sha256-CHvjmH7uPYJ1o97k+/u2GRK7/R0BaDfA6nhyJl3I0+U=";
types-aiobotocore-ses =
- buildTypesAiobotocorePackage "ses" "2.15.1"
- "sha256-H3mZA65etYo+frlSNEMs/lT8G86oWbNjlkPefoIc6AA=";
+ buildTypesAiobotocorePackage "ses" "2.15.2"
+ "sha256-3jDEReH8mLWDRDaEBGhXnESbvw5l8OANgl6VnYcbN6I=";
types-aiobotocore-sesv2 =
- buildTypesAiobotocorePackage "sesv2" "2.15.1"
- "sha256-diE7lw1LMxiy4gRam1zymw98VJGKaEWwQ5FudCma9ZU=";
+ buildTypesAiobotocorePackage "sesv2" "2.15.2"
+ "sha256-6NbQYkz04lWokHuhFpq3yY60HkXKKQkdXztNjW3XGcc=";
types-aiobotocore-shield =
- buildTypesAiobotocorePackage "shield" "2.15.1"
- "sha256-jeklWyR6ArvO9/i/2Iji+YbAsv2rnNLqKoSTBL5VDSQ=";
+ buildTypesAiobotocorePackage "shield" "2.15.2"
+ "sha256-lxGndPfh8XDcj8e8oKydEPcFfzNiSVXHAgv3rxSg11U=";
types-aiobotocore-signer =
- buildTypesAiobotocorePackage "signer" "2.15.1"
- "sha256-I+Cfmn14B9W1O/LBNWZZ9384H0DexJav2bkc4+2zV58=";
+ buildTypesAiobotocorePackage "signer" "2.15.2"
+ "sha256-vVkz6+GhJf8J2d/ZTfbTxIVdnWXA/ye/eq4nCtd/Krw=";
types-aiobotocore-simspaceweaver =
- buildTypesAiobotocorePackage "simspaceweaver" "2.15.1"
- "sha256-1B4R4cjzz3fnevwRsT4o3mzlzw4tXbO1kENgWOWbU7w=";
+ buildTypesAiobotocorePackage "simspaceweaver" "2.15.2"
+ "sha256-JesS1NX79j37T3K2lAaSAoQ3M0SYHgHWW6w5EGkwgoU=";
types-aiobotocore-sms =
- buildTypesAiobotocorePackage "sms" "2.15.1"
- "sha256-w2iD7ZpVIIDRuTWikJAp3j7j7jBfcpPnKXfTm6KWq10=";
+ buildTypesAiobotocorePackage "sms" "2.15.2"
+ "sha256-BD4R+N71BtyFQDzCR7e84vovWKkNRagloe5Se/oZJPU=";
types-aiobotocore-sms-voice =
- buildTypesAiobotocorePackage "sms-voice" "2.15.1"
- "sha256-+SZAFFyf+UTytFecjCv/MH9VykOCxFxXJEen1DZdljs=";
+ buildTypesAiobotocorePackage "sms-voice" "2.15.2"
+ "sha256-6UwSaemdRzaFk7fI+W1K7HUQTo93CTuoiQfOtvlroog=";
types-aiobotocore-snow-device-management =
- buildTypesAiobotocorePackage "snow-device-management" "2.15.1"
- "sha256-kaiXmu24wDGIzDtXJ2pT87Wdr3zzRioLVU5TjaNVsRo=";
+ buildTypesAiobotocorePackage "snow-device-management" "2.15.2"
+ "sha256-8Qt9oOvwGYiDnCNNRzXKGpSF+cxKbQFErROsWS5NQ6o=";
types-aiobotocore-snowball =
- buildTypesAiobotocorePackage "snowball" "2.15.1"
- "sha256-YvZxBJGNtRVSsJAtv46Nq9xliVvXShiI2exeir+bp8U=";
+ buildTypesAiobotocorePackage "snowball" "2.15.2"
+ "sha256-/NDdsd9AcLcpXAs0tqZ+nHHNJudfxVuYatqJHr9a8oo=";
types-aiobotocore-sns =
- buildTypesAiobotocorePackage "sns" "2.15.1"
- "sha256-U/VvZwz7qMrnPjgQUL0NMnNS6e5X4PgW/rjwBi65iAU=";
+ buildTypesAiobotocorePackage "sns" "2.15.2"
+ "sha256-7YRa4LucT1Jl8oujdVYsMw/wnRYSSMaZXMaY9qz4mRQ=";
types-aiobotocore-sqs =
- buildTypesAiobotocorePackage "sqs" "2.15.1"
- "sha256-CI9nNt+zfztYT6DwgjAe9RNtebegPAAsSl692FBF7hA=";
+ buildTypesAiobotocorePackage "sqs" "2.15.2"
+ "sha256-6R+AHdVU27iziZvPWMzB3iPNaFYvdQkzfHQAOK+PMtI=";
types-aiobotocore-ssm =
- buildTypesAiobotocorePackage "ssm" "2.15.1"
- "sha256-x/b1hpCTHqZcTJTzwQc+pYjdOYCiyQdsLw1vBpuPQyc=";
+ buildTypesAiobotocorePackage "ssm" "2.15.2"
+ "sha256-6b8jBjW+dhoaoM/xx08mZAh4EndISChOQL+mZZp14Q4=";
types-aiobotocore-ssm-contacts =
- buildTypesAiobotocorePackage "ssm-contacts" "2.15.1"
- "sha256-3N8kaI67M6xKuTsESi/x4FVXy2Lsdoc9RRGIo7bKAok=";
+ buildTypesAiobotocorePackage "ssm-contacts" "2.15.2"
+ "sha256-JsJoes3hiMJsOK9fMaO/xSSgyNR8W0KqxsW49sQ/qFo=";
types-aiobotocore-ssm-incidents =
- buildTypesAiobotocorePackage "ssm-incidents" "2.15.1"
- "sha256-Fkl8ZgS3DD3hRYWQHl1cM2RCNHi8tWk9a1fyCQa+/KM=";
+ buildTypesAiobotocorePackage "ssm-incidents" "2.15.2"
+ "sha256-TZ2mFVwjA3UGCnyVIOFNG6GSF1tWD+SP03g8CZZdr6c=";
types-aiobotocore-ssm-sap =
- buildTypesAiobotocorePackage "ssm-sap" "2.15.1"
- "sha256-23gDeTpYf9sNK2ARSPwZTkNSlGIze8ybLymQ+X0cf74=";
+ buildTypesAiobotocorePackage "ssm-sap" "2.15.2"
+ "sha256-nJHnIk+XzFLKeNJ3UdM9NslUeJdFhru6cmvvoZUJmTU=";
types-aiobotocore-sso =
- buildTypesAiobotocorePackage "sso" "2.15.1"
- "sha256-7uJXGduh2yrj0nLWgTyELxdB6ZaU7TX35GywXTECU64=";
+ buildTypesAiobotocorePackage "sso" "2.15.2"
+ "sha256-PhoZgQqeNQc3B75O1jIWVNU7lR9uBrJG9GpTfHB1pnI=";
types-aiobotocore-sso-admin =
- buildTypesAiobotocorePackage "sso-admin" "2.15.1"
- "sha256-qTAoxjZnze1ffC/QdVnCRy37H4Tzc1AkAERvvtVxkik=";
+ buildTypesAiobotocorePackage "sso-admin" "2.15.2"
+ "sha256-+Ofbw3lAiX3RtygG9zfxX3i87NVdYmIHKKxq+7NTHHE=";
types-aiobotocore-sso-oidc =
- buildTypesAiobotocorePackage "sso-oidc" "2.15.1"
- "sha256-+MsbvjZLLdY/JOr/yWBvrfHQ3SEWvUtzvaImsYNX0YI=";
+ buildTypesAiobotocorePackage "sso-oidc" "2.15.2"
+ "sha256-ZhEJ9TSH5zbH0a1ukgxX/XwIKrwxFvh/CF9SOAmAd4o=";
types-aiobotocore-stepfunctions =
- buildTypesAiobotocorePackage "stepfunctions" "2.15.1"
- "sha256-4YKcuhem2grrKP2I0y+fayyQ4beVhKQJ7KAC70TgN14=";
+ buildTypesAiobotocorePackage "stepfunctions" "2.15.2"
+ "sha256-DN3vboRwssrSolCuKts/35RiQR6jV61+QN7Z8cp2f4Y=";
types-aiobotocore-storagegateway =
- buildTypesAiobotocorePackage "storagegateway" "2.15.1"
- "sha256-DDxzE4KcnC4sjVgBMt2cldFgm2JIeA7pRR7lqocvXN8=";
+ buildTypesAiobotocorePackage "storagegateway" "2.15.2"
+ "sha256-6ahEEQrrvRI90jGON71iTLRatrEoF7ZyG7qJmG3oCsU=";
types-aiobotocore-sts =
- buildTypesAiobotocorePackage "sts" "2.15.1"
- "sha256-LMs2iAbogup0JrXFBIJhpgn8oFuhH3jGnb/Xh60xsMg=";
+ buildTypesAiobotocorePackage "sts" "2.15.2"
+ "sha256-5Ua7GxbzeeX0/8vTxsYgB8jruGv5u16FQ8plGKLMBVw=";
types-aiobotocore-support =
- buildTypesAiobotocorePackage "support" "2.15.1"
- "sha256-fpQ5fan2CkWJrnir65tBHyXAqSa1CVQXt/Q1h7NiyjU=";
+ buildTypesAiobotocorePackage "support" "2.15.2"
+ "sha256-nM+vzI5wv8VRyRUok6GaI77VEBcaxeGikldAAvAIAXw=";
types-aiobotocore-support-app =
- buildTypesAiobotocorePackage "support-app" "2.15.1"
- "sha256-W/uBm0i+eNsPdSpZ+WvxSRJpZTzRdnt4snregNIeghQ=";
+ buildTypesAiobotocorePackage "support-app" "2.15.2"
+ "sha256-EhVR5a5O7/XwiRDcIsUS6aZqILArMyxd85XmiNN+M+Y=";
types-aiobotocore-swf =
- buildTypesAiobotocorePackage "swf" "2.15.1"
- "sha256-ijmqVcESbAfQLCgWhIEqq1+V8fChp1Pq0IfeBjmPtPM=";
+ buildTypesAiobotocorePackage "swf" "2.15.2"
+ "sha256-/dz5ZVqz6ovntu/O5ON7Gf1o78Nn1FxJOUzcHvwuOwg=";
types-aiobotocore-synthetics =
- buildTypesAiobotocorePackage "synthetics" "2.15.1"
- "sha256-mDvgYxDjVc2Z+IGCiaNR3xOYuht1LHJPW1lViQsfsfQ=";
+ buildTypesAiobotocorePackage "synthetics" "2.15.2"
+ "sha256-akHP8h2XxNvHVku5uCTQ3K8HgwWRg9QL1BAQRzQ3eEc=";
types-aiobotocore-textract =
- buildTypesAiobotocorePackage "textract" "2.15.1"
- "sha256-HLjYbm4OK2gvKMKBkNZytKlChMW43y8g2k0CMVVvcGY=";
+ buildTypesAiobotocorePackage "textract" "2.15.2"
+ "sha256-Wt8E53/j9mi0yJWp/+omVnIBoI5sVMJPgR4BofB+6nM=";
types-aiobotocore-timestream-query =
- buildTypesAiobotocorePackage "timestream-query" "2.15.1"
- "sha256-Jx3U+EzIZzTntyq5YxlSJkHQaGX3JkKqCOlHtGqO7vY=";
+ buildTypesAiobotocorePackage "timestream-query" "2.15.2"
+ "sha256-7oi/qslTdLXQGVzsucF09PT+A1gyncYXdNoY0aZZwnA=";
types-aiobotocore-timestream-write =
- buildTypesAiobotocorePackage "timestream-write" "2.15.1"
- "sha256-h1eonOUwVXsybJ25UfQwZtZWuhDh1v8M10ZT9JM1NVo=";
+ buildTypesAiobotocorePackage "timestream-write" "2.15.2"
+ "sha256-oOPC3wV2Wutveglu9vd6bNl9MGWxsJhyxn1h3R5h3DU=";
types-aiobotocore-tnb =
- buildTypesAiobotocorePackage "tnb" "2.15.1"
- "sha256-6b9c2UdaNHM3/GAiGWFnZVR7sUP+cUy9Z5W3Ig+7fSM=";
+ buildTypesAiobotocorePackage "tnb" "2.15.2"
+ "sha256-rxiCacHIc1+JX5Ba+Ft3kaZfxPOuQzDbsK/wxPJi4VA=";
types-aiobotocore-transcribe =
- buildTypesAiobotocorePackage "transcribe" "2.15.1"
- "sha256-bLQrTDUhbYOTYY+KvUxMwiHgPFHrAJxB8Yjy3TUAMCc=";
+ buildTypesAiobotocorePackage "transcribe" "2.15.2"
+ "sha256-IMJBlNAWIlk0FWLQQ/2Gcyk6ePqicSqOkDvIxuc+yjg=";
types-aiobotocore-transfer =
- buildTypesAiobotocorePackage "transfer" "2.15.1"
- "sha256-+cSgukEugB7RSrkWsEgbiMS6tvjAJDPwVP+rVEsAMJE=";
+ buildTypesAiobotocorePackage "transfer" "2.15.2"
+ "sha256-M0bTj75PMhNE4Z1Cw8Mb5qlqN3NFkqyWPMi2T5IHnH0=";
types-aiobotocore-translate =
- buildTypesAiobotocorePackage "translate" "2.15.1"
- "sha256-Hf46I5GHQyLAN6IXL0X0VN6Mr3CsMhhPFKqx/fDrHv8=";
+ buildTypesAiobotocorePackage "translate" "2.15.2"
+ "sha256-OJYflZHEP6xshavrMsdALZ1W7OFGlXTcZ2y7lSZFiiM=";
types-aiobotocore-verifiedpermissions =
- buildTypesAiobotocorePackage "verifiedpermissions" "2.15.1"
- "sha256-yxamVPkF/RexBvdBpjUi8rYzEy5jOf15otKqi64gnOc=";
+ buildTypesAiobotocorePackage "verifiedpermissions" "2.15.2"
+ "sha256-jzG0vdPOF7gtAVdT4zUbQ9on9hGZ0r7Ip3BPJYVFk6I=";
types-aiobotocore-voice-id =
- buildTypesAiobotocorePackage "voice-id" "2.15.1"
- "sha256-B7Q0TAT7rMWVZf4wSE6qGxMalHwvV7hPrcnCw3vcQkw=";
+ buildTypesAiobotocorePackage "voice-id" "2.15.2"
+ "sha256-AG6/UuYdeYOjECyemoqB7BrjIDg6OuIbIfdCaSsgc7Y=";
types-aiobotocore-vpc-lattice =
- buildTypesAiobotocorePackage "vpc-lattice" "2.15.1"
- "sha256-ybBzzhKX3NClXHnYR7GBpQZGsF+xPprHrbHgOjeR+9U=";
+ buildTypesAiobotocorePackage "vpc-lattice" "2.15.2"
+ "sha256-pSrj/6I5X4EAiBGtP/usG8AnDFrExtV7wpCMIYjdmLI=";
types-aiobotocore-waf =
- buildTypesAiobotocorePackage "waf" "2.15.1"
- "sha256-YPYrL6RRL0UhABcDZXpJQ8RQWDvPkD+y/qDQ1PbLCuU=";
+ buildTypesAiobotocorePackage "waf" "2.15.2"
+ "sha256-rdMMNnCkv1+sCL+4lB5ubSWAyPvBrNDuLZcqFAky6kI=";
types-aiobotocore-waf-regional =
- buildTypesAiobotocorePackage "waf-regional" "2.15.1"
- "sha256-fkKB2Cmg0i/OOJKkHmLzU0UWkUDXVAjXYmBWpal6pg4=";
+ buildTypesAiobotocorePackage "waf-regional" "2.15.2"
+ "sha256-FqUfQlM41v6q5SdlSgzBt/MnK3SiDYdGKpqNnlcKMXQ=";
types-aiobotocore-wafv2 =
- buildTypesAiobotocorePackage "wafv2" "2.15.1"
- "sha256-f5xAh/57zMcvjJHeqDDSrlSx3u/J3e78oQmGVSyD4Vc=";
+ buildTypesAiobotocorePackage "wafv2" "2.15.2"
+ "sha256-wOVJrIL5F7qapff49bWw2NfX3p+fr2KiLyDU0UIKMDg=";
types-aiobotocore-wellarchitected =
- buildTypesAiobotocorePackage "wellarchitected" "2.15.1"
- "sha256-j1yGNqM32RKzz5xmL52+cwS9JIj1DUIJQatHz7ZjZrg=";
+ buildTypesAiobotocorePackage "wellarchitected" "2.15.2"
+ "sha256-srXL51+IeqOadPa8TFSA3BZEPQbw51zgsuRTbDJlACw=";
types-aiobotocore-wisdom =
- buildTypesAiobotocorePackage "wisdom" "2.15.1"
- "sha256-0rngVEUa9yBIeoMC2dKVVDty4DAiesQZJRm73C4PAhg=";
+ buildTypesAiobotocorePackage "wisdom" "2.15.2"
+ "sha256-p0KPHHmqy9Jd4tWypg+5AcnEHb0dESwNVC6bPr1VDBc=";
types-aiobotocore-workdocs =
- buildTypesAiobotocorePackage "workdocs" "2.15.1"
- "sha256-Jypse/lhsvGWfu8551dngM+Jp8BdIp2T1WRfqdV02ug=";
+ buildTypesAiobotocorePackage "workdocs" "2.15.2"
+ "sha256-csR9+vedxQbUu16e3fCwSTW4opv2FW7VnNXsfawJGSk=";
types-aiobotocore-worklink =
buildTypesAiobotocorePackage "worklink" "2.15.1"
@@ -1456,18 +1456,18 @@ rec {
"sha256-o2n4u7wgJPSS02LLZe+PLsxdwm5r+0j3VzDFVnR7bGc=";
types-aiobotocore-workmailmessageflow =
- buildTypesAiobotocorePackage "workmailmessageflow" "2.15.1"
- "sha256-PQQLKPZYaCqIVTXS8PWAjrYjp4ZTMl1XDuvz27s10sY=";
+ buildTypesAiobotocorePackage "workmailmessageflow" "2.15.2"
+ "sha256-2Rb15SCI1o6OfMuJzWcosZqWZQOs0ZrPGLDy7bdZPPk=";
types-aiobotocore-workspaces =
- buildTypesAiobotocorePackage "workspaces" "2.15.1"
- "sha256-eU+8eBZ52BEAqpvHWJ4aVr2kuz6/6fMu7yu4bA9f/TQ=";
+ buildTypesAiobotocorePackage "workspaces" "2.15.2"
+ "sha256-wQSb23Y6nySclLl9c2MCfiZ81N+GKbYhHcro6zBVtNo=";
types-aiobotocore-workspaces-web =
- buildTypesAiobotocorePackage "workspaces-web" "2.15.1"
- "sha256-+lUuiVz/wqkuH59QzB8ZIv+bvNGeNZvBDzUctYd6LAg=";
+ buildTypesAiobotocorePackage "workspaces-web" "2.15.2"
+ "sha256-oFljA4OPlPF4q9xMMxhtv2/t5FQcwUeGdBC3ueGCnKA=";
types-aiobotocore-xray =
- buildTypesAiobotocorePackage "xray" "2.15.1"
- "sha256-+MKFgYPnSmSLjE9YP8fDjAo91o+mYkN2T4FbOMVSmnw=";
+ buildTypesAiobotocorePackage "xray" "2.15.2"
+ "sha256-coVjEy0/Kt0gkLS/MI/r1WpXvbJJeCMfGUfCYH7SNPY=";
}
diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix
index 29fffba265bc..75215f8a8ee3 100644
--- a/pkgs/development/python-modules/types-aiobotocore/default.nix
+++ b/pkgs/development/python-modules/types-aiobotocore/default.nix
@@ -364,13 +364,13 @@
buildPythonPackage rec {
pname = "types-aiobotocore";
- version = "2.15.1";
+ version = "2.15.2";
pyproject = true;
src = fetchPypi {
pname = "types_aiobotocore";
inherit version;
- hash = "sha256-DW7QyEVvvlnew0WqFCgA2wg3uYvKHtX2jPbvbVITd0U=";
+ hash = "sha256-Y+akVszDPiyjUKrliM/bu5S97PNTPmqFePc2xbK4Vgc=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/types-aiobotocore/update.sh b/pkgs/development/python-modules/types-aiobotocore/update.sh
index ea5b05fdaacd..a3449d2b4347 100755
--- a/pkgs/development/python-modules/types-aiobotocore/update.sh
+++ b/pkgs/development/python-modules/types-aiobotocore/update.sh
@@ -371,7 +371,7 @@ for package in "${packages[@]}"; do
url="https://pypi.io/packages/source/t/${package}/${package//-/_}-${version}.tar.gz"
hash=$(nix-prefetch-url --type sha256 $url)
- sri_hash="$(nix hash to-sri --type sha256 $hash)"
+ sri_hash="$(nix hash convert --hash-algo sha256 --to sri $hash)"
package_short="${package#types-aiobotocore-}"
awk -i inplace -v pkg="$package" -v pkg_short="$package_short" -v ver="$version" -v hash="$sri_hash" '
diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix
index ed5295ea0d97..124bcfe8874f 100644
--- a/pkgs/development/python-modules/types-requests/default.nix
+++ b/pkgs/development/python-modules/types-requests/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "types-requests";
- version = "2.32.0.20240914";
+ version = "2.32.0.20241016";
pyproject = true;
src = fetchPypi {
inherit pname version;
- hash = "sha256-KFDheNs5Gdm/gJ5DTu9luknQ5+M6yS1Yj0peKV//1AU=";
+ hash = "sha256-DZytLydRXQ4+PacTShtvKPuXEp2GuGfyTZxyZFJjTZU=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/ufolint/default.nix b/pkgs/development/python-modules/ufolint/default.nix
index 95db33a7bfc1..714a5cac45f3 100644
--- a/pkgs/development/python-modules/ufolint/default.nix
+++ b/pkgs/development/python-modules/ufolint/default.nix
@@ -27,7 +27,6 @@ buildPythonPackage rec {
fonttools
];
- doCheck = true;
nativeBuildInputs = [ pytestCheckHook ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix
index 45cf6ce2e967..afc8c2588024 100644
--- a/pkgs/development/python-modules/uiprotect/default.nix
+++ b/pkgs/development/python-modules/uiprotect/default.nix
@@ -39,7 +39,7 @@
buildPythonPackage rec {
pname = "uiprotect";
- version = "6.3.1";
+ version = "6.3.2";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -48,7 +48,7 @@ buildPythonPackage rec {
owner = "uilibs";
repo = "uiprotect";
rev = "refs/tags/v${version}";
- hash = "sha256-42rxRD3mXgMLz3mADF0ksDLpw2di5MyVL7+6iW41nI8=";
+ hash = "sha256-qODr3MM1nBna3gBZhq/uAYUpKHrvoB3lebKsusxw9yE=";
};
build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix
index f11af5836ca8..0094bb972a91 100644
--- a/pkgs/development/python-modules/urwid/default.nix
+++ b/pkgs/development/python-modules/urwid/default.nix
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "urwid";
- version = "2.6.15";
+ version = "2.6.16";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "urwid";
repo = "urwid";
rev = "refs/tags/${version}";
- hash = "sha256-bBgzhNNYxNZKaSo43I3fMoR+j6XDV6UBNrZfQyZ/f7c=";
+ hash = "sha256-D5NHtU7XQRh8OqkwrN5r8U/VGF87LGwdnaqGhdjN8AE=";
};
postPatch = ''
@@ -68,6 +68,11 @@ buildPythonPackage rec {
pytestFlagsArray = [ "tests" ];
+ disabledTests = [
+ # Flaky tests
+ "TwistedEventLoopTest"
+ ];
+
disabledTestPaths = [
# expect call hangs
"tests/test_vterm.py"
diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix
index 6058d62c0640..8ef7730047d5 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/pkgs/development/python-modules/uvloop/default.nix
@@ -61,6 +61,9 @@ buildPythonPackage rec {
"--deselect=tests/test_process.py::Test_UV_Process::test_process_streams_redirect"
"--deselect=tests/test_process.py::Test_AIO_Process::test_process_streams_redirect"
]
+ ++ lib.optionals (pythonOlder "3.11") [
+ "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_create_connection_ssl_failed_certificat"
+ ]
++ lib.optionals (stdenv.hostPlatform.isDarwin) [
# Segmentation fault
"--deselect=tests/test_fs_event.py::Test_UV_FS_EVENT_RENAME::test_fs_event_rename"
diff --git a/pkgs/development/python-modules/validator-collection/default.nix b/pkgs/development/python-modules/validator-collection/default.nix
index fbec2841fcdb..818471e62d1c 100644
--- a/pkgs/development/python-modules/validator-collection/default.nix
+++ b/pkgs/development/python-modules/validator-collection/default.nix
@@ -9,7 +9,6 @@
certifi,
cffi,
chardet,
- codecov,
colorama,
coverage,
docutils,
@@ -82,7 +81,6 @@ buildPythonPackage rec {
certifi
cffi
chardet
- codecov
colorama
coverage
docutils
diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix
index 2536e44bd960..72803dfd6074 100644
--- a/pkgs/development/python-modules/velbus-aio/default.nix
+++ b/pkgs/development/python-modules/velbus-aio/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "velbus-aio";
- version = "2024.7.6";
+ version = "2024.10.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "Cereal2nd";
repo = "velbus-aio";
rev = "refs/tags/${version}";
- hash = "sha256-+mdIJNWnrw8DHVEes+/X04eTILBt7zgTgNLG80XJlnI=";
+ hash = "sha256-4hMUh/0/srYIPed647Sh7H7DIp2oV7LN9srzLr0Qxps=";
fetchSubmodules = true;
};
diff --git a/pkgs/development/python-modules/walrus/default.nix b/pkgs/development/python-modules/walrus/default.nix
index 976037f92889..e5513ff4ac9a 100644
--- a/pkgs/development/python-modules/walrus/default.nix
+++ b/pkgs/development/python-modules/walrus/default.nix
@@ -1,18 +1,18 @@
{
lib,
- pkgs,
buildPythonPackage,
fetchFromGitHub,
+ pkgs,
pythonOlder,
redis,
+ setuptools,
unittestCheckHook,
- fetchpatch,
}:
buildPythonPackage rec {
pname = "walrus";
- version = "0.9.3";
- format = "setuptools";
+ version = "0.9.4";
+ pyproject = true;
disabled = pythonOlder "3.7";
@@ -20,20 +20,12 @@ buildPythonPackage rec {
owner = "coleifer";
repo = "walrus";
rev = "refs/tags/${version}";
- hash = "sha256-jinYMGSBAY8HTg92qU/iU5vGIrrDr5SeQG0XjsBVfcc=";
+ hash = "sha256-cvoRiaGGTpZWfSE6DDT6GwDmc/TC/Z/E76Qy9Zzkpsw=";
};
- patches = [
- # distutils has been deprecated, this wraps its import inside a try-catch
- # and fallsback to a fallback import.
- # Should not be necessary in future versions.
- (fetchpatch {
- url = "https://github.com/coleifer/walrus/commit/79e20c89aa4015017ef8a3e0b5c27ca2731dc9b2.patch";
- hash = "sha256-hCpvki6SV3KYhicjjUMP4VrKMEerMjq2n1BgozXKDO8=";
- })
- ];
+ build-system = [ setuptools ];
- propagatedBuildInputs = [ redis ];
+ dependencies = [ redis ];
nativeCheckInputs = [ unittestCheckHook ];
diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix
index dd17bcefa39f..f9c205f3c725 100644
--- a/pkgs/development/python-modules/watchdog/default.nix
+++ b/pkgs/development/python-modules/watchdog/default.nix
@@ -2,7 +2,6 @@
lib,
stdenv,
buildPythonPackage,
- CoreServices,
eventlet,
fetchPypi,
flaky,
@@ -11,6 +10,7 @@
pytestCheckHook,
pythonOlder,
pyyaml,
+ apple-sdk_11,
}:
buildPythonPackage rec {
@@ -25,13 +25,7 @@ buildPythonPackage rec {
hash = "sha256-tN+7bEkiG+RTViPqRHSk1u4KnO9KgLIMKNtNhYtk4nA=";
};
- # force kqueue on x86_64-darwin, because our api version does
- # not support fsevents
- patches = lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64) [
- ./force-kqueue.patch
- ];
-
- buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ];
+ buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
optional-dependencies.watchmedo = [ pyyaml ];
diff --git a/pkgs/development/python-modules/watchdog/force-kqueue.patch b/pkgs/development/python-modules/watchdog/force-kqueue.patch
deleted file mode 100644
index d4a0f4e6a00e..000000000000
--- a/pkgs/development/python-modules/watchdog/force-kqueue.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 337e4be..55ef9a6 100644
---- a/setup.py
-+++ b/setup.py
-@@ -38,7 +38,7 @@ _apple_devices = ("appletv", "iphone", "ipod", "ipad", "watch")
- is_macos = sys.platform == "darwin" and not machine().lower().startswith(_apple_devices)
-
- ext_modules = []
--if is_macos or os.getenv("FORCE_MACOS_MACHINE", "0") == "1":
-+if False:
- ext_modules = [
- Extension(
- name="_watchdog_fsevents",
-diff --git a/tests/utils.py b/tests/utils.py
-index 00dcf40..9fbc42a 100644
---- a/tests/utils.py
-+++ b/tests/utils.py
-@@ -15,8 +15,6 @@ Emitter: Type[EventEmitter]
- if sys.platform.startswith("linux"):
- from watchdog.observers.inotify import InotifyEmitter as Emitter
- from watchdog.observers.inotify import InotifyFullEmitter
--elif sys.platform.startswith("darwin"):
-- from watchdog.observers.fsevents import FSEventsEmitter as Emitter
- elif sys.platform.startswith("win"):
- from watchdog.observers.read_directory_changes import WindowsApiEmitter as Emitter
- elif sys.platform.startswith(("dragonfly", "freebsd", "netbsd", "openbsd", "bsd")):
diff --git a/pkgs/development/python-modules/webrtc-models/default.nix b/pkgs/development/python-modules/webrtc-models/default.nix
new file mode 100644
index 000000000000..d03d77ca4924
--- /dev/null
+++ b/pkgs/development/python-modules/webrtc-models/default.nix
@@ -0,0 +1,59 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ hatchling,
+ mashumaro,
+ orjson,
+ pytest-asyncio,
+ pytest-cov-stub,
+ pytestCheckHook,
+ pythonOlder,
+ syrupy,
+}:
+
+buildPythonPackage rec {
+ pname = "webrtc-models";
+ version = "0.1.0";
+ pyproject = true;
+
+ disabled = pythonOlder "3.12";
+
+ src = fetchFromGitHub {
+ owner = "home-assistant-libs";
+ repo = "python-webrtc-models";
+ rev = "refs/tags/${version}";
+ hash = "sha256-Wmz+P4FFJJZujWF0SR6HVERNNO7xSM1iCayg6tmVyso=";
+ };
+
+ postPatch = ''
+ substituteInPlace pyproject.toml \
+ --replace-fail 'version = "0.0.0"' 'version = "${version}"'
+ '';
+
+ pythonRelaxDeps = [ "orjson" ];
+
+ build-system = [ hatchling ];
+
+ dependencies = [
+ mashumaro
+ orjson
+ ];
+
+ nativeCheckInputs = [
+ pytest-asyncio
+ pytest-cov-stub
+ pytestCheckHook
+ syrupy
+ ];
+
+ pythonImportsCheck = [ "webrtc_models" ];
+
+ meta = {
+ description = "WebRTC models as Python dataclasses with mashumaro";
+ homepage = "https://github.com/home-assistant-libs/python-webrtc-models";
+ changelog = "https://github.com/home-assistant-libs/python-webrtc-models/releases/tag/${version}";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix
index 59b1e02d771f..658d69ea942d 100644
--- a/pkgs/development/python-modules/websockets/default.nix
+++ b/pkgs/development/python-modules/websockets/default.nix
@@ -24,26 +24,31 @@ buildPythonPackage rec {
build-system = [ setuptools ];
- patchPhase = ''
- # Disable all tests that need to terminate within a predetermined amount of
- # time. This is nondeterministic.
- sed -i 's/with self.assertCompletesWithin.*:/if True:/' \
- tests/legacy/test_protocol.py
+ patchPhase =
+ ''
+ # Disable all tests that need to terminate within a predetermined amount of
+ # time. This is nondeterministic.
+ sed -i 's/with self.assertCompletesWithin.*:/if True:/' \
+ tests/legacy/test_protocol.py
- # Disables tests relying on tight timeouts to avoid failures like:
- # File "/build/source/tests/legacy/test_protocol.py", line 1270, in test_keepalive_ping_with_no_ping_timeout
- # ping_1_again, ping_2 = tuple(self.protocol.pings)
- # ValueError: too many values to unpack (expected 2)
- for t in \
- test_keepalive_ping_stops_when_connection_closing \
- test_keepalive_ping_does_not_crash_when_connection_lost \
- test_keepalive_ping \
- test_keepalive_ping_not_acknowledged_closes_connection \
- test_keepalive_ping_with_no_ping_timeout \
- ; do
- sed -i "s/def $t(/def skip_$t(/" tests/legacy/test_protocol.py
- done
- '';
+ # Disables tests relying on tight timeouts to avoid failures like:
+ # File "/build/source/tests/legacy/test_protocol.py", line 1270, in test_keepalive_ping_with_no_ping_timeout
+ # ping_1_again, ping_2 = tuple(self.protocol.pings)
+ # ValueError: too many values to unpack (expected 2)
+ for t in \
+ test_keepalive_ping_stops_when_connection_closing \
+ test_keepalive_ping_does_not_crash_when_connection_lost \
+ test_keepalive_ping \
+ test_keepalive_ping_not_acknowledged_closes_connection \
+ test_keepalive_ping_with_no_ping_timeout \
+ ; do
+ sed -i "s/def $t(/def skip_$t(/" tests/legacy/test_protocol.py
+ done
+ ''
+ + lib.optionalString (pythonOlder "3.11") ''
+ # Our Python 3.10 and older raise SSLError instead of SSLCertVerificationError
+ sed -i "s/def test_reject_invalid_server_certificate(/def skip_test_reject_invalid_server_certificate(/" tests/sync/test_client.py
+ '';
nativeCheckInputs = [ unittestCheckHook ];
diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix
index 83b446947683..367a615f9c27 100644
--- a/pkgs/development/python-modules/willow/default.nix
+++ b/pkgs/development/python-modules/willow/default.nix
@@ -1,43 +1,38 @@
{
lib,
buildPythonPackage,
- fetchFromGitHub,
-
- # build-system
- flit-core,
-
- # dependencies
- filetype,
defusedxml,
-
- # optional-dependencies
- pillow-heif,
-
- # tests
+ fetchFromGitHub,
+ filetype,
+ flit-core,
numpy,
opencv4,
+ pillow-heif,
pillow,
pytestCheckHook,
+ pythonOlder,
wand,
}:
buildPythonPackage rec {
pname = "willow";
- version = "1.8.0";
- format = "pyproject";
+ version = "1.9.0";
+ pyproject = true;
+
+ disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "wagtail";
repo = "Willow";
rev = "refs/tags/v${version}";
- hash = "sha256-g9/v56mdo0sJe5Pl/to/R/kXayaKK3qaYbnnPXpFjXE=";
+ hash = "sha256-H/UXE6gA6x849aqBcUgl3JYZ87OMNpuFyWGSsgqW1Rk=";
};
- nativeBuildInputs = [ flit-core ];
+ build-system = [ flit-core ];
pythonRelaxDeps = [ "defusedxml" ];
- propagatedBuildInputs = [
+ dependencies = [
filetype
defusedxml
];
@@ -57,6 +52,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python image library that sits on top of Pillow, Wand and OpenCV";
homepage = "https://github.com/torchbox/Willow/";
+ changelog = "https://github.com/wagtail/Willow/releases/tag/v${version}";
license = licenses.bsd2;
maintainers = with maintainers; [ desiderius ];
};
diff --git a/pkgs/development/python-modules/wxpython/0001-add-missing-bool-c.patch b/pkgs/development/python-modules/wxpython/0001-add-missing-bool-c.patch
new file mode 100644
index 000000000000..3a12611b5be1
--- /dev/null
+++ b/pkgs/development/python-modules/wxpython/0001-add-missing-bool-c.patch
@@ -0,0 +1,41 @@
+From f16912c7932ecc1cceb2fd9565fcae37bfd0447b Mon Sep 17 00:00:00 2001
+From: wxt <3264117476@qq.com>
+Date: Tue, 22 Oct 2024 11:07:58 +0800
+Subject: [PATCH] tt
+
+---
+ sip/siplib/bool.c | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+ create mode 100644 sip/siplib/bool.c
+
+diff --git a/sip/siplib/bool.c b/sip/siplib/bool.c
+new file mode 100644
+index 0000000..781babb
+--- /dev/null
++++ b/sip/siplib/bool.c
+@@ -0,0 +1,22 @@
++// This contains all the C++ code that is needed by the sip module.
++//
++// Copyright (c) 2015 Riverbank Computing Limited
++//
++// This file is part of SIP.
++//
++// This copy of SIP is licensed for use under the terms of the SIP License
++// Agreement. See the file LICENSE for more details.
++//
++// This copy of SIP may also used under the terms of the GNU General Public
++// License v2 or v3 as published by the Free Software Foundation which can be
++// found in the files LICENSE-GPL2 and LICENSE-GPL3 included in this package.
++//
++// SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++
++
++// Set a C++ bool for the main C implementation of the module.
++extern "C" void sipSetBool(void *ptr, int val)
++{
++ *reinterpret_cast(ptr) = !!val;
++}
+--
+2.46.1
+
diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix
index 6f313206c4cd..09cf9684c4d5 100644
--- a/pkgs/development/python-modules/wxpython/4.2.nix
+++ b/pkgs/development/python-modules/wxpython/4.2.nix
@@ -58,6 +58,7 @@ buildPythonPackage rec {
libpangocairo = "${pango}/lib/libpangocairo-1.0.so";
libcairo = "${cairo}/lib/libcairo.so";
})
+ ./0001-add-missing-bool-c.patch # Add missing bool.c from old source
];
# https://github.com/wxWidgets/Phoenix/issues/2575
diff --git a/pkgs/development/python-modules/xapian/default.nix b/pkgs/development/python-modules/xapian/default.nix
index 382b67293272..fea907243d70 100644
--- a/pkgs/development/python-modules/xapian/default.nix
+++ b/pkgs/development/python-modules/xapian/default.nix
@@ -34,8 +34,6 @@ buildPythonPackage rec {
xapian
];
- doCheck = true;
-
checkPhase = ''
${python.interpreter} python${pythonSuffix}/pythontest.py
'';
diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix
index 9a17ffa46517..ce66720f17d0 100644
--- a/pkgs/development/python-modules/xdis/default.nix
+++ b/pkgs/development/python-modules/xdis/default.nix
@@ -6,13 +6,14 @@
fetchpatch,
pytestCheckHook,
pythonOlder,
+ setuptools,
six,
}:
buildPythonPackage rec {
pname = "xdis";
version = "6.1.1";
- format = "setuptools";
+ pyproject = true;
disabled = pythonOlder "3.6";
@@ -24,7 +25,6 @@ buildPythonPackage rec {
};
# Backport magics for newer newer python versions
- # 6.1.1 only supports up to 3.12.4 while nixpkgs is already on 3.12.5+
patches = [
(fetchpatch {
url = "https://github.com/rocky/python-xdis/commit/fcba74a7f64c5e2879ca0779ff10f38f9229e7da.patch";
@@ -34,9 +34,25 @@ buildPythonPackage rec {
url = "https://github.com/rocky/python-xdis/commit/b66976ff53a2c6e17a73fb7652ddd6c8054df8db.patch";
hash = "sha256-KO1y0nDTPmEZ+0/3Pjh+CvTdpr/p4AYZ8XdH5J+XzXo=";
})
+ (fetchpatch {
+ url = "https://github.com/rocky/python-xdis/commit/a9f50c0ba77cdbf4693388404c13a02796a4221a.patch";
+ hash = "sha256-gwMagKBY7d/+ohESTSl6M2IEjzABxfrddpdr58VJAk8=";
+ })
+ (fetchpatch {
+ url = "https://github.com/rocky/python-xdis/commit/d9e15acae76a413667912a10fbf8259711ed9c65.patch";
+ hash = "sha256-hpmKg+K1RiLSnmUIS8KtZRVBfvTO9bWbpsNhBFUM38o=";
+ })
+ (fetchpatch {
+ url = "https://github.com/rocky/python-xdis/commit/b412c878d0bc1b516bd01612d46d8830c36a14ad.patch";
+ hash = "sha256-W1JuIXYLO6iyjWiSnzCoXzFsedZjesq31gEPgrtjxas=";
+ })
];
- propagatedBuildInputs = [
+ build-system = [
+ setuptools
+ ];
+
+ dependencies = [
click
six
];
diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix
index 8cd817ea1c90..944b9f4619e9 100644
--- a/pkgs/development/python-modules/xdot/default.nix
+++ b/pkgs/development/python-modules/xdot/default.nix
@@ -60,8 +60,6 @@ buildPythonPackage rec {
runHook postCheck
'';
- doCheck = true;
-
meta = with lib; {
description = "Interactive viewer for graphs written in Graphviz's dot";
mainProgram = "xdot";
diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix
index 73ac283ca349..76db9d97263a 100644
--- a/pkgs/development/python-modules/xhtml2pdf/default.nix
+++ b/pkgs/development/python-modules/xhtml2pdf/default.nix
@@ -3,7 +3,6 @@
arabic-reshaper,
buildPythonPackage,
fetchFromGitHub,
- fetchpatch2,
html5lib,
pillow,
pyhanko,
@@ -31,22 +30,11 @@ buildPythonPackage rec {
hash = "sha256-sva1Oqz4FsLz/www8IPVxol3D0hx5F5hQ0I/rSRP9sE=";
};
- patches = [
- # https://github.com/xhtml2pdf/xhtml2pdf/pull/754
- (fetchpatch2 {
- name = "reportlab-compat.patch";
- url = "https://github.com/xhtml2pdf/xhtml2pdf/commit/1252510bd23b833b45b4d252aeac62c1eb51eeef.patch";
- hash = "sha256-9Fkn086uh2biabmiChbBna8Q4lJV/604yX1ng9j5TGs=";
- })
- ];
-
- nativeBuildInputs = [
+ build-system = [
setuptools
];
- pythonRelaxDeps = [ "reportlab" ];
-
- propagatedBuildInputs = [
+ dependencies = [
arabic-reshaper
html5lib
pillow
@@ -71,12 +59,12 @@ buildPythonPackage rec {
"xhtml2pdf.pisa"
];
- meta = with lib; {
+ meta = {
+ changelog = "https://github.com/xhtml2pdf/xhtml2pdf/releases/tag/v${version}";
description = "PDF generator using HTML and CSS";
homepage = "https://github.com/xhtml2pdf/xhtml2pdf";
- changelog = "https://github.com/xhtml2pdf/xhtml2pdf/releases/tag/v${version}";
- license = licenses.asl20;
- maintainers = [ ];
+ license = lib.licenses.asl20;
mainProgram = "xhtml2pdf";
+ maintainers = with lib.maintainers; [ drupol ];
};
}
diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix
index 89323aa8d720..eb3472bce0f9 100644
--- a/pkgs/development/python-modules/xknx/default.nix
+++ b/pkgs/development/python-modules/xknx/default.nix
@@ -14,16 +14,16 @@
buildPythonPackage rec {
pname = "xknx";
- version = "3.2.0";
+ version = "3.3.0";
pyproject = true;
- disabled = pythonOlder "3.8";
+ disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "XKNX";
repo = "xknx";
rev = "refs/tags/${version}";
- hash = "sha256-hgCmzWncHTsvfVeU/ePpu59THtmuLlqeCO11/L4BRvM=";
+ hash = "sha256-FLGOY7IUdLvRbwSWUYbJl0VzOCJVwiG+2C+CjFAqI6g=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/xrootd/default.nix b/pkgs/development/python-modules/xrootd/default.nix
index 33b42f9f0f35..65d874d73c2d 100644
--- a/pkgs/development/python-modules/xrootd/default.nix
+++ b/pkgs/development/python-modules/xrootd/default.nix
@@ -3,7 +3,6 @@
buildPythonPackage,
cmake,
setuptools,
- wheel,
xrootd,
}:
@@ -15,10 +14,9 @@ buildPythonPackage rec {
sourceRoot = "${src.name}/bindings/python";
- nativeBuildInputs = [
+ build-system = [
cmake
setuptools
- wheel
];
buildInputs = [ xrootd ];
@@ -30,11 +28,11 @@ buildPythonPackage rec {
# Tests are only compatible with Python 2
doCheck = false;
- meta = with lib; {
+ meta = {
description = "XRootD central repository";
homepage = "https://github.com/xrootd/xrootd";
changelog = "https://github.com/xrootd/xrootd/releases/tag/v${version}";
- license = licenses.gpl3Only;
- maintainers = with maintainers; [ GaetanLepage ];
+ license = lib.licenses.gpl3Only;
+ maintainers = with lib.maintainers; [ GaetanLepage ];
};
}
diff --git a/pkgs/development/python-modules/yaramod/default.nix b/pkgs/development/python-modules/yaramod/default.nix
index 78589108f7e0..3bf6ba1b7546 100644
--- a/pkgs/development/python-modules/yaramod/default.nix
+++ b/pkgs/development/python-modules/yaramod/default.nix
@@ -21,7 +21,7 @@ let
in
buildPythonPackage rec {
pname = "yaramod";
- version = "3.23.0";
+ version = "4.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "avast";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-TB0dnWA+5beyHAoYUjqocmw5uGFgo/h9eKDbuKbmfsw=";
+ hash = "sha256-YbsNFtDk5u5UyTsS1aGKUv/HWYxEwERinZ3G84/mC9o=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/ydata-profiling/default.nix b/pkgs/development/python-modules/ydata-profiling/default.nix
index 74be2546c623..334261463c62 100644
--- a/pkgs/development/python-modules/ydata-profiling/default.nix
+++ b/pkgs/development/python-modules/ydata-profiling/default.nix
@@ -1,54 +1,59 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, pythonOlder
-, pytestCheckHook
-, dacite
-, htmlmin
-, imagehash
-, jinja2
-, matplotlib
-, multimethod
-, numba
-, numpy
-, pandas
-, phik
-, pyarrow
-, pydantic
-, pyyaml
-, requests
-, scipy
-, seaborn
-, statsmodels
-, tqdm
-, typeguard
-, visions
-, wordcloud
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ pythonOlder,
+ pytestCheckHook,
+ dacite,
+ htmlmin,
+ imagehash,
+ jinja2,
+ matplotlib,
+ multimethod,
+ numba,
+ numpy,
+ pandas,
+ phik,
+ pyarrow,
+ pydantic,
+ pyyaml,
+ requests,
+ scipy,
+ setuptools,
+ seaborn,
+ statsmodels,
+ tqdm,
+ typeguard,
+ visions,
+ wordcloud,
}:
buildPythonPackage rec {
pname = "ydata-profiling";
- version = "4.11.0";
+ version = "4.12.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ydataai";
- repo = pname;
+ repo = "ydata-profiling";
rev = "refs/tags/v${version}";
- hash = "sha256-3bgFPPGgLCcJfYr9vmwnHFwz3/zybRI8Aiu5VoOPsNA=";
+ hash = "sha256-G1qW6HcJi176nfxOBGBK2tLyY/Nnz9STYpZWluWvhP0=";
};
preBuild = ''
echo ${version} > VERSION
'';
+ build-system = [ setuptools ];
+
pythonRelaxDeps = [
+ "imagehash"
"scipy"
];
- propagatedBuildInputs = [
+ dependencies = [
dacite
htmlmin
imagehash
@@ -72,9 +77,10 @@ buildPythonPackage rec {
];
nativeCheckInputs = [
- pytestCheckHook
pyarrow
+ pytestCheckHook
];
+
disabledTestPaths = [
# needs Spark:
"tests/backends/spark_backend"
@@ -84,6 +90,7 @@ buildPythonPackage rec {
"tests/unit/test_dataset_schema.py"
"tests/unit/test_modular.py"
];
+
disabledTests = [
# try to download data:
"test_decorator"
@@ -92,9 +99,7 @@ buildPythonPackage rec {
"test_urls"
];
- pythonImportsCheck = [
- "ydata_profiling"
- ];
+ pythonImportsCheck = [ "ydata_profiling" ];
meta = with lib; {
description = "Create HTML profiling reports from Pandas DataFrames";
diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix
index b49e0e4cbd82..36a381551864 100644
--- a/pkgs/development/python-modules/yfinance/default.nix
+++ b/pkgs/development/python-modules/yfinance/default.nix
@@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "yfinance";
- version = "0.2.44";
+ version = "0.2.48";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "ranaroussi";
repo = "yfinance";
rev = "refs/tags/${version}";
- hash = "sha256-XaenqZMvbimuptfCpvyhXxvbJTPA94+nN938HI5gDQo=";
+ hash = "sha256-7m5N2l80Cg6+NDiW0x49WtHkc6fu07s0BqKlHFCc1v0=";
};
build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/zeversolar/default.nix b/pkgs/development/python-modules/zeversolar/default.nix
new file mode 100644
index 000000000000..5a28927a3ec3
--- /dev/null
+++ b/pkgs/development/python-modules/zeversolar/default.nix
@@ -0,0 +1,48 @@
+{
+ lib,
+ buildPythonPackage,
+ fetchFromGitHub,
+ poetry-core,
+ pytest-mock,
+ pytestCheckHook,
+ pythonOlder,
+ requests,
+ retry2,
+}:
+
+buildPythonPackage rec {
+ pname = "zeversolar";
+ version = "0.3.2";
+ pyproject = true;
+
+ disabled = pythonOlder "3.10";
+
+ src = fetchFromGitHub {
+ owner = "kvanzuijlen";
+ repo = "zeversolar";
+ rev = "refs/tags/${version}";
+ hash = "sha256-HnF21B7k2MmugMjGIF2EKwwXJWD/WdDvPdz1oaPSS5Y=";
+ };
+
+ build-system = [ poetry-core ];
+
+ dependencies = [
+ requests
+ retry2
+ ];
+
+ nativeCheckInputs = [
+ pytest-mock
+ pytestCheckHook
+ ];
+
+ pythonImportsCheck = [ "zeversolar" ];
+
+ meta = {
+ description = "Module to interact with the local CGI provided by ZeverSolar";
+ homepage = "https://github.com/kvanzuijlen/zeversolar";
+ changelog = "https://github.com/kvanzuijlen/zeversolar/releases/tag/${version}";
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/zipfile2/default.nix b/pkgs/development/python-modules/zipfile2/default.nix
index 2d611e912c04..68b1af2e79bd 100644
--- a/pkgs/development/python-modules/zipfile2/default.nix
+++ b/pkgs/development/python-modules/zipfile2/default.nix
@@ -1,31 +1,43 @@
{
+ lib,
buildPythonPackage,
fetchFromGitHub,
- lib,
- pythonAtLeast,
+ pytestCheckHook,
+ pythonOlder,
+ setuptools,
}:
buildPythonPackage rec {
pname = "zipfile2";
- version = "0.0.12";
- format = "setuptools";
+ version = "0.0.12-unstable-2024-09-28";
+ pyproject = true;
+
+ disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "cournape";
- repo = pname;
- rev = "v${version}";
- hash = "sha256-BwcEgW4XrQqz0Jmtbyxf8q0mWTJXv2dL3Tk7N/IYuMI=";
+ repo = "zipfile2";
+ #rev = "refs/tags/v${version}";
+ rev = "8823f7253772e5c5811343306a591c00c764c6d0";
+ hash = "sha256-jDOyIj0sQS1dIsar4nyk5V2mme3Zc6VTms49/4n93ho=";
};
- patches = [ ./no-setuid.patch ];
+ build-system = [ setuptools ];
+
+ nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "zipfile2" ];
+ disabledTests = [
+ # PermissionError: [Errno 1] Operation not ...
+ "test_extract"
+ ];
+
meta = with lib; {
- homepage = "https://github.com/cournape/zipfile2";
description = "Backwards-compatible improved zipfile class";
- maintainers = with maintainers; [ genericnerdyusername ];
+ homepage = "https://github.com/cournape/zipfile2";
+ changelog = "https://github.com/itziakos/zipfile2/releases/tag/v${version}";
license = licenses.psfl;
- broken = pythonAtLeast "3.12"; # tests are failing because the signature of ZipInfo._decodeExtra changed
+ maintainers = with maintainers; [ genericnerdyusername ];
};
}
diff --git a/pkgs/development/python2-modules/README.md b/pkgs/development/python2-modules/README.md
new file mode 100644
index 000000000000..2d3a7cbb2b8e
--- /dev/null
+++ b/pkgs/development/python2-modules/README.md
@@ -0,0 +1,7 @@
+# Python 2 is Not Supported
+
+Packages, applications, and services based on Python 2 are no longer supported and are being removed. If you require a Python 2 based package, you can include that package in your own local repository.
+
+Some packages may continue to be maintained for internal use by nixpkgs, but they should not be used by new public packages.
+
+For more details, see [Issue #201859](https://github.com/NixOS/nixpkgs/pull/201859).
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 99aa58e5040f..4689a1e95ac3 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -474,7 +474,7 @@ let
RMySQL = with pkgs; [ zlib libmysqlclient openssl.dev ];
RNetCDF = with pkgs; [ netcdf udunits ];
RODBC = [ pkgs.libiodbc ];
- rpanel = [ pkgs.bwidget ];
+ rpanel = [ pkgs.tclPackages.bwidget ];
Rpoppler = [ pkgs.poppler ];
RPostgres = with pkgs; [ postgresql ];
RPostgreSQL = with pkgs; [ postgresql postgresql ];
@@ -801,7 +801,7 @@ let
sphereTessellation = with pkgs; [ gmp.dev mpfr.dev ];
vapour = with pkgs; [ proj.dev gdal ];
MedianaDesigner = [ pkgs.zlib.dev ];
- ChemmineOB = [ pkgs.eigen ];
+ ChemmineOB = with pkgs; [ eigen openbabel ];
DGP4LCF = [ pkgs.lapack pkgs.blas ];
};
@@ -1460,9 +1460,9 @@ let
rpanel = old.rpanel.overrideAttrs (attrs: {
preConfigure = ''
- export TCLLIBPATH="${pkgs.bwidget}/lib/bwidget${pkgs.bwidget.version}"
+ export TCLLIBPATH="${pkgs.tclPackages.bwidget}/lib/bwidget${pkgs.tclPackages.bwidget.version}"
'';
- TCLLIBPATH = "${pkgs.bwidget}/lib/bwidget${pkgs.bwidget.version}";
+ TCLLIBPATH = "${pkgs.tclPackages.bwidget}/lib/bwidget${pkgs.tclPackages.bwidget.version}";
});
networkscaleup = old.networkscaleup.overrideAttrs (attrs: {
@@ -1582,29 +1582,26 @@ let
PKGCONFIG_LIBS = "-Wl,-rpath,${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.openssl}/lib -L${pkgs.cyrus_sasl.out}/lib -L${pkgs.zlib.out}/lib -lssl -lcrypto -lsasl2 -lz";
});
- ChemmineOB = let
- # R package doesn't compile with the latest (unstable) version.
- # Override from nixpkgs-23.11
- openbabel3 = pkgs.openbabel.overrideAttrs (attrs: {
- version = "3.1.1";
- src = pkgs.fetchFromGitHub {
- owner = "openbabel";
- repo = "openbabel";
- rev = "openbabel-${lib.replaceStrings ["."] ["-"] attrs.version}";
- sha256 = "sha256-wQpgdfCyBAoh4pmj9j7wPTlMtraJ62w/EShxi/olVMY=";
- };
- });
- in
- old.ChemmineOB.overrideAttrs (attrs: {
+ ChemmineOB = old.ChemmineOB.overrideAttrs (attrs: {
# pkg-config knows openbabel-3 without the .0
# Eigen3 is also looked for in the wrong location
+ # pointer was changed in newer version of openbabel:
+ # https://github.com/openbabel/openbabel/commit/305a6fd3183540e4a8ae1d79d10bf1860e6aa373
postPatch = ''
substituteInPlace configure \
--replace-fail openbabel-3.0 openbabel-3
substituteInPlace src/Makevars.in \
--replace-fail "-I/usr/include/eigen3" "-I${pkgs.eigen}/include/eigen3"
+ substituteInPlace src/ChemmineOB.cpp \
+ --replace-fail "obsharedptr<" "std::shared_ptr<"
'';
- buildInputs = attrs.buildInputs ++ [openbabel3];
+
+ # copied from fastnlo-toolkit:
+ # None of our currently packaged versions of swig are C++17-friendly
+ # Use a workaround from https://github.com/swig/swig/issues/1538
+ env = (attrs.env or { }) // {
+ NIX_CFLAGS_COMPILE = (attrs.env.NIX_CFLAGS_COMPILE or "") + lib.optionalString stdenv.hostPlatform.isDarwin " -D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES";
+ };
});
ps = old.ps.overrideAttrs (attrs: {
diff --git a/pkgs/development/tcl-modules/by-name/README.md b/pkgs/development/tcl-modules/by-name/README.md
new file mode 100644
index 000000000000..c65310524c1c
--- /dev/null
+++ b/pkgs/development/tcl-modules/by-name/README.md
@@ -0,0 +1,17 @@
+# Name-based Tcl package directories
+
+The structure of this directory is identical to the one described in
+[/pkgs/by-name/README.md](../../../by-name/README.md).
+The only difference is the scope:
+
+```nix
+{ lib
+# You can get tclPackages attributes directly
+, mkTclDerivation
+, tcllib
+}:
+
+mkTclDerivation {
+ # ...
+}
+```
diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/tcl-modules/by-name/bw/bwidget/package.nix
similarity index 91%
rename from pkgs/development/libraries/bwidget/default.nix
rename to pkgs/development/tcl-modules/by-name/bw/bwidget/package.nix
index 8a408864c582..161324f9e6e0 100644
--- a/pkgs/development/libraries/bwidget/default.nix
+++ b/pkgs/development/tcl-modules/by-name/bw/bwidget/package.nix
@@ -1,6 +1,6 @@
-{ lib, fetchurl, tcl, tk }:
+{ lib, fetchurl, mkTclDerivation, tk }:
-tcl.mkTclDerivation rec {
+mkTclDerivation rec {
pname = "bwidget";
version = "1.10.0";
diff --git a/pkgs/tools/misc/expect/0004-enable-cross-compilation.patch b/pkgs/development/tcl-modules/by-name/ex/expect/0004-enable-cross-compilation.patch
similarity index 100%
rename from pkgs/tools/misc/expect/0004-enable-cross-compilation.patch
rename to pkgs/development/tcl-modules/by-name/ex/expect/0004-enable-cross-compilation.patch
diff --git a/pkgs/tools/misc/expect/fix-build-time-run-tcl.patch b/pkgs/development/tcl-modules/by-name/ex/expect/fix-build-time-run-tcl.patch
similarity index 100%
rename from pkgs/tools/misc/expect/fix-build-time-run-tcl.patch
rename to pkgs/development/tcl-modules/by-name/ex/expect/fix-build-time-run-tcl.patch
diff --git a/pkgs/tools/misc/expect/fix-darwin-bsd-clang16.patch b/pkgs/development/tcl-modules/by-name/ex/expect/fix-darwin-bsd-clang16.patch
similarity index 100%
rename from pkgs/tools/misc/expect/fix-darwin-bsd-clang16.patch
rename to pkgs/development/tcl-modules/by-name/ex/expect/fix-darwin-bsd-clang16.patch
diff --git a/pkgs/tools/misc/expect/freebsd-unversioned.patch b/pkgs/development/tcl-modules/by-name/ex/expect/freebsd-unversioned.patch
similarity index 100%
rename from pkgs/tools/misc/expect/freebsd-unversioned.patch
rename to pkgs/development/tcl-modules/by-name/ex/expect/freebsd-unversioned.patch
diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/development/tcl-modules/by-name/ex/expect/package.nix
similarity index 100%
rename from pkgs/tools/misc/expect/default.nix
rename to pkgs/development/tcl-modules/by-name/ex/expect/package.nix
diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/tcl-modules/by-name/in/incrtcl/package.nix
similarity index 92%
rename from pkgs/development/libraries/incrtcl/default.nix
rename to pkgs/development/tcl-modules/by-name/in/incrtcl/package.nix
index 4558ebbd0dcf..7b1397ac1bb8 100644
--- a/pkgs/development/libraries/incrtcl/default.nix
+++ b/pkgs/development/tcl-modules/by-name/in/incrtcl/package.nix
@@ -1,6 +1,6 @@
-{ lib, stdenv, fetchurl, writeText, tcl }:
+{ lib, stdenv, mkTclDerivation, fetchurl, writeText, tcl }:
-tcl.mkTclDerivation rec {
+mkTclDerivation rec {
pname = "incrtcl";
version = "4.2.3";
diff --git a/pkgs/development/libraries/itktcl/default.nix b/pkgs/development/tcl-modules/by-name/it/itktcl/package.nix
similarity index 92%
rename from pkgs/development/libraries/itktcl/default.nix
rename to pkgs/development/tcl-modules/by-name/it/itktcl/package.nix
index b6a4788075f7..aefefa8c3ceb 100644
--- a/pkgs/development/libraries/itktcl/default.nix
+++ b/pkgs/development/tcl-modules/by-name/it/itktcl/package.nix
@@ -1,6 +1,6 @@
-{ lib, stdenv, fetchurl, tcl, tk, incrtcl }:
+{ lib, stdenv, fetchurl, mkTclDerivation, tk, incrtcl }:
-tcl.mkTclDerivation rec {
+mkTclDerivation rec {
pname = "itk-tcl";
version = "4.1.0";
diff --git a/pkgs/development/libraries/mustache-tcl/default.nix b/pkgs/development/tcl-modules/by-name/mu/mustache-tcl/package.nix
similarity index 90%
rename from pkgs/development/libraries/mustache-tcl/default.nix
rename to pkgs/development/tcl-modules/by-name/mu/mustache-tcl/package.nix
index 063c8ea36f71..5281f40a78e8 100644
--- a/pkgs/development/libraries/mustache-tcl/default.nix
+++ b/pkgs/development/tcl-modules/by-name/mu/mustache-tcl/package.nix
@@ -1,6 +1,6 @@
-{ lib, fetchFromGitHub, tcl, tcllib }:
+{ lib, fetchFromGitHub, mkTclDerivation, tcllib }:
-tcl.mkTclDerivation rec {
+mkTclDerivation rec {
pname = "mustache-tcl";
version = "1.1.3.4";
diff --git a/pkgs/by-name/pd/pdf4tcl/package.nix b/pkgs/development/tcl-modules/by-name/pd/pdf4tcl/package.nix
similarity index 93%
rename from pkgs/by-name/pd/pdf4tcl/package.nix
rename to pkgs/development/tcl-modules/by-name/pd/pdf4tcl/package.nix
index 94ba20ebd742..07d059c042d3 100644
--- a/pkgs/by-name/pd/pdf4tcl/package.nix
+++ b/pkgs/development/tcl-modules/by-name/pd/pdf4tcl/package.nix
@@ -1,10 +1,10 @@
{
lib,
- tcl,
+ mkTclDerivation,
fetchzip,
}:
-tcl.mkTclDerivation rec {
+mkTclDerivation rec {
pname = "pdf4tcl";
version = "0.9.4";
diff --git a/pkgs/development/libraries/tcl-fcgi/default.nix b/pkgs/development/tcl-modules/by-name/tc/tcl-fcgi/package.nix
similarity index 90%
rename from pkgs/development/libraries/tcl-fcgi/default.nix
rename to pkgs/development/tcl-modules/by-name/tc/tcl-fcgi/package.nix
index 5451c5186a4e..49d23ddd9a72 100644
--- a/pkgs/development/libraries/tcl-fcgi/default.nix
+++ b/pkgs/development/tcl-modules/by-name/tc/tcl-fcgi/package.nix
@@ -1,6 +1,6 @@
-{ lib, fetchFromGitHub, tcl, tclx }:
+{ lib, fetchFromGitHub, mkTclDerivation, tclx }:
-tcl.mkTclDerivation rec {
+mkTclDerivation rec {
pname = "tcl-fcgi";
version = "0.5.0";
diff --git a/pkgs/by-name/tc/tclcurl/package.nix b/pkgs/development/tcl-modules/by-name/tc/tclcurl/package.nix
similarity index 94%
rename from pkgs/by-name/tc/tclcurl/package.nix
rename to pkgs/development/tcl-modules/by-name/tc/tclcurl/package.nix
index 2bcfef25a3bd..9e967de825bc 100644
--- a/pkgs/by-name/tc/tclcurl/package.nix
+++ b/pkgs/development/tcl-modules/by-name/tc/tclcurl/package.nix
@@ -1,11 +1,11 @@
{
lib,
- tcl,
+ mkTclDerivation,
fetchFromGitHub,
curl,
}:
-tcl.mkTclDerivation rec {
+mkTclDerivation rec {
pname = "tclcurl";
version = "7.22.1";
diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/tcl-modules/by-name/tc/tcllib/package.nix
similarity index 93%
rename from pkgs/development/libraries/tcllib/default.nix
rename to pkgs/development/tcl-modules/by-name/tc/tcllib/package.nix
index a5bfba8b0559..8ec83df8b6ed 100644
--- a/pkgs/development/libraries/tcllib/default.nix
+++ b/pkgs/development/tcl-modules/by-name/tc/tcllib/package.nix
@@ -1,11 +1,11 @@
{ lib
, fetchzip
-, tcl
+, mkTclDerivation
, critcl
, withCritcl ? true
}:
-tcl.mkTclDerivation rec {
+mkTclDerivation rec {
pname = "tcllib";
version = "1.21";
diff --git a/pkgs/by-name/tc/tclmagick/package.nix b/pkgs/development/tcl-modules/by-name/tc/tclmagick/package.nix
similarity index 94%
rename from pkgs/by-name/tc/tclmagick/package.nix
rename to pkgs/development/tcl-modules/by-name/tc/tclmagick/package.nix
index f5d0bc4b152f..ad688ec56de4 100644
--- a/pkgs/by-name/tc/tclmagick/package.nix
+++ b/pkgs/development/tcl-modules/by-name/tc/tclmagick/package.nix
@@ -1,12 +1,12 @@
{
lib,
- tcl,
+ mkTclDerivation,
fetchzip,
graphicsmagick,
tk,
}:
-tcl.mkTclDerivation rec {
+mkTclDerivation rec {
pname = "tclmagick";
version = "1.3.43";
diff --git a/pkgs/development/interpreters/tclreadline/default.nix b/pkgs/development/tcl-modules/by-name/tc/tclreadline/package.nix
similarity index 97%
rename from pkgs/development/interpreters/tclreadline/default.nix
rename to pkgs/development/tcl-modules/by-name/tc/tclreadline/package.nix
index 57f7f9a7b194..62880ee5323a 100644
--- a/pkgs/development/interpreters/tclreadline/default.nix
+++ b/pkgs/development/tcl-modules/by-name/tc/tclreadline/package.nix
@@ -4,11 +4,11 @@
, autoconf
, libtool
, readline
-, tcl
+, mkTclDerivation
, tk
}:
-tcl.mkTclDerivation rec {
+mkTclDerivation rec {
pname = "tclreadline";
version = "2.4.0";
diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/tcl-modules/by-name/tc/tcltls/package.nix
similarity index 89%
rename from pkgs/development/libraries/tcltls/default.nix
rename to pkgs/development/tcl-modules/by-name/tc/tcltls/package.nix
index dbc095b64e0b..cb32bf4a7ba8 100644
--- a/pkgs/development/libraries/tcltls/default.nix
+++ b/pkgs/development/tcl-modules/by-name/tc/tcltls/package.nix
@@ -1,6 +1,6 @@
-{ lib, fetchurl, tcl, openssl }:
+{ lib, fetchurl, mkTclDerivation, openssl }:
-tcl.mkTclDerivation rec {
+mkTclDerivation rec {
pname = "tcltls";
version = "1.7.22";
diff --git a/pkgs/by-name/tc/tcludp/package.nix b/pkgs/development/tcl-modules/by-name/tc/tcludp/package.nix
similarity index 95%
rename from pkgs/by-name/tc/tcludp/package.nix
rename to pkgs/development/tcl-modules/by-name/tc/tcludp/package.nix
index 890b0d4366fc..073a93432fda 100644
--- a/pkgs/by-name/tc/tcludp/package.nix
+++ b/pkgs/development/tcl-modules/by-name/tc/tcludp/package.nix
@@ -1,10 +1,10 @@
{
lib,
- tcl,
+ mkTclDerivation,
fetchfossil,
}:
-tcl.mkTclDerivation rec {
+mkTclDerivation rec {
pname = "tcludp";
version = "1.0.11";
diff --git a/pkgs/by-name/tc/tclvfs/package.nix b/pkgs/development/tcl-modules/by-name/tc/tclvfs/package.nix
similarity index 95%
rename from pkgs/by-name/tc/tclvfs/package.nix
rename to pkgs/development/tcl-modules/by-name/tc/tclvfs/package.nix
index 9ac69b5bb153..0fde102cc2a7 100644
--- a/pkgs/by-name/tc/tclvfs/package.nix
+++ b/pkgs/development/tcl-modules/by-name/tc/tclvfs/package.nix
@@ -1,10 +1,10 @@
{
lib,
- tcl,
+ mkTclDerivation,
fetchzip,
}:
-tcl.mkTclDerivation {
+mkTclDerivation {
pname = "tclvfs";
version = "1.4-unstable-2023-11-23";
diff --git a/pkgs/development/libraries/tclx/default.nix b/pkgs/development/tcl-modules/by-name/tc/tclx/package.nix
similarity index 94%
rename from pkgs/development/libraries/tclx/default.nix
rename to pkgs/development/tcl-modules/by-name/tc/tclx/package.nix
index 5e3a73febe9b..8ed3bb6f5931 100644
--- a/pkgs/development/libraries/tclx/default.nix
+++ b/pkgs/development/tcl-modules/by-name/tc/tclx/package.nix
@@ -1,9 +1,9 @@
{ lib
, fetchFromGitHub
-, tcl
+, mkTclDerivation
}:
-tcl.mkTclDerivation rec {
+mkTclDerivation rec {
pname = "tclx";
version = "8.6.3";
diff --git a/pkgs/by-name/td/tdom/package.nix b/pkgs/development/tcl-modules/by-name/td/tdom/package.nix
similarity index 94%
rename from pkgs/by-name/td/tdom/package.nix
rename to pkgs/development/tcl-modules/by-name/td/tdom/package.nix
index a9b96c8d940a..38ac7acfbcf0 100644
--- a/pkgs/by-name/td/tdom/package.nix
+++ b/pkgs/development/tcl-modules/by-name/td/tdom/package.nix
@@ -1,13 +1,13 @@
{
lib,
- tcl,
+ mkTclDerivation,
fetchzip,
expat,
gumbo,
pkg-config,
}:
-tcl.mkTclDerivation rec {
+mkTclDerivation rec {
pname = "tdom";
version = "0.9.5";
diff --git a/pkgs/development/libraries/tix/duplicated-xlowerwindow.patch b/pkgs/development/tcl-modules/by-name/ti/tix/duplicated-xlowerwindow.patch
similarity index 100%
rename from pkgs/development/libraries/tix/duplicated-xlowerwindow.patch
rename to pkgs/development/tcl-modules/by-name/ti/tix/duplicated-xlowerwindow.patch
diff --git a/pkgs/development/libraries/tix/fix-clang16.patch b/pkgs/development/tcl-modules/by-name/ti/tix/fix-clang16.patch
similarity index 100%
rename from pkgs/development/libraries/tix/fix-clang16.patch
rename to pkgs/development/tcl-modules/by-name/ti/tix/fix-clang16.patch
diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/tcl-modules/by-name/ti/tix/package.nix
similarity index 100%
rename from pkgs/development/libraries/tix/default.nix
rename to pkgs/development/tcl-modules/by-name/ti/tix/package.nix
diff --git a/pkgs/development/libraries/tkimg/default.nix b/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix
similarity index 100%
rename from pkgs/development/libraries/tkimg/default.nix
rename to pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix
diff --git a/pkgs/development/libraries/wapp/default.nix b/pkgs/development/tcl-modules/by-name/wa/wapp/package.nix
similarity index 93%
rename from pkgs/development/libraries/wapp/default.nix
rename to pkgs/development/tcl-modules/by-name/wa/wapp/package.nix
index 9543b49af3b9..fc7e14205f9f 100644
--- a/pkgs/development/libraries/wapp/default.nix
+++ b/pkgs/development/tcl-modules/by-name/wa/wapp/package.nix
@@ -1,6 +1,6 @@
-{ lib, fetchurl, tcl }:
+{ lib, fetchurl, mkTclDerivation }:
-tcl.mkTclDerivation {
+mkTclDerivation {
pname = "wapp";
version = "0-unstable-2024-05-23";
diff --git a/pkgs/development/compilers/critcl/default.nix b/pkgs/development/tcl-modules/critcl/default.nix
similarity index 95%
rename from pkgs/development/compilers/critcl/default.nix
rename to pkgs/development/tcl-modules/critcl/default.nix
index 5caf63d9dba6..4dda4292eb64 100644
--- a/pkgs/development/compilers/critcl/default.nix
+++ b/pkgs/development/tcl-modules/critcl/default.nix
@@ -1,10 +1,11 @@
{ lib
, fetchFromGitHub
+, mkTclDerivation
, tcl
, tcllib
}:
-tcl.mkTclDerivation rec {
+mkTclDerivation rec {
pname = "critcl";
version = "3.2";
diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index af7420b7f4f5..88d62e6a1be2 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
- version = "3.2.269";
+ version = "3.2.271";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
rev = "refs/tags/${version}";
- hash = "sha256-bpXKSyuPhKby8pCQUrH6H9H5za5R8FsKnoqsm8P4zek=";
+ hash = "sha256-d0WUn/wrwDY+w2mTUBslwwzjwZ5wFhNtRubtN7DikEI=";
};
patches = [ ./flake8-compat-5.x.patch ];
diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/development/tools/apko/default.nix
index 6248c08360df..cb8d4f2eafac 100644
--- a/pkgs/development/tools/apko/default.nix
+++ b/pkgs/development/tools/apko/default.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "apko";
- version = "0.19.1";
+ version = "0.19.6";
src = fetchFromGitHub {
owner = "chainguard-dev";
repo = pname;
rev = "v${version}";
- hash = "sha256-uUsNYQPW2MtXxohdenXbNWfikp8TW0chJ5SDYU8ayV4=";
+ hash = "sha256-zcAV+6GdytdUsVxJCNIhfeVGjWFZ2/mgmwpIXTFLEhk=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -24,7 +24,7 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
- vendorHash = "sha256-2Tuhya70R++Nv5KEd+4vjxiTTansraSXQtGm/FqRktk=";
+ vendorHash = "sha256-vQjsKQ49ksea5GZXEd7XjGkN0IoW2HQekyQL5fmwCTc=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/tools/bazel-gazelle/default.nix b/pkgs/development/tools/bazel-gazelle/default.nix
index 496dcbb5dfb8..487e71225679 100644
--- a/pkgs/development/tools/bazel-gazelle/default.nix
+++ b/pkgs/development/tools/bazel-gazelle/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "bazel-gazelle";
- version = "0.39.0";
+ version = "0.39.1";
src = fetchFromGitHub {
owner = "bazelbuild";
repo = pname;
rev = "v${version}";
- hash = "sha256-T1Kd6C0eDvogFjeDuCMp/EjetblQ1Hjww+C4dUGNq3E=";
+ hash = "sha256-Y+k8ObfMwN6fLR2+Lwn64xHljDf3kxw2xp0YpJKbrDM=";
};
vendorHash = null;
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 61510384e31e..a2a1c1115a53 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -23,7 +23,11 @@ rec {
"x86_64-darwin"
"x86_64-linux"
"x86_64-windows"
- ]
+ ],
+
+ # Extra attributes to be merged into the resulting derivation's
+ # meta attribute.
+ meta ? {}
}:
{ lib
@@ -172,7 +176,7 @@ rec {
license = licenses.asl20;
maintainers = with maintainers; [ lorenzleutgeb liff ];
mainProgram = "gradle";
- };
+ } // meta;
});
# NOTE: Default JDKs that are hardcoded below must be LTS versions
@@ -180,8 +184,8 @@ rec {
# https://docs.gradle.org/current/userguide/compatibility.html
gradle_8 = gen {
- version = "8.10";
- hash = "sha256-W5xes/n8LJSrrqV9kL14dHyhF927+WyFnTdBGBoSvyo=";
+ version = "8.10.2";
+ hash = "sha256-McVXE+QCM6gwOCfOtCykikcmegrUurkXcSMSHnFSTCY=";
defaultJava = jdk21;
};
@@ -191,16 +195,11 @@ rec {
defaultJava = jdk17;
};
- gradle_6 = gen {
- version = "6.9.4";
- hash = "sha256-PiQCKFON6fGHcqV06ZoLqVnoPW7zUQFDgazZYxeBOJo=";
- defaultJava = jdk11;
- };
-
wrapGradle = {
- lib, callPackage, mitm-cache, substituteAll, symlinkJoin, concatTextFile, makeSetupHook
+ lib, callPackage, mitm-cache, substituteAll, symlinkJoin, concatTextFile, makeSetupHook, nix-update-script
}:
gradle-unwrapped:
+ updateAttrPath:
lib.makeOverridable (args:
let
gradle = gradle-unwrapped.override args;
@@ -226,8 +225,13 @@ rec {
passthru = {
fetchDeps = callPackage ./fetch-deps.nix { inherit mitm-cache; };
- inherit (gradle) jdk;
+ inherit (gradle) jdk tests;
unwrapped = gradle;
+ } // lib.optionalAttrs (updateAttrPath != null) {
+ updateScript = nix-update-script {
+ attrPath = updateAttrPath;
+ extraArgs = [ "--url=https://github.com/gradle/gradle" ];
+ };
};
meta = gradle.meta // {
diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix
index 3576b67208c3..b500d7d9cc40 100644
--- a/pkgs/development/tools/build-managers/gup/default.nix
+++ b/pkgs/development/tools/build-managers/gup/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, nix-update-source, lib, python3
, which, runtimeShell, pylint }:
stdenv.mkDerivation rec {
- version = "0.9.1";
+ version = "0.9.2";
src = fetchFromGitHub {
+ hash = "sha256-bV5HauM0xmRI/9Pxp1cYLPLA8PbFvPER2y4mAMmgchs=";
owner = "timbertson";
repo = "gup";
rev = "version-${version}";
- sha256 = "1wfw46b647rkalwds6547ylzy353b3xlklhcl2xjgj2gihvi30mx";
};
pname = "gup";
nativeBuildInputs = [ python3 which pylint ];
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
--set repo gup \
--set type fetchFromGitHub \
--set rev 'version-{version}' \
+ --nix-literal rev 'version-''${version}'\
--modify-nix default.nix
''
];
diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix
index 4ca4dcd04fa3..c7b602ccdab6 100644
--- a/pkgs/development/tools/build-managers/mill/default.nix
+++ b/pkgs/development/tools/build-managers/mill/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mill";
- version = "0.11.12";
+ version = "0.12.0";
src = fetchurl {
url = "https://github.com/com-lihaoyi/mill/releases/download/${finalAttrs.version}/${finalAttrs.version}-assembly";
- hash = "sha256-k4/oMHvtq5YXY8hRlX4gWN16ClfjXEAn6mRIoEBHNJo=";
+ hash = "sha256-y4KtBZ1P6TmKaIL2K+MVvn5zX8nOxLjaJkeXCb4SjM8=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix
index 98051df100a7..2fc0e95d75ee 100644
--- a/pkgs/development/tools/conftest/default.nix
+++ b/pkgs/development/tools/conftest/default.nix
@@ -6,15 +6,15 @@
buildGoModule rec {
pname = "conftest";
- version = "0.55.0";
+ version = "0.56.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "conftest";
rev = "refs/tags/v${version}";
- hash = "sha256-cJY3NmZa+IBmadTAusvzHKXeGsnsKpRqvJwYPVnU68A=";
+ hash = "sha256-7R6qMjwPtlpnsm6xej7jQntv9709//q4VVbatuzLuwk=";
};
- vendorHash = "sha256-iPTyDqaodTFhnGRLEbEFpQjfz9r4DsFdue7fQNwq/pU=";
+ vendorHash = "sha256-QPFLHP4nyJqB7tVVk00J+V+1YXGSsRvCZ1aLEMg0kfc=";
ldflags = [
"-s"
diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix
index 42aa1e5ab71d..792e71dd7fb8 100644
--- a/pkgs/development/tools/continuous-integration/fly/default.nix
+++ b/pkgs/development/tools/continuous-integration/fly/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fly";
- version = "7.11.2";
+ version = "7.12.0";
src = fetchFromGitHub {
owner = "concourse";
repo = "concourse";
rev = "v${version}";
- hash = "sha256-GopZTVdjnPQZ354UC6USHYew+bzuy2AxagsHeH7wseQ=";
+ hash = "sha256-lAx9TZVRkPMa5swB74zI0xJ7pbRDApZoens747XcuJk=";
};
- vendorHash = "sha256-Tzp4pPaIJ08NkkBBKR4xkMEhQR7K+Egx8aHYeRog0Gk=";
+ vendorHash = "sha256-dXjee2rZn1lVEmL8Cy8rrdpSX1OpS9GHKZo53ur3kew=";
subPackages = [ "fly" ];
diff --git a/pkgs/development/tools/crd2pulumi/default.nix b/pkgs/development/tools/crd2pulumi/default.nix
index 66ab82d17594..0dca4f13889c 100644
--- a/pkgs/development/tools/crd2pulumi/default.nix
+++ b/pkgs/development/tools/crd2pulumi/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "crd2pulumi";
- version = "1.5.2";
+ version = "1.5.3";
src = fetchFromGitHub {
owner = "pulumi";
repo = "crd2pulumi";
rev = "v${version}";
- sha256 = "sha256-wIg14U3CNuO7PbhOkaZMfzXhjnMWiddQKiDzgD493iY=";
+ sha256 = "sha256-sXZ5iImN+AwAEV6Xur4EbDZhzQEYJFf9AgaBf1wQAIA=";
};
- vendorHash = "sha256-tSQuyGo4YaqKp5C9V/tEobc/4+x5ExPbV3Y4nd8D8jE=";
+ vendorHash = "sha256-4L1KfpZ+KICPko74x3STRQFtkcNVU/5KFGhKEJ64+Jk=";
ldflags = [ "-s" "-w" "-X github.com/pulumi/crd2pulumi/gen.Version=${src.rev}" ];
diff --git a/pkgs/development/tools/database/sqlc/default.nix b/pkgs/development/tools/database/sqlc/default.nix
deleted file mode 100644
index 4ec22b7dfc84..000000000000
--- a/pkgs/development/tools/database/sqlc/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, buildGoModule, fetchFromGitHub }:
-
-let
- version = "1.27.0";
-in
-buildGoModule {
- pname = "sqlc";
- inherit version;
-
- src = fetchFromGitHub {
- owner = "sqlc-dev";
- repo = "sqlc";
- rev = "v${version}";
- hash = "sha256-wxQ+YPsDX0Z6B8whlQ/IaT2dRqapPL8kOuFEc6As1rU=";
- };
-
- proxyVendor = true;
- vendorHash = "sha256-ndOw3uShF5TngpxYNumoK3H3R9v4crfi5V3ZCoSqW90=";
-
- subPackages = [ "cmd/sqlc" ];
-
- meta = {
- description = "Generate type-safe code from SQL";
- mainProgram = "sqlc";
- homepage = "https://sqlc.dev/";
- license = lib.licenses.mit;
- maintainers = [ ];
- };
-}
diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix
index c68e1e00fc6f..23208b141408 100644
--- a/pkgs/development/tools/database/sqlfluff/default.nix
+++ b/pkgs/development/tools/database/sqlfluff/default.nix
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "sqlfluff";
- version = "3.2.4";
+ version = "3.2.5";
pyproject = true;
src = fetchFromGitHub {
owner = "sqlfluff";
repo = "sqlfluff";
rev = "refs/tags/${version}";
- hash = "sha256-7EP2XIbvdB3oCFTY6IS9r00/QEB/eHJth05hVBzZCUI=";
+ hash = "sha256-jYAzFqHuTpcgmnodt7vuNWTHRP3rd0B/3tp2Q04/N9o=";
};
build-system = with python3.pkgs; [ setuptools ];
diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix
index 39f1d1011b33..585b5d947263 100644
--- a/pkgs/development/tools/electron/binary/generic.nix
+++ b/pkgs/development/tools/electron/binary/generic.nix
@@ -43,7 +43,7 @@ let
++ optionals (versionOlder version "19.0.0") [ "i686-linux" ];
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
# https://www.electronjs.org/docs/latest/tutorial/electron-timelines
- knownVulnerabilities = optional (versionOlder version "30.0.0") "Electron version ${version} is EOL";
+ knownVulnerabilities = optional (versionOlder version "31.0.0") "Electron version ${version} is EOL";
};
fetcher = vers: tag: hash: fetchurl {
diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 2ed339ff7943..e6f6c9f38f11 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -56,35 +56,35 @@
},
"31": {
"hashes": {
- "aarch64-darwin": "dec23ecc15f4d0503163c5f65f59114127ce6d2518af8e6547ea787372575fcb",
- "aarch64-linux": "1911b1cef253d68fead45432e93740223c686ebc11c931bdd08439ec88030cfd",
- "armv7l-linux": "957d888d016270b658fb558f6e2061ffaa7f71c9d2b1c73c4f122342519ba741",
- "headers": "1vm3r688cjl5014x4lmmwh9927wbx26nd38lijmim434n32aby88",
- "x86_64-darwin": "4d5d21963bf833ccc25edbc2e8e884f408e24c2a39b53f1d0c30f4017ac2ba8a",
- "x86_64-linux": "86b3794aba055e84f23cba5d8319ca9f23a05385d2c06fe7d78d24d2bb356b67"
+ "aarch64-darwin": "d275eebc7cdaa1374e18ca97fe864767642203d89a0c66a49ed2e37acd11ff1c",
+ "aarch64-linux": "b67eb45065b3045041ccca358a9b608ff2fce9eb08ab45085b43c69790476e21",
+ "armv7l-linux": "58a257d20535933982ed27b5b58a79222e7b95b8fd24e057c06140755a03be10",
+ "headers": "1kqw3z7nwqrldbhc6ai8x903hwrl2grpq5ald0j0lgg8j1b0kjbj",
+ "x86_64-darwin": "1d64ae2924c92ee56bbd195076e125c80cc9cb47ebd88700600a504f212c3057",
+ "x86_64-linux": "bab1b66aa54d3d32e98c1b298a8c5ef38a2adb6205b697e34ea5fa1aec7727aa"
},
- "version": "31.6.0"
+ "version": "31.7.2"
},
"32": {
"hashes": {
- "aarch64-darwin": "906fbf9e7a5ee6d49ea107fdfd0e98bc80884fbf1f6ff38d824453f58c6ec259",
- "aarch64-linux": "6500fdbff988e0cda909643ba8439660a207c9a2d393fa63f680a0337e530342",
- "armv7l-linux": "7ffcce19ebdb30a9db78671c7f222edde66181a37c895834682d224e459200fc",
- "headers": "1z2khnsi8ngg762zfbdvy8g6vn87nj211xvv808isfca0lsd1fxm",
- "x86_64-darwin": "56e2e4252b4d4e92075345f0b9dbefc8db49bdc6a4c45a87000f3cc705057907",
- "x86_64-linux": "4fc58e6e79e5b5793ec9b5d35c8926fcad5352b6a1b21b3edf42343487c90185"
+ "aarch64-darwin": "c3fd68b5bdf0346c99b7c6bf41804dcaa74701847f5bbc58d25c261d33056967",
+ "aarch64-linux": "5587eeed9c507fc0f62006cb5206b37cd335d34ad0ae692d1c44b8009e2c0ab7",
+ "armv7l-linux": "cd44653e3602136a9dabef1db9305df8b1a24e77ace24f0cccbeed1fc041ce2c",
+ "headers": "1gh4cgpfxi9mv0l17wki21hd0rhrrvk68a7f2wksmhmsnj4yqyxi",
+ "x86_64-darwin": "4ee209cdf27df4af79fad026a24b3df120ff9c89c2bdbc68ab5478fa7f32f5d7",
+ "x86_64-linux": "0b515f5ba76e919540af17251a4ce4bc355fdb497fcd7bd47d689872a1aae82c"
},
- "version": "32.2.1"
+ "version": "32.2.2"
},
"33": {
"hashes": {
- "aarch64-darwin": "75f3267e5517bb35cbfc11f2d5673947cfa8a510dc3a78c46356a948650027f2",
- "aarch64-linux": "6c321b5f8f8fc694c09f6c904ad0a40a0eff1b84b2b771f6eae292e197e3a8c1",
- "armv7l-linux": "d54e4820ab965acaa21940e15b79278fdbff4df083f162cd2a192541cf5a7063",
- "headers": "0hzlsjay23hl6sn2gk87cqx8mra13y1ldjq6lgxy041xwfingv7f",
- "x86_64-darwin": "945a07cec9eb2bdfa6a7ae6971f1df564447a5eeea3d533abae3ef5eac1966a1",
- "x86_64-linux": "497ff71b2cacfc0a001fcfd3d852fd758e20604622ddfa2932dc32074c48af66"
+ "aarch64-darwin": "2d31f140b1a6cfa6efb509e644dee5830601e4d73d47539a8af20d57e8ae7b12",
+ "aarch64-linux": "43157d520ff6094ef7c390e49d1eec1ba58a488e150114c08e7157fb321fca7b",
+ "armv7l-linux": "1cb4a8422addfbb109a26f3cb4f406d793e5f04617bdc34b825dd17d84045906",
+ "headers": "1fiwmpfvjlyiixngb4rl6yrbm0sf0xrj13mprfg78a5kan9mwi7c",
+ "x86_64-darwin": "4bf99f30f124b447ef3b178e5ba0cdfe1faefa6a725bcde76a35eb26a50d4333",
+ "x86_64-linux": "933dc1eae3f2db67912b3ab056fd15a7ca3e1328fe8dd6a1f5266c5a063b1121"
},
- "version": "33.0.0"
+ "version": "33.0.2"
}
}
diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index 55e31c5b1641..2ff177f3567a 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -23,35 +23,35 @@
},
"31": {
"hashes": {
- "aarch64-darwin": "904d665b4df7377ccdae58c35328456bf2a05a8d3e878954e48175ee60103b3f",
- "aarch64-linux": "d66e80621dc8c667ca634c30c4be8486b56ebce17ba6debab5eb70dd40ed9ab9",
- "armv7l-linux": "ae76cf56a793f7c98411f997db610d4729b6992e7ccbb7651a960947e87c5bb2",
- "headers": "1vm3r688cjl5014x4lmmwh9927wbx26nd38lijmim434n32aby88",
- "x86_64-darwin": "3ee05c812e0ce5cb0ee7a36fb1c3a52447d8bfef80a57ca82667b501a354778a",
- "x86_64-linux": "65b04f0d8980c17d205644903718a4b41ba6c1fab9d25a58dadf00b6db24a402"
+ "aarch64-darwin": "e49778b48b971b06e965aa2a3cd07194a4c4c1f66e3a3565e97f21a94865fea8",
+ "aarch64-linux": "9a28b5402e88b74657e2e89eeafbeedc9fed3ec1f36f408ddeef12871042278d",
+ "armv7l-linux": "465f71ab1385c3538f10d1d463fc482be04ab3e53b0a31291e124f1b88d175ca",
+ "headers": "1kqw3z7nwqrldbhc6ai8x903hwrl2grpq5ald0j0lgg8j1b0kjbj",
+ "x86_64-darwin": "8ede4560f070f8d7e08e1c71f4135c10b164a077befe255110b957d32b865db5",
+ "x86_64-linux": "b3d19e86d5fc4d49c7e340282e421590ee1a81d6a75fdf4aea85b36e2c39d8a9"
},
- "version": "31.6.0"
+ "version": "31.7.2"
},
"32": {
"hashes": {
- "aarch64-darwin": "29acb63bb116a08e97797042505d48eecfa396f5d84a12114573aa70acaa48ec",
- "aarch64-linux": "6b311318f5a537e21d2d832609ce8306b4806e4c62aaa132ee87e063d45f5b00",
- "armv7l-linux": "ac1529a8f6e4c77fdae3bc92bc5bfcb40c3b19def0772de9d1874da7223517b7",
- "headers": "1z2khnsi8ngg762zfbdvy8g6vn87nj211xvv808isfca0lsd1fxm",
- "x86_64-darwin": "a1fd00f8634c6b4d9e28ce8ac69684ea24f5274c9f17c0e39bd149b34568b84b",
- "x86_64-linux": "2329d1307729c714bef71d9f8250ed510b5a1ae07beefddee2371af70f712297"
+ "aarch64-darwin": "0ed199847a33fafa4482e1a49e5e8394f09a433eb5f2e638e25faac80ce2d435",
+ "aarch64-linux": "fb6f143eaff79c7096a8c2164d8b30dcd564056e1b9ec7e30b1290d8c5ec2b10",
+ "armv7l-linux": "15350e535ed59660f3d2082d13231a56f847f3e3deaeb05c3fd714629322492c",
+ "headers": "1gh4cgpfxi9mv0l17wki21hd0rhrrvk68a7f2wksmhmsnj4yqyxi",
+ "x86_64-darwin": "af52397c32446f114619d5cd2ec6d83748095a0cd6a5c0c95479397e4ed30be5",
+ "x86_64-linux": "05a35b7b2d77012bef8c9920cec87f4356aff191aa7009ffaa2e8e3cfac888e4"
},
- "version": "32.2.1"
+ "version": "32.2.2"
},
"33": {
"hashes": {
- "aarch64-darwin": "c0717f7dc5a2e3f99688389e643e9dc2e513a948df537abadc24230e1c93a1a3",
- "aarch64-linux": "32887c18a8acb0d36eba6e3d9d9f763dda9155f98a948958b446681b9da63ed3",
- "armv7l-linux": "c52961bcc5d2764d8a144a4fc2b9c25e904c8345deec9253dcaca7d560508a56",
- "headers": "0hzlsjay23hl6sn2gk87cqx8mra13y1ldjq6lgxy041xwfingv7f",
- "x86_64-darwin": "13086ff2417512f9c87982857e67f25ee05f55e3bb18b5d373264c153a50e166",
- "x86_64-linux": "b07f166b53bdf64282e8ba73bf6a6bc86844dd38c183ee7ecbad5d281ee380ea"
+ "aarch64-darwin": "31b21d4f0798b0a91e7b41fd354c8d6b64345668db2948a8b0ebe9dc33992102",
+ "aarch64-linux": "d79008c5024612d94bb03c20c753fc93e66cbc49fa4d56438e249b1e3bfb4d68",
+ "armv7l-linux": "b2afa0b00e88dd5bb5bffafa8ffbb0501fbcc0bb7d67eacda46026bf92d92590",
+ "headers": "1fiwmpfvjlyiixngb4rl6yrbm0sf0xrj13mprfg78a5kan9mwi7c",
+ "x86_64-darwin": "aeeca15c1925c57fa91f71b56781270549eb4cd7a82ed423335cb5a2e92fa0b0",
+ "x86_64-linux": "ace2073bfe2e9c340255b6a33ad2df61070e002bea645ce522b63a466428bd5e"
},
- "version": "33.0.0"
+ "version": "33.0.2"
}
}
diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix
index 15675c7d87da..bed48f725649 100644
--- a/pkgs/development/tools/electron/common.nix
+++ b/pkgs/development/tools/electron/common.nix
@@ -49,14 +49,7 @@ in ((chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
src = null;
- patches = base.patches ++ lib.optional (lib.versionOlder info.version "30")
- (substituteAll {
- # disable a component that requires CIPD blobs
- name = "disable-screen-ai.patch";
- src = ./disable-screen-ai.patch;
- inherit (info) version;
- })
- ;
+ patches = base.patches;
unpackPhase = ''
runHook preUnpack
@@ -174,9 +167,6 @@ in ((chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
dawn_use_built_dxc = false;
v8_enable_private_mapping_fork_optimization = true;
v8_expose_public_symbols = true;
- } // lib.optionalAttrs (lib.versionOlder info.version "31") {
- use_perfetto_client_library = false;
- } // lib.optionalAttrs (lib.versionAtLeast info.version "31") {
enable_dangling_raw_ptr_feature_flag = false;
clang_unsafe_buffers_paths = "";
enterprise_cloud_content_analysis = false;
diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 046de00cf35e..e08754d49d4f 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1,921 +1,4 @@
{
- "30": {
- "chrome": "124.0.6367.243",
- "chromium": {
- "deps": {
- "gn": {
- "hash": "sha256-aEL1kIhgPAFqdb174dG093HoLhCJ07O1Kpqfu7r14wQ=",
- "rev": "22581fb46c0c0c9530caa67149ee4dd8811063cf",
- "url": "https://gn.googlesource.com/gn",
- "version": "2024-03-14"
- }
- },
- "version": "124.0.6367.243"
- },
- "chromium_npm_hash": "sha256-oILlQlzTcc0YqAvK5htRvG/YXWJTDtJ60Z1EcBEj9dw=",
- "deps": {
- "src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-YrAJnuNig6v87+eNnZ2W+PCzxjGe5CuymF6ul/v9SCk=",
- "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
- "rev": "124.0.6367.243",
- "url": "https://chromium.googlesource.com/chromium/src.git"
- },
- "src/chrome/test/data/perf/canvas_bench": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=",
- "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732",
- "url": "https://chromium.googlesource.com/chromium/canvas_bench.git"
- },
- "src/chrome/test/data/perf/frame_rate/content": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=",
- "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9",
- "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git"
- },
- "src/chrome/test/data/xr/webvr_info": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=",
- "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248",
- "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git"
- },
- "src/docs/website": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-2WyiSqza9Mp2G8KHUnrzfikC7hGcUTLu4/W9AD6Zdi4=",
- "rev": "02057aa20e0dd4598967e3daf2f25c815962ef1c",
- "url": "https://chromium.googlesource.com/website.git"
- },
- "src/electron": {
- "fetcher": "fetchFromGitHub",
- "hash": "sha256-LkDhMO6FOS/8WgAQBs3HZ8ujkS4yBtVJR7ARxEiJIME=",
- "owner": "electron",
- "repo": "electron",
- "rev": "v30.5.1"
- },
- "src/media/cdm/api": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=",
- "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28",
- "url": "https://chromium.googlesource.com/chromium/cdm.git"
- },
- "src/net/third_party/quiche/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-BJ3CCKFHOcIgIqnYxfjfOqbRhnt9ycrZfAFRZOLPYZQ=",
- "rev": "9f8738892edd83219d2f83fdd73c7c14d5dbb80d",
- "url": "https://quiche.googlesource.com/quiche.git"
- },
- "src/third_party/accessibility_test_framework/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ=",
- "rev": "4a764c690353ea136c82f1a696a70bf38d1ef5fe",
- "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git"
- },
- "src/third_party/angle": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-MFXZ7gEO8vHFHtjzzLSgGlB9AKx+hndPfmwsE5XHGXo=",
- "rev": "bda89e1f7c7195a9d03d037039c2dd5057563a59",
- "url": "https://chromium.googlesource.com/angle/angle.git"
- },
- "src/third_party/angle/third_party/VK-GL-CTS/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-eQvZmm6aAsI+z++SMM9i/SsREjikIjMLpedzw57eKyA=",
- "rev": "ec9827528085fcffca353c8d941ec20e3de7aaea",
- "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS"
- },
- "src/third_party/angle/third_party/glmark2/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=",
- "rev": "ca8de51fedb70bace5351c6b002eb952c747e889",
- "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2"
- },
- "src/third_party/angle/third_party/rapidjson/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=",
- "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f",
- "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson"
- },
- "src/third_party/anonymous_tokens/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-ZKvfil6V4PexxVl/UCW/mUINlCHBTrZnhTB0UhTW0PQ=",
- "rev": "321a40ba18a083feccb8ae2f99a8676bb1702676",
- "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git"
- },
- "src/third_party/beto-core/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-7GkqH4hgTVmISjUy/Km/X28tBSsiMs3JRnDmol1zaag=",
- "rev": "8bd72cfb219344308ee857bcbe65a27fe91acfe8",
- "url": "https://beto-core.googlesource.com/beto-core.git"
- },
- "src/third_party/boringssl/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-RiDdH26xzoAD2NdTNKDraco9p2jKHXJxbRWI3pUhI78=",
- "rev": "4fa4804c8ab4521079af62dba5260a99c34b8a29",
- "url": "https://boringssl.googlesource.com/boringssl.git"
- },
- "src/third_party/breakpad/breakpad": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-qAIXZ1jZous0Un0jVkOQ66nA2525NziV3Lbso2/+Z1Y=",
- "rev": "76788faa4ef163081f82273bfca7fae8a734b971",
- "url": "https://chromium.googlesource.com/breakpad/breakpad.git"
- },
- "src/third_party/cast_core/public/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=",
- "rev": "71f51fd6fa45fac73848f65421081edd723297cd",
- "url": "https://chromium.googlesource.com/cast_core/public"
- },
- "src/third_party/catapult": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-HhpP5OeGF9in2XEoZMfMCIAFHAqlDvJpfSWa8JfGWzM=",
- "rev": "9128ec6d34905512199f953bc60ff75ca29d0cf2",
- "url": "https://chromium.googlesource.com/catapult.git"
- },
- "src/third_party/ced/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=",
- "rev": "ba412eaaacd3186085babcd901679a48863c7dd5",
- "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git"
- },
- "src/third_party/chromium-variations": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-YwnqJynhunMvIduUcJ1/nBLabe/WS4RDox+XLMYMA2c=",
- "rev": "e78e275e34f94fdf333245137878f0f6482db67d",
- "url": "https://chromium.googlesource.com/chromium-variations.git"
- },
- "src/third_party/clang-format/script": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-7VvofDDQe+SoMRBfVk26q+C+OPyOE7QH35wVWkfDKxs=",
- "rev": "e5337933f2951cacd3aeacd238ce4578163ca0b9",
- "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git"
- },
- "src/third_party/cld_3/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=",
- "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661",
- "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git"
- },
- "src/third_party/colorama/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=",
- "rev": "3de9f013df4b470069d03d250224062e8cf15c49",
- "url": "https://chromium.googlesource.com/external/colorama.git"
- },
- "src/third_party/content_analysis_sdk/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=",
- "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc",
- "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git"
- },
- "src/third_party/cpu_features/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=",
- "rev": "936b9ab5515dead115606559502e3864958f7f6e",
- "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git"
- },
- "src/third_party/cpuinfo/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-9QRj4OA1qWlZujVJ6Z9x3190taVjTCZocM/272eepIs=",
- "rev": "aa4b2163b99ac9534194520f70b93eeefb0b3b4e",
- "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git"
- },
- "src/third_party/crc32c/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=",
- "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6",
- "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git"
- },
- "src/third_party/cros-components/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-w2VosAdg+GtalFaGxDB8FB2w7498PMudsXxX4SpJqYE=",
- "rev": "a254b37189cf97cfc76634644e58be511aefb69a",
- "url": "https://chromium.googlesource.com/external/google3/cros_components.git"
- },
- "src/third_party/cros_system_api": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-dFp4Hy7fldUjXxUTtcyRXdt7zpIP2lchzDKkk0b+iko=",
- "rev": "9a51dc89c4f21362e858b20a6a7cc8adfd7c7238",
- "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git"
- },
- "src/third_party/crossbench": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-4gQn5y/Z6ccYA/0VjIQfMpFMkEuPA78jyCgZ+FpmsFs=",
- "rev": "acbea986f40578f43c88239c78c797f61842e642",
- "url": "https://chromium.googlesource.com/crossbench.git"
- },
- "src/third_party/dav1d/libdav1d": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-AA2bcrsW1xFspyl5TqYUJeAwKM06rWTNtXr/uMVIJmw=",
- "rev": "006ca01d387ac6652825d6cce1a57b2de67dbf8d",
- "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
- },
- "src/third_party/dawn": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-W0E0fhjAc5gdTgIsy+iOAFA7GPEFeMPPJEU5nnRUtbM=",
- "rev": "e04b03f714994b7a747b5472da4ffae9e6e38938",
- "url": "https://dawn.googlesource.com/dawn.git"
- },
- "src/third_party/dawn/third_party/dxc": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-bqzkbBbf1btIz84odYfC3c69m6kgssHy2+a9aR+EUaQ=",
- "rev": "511cfef8e0509d172fbfa156be8a97ed2b42590b",
- "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler"
- },
- "src/third_party/dawn/third_party/dxheaders": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=",
- "rev": "980971e835876dc0cde415e8f9bc646e64667bf7",
- "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers"
- },
- "src/third_party/dawn/third_party/glfw": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=",
- "rev": "62e175ef9fae75335575964c845a302447c012c7",
- "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw"
- },
- "src/third_party/dawn/third_party/khronos/EGL-Registry": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=",
- "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071",
- "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry"
- },
- "src/third_party/dawn/third_party/khronos/OpenGL-Registry": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=",
- "rev": "5bae8738b23d06968e7c3a41308568120943ae77",
- "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry"
- },
- "src/third_party/dawn/third_party/webgpu-cts": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-VTYTdvBNxqRzYjEx5ml4LnkDEUGpyvssSzDOndHyYgU=",
- "rev": "3e45aee0b16dc724a79a0feb0490e2ddb06c9f0d",
- "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts"
- },
- "src/third_party/depot_tools": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-YmjhwOjqCRxDhC7P+aRoNN+Vokl7hB4s6hDNFS5gLYo=",
- "rev": "9c43bc14f1a7404fd4b6f744050d553acca557bf",
- "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
- },
- "src/third_party/devtools-frontend/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-FVYUoK3KWlIjQTWlNkjmnzJDfpRkEZ9sFWTr4GdOUJw=",
- "rev": "694ad4ed3c55195acd701950d2b2528880e9201e",
- "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
- },
- "src/third_party/dom_distiller_js/dist": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=",
- "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d",
- "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git"
- },
- "src/third_party/eigen3/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-tx/XR7xJ7IMh5RMvL8wRo/g+dfD3xcjZkLPSY4D9HaY=",
- "rev": "2a9055b50ed22101da7d77e999b90ed50956fe0b",
- "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git"
- },
- "src/third_party/electron_node": {
- "fetcher": "fetchFromGitHub",
- "hash": "sha256-3pcWLDR1Y6oJUuwtequ5pK7nGwPeOqzALVNGJYskuc0=",
- "owner": "nodejs",
- "repo": "node",
- "rev": "v20.16.0"
- },
- "src/third_party/emoji-segmenter/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=",
- "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e",
- "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git"
- },
- "src/third_party/engflow-reclient-configs": {
- "fetcher": "fetchFromGitHub",
- "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=",
- "owner": "EngFlow",
- "repo": "reclient-configs",
- "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d"
- },
- "src/third_party/expat/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-FXTDGAK03jc2wvazhRKqtsFRKZUYS/9HLpZNp4JfZJI=",
- "rev": "441f98d02deafd9b090aea568282b28f66a50e36",
- "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git"
- },
- "src/third_party/farmhash/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=",
- "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45",
- "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git"
- },
- "src/third_party/ffmpeg": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-5ynDd2wQ3QtS6SM2X+j3hTKB9aVhGrjoIlGSzy43K8Q=",
- "rev": "52d8ef3799b2f16b66351dd0972bb0bcee1648ac",
- "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
- },
- "src/third_party/flac": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=",
- "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c",
- "url": "https://chromium.googlesource.com/chromium/deps/flac.git"
- },
- "src/third_party/flatbuffers/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-LecJwLDG6szZZ/UOCFD+MDqH3NKawn0sdEwgnMt8wMM=",
- "rev": "bcb9ef187628fe07514e57756d05e6a6296f7dc5",
- "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git"
- },
- "src/third_party/fontconfig/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=",
- "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267",
- "url": "https://chromium.googlesource.com/external/fontconfig.git"
- },
- "src/third_party/fp16/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=",
- "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91",
- "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git"
- },
- "src/third_party/freetype-testing/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=",
- "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f",
- "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git"
- },
- "src/third_party/freetype/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-FtFRJaxyp7vo4EPBiqx05OsKo1UA1g/h+9BjuoijLFA=",
- "rev": "f42ce25563b73fed0123d18a2556b9ba01d2c76b",
- "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
- },
- "src/third_party/fuzztest/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-utl9uwFqMqDW9ll9/3lh3rfjmPHlv5sx/enQuPffQZ8=",
- "rev": "bddcd9f77ba0a81a99ce50bcadf5149efe545df0",
- "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
- },
- "src/third_party/fxdiv/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=",
- "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8",
- "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git"
- },
- "src/third_party/gemmlowp/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=",
- "rev": "13d57703abca3005d97b19df1f2db731607a7dc2",
- "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git"
- },
- "src/third_party/google_benchmark/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME=",
- "rev": "344117638c8ff7e239044fd0fa7085839fc03021",
- "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git"
- },
- "src/third_party/googletest/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-mNYS3k2fAc7Q6GlpnO7pkXSkGHfUH1MXuZXkCmwG4q4=",
- "rev": "c231e6f5b152029dbd5fa4a9e0c04095035aec3f",
- "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git"
- },
- "src/third_party/grpc/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=",
- "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737",
- "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git"
- },
- "src/third_party/harfbuzz-ng/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-VAan6P8PHSq8RsGE4YbI/wCfFAhzl3nJMt0cQBYi5Ls=",
- "rev": "155015f4bec434ecc2f94621665844218f05ce51",
- "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
- },
- "src/third_party/highway/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=",
- "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a",
- "url": "https://chromium.googlesource.com/external/github.com/google/highway.git"
- },
- "src/third_party/hunspell_dictionaries": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=",
- "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e",
- "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git"
- },
- "src/third_party/icu": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-YYoslfgGfmDpSTxtCOmGGfwQg6mVU1IggzAtWRwwcMc=",
- "rev": "bad7ddbf921358177e56fd723c2f59f8041a370f",
- "url": "https://chromium.googlesource.com/chromium/deps/icu.git"
- },
- "src/third_party/jsoncpp/source": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=",
- "rev": "42e892d96e47b1f6e29844cc705e148ec4856448",
- "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git"
- },
- "src/third_party/leveldatabase/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=",
- "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea",
- "url": "https://chromium.googlesource.com/external/leveldb.git"
- },
- "src/third_party/libFuzzer/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-T0dO+1A0r6kLFoleMkY8heu80biPntCpvA6YfqA7b+E=",
- "rev": "758bd21f103a501b362b1ca46fa8fcb692eaa303",
- "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git"
- },
- "src/third_party/libaddressinput/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=",
- "rev": "e8712e415627f22d0b00ebee8db99547077f39bd",
- "url": "https://chromium.googlesource.com/external/libaddressinput.git"
- },
- "src/third_party/libaom/source/libaom": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-zgtNjrQE+fzr8Aye0rAkQR5enzfacCAsRbC3crUrMQ4=",
- "rev": "158761dfb40e77f3a54c3b14a596112837baa24b",
- "url": "https://aomedia.googlesource.com/aom.git"
- },
- "src/third_party/libavif/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-moVf7i0gZ/KW53ACcVIWKWNL0oAimOSU1m5IdQHz6z8=",
- "rev": "43ec9ace31c6ca11efddddb61b94b744450d46e2",
- "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git"
- },
- "src/third_party/libavifinfo/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-UAc4iYWrKWteH98hD3QLkD3JWmV/rsvWhFIVJN7tc+Q=",
- "rev": "b496868f7c3fd17dfeeecc0364fe37e19edd548a",
- "url": "https://aomedia.googlesource.com/libavifinfo.git"
- },
- "src/third_party/libc++/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-k2bSS8OhVyd0/metFpwFvRCWYOaLEU0Md4AW50GpGTM=",
- "rev": "80307e66e74bae927fb8709a549859e777e3bf0b",
- "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git"
- },
- "src/third_party/libc++abi/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-AdyX58sg//O2e76HAcRC5DcuiTsd68QS4mNVkPv0Vck=",
- "rev": "ec88f0ab262c5f2426dbf138b92ee9ae5961e431",
- "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git"
- },
- "src/third_party/libdrm/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=",
- "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1",
- "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git"
- },
- "src/third_party/libgav1/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-tB9Wzjs4Sct7QendDMKkaEE4ddD6ptnNCmj1yYKcQSc=",
- "rev": "f9a93151adf7203c6ab90f3c94bbd5972b7967b8",
- "url": "https://chromium.googlesource.com/codecs/libgav1.git"
- },
- "src/third_party/libipp/libipp": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=",
- "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f",
- "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git"
- },
- "src/third_party/libjpeg_turbo": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-+t75ZAdOXc7Nd1/8zEQLX+enZb8upqIQuR6qzb9z7Cg=",
- "rev": "9b894306ec3b28cea46e84c32b56773a98c483da",
- "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git"
- },
- "src/third_party/liblouis/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=",
- "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376",
- "url": "https://chromium.googlesource.com/external/liblouis-github.git"
- },
- "src/third_party/libphonenumber/dist": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=",
- "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362",
- "url": "https://chromium.googlesource.com/external/libphonenumber.git"
- },
- "src/third_party/libprotobuf-mutator/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=",
- "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf",
- "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git"
- },
- "src/third_party/libsrtp": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-pfLFh2JGk/g0ZZxBKTaYW9/PBpkCm0rtJeyNePUMTTc=",
- "rev": "5b7c744eb8310250ccc534f3f86a2015b3887a0a",
- "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git"
- },
- "src/third_party/libsync/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=",
- "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6",
- "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git"
- },
- "src/third_party/libunwind/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-/4/Trextb4F9UMDVrg4uG9QZl6S0H9FiwnL+2S5+ZpE=",
- "rev": "419b03c0b8f20d6da9ddcb0d661a94a97cdd7dad",
- "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
- },
- "src/third_party/libvpx/source/libvpx": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-5IsUUvhcKKiWJFetS29+S7Wiz5JwqRZGK2t2ehld/M4=",
- "rev": "19832b1702d5b0adf616a0e080abd5207c8445b5",
- "url": "https://chromium.googlesource.com/webm/libvpx.git"
- },
- "src/third_party/libwebm/source": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=",
- "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da",
- "url": "https://chromium.googlesource.com/webm/libwebm.git"
- },
- "src/third_party/libwebp/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-Wa33opOFgcmYtycezDUt2f6PqZBse6xYB5kLuSaw95o=",
- "rev": "ca332209cb5567c9b249c86788cb2dbf8847e760",
- "url": "https://chromium.googlesource.com/webm/libwebp.git"
- },
- "src/third_party/libyuv": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-hD5B9fPNwf8M98iS/PYeUJgJxtBvvf2BrrlnBNYXSg0=",
- "rev": "a6a2ec654b1be1166b376476a7555c89eca0c275",
- "url": "https://chromium.googlesource.com/libyuv/libyuv.git"
- },
- "src/third_party/lss": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=",
- "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521",
- "url": "https://chromium.googlesource.com/linux-syscall-support.git"
- },
- "src/third_party/material_color_utilities/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=",
- "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465",
- "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git"
- },
- "src/third_party/minigbm/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=",
- "rev": "3018207f4d89395cc271278fb9a6558b660885f5",
- "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git"
- },
- "src/third_party/nan": {
- "fetcher": "fetchFromGitHub",
- "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=",
- "owner": "nodejs",
- "repo": "nan",
- "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213"
- },
- "src/third_party/nasm": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=",
- "rev": "f477acb1049f5e043904b87b825c5915084a9a29",
- "url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
- },
- "src/third_party/nearby/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-YotKuKutnjuphwiElfQO6qpoNLhZGP6bqWZnW3Zv6QI=",
- "rev": "33e682f24427a0eb634bd3186fe3c6fd96bd6768",
- "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git"
- },
- "src/third_party/neon_2_sse/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=",
- "rev": "a15b489e1222b2087007546b4912e21293ea86ff",
- "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git"
- },
- "src/third_party/openh264/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=",
- "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7",
- "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264"
- },
- "src/third_party/openscreen/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-4Qd5nHJxIOY7ifPy6Xf0TgZK0TkZY48scOkJ25kMCjk=",
- "rev": "90e48ecc4ed9feeba36f49065c738d620d6f0780",
- "url": "https://chromium.googlesource.com/openscreen"
- },
- "src/third_party/openscreen/src/buildtools": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-SBorO59kMSnskcp3oP5lrGQg+9cr/Ymey2aZGlRTgu0=",
- "rev": "0ac67b7cef80e421283f633ee9c2ce652f6e42cc",
- "url": "https://chromium.googlesource.com/chromium/src/buildtools"
- },
- "src/third_party/openscreen/src/third_party/tinycbor/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=",
- "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7",
- "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git"
- },
- "src/third_party/ots/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=",
- "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33",
- "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git"
- },
- "src/third_party/pdfium": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-/gSW4sd2AN4m3aIs9AojqsfrXeCNNrl7wFM54KeQVxw=",
- "rev": "dcdd830ae4e1b14f85383d1baf84efee6bc853cc",
- "url": "https://pdfium.googlesource.com/pdfium.git"
- },
- "src/third_party/perfetto": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-FeI+nAa5N8mQoA8gDSmWn6nw6TSPhDGwJI8/7r/5z1c=",
- "rev": "a66020f87046d8934c22e20acb2bb8a91901ce8e",
- "url": "https://android.googlesource.com/platform/external/perfetto.git"
- },
- "src/third_party/protobuf-javascript/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U=",
- "rev": "e34549db516f8712f678fcd4bc411613b5cc5295",
- "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript"
- },
- "src/third_party/pthreadpool/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=",
- "rev": "4fe0e1e183925bf8cfa6aae24237e724a96479b8",
- "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git"
- },
- "src/third_party/pyelftools": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=",
- "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae",
- "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git"
- },
- "src/third_party/pywebsocket3/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=",
- "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2",
- "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git"
- },
- "src/third_party/quic_trace/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=",
- "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc",
- "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git"
- },
- "src/third_party/re2/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-gB6vW6UJ60LrrGeNP6NKAcirIK6jgZjHRc6TA+pNXAQ=",
- "rev": "6598a8ecd57724c8c7d43b2fca8eb9f9969ce57c",
- "url": "https://chromium.googlesource.com/external/github.com/google/re2.git"
- },
- "src/third_party/ruy/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-cwmKQJpR+7lp+dq8fGu6U8A+qmkXz6SlWvAdhBkKZOw=",
- "rev": "587c2cf8b11d3c32fa26887063eda3171a3d353e",
- "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git"
- },
- "src/third_party/securemessage/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=",
- "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84",
- "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git"
- },
- "src/third_party/skia": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-zHfv4OZK/nVJc2rl+dBSCc4f6qndpAKcFZtThw06+LY=",
- "rev": "a747f7ea37db6ea3871816dbaf2eb41b5776c826",
- "url": "https://skia.googlesource.com/skia.git"
- },
- "src/third_party/smhasher/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=",
- "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f",
- "url": "https://chromium.googlesource.com/external/smhasher.git"
- },
- "src/third_party/snappy/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=",
- "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c",
- "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git"
- },
- "src/third_party/speedometer/v3.0": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=",
- "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d",
- "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
- },
- "src/third_party/sqlite/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-TsrSvL76H7SFhJWgHqyl8Y/BhAcnI9oaT2tUT6Ktan4=",
- "rev": "f51e3fa404f5853650525549c78d7489a7f457b3",
- "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git"
- },
- "src/third_party/squirrel.mac": {
- "fetcher": "fetchFromGitHub",
- "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=",
- "owner": "Squirrel",
- "repo": "Squirrel.Mac",
- "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38"
- },
- "src/third_party/squirrel.mac/vendor/Mantle": {
- "fetcher": "fetchFromGitHub",
- "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=",
- "owner": "Mantle",
- "repo": "Mantle",
- "rev": "78d3966b3c331292ea29ec38661b25df0a245948"
- },
- "src/third_party/squirrel.mac/vendor/ReactiveObjC": {
- "fetcher": "fetchFromGitHub",
- "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=",
- "owner": "ReactiveCocoa",
- "repo": "ReactiveObjC",
- "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76"
- },
- "src/third_party/swiftshader": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-tU0maePvL35JIVKFm+9hmPYDM81szLNYqUJyTKMHT0k=",
- "rev": "bbe6452b420c5ddc4b0fd421b0a3ce271262f4ca",
- "url": "https://swiftshader.googlesource.com/SwiftShader.git"
- },
- "src/third_party/text-fragments-polyfill/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=",
- "rev": "c036420683f672d685e27415de0a5f5e85bdc23f",
- "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git"
- },
- "src/third_party/tflite/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-Iqun3uMTCjGzHxUDeTCrvZufNtobnbqYVPDt7ZJ06wM=",
- "rev": "55bc062601e4ee5a4efa834a84ae5c5ec6b28306",
- "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git"
- },
- "src/third_party/ukey2/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=",
- "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47",
- "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git"
- },
- "src/third_party/vulkan-deps": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-MokWdjOP8Mc5hmoRrSXHXkobMPWbbmMzAMBOOoKG3gk=",
- "rev": "3cebaae6743688201c8aa9b3694bba6948f0fa68",
- "url": "https://chromium.googlesource.com/vulkan-deps"
- },
- "src/third_party/vulkan-deps/glslang/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-lP+N1d6jE+Cj5ofomgMEhbA6VbH5eKw83mY6zNIOfNk=",
- "rev": "9f37ad360ea1c32162f0cc1799b1b292594fc771",
- "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang"
- },
- "src/third_party/vulkan-deps/spirv-cross/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=",
- "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3",
- "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross"
- },
- "src/third_party/vulkan-deps/spirv-headers/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-kyOAwe4R0FmeA9IIJF2eoZR+7g9LiGKaZ7FuIfkrXJ4=",
- "rev": "8b246ff75c6615ba4532fe4fde20f1be090c3764",
- "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers"
- },
- "src/third_party/vulkan-deps/spirv-tools/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-/Cldtx75V+z3FuColEqwweyZHEqR2NaIj1Ha/vPoCsc=",
- "rev": "c6615779ef8a1eb5ef48fef77bf3eb2cf4f5438d",
- "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools"
- },
- "src/third_party/vulkan-deps/vulkan-headers/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-EnKiCtH6rh3ACQgokSSfp4FPFluMZW0dheP8IEzZtY4=",
- "rev": "577baa05033cf1d9236b3d078ca4b3269ed87a2b",
- "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers"
- },
- "src/third_party/vulkan-deps/vulkan-loader/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-zkJSPshRaZRDiBvLJbJo8l1MX10KXYZniqtNTNnokT4=",
- "rev": "61a9c50248e09f3a0e0be7ce6f8bb1663855f979",
- "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader"
- },
- "src/third_party/vulkan-deps/vulkan-tools/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-9qs0oS6W7x/1Z+wlFt91bqF09oxoloNPtjjH9mECJFk=",
- "rev": "733fd2b522918f81f9c4669350dafd066f99c5d5",
- "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools"
- },
- "src/third_party/vulkan-deps/vulkan-utility-libraries/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-mCD9/bpWUXRVJ+OyOqG0tXTgFuptIlcG6UR/RiNV1Z0=",
- "rev": "a4140c5fd47dcf3a030726a60b293db61cfb54a3",
- "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries"
- },
- "src/third_party/vulkan-deps/vulkan-validation-layers/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-Bcm5yMo7JL/E6YZetlabkA0mkEFxbWriYNd8tRtgx5k=",
- "rev": "5b8af92af052c83444ac560ff1e28c1c322424ef",
- "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers"
- },
- "src/third_party/vulkan_memory_allocator": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=",
- "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21",
- "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git"
- },
- "src/third_party/wayland-protocols/gtk": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=",
- "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0",
- "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git"
- },
- "src/third_party/wayland-protocols/kde": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=",
- "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e",
- "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git"
- },
- "src/third_party/wayland-protocols/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-ljMcY59iOdGYeToadCuQ3t0lrBnsBdot+NiT6e+JJ04=",
- "rev": "681c33c8547d6aefe24455ba2bffe1c5ae11fee5",
- "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git"
- },
- "src/third_party/wayland/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-YSo1DznmcaYSUcJl/3voVSfZfuLokAFQt6F3M1Iat28=",
- "rev": "c35d1a3d1c0a1735afe5eb227cb826faa878ec19",
- "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git"
- },
- "src/third_party/webdriver/pylib": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=",
- "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04",
- "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git"
- },
- "src/third_party/webgl/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-dubsIPZKBGOzANGvMtQxFKFIHr0laDUGpzgRyEOjHMU=",
- "rev": "f4bf599a8b575df685c31d9c4729a70a04e377ed",
- "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git"
- },
- "src/third_party/webgpu-cts/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-/duXwmqanyI2KEnV5izvr0kE8tJNI1F1jMMIY0ylLH8=",
- "rev": "addbf812fd750dc8cebbd63732e7ce54a763fbee",
- "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git"
- },
- "src/third_party/webrtc": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-USSfh+vUFrWnXYvZIORRb4AEGNSCPub2cNqEdZD9mKM=",
- "rev": "a55ff9e83e4592010969d428bee656bace8cbc3b",
- "url": "https://webrtc.googlesource.com/src.git"
- },
- "src/third_party/weston/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=",
- "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7",
- "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git"
- },
- "src/third_party/wuffs/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=",
- "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8",
- "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git"
- },
- "src/third_party/xdg-utils": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=",
- "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44",
- "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git"
- },
- "src/third_party/xnnpack/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-Cmw+rj805YTnnCwy2Zwzi2ZW4sdX5JWjTnBaUB6+YyU=",
- "rev": "7e696d941310a528dd2d6fbee3d499d19b24746d",
- "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git"
- },
- "src/third_party/zstd/src": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-hWfYKiTzkmeiUTgNrSYXOFauusSVceVhD04Hgk69CK4=",
- "rev": "621a263fb2e6c2175fbd489e5d77ee8038baa2b2",
- "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git"
- },
- "src/tools/page_cycler/acid3": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=",
- "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba",
- "url": "https://chromium.googlesource.com/chromium/deps/acid3.git"
- },
- "src/v8": {
- "fetcher": "fetchFromGitiles",
- "hash": "sha256-ME/O8CJASZ8Ql931EaTRM3+6lLzGx1us/cK9Dv7Bd+s=",
- "rev": "cc9dc1eb196bc3cbeca92eeec62949b4ac7cd757",
- "url": "https://chromium.googlesource.com/v8/v8.git"
- }
- },
- "electron_yarn_hash": "0vq12z09hcm6xdrd34b01vx1c47r4zdaqrkw9db6r612xrp2xi0c",
- "modules": "123",
- "node": "20.16.0",
- "version": "30.5.1"
- },
"31": {
"chrome": "126.0.6478.234",
"chromium": {
@@ -964,10 +47,10 @@
},
"src/electron": {
"fetcher": "fetchFromGitHub",
- "hash": "sha256-dw2WLjkHCt/uYXT+eZpaJ1bdB6DdMcJLjnscREp4YU8=",
+ "hash": "sha256-OlnSVTCfhl8Gl6DHG6JBi/x0G9cXar1KC3mfxcZ3y1Y=",
"owner": "electron",
"repo": "electron",
- "rev": "v31.6.0"
+ "rev": "v31.7.2"
},
"src/media/cdm/api": {
"fetcher": "fetchFromGitiles",
@@ -1211,10 +294,10 @@
},
"src/third_party/electron_node": {
"fetcher": "fetchFromGitHub",
- "hash": "sha256-fYx771gbZTsgEmHQf4mj3qSqmFHs8YVg4sVyUnfsmqI=",
+ "hash": "sha256-gm0mJNq6RVWfSsy7vxz44zz0OKjoH50APKOkOnI+Is8=",
"owner": "nodejs",
"repo": "node",
- "rev": "v20.17.0"
+ "rev": "v20.18.0"
},
"src/third_party/emoji-segmenter/src": {
"fetcher": "fetchFromGitiles",
@@ -1852,10 +935,10 @@
"url": "https://chromium.googlesource.com/v8/v8.git"
}
},
- "electron_yarn_hash": "12pcq3zzx6627igdfd5bgyismz9n21093smpd43c4aall2mn6194",
+ "electron_yarn_hash": "0mkq703idswn1qdmrm21ra58pa69hz79hyhaqnigyc854qf4k6w2",
"modules": "125",
- "node": "20.17.0",
- "version": "31.6.0"
+ "node": "20.18.0",
+ "version": "31.7.2"
},
"32": {
"chrome": "128.0.6613.186",
@@ -1905,10 +988,10 @@
},
"src/electron": {
"fetcher": "fetchFromGitHub",
- "hash": "sha256-6Yt3fz2XqFoSh+V/tI9ygFdHf76p2vGOR7+6FgTnfWg=",
+ "hash": "sha256-RrQMeFf3notm96BJJgctXU/0azABY4axQ8VIEQsG4Gk=",
"owner": "electron",
"repo": "electron",
- "rev": "v32.2.1"
+ "rev": "v32.2.2"
},
"src/media/cdm/api": {
"fetcher": "fetchFromGitiles",
@@ -2796,10 +1879,10 @@
"electron_yarn_hash": "19iw16qs4h6b1bcmkkqxhhcgxnl2r6qf57w7dr76vbl0zhmhlyf9",
"modules": "128",
"node": "20.18.0",
- "version": "32.2.1"
+ "version": "32.2.2"
},
"33": {
- "chrome": "130.0.6723.44",
+ "chrome": "130.0.6723.59",
"chromium": {
"deps": {
"gn": {
@@ -2809,15 +1892,15 @@
"version": "2024-09-09"
}
},
- "version": "130.0.6723.44"
+ "version": "130.0.6723.59"
},
"chromium_npm_hash": "sha256-4w5m/bTMygidlb4TZHMx1Obp784DLxMwrfe1Uvyyfp8=",
"deps": {
"src": {
"fetcher": "fetchFromGitiles",
- "hash": "sha256-zCyzVI6qbI1qTT0QBpVxLgNF5+L/Ym8WF6175/hv9k0=",
+ "hash": "sha256-8AsyUWYjYNczlybVCsvR5YEaL+Ak4Sth7ZA5n6gUjss=",
"postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
- "rev": "130.0.6723.44",
+ "rev": "130.0.6723.59",
"url": "https://chromium.googlesource.com/chromium/src.git"
},
"src/chrome/test/data/perf/canvas_bench": {
@@ -2846,10 +1929,10 @@
},
"src/electron": {
"fetcher": "fetchFromGitHub",
- "hash": "sha256-8Y6jzjaLseSR4JPurofSG8Bs0m7wJucn4cwIc+z89sM=",
+ "hash": "sha256-0Ftjs2hvO7ySECm9U3JFOBtb/VgEHchTfnAoo45sOj8=",
"owner": "electron",
"repo": "electron",
- "rev": "v33.0.0"
+ "rev": "v33.0.2"
},
"src/media/cdm/api": {
"fetcher": "fetchFromGitiles",
@@ -2877,8 +1960,8 @@
},
"src/third_party/angle": {
"fetcher": "fetchFromGitiles",
- "hash": "sha256-B/xH9kMuOcExMyp5wtk/CeJtUogmnwmMpfaTDpE3pio=",
- "rev": "3cabe8c25ad30b0761ee74bc4d9f455cb5ba84c7",
+ "hash": "sha256-k9moMf40yao+FxWT6c/JBu0z/oI+U26LnqUwoweA0SU=",
+ "rev": "21e4b689c009a93f66d61989a713d52bceaf2979",
"url": "https://chromium.googlesource.com/angle/angle.git"
},
"src/third_party/angle/third_party/VK-GL-CTS/src": {
@@ -3075,8 +2158,8 @@
},
"src/third_party/devtools-frontend/src": {
"fetcher": "fetchFromGitiles",
- "hash": "sha256-GUpeszdPsCfN+RSg6vRTyfxwD0/TEtWmBEIcIUwYhBg=",
- "rev": "88446977cb017f143f1ff6963d384b05a4414f54",
+ "hash": "sha256-brsMWPV8xleRMMUnrONL23kJyy3C98p59nPkGCMUTM0=",
+ "rev": "b99303161bf24247ed677a5be454dab24ebdced5",
"url": "https://chromium.googlesource.com/devtools/devtools-frontend"
},
"src/third_party/dom_distiller_js/dist": {
@@ -3749,6 +2832,6 @@
"electron_yarn_hash": "0x3hk02diq4ss2405m44r4nb144h213vqr5hr4gmy04p6drk76qv",
"modules": "130",
"node": "20.18.0",
- "version": "33.0.0"
+ "version": "33.0.2"
}
}
diff --git a/pkgs/development/tools/electron/update.py b/pkgs/development/tools/electron/update.py
index 14ccfe6d84a3..81e00691ae12 100755
--- a/pkgs/development/tools/electron/update.py
+++ b/pkgs/development/tools/electron/update.py
@@ -182,18 +182,16 @@ class GitilesRepo(Repo):
def __init__(self, url: str, rev: str) -> None:
super().__init__()
self.fetcher = "fetchFromGitiles"
- # self.fetcher = 'fetchgit'
self.args = {
"url": url,
"rev": rev,
- # "fetchSubmodules": "false",
}
if url == "https://chromium.googlesource.com/chromium/src.git":
self.args["postFetch"] = "rm -r $out/third_party/blink/web_tests; "
self.args["postFetch"] += "rm -r $out/third_party/hunspell/tests; "
self.args["postFetch"] += "rm -r $out/content/test/data; "
- self.args["postFetch"] += "rm -r $out/courgette/testdata; "
+ self.args["postFetch"] += "rm -rf $out/courgette/testdata; "
self.args["postFetch"] += "rm -r $out/extensions/test/data; "
self.args["postFetch"] += "rm -r $out/media/test/data; "
diff --git a/pkgs/development/tools/espup/default.nix b/pkgs/development/tools/espup/default.nix
index 336bdcdf5229..f584e3486e4f 100644
--- a/pkgs/development/tools/espup/default.nix
+++ b/pkgs/development/tools/espup/default.nix
@@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "espup";
- version = "0.12.2";
+ version = "0.13.0";
src = fetchFromGitHub {
owner = "esp-rs";
repo = "espup";
rev = "v${version}";
- hash = "sha256-7rxT3Stbfec7oxZOBN87lICmq+V8OZMCXb5F6Ca6jS4=";
+ hash = "sha256-okB8K0ly3MvnkVve41eT0SNr5dPn5E5QXewqLHGL/Tc=";
};
- cargoHash = "sha256-GfoM2ngwnovQdbiEUQrkrrMpq4fo37VVOmnkK/5l+C8=";
+ cargoHash = "sha256-n2tLG3logtc73Ut/R1UGuLSm7MpZ4Bxp/08SOhGL+80=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/development/tools/extism-cli/default.nix b/pkgs/development/tools/extism-cli/default.nix
index 5923c9d58dbb..36bdd4557d77 100644
--- a/pkgs/development/tools/extism-cli/default.nix
+++ b/pkgs/development/tools/extism-cli/default.nix
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "extism-cli";
- version = "1.5.4";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "extism";
repo = "cli";
rev = "refs/tags/v${version}";
- hash = "sha256-zC03cvvotRIiW4IiVTwffgMYLDrCp72pgMJHoJk5L0Q=";
+ hash = "sha256-FAnPyhCc1R6Xk195hTfO16WVtYVB6RPp7Ih7+uyRy2s=";
};
- vendorHash = "sha256-n4Ue2TSG0zbC2uqXiNakqWQjxhbOgXnC2Y7EKP2BM8Q=";
+ vendorHash = "sha256-w8XqHirHfswhlBH/oSrDKLyGdbaiFjQGEZcMH+WVLYo=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix
index d9cd2d0cbbc5..f730b150e59f 100644
--- a/pkgs/development/tools/faas-cli/default.nix
+++ b/pkgs/development/tools/faas-cli/default.nix
@@ -18,13 +18,13 @@ let
in
buildGoModule rec {
pname = "faas-cli";
- version = "0.16.36";
+ version = "0.16.37";
src = fetchFromGitHub {
owner = "openfaas";
repo = "faas-cli";
rev = version;
- sha256 = "sha256-5wvVwUj4JqHHZ/Q7s65nlCYENgHENma3IuUsNwcNJ9M=";
+ sha256 = "sha256-DGtIoX0cvhnHYD+xBV6lW703onupLpF/QYH75rt23Q4=";
};
vendorHash = null;
diff --git a/pkgs/development/tools/fnlfmt/default.nix b/pkgs/development/tools/fnlfmt/default.nix
index a5f325ebdab8..052068710cf3 100644
--- a/pkgs/development/tools/fnlfmt/default.nix
+++ b/pkgs/development/tools/fnlfmt/default.nix
@@ -1,4 +1,10 @@
-{ lib, stdenv, fetchFromSourcehut, luaPackages, lua }:
+{
+ lib,
+ stdenv,
+ fetchFromSourcehut,
+ lua,
+ luaPackages,
+}:
stdenv.mkDerivation rec {
pname = "fnlfmt";
@@ -15,26 +21,26 @@ stdenv.mkDerivation rec {
buildInputs = [ lua ];
- buildPhase = ''
- runHook preBuild
+ makeFlags = [
+ "PREFIX=$(out)"
+ "FENNEL=${luaPackages.fennel}/bin/fennel"
+ ];
+ sourceRoot = [ "${src.name}/tags/${version}" ];
- echo "#!${lua}/bin/lua" > fnlfmt
- ${luaPackages.fennel}/bin/fennel --require-as-include --compile tags/${version}/cli.fnl >> fnlfmt
- chmod +x fnlfmt
+ doInstallCheck = true;
+ installCheckPhase = ''
+ runHook preInstallCheck
- runHook postBuild
- '';
+ $out/bin/fnlfmt --help > /dev/null
- installPhase = ''
- runHook preInstall
- install -D ./fnlfmt $out/bin/fnlfmt
- runHook postInstall
+ runHook postInstallCheck
'';
meta = with lib; {
description = "Formatter for Fennel";
- homepage = "https://git.sr.ht/~technomancy/fnlfmt";
- license = licenses.lgpl3Plus;
+ homepage = src.meta.homepage;
+ changelog = "${src.meta.homepage}/tree/${version}/changelog.md";
+ license = licenses.mit;
platforms = lua.meta.platforms;
maintainers = with maintainers; [ chiroptical ];
mainProgram = "fnlfmt";
diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix
index 7a46966e90e7..88b740fb6cd4 100644
--- a/pkgs/development/tools/gauge/default.nix
+++ b/pkgs/development/tools/gauge/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "gauge";
- version = "1.6.8";
+ version = "1.6.9";
patches = [
# adds a check which adds an error message when trying to
@@ -14,10 +14,10 @@ buildGoModule rec {
owner = "getgauge";
repo = "gauge";
rev = "v${version}";
- hash = "sha256-ifE+6lwBYVZl0eAOCUTrqqTwVnKvCB44AHXTyLhsMX8=";
+ hash = "sha256-YjLBfQ6L3UwcgQ9LgUfnNSegNhQI8/Gb5Hdpe0/uzOc=";
};
- vendorHash = "sha256-yh7hAKmt2qn2jmPKGF+ATvZd4miNHuHsKlFNaWibTJQ=";
+ vendorHash = "sha256-Uir/umJNnTHWEKPbVch0Pq7B3hVim8BMtGc/M9esADw=";
excludedPackages = [ "build" "man" ];
diff --git a/pkgs/development/tools/gauge/plugins/dotnet/data.json b/pkgs/development/tools/gauge/plugins/dotnet/data.json
index 19d228a955cc..3e3aac11ed19 100644
--- a/pkgs/development/tools/gauge/plugins/dotnet/data.json
+++ b/pkgs/development/tools/gauge/plugins/dotnet/data.json
@@ -1,5 +1,5 @@
{
- "version": "0.7.1",
- "url": "https://github.com/getgauge/gauge-dotnet/releases/download/v0.7.1/gauge-dotnet-0.7.1.zip",
- "hash": "sha256-0sJctSdQfkm70Z1JDFMc2qwo0PbDWYlHbqfVsnlHyDg="
+ "version": "0.7.2",
+ "url": "https://github.com/getgauge/gauge-dotnet/releases/download/v0.7.2/gauge-dotnet-0.7.2.zip",
+ "hash": "sha256-ac2pf0st1p/DPAXgQC689nbD+DO7DYkxFqrVItq+UWw="
}
diff --git a/pkgs/development/tools/gemstash/Gemfile.lock b/pkgs/development/tools/gemstash/Gemfile.lock
index eed8dffc6225..e091a27c0f86 100644
--- a/pkgs/development/tools/gemstash/Gemfile.lock
+++ b/pkgs/development/tools/gemstash/Gemfile.lock
@@ -1,24 +1,24 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (7.1.2)
+ activesupport (7.2.1.2)
base64
bigdecimal
- concurrent-ruby (~> 1.0, >= 1.0.2)
+ concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
+ logger (>= 1.4.2)
minitest (>= 5.1)
- mutex_m
- tzinfo (~> 2.0)
+ securerandom (>= 0.3)
+ tzinfo (~> 2.0, >= 2.0.5)
base64 (0.2.0)
- bigdecimal (3.1.4)
- concurrent-ruby (1.2.2)
+ bigdecimal (3.1.8)
+ concurrent-ruby (1.3.4)
connection_pool (2.4.1)
- dalli (3.2.6)
- drb (2.2.0)
- ruby2_keywords
- faraday (1.10.3)
+ dalli (3.2.8)
+ drb (2.2.1)
+ faraday (1.10.4)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
@@ -36,12 +36,12 @@ GEM
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
- faraday-net_http (1.0.1)
+ faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
- faraday_middleware (1.2.0)
+ faraday_middleware (1.2.1)
faraday (~> 1.0)
gemstash (2.7.1)
activesupport (>= 4.2, < 8)
@@ -57,50 +57,60 @@ GEM
sqlite3 (~> 1.3)
terminal-table (~> 3.0)
thor (~> 1.0)
- i18n (1.14.1)
+ i18n (1.14.6)
concurrent-ruby (~> 1.0)
+ logger (1.6.1)
lru_redux (1.1.0)
- mini_portile2 (2.8.5)
- minitest (5.20.0)
- multipart-post (2.3.0)
- mustermann (3.0.0)
+ minitest (5.25.1)
+ multipart-post (2.4.1)
+ mustermann (3.0.3)
ruby2_keywords (~> 0.0.1)
- mutex_m (0.2.0)
- nio4r (2.6.1)
- psych (5.1.1.1)
+ nio4r (2.7.3)
+ psych (5.1.2)
stringio
- puma (6.4.0)
+ puma (6.4.3)
nio4r (~> 2.0)
- rack (2.2.8)
- rack-protection (3.1.0)
+ rack (2.2.10)
+ rack-protection (3.2.0)
+ base64 (>= 0.1.0)
rack (~> 2.2, >= 2.2.4)
ruby2_keywords (0.0.5)
- sequel (5.74.0)
+ securerandom (0.3.1)
+ sequel (5.85.0)
bigdecimal
server_health_check (1.0.2)
server_health_check-rack (0.1.0)
server_health_check (~> 1.0, >= 1.0.1)
- sinatra (3.1.0)
+ sinatra (3.2.0)
mustermann (~> 3.0)
rack (~> 2.2, >= 2.2.4)
- rack-protection (= 3.1.0)
+ rack-protection (= 3.2.0)
tilt (~> 2.0)
- sqlite3 (1.6.9)
- mini_portile2 (~> 2.8.0)
- stringio (3.1.0)
+ sqlite3 (1.7.3-aarch64-linux)
+ sqlite3 (1.7.3-arm-linux)
+ sqlite3 (1.7.3-arm64-darwin)
+ sqlite3 (1.7.3-x86-linux)
+ sqlite3 (1.7.3-x86_64-darwin)
+ sqlite3 (1.7.3-x86_64-linux)
+ stringio (3.1.1)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
- thor (1.3.0)
- tilt (2.3.0)
+ thor (1.3.2)
+ tilt (2.4.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
- unicode-display_width (2.5.0)
+ unicode-display_width (2.6.0)
PLATFORMS
- ruby
+ aarch64-linux
+ arm-linux
+ arm64-darwin
+ x86-linux
+ x86_64-darwin
+ x86_64-linux
DEPENDENCIES
gemstash
BUNDLED WITH
- 2.4.22
+ 2.5.17
diff --git a/pkgs/development/tools/gemstash/gemset.nix b/pkgs/development/tools/gemstash/gemset.nix
index ba5b0b9178e1..8d626cd10367 100644
--- a/pkgs/development/tools/gemstash/gemset.nix
+++ b/pkgs/development/tools/gemstash/gemset.nix
@@ -1,14 +1,14 @@
{
activesupport = {
- dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"];
+ dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "logger" "minitest" "securerandom" "tzinfo"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1l6hmf99zgckpn812qfxfz60rbh0zixv1hxnxhjlg8942pvixn2v";
+ sha256 = "1cacrvmn1561fb88fn99ig52wdz1k67s7vbssqwwwljf1kanlgvc";
type = "gem";
};
- version = "7.1.2";
+ version = "7.2.1.2";
};
base64 = {
groups = ["default"];
@@ -25,20 +25,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07y615s8yldk3k13lmkhpk1k190lcqvmxmnjwgh4bzjan9xrc36y";
+ sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
type = "gem";
};
- version = "3.1.4";
+ version = "3.1.8";
};
concurrent-ruby = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
+ sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
type = "gem";
};
- version = "1.2.2";
+ version = "1.3.4";
};
connection_pool = {
groups = ["default"];
@@ -55,21 +55,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "137xw0nl7ixxqyam6fjgmzl24i3rdml37whgnks8y35w92i95447";
+ sha256 = "19daxf5n5gr3pr57k4wqg701c3zwsk2h4jjialkaw7yrhi85jqrf";
type = "gem";
};
- version = "3.2.6";
+ version = "3.2.8";
};
drb = {
- dependencies = ["ruby2_keywords"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "03ylflxbp9jrs1hx3d4wvx05yb9hdq4a0r706zz6qc6kvqfazr79";
+ sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79";
type = "gem";
};
- version = "2.2.0";
+ version = "2.2.1";
};
faraday = {
dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
@@ -77,10 +76,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1c760q0ks4vj4wmaa7nh1dgvgqiwaw0mjr7v8cymy7i3ffgjxx90";
+ sha256 = "069gmdh5j90v06rbwlqvlhzhq45lxhx74mahz25xd276rm0wb153";
type = "gem";
};
- version = "1.10.3";
+ version = "1.10.4";
};
faraday-em_http = {
groups = ["default"];
@@ -138,10 +137,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j";
+ sha256 = "10n6wikd442mfm15hd6gzm0qb527161w1wwch4h5m4iclkz2x6b3";
type = "gem";
};
- version = "1.0.1";
+ version = "1.0.2";
};
faraday-net_http_persistent = {
groups = ["default"];
@@ -189,10 +188,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy";
+ sha256 = "1s990pnapb3vci9c00bklqc7jjix4i2zhxn2zf1lfk46xv47hnyl";
type = "gem";
};
- version = "1.2.0";
+ version = "1.2.1";
};
gemstash = {
dependencies = ["activesupport" "dalli" "faraday" "faraday_middleware" "lru_redux" "psych" "puma" "sequel" "server_health_check-rack" "sinatra" "sqlite3" "terminal-table" "thor"];
@@ -211,13 +210,22 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
+ sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw";
type = "gem";
};
- version = "1.14.1";
+ version = "1.14.6";
+ };
+ logger = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
+ type = "gem";
+ };
+ version = "1.6.1";
};
lru_redux = {
- gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
@@ -225,38 +233,27 @@
sha256 = "1yxghzg7476sivz8yyr9nkak2dlbls0b89vc2kg52k0nmg6d0wgf";
type = "gem";
};
- target_platform = "ruby";
version = "1.1.0";
};
- mini_portile2 = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs";
- type = "gem";
- };
- version = "2.8.5";
- };
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3";
+ sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix";
type = "gem";
};
- version = "5.20.0";
+ version = "5.25.1";
};
multipart-post = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lgyysrpl50wgcb9ahg29i4p01z0irb3p9lirygma0kkfr5dgk9x";
+ sha256 = "1a5lrlvmg2kb2dhw3lxcsv6x276bwgsxpnka1752082miqxd0wlq";
type = "gem";
};
- version = "2.3.0";
+ version = "2.4.1";
};
mustermann = {
dependencies = ["ruby2_keywords"];
@@ -264,30 +261,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rwbq20s2gdh8dljjsgj5s6wqqfmnbclhvv2c2608brv7jm6jdbd";
+ sha256 = "123ycmq6pkivv29bqbv79jv2cs04xakzd0fz1lalgvfs5nxfky6i";
type = "gem";
};
- version = "3.0.0";
- };
- mutex_m = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn";
- type = "gem";
- };
- version = "0.2.0";
+ version = "3.0.3";
};
nio4r = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1y99dfzlb3kgzh7pfk8km0p5zjiblxyh5rm8yal9h523vi5awji8";
+ sha256 = "017nbw87dpr4wyk81cgj8kxkxqgsgblrkxnmmadc77cg9gflrfal";
type = "gem";
};
- version = "2.6.1";
+ version = "2.7.3";
};
psych = {
dependencies = ["stringio"];
@@ -295,10 +282,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wjzrkssjfjpynij5dpycyflhqbjvi1gc2j73xgq3b196s1d3c24";
+ sha256 = "0s5383m6004q76xm3lb732bp4sjzb6mxb6rbgn129gy2izsj4wrk";
type = "gem";
};
- version = "5.1.1.1";
+ version = "5.1.2";
};
puma = {
dependencies = ["nio4r"];
@@ -306,34 +293,33 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1y8jcw80zcxvdq0id329lzmp5pzx7hpac227d7sgjkblc89s3pfm";
+ sha256 = "0gml1rixrfb0naciq3mrnqkpcvm9ahgps1c04hzxh4b801f69914";
type = "gem";
};
- version = "6.4.0";
+ version = "6.4.3";
};
rack = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv";
+ sha256 = "0ax778fsfvlhj7c11n0d1wdcb8bxvkb190a9lha5d91biwzyx9g4";
type = "gem";
};
- version = "2.2.8";
+ version = "2.2.10";
};
rack-protection = {
- dependencies = ["rack"];
+ dependencies = ["base64" "rack"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xsz78hccgza144n37bfisdkzpr2c8m0xl6rnlzgxdbsm1zrkg7r";
+ sha256 = "1zzvivmdb4dkscc58i3gmcyrnypynsjwp6xgc4ylarlhqmzvlx1w";
type = "gem";
};
- version = "3.1.0";
+ version = "3.2.0";
};
ruby2_keywords = {
- gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
@@ -341,22 +327,30 @@
sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
type = "gem";
};
- target_platform = "ruby";
version = "0.0.5";
};
+ securerandom = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q";
+ type = "gem";
+ };
+ version = "0.3.1";
+ };
sequel = {
dependencies = ["bigdecimal"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zj66n0m1la1anxjjdb8a35frzabym112rf9ssyxq42mq05ln4m2";
+ sha256 = "04jjv63wvvi9qfkpfsrv6w74liiqk4cd1qnlk7ja7i2waci9hlzx";
type = "gem";
};
- version = "5.74.0";
+ version = "5.85.0";
};
server_health_check = {
- gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
@@ -364,12 +358,10 @@
sha256 = "06chz92parchhj1457lf5lbj3hrmvqpq6mfskxcnj5f4qa14n5wd";
type = "gem";
};
- target_platform = "ruby";
version = "1.0.2";
};
server_health_check-rack = {
dependencies = ["server_health_check"];
- gem_platform = "ruby";
groups = ["default"];
platforms = [];
source = {
@@ -377,7 +369,6 @@
sha256 = "0cgqr94x18f60n27sk9lgg471c6vk6qy132z7i1ppp32kvmjfphs";
type = "gem";
};
- target_platform = "ruby";
version = "0.1.0";
};
sinatra = {
@@ -386,31 +377,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00541cnypsh1mnilfxxqlz6va9afrixf9m1asn4wzjp5m59777p8";
+ sha256 = "01wq20aqk5kfggq3wagx5xr1cz0x08lg6dxbk9yhd1sf0d6pywkf";
type = "gem";
};
- version = "3.1.0";
+ version = "3.2.0";
};
sqlite3 = {
- dependencies = ["mini_portile2"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08irz5llz31im8pmkk5k0kw433jyyji1qa98xkdmpphncdjr38am";
+ sha256 = "sha256-+nf2PHCVSPRtTptrtFzaUqo4gaoSzIWZETJ1jolocBw=";
type = "gem";
};
- version = "1.6.9";
+ version = "1.7.3";
};
stringio = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "063psvsn1aq6digpznxfranhcpmi0sdv2jhra5g0459sw0x2dxn1";
+ sha256 = "07mfqb40b2wh53k33h91zva78f9zwcdnl85jiq74wnaw2wa6wiak";
type = "gem";
};
- version = "3.1.0";
+ version = "3.1.1";
};
terminal-table = {
dependencies = ["unicode-display_width"];
@@ -428,20 +418,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s";
+ sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f";
type = "gem";
};
- version = "1.3.0";
+ version = "1.3.2";
};
tilt = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0p3l7v619hwfi781l3r7ypyv1l8hivp09r18kmkn6g11c4yr1pc2";
+ sha256 = "0kds7wkxmb038cwp6ravnwn8k65ixc68wpm8j5jx5bhx8ndg4x6z";
type = "gem";
};
- version = "2.3.0";
+ version = "2.4.0";
};
tzinfo = {
dependencies = ["concurrent-ruby"];
@@ -459,9 +449,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky";
+ sha256 = "0nkz7fadlrdbkf37m0x7sw8bnz8r355q3vwcfb9f9md6pds9h9qj";
type = "gem";
};
- version = "2.5.0";
+ version = "2.6.0";
};
}
diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix
index 4584650436c2..06a4c36a7d9f 100644
--- a/pkgs/development/tools/ginkgo/default.nix
+++ b/pkgs/development/tools/ginkgo/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "ginkgo";
- version = "2.20.2";
+ version = "2.21.0";
src = fetchFromGitHub {
owner = "onsi";
repo = "ginkgo";
rev = "v${version}";
- sha256 = "sha256-/emP4U2s7/hYJZCJ+TdE5sM45q0C8OrrIFreSupq3ig=";
+ sha256 = "sha256-9WvBdcl65WTwzFKTPYTg6ufhIBuqx+T99ng7UePSNHU=";
};
- vendorHash = "sha256-6HlCj2Wq+lH6OQxG18fCMj1eC2Xy++IQx35nCAtHQ/U=";
+ vendorHash = "sha256-tjHBnkFlkP7n0/c9bz/nUzWerPzVQ+12cKijG1Jzti8=";
# integration tests expect more file changes
# types tests are missing CodeLocation
diff --git a/pkgs/development/tools/go-minimock/default.nix b/pkgs/development/tools/go-minimock/default.nix
index 55601dd5704f..8238d97a596a 100644
--- a/pkgs/development/tools/go-minimock/default.nix
+++ b/pkgs/development/tools/go-minimock/default.nix
@@ -2,20 +2,20 @@
buildGoModule rec {
pname = "go-minimock";
- version = "3.4.0";
+ version = "3.4.1";
src = fetchFromGitHub {
owner = "gojuno";
repo = "minimock";
rev = "v${version}";
- hash = "sha256-IfowEauUoMybElxThsAZxtdZu3LCqwgpJM5wLQI/yAc=";
+ hash = "sha256-YwaC+saod1IoVj6fc6Zucwy83XhnPgqaOp1IcxEmlaw=";
};
ldflags = [
"-s" "-w" "-X main.version=${version}"
];
- vendorHash = "sha256-ObyIiHidGioSelX2qplFMkC0KX44h0rT6ePa3QKpNfU=";
+ vendorHash = "sha256-0dqbDG/fKaznxeVMSVCEtkQn76dOso6XBiw6xlKqgwM=";
doCheck = true;
diff --git a/pkgs/development/tools/gqlgenc/default.nix b/pkgs/development/tools/gqlgenc/default.nix
index ef0fd7c3c8ab..e737adb02656 100644
--- a/pkgs/development/tools/gqlgenc/default.nix
+++ b/pkgs/development/tools/gqlgenc/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gqlgenc";
- version = "0.25.2";
+ version = "0.25.3";
src = fetchFromGitHub {
owner = "yamashou";
repo = "gqlgenc";
rev = "v${version}";
- sha256 = "sha256-g+l493Nt0SuW4gwJh0s9Zeejpyx2oLxVDykIvBup638=";
+ sha256 = "sha256-sIXPd/+BVaywAAt2myNOBaAjy/eTY6C8TdSuOoikr0E=";
};
excludedPackages = [ "example" ];
diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix
index d2d74ab52edf..75baa0d446e1 100644
--- a/pkgs/development/tools/hcloud/default.nix
+++ b/pkgs/development/tools/hcloud/default.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "hcloud";
- version = "1.47.0";
+ version = "1.48.0";
src = fetchFromGitHub {
owner = "hetznercloud";
repo = "cli";
rev = "refs/tags/v${version}";
- hash = "sha256-bIrkX/udxkHA+DWQ1t7QkHOmEhqacdtVR9wBWaS820M=";
+ hash = "sha256-fD+aEt3jakfdrh68Ok0SiehOy3Sg+B+3HUGO8gSSxTQ=";
};
- vendorHash = "sha256-fNcyIP6q54A+TlsN0xliQGONx7H20KNY+d0NxOUSxQc=";
+ vendorHash = "sha256-QO7K7nwFIYyJ5wGwuACWxzVf8mSX7JMsrbWqm6g5RCs=";
ldflags = [
"-s"
diff --git a/pkgs/development/tools/headache/default.nix b/pkgs/development/tools/headache/default.nix
index b5f5e55f3f79..93077f31104d 100644
--- a/pkgs/development/tools/headache/default.nix
+++ b/pkgs/development/tools/headache/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, nix-update-script, ocamlPackages }:
+{ lib, stdenv, fetchFromGitHub, nix-update-script, ocamlPackages, darwin }:
let
inherit (ocamlPackages) buildDunePackage camomile;
@@ -15,6 +15,8 @@ buildDunePackage rec {
sha256 = "sha256-UXQIIsCyJZN4qos7Si7LLm9vQueOduUmLeYHuyT2GZo=";
};
+ nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.sigtool;
+
propagatedBuildInputs = [
camomile
];
diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/development/tools/ineffassign/default.nix
deleted file mode 100644
index 0febc4db51e7..000000000000
--- a/pkgs/development/tools/ineffassign/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, go
-}:
-
-buildGoModule rec {
- pname = "ineffassign";
- version = "unstable-2021-09-04";
- rev = "4cc7213b9bc8b868b2990c372f6fa057fa88b91c";
-
- src = fetchFromGitHub {
- owner = "gordonklaus";
- repo = "ineffassign";
- inherit rev;
- sha256 = "sha256-XLXANN9TOmrNOixWtlqnIC27u+0TW2P3s9MyeyVUcAQ=";
- };
-
- vendorHash = "sha256-QTgWicN2m2ughtLsEBMaQWfpDbmbL0nS5qaIKF3mTJM=";
-
- allowGoReference = true;
-
- nativeCheckInputs = [ go ];
-
- meta = with lib; {
- description = "Detect ineffectual assignments in Go code";
- mainProgram = "ineffassign";
- homepage = "https://github.com/gordonklaus/ineffassign";
- license = licenses.mit;
- maintainers = with maintainers; [ kalbasit ];
- };
-}
diff --git a/pkgs/development/tools/infisical/default.nix b/pkgs/development/tools/infisical/default.nix
index 1de803fb6590..b7e7c349f045 100644
--- a/pkgs/development/tools/infisical/default.nix
+++ b/pkgs/development/tools/infisical/default.nix
@@ -15,7 +15,7 @@ let
buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json);
# the version of infisical
- version = "0.31.1";
+ version = "0.31.2";
# the platform-specific, statically linked binary
src =
diff --git a/pkgs/development/tools/infisical/hashes.json b/pkgs/development/tools/infisical/hashes.json
index c83a5aea7b06..7346d8e18b64 100644
--- a/pkgs/development/tools/infisical/hashes.json
+++ b/pkgs/development/tools/infisical/hashes.json
@@ -1,6 +1,6 @@
{ "_comment": "@generated by pkgs/development/tools/infisical/update.sh"
-, "x86_64-linux": "sha256-8fRZNnXmP1E75Bk8PjvtZ5fBFwLEq+qPmBoB1b+ho6I="
-, "x86_64-darwin": "sha256-ayc16K60EMGhGZES2KEDGcebCQ1UXOWl1qJJc9KCsEA="
-, "aarch64-linux": "sha256-l4pweKQKHPNUwpm+1hhYjP0oK6Cs0eu2YdzXpvptzLg="
-, "aarch64-darwin": "sha256-LXrxFNevOjkXnQ+hEx1Y5FNfwGHTKksDLLEWbSK34pU="
+, "x86_64-linux": "sha256-vNA6bhbgfzWRSlIitA9VJVOxe+LF3ra6q6lJY1NW13w="
+, "x86_64-darwin": "sha256-p+iis192d77vRWbPtWiFWZSgzdNY3K7VeDmmc7AbBtg="
+, "aarch64-linux": "sha256-IeCyJT8KF3Kh4XXfKmsKAewZWW3C9Gz3GQseMd0WMUw="
+, "aarch64-darwin": "sha256-vXS8YbLb2tCqaGEJSmS147b0m1OMZTFZ5Ou2vtegFWo="
}
diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix
index b9add5050a74..d92e79a5ffc5 100644
--- a/pkgs/development/tools/jql/default.nix
+++ b/pkgs/development/tools/jql/default.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "jql";
- version = "7.2.0";
+ version = "8.0.0";
src = fetchFromGitHub {
owner = "yamafaktory";
repo = pname;
rev = "jql-v${version}";
- hash = "sha256-UyZ7unIbKRn/5WsoYxkHWQ5k0Tb5NcC+UGpiyvpShBo=";
+ hash = "sha256-4H2V/ZE29Jw0JWSzP7X8SKgD+vXoCd7pcfTqB7/8m7M=";
};
- cargoHash = "sha256-gJQsap31twigZT5n5w7oHATdNf0DfqoNfdS7cMU/hiA=";
+ cargoHash = "sha256-/Y880GUXTUOd7SyVhbMZhMPgfm66HbWrz5miGJjfX0g=";
meta = with lib; {
description = "JSON Query Language CLI tool built with Rust";
diff --git a/pkgs/development/tools/language-servers/crystalline/default.nix b/pkgs/development/tools/language-servers/crystalline/default.nix
index 6ffb002ca7a7..3f59e57bdb01 100644
--- a/pkgs/development/tools/language-servers/crystalline/default.nix
+++ b/pkgs/development/tools/language-servers/crystalline/default.nix
@@ -7,7 +7,7 @@
}:
let
- version = "0.14.1";
+ version = "0.15.0";
in
crystal.buildCrystalPackage {
pname = "crystalline";
@@ -17,7 +17,7 @@ crystal.buildCrystalPackage {
owner = "elbywan";
repo = "crystalline";
rev = "v${version}";
- hash = "sha256-Z5gEuyK3MeFaIuzr+SdZ6dphSGEqL4fQ+cOwDW1Y3go=";
+ hash = "sha256-6ZAogEuOJH1QQ6NSJ+8KZUSFSgQAcvd4U9vWNAGix/M=";
};
format = "crystal";
diff --git a/pkgs/development/tools/language-servers/metals/default.nix b/pkgs/development/tools/language-servers/metals/default.nix
index 708d62d2ec7b..3247018038cc 100644
--- a/pkgs/development/tools/language-servers/metals/default.nix
+++ b/pkgs/development/tools/language-servers/metals/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "metals";
- version = "1.3.5";
+ version = "1.4.0";
deps = stdenv.mkDerivation {
name = "${pname}-deps-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
'';
outputHashMode = "recursive";
outputHashAlgo = "sha256";
- outputHash = "sha256-86/zeoOO5kSAwh7uQTV7nGUGQoIux1rlH5eUgvn3kvY=";
+ outputHash = "sha256-mmsCdv3zSwsaA00I5sQVy0V4fl1GytdgjVjs2r6x32Q=";
};
nativeBuildInputs = [ makeWrapper setJavaClassPath ];
diff --git a/pkgs/development/tools/lurk/default.nix b/pkgs/development/tools/lurk/default.nix
index 0f6f109899c3..3f72762eec95 100644
--- a/pkgs/development/tools/lurk/default.nix
+++ b/pkgs/development/tools/lurk/default.nix
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "lurk";
- version = "0.3.8";
+ version = "0.3.9";
src = fetchFromGitHub {
owner = "jakwai01";
repo = pname;
rev = "v${version}";
- hash = "sha256-JY5MSjHN8/n5iILgqjo6EOzuQRuTovAptMPh6oiJ7Zw=";
+ hash = "sha256-KiM5w0YPxEpJ4cR/8YfhWlTrffqf5Ak1eu0yxgOmqUs=";
};
- cargoHash = "sha256-cVGN5LZwjWijvVoAnz8LUyTImfT6KvgTGEg5JODGXHk=";
+ cargoHash = "sha256-wccehO+zHKINMk9q7vZjUUl7puB6NzcYdl+meA5Bh/c=";
postPatch = ''
substituteInPlace src/lib.rs \
diff --git a/pkgs/development/tools/misc/go-md2man/default.nix b/pkgs/development/tools/misc/go-md2man/default.nix
index ee8b8d38b565..b66584b90a93 100644
--- a/pkgs/development/tools/misc/go-md2man/default.nix
+++ b/pkgs/development/tools/misc/go-md2man/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "go-md2man";
- version = "2.0.4";
+ version = "2.0.5";
vendorHash = "sha256-aMLL/tmRLyGze3RSB9dKnoTv5ZK1eRtgV8fkajWEbU0=";
@@ -10,7 +10,7 @@ buildGoModule rec {
rev = "v${version}";
owner = "cpuguy83";
repo = "go-md2man";
- sha256 = "sha256-pQ+H8Psh92KWTang8hK0cHFLomH+4X0rMMilIJUQ4Qc=";
+ sha256 = "sha256-UX9FajFqZApVFED3MYcq167iPwztnIck25ehfcOeFD8=";
};
meta = with lib; {
diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix
index 8b0026fdf441..051bc6d8529a 100644
--- a/pkgs/development/tools/misc/texlab/default.nix
+++ b/pkgs/development/tools/misc/texlab/default.nix
@@ -15,21 +15,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "texlab";
- version = "5.20.0";
+ version = "5.21.0";
src = fetchFromGitHub {
owner = "latex-lsp";
repo = "texlab";
rev = "refs/tags/v${version}";
- hash = "sha256-hKQdc9p69L0t2MwCR4Fy20Nl+2qQk5JJoCaB4O43DNY=";
+ hash = "sha256-Lx7vENYuBXaMvGDOZxAPqivGZVaCXYrihaTnBn9eTm4=";
};
- cargoHash = "sha256-A/stdJ1baV0hdDXTdLd9gi8+JO7qPgQbNiYjHkp1GPQ=";
-
- # https://github.com/latex-lsp/texlab/pull/1237
- preBuild = ''
- rm .cargo/config.toml
- '';
+ cargoHash = "sha256-6JDG9Ac43AW6HV2baZH08uxdb84hjrGXgdzZiFr2Ybk=";
outputs = [ "out" ] ++ lib.optional (!isCross) "man";
@@ -46,7 +41,7 @@ rustPlatform.buildRustPackage rec {
# generate the man page
postInstall = lib.optionalString (!isCross) ''
# TexLab builds man page separately in CI:
- # https://github.com/latex-lsp/texlab/blob/v5.20.0/.github/workflows/publish.yml#L110-L114
+ # https://github.com/latex-lsp/texlab/blob/v5.21.0/.github/workflows/publish.yml#L110-L114
help2man --no-info "$out/bin/texlab" > texlab.1
installManPage texlab.1
'';
diff --git a/pkgs/development/tools/moq/default.nix b/pkgs/development/tools/moq/default.nix
index e3ba759beb16..06babfb658f9 100644
--- a/pkgs/development/tools/moq/default.nix
+++ b/pkgs/development/tools/moq/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "moq";
- version = "0.4.0";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "matryer";
repo = "moq";
rev = "v${version}";
- sha256 = "sha256-7egB+0JLHUbPc21XBC18M4m4fPqy1Qon3N9Fwkcmico=";
+ sha256 = "sha256-fIvh+IvkyU76RzJvThIFrsBOg/w+FtNjgthOy04siOc=";
};
vendorHash = "sha256-Kp0mRLmOlV3UpYSQJoc54tYU78sg+RZ5qy/1ime7j7w=";
diff --git a/pkgs/development/tools/nagelfar/default.nix b/pkgs/development/tools/nagelfar/default.nix
index a40861e0988d..3e379875c4c5 100644
--- a/pkgs/development/tools/nagelfar/default.nix
+++ b/pkgs/development/tools/nagelfar/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchzip, tcl, tcllib, tk, }:
+{ lib, fetchzip, tcl, tclPackages, tk, }:
tcl.mkTclDerivation {
pname = "nagelfar";
@@ -11,7 +11,7 @@ tcl.mkTclDerivation {
buildInputs = [
tcl
- tcllib
+ tclPackages.tcllib
tk
];
diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix
deleted file mode 100644
index bd5102e038a2..000000000000
--- a/pkgs/development/tools/omnisharp-roslyn/default.nix
+++ /dev/null
@@ -1,93 +0,0 @@
-{ buildDotnetModule
-, dotnetCorePackages
-, fetchFromGitHub
-, lib
-, stdenv
-, runCommand
-, expect
-}:
-let
- inherit (dotnetCorePackages) sdk_8_0 runtime_6_0;
-in
-let finalPackage = buildDotnetModule rec {
- pname = "omnisharp-roslyn";
- version = "1.39.12";
-
- src = fetchFromGitHub {
- owner = "OmniSharp";
- repo = "omnisharp-roslyn";
- rev = "refs/tags/v${version}";
- hash = "sha256-WQIBNqUqvVA0UhSoPdf179X+GYKp4LhPvYeEAet6TnY=";
- };
-
- projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj";
- nugetDeps = ./deps.nix;
-
- dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_6_0 sdk_8_0 ];
- dotnet-runtime = sdk_8_0;
-
- dotnetInstallFlags = [ "--framework net6.0" ];
- dotnetBuildFlags = [ "--framework net6.0" "--no-self-contained" ];
- dotnetFlags = [
- # These flags are set by the cake build.
- "-property:PackageVersion=${version}"
- "-property:AssemblyVersion=${version}.0"
- "-property:FileVersion=${version}.0"
- "-property:InformationalVersion=${version}"
- "-property:RuntimeFrameworkVersion=${runtime_6_0.version}"
- "-property:RollForward=LatestMajor"
- ];
-
- postPatch = ''
- # Relax the version requirement
- rm global.json
-
- # Patch the project files so we can compile them properly
- for project in src/OmniSharp.Http.Driver/OmniSharp.Http.Driver.csproj src/OmniSharp.LanguageServerProtocol/OmniSharp.LanguageServerProtocol.csproj src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj; do
- substituteInPlace $project \
- --replace 'win7-x64;win7-x86;win10-arm64' 'linux-x64;linux-arm64;osx-x64;osx-arm64'
- done
- '';
-
- useDotnetFromEnv = true;
- executables = [ "OmniSharp" ];
-
- passthru.tests = let
- with-sdk = sdk: runCommand "with-${if sdk ? version then sdk.version else "no"}-sdk"
- { nativeBuildInputs = [ finalPackage sdk expect ]; meta.timeout = 60; } ''
- HOME=$TMPDIR
- expect <<"EOF"
- spawn OmniSharp
- expect_before timeout {
- send_error "timeout!\n"
- exit 1
- }
- expect ".NET Core SDK ${if sdk ? version then sdk.version else sdk_8_0.version}"
- expect "{\"Event\":\"started\","
- send \x03
- expect eof
- catch wait result
- exit [lindex $result 3]
- EOF
- touch $out
- '';
- in {
- # Make sure we can run OmniSharp with any supported SDK version, as well as without
- with-net6-sdk = with-sdk dotnetCorePackages.sdk_6_0;
- with-net7-sdk = with-sdk dotnetCorePackages.sdk_7_0;
- with-net8-sdk = with-sdk dotnetCorePackages.sdk_8_0;
- no-sdk = with-sdk null;
- };
-
- meta = {
- description = "OmniSharp based on roslyn workspaces";
- homepage = "https://github.com/OmniSharp/omnisharp-roslyn";
- sourceProvenance = with lib.sourceTypes; [
- fromSource
- binaryNativeCode # dependencies
- ];
- license = lib.licenses.mit;
- maintainers = with lib.maintainers; [ tesq0 ericdallo corngood mdarocha ];
- mainProgram = "OmniSharp";
- };
-}; in finalPackage
diff --git a/pkgs/development/tools/pnpm/fetch-deps/default.nix b/pkgs/development/tools/pnpm/fetch-deps/default.nix
index ae2c1e1193cb..971f1656ba92 100644
--- a/pkgs/development/tools/pnpm/fetch-deps/default.nix
+++ b/pkgs/development/tools/pnpm/fetch-deps/default.nix
@@ -56,7 +56,7 @@
yq
];
- impureEnvVars = lib.fetchers.proxyImpureEnvVars;
+ impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "NIX_NPM_REGISTRY" ];
installPhase = ''
runHook preInstall
@@ -82,6 +82,7 @@
--ignore-scripts \
${lib.escapeShellArgs filterFlags} \
${lib.escapeShellArgs pnpmInstallFlags} \
+ --registry="$NIX_NPM_REGISTRY" \
--frozen-lockfile
runHook postInstall
diff --git a/pkgs/development/tools/refurb/default.nix b/pkgs/development/tools/refurb/default.nix
index 83c0e04b1829..275039b601a3 100644
--- a/pkgs/development/tools/refurb/default.nix
+++ b/pkgs/development/tools/refurb/default.nix
@@ -44,6 +44,7 @@ python3Packages.buildPythonApplication rec {
disabledTests = [
"test_checks" # broken because new mypy release added new checks
+ "test_mypy_consistence" # broken by new mypy release
];
pythonImportsCheck = [
diff --git a/pkgs/development/tools/reindeer/default.nix b/pkgs/development/tools/reindeer/default.nix
index d60a81ea85fb..8f552c7834e7 100644
--- a/pkgs/development/tools/reindeer/default.nix
+++ b/pkgs/development/tools/reindeer/default.nix
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "reindeer";
- version = "2024.09.30.00";
+ version = "2024.10.28.00";
src = fetchFromGitHub {
owner = "facebookincubator";
repo = "reindeer";
rev = "refs/tags/v${version}";
- hash = "sha256-MGOT9fG5scZzHZ1mgqBE3GfhOnTRyPjD2kibbCteUjc=";
+ hash = "sha256-1wbw92dZT5SVXgfWMgXd3asHhilVzH4lvqW60hTznVc=";
};
- cargoHash = "sha256-es2jdfVSufXdUxHbQ4MYPPmsnnxT7DTcoCi10YhW/7I=";
+ cargoHash = "sha256-OjA0OKotAdRLGRkl8n3Gn2+Z8JVcGjQYHtOszWnnFdM=";
nativeBuildInputs = [ pkg-config ];
buildInputs =
diff --git a/pkgs/development/tools/relic/default.nix b/pkgs/development/tools/relic/default.nix
index 3a66444f345c..a191bc3dd7fc 100644
--- a/pkgs/development/tools/relic/default.nix
+++ b/pkgs/development/tools/relic/default.nix
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "relic";
- version = "8.0.1";
+ version = "8.1.0";
src = fetchFromGitHub {
owner = "sassoftware";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-w7KU3XntkKep0mcuOUBSG4fJW14yCamioeRH5YrULSo=";
+ sha256 = "sha256-jBE23kGrU/q53ZTVoQ9xmeL+rVuSneObbCRqEa/zvpI=";
};
- vendorHash = "sha256-/P4W+smY01feV1HP5Tsx0PsoOyp//ik7RVWuEaiSepY=";
+ vendorHash = "sha256-x0EqKotZJny+7FtRvdXWUkPpG0jntFGe/IpNzKVL2pI=";
ldflags = [
"-s"
diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix
index cbdd2a90b591..22152eed30d7 100644
--- a/pkgs/development/tools/rust/cargo-dist/default.nix
+++ b/pkgs/development/tools/rust/cargo-dist/default.nix
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-dist";
- version = "0.22.1";
+ version = "0.23.0";
src = fetchFromGitHub {
owner = "axodotdev";
repo = "cargo-dist";
rev = "v${version}";
- hash = "sha256-Pq7gVZWvtWhS7HJPwKPDq3TJqwurG6fXisM5FsSMZ9k=";
+ hash = "sha256-R6uTuU+U9fAUx7JP2QD+mTaoSipuaOlqPiiPdXqgfhw=";
};
- cargoHash = "sha256-0j3u4oQ8JxJP+lBufDiSMyvFrW70X1snpHstjaM9tDg=";
+ cargoHash = "sha256-Hx3xo4PVObtSk68pUIqCbploKN7AxbRD36uOl/QaVkM=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix
index f85d1459c8ae..923867851b5d 100644
--- a/pkgs/development/tools/rust/cargo-hack/default.nix
+++ b/pkgs/development/tools/rust/cargo-hack/default.nix
@@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-hack";
- version = "0.6.31";
+ version = "0.6.32";
src = fetchCrate {
inherit pname version;
- hash = "sha256-PMqGDwiQYTtPna4buO6pxUjF+RXT9phjPUNcpQQSn6Q=";
+ hash = "sha256-XjubvjK+FySm0nqlzFsRhDQOI9M0enonwwPhZ/KFFlk=";
};
- cargoHash = "sha256-/bkGWQZAHkMtH6Y9ntFJEKV6gmUZEAbYf5A5xoUOMM8=";
+ cargoHash = "sha256-sWXeGohH9iLMkmBgNjSfg25eDzZHSzWrOGgccuWPBLM=";
# some necessary files are absent in the crate version
doCheck = false;
diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix
index 2db732560df1..ec0f9331df7b 100644
--- a/pkgs/development/tools/rust/cargo-msrv/default.nix
+++ b/pkgs/development/tools/rust/cargo-msrv/default.nix
@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-msrv";
- version = "0.15.1";
+ version = "0.16.2";
src = fetchFromGitHub {
owner = "foresterre";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-rmWPkxxrpVamYHII0xkZq62ubL3/jrcqXUvFH9VuNtg=";
+ sha256 = "sha256-pgSwyq5KK9PCsmMnquufaw2oW7VSm93xRmozi/uqzNc=";
};
- cargoHash = "sha256-/Bspy94uIP/e4uJY8qo+UPK1tnPjglxiMWeYWx2qoHk=";
+ cargoHash = "sha256-4eGoNKv76+3QVRUbTPiqTiLbQoOX6mVouJ3puxN6pMY=";
passthru = {
updateScript = gitUpdater {
diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix
index c14591c65033..a702e2ed84ff 100644
--- a/pkgs/development/tools/rust/cargo-nextest/default.nix
+++ b/pkgs/development/tools/rust/cargo-nextest/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-nextest";
- version = "0.9.79";
+ version = "0.9.81";
src = fetchFromGitHub {
owner = "nextest-rs";
repo = "nextest";
rev = "cargo-nextest-${version}";
- hash = "sha256-bP7tOhmfcfAtgL5d/G/B+ZgWeE8Q7f0A09XundTrU3g=";
+ hash = "sha256-Onvi/q173af1W3wzrlrU909mfQ6bCC4csp2B4UqDsnM=";
};
- cargoHash = "sha256-dprzi/VRzJBBkZ3xNSYLNAnwdyY+m8wVZbyv41p6v+I=";
+ cargoHash = "sha256-sfjpTj+XSnxweZMlASe24qGAJZ4gazs0O7JENiu/U+g=";
cargoBuildFlags = [ "-p" "cargo-nextest" ];
cargoTestFlags = [ "-p" "cargo-nextest" ];
diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix
index b85112f75538..92127031c8a5 100644
--- a/pkgs/development/tools/rust/cargo-tally/default.nix
+++ b/pkgs/development/tools/rust/cargo-tally/default.nix
@@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-tally";
- version = "1.0.48";
+ version = "1.0.50";
src = fetchCrate {
inherit pname version;
- hash = "sha256-BrWJKM7Vkvjlkn3PCBe45epQc2SkjKVlttQF0/AHSls=";
+ hash = "sha256-kU2SmD51enAyRzzpPJunMKloKS1m7zwEqk2kMX94s7U=";
};
- cargoHash = "sha256-Dkz3QJchUAn4/kQsmQcSfxVrRdiCA2qJSOTszfvE4No=";
+ cargoHash = "sha256-tWMiAb50znyZS77Qcp5dUjPr7qnODjiEFunIyDOde8s=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
DiskArbitration
diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix
index a41e2616ba89..16ef0f6ea57b 100644
--- a/pkgs/development/tools/rust/cargo-udeps/default.nix
+++ b/pkgs/development/tools/rust/cargo-udeps/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-udeps";
- version = "0.1.50";
+ version = "0.1.52";
src = fetchFromGitHub {
owner = "est31";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-SU9SX+Z03CnJAuR1RCdSuU5Q+lxqAbqJY4SA83Ezj8M=";
+ sha256 = "sha256-ArFQaQQU6lOT5wS9vxC+hCYpDWaq7D1DbQhjGzPQEjo=";
};
- cargoHash = "sha256-HWJt9WaSKVJDcUEOgi0Zai3k44KyQqs+ckTAZfZyibA=";
+ cargoHash = "sha256-fRTOhZVehGBwQcJQM/GWmLgfaDK7aJFYz772MPYhkn4=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix
index d2ef93622786..a481d649e576 100644
--- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix
+++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-zigbuild";
- version = "0.19.3";
+ version = "0.19.4";
src = fetchFromGitHub {
owner = "messense";
repo = pname;
rev = "v${version}";
- hash = "sha256-fVsYQjv+DjGCWv/dAk8S8GcEtDIdaxb1yXAqCpTm0sQ=";
+ hash = "sha256-b1TzMqX+mt14rhOLQQHnHYN69peEfXGpyM4rR6EcxbU=";
};
- cargoHash = "sha256-R5jv8hFHdhS6MoU5oHleN5B7k2RPX7GhJMwym8kYAYY=";
+ cargoHash = "sha256-NWP8jaQz4KzsZFFR9WAvdlecUI3ogPNN4pcyCUBSq6E=";
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/sd-local/default.nix b/pkgs/development/tools/sd-local/default.nix
index 29c1c2de4575..5ecf6c10a4ff 100644
--- a/pkgs/development/tools/sd-local/default.nix
+++ b/pkgs/development/tools/sd-local/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "sd-local";
- version = "1.0.54";
+ version = "1.0.55";
src = fetchFromGitHub {
owner = "screwdriver-cd";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-2R/TVKCj3abUtrzzMW907GCC1H+lxTmg4J1kHHztE8I=";
+ sha256 = "sha256-b8gv2iPk6LGTfHk67NXSlA637nHY2UjX25uLaIA6E/g=";
};
vendorHash = "sha256-rAFfyMlnhDrb+f04S9+hNygXPaoG9mheQMxaJtXxBVw=";
diff --git a/pkgs/development/tools/snazy/default.nix b/pkgs/development/tools/snazy/default.nix
index a5fee4c38c24..0eb2b588f25d 100644
--- a/pkgs/development/tools/snazy/default.nix
+++ b/pkgs/development/tools/snazy/default.nix
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "snazy";
- version = "0.53.0";
+ version = "0.54.0";
src = fetchFromGitHub {
owner = "chmouel";
repo = pname;
rev = version;
- hash = "sha256-iRoNmqZadwUxowcC/emqdGhOWMl5c1OJr/VVyxYg2h0=";
+ hash = "sha256-1+UbUwvv5HWiQ+u9gPtJ3JwP6cMi4IZOCSMedXzWEoQ=";
};
- cargoHash = "sha256-e39lmGEPRU/vATcJKB89+B/STi1viP6r43X4Y2u/fe4=";
+ cargoHash = "sha256-NmnKWVyD+NrP7ReERQB1/K8hyrSFj6qgjQjYwxZc+OY=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix
index 5f8d0173268b..5366355042f6 100644
--- a/pkgs/development/tools/supabase-cli/default.nix
+++ b/pkgs/development/tools/supabase-cli/default.nix
@@ -9,16 +9,16 @@
buildGoModule rec {
pname = "supabase-cli";
- version = "1.202.3";
+ version = "1.210.1";
src = fetchFromGitHub {
owner = "supabase";
repo = "cli";
rev = "v${version}";
- hash = "sha256-ikwOG2hbip44fStcIXVuZ4Y2hrt9of2jKavp35OJs1I=";
+ hash = "sha256-QQfuoM+CQIvQarEkfKlca8RBZkreesyjrrfSxrpUlCg=";
};
- vendorHash = "sha256-1g+J7IEkslASyLlfk0zxaFVpNtYDmfZPjkHcAiUzQDM=";
+ vendorHash = "sha256-akNozQxElu+/BA5tDXRUPlMrQ2DBm2i713ZrQbwC4I0=";
ldflags = [
"-s"
diff --git a/pkgs/development/tools/tailwindcss/default.nix b/pkgs/development/tools/tailwindcss/default.nix
index d06878f0fa31..14e859c9c510 100644
--- a/pkgs/development/tools/tailwindcss/default.nix
+++ b/pkgs/development/tools/tailwindcss/default.nix
@@ -18,16 +18,16 @@ let
}.${system} or throwSystem;
hash = {
- aarch64-darwin = "sha256-MncDpGRggZBuEdEW/06OQwdkZsPSaSgrvmElVbn+DFg=";
- aarch64-linux = "sha256-2Hiv11tqeSlFx/I0VD8MOJt+AmAB5yUFqny3bT4eR+w=";
- armv7l-linux = "sha256-msguyvTGQV7BC1eIMAGyIIaZk1qVz/pB8G8iQsKJAEA=";
- x86_64-darwin = "sha256-PEQjSU2CBLN0Vct3sbhe9cbEJBP1jhUWpL91KFMcBn0=";
- x86_64-linux = "sha256-yRzMhkL3nX21U46NaGpNwY4AqTGA9TdyCKmpPH77m2o=";
+ aarch64-darwin = "sha256-y1//nTmNDU8hw3wumVeK2kN2b7xoB7X5Kdg16/0HUms=";
+ aarch64-linux = "sha256-o1jubyQBq/z83CPzTII6ZclZUHVXVahsu024GXFrxX8=";
+ armv7l-linux = "sha256-+hb5ahgDCLSoR5o3YovdDp6igbXkHhxu0Lu1iY8Xros=";
+ x86_64-darwin = "sha256-raeEz+Kd3cfzPGTKC79h51vcXpGGDRuZY7luDGZphbs=";
+ x86_64-linux = "sha256-haR0CRyHcK8hXUAkW968Ui6vGpiPP5V1mi7n6lOS71M=";
}.${system} or throwSystem;
in
stdenv.mkDerivation rec {
pname = "tailwindcss";
- version = "3.4.13";
+ version = "3.4.14";
src = fetchurl {
url = "https://github.com/tailwindlabs/tailwindcss/releases/download/v${version}/tailwindcss-${plat}";
diff --git a/pkgs/development/tools/tokio-console/default.nix b/pkgs/development/tools/tokio-console/default.nix
index 03775abeeb51..00067f8335d4 100644
--- a/pkgs/development/tools/tokio-console/default.nix
+++ b/pkgs/development/tools/tokio-console/default.nix
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "tokio-console";
- version = "0.1.10";
+ version = "0.1.13";
src = fetchFromGitHub {
owner = "tokio-rs";
repo = "console";
rev = "tokio-console-v${version}";
- hash = "sha256-sjfdxOeaNANYJuJMjZ/tCGc2mWM+98d8yPHAVSl4cF4=";
+ hash = "sha256-KqX+s1oQIRyqAP+0iGrZiT8lB+cGviY1vtHaXy5Q6TA=";
};
- cargoHash = "sha256-86KQpRpYSCQs6SUeG0HV26b58x/QUyovoL+5fg8JCOI=";
+ cargoHash = "sha256-QJdTysoVIbeLsTMt62Q355S8zx8tNCikZAyeRs7cz4o=";
buildAndTestSubdir = "tokio-console";
diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix
index 4a3e61fb9059..a2de21fd7a2b 100644
--- a/pkgs/development/tools/ytt/default.nix
+++ b/pkgs/development/tools/ytt/default.nix
@@ -1,12 +1,18 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
-
+{
+ lib,
+ buildGoModule,
+ fetchFromGitHub,
+ installShellFiles,
+ testers,
+ ytt,
+}:
buildGoModule rec {
pname = "ytt";
version = "0.50.0";
src = fetchFromGitHub {
- owner = "vmware-tanzu";
- repo = "carvel-ytt";
+ owner = "carvel-dev";
+ repo = "ytt";
rev = "v${version}";
sha256 = "sha256-57SCBlA2IoBy0iygqunFPBS/nyLtl7e7GlA3vB+ED/4=";
};
@@ -16,11 +22,11 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
ldflags = [
- "-X github.com/vmware-tanzu/carvel-ytt/pkg/version.Version=${version}"
+ "-s"
+ "-w"
+ "-X carvel.dev/ytt/pkg/version.Version=${version}"
];
- subPackages = [ "cmd/ytt" ];
-
postInstall = ''
installShellCompletion --cmd ytt \
--bash <($out/bin/ytt completion bash) \
@@ -28,11 +34,27 @@ buildGoModule rec {
--zsh <($out/bin/ytt completion zsh)
'';
+ # Once `__structuredArgs` is introduced, integrate checks and
+ # set some regexes `checkFlags = [ "-skip=TestDataValues.*" ]`
+ # etc. So far we dont test because passing '*' chars through the Go builder
+ # is flawed.
+ doCheck = false;
+
+ passthru.tests.version = testers.testVersion {
+ package = ytt;
+ command = "ytt --version";
+ inherit version;
+ };
+
meta = with lib; {
description = "YAML templating tool that allows configuration of complex software via reusable templates with user-provided values";
mainProgram = "ytt";
homepage = "https://get-ytt.io";
license = licenses.asl20;
- maintainers = with maintainers; [ brodes techknowlogick ];
+ maintainers = with maintainers; [
+ brodes
+ techknowlogick
+ gabyx
+ ];
};
}
diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index dc4f10b7454d..6a71b0056bf7 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -5,14 +5,11 @@ let
inherit openssl;
python = python3;
};
-
- gypPatches = callPackage ./gyp-patches.nix { } ++ [
- ];
in
buildNodejs {
inherit enableNpm;
- version = "22.9.0";
- sha256 = "a55aeb368dee93432f610127cf94ce682aac07b93dcbbaadd856df122c9239df";
+ version = "22.10.0";
+ sha256 = "3180710d3130ad9df01466abf010e408d41b374be54301d1480d10eca73558e0";
patches = [
./configure-emulator.patch
./configure-armv6-vfpv2.patch
@@ -21,32 +18,5 @@ buildNodejs {
./node-npm-build-npm-package-logic.patch
./use-correct-env-in-tests.patch
./bin-sh-node-run-v22.patch
-
- # Patches for OpenSSL 3.2
- # Patches not yet released
- (fetchpatch2 {
- url = "https://github.com/nodejs/node/commit/f8b7a171463e775da304bccf4cf165e634525c7e.patch?full_index=1";
- hash = "sha256-imptUwt2oG8pPGKD3V6m5NQXuahis71UpXiJm4C0E6o=";
- })
- (fetchpatch2 {
- url = "https://github.com/nodejs/node/commit/6dfa3e46d3d2f8cfba7da636d48a5c41b0132cd7.patch?full_index=1";
- hash = "sha256-ITtGsvZI6fliirCKvbMH9N2Xoy3001bz+hS3NPoqvzg=";
- })
- (fetchpatch2 {
- url = "https://github.com/nodejs/node/commit/29b9c72b05786061cde58a5ae11cfcb580ab6c28.patch?full_index=1";
- hash = "sha256-xaqtwsrOIyRV5zzccab+nDNG8kUgO6AjrVYJNmjeNP0=";
- })
- (fetchpatch2 {
- url = "https://github.com/nodejs/node/commit/cfe58cfdc488da71e655d3da709292ce6d9ddb58.patch?full_index=1";
- hash = "sha256-9GblpbQcYfoiE5R7fETsdW7v1Mm2Xdr4+xRNgUpLO+8=";
- })
- (fetchpatch2 {
- url = "https://github.com/nodejs/node/commit/2cec716c48cea816dcd5bf4997ae3cdf1fe4cd90.patch?full_index=1";
- hash = "sha256-ExIkAj8yRJEK39OfV6A53HiuZsfQOm82/Tvj0nCaI8A=";
- })
- (fetchpatch2 {
- url = "https://github.com/nodejs/node/commit/0f7bdcc17fbc7098b89f238f4bd8ecad9367887b.patch?full_index=1";
- hash = "sha256-lXx6QyD2anlY9qAwjNMFM2VcHckBshghUF1NaMoaNl4=";
- })
- ] ++ gypPatches;
+ ];
}
diff --git a/pkgs/development/web/nodejs/v23.nix b/pkgs/development/web/nodejs/v23.nix
new file mode 100644
index 000000000000..2039e9385c4f
--- /dev/null
+++ b/pkgs/development/web/nodejs/v23.nix
@@ -0,0 +1,52 @@
+{
+ callPackage,
+ fetchpatch2,
+ openssl,
+ python3,
+ enableNpm ? true,
+}:
+
+let
+ buildNodejs = callPackage ./nodejs.nix {
+ inherit openssl;
+ python = python3;
+ };
+in
+buildNodejs {
+ inherit enableNpm;
+ version = "23.1.0";
+ sha256 = "57cbfd3dd51f9300ea2b8e60a8ed215b1eaa71fbde4c3903a7d31a443a4a4423";
+ patches = [
+ ./configure-emulator.patch
+ ./configure-armv6-vfpv2.patch
+ ./disable-darwin-v8-system-instrumentation-node19.patch
+ ./bypass-darwin-xcrun-node16.patch
+ ./node-npm-build-npm-package-logic.patch
+ ./use-correct-env-in-tests.patch
+ ./bin-sh-node-run-v22.patch
+
+ # Those reverts are due to a mismatch with the libuv version used upstream
+ (fetchpatch2 {
+ url = "https://github.com/nodejs/node/commit/dcbc5fbe65b068a90c3d0970155d3a68774caa38.patch?full_index=1";
+ hash = "sha256-Q7YrooolMjsGflTQEj5ra6hRVGhMP6APaydf1MGH54Q=";
+ revert = true;
+ excludes = [ "doc/*" ];
+ })
+ (fetchpatch2 {
+ url = "https://github.com/nodejs/node/commit/ec867ac7ce4e4913a8415eda48a7af9fc226097d.patch?full_index=1";
+ hash = "sha256-zfnHxC7ZMZAiu0/6PsX7RFasTevHMETv+azhTZnKI64=";
+ revert = true;
+ excludes = [ "doc/*" ];
+ })
+ (fetchpatch2 {
+ url = "https://github.com/nodejs/node/commit/f97865fab436fba24b46dad14435ec4b482243a2.patch?full_index=1";
+ hash = "sha256-o5aPQqUXubtJKMX28jn8LdjZHw37/BqENkYt6RAR3kY=";
+ revert = true;
+ })
+ (fetchpatch2 {
+ url = "https://github.com/nodejs/node/commit/54d55f2337ebe04451da770935ad453accb147f9.patch?full_index=1";
+ hash = "sha256-gmIyiSyNzC3pClL1SM2YicckWM+/2tsbV1xv2S3d5G0=";
+ revert = true;
+ })
+ ];
+}
diff --git a/pkgs/games/eboard/default.nix b/pkgs/games/eboard/default.nix
deleted file mode 100644
index 0250208fd48a..000000000000
--- a/pkgs/games/eboard/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, stdenv, fetchurl, perl, pkg-config, gtk2 }:
-
-stdenv.mkDerivation rec {
- pname = "eboard";
- version = "1.1.1";
-
- src = fetchurl {
- url = "mirror://sourceforge/eboard/eboard-${version}.tar.bz2";
- sha256 = "0vm25j1s2zg1lipwjv9qrcm877ikfmk1yh34i8f5l3bwd63115xd";
- };
-
- patches = [ ./eboard.patch ];
-
- buildInputs = [ gtk2 ];
- nativeBuildInputs = [ perl pkg-config ];
-
- hardeningDisable = [ "format" ];
-
- env.NIX_CFLAGS_COMPILE = "-fpermissive";
-
- meta = {
- homepage = "http://www.bergo.eng.br/eboard/";
- description = "Chess interface for Unix-like systems";
- platforms = lib.platforms.linux;
- };
-}
diff --git a/pkgs/games/eboard/eboard.patch b/pkgs/games/eboard/eboard.patch
deleted file mode 100644
index f80c1b2f78d7..000000000000
--- a/pkgs/games/eboard/eboard.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/cimg.cc 2014-05-25 02:41:58.000000000 -0500
-+++ b/cimg.cc 2014-05-25 02:42:31.000000000 -0500
-@@ -94,11 +94,11 @@
- ct == PNG_COLOR_TYPE_GRAY_ALPHA)
- png_set_gray_to_rgb(pngp);
-
-- alloc(pngp->width,pngp->height);
-+ alloc(png_get_image_width(pngp, infp),png_get_image_height(pngp, infp));
- if (!ok) { fclose(f); return; }
- ok = 0;
-
-- for(i=0;iheight;i++) {
-+ for(i=0;i $out/nix-support/depends
+ '';
}
diff --git a/pkgs/kde/third-party/karousel/default.nix b/pkgs/kde/third-party/karousel/default.nix
index ebaf37cfa3a6..d197dbcf5a60 100644
--- a/pkgs/kde/third-party/karousel/default.nix
+++ b/pkgs/kde/third-party/karousel/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "karousel";
- version = "0.9.4";
+ version = "0.10";
src = fetchFromGitHub {
owner = "peterfajdiga";
repo = "karousel";
rev = "v${finalAttrs.version}";
- hash = "sha256-L6N1TCvc9AoTTJrAnO68lbSZq8M668BHAU7ynNzoTn8=";
+ hash = "sha256-lI3VaCd4eYhWbnYLEIeFiB88SWjd/DF8CUGFmxEXDXo=";
};
postPatch = ''
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 07542bfa633a..bbfb3ec28ca7 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -138,8 +138,11 @@ stdenv.mkDerivation rec {
passthru.tests = {
inherit (nixosTests)
+ cups-pdf
printing-service
printing-socket
+ printing-service-notcp
+ printing-socket-notcp
;
};
diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix
index 4e213a0b4c21..75dd729f86db 100644
--- a/pkgs/misc/drivers/epson-escpr2/default.nix
+++ b/pkgs/misc/drivers/epson-escpr2/default.nix
@@ -10,14 +10,14 @@
stdenv.mkDerivation rec {
pname = "epson-inkjet-printer-escpr2";
- version = "1.2.18";
+ version = "1.2.20";
src = fetchurl {
# To find the most recent version go to
# https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr2.php
# and retreive the download link for source package for x86 CPU
- url = "https://download3.ebz.epson.net/dsc/f/03/00/16/25/39/fcf17405f25e851f3ee0e5ed3ce97d09f22ecb41/epson-inkjet-printer-escpr2-1.2.18-1.src.rpm";
- sha256 = "sha256-cdCcZzi31jPGmMnlKtPCFVla0YWfrCTbXsXHSeB0Vk4=";
+ url = "https://download3.ebz.epson.net/dsc/f/03/00/16/35/74/81cbf34af8c0fa4c59b4c1f4600173dfda822ee4/epson-inkjet-printer-escpr2-1.2.20-1.src.rpm";
+ sha256 = "sha256-HBKAcHVOV+xO6IpFS1EyYyn4Ri4e5btBp/e50f3RoTA=";
};
unpackPhase = ''
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index fa3c2aad09fd..cba838569ffa 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -89,7 +89,6 @@ python311Packages.buildPythonApplication {
] ++ lib.optionals withQt5 [
pyqt5
pyqt5-sip
- enum-compat
];
makeWrapperArgs = [ "--prefix" "PATH" ":" "${nettools}/bin" ];
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 1983157df1f6..24d37b78c5fc 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -17,6 +17,7 @@
, swig
, which
, python3
+, perl
, armTrustedFirmwareAllwinner
, armTrustedFirmwareAllwinnerH6
, armTrustedFirmwareAllwinnerH616
@@ -88,6 +89,7 @@ let
]))
swig
which # for scripts/dtc-version.sh
+ perl # for oid build (secureboot)
] ++ lib.optionals (!crossTools) toolsDeps;
depsBuildBuild = [ buildPackages.stdenv.cc ];
buildInputs = lib.optionals crossTools toolsDeps;
diff --git a/pkgs/os-specific/darwin/karabiner-elements/default.nix b/pkgs/os-specific/darwin/karabiner-elements/default.nix
index 5239bc73b842..f7c02f9bf9fa 100644
--- a/pkgs/os-specific/darwin/karabiner-elements/default.nix
+++ b/pkgs/os-specific/darwin/karabiner-elements/default.nix
@@ -41,9 +41,10 @@ stdenv.mkDerivation (finalAttrs: {
sourceRoot = ".";
postPatch = ''
- for f in *.pkg/Library/Launch{Agents,Daemons}/*.plist; do
- substituteInPlace $f \
- --replace "/Library/" "$out/Library/"
+ shopt -s globstar
+ for f in *.pkg/Library/**/Launch{Agents,Daemons}/*.plist; do
+ substituteInPlace "$f" \
+ --replace-fail "/Library/" "$out/Library/"
done
'';
diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index 1aa1a5693655..86a2255d657a 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -83,9 +83,12 @@ in lib.makeExtensible (self: {
xcode_14 = requireXcode "14" "sha256-E+wjPgQx/lbYAsauksdmGsygL5VPBA8R9pHB93eA7T0=";
xcode_14_1 = requireXcode "14.1" "sha256-QJGAUVIhuDYyzDNttBPv5lIGOfvkYqdOFSUAr5tlkfs=";
xcode_15 = requireXcode "15" "sha256-ffqISt2Ayccln5BArKIjSdzbEgoSoNwq8TPLGysAE0c=";
+ xcode_15_0_1 = requireXcode "15.0.1" "sha256-ZJFCA2HUNmw8NxW3wyIyIsMr8k6z50BHqu9IE2VjuOg=";
xcode_15_1 = requireXcode "15.1" "sha256-0djqoSamU87rCpjo50Un3cFg9wKf+pSczRko6uumGM0=";
xcode_15_2 = requireXcode "15.2" "sha256-9B/4Tdyb3QGAzm579QGn5Iq/hA2hscD8OcoSJ5BFFXs=";
xcode_15_3 = requireXcode "15.3" "sha256-FyVA8EEPCI12Z4sJ4RQRZlMMpFmi7S8VYLcyvad3swM=";
xcode_15_4 = requireXcode "15.4" "sha256-yeo+sf6bBIJy9/1sQiMuPEMPniwGXMB6/FXXL0UrI5U=";
+ xcode_16 = requireXcode "16" "sha256-i/MMcEi5wCpe5+nGo6gUTsFFCoorORydAn7D/GClEdo=";
+ xcode_16_1 = requireXcode "16.1" "sha256-yYg6NRRnYM/5X3hhVMfcXcdoiOV36fIongJNQ5nviD8=";
xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "12.3")}";
})
diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix
index cae7901386d1..0e2f6a0639fe 100644
--- a/pkgs/os-specific/linux/cifs-utils/default.nix
+++ b/pkgs/os-specific/linux/cifs-utils/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "cifs-utils";
- version = "7.0";
+ version = "7.1";
src = fetchurl {
url = "mirror://samba/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2";
- sha256 = "sha256-De+quFvT6kb/xFq0H7DQrVTQWuLPqn5QPehtTxK8gWE=";
+ sha256 = "sha256-ohEj92pKajbJZTGJukkY6988/NP5CScwpH/zRQtbWyo=";
};
nativeBuildInputs = [ autoreconfHook docutils pkg-config ];
diff --git a/pkgs/os-specific/linux/corefreq/default.nix b/pkgs/os-specific/linux/corefreq/default.nix
new file mode 100644
index 000000000000..59da0e077069
--- /dev/null
+++ b/pkgs/os-specific/linux/corefreq/default.nix
@@ -0,0 +1,47 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ kernel,
+ # See the official readme for a list of optional flags:
+ # https://github.com/cyring/CoreFreq/blob/master/README.md
+ extraFlags ? [ ],
+}:
+
+stdenv.mkDerivation rec {
+ pname = "corefreq";
+ version = "1.98.4";
+
+ src = fetchFromGitHub {
+ owner = "cyring";
+ repo = "CoreFreq";
+ rev = version;
+ hash = "sha256-ljo8EDoJmcdfVvC8s+Xbf5TsYruvSOU1OSYBPwQst1c=";
+ };
+
+ nativeBuildInputs = kernel.moduleBuildDependencies;
+
+ env.NIX_CFLAGS_COMPILE = "-I${src}/${stdenv.hostPlatform.qemuArch}";
+ makeFlags = [
+ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+ "INSTALL_MOD_PATH=$(out)"
+ ] ++ extraFlags;
+
+ preInstall = ''
+ mkdir -p $out/bin
+ '';
+
+ installFlags = [ "PREFIX=$(out)" ];
+
+ meta = {
+ description = "CPU monitoring and tuning software designed for 64-bit processors";
+ homepage = "https://github.com/cyring/CoreFreq";
+ license = lib.licenses.gpl2Only;
+ maintainers = with lib.maintainers; [ mrene ];
+ mainProgram = "corefreq-cli";
+ platforms = [
+ "x86_64-linux"
+ "aarch64-linux"
+ ];
+ };
+}
diff --git a/pkgs/os-specific/linux/cpuid/default.nix b/pkgs/os-specific/linux/cpuid/default.nix
index d74d25398f64..e656212991f9 100644
--- a/pkgs/os-specific/linux/cpuid/default.nix
+++ b/pkgs/os-specific/linux/cpuid/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "cpuid";
- version = "20240324";
+ version = "20241023";
src = fetchurl {
url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz";
- sha256 = "sha256-3fvFudgBUbsEl16d7BMFEDQZeY0i7/LiRJCD3AhiGEw=";
+ sha256 = "sha256-/HdDWo1dKzVRcTMB6M24PmKjz+3IQTKw7JsbteUkT9w=";
};
# For pod2man during the build process.
diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix
index 784024f8754d..9414f4fb33fe 100644
--- a/pkgs/os-specific/linux/dbus-broker/default.nix
+++ b/pkgs/os-specific/linux/dbus-broker/default.nix
@@ -11,6 +11,10 @@
}:
let
+ meta = {
+ maintainers = with lib.maintainers; [ peterhoeg ];
+ platforms = lib.platforms.linux;
+ };
dep = { pname, version, hash, rev ? "v${version}", buildInputs ? [ ] }:
stdenv.mkDerivation {
@@ -22,6 +26,14 @@ let
};
nativeBuildInputs = [ meson ninja pkg-config ];
inherit buildInputs;
+ meta = meta // {
+ description = "The C-Util Project is a collection of utility libraries for the C11 language.";
+ homepage = "https://c-util.github.io/";
+ license = [
+ lib.licenses.asl20
+ lib.licenses.lgpl21Plus
+ ];
+ };
};
# These libraries are not used outside of dbus-broker.
@@ -89,11 +101,9 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = true;
- meta = with lib; {
+ meta = meta // {
description = "Linux D-Bus Message Broker";
homepage = "https://github.com/bus1/dbus-broker/wiki";
- license = licenses.asl20;
- maintainers = with maintainers; [ peterhoeg ];
- platforms = platforms.linux;
+ license = lib.licenses.asl20;
};
})
diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix
index 8eed47235f06..312d008cf5b6 100644
--- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix
+++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "intel-compute-runtime";
- version = "24.35.30872.22";
+ version = "24.39.31294.12";
src = fetchFromGitHub {
owner = "intel";
repo = "compute-runtime";
rev = version;
- hash = "sha256-OI1pyH6g4U6FI2zE63oU9y8e39VgZUO0tSIOsOOon88=";
+ hash = "sha256-7GNtAo20DgxAxYSPt6Nh92nuuaS9tzsQGH+sLnsvBKU=";
};
nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index 1be7debb895c..b87fe51434f3 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/pkgs/os-specific/linux/iputils/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "iputils";
- version = "20240117";
+ version = "20240905";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- hash = "sha256-sERY8ZKuXiY85cXdNWOm4byiNU7mOVIeA55dgQJHdoE=";
+ hash = "sha256-2CjzIOe1hrW3He9DN+w+Wi2zaaMBkVEdA7dezTpkx8I=";
};
outputs = [ "out" "apparmor" ];
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 9ba531988229..54a9753b5fa1 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -644,10 +644,7 @@ let
NFS_V4_1 = yes; # NFSv4.1 client support
NFS_V4_2 = yes;
NFS_V4_SECURITY_LABEL = yes;
-
- # Fails with
- # `fs/nfs/localio.o: relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol `nfs_to' which may bind externally can not be used when making a shared object; recompile with -fPIC`
- NFS_LOCALIO = lib.mkIf (!stdenv.hostPlatform.isAarch64) (whenAtLeast "6.12" yes);
+ NFS_LOCALIO = whenAtLeast "6.12" yes;
CIFS_XATTR = yes;
CIFS_POSIX = option yes;
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 49c9594f8f7f..046fb3fe6120 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -71,7 +71,7 @@ lib.makeOverridable ({ # The kernel source tarball.
, autoModules ? stdenv.hostPlatform.linux-kernel.autoModules
, preferBuiltin ? stdenv.hostPlatform.linux-kernel.preferBuiltin or false
, kernelArch ? stdenv.hostPlatform.linuxArch
-, kernelTests ? []
+, kernelTests ? {}
, stdenv ? args'.stdenv
, buildPackages ? args'.buildPackages
@@ -281,12 +281,12 @@ kernel.overrideAttrs (finalAttrs: previousAttrs: {
modDirVersion = throw (explain "modDirVersion");
}))).version
emptyFile;
- in [
- (nixosTests.kernel-generic.passthru.testsForKernel overridableKernel)
- versionDoesNotDependOnPatchesEtc
+ in {
+ inherit versionDoesNotDependOnPatchesEtc;
+ testsForKernel = nixosTests.kernel-generic.passthru.testsForKernel overridableKernel;
# Disabled by default, because the infinite recursion is hard to understand. The other test's error is better and produces a shorter trace.
- # versionDoesNotDependOnPatchesEtcNixOS
- ] ++ kernelTests;
+ # inherit versionDoesNotDependOnPatchesEtcNixOS;
+ } // kernelTests;
};
}));
diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
index 1ab5c8346f33..6236c923c8a9 100755
--- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
+++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
@@ -220,9 +220,9 @@ buildHostCmd() {
if [ -z "$buildHost" ]; then
runCmd "$@"
elif [ -n "$remoteNix" ]; then
- runCmd ssh $SSHOPTS "$buildHost" "${c[@]}" env PATH="$remoteNix":'$PATH' "$@"
+ runCmd ssh $SSHOPTS "$buildHost" "${c[@]}" env PATH="$remoteNix":'$PATH' "${@@Q}"
else
- runCmd ssh $SSHOPTS "$buildHost" "${c[@]}" "$@"
+ runCmd ssh $SSHOPTS "$buildHost" "${c[@]}" "${@@Q}"
fi
}
@@ -237,7 +237,7 @@ targetHostCmd() {
if [ -z "$targetHost" ]; then
runCmd "${c[@]}" "$@"
else
- runCmd ssh $SSHOPTS "$targetHost" "${c[@]}" "$@"
+ runCmd ssh $SSHOPTS "$targetHost" "${c[@]}" "${@@Q}"
fi
}
@@ -790,7 +790,6 @@ if [ -z "$rollback" ]; then
pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}")"
fi
copyToTarget "$pathToConfig"
- targetHostSudoCmd nix-env -p "$profile" --set "$pathToConfig"
elif [[ "$action" = test || "$action" = build || "$action" = dry-build || "$action" = dry-activate ]]; then
if [[ -z $buildingAttribute ]]; then
pathToConfig="$(nixBuild $buildFile -A "${attr:+$attr.}config.system.build.toplevel" "${extraBuildFlags[@]}")"
@@ -841,12 +840,56 @@ else # [ -n "$rollback" ]
fi
+hasApplyScript=
+# If we're doing a deployment-like action, we need to know whether the config has
+# an apply script. NixOS versions >= 24.11 should be deployed with toplevel/bin/apply.
+if [[ "$action" = switch || "$action" = boot || "$action" = test || "$action" = dry-activate ]]; then
+ hasApplyScriptOut="$(targetHostCmd sh -c "if test -e $pathToConfig/bin/apply; then echo __has-apply-script__; elif test -e $pathToConfig/bin; then echo __has-no-apply-script__; else echo $pathToConfig is gone; fi
+ ")"
+ # SSH can be messy (e.g. when user has a shell rc file that prints to stdout)
+ # So we only check for the substring
+ case "$hasApplyScriptOut" in
+ *__has-apply-script__*)
+ hasApplyScript=1
+ ;;
+ *__has-no-apply-script__*)
+ hasApplyScript=
+ ;;
+ *)
+ # Unlikely
+ echo "$hasApplyScriptOut" 1>&2
+ log "error: $pathToConfig could not be read"
+ exit 1
+ ;;
+ esac
+fi
+
+# switch|boot|test|dry-activate
+#
# If we're not just building, then make the new configuration the boot
# default and/or activate it now.
-if [[ "$action" = switch || "$action" = boot || "$action" = test || "$action" = dry-activate ]]; then
- # Using systemd-run here to protect against PTY failures/network
- # disconnections during rebuild.
- # See: https://github.com/NixOS/nixpkgs/issues/39118
+if [[ -n "$hasApplyScript" ]] \
+ && [[ "$action" = switch || "$action" = boot || "$action" = test || "$action" = dry-activate ]]; then
+ cmd=("$pathToConfig/bin/apply" "$action" "--profile" "$profile")
+ if [[ -n "$specialisation" ]]; then
+ cmd+=("--specialisation" "$specialisation")
+ fi
+ if [[ -n "$installBootloader" ]]; then
+ cmd+=("--install-bootloader")
+ fi
+ targetHostSudoCmd "${cmd[@]}"
+elif [[ "$action" = switch || "$action" = boot || "$action" = test || "$action" = dry-activate ]]; then
+ # Legacy, without apply script, NixOS < 24.11
+
+ if [[ "$action" = switch || "$action" = boot ]]; then
+ if [[ -z "$rollback" ]]; then
+ : # We've already switched it so that hasApplyScript would check the right $pathToConfig
+ else
+ targetHostSudoCmd nix-env -p "$profile" --set "$pathToConfig"
+ fi
+ fi
+
+ # Legacy logic to support deploying NixOS <24.11; see hasApplyScript
cmd=(
"systemd-run"
"-E" "LOCALE_ARCHIVE" # Will be set to new value early in switch-to-configuration script, but interpreter starts out with old value
diff --git a/pkgs/os-specific/linux/nsncd/default.nix b/pkgs/os-specific/linux/nsncd/default.nix
index f235fa0646cb..43f19cf6f729 100644
--- a/pkgs/os-specific/linux/nsncd/default.nix
+++ b/pkgs/os-specific/linux/nsncd/default.nix
@@ -7,24 +7,35 @@
nixosTests,
}:
+let
+ version = "1.5.1";
+in
+
rustPlatform.buildRustPackage {
pname = "nsncd";
- version = "1.4.1-unstable-2024-10-03";
+ inherit version;
src = fetchFromGitHub {
owner = "twosigma";
repo = "nsncd";
- rev = "cf94e3cfc7dfff69867209c7e68945bac2d3913d";
- hash = "sha256-mjTbyO0b9i4LMv7DWHm0Y4z1pvcapCtFsHLV5cTAxQE=";
+ rev = "v${version}";
+ hash = "sha256-0cFCX5pKvYv6yr4+X5kXGz8clNi/LYndFtHaxSmHN+I=";
};
- cargoHash = "sha256-cgdob/HmE6I59W5UQRItAFXDj7IvazNt99LbJlKQDNo=";
+ cargoHash = "sha256-1n+yCjuJ7kQkd68AOCVz5MWWe1qItaceT1rDlLi1Vqo=";
checkFlags = [
# Relies on the test environment to be able to resolve "localhost"
# on IPv4. That's not the case in the Nix sandbox somehow. Works
# when running cargo test impurely on a (NixOS|Debian) machine.
"--skip=ffi::test_gethostbyname2_r"
+
+ # Relies on /etc/services to be present?
+ "--skip=handlers::test::test_handle_getservbyname_name"
+ "--skip=handlers::test::test_handle_getservbyname_name_proto"
+ "--skip=handlers::test::test_handle_getservbyport_port"
+ "--skip=handlers::test::test_handle_getservbyport_port_proto"
+ "--skip=handlers::test::test_handle_getservbyport_port_proto_aliases"
];
meta = with lib; {
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index a3144cf6bc39..56adc98c928b 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -69,11 +69,11 @@ rec {
# Vulkan developer beta driver
# See here for more information: https://developer.nvidia.com/vulkan-driver
vulkan_beta = generic rec {
- version = "550.40.76";
+ version = "550.40.79";
persistencedVersion = "550.54.14";
settingsVersion = "550.54.14";
- sha256_64bit = "sha256-dgeK0gIOrCvt7Au8sihBVjNwqAIhBjLK/X1q5hG5F8k=";
- openSha256 = "sha256-VU0awnFnFbM7MUcKiHCQ+fHhnrL/kZom4ymRX3qeuKk=";
+ sha256_64bit = "sha256-t/i/MeAkw03evuil0lbQnDiOVQmc8xAZqGo5P+BnUt8=";
+ openSha256 = "sha256-mWoI6j/OqAPrGrw6QwdOT9kFPzg3PSNSZW5JDlRTB+s=";
settingsSha256 = "sha256-m2rNASJp0i0Ez2OuqL+JpgEF0Yd8sYVCyrOoo/ln2a4=";
persistencedSha256 = "sha256-XaPN8jVTjdag9frLPgBtqvO/goB5zxeGzaTU0CdL6C4=";
url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux";
diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix
index c6adc9c55f6e..8f92764f5eaa 100644
--- a/pkgs/os-specific/linux/prl-tools/default.nix
+++ b/pkgs/os-specific/linux/prl-tools/default.nix
@@ -37,13 +37,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "prl-tools";
- version = "20.1.0-55732";
+ version = "20.1.1-55740";
# We download the full distribution to extract prl-tools-lin.iso from
# => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
src = fetchurl {
url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg";
- hash = "sha256-WKYsLcr7m6VAjYZu4BNxaarI7x/a7onlalQpV/Qws0w=";
+ hash = "sha256-3Lo/tAPn3vYvHXV9r8VeMkxKjRPpr8fhADh0vyppC0k=";
};
hardeningDisable = [ "pic" "format" ];
diff --git a/pkgs/os-specific/linux/prl-tools/update.sh b/pkgs/os-specific/linux/prl-tools/update.sh
index fad989127aed..b1000fbd966c 100755
--- a/pkgs/os-specific/linux/prl-tools/update.sh
+++ b/pkgs/os-specific/linux/prl-tools/update.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl jq
+#!nix-shell -i bash -p curl jq libxml2
set -eu -o pipefail
@@ -11,13 +11,15 @@ path="$nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix"
kb_url="https://kb.parallels.com/en/130212"
content="$(curl -s "$kb_url")"
-# Match latest version from Parallels knowledge base
-regex=''
-if [[ $content =~ $regex ]]; then
+# Parse HTML content and retrieve og:description for header metadata
+description=$(echo "$content" | xmllint --recover --html --xpath 'string(//meta[@property="og:description"]/@content)' - 2>/dev/null)
+regex='[^0-9]+([0-9]+\.[0-9]+\.[0-9]+)[^\(]+\(([0-9]+)\)'
+if [[ $description =~ $regex ]]; then
version="${BASH_REMATCH[1]}-${BASH_REMATCH[2]}"
echo "Found latest version: $version"
else
echo "Failed to extract version from $kb_url" >&2
+ echo "Retrived description: $description" >&2
exit 1
fi
diff --git a/pkgs/os-specific/linux/scx/default.nix b/pkgs/os-specific/linux/scx/default.nix
new file mode 100644
index 000000000000..e064e45c50cb
--- /dev/null
+++ b/pkgs/os-specific/linux/scx/default.nix
@@ -0,0 +1,79 @@
+{
+ lib,
+ callPackage,
+ pkg-config,
+ rustPlatform,
+ llvmPackages,
+ elfutils,
+ zlib,
+ fetchFromGitHub,
+}:
+let
+ versionInfo = lib.importJSON ./version.json;
+
+ # Useful function for packaging schedulers, should be used unless the build system is too complex
+ # passes some default values like src, version (all of which can be overridden)
+ mkScxScheduler =
+ packageType:
+ args@{ schedulerName, ... }:
+ (if packageType == "rust" then rustPlatform.buildRustPackage else llvmPackages.stdenv.mkDerivation)
+ (
+ args
+ // {
+ pname = "${schedulerName}";
+ version = args.version or versionInfo.scx.version;
+
+ src = args.src or fetchFromGitHub {
+ owner = "sched-ext";
+ repo = "scx";
+ rev = "refs/tags/v${versionInfo.scx.version}";
+ inherit (versionInfo.scx) hash;
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ llvmPackages.clang
+ ] ++ (args.nativeBuildInputs or [ ]);
+ buildInputs = [
+ elfutils
+ zlib
+ ] ++ (args.buildInputs or [ ]);
+
+ env.LIBCLANG_PATH = args.env.LIBCLANG_PATH or "${llvmPackages.libclang.lib}/lib";
+
+ # Needs to be disabled in BPF builds
+ hardeningDisable = [
+ "zerocallusedregs"
+ ] ++ (args.hardeningDisable or [ ]);
+
+ meta = (args.meta or { }) // {
+ description = args.meta.description or "";
+ longDescription =
+ (args.meta.longDescription or "")
+ + ''
+ \n\nSched-ext schedulers are only available on supported kernels
+ (6.12 and above or any kernel with the scx patchset applied).'';
+
+ homepage = args.meta.homepage or "https://github.com/sched-ext/scx";
+ license = args.meta.license or lib.licenses.gpl2Only;
+ platforms = args.meta.platforms or lib.platforms.linux;
+ maintainers = (args.meta.maintainers or [ ]) ++ (with lib.maintainers; [ johnrtitor ]);
+ };
+ }
+ );
+
+ schedulers = lib.mergeAttrsList [
+ { bpfland = import ./scx_bpfland; }
+ { lavd = import ./scx_lavd; }
+ { layered = import ./scx_layered; }
+ { rlfifo = import ./scx_rlfifo; }
+ { rustland = import ./scx_rustland; }
+ { rusty = import ./scx_rusty; }
+ { csheds = import ./scx_csheds.nix; }
+ { full = import ./scx_full.nix; }
+ ];
+in
+(lib.mapAttrs (name: scheduler: callPackage scheduler { inherit mkScxScheduler; }) schedulers)
+// {
+ inherit mkScxScheduler;
+}
diff --git a/pkgs/os-specific/linux/scx/scx_bpfland/Cargo.lock b/pkgs/os-specific/linux/scx/scx_bpfland/Cargo.lock
new file mode 100644
index 000000000000..8ff68f351b08
--- /dev/null
+++ b/pkgs/os-specific/linux/scx/scx_bpfland/Cargo.lock
@@ -0,0 +1,1530 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "bindgen"
+version = "0.69.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
+dependencies = [
+ "bitflags",
+ "cexpr",
+ "clang-sys",
+ "itertools",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn",
+ "which",
+]
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "serde",
+ "tap",
+ "wyz",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "camino"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo-platform"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.15.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "cc"
+version = "1.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "clang-sys"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim 0.11.1",
+ "terminal_size",
+ "unicase",
+ "unicode-width 0.2.0",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+
+[[package]]
+name = "const_format"
+version = "0.2.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48"
+dependencies = [
+ "const_format_proc_macros",
+]
+
+[[package]]
+name = "const_format_proc_macros"
+version = "0.2.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "crossbeam"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-epoch",
+ "crossbeam-queue",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "ctrlc"
+version = "3.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
+dependencies = [
+ "nix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "endian-type"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+
+[[package]]
+name = "filetime"
+version = "0.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "libredox",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "home"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.15.0",
+]
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "js-sys"
+version = "0.3.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cb94a0ffd3f3ee755c20f7d8752f45cac88605a4dcf808abcff72873296ec7b"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "libbpf-cargo"
+version = "0.24.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79a715b0dbcbf93cb2d674d244341180120e9bff0ddbc81b42d6ccf1a4fdd483"
+dependencies = [
+ "anyhow",
+ "cargo_metadata 0.15.4",
+ "clap",
+ "libbpf-rs",
+ "memmap2",
+ "regex",
+ "semver",
+ "serde",
+ "serde_json",
+ "tempfile",
+]
+
+[[package]]
+name = "libbpf-rs"
+version = "0.24.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bafb274d5b387bfe6e91e95b2481891c0cfcd7ee4bb48e992439becd0eb3e36c"
+dependencies = [
+ "bitflags",
+ "libbpf-sys",
+ "libc",
+ "vsprintf",
+]
+
+[[package]]
+name = "libbpf-sys"
+version = "1.4.5+v1.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cabee52b6f7e73308d6fd4f8e6bbbdcb97670f49f6e581c5897e4d2410b6019"
+dependencies = [
+ "cc",
+ "nix",
+ "pkg-config",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.159"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+
+[[package]]
+name = "libloading"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+dependencies = [
+ "cfg-if",
+ "windows-targets",
+]
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags",
+ "libc",
+ "redox_syscall",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memmap2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "metrics"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261"
+dependencies = [
+ "ahash",
+ "portable-atomic",
+]
+
+[[package]]
+name = "metrics-util"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4259040465c955f9f2f1a4a8a16dc46726169bca0f88e8fb2dbeced487c3e828"
+dependencies = [
+ "aho-corasick",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "hashbrown 0.14.5",
+ "indexmap",
+ "metrics",
+ "num_cpus",
+ "ordered-float",
+ "quanta",
+ "radix_trie",
+ "sketches-ddsketch",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "nibble_vec"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
+dependencies = [
+ "smallvec",
+]
+
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "num_threads"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+
+[[package]]
+name = "ordered-float"
+version = "4.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d501f1a72f71d3c063a6bbc8f7271fa73aa09fe5d6283b6571e2ed176a2537"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+
+[[package]]
+name = "portable-atomic"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "prettyplease"
+version = "0.2.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quanta"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5"
+dependencies = [
+ "crossbeam-utils",
+ "libc",
+ "once_cell",
+ "raw-cpuid",
+ "wasi",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
+[[package]]
+name = "radix_trie"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
+dependencies = [
+ "endian-type",
+ "nibble_vec",
+]
+
+[[package]]
+name = "raw-cpuid"
+version = "11.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "regex"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax 0.8.5",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.5",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustix"
+version = "0.38.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scx_bpfland"
+version = "1.0.5"
+dependencies = [
+ "anyhow",
+ "clap",
+ "crossbeam",
+ "ctrlc",
+ "libbpf-rs",
+ "log",
+ "scx_stats",
+ "scx_stats_derive",
+ "scx_utils",
+ "serde",
+ "simplelog",
+]
+
+[[package]]
+name = "scx_stats"
+version = "1.0.5"
+dependencies = [
+ "anyhow",
+ "crossbeam",
+ "libc",
+ "log",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "syn",
+]
+
+[[package]]
+name = "scx_stats_derive"
+version = "1.0.5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "scx_stats",
+ "serde_json",
+ "syn",
+]
+
+[[package]]
+name = "scx_utils"
+version = "1.0.5"
+dependencies = [
+ "anyhow",
+ "bindgen",
+ "bitvec",
+ "glob",
+ "hex",
+ "lazy_static",
+ "libbpf-cargo",
+ "libbpf-rs",
+ "libc",
+ "log",
+ "metrics",
+ "metrics-util",
+ "paste",
+ "regex",
+ "scx_stats",
+ "serde",
+ "sscanf",
+ "tar",
+ "vergen",
+ "version-compare",
+ "walkdir",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.210"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.210"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.128"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "simplelog"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0"
+dependencies = [
+ "log",
+ "termcolor",
+ "time",
+]
+
+[[package]]
+name = "sketches-ddsketch"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c"
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "sscanf"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a147d3cf7e723671ed11355b5b008c8019195f7fc902e213f5557d931e9f839d"
+dependencies = [
+ "const_format",
+ "lazy_static",
+ "regex",
+ "sscanf_macro",
+]
+
+[[package]]
+name = "sscanf_macro"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af3a37bdf8e90e77cc60f74473edf28d922ae2eacdd595e67724ccd2381774cc"
+dependencies = [
+ "convert_case",
+ "proc-macro2",
+ "quote",
+ "regex-syntax 0.6.29",
+ "strsim 0.10.0",
+ "syn",
+ "unicode-width 0.1.12",
+]
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "syn"
+version = "2.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
+name = "tar"
+version = "0.4.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020"
+dependencies = [
+ "filetime",
+ "libc",
+ "xattr",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "terminal_size"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef"
+dependencies = [
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "time"
+version = "0.3.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+dependencies = [
+ "deranged",
+ "itoa",
+ "libc",
+ "num-conv",
+ "num_threads",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "unicase"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
+
+[[package]]
+name = "unicode-width"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "vergen"
+version = "8.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566"
+dependencies = [
+ "anyhow",
+ "cargo_metadata 0.18.1",
+ "cfg-if",
+ "regex",
+ "rustversion",
+ "time",
+]
+
+[[package]]
+name = "version-compare"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "vsprintf"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aec2f81b75ca063294776b4f7e8da71d1d5ae81c2b1b149c8d89969230265d63"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef073ced962d62984fb38a36e5fdc1a2b23c9e0e1fa0689bb97afa4202ef6887"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4bfab14ef75323f4eb75fa52ee0a3fb59611977fd3240da19b2cf36ff85030e"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7bec9830f60924d9ceb3ef99d55c155be8afa76954edffbb5936ff4509474e7"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c74f6e152a76a2ad448e223b0fc0b6b5747649c3d769cc6bf45737bf97d0ed6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a42f6c679374623f295a8623adfe63d9284091245c3504bde47c17a3ce2777d9"
+
+[[package]]
+name = "web-sys"
+version = "0.3.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44188d185b5bdcae1052d08bcbcf9091a5524038d4572cc4f4f2bb9d5554ddd9"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "which"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
+[[package]]
+name = "xattr"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
+dependencies = [
+ "libc",
+ "linux-raw-sys",
+ "rustix",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/pkgs/os-specific/linux/scx/scx_bpfland/default.nix b/pkgs/os-specific/linux/scx/scx_bpfland/default.nix
new file mode 100644
index 000000000000..96284e55bc40
--- /dev/null
+++ b/pkgs/os-specific/linux/scx/scx_bpfland/default.nix
@@ -0,0 +1,38 @@
+{
+ stdenv,
+ lib,
+ mkScxScheduler,
+}:
+
+mkScxScheduler "rust" {
+ schedulerName = "scx_bpfland";
+
+ cargoRoot = "scheds/rust/scx_bpfland";
+ cargoLock.lockFile = ./Cargo.lock;
+ postPatch = ''
+ rm Cargo.toml Cargo.lock
+ ln -fs ${./Cargo.lock} scheds/rust/scx_bpfland/Cargo.lock
+ '';
+
+ preBuild = ''
+ cd scheds/rust/scx_bpfland
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin
+ cp target/${stdenv.targetPlatform.config}/release/scx_bpfland $out/bin/
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "Sched-ext Rust userspace scheduler";
+ longDescription = ''
+ Vruntime-based Sched-ext scheduler that prioritizes interactive workloads. This
+ scheduler is derived from scx_rustland, but it is fully implemented in BPF. It
+ has a minimal user-space Rust part to process command line options, collect metrics
+ and log out scheduling statistics. The BPF part makes all the scheduling decisions.
+ '';
+ mainProgram = "scx_bpfland";
+ };
+}
diff --git a/pkgs/os-specific/linux/scx/scx_csheds.nix b/pkgs/os-specific/linux/scx/scx_csheds.nix
new file mode 100644
index 000000000000..82d175141357
--- /dev/null
+++ b/pkgs/os-specific/linux/scx/scx_csheds.nix
@@ -0,0 +1,109 @@
+{
+ stdenv,
+ lib,
+ mkScxScheduler,
+ fetchFromGitHub,
+ writeShellScript,
+ bash,
+ meson,
+ ninja,
+ jq,
+ bpftools,
+ elfutils,
+ zlib,
+ libbpf,
+}:
+
+let
+ versionInfo = lib.importJSON ./version.json;
+
+ # scx needs a specific commit of bpftool
+ # can be found in meson.build of scx src
+ # grep 'bpftool_commit =' ./meson.build
+ bpftools_src = fetchFromGitHub {
+ owner = "libbpf";
+ repo = "bpftool";
+ inherit (versionInfo.bpftool) rev hash;
+ fetchSubmodules = true;
+ };
+
+ # scx needs a specific commit of bpftool
+ # this imitates the fetch_bpftool script in src/meson-scripts
+ fetchBpftool = writeShellScript "fetch_bpftool" ''
+ [ "$2" == '${bpftools_src.rev}' ] || exit 1
+ cd "$1"
+ cp --no-preserve=mode,owner -r "${bpftools_src}/" ./bpftool
+ '';
+
+ # Fixes a bug with the meson build script where it specifies
+ # /bin/bash twice in the script
+ misbehaviorBash = writeShellScript "bash" ''
+ shift 1
+ exec ${lib.getExe bash} "$@"
+ '';
+
+ # Won't build with stable libbpf, so use the latest commit
+ libbpf-git = libbpf.overrideAttrs (oldAttrs: {
+ src = fetchFromGitHub {
+ owner = "libbpf";
+ repo = "libbpf";
+ inherit (versionInfo.libbpf) rev hash;
+ fetchSubmodules = true;
+ };
+ });
+
+in
+mkScxScheduler "c" {
+ schedulerName = "scx_csheds";
+
+ postPatch = ''
+ rm meson-scripts/fetch_bpftool
+ patchShebangs ./meson-scripts
+ cp ${fetchBpftool} meson-scripts/fetch_bpftool
+ substituteInPlace meson.build \
+ --replace-fail '[build_bpftool' "['${misbehaviorBash}', build_bpftool"
+ '';
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ jq
+ ] ++ bpftools.buildInputs ++ bpftools.nativeBuildInputs;
+
+ buildInputs = [
+ elfutils
+ zlib
+ libbpf-git
+ ];
+
+ mesonFlags = [
+ (lib.mapAttrsToList lib.mesonEnable {
+ # systemd unit is implemented in the nixos module
+ # upstream systemd files are a hassle to patch
+ "systemd" = false;
+ "openrc" = false;
+ # libbpf is already fetched as FOD
+ "libbpf_a" = false;
+ # not for nix
+ "libalpm" = false;
+ })
+ (lib.mapAttrsToList lib.mesonBool {
+ # needed libs are already fetched as FOD
+ "offline" = true;
+ # rust based schedulers are built seperately
+ "enable_rust" = false;
+ })
+ ];
+
+ hardeningDisable = [
+ "stackprotector"
+ ];
+
+ meta = {
+ description = "Sched-ext C userspace schedulers";
+ longDescription = ''
+ This includes C based schedulers such as scx_central, scx_flatcg,
+ scx_nest, scx_pair, scx_qmap, scx_simple, scx_userland.
+ '';
+ };
+}
diff --git a/pkgs/os-specific/linux/scx/scx_full.nix b/pkgs/os-specific/linux/scx/scx_full.nix
new file mode 100644
index 000000000000..48254ee4c2c8
--- /dev/null
+++ b/pkgs/os-specific/linux/scx/scx_full.nix
@@ -0,0 +1,28 @@
+{
+ stdenv,
+ lib,
+ scx,
+ mkScxScheduler,
+}:
+scx.csheds.overrideAttrs (oldAttrs: {
+ pname = "scx_full";
+ postInstall =
+ (oldAttrs.postInstall or "")
+ + ''
+ cp ${lib.getExe scx.bpfland} $out/bin/
+ cp ${lib.getExe scx.lavd} $out/bin/
+ cp ${lib.getExe scx.layered} $out/bin/
+ cp ${lib.getExe scx.rlfifo} $out/bin/
+ cp ${lib.getExe scx.rustland} $out/bin/
+ cp ${lib.getExe scx.rusty} $out/bin/
+ '';
+
+ meta = oldAttrs.meta // {
+ description = "Sched-ext C and Rust userspace schedulers";
+ longDescription = ''
+ This includes C based schedulers such as scx_central, scx_flatcg,
+ scx_pair, scx_qmap, scx_simple, scx_userland and Rust based schedulers
+ like scx_rustland, scx_bpfland, scx_lavd, scx_layered, scx_rlfifo.
+ '';
+ };
+})
diff --git a/pkgs/os-specific/linux/scx/scx_lavd/Cargo.lock b/pkgs/os-specific/linux/scx/scx_lavd/Cargo.lock
new file mode 100644
index 000000000000..154449b6d2aa
--- /dev/null
+++ b/pkgs/os-specific/linux/scx/scx_lavd/Cargo.lock
@@ -0,0 +1,1646 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "bindgen"
+version = "0.69.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
+dependencies = [
+ "bitflags 2.6.0",
+ "cexpr",
+ "clang-sys",
+ "itertools 0.12.1",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn",
+ "which",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "serde",
+ "tap",
+ "wyz",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "camino"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo-platform"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.15.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "cc"
+version = "1.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "clang-sys"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim 0.11.1",
+ "terminal_size",
+ "unicase",
+ "unicode-width 0.2.0",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+
+[[package]]
+name = "const_format"
+version = "0.2.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48"
+dependencies = [
+ "const_format_proc_macros",
+]
+
+[[package]]
+name = "const_format_proc_macros"
+version = "0.2.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "crossbeam"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-epoch",
+ "crossbeam-queue",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "ctrlc"
+version = "3.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
+dependencies = [
+ "nix 0.29.0",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "endian-type"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+
+[[package]]
+name = "fb_procfs"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d16e986e12a0b63c17fe7df3569ed524da77d258a900863034571fd08f7553ac"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "nix 0.25.1",
+ "openat",
+ "serde",
+ "thiserror",
+ "threadpool",
+]
+
+[[package]]
+name = "filetime"
+version = "0.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "libredox",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "gpoint"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c00f1d62d57408109a871dd9e12b76645ec4284406d5ec838d277777ef1ef6c"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "home"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.15.0",
+]
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "js-sys"
+version = "0.3.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cb94a0ffd3f3ee755c20f7d8752f45cac88605a4dcf808abcff72873296ec7b"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "libbpf-cargo"
+version = "0.24.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79a715b0dbcbf93cb2d674d244341180120e9bff0ddbc81b42d6ccf1a4fdd483"
+dependencies = [
+ "anyhow",
+ "cargo_metadata 0.15.4",
+ "clap",
+ "libbpf-rs",
+ "memmap2",
+ "regex",
+ "semver",
+ "serde",
+ "serde_json",
+ "tempfile",
+]
+
+[[package]]
+name = "libbpf-rs"
+version = "0.24.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bafb274d5b387bfe6e91e95b2481891c0cfcd7ee4bb48e992439becd0eb3e36c"
+dependencies = [
+ "bitflags 2.6.0",
+ "libbpf-sys",
+ "libc",
+ "vsprintf",
+]
+
+[[package]]
+name = "libbpf-sys"
+version = "1.4.5+v1.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cabee52b6f7e73308d6fd4f8e6bbbdcb97670f49f6e581c5897e4d2410b6019"
+dependencies = [
+ "cc",
+ "nix 0.29.0",
+ "pkg-config",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.159"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+
+[[package]]
+name = "libloading"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+dependencies = [
+ "cfg-if",
+ "windows-targets",
+]
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+ "redox_syscall",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memmap2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "metrics"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261"
+dependencies = [
+ "ahash",
+ "portable-atomic",
+]
+
+[[package]]
+name = "metrics-util"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4259040465c955f9f2f1a4a8a16dc46726169bca0f88e8fb2dbeced487c3e828"
+dependencies = [
+ "aho-corasick",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "hashbrown 0.14.5",
+ "indexmap",
+ "metrics",
+ "num_cpus",
+ "ordered-float 4.3.0",
+ "quanta",
+ "radix_trie",
+ "sketches-ddsketch",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "nibble_vec"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
+dependencies = [
+ "smallvec",
+]
+
+[[package]]
+name = "nix"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
+dependencies = [
+ "autocfg",
+ "bitflags 1.3.2",
+ "cfg-if",
+ "libc",
+ "memoffset",
+ "pin-utils",
+]
+
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "num_threads"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+
+[[package]]
+name = "openat"
+version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95aa7c05907b3ebde2610d602f4ddd992145cc6a84493647c30396f30ba83abe"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "ordered-float"
+version = "3.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "ordered-float"
+version = "4.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d501f1a72f71d3c063a6bbc8f7271fa73aa09fe5d6283b6571e2ed176a2537"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
+[[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.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+
+[[package]]
+name = "plain"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
+
+[[package]]
+name = "portable-atomic"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "prettyplease"
+version = "0.2.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quanta"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5"
+dependencies = [
+ "crossbeam-utils",
+ "libc",
+ "once_cell",
+ "raw-cpuid",
+ "wasi",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
+[[package]]
+name = "radix_trie"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
+dependencies = [
+ "endian-type",
+ "nibble_vec",
+]
+
+[[package]]
+name = "raw-cpuid"
+version = "11.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "regex"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax 0.8.5",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.5",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustix"
+version = "0.38.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+dependencies = [
+ "bitflags 2.6.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scx_lavd"
+version = "1.0.5"
+dependencies = [
+ "anyhow",
+ "bitvec",
+ "clap",
+ "crossbeam",
+ "ctrlc",
+ "fb_procfs",
+ "gpoint",
+ "hex",
+ "itertools 0.13.0",
+ "libbpf-rs",
+ "libc",
+ "log",
+ "ordered-float 3.9.2",
+ "plain",
+ "scx_stats",
+ "scx_stats_derive",
+ "scx_utils",
+ "serde",
+ "simplelog",
+ "static_assertions",
+]
+
+[[package]]
+name = "scx_stats"
+version = "1.0.5"
+dependencies = [
+ "anyhow",
+ "crossbeam",
+ "libc",
+ "log",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "syn",
+]
+
+[[package]]
+name = "scx_stats_derive"
+version = "1.0.5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "scx_stats",
+ "serde_json",
+ "syn",
+]
+
+[[package]]
+name = "scx_utils"
+version = "1.0.5"
+dependencies = [
+ "anyhow",
+ "bindgen",
+ "bitvec",
+ "glob",
+ "hex",
+ "lazy_static",
+ "libbpf-cargo",
+ "libbpf-rs",
+ "libc",
+ "log",
+ "metrics",
+ "metrics-util",
+ "paste",
+ "regex",
+ "scx_stats",
+ "serde",
+ "sscanf",
+ "tar",
+ "vergen",
+ "version-compare",
+ "walkdir",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.210"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.210"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.128"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "simplelog"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0"
+dependencies = [
+ "log",
+ "termcolor",
+ "time",
+]
+
+[[package]]
+name = "sketches-ddsketch"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c"
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "sscanf"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a147d3cf7e723671ed11355b5b008c8019195f7fc902e213f5557d931e9f839d"
+dependencies = [
+ "const_format",
+ "lazy_static",
+ "regex",
+ "sscanf_macro",
+]
+
+[[package]]
+name = "sscanf_macro"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af3a37bdf8e90e77cc60f74473edf28d922ae2eacdd595e67724ccd2381774cc"
+dependencies = [
+ "convert_case",
+ "proc-macro2",
+ "quote",
+ "regex-syntax 0.6.29",
+ "strsim 0.10.0",
+ "syn",
+ "unicode-width 0.1.12",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "syn"
+version = "2.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
+name = "tar"
+version = "0.4.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020"
+dependencies = [
+ "filetime",
+ "libc",
+ "xattr",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "terminal_size"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef"
+dependencies = [
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "threadpool"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
+dependencies = [
+ "num_cpus",
+]
+
+[[package]]
+name = "time"
+version = "0.3.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+dependencies = [
+ "deranged",
+ "itoa",
+ "libc",
+ "num-conv",
+ "num_threads",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "unicase"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
+
+[[package]]
+name = "unicode-width"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "vergen"
+version = "8.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566"
+dependencies = [
+ "anyhow",
+ "cargo_metadata 0.18.1",
+ "cfg-if",
+ "regex",
+ "rustversion",
+ "time",
+]
+
+[[package]]
+name = "version-compare"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "vsprintf"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aec2f81b75ca063294776b4f7e8da71d1d5ae81c2b1b149c8d89969230265d63"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef073ced962d62984fb38a36e5fdc1a2b23c9e0e1fa0689bb97afa4202ef6887"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4bfab14ef75323f4eb75fa52ee0a3fb59611977fd3240da19b2cf36ff85030e"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7bec9830f60924d9ceb3ef99d55c155be8afa76954edffbb5936ff4509474e7"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c74f6e152a76a2ad448e223b0fc0b6b5747649c3d769cc6bf45737bf97d0ed6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a42f6c679374623f295a8623adfe63d9284091245c3504bde47c17a3ce2777d9"
+
+[[package]]
+name = "web-sys"
+version = "0.3.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44188d185b5bdcae1052d08bcbcf9091a5524038d4572cc4f4f2bb9d5554ddd9"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "which"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
+[[package]]
+name = "xattr"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
+dependencies = [
+ "libc",
+ "linux-raw-sys",
+ "rustix",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/pkgs/os-specific/linux/scx/scx_lavd/default.nix b/pkgs/os-specific/linux/scx/scx_lavd/default.nix
new file mode 100644
index 000000000000..68b278dff195
--- /dev/null
+++ b/pkgs/os-specific/linux/scx/scx_lavd/default.nix
@@ -0,0 +1,37 @@
+{
+ stdenv,
+ lib,
+ mkScxScheduler,
+}:
+
+mkScxScheduler "rust" {
+ schedulerName = "scx_lavd";
+
+ cargoRoot = "scheds/rust/scx_lavd";
+ cargoLock.lockFile = ./Cargo.lock;
+ postPatch = ''
+ rm Cargo.toml Cargo.lock
+ ln -fs ${./Cargo.lock} scheds/rust/scx_lavd/Cargo.lock
+ '';
+
+ preBuild = ''
+ cd scheds/rust/scx_lavd
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin
+ cp target/${stdenv.targetPlatform.config}/release/scx_lavd $out/bin/
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "Sched-ext Rust userspace scheduler";
+ longDescription = ''
+ BPF scheduler that implements an LAVD (Latency-criticality Aware Virtual Deadline)
+ scheduling algorithm. typical use case involves highly interactive applications,
+ such as gaming, which requires high throughput and low tail latencies.
+ '';
+ mainProgram = "scx_lavd";
+ };
+}
diff --git a/pkgs/os-specific/linux/scx/scx_layered/Cargo.lock b/pkgs/os-specific/linux/scx/scx_layered/Cargo.lock
new file mode 100644
index 000000000000..81dd90a77f1c
--- /dev/null
+++ b/pkgs/os-specific/linux/scx/scx_layered/Cargo.lock
@@ -0,0 +1,1672 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "bindgen"
+version = "0.69.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
+dependencies = [
+ "bitflags 2.6.0",
+ "cexpr",
+ "clang-sys",
+ "itertools",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn",
+ "which",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "serde",
+ "tap",
+ "wyz",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "camino"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo-platform"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.15.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "cc"
+version = "1.1.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "chrono"
+version = "0.4.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-targets",
+]
+
+[[package]]
+name = "clang-sys"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim 0.11.1",
+ "terminal_size",
+ "unicase",
+ "unicode-width 0.2.0",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+
+[[package]]
+name = "const_format"
+version = "0.2.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48"
+dependencies = [
+ "const_format_proc_macros",
+]
+
+[[package]]
+name = "const_format_proc_macros"
+version = "0.2.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "crossbeam"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-epoch",
+ "crossbeam-queue",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "ctrlc"
+version = "3.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
+dependencies = [
+ "nix 0.29.0",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "endian-type"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+
+[[package]]
+name = "fb_procfs"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d16e986e12a0b63c17fe7df3569ed524da77d258a900863034571fd08f7553ac"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "nix 0.25.1",
+ "openat",
+ "serde",
+ "thiserror",
+ "threadpool",
+]
+
+[[package]]
+name = "filetime"
+version = "0.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "libredox",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "home"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.15.0",
+]
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "js-sys"
+version = "0.3.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "libbpf-cargo"
+version = "0.24.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e728b7b8be47b3650fdce768075691c69c8798022eb1bab6167cce20f82b10c"
+dependencies = [
+ "anyhow",
+ "cargo_metadata 0.15.4",
+ "clap",
+ "libbpf-rs",
+ "memmap2",
+ "regex",
+ "semver",
+ "serde",
+ "serde_json",
+ "tempfile",
+]
+
+[[package]]
+name = "libbpf-rs"
+version = "0.24.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73d2e61404e42ba2d97a9acbc24d046cfae978393e21b428e780adbc997504d0"
+dependencies = [
+ "bitflags 2.6.0",
+ "libbpf-sys",
+ "libc",
+ "vsprintf",
+]
+
+[[package]]
+name = "libbpf-sys"
+version = "1.4.5+v1.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cabee52b6f7e73308d6fd4f8e6bbbdcb97670f49f6e581c5897e4d2410b6019"
+dependencies = [
+ "cc",
+ "nix 0.29.0",
+ "pkg-config",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.161"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
+
+[[package]]
+name = "libloading"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+dependencies = [
+ "cfg-if",
+ "windows-targets",
+]
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+ "redox_syscall",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memmap2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "metrics"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261"
+dependencies = [
+ "ahash",
+ "portable-atomic",
+]
+
+[[package]]
+name = "metrics-util"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4259040465c955f9f2f1a4a8a16dc46726169bca0f88e8fb2dbeced487c3e828"
+dependencies = [
+ "aho-corasick",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "hashbrown 0.14.5",
+ "indexmap",
+ "metrics",
+ "num_cpus",
+ "ordered-float",
+ "quanta",
+ "radix_trie",
+ "sketches-ddsketch",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "nibble_vec"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
+dependencies = [
+ "smallvec",
+]
+
+[[package]]
+name = "nix"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
+dependencies = [
+ "autocfg",
+ "bitflags 1.3.2",
+ "cfg-if",
+ "libc",
+ "memoffset",
+ "pin-utils",
+]
+
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "num_threads"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+
+[[package]]
+name = "openat"
+version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95aa7c05907b3ebde2610d602f4ddd992145cc6a84493647c30396f30ba83abe"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "ordered-float"
+version = "4.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83e7ccb95e240b7c9506a3d544f10d935e142cc90b0a1d56954fb44d89ad6b97"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
+[[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.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+
+[[package]]
+name = "portable-atomic"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "prettyplease"
+version = "0.2.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quanta"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5"
+dependencies = [
+ "crossbeam-utils",
+ "libc",
+ "once_cell",
+ "raw-cpuid",
+ "wasi",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
+[[package]]
+name = "radix_trie"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
+dependencies = [
+ "endian-type",
+ "nibble_vec",
+]
+
+[[package]]
+name = "raw-cpuid"
+version = "11.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "regex"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax 0.8.5",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.5",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustix"
+version = "0.38.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+dependencies = [
+ "bitflags 2.6.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scx_layered"
+version = "1.0.5"
+dependencies = [
+ "anyhow",
+ "bitvec",
+ "chrono",
+ "clap",
+ "crossbeam",
+ "ctrlc",
+ "fastrand",
+ "fb_procfs",
+ "lazy_static",
+ "libbpf-rs",
+ "libc",
+ "log",
+ "scx_stats",
+ "scx_stats_derive",
+ "scx_utils",
+ "serde",
+ "serde_json",
+ "simplelog",
+]
+
+[[package]]
+name = "scx_stats"
+version = "1.0.5"
+dependencies = [
+ "anyhow",
+ "crossbeam",
+ "libc",
+ "log",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "syn",
+]
+
+[[package]]
+name = "scx_stats_derive"
+version = "1.0.5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "scx_stats",
+ "serde_json",
+ "syn",
+]
+
+[[package]]
+name = "scx_utils"
+version = "1.0.5"
+dependencies = [
+ "anyhow",
+ "bindgen",
+ "bitvec",
+ "glob",
+ "hex",
+ "lazy_static",
+ "libbpf-cargo",
+ "libbpf-rs",
+ "libc",
+ "log",
+ "metrics",
+ "metrics-util",
+ "paste",
+ "regex",
+ "scx_stats",
+ "serde",
+ "sscanf",
+ "tar",
+ "vergen",
+ "version-compare",
+ "walkdir",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.210"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.210"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.129"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dbcf9b78a125ee667ae19388837dd12294b858d101fdd393cb9d5501ef09eb2"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "simplelog"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0"
+dependencies = [
+ "log",
+ "termcolor",
+ "time",
+]
+
+[[package]]
+name = "sketches-ddsketch"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c"
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "sscanf"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a147d3cf7e723671ed11355b5b008c8019195f7fc902e213f5557d931e9f839d"
+dependencies = [
+ "const_format",
+ "lazy_static",
+ "regex",
+ "sscanf_macro",
+]
+
+[[package]]
+name = "sscanf_macro"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af3a37bdf8e90e77cc60f74473edf28d922ae2eacdd595e67724ccd2381774cc"
+dependencies = [
+ "convert_case",
+ "proc-macro2",
+ "quote",
+ "regex-syntax 0.6.29",
+ "strsim 0.10.0",
+ "syn",
+ "unicode-width 0.1.12",
+]
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "syn"
+version = "2.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
+name = "tar"
+version = "0.4.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020"
+dependencies = [
+ "filetime",
+ "libc",
+ "xattr",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "terminal_size"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef"
+dependencies = [
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "threadpool"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
+dependencies = [
+ "num_cpus",
+]
+
+[[package]]
+name = "time"
+version = "0.3.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+dependencies = [
+ "deranged",
+ "itoa",
+ "libc",
+ "num-conv",
+ "num_threads",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "unicase"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
+
+[[package]]
+name = "unicode-width"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "vergen"
+version = "8.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566"
+dependencies = [
+ "anyhow",
+ "cargo_metadata 0.18.1",
+ "cfg-if",
+ "regex",
+ "rustversion",
+ "time",
+]
+
+[[package]]
+name = "version-compare"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "vsprintf"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aec2f81b75ca063294776b4f7e8da71d1d5ae81c2b1b149c8d89969230265d63"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
+
+[[package]]
+name = "web-sys"
+version = "0.3.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "which"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
+[[package]]
+name = "xattr"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
+dependencies = [
+ "libc",
+ "linux-raw-sys",
+ "rustix",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/pkgs/os-specific/linux/scx/scx_layered/default.nix b/pkgs/os-specific/linux/scx/scx_layered/default.nix
new file mode 100644
index 000000000000..2c0f6ee14d7e
--- /dev/null
+++ b/pkgs/os-specific/linux/scx/scx_layered/default.nix
@@ -0,0 +1,36 @@
+{
+ stdenv,
+ lib,
+ mkScxScheduler,
+}:
+
+mkScxScheduler "rust" {
+ schedulerName = "scx_layered";
+
+ cargoRoot = "scheds/rust/scx_layered";
+ cargoLock.lockFile = ./Cargo.lock;
+ postPatch = ''
+ rm Cargo.toml Cargo.lock
+ ln -fs ${./Cargo.lock} scheds/rust/scx_layered/Cargo.lock
+ '';
+
+ preBuild = ''
+ cd scheds/rust/scx_layered
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin
+ cp target/${stdenv.targetPlatform.config}/release/scx_layered $out/bin/
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "Sched-ext Rust userspace scheduler";
+ longDescription = ''
+ Highly configurable multi-layer BPF/userspace hybrid scheduler.
+ It is designed to be highly customizable, and can be targeted for specific applications.
+ '';
+ mainProgram = "scx_layered";
+ };
+}
diff --git a/pkgs/os-specific/linux/scx/scx_rlfifo/Cargo.lock b/pkgs/os-specific/linux/scx/scx_rlfifo/Cargo.lock
new file mode 100644
index 000000000000..997b1943b53f
--- /dev/null
+++ b/pkgs/os-specific/linux/scx/scx_rlfifo/Cargo.lock
@@ -0,0 +1,1486 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "bindgen"
+version = "0.69.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
+dependencies = [
+ "bitflags",
+ "cexpr",
+ "clang-sys",
+ "itertools",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn",
+ "which",
+]
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "serde",
+ "tap",
+ "wyz",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "camino"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo-platform"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.15.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "cc"
+version = "1.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "clang-sys"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim 0.11.1",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+
+[[package]]
+name = "const_format"
+version = "0.2.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48"
+dependencies = [
+ "const_format_proc_macros",
+]
+
+[[package]]
+name = "const_format_proc_macros"
+version = "0.2.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "crossbeam"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-epoch",
+ "crossbeam-queue",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "ctrlc"
+version = "3.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
+dependencies = [
+ "nix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "endian-type"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+
+[[package]]
+name = "filetime"
+version = "0.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "libredox",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "home"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.15.0",
+]
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "js-sys"
+version = "0.3.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cb94a0ffd3f3ee755c20f7d8752f45cac88605a4dcf808abcff72873296ec7b"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "libbpf-cargo"
+version = "0.24.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79a715b0dbcbf93cb2d674d244341180120e9bff0ddbc81b42d6ccf1a4fdd483"
+dependencies = [
+ "anyhow",
+ "cargo_metadata 0.15.4",
+ "clap",
+ "libbpf-rs",
+ "memmap2",
+ "regex",
+ "semver",
+ "serde",
+ "serde_json",
+ "tempfile",
+]
+
+[[package]]
+name = "libbpf-rs"
+version = "0.24.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bafb274d5b387bfe6e91e95b2481891c0cfcd7ee4bb48e992439becd0eb3e36c"
+dependencies = [
+ "bitflags",
+ "libbpf-sys",
+ "libc",
+ "vsprintf",
+]
+
+[[package]]
+name = "libbpf-sys"
+version = "1.4.5+v1.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cabee52b6f7e73308d6fd4f8e6bbbdcb97670f49f6e581c5897e4d2410b6019"
+dependencies = [
+ "cc",
+ "nix",
+ "pkg-config",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.159"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+
+[[package]]
+name = "libloading"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+dependencies = [
+ "cfg-if",
+ "windows-targets",
+]
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags",
+ "libc",
+ "redox_syscall",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memmap2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "metrics"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261"
+dependencies = [
+ "ahash",
+ "portable-atomic",
+]
+
+[[package]]
+name = "metrics-util"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4259040465c955f9f2f1a4a8a16dc46726169bca0f88e8fb2dbeced487c3e828"
+dependencies = [
+ "aho-corasick",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "hashbrown 0.14.5",
+ "indexmap",
+ "metrics",
+ "num_cpus",
+ "ordered-float",
+ "quanta",
+ "radix_trie",
+ "sketches-ddsketch",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "nibble_vec"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
+dependencies = [
+ "smallvec",
+]
+
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "num_threads"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+
+[[package]]
+name = "ordered-float"
+version = "4.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d501f1a72f71d3c063a6bbc8f7271fa73aa09fe5d6283b6571e2ed176a2537"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+
+[[package]]
+name = "plain"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
+
+[[package]]
+name = "portable-atomic"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "prettyplease"
+version = "0.2.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quanta"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5"
+dependencies = [
+ "crossbeam-utils",
+ "libc",
+ "once_cell",
+ "raw-cpuid",
+ "wasi",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
+[[package]]
+name = "radix_trie"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
+dependencies = [
+ "endian-type",
+ "nibble_vec",
+]
+
+[[package]]
+name = "raw-cpuid"
+version = "11.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "regex"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax 0.8.5",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.5",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustix"
+version = "0.38.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scx_rlfifo"
+version = "1.0.5"
+dependencies = [
+ "anyhow",
+ "ctrlc",
+ "libbpf-rs",
+ "libc",
+ "plain",
+ "scx_rustland_core",
+ "scx_utils",
+]
+
+[[package]]
+name = "scx_rustland_core"
+version = "2.1.2"
+dependencies = [
+ "anyhow",
+ "libbpf-rs",
+ "libc",
+ "plain",
+ "scx_utils",
+ "tar",
+ "walkdir",
+]
+
+[[package]]
+name = "scx_stats"
+version = "1.0.5"
+dependencies = [
+ "anyhow",
+ "crossbeam",
+ "libc",
+ "log",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "syn",
+]
+
+[[package]]
+name = "scx_utils"
+version = "1.0.5"
+dependencies = [
+ "anyhow",
+ "bindgen",
+ "bitvec",
+ "glob",
+ "hex",
+ "lazy_static",
+ "libbpf-cargo",
+ "libbpf-rs",
+ "libc",
+ "log",
+ "metrics",
+ "metrics-util",
+ "paste",
+ "regex",
+ "scx_stats",
+ "serde",
+ "sscanf",
+ "tar",
+ "vergen",
+ "version-compare",
+ "walkdir",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.210"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.210"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.128"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "sketches-ddsketch"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c"
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "sscanf"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a147d3cf7e723671ed11355b5b008c8019195f7fc902e213f5557d931e9f839d"
+dependencies = [
+ "const_format",
+ "lazy_static",
+ "regex",
+ "sscanf_macro",
+]
+
+[[package]]
+name = "sscanf_macro"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af3a37bdf8e90e77cc60f74473edf28d922ae2eacdd595e67724ccd2381774cc"
+dependencies = [
+ "convert_case",
+ "proc-macro2",
+ "quote",
+ "regex-syntax 0.6.29",
+ "strsim 0.10.0",
+ "syn",
+ "unicode-width",
+]
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "syn"
+version = "2.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
+name = "tar"
+version = "0.4.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020"
+dependencies = [
+ "filetime",
+ "libc",
+ "xattr",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "time"
+version = "0.3.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+dependencies = [
+ "deranged",
+ "itoa",
+ "libc",
+ "num-conv",
+ "num_threads",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "vergen"
+version = "8.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566"
+dependencies = [
+ "anyhow",
+ "cargo_metadata 0.18.1",
+ "cfg-if",
+ "regex",
+ "rustversion",
+ "time",
+]
+
+[[package]]
+name = "version-compare"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "vsprintf"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aec2f81b75ca063294776b4f7e8da71d1d5ae81c2b1b149c8d89969230265d63"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef073ced962d62984fb38a36e5fdc1a2b23c9e0e1fa0689bb97afa4202ef6887"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4bfab14ef75323f4eb75fa52ee0a3fb59611977fd3240da19b2cf36ff85030e"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7bec9830f60924d9ceb3ef99d55c155be8afa76954edffbb5936ff4509474e7"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c74f6e152a76a2ad448e223b0fc0b6b5747649c3d769cc6bf45737bf97d0ed6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a42f6c679374623f295a8623adfe63d9284091245c3504bde47c17a3ce2777d9"
+
+[[package]]
+name = "web-sys"
+version = "0.3.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44188d185b5bdcae1052d08bcbcf9091a5524038d4572cc4f4f2bb9d5554ddd9"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "which"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
+[[package]]
+name = "xattr"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
+dependencies = [
+ "libc",
+ "linux-raw-sys",
+ "rustix",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/pkgs/os-specific/linux/scx/scx_rlfifo/default.nix b/pkgs/os-specific/linux/scx/scx_rlfifo/default.nix
new file mode 100644
index 000000000000..fb5a549fddc5
--- /dev/null
+++ b/pkgs/os-specific/linux/scx/scx_rlfifo/default.nix
@@ -0,0 +1,37 @@
+{
+ stdenv,
+ lib,
+ mkScxScheduler,
+}:
+
+mkScxScheduler "rust" {
+ schedulerName = "scx_rlfifo";
+
+ cargoRoot = "scheds/rust/scx_rlfifo";
+ cargoLock.lockFile = ./Cargo.lock;
+ postPatch = ''
+ rm Cargo.toml Cargo.lock
+ ln -fs ${./Cargo.lock} scheds/rust/scx_rlfifo/Cargo.lock
+ '';
+
+ preBuild = ''
+ cd scheds/rust/scx_rlfifo
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin
+ cp target/${stdenv.targetPlatform.config}/release/scx_rlfifo $out/bin/
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "Sched-ext Rust userspace scheduler";
+ longDescription = ''
+ scx_rlfifo is a simple FIFO scheduler runs in user-space, based on the
+ scx_rustland_core framework. Not for production use, but useful to test as a
+ baseline against complex scheduling polices or for a basic FIFO scheduling approach.
+ '';
+ mainProgram = "scx_rlfifo";
+ };
+}
diff --git a/pkgs/os-specific/linux/scx/scx_rustland/Cargo.lock b/pkgs/os-specific/linux/scx/scx_rustland/Cargo.lock
new file mode 100644
index 000000000000..7f37b49262c4
--- /dev/null
+++ b/pkgs/os-specific/linux/scx/scx_rustland/Cargo.lock
@@ -0,0 +1,1630 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "bindgen"
+version = "0.69.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
+dependencies = [
+ "bitflags 2.6.0",
+ "cexpr",
+ "clang-sys",
+ "itertools",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn",
+ "which",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "serde",
+ "tap",
+ "wyz",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "camino"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo-platform"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.15.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "cc"
+version = "1.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "clang-sys"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim 0.11.1",
+ "terminal_size",
+ "unicase",
+ "unicode-width 0.2.0",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+
+[[package]]
+name = "const_format"
+version = "0.2.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48"
+dependencies = [
+ "const_format_proc_macros",
+]
+
+[[package]]
+name = "const_format_proc_macros"
+version = "0.2.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "crossbeam"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-epoch",
+ "crossbeam-queue",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "ctrlc"
+version = "3.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
+dependencies = [
+ "nix 0.29.0",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "endian-type"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+
+[[package]]
+name = "fb_procfs"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d16e986e12a0b63c17fe7df3569ed524da77d258a900863034571fd08f7553ac"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "nix 0.25.1",
+ "openat",
+ "serde",
+ "thiserror",
+ "threadpool",
+]
+
+[[package]]
+name = "filetime"
+version = "0.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "libredox",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "home"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.15.0",
+]
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "js-sys"
+version = "0.3.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cb94a0ffd3f3ee755c20f7d8752f45cac88605a4dcf808abcff72873296ec7b"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "libbpf-cargo"
+version = "0.24.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79a715b0dbcbf93cb2d674d244341180120e9bff0ddbc81b42d6ccf1a4fdd483"
+dependencies = [
+ "anyhow",
+ "cargo_metadata 0.15.4",
+ "clap",
+ "libbpf-rs",
+ "memmap2",
+ "regex",
+ "semver",
+ "serde",
+ "serde_json",
+ "tempfile",
+]
+
+[[package]]
+name = "libbpf-rs"
+version = "0.24.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bafb274d5b387bfe6e91e95b2481891c0cfcd7ee4bb48e992439becd0eb3e36c"
+dependencies = [
+ "bitflags 2.6.0",
+ "libbpf-sys",
+ "libc",
+ "vsprintf",
+]
+
+[[package]]
+name = "libbpf-sys"
+version = "1.4.5+v1.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cabee52b6f7e73308d6fd4f8e6bbbdcb97670f49f6e581c5897e4d2410b6019"
+dependencies = [
+ "cc",
+ "nix 0.29.0",
+ "pkg-config",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.159"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+
+[[package]]
+name = "libloading"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+dependencies = [
+ "cfg-if",
+ "windows-targets",
+]
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+ "redox_syscall",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memmap2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "metrics"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261"
+dependencies = [
+ "ahash",
+ "portable-atomic",
+]
+
+[[package]]
+name = "metrics-util"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4259040465c955f9f2f1a4a8a16dc46726169bca0f88e8fb2dbeced487c3e828"
+dependencies = [
+ "aho-corasick",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "hashbrown 0.14.5",
+ "indexmap",
+ "metrics",
+ "num_cpus",
+ "ordered-float 4.3.0",
+ "quanta",
+ "radix_trie",
+ "sketches-ddsketch",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "nibble_vec"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
+dependencies = [
+ "smallvec",
+]
+
+[[package]]
+name = "nix"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
+dependencies = [
+ "autocfg",
+ "bitflags 1.3.2",
+ "cfg-if",
+ "libc",
+ "memoffset",
+ "pin-utils",
+]
+
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "num_threads"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+
+[[package]]
+name = "openat"
+version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95aa7c05907b3ebde2610d602f4ddd992145cc6a84493647c30396f30ba83abe"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "ordered-float"
+version = "3.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "ordered-float"
+version = "4.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d501f1a72f71d3c063a6bbc8f7271fa73aa09fe5d6283b6571e2ed176a2537"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
+[[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.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+
+[[package]]
+name = "plain"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
+
+[[package]]
+name = "portable-atomic"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "prettyplease"
+version = "0.2.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quanta"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5"
+dependencies = [
+ "crossbeam-utils",
+ "libc",
+ "once_cell",
+ "raw-cpuid",
+ "wasi",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
+[[package]]
+name = "radix_trie"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
+dependencies = [
+ "endian-type",
+ "nibble_vec",
+]
+
+[[package]]
+name = "raw-cpuid"
+version = "11.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "regex"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax 0.8.5",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.5",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustix"
+version = "0.38.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+dependencies = [
+ "bitflags 2.6.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scx_rustland"
+version = "1.0.5"
+dependencies = [
+ "anyhow",
+ "clap",
+ "ctrlc",
+ "fb_procfs",
+ "libbpf-rs",
+ "libc",
+ "log",
+ "ordered-float 3.9.2",
+ "plain",
+ "scx_rustland_core",
+ "scx_stats",
+ "scx_stats_derive",
+ "scx_utils",
+ "serde",
+ "simplelog",
+]
+
+[[package]]
+name = "scx_rustland_core"
+version = "2.1.2"
+dependencies = [
+ "anyhow",
+ "libbpf-rs",
+ "libc",
+ "plain",
+ "scx_utils",
+ "tar",
+ "walkdir",
+]
+
+[[package]]
+name = "scx_stats"
+version = "1.0.5"
+dependencies = [
+ "anyhow",
+ "crossbeam",
+ "libc",
+ "log",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "syn",
+]
+
+[[package]]
+name = "scx_stats_derive"
+version = "1.0.5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "scx_stats",
+ "serde_json",
+ "syn",
+]
+
+[[package]]
+name = "scx_utils"
+version = "1.0.5"
+dependencies = [
+ "anyhow",
+ "bindgen",
+ "bitvec",
+ "glob",
+ "hex",
+ "lazy_static",
+ "libbpf-cargo",
+ "libbpf-rs",
+ "libc",
+ "log",
+ "metrics",
+ "metrics-util",
+ "paste",
+ "regex",
+ "scx_stats",
+ "serde",
+ "sscanf",
+ "tar",
+ "vergen",
+ "version-compare",
+ "walkdir",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.210"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.210"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.128"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "simplelog"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0"
+dependencies = [
+ "log",
+ "termcolor",
+ "time",
+]
+
+[[package]]
+name = "sketches-ddsketch"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c"
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "sscanf"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a147d3cf7e723671ed11355b5b008c8019195f7fc902e213f5557d931e9f839d"
+dependencies = [
+ "const_format",
+ "lazy_static",
+ "regex",
+ "sscanf_macro",
+]
+
+[[package]]
+name = "sscanf_macro"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af3a37bdf8e90e77cc60f74473edf28d922ae2eacdd595e67724ccd2381774cc"
+dependencies = [
+ "convert_case",
+ "proc-macro2",
+ "quote",
+ "regex-syntax 0.6.29",
+ "strsim 0.10.0",
+ "syn",
+ "unicode-width 0.1.12",
+]
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "syn"
+version = "2.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
+name = "tar"
+version = "0.4.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020"
+dependencies = [
+ "filetime",
+ "libc",
+ "xattr",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "terminal_size"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef"
+dependencies = [
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "threadpool"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
+dependencies = [
+ "num_cpus",
+]
+
+[[package]]
+name = "time"
+version = "0.3.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+dependencies = [
+ "deranged",
+ "itoa",
+ "libc",
+ "num-conv",
+ "num_threads",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "unicase"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
+
+[[package]]
+name = "unicode-width"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "vergen"
+version = "8.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566"
+dependencies = [
+ "anyhow",
+ "cargo_metadata 0.18.1",
+ "cfg-if",
+ "regex",
+ "rustversion",
+ "time",
+]
+
+[[package]]
+name = "version-compare"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "vsprintf"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aec2f81b75ca063294776b4f7e8da71d1d5ae81c2b1b149c8d89969230265d63"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef073ced962d62984fb38a36e5fdc1a2b23c9e0e1fa0689bb97afa4202ef6887"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4bfab14ef75323f4eb75fa52ee0a3fb59611977fd3240da19b2cf36ff85030e"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7bec9830f60924d9ceb3ef99d55c155be8afa76954edffbb5936ff4509474e7"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c74f6e152a76a2ad448e223b0fc0b6b5747649c3d769cc6bf45737bf97d0ed6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a42f6c679374623f295a8623adfe63d9284091245c3504bde47c17a3ce2777d9"
+
+[[package]]
+name = "web-sys"
+version = "0.3.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44188d185b5bdcae1052d08bcbcf9091a5524038d4572cc4f4f2bb9d5554ddd9"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "which"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
+[[package]]
+name = "xattr"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
+dependencies = [
+ "libc",
+ "linux-raw-sys",
+ "rustix",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/pkgs/os-specific/linux/scx/scx_rustland/default.nix b/pkgs/os-specific/linux/scx/scx_rustland/default.nix
new file mode 100644
index 000000000000..066690e210c2
--- /dev/null
+++ b/pkgs/os-specific/linux/scx/scx_rustland/default.nix
@@ -0,0 +1,38 @@
+{
+ stdenv,
+ lib,
+ mkScxScheduler,
+}:
+
+mkScxScheduler "rust" {
+ schedulerName = "scx_rustland";
+
+ cargoRoot = "scheds/rust/scx_rustland";
+ cargoLock.lockFile = ./Cargo.lock;
+ postPatch = ''
+ rm Cargo.toml Cargo.lock
+ ln -fs ${./Cargo.lock} scheds/rust/scx_rustland/Cargo.lock
+ '';
+
+ preBuild = ''
+ cd scheds/rust/scx_rustland
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin
+ cp target/${stdenv.targetPlatform.config}/release/scx_rustland $out/bin/
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "Sched-ext Rust userspace scheduler";
+ longDescription = ''
+ Made of a BPF component (scx_rustland_core) that implements the low level sched-ext functionalities
+ and a user-space counterpart (scheduler), written in Rust, that implements the actual scheduling policy.
+ It is designed to prioritize interactive workloads over background CPU-intensive workloads. Typical use
+ case involves low-latency interactive applications, such as gaming, video conferencing and live streaming.
+ '';
+ mainProgram = "scx_rustland";
+ };
+}
diff --git a/pkgs/os-specific/linux/scx/scx_rusty/Cargo.lock b/pkgs/os-specific/linux/scx/scx_rusty/Cargo.lock
new file mode 100644
index 000000000000..c3d93d9113c3
--- /dev/null
+++ b/pkgs/os-specific/linux/scx/scx_rusty/Cargo.lock
@@ -0,0 +1,1689 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8"
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "bindgen"
+version = "0.69.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
+dependencies = [
+ "bitflags 2.6.0",
+ "cexpr",
+ "clang-sys",
+ "itertools",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn",
+ "which",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "serde",
+ "tap",
+ "wyz",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "camino"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo-platform"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.15.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "cc"
+version = "1.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "chrono"
+version = "0.4.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-targets",
+]
+
+[[package]]
+name = "clang-sys"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim 0.11.1",
+ "terminal_size",
+ "unicase",
+ "unicode-width 0.2.0",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+
+[[package]]
+name = "const_format"
+version = "0.2.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48"
+dependencies = [
+ "const_format_proc_macros",
+]
+
+[[package]]
+name = "const_format_proc_macros"
+version = "0.2.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "crossbeam"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-epoch",
+ "crossbeam-queue",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "ctrlc"
+version = "3.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
+dependencies = [
+ "nix 0.29.0",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "endian-type"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+
+[[package]]
+name = "fb_procfs"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d16e986e12a0b63c17fe7df3569ed524da77d258a900863034571fd08f7553ac"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "nix 0.25.1",
+ "openat",
+ "serde",
+ "thiserror",
+ "threadpool",
+]
+
+[[package]]
+name = "filetime"
+version = "0.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "libredox",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "home"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.15.0",
+]
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "js-sys"
+version = "0.3.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "libbpf-cargo"
+version = "0.24.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e728b7b8be47b3650fdce768075691c69c8798022eb1bab6167cce20f82b10c"
+dependencies = [
+ "anyhow",
+ "cargo_metadata 0.15.4",
+ "clap",
+ "libbpf-rs",
+ "memmap2",
+ "regex",
+ "semver",
+ "serde",
+ "serde_json",
+ "tempfile",
+]
+
+[[package]]
+name = "libbpf-rs"
+version = "0.24.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73d2e61404e42ba2d97a9acbc24d046cfae978393e21b428e780adbc997504d0"
+dependencies = [
+ "bitflags 2.6.0",
+ "libbpf-sys",
+ "libc",
+ "vsprintf",
+]
+
+[[package]]
+name = "libbpf-sys"
+version = "1.4.5+v1.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cabee52b6f7e73308d6fd4f8e6bbbdcb97670f49f6e581c5897e4d2410b6019"
+dependencies = [
+ "cc",
+ "nix 0.29.0",
+ "pkg-config",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.161"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
+
+[[package]]
+name = "libloading"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+dependencies = [
+ "cfg-if",
+ "windows-targets",
+]
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+ "redox_syscall",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memmap2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "metrics"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261"
+dependencies = [
+ "ahash",
+ "portable-atomic",
+]
+
+[[package]]
+name = "metrics-util"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4259040465c955f9f2f1a4a8a16dc46726169bca0f88e8fb2dbeced487c3e828"
+dependencies = [
+ "aho-corasick",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "hashbrown 0.14.5",
+ "indexmap",
+ "metrics",
+ "num_cpus",
+ "ordered-float 4.4.0",
+ "quanta",
+ "radix_trie",
+ "sketches-ddsketch",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "nibble_vec"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
+dependencies = [
+ "smallvec",
+]
+
+[[package]]
+name = "nix"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
+dependencies = [
+ "autocfg",
+ "bitflags 1.3.2",
+ "cfg-if",
+ "libc",
+ "memoffset",
+ "pin-utils",
+]
+
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "num_threads"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+
+[[package]]
+name = "openat"
+version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95aa7c05907b3ebde2610d602f4ddd992145cc6a84493647c30396f30ba83abe"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "ordered-float"
+version = "3.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "ordered-float"
+version = "4.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83e7ccb95e240b7c9506a3d544f10d935e142cc90b0a1d56954fb44d89ad6b97"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
+[[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.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+
+[[package]]
+name = "portable-atomic"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "prettyplease"
+version = "0.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quanta"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5"
+dependencies = [
+ "crossbeam-utils",
+ "libc",
+ "once_cell",
+ "raw-cpuid",
+ "wasi",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
+[[package]]
+name = "radix_trie"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
+dependencies = [
+ "endian-type",
+ "nibble_vec",
+]
+
+[[package]]
+name = "raw-cpuid"
+version = "11.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "regex"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax 0.8.5",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.5",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustix"
+version = "0.38.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a"
+dependencies = [
+ "bitflags 2.6.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scx_rusty"
+version = "1.0.5"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "clap",
+ "crossbeam",
+ "ctrlc",
+ "fb_procfs",
+ "libbpf-rs",
+ "libc",
+ "log",
+ "ordered-float 3.9.2",
+ "scx_stats",
+ "scx_stats_derive",
+ "scx_utils",
+ "serde",
+ "simplelog",
+ "sorted-vec",
+ "static_assertions",
+]
+
+[[package]]
+name = "scx_stats"
+version = "1.0.5"
+dependencies = [
+ "anyhow",
+ "crossbeam",
+ "libc",
+ "log",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "syn",
+]
+
+[[package]]
+name = "scx_stats_derive"
+version = "1.0.5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "scx_stats",
+ "serde_json",
+ "syn",
+]
+
+[[package]]
+name = "scx_utils"
+version = "1.0.5"
+dependencies = [
+ "anyhow",
+ "bindgen",
+ "bitvec",
+ "glob",
+ "hex",
+ "lazy_static",
+ "libbpf-cargo",
+ "libbpf-rs",
+ "libc",
+ "log",
+ "metrics",
+ "metrics-util",
+ "paste",
+ "regex",
+ "scx_stats",
+ "serde",
+ "sscanf",
+ "tar",
+ "vergen",
+ "version-compare",
+ "walkdir",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.214"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.214"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.132"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "simplelog"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0"
+dependencies = [
+ "log",
+ "termcolor",
+ "time",
+]
+
+[[package]]
+name = "sketches-ddsketch"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c"
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "sorted-vec"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f64b077cc81ab5f1209bb44c6530a3277261aeaa5405111d48326897306918b"
+
+[[package]]
+name = "sscanf"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a147d3cf7e723671ed11355b5b008c8019195f7fc902e213f5557d931e9f839d"
+dependencies = [
+ "const_format",
+ "lazy_static",
+ "regex",
+ "sscanf_macro",
+]
+
+[[package]]
+name = "sscanf_macro"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af3a37bdf8e90e77cc60f74473edf28d922ae2eacdd595e67724ccd2381774cc"
+dependencies = [
+ "convert_case",
+ "proc-macro2",
+ "quote",
+ "regex-syntax 0.6.29",
+ "strsim 0.10.0",
+ "syn",
+ "unicode-width 0.1.12",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "syn"
+version = "2.0.85"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
+name = "tar"
+version = "0.4.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020"
+dependencies = [
+ "filetime",
+ "libc",
+ "xattr",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "terminal_size"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef"
+dependencies = [
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "threadpool"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
+dependencies = [
+ "num_cpus",
+]
+
+[[package]]
+name = "time"
+version = "0.3.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+dependencies = [
+ "deranged",
+ "itoa",
+ "libc",
+ "num-conv",
+ "num_threads",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "unicase"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
+
+[[package]]
+name = "unicode-width"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "vergen"
+version = "8.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566"
+dependencies = [
+ "anyhow",
+ "cargo_metadata 0.18.1",
+ "cfg-if",
+ "regex",
+ "rustversion",
+ "time",
+]
+
+[[package]]
+name = "version-compare"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "vsprintf"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aec2f81b75ca063294776b4f7e8da71d1d5ae81c2b1b149c8d89969230265d63"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
+
+[[package]]
+name = "web-sys"
+version = "0.3.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "which"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
+[[package]]
+name = "xattr"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
+dependencies = [
+ "libc",
+ "linux-raw-sys",
+ "rustix",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/pkgs/os-specific/linux/scx/scx_rusty/default.nix b/pkgs/os-specific/linux/scx/scx_rusty/default.nix
new file mode 100644
index 000000000000..55ed309aba62
--- /dev/null
+++ b/pkgs/os-specific/linux/scx/scx_rusty/default.nix
@@ -0,0 +1,38 @@
+{
+ stdenv,
+ lib,
+ mkScxScheduler,
+}:
+
+mkScxScheduler "rust" {
+ schedulerName = "scx_rusty";
+
+ cargoRoot = "scheds/rust/scx_rusty";
+ cargoLock.lockFile = ./Cargo.lock;
+ postPatch = ''
+ rm Cargo.toml Cargo.lock
+ ln -fs ${./Cargo.lock} scheds/rust/scx_rusty/Cargo.lock
+ '';
+
+ preBuild = ''
+ cd scheds/rust/scx_rusty
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin
+ cp target/${stdenv.targetPlatform.config}/release/scx_rusty $out/bin/
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "Sched-ext Rust userspace scheduler";
+ longDescription = ''
+ Multi-domain, BPF/userspace hybrid scheduler. BPF portion of the scheduler does
+ a simple round robin in each domain, and the userspace portion calculates the load
+ factor of each domain, and informs BPF of how tasks should be load balanced accordingly.
+ Rusty is designed to be flexible, accommodating different architectures and workloads.
+ '';
+ mainProgram = "scx_rusty";
+ };
+}
diff --git a/pkgs/os-specific/linux/scx/update.sh b/pkgs/os-specific/linux/scx/update.sh
new file mode 100755
index 000000000000..4e8048d803e2
--- /dev/null
+++ b/pkgs/os-specific/linux/scx/update.sh
@@ -0,0 +1,50 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p coreutils moreutils curl jq nix-prefetch-git cargo gnugrep gawk
+# shellcheck shell=bash
+
+set -euo pipefail
+
+versionJson="$(realpath "./pkgs/os-specific/linux/scx/version.json")"
+nixFolder="$(dirname "$versionJson")"
+
+localVer=$(jq -r .version <$versionJson)
+latestVer=$(curl -s https://api.github.com/repos/sched-ext/scx/releases/latest | jq -r .tag_name | sed 's/v//g')
+
+if [ "$localVer" == "$latestVer" ]; then
+ exit 0
+fi
+
+latestHash=$(nix-prefetch-git https://github.com/sched-ext/scx.git --rev refs/tags/v$latestVer --quiet | jq -r .hash)
+
+tmp=$(mktemp -d)
+trap 'rm -rf -- "${tmp}"' EXIT
+
+git clone --depth 1 --branch "v$latestVer" https://github.com/sched-ext/scx.git "$tmp/scx"
+
+pushd "$tmp/scx"
+
+bpftoolRev=$(grep 'bpftool_commit =' ./meson.build | awk -F"'" '{print $2}')
+bpftoolHash=$(nix-prefetch-git https://github.com/libbpf/bpftool.git --rev $bpftoolRev --fetch-submodules --quiet | jq -r .hash)
+
+libbpfRev=$(curl -s "https://api.github.com/repos/libbpf/libbpf/commits/master" | jq -r '.sha')
+libbpfHash=$(nix-prefetch-git https://github.com/libbpf/libbpf.git --rev $libbpfRev --fetch-submodules --quiet | jq -r .hash)
+
+jq \
+ --arg latestVer "$latestVer" --arg latestHash "$latestHash" \
+ --arg bpftoolRev "$bpftoolRev" --arg bpftoolHash "$bpftoolHash" \
+ --arg libbpfRev "$libbpfRev" --arg libbpfHash "$libbpfHash" \
+ ".scx.version = \$latestVer | .scx.hash = \$latestHash |\
+ .bpftool.rev = \$bpftoolRev | .bpftool.hash = \$bpftoolHash |\
+ .libbpf.rev = \$libbpfRev | .libbpf.hash = \$libbpfHash" \
+ "$versionJson" | sponge $versionJson
+
+rm -f Cargo.toml Cargo.lock
+
+for scheduler in bpfland lavd layered rlfifo rustland rusty; do
+ pushd "scheds/rust/scx_$scheduler"
+
+ cargo generate-lockfile
+ cp Cargo.lock "$nixFolder/scx_$scheduler/Cargo.lock"
+
+ popd
+done
diff --git a/pkgs/os-specific/linux/scx/version.json b/pkgs/os-specific/linux/scx/version.json
new file mode 100644
index 000000000000..99148b7e3c73
--- /dev/null
+++ b/pkgs/os-specific/linux/scx/version.json
@@ -0,0 +1,14 @@
+{
+ "scx": {
+ "version": "1.0.5",
+ "hash": "sha256-nb2bzEanPPWTUhMmGw/8/bwOkdgNmwoZX2lMFq5Av5Q="
+ },
+ "bpftool": {
+ "rev": "77a72987353fcae8ce330fd87d4c7afb7677a169",
+ "hash": "sha256-pItTVewlXgB97AC/WH9rW9J/eYSe2ZdBkJaAgGnDeUU="
+ },
+ "libbpf": {
+ "rev": "09b9e83102eb8ab9e540d36b4559c55f3bcdb95d",
+ "hash": "sha256-0PadA9OppNGmgSTLi8sXrh3syxPVkqrnTkBr8cyp+Ug="
+ }
+}
diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix
index 2a5112e9fdd0..ea37545672ed 100644
--- a/pkgs/os-specific/linux/sysstat/default.nix
+++ b/pkgs/os-specific/linux/sysstat/default.nix
@@ -32,10 +32,11 @@ stdenv.mkDerivation rec {
patches = [ ./install.patch ];
meta = {
+ mainProgram = "iostat";
homepage = "http://sebastien.godard.pagesperso-orange.fr/";
description = "Collection of performance monitoring tools for Linux (such as sar, iostat and pidstat)";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
- maintainers = [ ];
+ maintainers = [ lib.maintainers.hensoko ];
};
}
diff --git a/pkgs/os-specific/linux/system76-io/default.nix b/pkgs/os-specific/linux/system76-io/default.nix
index 54af222bc7d8..772ef9f06d09 100644
--- a/pkgs/os-specific/linux/system76-io/default.nix
+++ b/pkgs/os-specific/linux/system76-io/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, kernel }:
let
- version = "1.0.2";
- sha256 = "sha256-DWUjQmoojkzFv1p4Xyt0kOwwqQ216ocO5yR/ujhhMPA=";
+ version = "1.0.4";
+ hash = "sha256-VE6sCehjXlRuOVcK4EN2H+FhaVaBi/jrAYx4TZjbreA=";
in
stdenv.mkDerivation {
name = "system76-io-module-${version}-${kernel.version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
owner = "pop-os";
repo = "system76-io-dkms";
rev = version;
- inherit sha256;
+ inherit hash;
};
hardeningDisable = [ "pic" ];
@@ -27,12 +27,12 @@ stdenv.mkDerivation {
install -D system76-io.ko $out/lib/modules/${kernel.modDirVersion}/misc/system76-io.ko
'';
- meta = with lib; {
- maintainers = [ maintainers.khumba ];
- license = [ licenses.gpl2Plus ];
- platforms = [ "i686-linux" "x86_64-linux" ];
- broken = versionOlder kernel.version "4.14";
- description = "DKMS module for controlling System76 I/O board";
+ meta = {
+ maintainers = with lib.maintainers; [ khumba ahoneybun ];
+ license = lib.licenses.gpl2Plus;
+ platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
+ broken = lib.versionOlder kernel.version "5.10";
+ description = "DKMS module for controlling System76 Io board";
homepage = "https://github.com/pop-os/system76-io-dkms";
};
}
diff --git a/pkgs/os-specific/linux/system76/default.nix b/pkgs/os-specific/linux/system76/default.nix
index 7d9cd9bde024..b42b31c5a214 100644
--- a/pkgs/os-specific/linux/system76/default.nix
+++ b/pkgs/os-specific/linux/system76/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, kernel }:
let
- version = "1.0.13";
- sha256 = "162hhmnww8z9k0795ffs8v3f61hlfm375law156sk5l08if19a4r";
+ version = "1.0.16";
+ hash = "sha256-jsBLy5WDl2l8o/2ccIk1XMqOukeDX5eZ+VH5Dyo5BaA=";
in
stdenv.mkDerivation {
name = "system76-module-${version}-${kernel.version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
owner = "pop-os";
repo = "system76-dkms";
rev = version;
- inherit sha256;
+ inherit hash;
};
hardeningDisable = [ "pic" ];
@@ -29,11 +29,10 @@ stdenv.mkDerivation {
mv lib/udev/hwdb.d/* $out/lib/udev/hwdb.d
'';
- meta = with lib; {
- maintainers = [ maintainers.khumba ];
- license = [ licenses.gpl2Plus ];
+ meta = {
+ maintainers = [ lib.maintainers.khumba ];
+ license = [ lib.licenses.gpl2Plus ];
platforms = [ "i686-linux" "x86_64-linux" ];
- broken = versionOlder kernel.version "4.14";
description = "System76 DKMS driver";
homepage = "https://github.com/pop-os/system76-dkms";
longDescription = ''
diff --git a/pkgs/os-specific/linux/vdo/default.nix b/pkgs/os-specific/linux/vdo/default.nix
index dc0a30732ed0..6f9b76ebc547 100644
--- a/pkgs/os-specific/linux/vdo/default.nix
+++ b/pkgs/os-specific/linux/vdo/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "vdo";
- version = "8.3.0.71";
+ version = "8.3.0.72";
src = fetchFromGitHub {
owner = "dm-vdo";
repo = pname;
rev = version;
- hash = "sha256-FZerMUzth43p5jvKQalyYcW+mrl6SLjS8GrivY2qWkI=";
+ hash = "sha256-ILS5cUWR04/GePyXHj00Am4HMDAhAaN/uUe7kchjo/8=";
};
nativeBuildInputs = [
diff --git a/pkgs/os-specific/linux/xone/default.nix b/pkgs/os-specific/linux/xone/default.nix
index b0da374d9874..f75b4696f40b 100644
--- a/pkgs/os-specific/linux/xone/default.nix
+++ b/pkgs/os-specific/linux/xone/default.nix
@@ -19,6 +19,13 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://github.com/medusalix/xone/commit/28df566c38e0ee500fd5f74643fc35f21a4ff696.patch";
hash = "sha256-X14oZmxqqZJoBZxPXGZ9R8BAugx/hkSOgXlGwR5QCm8=";
})
+ # Fix build on kernel 6.12
+ # https://github.com/medusalix/xone/pull/53
+ (fetchpatch {
+ name = "kernel-6.12.patch";
+ url = "https://github.com/medusalix/xone/commit/d88ea1e8b430d4b96134e43ca1892ac48334578e.patch";
+ hash = "sha256-zQK1tuxu2ZmKxPO0amkfcT/RFBSkU2pWD0qhGyCCHXI=";
+ })
];
setSourceRoot = ''
diff --git a/pkgs/os-specific/linux/zfs/2_1.nix b/pkgs/os-specific/linux/zfs/2_1.nix
index d950f5cac15d..885ebca73abb 100644
--- a/pkgs/os-specific/linux/zfs/2_1.nix
+++ b/pkgs/os-specific/linux/zfs/2_1.nix
@@ -22,9 +22,9 @@ callPackage ./generic.nix args {
hash = "sha256-zFO8fMbirEOrn5W57rAN7IWY6EIXG8jDXqhP7BWJyiY=";
- tests = [
- nixosTests.zfs.series_2_1
- ];
+ tests = {
+ inherit (nixosTests.zfs) series_2_1;
+ };
maintainers = [ lib.maintainers.raitobezarius ];
}
diff --git a/pkgs/os-specific/linux/zfs/2_2.nix b/pkgs/os-specific/linux/zfs/2_2.nix
index befb83b20569..9d8be86258d5 100644
--- a/pkgs/os-specific/linux/zfs/2_2.nix
+++ b/pkgs/os-specific/linux/zfs/2_2.nix
@@ -19,10 +19,9 @@ callPackage ./generic.nix args {
# this package should point to the latest release.
version = "2.2.6";
- tests = [
- nixosTests.zfs.installer
- nixosTests.zfs.series_2_2
- ];
+ tests = {
+ inherit (nixosTests.zfs) installer series_2_2;
+ };
maintainers = with lib.maintainers; [ adamcstephens amarshall ];
diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix
index 3fb46077d886..0d75c8c7072c 100644
--- a/pkgs/os-specific/linux/zfs/unstable.nix
+++ b/pkgs/os-specific/linux/zfs/unstable.nix
@@ -14,18 +14,18 @@ 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.11";
+ kernelCompatible = kernel: kernel.kernelOlder "6.12";
# 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.2.6";
+ version = "2.3.0-rc2";
# rev = "";
- tests = [
- nixosTests.zfs.unstable
- ];
+ tests = {
+ inherit (nixosTests.zfs) unstable;
+ };
- hash = "sha256-wkgoYg6uQOHVq8a9sJXzO/QXJ6q28l7JXWkC+BFvOb0=";
+ hash = "sha256-/INlfiPpRm5JprcORzJJKyjpGIMY1LceY3yZ811uf2A=";
}
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index f7e792da825a..baf99a2633b6 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -14,7 +14,7 @@
stdenv.mkDerivation rec {
pname = "slurm";
- version = "24.05.3.1";
+ version = "24.05.4.1";
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
# because the latter does not keep older releases.
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
repo = "slurm";
# The release tags use - instead of .
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
- hash = "sha256-qYIpYBjbYgbYzPKEgKEEXEf/0bFyp1sFFl7A7mq6Nco=";
+ hash = "sha256-sviXuRJOpuSoOMNjGPRe11qlphk0Y1/YV/Y5M+QkWys=";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix
index 061ea520731b..4014d566068e 100644
--- a/pkgs/servers/coturn/default.nix
+++ b/pkgs/servers/coturn/default.nix
@@ -37,6 +37,10 @@ stdenv.mkDerivation rec {
patches = [
./pure-configure.patch
+
+ # Don't call setgroups unconditionally in mainrelay
+ # https://github.com/coturn/coturn/pull/1508
+ ./dont-call-setgroups-unconditionally.patch
];
# Workaround build failure on -fno-common toolchains like upstream
diff --git a/pkgs/servers/coturn/dont-call-setgroups-unconditionally.patch b/pkgs/servers/coturn/dont-call-setgroups-unconditionally.patch
new file mode 100644
index 000000000000..6b7780cbee84
--- /dev/null
+++ b/pkgs/servers/coturn/dont-call-setgroups-unconditionally.patch
@@ -0,0 +1,46 @@
+From 1b5da9c7c5423eed7a567a02e66c244705116724 Mon Sep 17 00:00:00 2001
+From: networkException
+Date: Thu, 30 May 2024 02:07:04 +0200
+Subject: [PATCH] Don't call `setgroups` unconditionally in mainrelay
+
+This patch moves the call to `setgroups` from the beginning of the
+`drop_priviliges` function to branch in which `setuid` is actually
+called. This still fulfills the intention of
+acbf7e15c9290e0891a6b6b5ce6e81bbaa77ce5a, initially introducting
+the call to `setgroups`:
+
+> Fix related to POS36-C and rpmlint error
+> "missing-call-to-setgroups-before-setuid".
+
+As per this intention is is not required to call `setgroups`
+otherwise, reducing the more exotic (as in not part of POSIX and
+considered priviliged by systemd) system calls coturn needs to make
+at startup.
+---
+ src/apps/relay/mainrelay.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/apps/relay/mainrelay.c b/src/apps/relay/mainrelay.c
+index cf370ec8a..56eaf82d0 100644
+--- a/src/apps/relay/mainrelay.c
++++ b/src/apps/relay/mainrelay.c
+@@ -2913,7 +2913,6 @@ static void drop_privileges(void) {
+ #if defined(WINDOWS)
+ // TODO: implement it!!!
+ #else
+- setgroups(0, NULL);
+ if (procgroupid_set) {
+ if (getgid() != procgroupid) {
+ if (setgid(procgroupid) != 0) {
+@@ -2929,6 +2928,11 @@ static void drop_privileges(void) {
+
+ if (procuserid_set) {
+ if (procuserid != getuid()) {
++ if (setgroups(0, NULL) != 0) {
++ perror("setgroups: Unable drop supplementary groups");
++ exit(-1);
++ }
++
+ if (setuid(procuserid) != 0) {
+ perror("setuid: Unable to change user privileges");
+ exit(-1);
diff --git a/pkgs/servers/fastnetmon-advanced/default.nix b/pkgs/servers/fastnetmon-advanced/default.nix
index ab655bca526c..a20a14bed3b5 100644
--- a/pkgs/servers/fastnetmon-advanced/default.nix
+++ b/pkgs/servers/fastnetmon-advanced/default.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "fastnetmon-advanced";
- version = "2.0.363";
+ version = "2.0.367";
src = fetchurl {
url = "https://repo.fastnetmon.com/fastnetmon_ubuntu_jammy/pool/fastnetmon/f/fastnetmon/fastnetmon_${version}_amd64.deb";
- hash = "sha256-2AKUNPQ7OzuYOolJHwTnWHzB4Qpwun/77+dFCN/cE98=";
+ hash = "sha256-D/4kkT6ehEmlfRUeP1uLuO/hd9ZrMBJSKF5DKYXOPxs=";
};
nativeBuildInputs = [
@@ -27,18 +27,8 @@ stdenv.mkDerivation rec {
ar xf $src
tar xf data.tar.xz
- # both clickhouse 2.0.0 and 2.3.0 libs are included, without versioning it will by
- # default choose the first it finds, but we need 2.3.0 otherwise the fastnetmon
- # binary will be missing symbols
- rm -r opt/fastnetmon/libraries/libclickhouse_2_0_0
-
# unused libraries, which have additional dependencies
rm opt/fastnetmon/libraries/gcc1210/lib/libgccjit.so.0.0.1
- rm opt/fastnetmon/libraries/poco_1_10_0/lib/libPocoCryptod.so.70
- rm opt/fastnetmon/libraries/poco_1_10_0/lib/libPocoCrypto.so.70
- rm opt/fastnetmon/libraries/poco_1_10_0/lib/libPocoJWTd.so.70
- rm opt/fastnetmon/libraries/poco_1_10_0/lib/libPocoJWT.so.70
- rm opt/fastnetmon/libraries/wkhtmltopdf-0.12.3/wkhtmltox/lib/libwkhtmltox.so.0.12.3
'';
installPhase = ''
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 8fe00f2433a4..1a6dba594ece 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "2024.10.3";
+ version = "2024.10.4";
components = {
"3_day_blinds" = ps: with ps; [
];
@@ -754,8 +754,9 @@
];
"deako" = ps: with ps; [
ifaddr
+ pydeako
zeroconf
- ]; # missing inputs: pydeako
+ ];
"debugpy" = ps: with ps; [
debugpy
];
@@ -1940,12 +1941,13 @@
home-assistant-intents
ifaddr
mutagen
+ py-improv-ble-client
pymicro-vad
pyserial
pyspeex-noise
pyudev
zeroconf
- ]; # missing inputs: py-improv-ble-client
+ ];
"incomfort" = ps: with ps; [
incomfort-client
];
@@ -2332,13 +2334,14 @@
hassil
home-assistant-intents
ifaddr
+ leaone-ble
mutagen
pymicro-vad
pyserial
pyspeex-noise
pyudev
zeroconf
- ]; # missing inputs: leaone-ble
+ ];
"led_ble" = ps: with ps; [
aioesphomeapi
aioruuvigateway
@@ -2597,13 +2600,14 @@
hassil
home-assistant-intents
ifaddr
+ melnor-bluetooth
mutagen
pymicro-vad
pyserial
pyspeex-noise
pyudev
zeroconf
- ]; # missing inputs: melnor-bluetooth
+ ];
"meraki" = ps: with ps; [
];
"mercury_nz" = ps: with ps; [
@@ -4958,7 +4962,8 @@
xmltodict
];
"zeversolar" = ps: with ps; [
- ]; # missing inputs: zeversolar
+ zeversolar
+ ];
"zha" = ps: with ps; [
aiohasupervisor
pillow
@@ -5125,6 +5130,7 @@
"datadog"
"date"
"datetime"
+ "deako"
"debugpy"
"deconz"
"default_config"
@@ -5341,6 +5347,7 @@
"image_upload"
"imap"
"imgw_pib"
+ "improv_ble"
"incomfort"
"influxdb"
"inkbird"
@@ -5395,6 +5402,7 @@
"lawn_mower"
"lcn"
"ld2410_ble"
+ "leaone"
"led_ble"
"lektrico"
"lg_netcast"
@@ -5442,6 +5450,7 @@
"media_player"
"media_source"
"melcloud"
+ "melnor"
"meraki"
"met"
"met_eireann"
@@ -5878,6 +5887,7 @@
"zamg"
"zeroconf"
"zerproc"
+ "zeversolar"
"zha"
"zodiac"
"zone"
diff --git a/pkgs/servers/home-assistant/custom-components/climate_group/package.nix b/pkgs/servers/home-assistant/custom-components/climate_group/package.nix
new file mode 100644
index 000000000000..9255fe7a3cb7
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/climate_group/package.nix
@@ -0,0 +1,27 @@
+{
+ lib,
+ fetchFromGitHub,
+ buildHomeAssistantComponent,
+}:
+buildHomeAssistantComponent rec {
+ owner = "bjrnptrsn";
+ domain = "climate_group";
+ version = "1.0.7";
+
+ src = fetchFromGitHub {
+ inherit owner;
+ repo = "climate_group";
+ rev = "refs/tags/${version}";
+ hash = "sha256-f/VQUNzRSxmKGNgijaafQ5NbngUUKmcdkafYC3Ol9qM=";
+ };
+
+ dontBuild = true;
+
+ meta = {
+ changelog = "https://github.com/bjrnptrsn/climate_group/blob/${src.rev}/README.md#changelog";
+ description = "Group multiple climate devices to a single entity";
+ homepage = "https://github.com/bjrnptrsn/climate_group";
+ maintainers = builtins.attrValues { inherit (lib.maintainers) jamiemagee; };
+ license = lib.licenses.mit;
+ };
+}
diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
index 73924b838e39..fc4479ed7053 100644
--- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
@@ -7,13 +7,13 @@
buildHomeAssistantComponent rec {
owner = "danielperna84";
domain = "homematicip_local";
- version = "1.67.0";
+ version = "1.68.1";
src = fetchFromGitHub {
owner = "danielperna84";
repo = "custom_homematic";
rev = "refs/tags/${version}";
- hash = "sha256-lKjBt5oMSdGHXUddaGM+BQOhFnsobvgf2k6qMu2uofY=";
+ hash = "sha256-LRsLSMtPxc/v+zu//I+huGeFaa9i+NGtOLWmEiSwg9g=";
};
dependencies = [
diff --git a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
index 7e911c14f1d0..91ba2467a0fd 100644
--- a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix
@@ -12,13 +12,13 @@
buildHomeAssistantComponent rec {
owner = "mampfes";
domain = "waste_collection_schedule";
- version = "2.2.0";
+ version = "2.4.0";
src = fetchFromGitHub {
inherit owner;
- repo = "hacs_${domain}";
+ repo = "hacs_waste_collection_schedule";
rev = "refs/tags/${version}";
- hash = "sha256-XzHShFM0H8F/erc/XiCMDotCfN/JJoO5SWX+O9Fqxkw=";
+ hash = "sha256-2WUwUifRCIhz+QmhpY8VGx/USEImpPX0K511xDJWP1I=";
};
dependencies = [
diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
index 4dba1f70bdef..cd6ac2080df3 100644
--- a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
@@ -12,13 +12,13 @@
buildHomeAssistantComponent rec {
owner = "al-one";
domain = "xiaomi_miot";
- version = "0.7.20";
+ version = "0.7.21";
src = fetchFromGitHub {
owner = "al-one";
repo = "hass-xiaomi-miot";
rev = "v${version}";
- hash = "sha256-wR5N6a+g4TE9cRv1k4zExCWiui7ZHwK54j0oUxnhcR0=";
+ hash = "sha256-5MYA5MejQAANyjVqhqZtaIEQEs1K/aOx+1n+L9TmNmY=";
};
propagatedBuildInputs = [
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/default.nix
new file mode 100644
index 000000000000..dfd8d36061fa
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/default.nix
@@ -0,0 +1,37 @@
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+}:
+
+stdenv.mkDerivation rec {
+ pname = "bubble-card";
+ version = "2.2.4";
+
+ dontBuild = true;
+
+ src = fetchFromGitHub {
+ owner = "Clooos";
+ repo = "Bubble-Card";
+ rev = "v${version}";
+ hash = "sha256-vsgu1hvtlppADvaFLeB4xQHbP3wBc6H4p5HbeS3JY80=";
+ };
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir $out
+ install -m0644 dist/bubble-card.js $out
+ install -m0644 dist/bubble-pop-up-fix.js $out
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ changelog = "https://github.com/Clooos/bubble-card/releases/tag/v${version}";
+ description = "Bubble Card is a minimalist card collection for Home Assistant with a nice pop-up touch.";
+ homepage = "https://github.com/Clooos/Bubble-Card";
+ license = licenses.mit;
+ maintainers = with maintainers; [ pta2002 ];
+ };
+}
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix
index 6271c3681bb1..c4ddd97b7749 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix
@@ -9,6 +9,8 @@
atomic-calendar-revive = callPackage ./atomic-calendar-revive { };
+ bubble-card = callPackage ./bubble-card { };
+
button-card = callPackage ./button-card { };
card-mod = callPackage ./card-mod { };
@@ -31,6 +33,8 @@
rmv-card = callPackage ./rmv-card { };
+ sankey-chart = callPackage ./sankey-chart { };
+
template-entity-row = callPackage ./template-entity-row { };
universal-remote-card = callPackage ./universal-remote-card { };
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix
index 9a03f71e8041..5c05354c3752 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix
@@ -5,16 +5,16 @@
buildNpmPackage rec {
pname = "mushroom";
- version = "4.0.7";
+ version = "4.0.8";
src = fetchFromGitHub {
owner = "piitaya";
repo = "lovelace-mushroom";
rev = "v${version}";
- hash = "sha256-97FW4kNPaoP501xD0W/PjmykwhLbLz7yHVNZiwl/clE=";
+ hash = "sha256-jwL/LrnQsjwv9Wt+jmJKE7jJ3YO8K7eBkxkvAvCbg7g=";
};
- npmDepsHash = "sha256-Gpt17teEbBMHU8teiH66fjZmgq+6v/XovTVxNfHFTg4=";
+ npmDepsHash = "sha256-fzmVRmX1lBy+t7gRCUfw2ONYyKDUs6IkSnAstiYJ7qg=";
installPhase = ''
runHook preInstall
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/default.nix
new file mode 100644
index 000000000000..d9b1c25b1cc5
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/sankey-chart/default.nix
@@ -0,0 +1,37 @@
+{
+ lib,
+ buildNpmPackage,
+ fetchFromGitHub,
+}:
+
+buildNpmPackage rec {
+ pname = "sankey-chart";
+ version = "3.5.0";
+
+ src = fetchFromGitHub {
+ owner = "MindFreeze";
+ repo = "ha-sankey-chart";
+ rev = "v${version}";
+ hash = "sha256-cQZPWyXMwJZAhsWYtNLGXpelvmeWlyQbaoqYREwfeNg=";
+ };
+
+ npmDepsHash = "sha256-GXhxMq0h/AmLGIiq2N/hSi+4O9uNDPawaSdPmJ8OyX8=";
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir $out/
+ cp -v dist/ha-sankey-chart.js $out/sankey-chart.js
+
+ runHook postInstall
+ '';
+
+ meta = {
+ description = "Home Assistant lovelace card to display a sankey chart.";
+ homepage = "https://github.com/MindFreeze/ha-sankey-chart";
+ changelog = "https://github.com/MindFreeze/ha-sankey-chart/blob/${src.rev}/CHANGELOG.md";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ hexa ];
+ platforms = lib.platforms.all;
+ };
+}
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index d0bc0fbc8b08..feed5887e4be 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -100,16 +100,6 @@ let
];
});
- geojson = super.geojson.overridePythonAttrs (oldAttrs: rec {
- version = "2.5.0";
- src = fetchFromGitHub {
- inherit (oldAttrs.src) owner repo;
- rev = "refs/tags/${version}";
- hash = "sha256-AcImffYki1gnIaZp/1eacNjdDgjn6qinPJXq9jYtoRg=";
- };
- doCheck = false;
- });
-
gspread = super.gspread.overridePythonAttrs (oldAttrs: rec {
version = "5.12.4";
src = fetchFromGitHub {
@@ -181,15 +171,6 @@ let
};
});
- pyasn1 = super.pyasn1.overridePythonAttrs (oldAttrs: rec {
- version = "0.4.8";
- src = fetchPypi {
- inherit (oldAttrs) pname;
- inherit version;
- hash = "sha256-rvd8n7lKOsWI6HhBIIvexGRHHZhxvVBQoofMmkdc0Lo=";
- };
- });
-
# Pinned due to API changes >0.3.5.3
pyatag = super.pyatag.overridePythonAttrs (oldAttrs: rec {
version = "0.3.5.3";
@@ -340,6 +321,7 @@ let
doCheck = false; # Tests changed a lot for > 3
});
+ # pinned for sigstore
tuf = super.tuf.overridePythonAttrs rec {
version = "2.1.0";
src = fetchFromGitHub {
@@ -425,7 +407,7 @@ let
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run update-component-packages.py after updating
- hassVersion = "2024.10.3";
+ hassVersion = "2024.10.4";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@@ -443,13 +425,13 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
- hash = "sha256-kxxa7FI2wIpE3bEifNyjtEHj7rsuImQvxGd6I46ySqM=";
+ hash = "sha256-uaGGt5qCdyFXuEtg20MzmFd4PXkdPP8h4HJBvRV6sz8=";
};
# Secondary source is pypi sdist for translations
sdist = fetchPypi {
inherit pname version;
- hash = "sha256-DhDdCvov5/Yf2MnY2veV8W/lYk3LTDzxYpbAsbjxWcg=";
+ hash = "sha256-al45WS8SIgOM2TqGPIptZU7iNMapYUg+fK2MLh68lxs=";
};
build-system = with python.pkgs; [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 70c92b8bcec7..bb9cc204bf59 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -4,7 +4,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
- version = "20241002.3";
+ version = "20241002.4";
format = "wheel";
src = fetchPypi {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
- hash = "sha256-O1Yb5bCaKoS/Owwb0I0bF2neN2YTOnu28ruVA1cnFzk=";
+ hash = "sha256-b1/VrN0r/7rvSCjSn9HugKLaA40yl4AsFugzmCZKzd8=";
};
# there is nothing to strip in this package
diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index 25f33e9fb321..efd82a902f22 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "homeassistant-stubs";
- version = "2024.10.2";
+ version = "2024.10.4";
pyproject = true;
disabled = python.version != home-assistant.python.version;
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "KapJI";
repo = "homeassistant-stubs";
rev = "refs/tags/${version}";
- hash = "sha256-6aFZiJKPuUdnC3YzSHyJgn2iTHfP8MCwx17I7uxVTNg=";
+ hash = "sha256-MjHqX1OP1mEEypAxZ8Xc+ZWBsfj4yiFG9oItFnf/svk=";
};
build-system = [
diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix
index 07fc9a00b999..4f1ae7204fad 100644
--- a/pkgs/servers/home-assistant/tests.nix
+++ b/pkgs/servers/home-assistant/tests.nix
@@ -3,27 +3,21 @@
}:
let
+ getComponentDeps = component: home-assistant.getPackages component home-assistant.python.pkgs;
+
# some components' tests have additional dependencies
extraCheckInputs = with home-assistant.python.pkgs; {
- airzone_cloud = [
- aioairzone
- ];
- androidtv = home-assistant.getPackages "asuswrt" home-assistant.python.pkgs;
- bluetooth = [
- pyswitchbot
- ];
+ axis = getComponentDeps "deconz";
govee_ble = [
ibeacon-ble
];
+ hassio = getComponentDeps "homeassistant_yellow";
lovelace = [
pychromecast
];
matrix = [
pydantic
];
- mopeka = [
- pyswitchbot
- ];
onboarding = [
pymetno
radios
@@ -41,9 +35,6 @@ let
system_log = [
isal
];
- tilt_ble = [
- ibeacon-ble
- ];
xiaomi_miio = [
arrow
];
@@ -59,22 +50,6 @@ let
};
extraDisabledTests = {
- advantage_air = [
- # AssertionError: assert 2 == 1 (Expected two calls, got one)
- "test_binary_sensor_async_setup_entry"
- ];
- hassio = [
- # fails to load the hardware component
- "test_device_registry_calls"
- ];
- husqvarna_automower = [
- # snapshot mismatch
- "test_device_diagnostics"
- ];
- recorder = [
- # call not happening, likely due to timezone issues
- "test_auto_purge"
- ];
shell_command = [
# tries to retrieve file from github
"test_non_text_stdout_capture"
@@ -84,16 +59,12 @@ let
"test_sensor_entities"
];
websocket_api = [
- # racy
+ # AssertionError: assert 'unknown_error' == 'template_error'
"test_render_template_with_timeout"
];
};
extraPytestFlagsArray = {
- cloud = [
- # Tries to connect to alexa-api.nabucasa.com:443
- "--deselect tests/components/cloud/test_http_api.py::test_websocket_update_preferences_alexa_report_state"
- ];
dnsip = [
# Tries to resolve DNS entries
"--deselect tests/components/dnsip/test_config_flow.py::test_options_flow"
@@ -109,10 +80,13 @@ let
# aioserial mock produces wrong state
"--deselect tests/components/modem_callerid/test_init.py::test_setup_entry"
];
- velux = [
- # uses unmocked sockets
- "--deselect tests/components/velux/test_config_flow.py::test_user_success"
- "--deselect tests/components/velux/test_config_flow.py::test_import_valid_config"
+ sql = [
+ "-W"
+ "ignore::sqlalchemy.exc.SAWarning"
+ ];
+ vicare = [
+ # Snapshot 'test_all_entities[sensor.model0_electricity_consumption_today-entry]' does not exist!
+ "--deselect=tests/components/vicare/test_sensor.py::test_all_entities"
];
};
in lib.listToAttrs (map (component: lib.nameValuePair component (
diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix
index ebce97dcc464..07d668f2a07f 100644
--- a/pkgs/servers/home-automation/evcc/default.nix
+++ b/pkgs/servers/home-automation/evcc/default.nix
@@ -16,20 +16,20 @@
buildGoModule rec {
pname = "evcc";
- version = "0.131.1";
+ version = "0.131.3";
src = fetchFromGitHub {
owner = "evcc-io";
repo = "evcc";
rev = version;
- hash = "sha256-GEIiAjurbLLY+HMOxP40E3plZe2EsS82mxKSj9wheQI=";
+ hash = "sha256-HbZ/KlsiuHVsDKvCUz7+Xq6Y+XkfZ9Oe7tD3rfZrRRE=";
};
- vendorHash = "sha256-T3SmFnGOw6AJaji4tR1uK+lQj8JNcUMJErUuhwdg3gA=";
+ vendorHash = "sha256-hPCTAK4u79r9EoHkv6g1QvkRDZ95hXzyiiQpRD+0aLQ=";
npmDeps = fetchNpmDeps {
inherit src;
- hash = "sha256-RoCEvbn3sM1lLtrk+Kxi4vqYsqxJt79b0VZZgA8MQBA=";
+ hash = "sha256-4PBlN2pbr7dzZNQzh/P0kBlsg6ut2XPwsfFB132hWO0=";
};
nativeBuildInputs = [
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index a9ccebea6d11..3a29bd72b44e 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -11,6 +11,7 @@
, expat
, fdk_aac
, ffmpeg-headless
+, ffmpeg_6-headless
, geoip
, libbsd
, libiconv
@@ -991,7 +992,7 @@ let self = {
'';
};
- inputs = [ ffmpeg-headless fdk_aac openssl libxml2 libiconv ];
+ inputs = [ ffmpeg_6-headless fdk_aac openssl libxml2 libiconv ];
meta = with lib; {
description = "VOD packager";
diff --git a/pkgs/servers/http/router/default.nix b/pkgs/servers/http/router/default.nix
index c5a2f7d33c14..40eac67fdb64 100644
--- a/pkgs/servers/http/router/default.nix
+++ b/pkgs/servers/http/router/default.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "router";
- version = "1.55.0";
+ version = "1.56.0";
src = fetchFromGitHub {
owner = "apollographql";
repo = pname;
rev = "v${version}";
- hash = "sha256-qnjerjU940Tl/2kmvIMU5K40Qtv3Ukrou6uTuBcwfbQ=";
+ hash = "sha256-4l9nTbtF8hy2x1fdRhmMKcYxTD6wWKXIfihLTWdtm7U=";
};
- cargoHash = "sha256-gl2UTAljMsjm+TrSjHGEXqJGHdx5PB1Jobm7aNX2nFY=";
+ cargoHash = "sha256-zeMUw/OLPXM1uARrUeva90DLgpD5qFDhVKWgP/c3w7g=";
nativeBuildInputs = [
cmake
diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index e917a9558ce3..12a242a4ed28 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -24,6 +24,7 @@ let
"out"
"webapps"
];
+
installPhase = ''
mkdir $out
mv * $out
@@ -67,4 +68,9 @@ in
version = "10.1.30";
hash = "sha256-jeWoCPPcdirOZ5SM2Q0TJ7EWgWYiBE3IdQ8EIH35Ci4=";
};
+
+ tomcat11 = common {
+ version = "11.0.0";
+ hash = "sha256-0MoxmvNJg49ZAJqcXtNwnwI0QgEFnbwm3OQxPulpzSA=";
+ };
}
diff --git a/pkgs/servers/http/webhook/default.nix b/pkgs/servers/http/webhook/default.nix
index d4ee36713e4c..2b61d877f0bc 100644
--- a/pkgs/servers/http/webhook/default.nix
+++ b/pkgs/servers/http/webhook/default.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "webhook";
- version = "2.8.1";
+ version = "2.8.2";
src = fetchFromGitHub {
owner = "adnanh";
repo = "webhook";
rev = version;
- sha256 = "sha256-8OpVpm9nEroUlr41VgnyM6sxd/FlSvoQK5COOWvo4Y4=";
+ sha256 = "sha256-3Ew72ADGTlvp6w37nYbCng7HHCZ0a7kVf3DNRNyCkZU=";
};
vendorHash = null;
diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix
index 18f94c599863..160185c5f3dd 100644
--- a/pkgs/servers/imgproxy/default.nix
+++ b/pkgs/servers/imgproxy/default.nix
@@ -3,16 +3,16 @@
buildGoModule rec {
pname = "imgproxy";
- version = "3.26.0";
+ version = "3.26.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
- hash = "sha256-sjgSbKKTUq6HL7QZ3LNU1Eo+2n/KnlY7Yt80lXAR26k=";
+ hash = "sha256-r8yczisCN2jfWFc0L+EIgJLw5MPK4r5+lJsW6FM2hUY=";
rev = "v${version}";
};
- vendorHash = "sha256-YxZuAo8l3fhCGCEQVPzKeVdL7i4jWe8rZ5pILI4NVP4=";
+ vendorHash = "sha256-LGQ+JJ3OqDisT+CsnseVO54wyRTOkGpG9/zzpJw9P1I=";
nativeBuildInputs = [ pkg-config gobject-introspection ];
diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix
index 2bf5cc37a441..e89feea01c14 100644
--- a/pkgs/servers/keycloak/default.nix
+++ b/pkgs/servers/keycloak/default.nix
@@ -18,11 +18,11 @@ let
'';
in stdenv.mkDerivation rec {
pname = "keycloak";
- version = "26.0.1";
+ version = "26.0.2";
src = fetchzip {
url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
- hash = "sha256-8dA38Xjvr5+LqyD222mOg8RIhw3gFbilPgVxlrdiCq4=";
+ hash = "sha256-bhzzhFYMimGts5EElvlRpii4UGPzug6R0/F1lfbXKok=";
};
nativeBuildInputs = [ makeWrapper jre ];
diff --git a/pkgs/servers/limesurvey/default.nix b/pkgs/servers/limesurvey/default.nix
index 9f7db0b916b6..ecffaa1fe27d 100644
--- a/pkgs/servers/limesurvey/default.nix
+++ b/pkgs/servers/limesurvey/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "limesurvey";
- version = "6.4.1+240108";
+ version = "6.6.5+240924";
src = fetchFromGitHub {
owner = "LimeSurvey";
repo = "LimeSurvey";
rev = version;
- hash = "sha256-Cpf8X6igF7LdRbFihGudFmx/8aY0Kf0BE7jHnEF1DYA=";
+ hash = "sha256-CuuTFCDY7jnF2njZdyB6e8/nRf0n0ybKgZ0QscC2IAI=";
};
phpConfig = writeText "config.php" ''
diff --git a/pkgs/servers/mail/mailpit/source.nix b/pkgs/servers/mail/mailpit/source.nix
index cf45c132f677..f6b15cb7f686 100644
--- a/pkgs/servers/mail/mailpit/source.nix
+++ b/pkgs/servers/mail/mailpit/source.nix
@@ -1,6 +1,6 @@
{
- version = "1.20.4";
- hash = "sha256-YvVaKNd7e+NHgRaIzzjSj2Jv4FowGJSwiPzdN2viQdk=";
- npmDepsHash = "sha256-9/55zhRLMxo51vuLcCMGiJ9VPvUF1cSm8HhvDn2UnQo=";
- vendorHash = "sha256-peE8VzgzQeawajk+bndO8lJZEGpCO17003dD90c9Xfg=";
+ version = "1.21.0";
+ hash = "sha256-u2mQfqfBfSV716FlGJyFJoRBtTs+WprM/X8i5RLuhZ0=";
+ npmDepsHash = "sha256-0PjJkGsIpnYVSUpwgtrqWVFMI9Lpjo0j7aprtFvePWQ=";
+ vendorHash = "sha256-2qqsYYyykmbnnyLHAk4/1HUps7XVQ5ve+niaayb/VQ0=";
}
diff --git a/pkgs/servers/matrix-conduit/Cargo.lock b/pkgs/servers/matrix-conduit/Cargo.lock
index 9e47fc4f2b9f..9a98f2a53ea7 100644
--- a/pkgs/servers/matrix-conduit/Cargo.lock
+++ b/pkgs/servers/matrix-conduit/Cargo.lock
@@ -487,7 +487,7 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]]
name = "conduit"
-version = "0.8.0"
+version = "0.9.0"
dependencies = [
"async-trait",
"axum 0.7.5",
@@ -1158,6 +1158,15 @@ dependencies = [
"itoa",
]
+[[package]]
+name = "http-auth"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643c9bbf6a4ea8a656d6b4cd53d34f79e3f841ad5203c1a55fb7d761923bc255"
+dependencies = [
+ "memchr",
+]
+
[[package]]
name = "http-body"
version = "0.4.6"
@@ -1194,9 +1203,9 @@ dependencies = [
[[package]]
name = "httparse"
-version = "1.8.0"
+version = "1.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
[[package]]
name = "httpdate"
@@ -2223,7 +2232,7 @@ dependencies = [
[[package]]
name = "ruma"
version = "0.10.1"
-source = "git+https://github.com/ruma/ruma#ef40b184b7410a93e933b4ad719a72aea1bdd20e"
+source = "git+https://github.com/ruma/ruma#c06af4385e0e30c48a8e9ca3d488da32102d0db9"
dependencies = [
"assign",
"js_int",
@@ -2244,7 +2253,7 @@ dependencies = [
[[package]]
name = "ruma-appservice-api"
version = "0.10.0"
-source = "git+https://github.com/ruma/ruma#ef40b184b7410a93e933b4ad719a72aea1bdd20e"
+source = "git+https://github.com/ruma/ruma#c06af4385e0e30c48a8e9ca3d488da32102d0db9"
dependencies = [
"js_int",
"ruma-common",
@@ -2256,7 +2265,7 @@ dependencies = [
[[package]]
name = "ruma-client-api"
version = "0.18.0"
-source = "git+https://github.com/ruma/ruma#ef40b184b7410a93e933b4ad719a72aea1bdd20e"
+source = "git+https://github.com/ruma/ruma#c06af4385e0e30c48a8e9ca3d488da32102d0db9"
dependencies = [
"as_variant",
"assign",
@@ -2279,7 +2288,7 @@ dependencies = [
[[package]]
name = "ruma-common"
version = "0.13.0"
-source = "git+https://github.com/ruma/ruma#ef40b184b7410a93e933b4ad719a72aea1bdd20e"
+source = "git+https://github.com/ruma/ruma#c06af4385e0e30c48a8e9ca3d488da32102d0db9"
dependencies = [
"as_variant",
"base64 0.22.1",
@@ -2309,7 +2318,7 @@ dependencies = [
[[package]]
name = "ruma-events"
version = "0.28.1"
-source = "git+https://github.com/ruma/ruma#ef40b184b7410a93e933b4ad719a72aea1bdd20e"
+source = "git+https://github.com/ruma/ruma#c06af4385e0e30c48a8e9ca3d488da32102d0db9"
dependencies = [
"as_variant",
"indexmap 2.2.6",
@@ -2325,15 +2334,22 @@ dependencies = [
"thiserror",
"tracing",
"url",
+ "web-time",
"wildmatch",
]
[[package]]
name = "ruma-federation-api"
version = "0.9.0"
-source = "git+https://github.com/ruma/ruma#ef40b184b7410a93e933b4ad719a72aea1bdd20e"
+source = "git+https://github.com/ruma/ruma#c06af4385e0e30c48a8e9ca3d488da32102d0db9"
dependencies = [
+ "bytes",
+ "http 1.1.0",
+ "httparse",
"js_int",
+ "memchr",
+ "mime",
+ "rand",
"ruma-common",
"ruma-events",
"serde",
@@ -2343,7 +2359,7 @@ dependencies = [
[[package]]
name = "ruma-identifiers-validation"
version = "0.9.5"
-source = "git+https://github.com/ruma/ruma#ef40b184b7410a93e933b4ad719a72aea1bdd20e"
+source = "git+https://github.com/ruma/ruma#c06af4385e0e30c48a8e9ca3d488da32102d0db9"
dependencies = [
"js_int",
"thiserror",
@@ -2352,7 +2368,7 @@ dependencies = [
[[package]]
name = "ruma-identity-service-api"
version = "0.9.0"
-source = "git+https://github.com/ruma/ruma#ef40b184b7410a93e933b4ad719a72aea1bdd20e"
+source = "git+https://github.com/ruma/ruma#c06af4385e0e30c48a8e9ca3d488da32102d0db9"
dependencies = [
"js_int",
"ruma-common",
@@ -2362,8 +2378,9 @@ dependencies = [
[[package]]
name = "ruma-macros"
version = "0.13.0"
-source = "git+https://github.com/ruma/ruma#ef40b184b7410a93e933b4ad719a72aea1bdd20e"
+source = "git+https://github.com/ruma/ruma#c06af4385e0e30c48a8e9ca3d488da32102d0db9"
dependencies = [
+ "cfg-if",
"once_cell",
"proc-macro-crate",
"proc-macro2",
@@ -2377,7 +2394,7 @@ dependencies = [
[[package]]
name = "ruma-push-gateway-api"
version = "0.9.0"
-source = "git+https://github.com/ruma/ruma#ef40b184b7410a93e933b4ad719a72aea1bdd20e"
+source = "git+https://github.com/ruma/ruma#c06af4385e0e30c48a8e9ca3d488da32102d0db9"
dependencies = [
"js_int",
"ruma-common",
@@ -2389,18 +2406,20 @@ dependencies = [
[[package]]
name = "ruma-server-util"
version = "0.3.0"
-source = "git+https://github.com/ruma/ruma#ef40b184b7410a93e933b4ad719a72aea1bdd20e"
+source = "git+https://github.com/ruma/ruma#c06af4385e0e30c48a8e9ca3d488da32102d0db9"
dependencies = [
"headers",
+ "http 1.1.0",
+ "http-auth",
"ruma-common",
+ "thiserror",
"tracing",
- "yap",
]
[[package]]
name = "ruma-signatures"
version = "0.15.0"
-source = "git+https://github.com/ruma/ruma#ef40b184b7410a93e933b4ad719a72aea1bdd20e"
+source = "git+https://github.com/ruma/ruma#c06af4385e0e30c48a8e9ca3d488da32102d0db9"
dependencies = [
"base64 0.22.1",
"ed25519-dalek",
@@ -2416,7 +2435,7 @@ dependencies = [
[[package]]
name = "ruma-state-res"
version = "0.11.0"
-source = "git+https://github.com/ruma/ruma#ef40b184b7410a93e933b4ad719a72aea1bdd20e"
+source = "git+https://github.com/ruma/ruma#c06af4385e0e30c48a8e9ca3d488da32102d0db9"
dependencies = [
"itertools",
"js_int",
@@ -3757,12 +3776,6 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
-[[package]]
-name = "yap"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfe269e7b803a5e8e20cbd97860e136529cd83bf2c9c6d37b142467e7e1f051f"
-
[[package]]
name = "zerocopy"
version = "0.7.34"
diff --git a/pkgs/servers/matrix-conduit/default.nix b/pkgs/servers/matrix-conduit/default.nix
index 4e3ddb37db4d..9f0af06125f9 100644
--- a/pkgs/servers/matrix-conduit/default.nix
+++ b/pkgs/servers/matrix-conduit/default.nix
@@ -12,13 +12,13 @@
rustPlatform.buildRustPackage rec {
pname = "matrix-conduit";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchFromGitLab {
owner = "famedly";
repo = "conduit";
rev = "v${version}";
- hash = "sha256-/qKPeE2Ptweaf+rHOvdW0TUDLwN9D93MMgDoU4fTzEA=";
+ hash = "sha256-mQLfRAun2G/LDnw3jyFGJbOqpxh2PL8IGzFELRfAgAI=";
};
# We have to use importCargoLock here because `cargo vendor` currently doesn't support workspace
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
- "ruma-0.10.1" = "sha256-I1mTeJLo+pgIqFkn1D2De/oACQPkUELjGdyGf3MVuLQ=";
+ "ruma-0.10.1" = "sha256-VmIZ24vULpm6lF24OFZdsI5JG+XqVPpUWM/R64X17jo=";
};
};
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index a1002c847707..40a8de393f14 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -17,20 +17,20 @@ let
in
python3.pkgs.buildPythonApplication rec {
pname = "matrix-synapse";
- version = "1.117.0";
+ version = "1.118.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "element-hq";
repo = "synapse";
rev = "v${version}";
- hash = "sha256-fBxvEHkLo736Qp973XeXXG84MuZHOZfBHjKbcJpmtJw=";
+ hash = "sha256-dMa1L1MYzt/XfCD8hGt+WupAwl5l4zwVcj5mQ8KtTp8=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- hash = "sha256-Wqpt42dubiECMPfijtb8EcsKDTsVKseZ8f6VP7QBpoo=";
+ hash = "sha256-FJaj5T2wMIn/A0JNUGpXyNtPvXIAF8Ivkej4vS1S3dA=";
};
postPatch = ''
diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix
index d2d7274bf8ad..143034ecddee 100644
--- a/pkgs/servers/mautrix-signal/default.nix
+++ b/pkgs/servers/mautrix-signal/default.nix
@@ -2,6 +2,7 @@
lib,
buildGoModule,
fetchFromGitHub,
+ fetchpatch,
olm,
libsignal-ffi,
# This option enables the use of an experimental pure-Go implementation of
@@ -14,15 +15,23 @@
buildGoModule rec {
pname = "mautrix-signal";
- version = "0.7.1";
+ version = "0.7.2";
src = fetchFromGitHub {
owner = "mautrix";
repo = "signal";
rev = "v${version}";
- hash = "sha256-OjWRdYAxjYMGZswwKqGKUwCIc5qHkNBTQgIcbiRquH0=";
+ hash = "sha256-KGIlLGGVaySRrHt6P2AlnDEew/ERyrDYyN2lOz3318M=";
};
+ patches = [
+ # fixes broken media uploads, will be included in the next release
+ (fetchpatch {
+ url = "https://github.com/mautrix/signal/commit/b09995a892c9930628e1669532d9c1283a4938c8.patch";
+ hash = "sha256-M8TvCLZG5MbD/Bkpo4cxQf/19dPfbGzMyIPn9utPLco=";
+ })
+ ];
+
buildInputs = (lib.optional (!withGoolm) olm) ++ [
# must match the version used in https://github.com/mautrix/signal/tree/main/pkg/libsignalgo
# see https://github.com/mautrix/signal/issues/401
@@ -30,7 +39,7 @@ buildGoModule rec {
];
tags = lib.optional withGoolm "goolm";
- vendorHash = "sha256-oV8ILDEyMpOZy5m2mnPAZj5XAhleO8yNz49wxvZboVs=";
+ vendorHash = "sha256-bKQKO5RqgMrWq7NyNF1rj2CLp5SeBP80HWxF8MWnZ1U=";
doCheck = false;
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index d2b4fc16d436..af9673228d4a 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGo122Module, fetchFromGitHub, removeReferencesTo
+{ lib, stdenv, buildGoModule, fetchFromGitHub, removeReferencesTo
, tzdata, wire
, yarn, nodejs, python3, cacert
, jq, moreutils
@@ -6,10 +6,9 @@
, faketty
}:
-# TODO: Go back to using buildGoModule when upgrading to grafana 11.3.
-buildGo122Module rec {
+buildGoModule rec {
pname = "grafana";
- version = "11.2.2+security-01";
+ version = "11.3.0";
subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ];
@@ -17,7 +16,7 @@ buildGo122Module rec {
owner = "grafana";
repo = "grafana";
rev = "v${version}";
- hash = "sha256-1ZDX0R3t6CAdIfrYfR373olGL5orSDs2iwriAszl7qk=";
+ hash = "sha256-tPPhRCZ8auVaX68YhGzpkykxqln8zzqdAZiedpmYqlk=";
};
# borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
@@ -52,16 +51,16 @@ buildGo122Module rec {
dontFixup = true;
outputHashMode = "recursive";
outputHash = rec {
- x86_64-linux = "sha256-rz/IP6wi4VKWgO8P4Mov3oviwsDe5iBSKamArVR/+T0=";
+ x86_64-linux = "sha256-8XuRhipddv28msoSpG5WjpHc7NUEh4/+wRutKrY9r1U=";
aarch64-linux = x86_64-linux;
- aarch64-darwin = "sha256-9J9wD8nJ4JEUKroxCEBYZytywzjGkGhujdj9FcNe0rM=";
+ aarch64-darwin = "sha256-IOuE2QjZmeCOZdqA49RWoAtz2FROGqWo8Dp4wFnEkkk=";
x86_64-darwin = aarch64-darwin;
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
disallowedRequisites = [ offlineCache ];
- vendorHash = "sha256-shQ39N9YxksfzHDgHx3qjLbZfv5D1+sqtpALI0hCK3U=";
+ vendorHash = "sha256-3dRXvBmorItNa2HAFhEhMxKwD4LSKSgTUSjukOV2RSg=";
proxyVendor = true;
diff --git a/pkgs/servers/monitoring/librenms/default.nix b/pkgs/servers/monitoring/librenms/default.nix
index 34ab4c176026..2697fea5d096 100644
--- a/pkgs/servers/monitoring/librenms/default.nix
+++ b/pkgs/servers/monitoring/librenms/default.nix
@@ -24,16 +24,16 @@ let
phpPackage = php82.withExtensions ({ enabled, all }: enabled ++ [ all.memcached ]);
in phpPackage.buildComposerProject rec {
pname = "librenms";
- version = "24.8.0";
+ version = "24.9.1";
src = fetchFromGitHub {
owner = "librenms";
repo = pname;
rev = "${version}";
- sha256 = "sha256-K4aHFMTHOLkrep2XtcilbaVsQrqXvuQmYZBl3+iG6kg=";
+ sha256 = "sha256-6LNhMtw2U7/31Qsd1C8u+iT99CCdoz3qQh0hjsDM+9A=";
};
- vendorHash = "sha256-jJa4wQJQyeV6/ZkbZCxwyNi3AmPMtnUpGa4VQzkIKy4=";
+ vendorHash = "sha256-VWf1gN2VczS/4+aO+QFjBMjeritO/3dF6oeaOfSQibo=";
php = phpPackage;
@@ -53,6 +53,7 @@ in phpPackage.buildComposerProject rec {
(python3.withPackages (ps: with ps; [
pymysql
python-dotenv
+ python-memcached
redis
setuptools
psutil
diff --git a/pkgs/servers/monitoring/nagios-plugins/check_interfaces/default.nix b/pkgs/servers/monitoring/nagios-plugins/check_interfaces/default.nix
new file mode 100644
index 000000000000..510e69702c5f
--- /dev/null
+++ b/pkgs/servers/monitoring/nagios-plugins/check_interfaces/default.nix
@@ -0,0 +1,46 @@
+{
+ check_interfaces,
+ fetchurl,
+ lib,
+ net-snmp,
+ nix-update-script,
+ stdenv,
+ testers,
+}:
+stdenv.mkDerivation rec {
+ pname = "check_interfaces";
+ version = "1.4.4";
+
+ src = fetchurl {
+ url = "https://github.com/NETWAYS/check_interfaces/releases/download/v${version}/check_interfaces-${version}.tar.gz";
+ hash = "sha256-sQ2lee2gxyrl455tumMJ4EbKc8mYEDXl18Wik6daf5Q=";
+ };
+
+ buildInputs = [ net-snmp ];
+
+ configureFlags = [ "--libexecdir=${placeholder "out"}/bin" ];
+
+ enableParallelBuilding = true;
+
+ postInstall = ''
+ # Remove unnecessary header files
+ rm --recursive $out/include
+ '';
+
+ passthru = {
+ updateScript = nix-update-script { };
+ tests.version = testers.testVersion {
+ package = check_interfaces;
+ };
+ };
+
+ meta = with lib; {
+ changelog = "https://github.com/NETWAYS/check_interfaces/releases/tag/v${version}";
+ description = "Icinga check plugin for network hardware interfaces";
+ homepage = "https://github.com/NETWAYS/check_interfaces/";
+ license = with licenses; [ gpl2Only ];
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ jwillikers ];
+ mainProgram = "check_interfaces";
+ };
+}
diff --git a/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix b/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix
index c31f28dbfdc9..9ad31b8efaa0 100644
--- a/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix
+++ b/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "check_ssl_cert";
- version = "2.84.4";
+ version = "2.84.5";
src = fetchFromGitHub {
owner = "matteocorti";
repo = "check_ssl_cert";
rev = "refs/tags/v${version}";
- hash = "sha256-HVif2pjVumrf2YFSHbNiL9pfXy8XNeXHRgaIlx/Tzds=";
+ hash = "sha256-4/vrJ3G45kEg77IbLlWqQYpYYnqMxW3lr9tPGbv5Qno=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/monitoring/nagios-plugins/check_uptime/default.nix b/pkgs/servers/monitoring/nagios-plugins/check_uptime/default.nix
index 7f6913794d02..dc707f2f3725 100644
--- a/pkgs/servers/monitoring/nagios-plugins/check_uptime/default.nix
+++ b/pkgs/servers/monitoring/nagios-plugins/check_uptime/default.nix
@@ -7,7 +7,7 @@
stdenv.mkDerivation {
pname = "check-uptime";
- version = "unstable-2016-11-12";
+ version = "0-unstable-2016-11-12";
src = fetchFromGitHub {
owner = "madrisan";
diff --git a/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix b/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix
index 0a421e95b976..0e13f54bf5bd 100644
--- a/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix
+++ b/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix
@@ -2,7 +2,6 @@
autoreconfHook,
coreutils,
fetchFromGitHub,
- fetchurl,
gnugrep,
gnused,
lib,
@@ -12,28 +11,16 @@
}:
let
- glplugin = fetchFromGitHub {
- owner = "lausser";
- repo = "GLPlugin";
- rev = "ef3107f01afe55fad5452e64ac5bbea00b18a8d5";
- sha256 = "047fwrycsl2vmpi4wl46fs6f8y191d6qc9ms5rvmrj1dm2r828ws";
- };
-
generic =
{
pname,
version,
- sha256,
+ src,
description,
buildInputs,
}:
stdenv.mkDerivation {
- inherit pname version;
-
- src = fetchurl {
- url = "https://labs.consol.de/assets/downloads/nagios/${pname}-${version}.tar.gz";
- inherit sha256;
- };
+ inherit pname version src;
buildInputs = [ perlPackages.perl ] ++ buildInputs;
@@ -42,9 +29,7 @@ let
makeWrapper
];
- prePatch = ''
- rm -rf GLPlugin
- ln -s ${glplugin} GLPlugin
+ postPatch = ''
substituteInPlace plugins-scripts/Makefile.am \
--replace-fail /bin/cat ${lib.getExe' coreutils "cat"} \
--replace-fail /bin/echo ${lib.getExe' coreutils "echo"} \
@@ -74,26 +59,50 @@ let
in
{
- check_mssql_health = generic {
+ check_mssql_health = generic rec {
pname = "check-mssql-health";
- version = "2.6.4.15";
- sha256 = "12z0b3c2p18viy7s93r6bbl8fvgsqh80136d07118qhxshp1pwxg";
+ version = "2.7.7";
+
+ src = fetchFromGitHub {
+ owner = "lausser";
+ repo = "check_mssql_health";
+ rev = "refs/tags/${version}";
+ hash = "sha256-K6sGrms9z59a9rkZNulwKBexGF2Nkqqak/cRg12ynxc=";
+ fetchSubmodules = true;
+ };
+
description = "Check plugin for Microsoft SQL Server";
buildInputs = [ perlPackages.DBDsybase ];
};
- check_nwc_health = generic {
+ check_nwc_health = generic rec {
pname = "check-nwc-health";
- version = "7.10.0.6";
- sha256 = "092rhaqnk3403z0y60x38vgh65gcia3wrd6gp8mr7wszja38kxv2";
+ version = "11.7";
+
+ src = fetchFromGitHub {
+ owner = "lausser";
+ repo = "check_nwc_health";
+ rev = "refs/tags/${version}";
+ hash = "sha256-r8Cb9RnEohNp0GxMAIaj7e08dTWZhuV1jz4/b8tuJ6k=";
+ fetchSubmodules = true;
+ };
+
description = "Check plugin for network equipment";
buildInputs = [ perlPackages.NetSNMP ];
};
- check_ups_health = generic {
+ check_ups_health = generic rec {
pname = "check-ups-health";
- version = "2.8.3.3";
- sha256 = "0qc2aglppwr9ms4p53kh9nr48625sqrbn46xs0k9rx5sv8hil9hm";
+ version = "4.3.1.1";
+
+ src = fetchFromGitHub {
+ owner = "lausser";
+ repo = "check_ups_health";
+ rev = "refs/tags/${version}";
+ hash = "sha256-ZGSTPVJObP49/tDASOCh4wVdMKajheHD+xVTiFf101k=";
+ fetchSubmodules = true;
+ };
+
description = "Check plugin for UPSs";
buildInputs = [ perlPackages.NetSNMP ];
};
diff --git a/pkgs/servers/monitoring/nagios-plugins/manubulon-snmp-plugins/default.nix b/pkgs/servers/monitoring/nagios-plugins/manubulon-snmp-plugins/default.nix
new file mode 100644
index 000000000000..edb8f7dca0fa
--- /dev/null
+++ b/pkgs/servers/monitoring/nagios-plugins/manubulon-snmp-plugins/default.nix
@@ -0,0 +1,67 @@
+{
+ fetchFromGitHub,
+ lib,
+ makeWrapper,
+ manubulon-snmp-plugins,
+ nix-update-script,
+ perlPackages,
+ stdenv,
+ testers,
+}:
+stdenv.mkDerivation rec {
+ pname = "manubulon-snmp-plugins";
+ version = "2.1.0-unstable-2024-03-13";
+
+ src = fetchFromGitHub {
+ owner = "SteScho";
+ repo = "manubulon-snmp";
+ rev = "1a5afb2486802034146277010d956eba9c2ad54b";
+ hash = "sha256-B5CCGMkNv1wGnLQIl0yiGTH2j5MOlj5+MrRqbLNIwhE=";
+ };
+
+ buildInputs = with perlPackages; [
+ CryptDES
+ CryptRijndael
+ DigestHMAC
+ DigestSHA1
+ GetoptLongDescriptive
+ NetSNMP
+ perl
+ ];
+
+ nativeBuildInputs = [
+ makeWrapper
+ ];
+
+ installPhase = ''
+ runHook preInstall
+ mkdir --parents $out/bin
+ install --mode=0755 plugins/*.pl $out/bin
+ runHook postInstall
+ '';
+
+ postFixup = ''
+ for f in $out/bin/* ; do
+ wrapProgram $f --set PERL5LIB $PERL5LIB --set LC_ALL C
+ done
+ '';
+
+ passthru = {
+ updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+ tests.version = testers.testVersion {
+ package = manubulon-snmp-plugins;
+ # Program returns status code 3
+ command = "check_snmp_int.pl --version || true";
+ version = builtins.head (lib.splitString "-" version);
+ };
+ };
+
+ meta = with lib; {
+ changelog = "https://github.com/SteScho/manubulon-snmp/releases/tag/v${version}";
+ description = "Set of Icinga/Nagios plugins to check hosts and hardware with the SNMP protocol";
+ homepage = "https://github.com/SteScho/manubulon-snmp";
+ license = with licenses; [ gpl2Only ];
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ jwillikers ];
+ };
+}
diff --git a/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix b/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix
new file mode 100644
index 000000000000..62b435a890c9
--- /dev/null
+++ b/pkgs/servers/monitoring/nagios-plugins/openbsd_snmp3_check/default.nix
@@ -0,0 +1,41 @@
+{
+ fetchFromGitHub,
+ lib,
+ nix-update-script,
+ openbsd_snmp3_check,
+ python3Packages,
+ testers,
+}:
+python3Packages.buildPythonApplication rec {
+ pname = "openbsd_snmp3_check";
+ version = "0.55";
+ pyproject = false;
+
+ src = fetchFromGitHub {
+ owner = "alexander-naumov";
+ repo = "openbsd_snmp3_check";
+ rev = "v${version}";
+ hash = "sha256-qDYANMvQU72f9wz8os7S1PfBH08AAqhtWLHVuSmkub4=";
+ };
+
+ postInstall = ''
+ install -Dm755 openbsd_snmp3.py $out/bin/openbsd_snmp3.py
+ '';
+
+ passthru = {
+ updateScript = nix-update-script { };
+ tests.version = testers.testVersion {
+ package = openbsd_snmp3_check;
+ };
+ };
+
+ meta = with lib; {
+ changelog = "https://github.com/alexander-naumov/openbsd_snmp3_check/releases/tag/v${version}";
+ description = "SNMP v3 check for OpenBSD systems state monitoring";
+ homepage = "https://github.com/alexander-naumov/openbsd_snmp3_check";
+ license = with licenses; [ bsd3 ];
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ jwillikers ];
+ mainProgram = "openbsd_snmp3.py";
+ };
+}
diff --git a/pkgs/servers/monitoring/nagios-plugins/plugins.nix b/pkgs/servers/monitoring/nagios-plugins/plugins.nix
index e4adccaa10e0..d49c914d2a41 100644
--- a/pkgs/servers/monitoring/nagios-plugins/plugins.nix
+++ b/pkgs/servers/monitoring/nagios-plugins/plugins.nix
@@ -2,6 +2,7 @@
{
check_esxi_hardware = callPackage ./check_esxi_hardware { };
+ check_interfaces = callPackage ./check_interfaces { };
check_openvpn = callPackage ./check_openvpn { };
check_smartmon = callPackage ./check_smartmon { };
check_ssl_cert = callPackage ./check_ssl_cert { };
@@ -11,4 +12,6 @@
check_zfs = callPackage ./check_zfs { };
inherit (callPackage ./labs_consol_de { }) check_mssql_health check_nwc_health check_ups_health;
+ manubulon-snmp-plugins = callPackage ./manubulon-snmp-plugins { };
+ openbsd_snmp3_check = callPackage ./openbsd_snmp3_check { };
}
diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
index 474067622453..6a5c9e0ae8cc 100644
--- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
@@ -13,7 +13,14 @@ buildGoModule rec {
vendorHash = "sha256-qmyqAbwQYgUFFQwCLakQGta2XMGCbCOvCB93S8/TWIs=";
- ldflags = [ "-s" "-w" "-X main.version=${version}" ];
+ ldflags = let t = "github.com/prometheus/common/version"; in [
+ "-s"
+ "-w"
+ "-X ${t}.Version=${version}"
+ "-X ${t}.Branch=unknown"
+ "-X ${t}.BuildUser=nix@nixpkgs"
+ "-X ${t}.BuildDate=unknown"
+ ];
passthru.tests = { inherit (nixosTests.prometheus-exporters) nginx; };
diff --git a/pkgs/servers/monitoring/prometheus/tor-exporter.nix b/pkgs/servers/monitoring/prometheus/tor-exporter.nix
deleted file mode 100644
index c12e92c5ee56..000000000000
--- a/pkgs/servers/monitoring/prometheus/tor-exporter.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ lib, fetchFromGitHub, python3Packages, nixosTests }:
-
-python3Packages.buildPythonApplication rec {
- pname = "tor-exporter";
- version = "0.4";
-
- # Just a single .py file to use as the application's main entry point.
- format = "other";
-
- src = fetchFromGitHub {
- rev = "v${version}";
- owner = "atx";
- repo = "prometheus-tor_exporter";
- sha256 = "1gzf42z0cgdqijbi9cwpjkqzkvnabaxkkfa5ac5h27r3pxx3q4n0";
- };
-
- propagatedBuildInputs = with python3Packages; [ prometheus-client stem retrying ];
-
- installPhase = ''
- mkdir -p $out/share/
- cp prometheus-tor-exporter.py $out/share/
- '';
-
- fixupPhase = ''
- makeWrapper "${python3Packages.python.interpreter}" "$out/bin/prometheus-tor-exporter" \
- --set PYTHONPATH "$PYTHONPATH" \
- --add-flags "$out/share/prometheus-tor-exporter.py"
- '';
-
- passthru.tests = { inherit (nixosTests.prometheus-exporters) tor; };
-
- meta = with lib; {
- description = "Prometheus exporter that exposes metrics from a Tor daemon";
- mainProgram = "prometheus-tor-exporter";
- homepage = "https://github.com/atx/prometheus-tor_exporter";
- license = licenses.mit;
- maintainers = with maintainers; [ Scrumplex ];
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix
index 53a5601c5171..422c3e885a63 100644
--- a/pkgs/servers/nfs-ganesha/default.nix
+++ b/pkgs/servers/nfs-ganesha/default.nix
@@ -20,7 +20,7 @@
stdenv.mkDerivation rec {
pname = "nfs-ganesha";
- version = "6.1";
+ version = "6.2";
outputs = [
"out"
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
owner = "nfs-ganesha";
repo = "nfs-ganesha";
rev = "V${version}";
- hash = "sha256-XQpbQ7NXVGVbm99d1ZEh1ckR5fd81xwZw8HorXHaeBk=";
+ hash = "sha256-wWN9E6QxipTh5ppEyEbhqG0uSVjd+DzWgY/oj5FIso0=";
};
preConfigure = "cd src";
diff --git a/pkgs/servers/owntracks-recorder/default.nix b/pkgs/servers/owntracks-recorder/default.nix
index 98c97f833bde..46460f912b45 100644
--- a/pkgs/servers/owntracks-recorder/default.nix
+++ b/pkgs/servers/owntracks-recorder/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "owntracks-recorder";
- version = "0.9.8";
+ version = "0.9.9";
src = fetchFromGitHub {
owner = "owntracks";
repo = "recorder";
rev = finalAttrs.version;
- hash = "sha256-h+hjcaa+Ooa8gErjzfX+p+S24fbnCOtjfliFWVj73dI=";
+ hash = "sha256-6oCWzTiQgpp75xojd2ZFsrg+Kd5/gex1BPQVOWHfMuk=";
};
nativeBuildInputs = [
diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix
index 37b72c4538da..5704232a1495 100644
--- a/pkgs/servers/pocketbase/default.nix
+++ b/pkgs/servers/pocketbase/default.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "pocketbase";
- version = "0.22.21";
+ version = "0.22.22";
src = fetchFromGitHub {
owner = "pocketbase";
repo = "pocketbase";
rev = "v${version}";
- hash = "sha256-KpW2ThWbAD/c1Z7xSCEbguMTPfBkgngxjXWOPvf5658=";
+ hash = "sha256-X2m7BBAF91wcWlzYYhAw9PuBzMQHtRsCrgh08VaITGg=";
};
- vendorHash = "sha256-5lfjwCh930B5k8KbUDW81HkmiO7io4RqEr4VP8MikeA=";
+ vendorHash = "sha256-ItuwB3Dk89fazRZL0l5EPMJ8VGC3p2jwECYVquV7xsc=";
# This is the released subpackage from upstream repo
subPackages = [ "examples/base" ];
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 1e0f60224b5f..ae7a489d4b35 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -128,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: {
++ optionals stdenv.hostPlatform.isDarwin [ libiconv ]
++ optionals enableLDAP [ openldap.dev python3Packages.markdown ]
++ optionals (!enableLDAP && stdenv.hostPlatform.isLinux) [ ldb talloc tevent ]
- ++ optional (enablePrinting && stdenv.hostPlatform.isLinux) cups
+ ++ optional enablePrinting cups
++ optional enableMDNS avahi
++ optionals enableDomainController [ gpgme lmdb python3Packages.dnspython ]
++ optional enableRegedit ncurses
@@ -160,6 +160,7 @@ stdenv.mkDerivation (finalAttrs: {
"--sysconfdir=/etc"
"--localstatedir=/var"
"--disable-rpath"
+ (lib.enableFeature enablePrinting "cups")
] ++ optional (!enableDomainController)
"--without-ad-dc"
++ optionals (!enableLDAP) [
diff --git a/pkgs/servers/search/meilisearch/Cargo.lock b/pkgs/servers/search/meilisearch/Cargo.lock
index e6cf59d4cadf..9fdf0cb2da83 100644
--- a/pkgs/servers/search/meilisearch/Cargo.lock
+++ b/pkgs/servers/search/meilisearch/Cargo.lock
@@ -471,7 +471,7 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]]
name = "benchmarks"
-version = "1.10.2"
+version = "1.10.3"
dependencies = [
"anyhow",
"bytes",
@@ -652,7 +652,7 @@ dependencies = [
[[package]]
name = "build-info"
-version = "1.10.2"
+version = "1.10.3"
dependencies = [
"anyhow",
"time",
@@ -1622,7 +1622,7 @@ dependencies = [
[[package]]
name = "dump"
-version = "1.10.2"
+version = "1.10.3"
dependencies = [
"anyhow",
"big_s",
@@ -1834,7 +1834,7 @@ checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
[[package]]
name = "file-store"
-version = "1.10.2"
+version = "1.10.3"
dependencies = [
"tempfile",
"thiserror",
@@ -1856,7 +1856,7 @@ dependencies = [
[[package]]
name = "filter-parser"
-version = "1.10.2"
+version = "1.10.3"
dependencies = [
"insta",
"nom",
@@ -1876,7 +1876,7 @@ dependencies = [
[[package]]
name = "flatten-serde-json"
-version = "1.10.2"
+version = "1.10.3"
dependencies = [
"criterion",
"serde_json",
@@ -2000,7 +2000,7 @@ dependencies = [
[[package]]
name = "fuzzers"
-version = "1.10.2"
+version = "1.10.3"
dependencies = [
"arbitrary",
"clap",
@@ -2552,7 +2552,7 @@ checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d"
[[package]]
name = "index-scheduler"
-version = "1.10.2"
+version = "1.10.3"
dependencies = [
"anyhow",
"arroy",
@@ -2746,7 +2746,7 @@ dependencies = [
[[package]]
name = "json-depth-checker"
-version = "1.10.2"
+version = "1.10.3"
dependencies = [
"criterion",
"serde_json",
@@ -3365,7 +3365,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
[[package]]
name = "meili-snap"
-version = "1.10.2"
+version = "1.10.3"
dependencies = [
"insta",
"md5",
@@ -3374,7 +3374,7 @@ dependencies = [
[[package]]
name = "meilisearch"
-version = "1.10.2"
+version = "1.10.3"
dependencies = [
"actix-cors",
"actix-http",
@@ -3463,7 +3463,7 @@ dependencies = [
[[package]]
name = "meilisearch-auth"
-version = "1.10.2"
+version = "1.10.3"
dependencies = [
"base64 0.22.1",
"enum-iterator",
@@ -3482,7 +3482,7 @@ dependencies = [
[[package]]
name = "meilisearch-types"
-version = "1.10.2"
+version = "1.10.3"
dependencies = [
"actix-web",
"anyhow",
@@ -3512,7 +3512,7 @@ dependencies = [
[[package]]
name = "meilitool"
-version = "1.10.2"
+version = "1.10.3"
dependencies = [
"anyhow",
"clap",
@@ -3542,7 +3542,7 @@ dependencies = [
[[package]]
name = "milli"
-version = "1.10.2"
+version = "1.10.3"
dependencies = [
"arroy",
"big_s",
@@ -3976,7 +3976,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]]
name = "permissive-json-pointer"
-version = "1.10.2"
+version = "1.10.3"
dependencies = [
"big_s",
"serde_json",
@@ -6361,7 +6361,7 @@ dependencies = [
[[package]]
name = "xtask"
-version = "1.10.2"
+version = "1.10.3"
dependencies = [
"anyhow",
"build-info",
diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix
index a7e8c7f8cbc0..e87fe1f9b60f 100644
--- a/pkgs/servers/search/meilisearch/default.nix
+++ b/pkgs/servers/search/meilisearch/default.nix
@@ -10,7 +10,7 @@
}:
let
- version = "1.10.2";
+ version = "1.10.3";
in
rustPlatform.buildRustPackage {
pname = "meilisearch";
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
owner = "meilisearch";
repo = "meiliSearch";
rev = "refs/tags/v${version}";
- hash = "sha256-gI0Azbb4gYFf4E/oIoJbln/mkbJIenSPzGUVliGzOzE=";
+ hash = "sha256-OKy4y11akNGGrRzMHbIWe3MpZCz7qyofsJMAL06NDpo=";
};
cargoBuildFlags = [ "--package=meilisearch" ];
diff --git a/pkgs/servers/simple-http-server/default.nix b/pkgs/servers/simple-http-server/default.nix
index cb4fe1300062..fe84eaf3a2d3 100644
--- a/pkgs/servers/simple-http-server/default.nix
+++ b/pkgs/servers/simple-http-server/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "simple-http-server";
- version = "0.6.9";
+ version = "0.6.10";
src = fetchFromGitHub {
owner = "TheWaWaR";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-JY3j/SCBm485w4x3EDTjDQw/N+t+3FvQyY9b7SQKhak=";
+ sha256 = "sha256-r8Ush6cdGNxcRB3RSRJLtjseII5SQt9+oMqOTBmVfaY=";
};
- cargoHash = "sha256-6Gg4CDqlMtiOHJSeMfg9rP0CgP57GGfnuoqAXFuL8jo=";
+ cargoHash = "sha256-RdHcMnUctHYdQRsF6T9w8FoD56Bv4Xm0Jlu4Rls0C+M=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix
index 530ada2bb527..78b73b158555 100644
--- a/pkgs/servers/spicedb/default.nix
+++ b/pkgs/servers/spicedb/default.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "spicedb";
- version = "1.37.0";
+ version = "1.37.1";
src = fetchFromGitHub {
owner = "authzed";
repo = "spicedb";
rev = "v${version}";
- hash = "sha256-ClBT0S5pb/XRQftvbnwqGJE6SBuGQCvb/A8oY/tv0/c=";
+ hash = "sha256-15X9Q6akidXTYO5U3MYi14u8shTicQQ9wGSVOcefxhg=";
};
vendorHash = "sha256-aTfjSGen9rJ/GTCUFuuEykNqQNsnuNyRGm7CtMSZoJ0=";
diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix
index b4f5724bcf77..21105ea723ca 100644
--- a/pkgs/servers/sql/pgpool/default.nix
+++ b/pkgs/servers/sql/pgpool/default.nix
@@ -10,12 +10,12 @@
stdenv.mkDerivation rec {
pname = "pgpool-II";
- version = "4.5.2";
+ version = "4.5.4";
src = fetchurl {
url = "https://www.pgpool.net/mediawiki/download.php?f=pgpool-II-${version}.tar.gz";
name = "pgpool-II-${version}.tar.gz";
- hash = "sha256-SArCPwHNfWyFayk4a/F6hIcS+0tAV9TIq9XIv4Gb3wY=";
+ hash = "sha256-0TkudM4oB/iuYohyyxq3kUJJkhGA3JnfQKHWAmR6EP0=";
};
buildInputs = [
diff --git a/pkgs/servers/sql/postgresql/17.nix b/pkgs/servers/sql/postgresql/17.nix
new file mode 100644
index 000000000000..5d8d8cd693c2
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/17.nix
@@ -0,0 +1,6 @@
+import ./generic.nix {
+ version = "17.0";
+ hash = "sha256-fidhMcD91rYliNutmzuyS4w0mNUAkyjbpZrxboGRCd4=";
+ # TODO: Add dont-use-locale-a-on-musl.patch once Alpine Linux has PostgreSQL 17.
+ # MR in: https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/72853
+}
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 3040e8074b32..8eb20188651f 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -14,6 +14,7 @@ let
postgresql_14 = ./14.nix;
postgresql_15 = ./15.nix;
postgresql_16 = ./16.nix;
+ postgresql_17 = ./17.nix;
};
mkAttributes = jitSupport:
diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix
index b80d1c203b2c..695a0093c225 100644
--- a/pkgs/servers/sql/postgresql/ext/age.nix
+++ b/pkgs/servers/sql/postgresql/ext/age.nix
@@ -2,6 +2,8 @@
let
hashes = {
+ # Issue tracking PostgreSQL 17 support: https://github.com/apache/age/issues/2111
+ # "17" = "";
"16" = "sha256-sXh/vmGyYj00ALfFVdeql2DZ6nCJQDNKyNgzlOZnPAw=";
"15" = "sha256-webZWgWZGnSoXwTpk816tjbtHV1UIlXkogpBDAEL4gM=";
"14" = "sha256-jZXhcYBubpjIJ8M5JHXKV5f6VK/2BkypH3P7nLxZz3E=";
diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix
index 28d6139f0a50..b4c08b4ceab1 100644
--- a/pkgs/servers/sql/postgresql/ext/citus.nix
+++ b/pkgs/servers/sql/postgresql/ext/citus.nix
@@ -41,7 +41,10 @@ stdenv.mkDerivation rec {
# "Our soft policy for Postgres version compatibility is to support Citus'
# latest release with Postgres' 3 latest releases."
# https://www.citusdata.com/updates/v12-0/#deprecated_features
- broken = versionOlder postgresql.version "14";
+ broken = versionOlder postgresql.version "14" ||
+ # PostgreSQL 17 support issue upstream: https://github.com/citusdata/citus/issues/7708
+ # Check after next package update.
+ (versionAtLeast postgresql.version "17" && version == "12.1.2");
description = "Distributed PostgreSQL as an extension";
homepage = "https://www.citusdata.com/";
changelog = "https://github.com/citusdata/citus/blob/${src.rev}/CHANGELOG.md";
diff --git a/pkgs/servers/sql/postgresql/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/lantern.nix
index 80263fc2b4a9..0138594cd105 100644
--- a/pkgs/servers/sql/postgresql/ext/lantern.nix
+++ b/pkgs/servers/sql/postgresql/ext/lantern.nix
@@ -2,27 +2,33 @@
, stdenv
, cmake
, fetchFromGitHub
+, openssl
, postgresql
, postgresqlTestExtension
}:
stdenv.mkDerivation (finalAttrs: {
pname = "postgresql-lantern";
- version = "0.2.4";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "lanterndata";
repo = "lantern";
rev = "v${finalAttrs.version}";
- hash = "sha256-d5CdS11Z0u8+oPvjH6gVx6k8y05SS6wU3PnafcEgQeY=";
+ hash = "sha256-V8W61hELXeaVvNZgRUcckFlCMWis7NENlRKySxsK/L8=";
fetchSubmodules = true;
};
+ postPatch = ''
+ patchShebangs --build lantern_hnsw/scripts/link_llvm_objects.sh
+ '';
+
nativeBuildInputs = [
cmake
];
buildInputs = [
+ openssl
postgresql
];
@@ -38,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
"-DBUILD_FOR_DISTRIBUTING=ON"
+ "-S ../lantern_hnsw"
];
passthru.tests.extension = postgresqlTestExtension {
diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
index 42d055a029ae..74bf0b8eda64 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
@@ -28,5 +28,8 @@ stdenv.mkDerivation rec {
maintainers = [ ];
platforms = postgresql.meta.platforms;
license = licenses.postgresql;
+ # PostgreSQL 17 support issue upstream: https://github.com/hapostgres/pg_auto_failover/issues/1048
+ # Check after next package update.
+ broken = versionAtLeast postgresql.version "17" && version == "2.1";
};
}
diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix
index 02c6e6435ae7..3dea36f7e740 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "pg_cron";
- version = "1.6.2";
+ version = "1.6.4";
buildInputs = [ postgresql ];
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "citusdata";
repo = pname;
rev = "v${version}";
- hash = "sha256-/dD1gX0+RRsBFIjSV9TVk+ppPw0Jrzssl+rRZ2qAp4w=";
+ hash = "sha256-t1DpFkPiSfdoGG2NgNT7g1lkvSooZoRoUrix6cBID40=";
};
installPhase = ''
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Run Cron jobs through PostgreSQL";
homepage = "https://github.com/citusdata/pg_cron";
- changelog = "https://github.com/citusdata/pg_cron/raw/v${version}/CHANGELOG.md";
+ changelog = "https://github.com/citusdata/pg_cron/releases/tag/v${version}";
maintainers = with maintainers; [ thoughtpolice ];
platforms = postgresql.meta.platforms;
license = licenses.postgresql;
diff --git a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix
index 010f8f819da9..57bf1b62e15f 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.renzo ];
platforms = postgresql.meta.platforms;
license = licenses.mit;
+ # Broken on darwin and linux (JIT) with no upstream fix available.
+ broken = lib.versionAtLeast postgresql.version "16" && stdenv.cc.isClang;
};
}
diff --git a/pkgs/servers/sql/postgresql/ext/pg_embedding.nix b/pkgs/servers/sql/postgresql/ext/pg_embedding.nix
index 5306a619038d..a4c1e72cc5e4 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_embedding.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_embedding.nix
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ ];
platforms = postgresql.meta.platforms;
license = licenses.asl20;
+ knownVulnerabilities = [ "As of Sept 29, 2023, the authors have abandoned the project and strongly encourage using pgvector, which is faster, has more functionality, and is actively maintained: check out the author's instructions to migrate at https://neon.tech/docs/extensions/pg_embedding#migrate-from-pg_embedding-to-pgvector" ];
};
}
diff --git a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix
index afc5b9fe6506..8983acb3152a 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix
@@ -2,6 +2,10 @@
let
source = {
+ "17" = {
+ version = "1.7.0";
+ hash = "sha256-MNQMePDmGxC8OFIJuVJrhfgU566vkng00+tjeGpGKvs=";
+ };
"16" = {
version = "1.6.0";
hash = "sha256-lg7N0QblluTgtNo1tGZjirNJSyQXtcAEs9Jqd3zx0Sg=";
diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix
index 46c01251d503..fcae540d1356 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pg_ivm";
- version = "1.8";
+ version = "1.9";
src = fetchFromGitHub {
owner = "sraoss";
repo = pname;
rev = "v${version}";
- hash = "sha256-HncWX3jx9sEvxGGMMZ9QT4tDQ4JYbkNrFw2aZHgCVE8=";
+ hash = "sha256-Qcie7sbXcMbQkMoFIYBfttmvlYooESdSk2DyebHKPlk=";
};
buildInputs = [ postgresql ];
diff --git a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
index 6637c98c9565..4aeec3e31f09 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix
@@ -21,6 +21,10 @@ with {
version = "1.5";
sha256 = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs=";
};
+ "17" = {
+ version = "1.5";
+ sha256 = "sha256-RRSpkWLFuif+6RCncnsb1NnjKnIIRY9KgebKkjCN5cs=";
+ };
}."${lib.versions.major postgresql.version}" or (throw "pg_safeupdate: version specification for pg ${postgresql.version} missing.");
stdenv.mkDerivation rec {
diff --git a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
index a0669331055b..8bcb8777c57b 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_similarity.nix
@@ -1,17 +1,27 @@
-{ stdenv, lib, fetchFromGitHub, gcc, postgresql }:
+{ stdenv, lib, fetchFromGitHub, fetchpatch, postgresql, unstableGitUpdater }:
stdenv.mkDerivation {
-
pname = "pg_similarity";
- version = "1.0";
+ version = "1.0-unstable-2021-01-12";
+
src = fetchFromGitHub {
owner = "eulerto";
repo = "pg_similarity";
- rev = "be1a8b08c8716e59b89982557da9ea68cdf868c5";
- sha256 = "1z4v4r2yccdr8kz3935fnk1bc5vj0qj0apscldyap4wxlyi89xim";
+ rev = "b9cb0a2d501b91e33cd1ef550b05483ca3563f71";
+ sha256 = "sha256-L04ANvyfzHgW7fINeJEY6T77Vojq3SI8P1TWiCRSPs0=";
};
- buildInputs = [ postgresql gcc ];
+ patches = [
+ (fetchpatch {
+ # https://github.com/eulerto/pg_similarity/pull/43
+ # Also applied in debian as https://sources.debian.org/data/main/p/pg-similarity/1.0-8/debian/patches/pg16
+ name = "pg16.patch";
+ url = "https://github.com/eulerto/pg_similarity/commit/f7781ea5ace80f697a8249e03e3ce47d4b0f6b2f.patch";
+ hash = "sha256-MPDvWfNzSg28lXL5u5/Un9pOCJjqJ4Fz9b8XCfalgts=";
+ })
+ ];
+
+ buildInputs = [ postgresql ];
makeFlags = [ "USE_PGXS=1" ];
@@ -20,6 +30,8 @@ stdenv.mkDerivation {
install -D ./{pg_similarity--unpackaged--1.0.sql,pg_similarity--1.0.sql,pg_similarity.control} -t $out/share/postgresql/extension
'';
+ passthru.updateScript = unstableGitUpdater {};
+
meta = {
description = "Extension to support similarity queries on PostgreSQL";
longDescription = ''
diff --git a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix
index 6e09fe9a7318..7d03b21d989d 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pg_squeeze";
- version = "1.6.2";
+ version = "1.7.0";
src = fetchFromGitHub {
owner = "cybertec-postgresql";
repo = "pg_squeeze";
rev = "REL${builtins.replaceStrings ["."] ["_"] finalAttrs.version}";
- hash = "sha256-YS13iIpQ4NJe0N6bRVa2RDxEMwEzBc2mjNYM5/Vqjn8=";
+ hash = "sha256-Kh1wSOvV5Rd1CG/na3yzbWzvaR8SJ6wmTZOnM+lbgik=";
};
buildInputs = [
diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix
index 2a11417c9083..b210db910411 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "pg_topn";
- version = "2.6.0";
+ version = "2.7.0";
buildInputs = [ postgresql ];
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "citusdata";
repo = "postgresql-topn";
rev = "refs/tags/v${version}";
- sha256 = "sha256-kq3P+a9NWLKN/CsISGHfInbeL4ex4KIeDhTKyyN7FVE=";
+ sha256 = "sha256-lP6Iil/BUv4ga+co+oBpKv1FBqFuBGfNjueEolM6png=";
};
installPhase = ''
diff --git a/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/pkgs/servers/sql/postgresql/ext/pgaudit.nix
index f4c03d611f50..1079a13b2dfc 100644
--- a/pkgs/servers/sql/postgresql/ext/pgaudit.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgaudit.nix
@@ -2,6 +2,10 @@
let
source = {
+ "17" = {
+ version = "17.0";
+ hash = "sha256-3ksq09wiudQPuBQI3dhEQi8IkXKLVIsPFgBnwLiicro=";
+ };
"16" = {
version = "16.0";
hash = "sha256-8+tGOl1U5y9Zgu+9O5UDDE4bec4B0JC/BQ6GLhHzQzc=";
diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
index 0ba7fa093820..3a7c9e237f98 100644
--- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pgroonga";
- version = "3.1.8";
+ version = "3.2.3";
src = fetchurl {
url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz";
- hash = "sha256-Wjh0NJK6IfcI30R7HKCsB87/lxXZYEqiMD9t2nldCW4=";
+ hash = "sha256-k9+DgiLzU2cA3jvw3pMF7/FmDGxsCYtAOaUtf2LMTnw=";
};
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix
index e8b3af416ca7..117319e606f0 100644
--- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix
@@ -93,7 +93,10 @@ in
meta = with lib; {
# Upstream removed support for PostgreSQL 12 and 13 on 0.3.0: https://github.com/tensorchord/pgvecto.rs/issues/343
- broken = stdenv.hostPlatform.isDarwin || (versionOlder postgresql.version "14");
+ broken = stdenv.hostPlatform.isDarwin || (versionOlder postgresql.version "14") ||
+ # PostgreSQL 17 support issue upstream: https://github.com/tensorchord/pgvecto.rs/issues/607
+ # Check after next package update.
+ versionAtLeast postgresql.version "17" && version == "0.3.0";
description = "Scalable, Low-latency and Hybrid-enabled Vector Search in Postgres";
homepage = "https://github.com/tensorchord/pgvecto.rs";
license = licenses.asl20;
diff --git a/pkgs/servers/sql/postgresql/ext/plr.nix b/pkgs/servers/sql/postgresql/ext/plr.nix
index 05d22c19a8b0..b30b59b86d2a 100644
--- a/pkgs/servers/sql/postgresql/ext/plr.nix
+++ b/pkgs/servers/sql/postgresql/ext/plr.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "plr";
- version = "8.4.6";
+ version = "8.4.7";
src = fetchFromGitHub {
owner = "postgres-plr";
repo = "plr";
rev = "REL${builtins.replaceStrings ["."] ["_"] version}";
- sha256 = "sha256-c+wKWL66pulihVQnhdbzivrZOMD1/FfOpb+vFoHgqVg=";
+ sha256 = "sha256-PdvFEmtKfLT/xfaf6obomPR5hKC9F+wqpfi1heBphRk=";
};
nativeBuildInputs = [ pkg-config ];
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "PL/R - R Procedural Language for PostgreSQL";
homepage = "https://github.com/postgres-plr/plr";
+ changelog = "https://github.com/postgres-plr/plr/blob/${src.rev}/changelog.md";
maintainers = with maintainers; [ qoelet ];
platforms = postgresql.meta.platforms;
license = licenses.gpl2Only;
diff --git a/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8/default.nix
index e0dbc19e353f..2c375babd464 100644
--- a/pkgs/servers/sql/postgresql/ext/plv8/default.nix
+++ b/pkgs/servers/sql/postgresql/ext/plv8/default.nix
@@ -15,13 +15,13 @@ let
libv8 = nodejs_20.libv8;
in stdenv.mkDerivation (finalAttrs: {
pname = "plv8";
- version = "3.2.2";
+ version = "3.2.3";
src = fetchFromGitHub {
owner = "plv8";
repo = "plv8";
rev = "v${finalAttrs.version}";
- hash = "sha256-azO33v22EF+/sTNmwswxyDR0PhrvWfTENuLu6JgSGJ0=";
+ hash = "sha256-ivQZJSNn5giWF351fqZ7mBZoJkGtby5T7beK45g3Zqs=";
};
patches = [
@@ -135,6 +135,7 @@ in stdenv.mkDerivation (finalAttrs: {
meta = with lib; {
description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL";
homepage = "https://plv8.github.io/";
+ changelog = "https://github.com/plv8/plv8/blob/r${finalAttrs.version}/Changes";
maintainers = [ ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
license = licenses.postgresql;
diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix
index 565f3fdaf60d..728f3b348c69 100644
--- a/pkgs/servers/sql/postgresql/ext/repmgr.nix
+++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix
@@ -37,6 +37,9 @@ stdenv.mkDerivation rec {
license = licenses.postgresql;
platforms = postgresql.meta.platforms;
maintainers = with maintainers; [ zimbatm ];
+ # PostgreSQL 17 support issue upstream: https://github.com/EnterpriseDB/repmgr/issues/856
+ # Check after next package update.
+ broken = versionAtLeast postgresql.version "17" && version == "5.4.1";
};
}
diff --git a/pkgs/servers/sql/postgresql/ext/smlar.nix b/pkgs/servers/sql/postgresql/ext/smlar.nix
index 12fdd79cc8f4..4188c3b9c99a 100644
--- a/pkgs/servers/sql/postgresql/ext/smlar.nix
+++ b/pkgs/servers/sql/postgresql/ext/smlar.nix
@@ -26,5 +26,7 @@ stdenv.mkDerivation rec {
platforms = postgresql.meta.platforms;
license = licenses.bsd2;
maintainers = [ ];
+ # Broken on darwin and linux (JIT) with no upstream fix available.
+ broken = lib.versionAtLeast postgresql.version "16" && stdenv.cc.isClang;
};
}
diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
index 4a192cda9aa3..2dbf344fc624 100644
--- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
+++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix
@@ -2,16 +2,15 @@
stdenv.mkDerivation rec {
pname = "tds_fdw";
- # Move to stable version when it's released.
- version = "2.0.3-unstable-2024-02-10";
+ version = "2.0.4";
buildInputs = [ postgresql freetds ];
src = fetchFromGitHub {
owner = "tds-fdw";
repo = "tds_fdw";
- rev = "f78bd38955d01d3ca357b90717588ec2f90b4991";
- hash = "sha256-3J8wzk0YIxRPhALd5PgVW000hzQw3r4rTrnqg9uB/Bo=";
+ rev = "v${version}";
+ hash = "sha256-ruelOHueaHx1royLPvDM8Abd1rQD62R4KXgtHY9qqTw=";
};
installPhase = ''
@@ -21,13 +20,10 @@ stdenv.mkDerivation rec {
install -D tds_fdw.control -t $out/share/postgresql/extension
'';
- passthru.updateScript = unstableGitUpdater {
- tagPrefix = "v";
- };
-
meta = with lib; {
description = "PostgreSQL foreign data wrapper to connect to TDS databases (Sybase and Microsoft SQL Server)";
homepage = "https://github.com/tds-fdw/tds_fdw";
+ changelog = "https://github.com/tds-fdw/tds_fdw/releases/tag/v${version}";
maintainers = [ maintainers.steve-chavez ];
platforms = postgresql.meta.platforms;
license = licenses.postgresql;
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index bd2d2d3b74be..60e14e922835 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -41,6 +41,11 @@ stdenv.mkDerivation rec {
maintainers = [ ];
platforms = postgresql.meta.platforms;
license = with licenses; if enableUnfree then tsl else asl20;
- broken = versionOlder postgresql.version "13";
+ broken = versionOlder postgresql.version "13" ||
+ # timescaledb supports PostgreSQL 17 from 2.17.0 on:
+ # https://github.com/timescale/timescaledb/releases/tag/2.17.0
+ # We can't upgrade to it, yet, because this would imply dropping support for
+ # PostgreSQL 13, which is a breaking change.
+ (versionAtLeast postgresql.version "17" && version == "2.14.2");
};
}
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
index 0776fcb4468a..ab414a400d29 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
@@ -39,5 +39,8 @@
maintainers = with maintainers; [ typetetris ];
platforms = postgresql.meta.platforms;
license = licenses.tsl;
+ # PostgreSQL 17 support issue upstream: https://github.com/timescale/timescaledb-toolkit/issues/813
+ # Check after next package update.
+ broken = versionAtLeast postgresql.version "17" && version == "1.18.0";
};
}
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index 539a4d05019d..decaedc5f85f 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -5,7 +5,7 @@ let
{ stdenv, lib, fetchurl, fetchpatch, makeWrapper
, glibc, zlib, readline, openssl, icu, lz4, zstd, systemdLibs, libuuid
, pkg-config, libxml2, tzdata, libkrb5, substituteAll, darwin
- , linux-pam
+ , linux-pam, bison, flex, perl, docbook_xml_dtd_45, docbook-xsl-nons, libxslt
, removeReferencesTo, writeShellApplication
@@ -114,7 +114,8 @@ let
pkg-config
removeReferencesTo
]
- ++ lib.optionals jitSupport [ llvmPackages.llvm.dev nukeReferences ];
+ ++ lib.optionals jitSupport [ llvmPackages.llvm.dev nukeReferences ]
+ ++ lib.optionals (atLeast "17") [ bison flex perl docbook_xml_dtd_45 docbook-xsl-nons libxslt ];
enableParallelBuilding = true;
@@ -150,7 +151,8 @@ let
++ lib.optionals stdenv'.hostPlatform.isLinux [ "--with-pam" ]
# This could be removed once the upstream issue is resolved:
# https://postgr.es/m/flat/427c7c25-e8e1-4fc5-a1fb-01ceff185e5b%40technowledgy.de
- ++ lib.optionals (stdenv'.hostPlatform.isDarwin && atLeast "16") [ "LDFLAGS_EX_BE=-Wl,-export_dynamic" ];
+ ++ lib.optionals (stdenv'.hostPlatform.isDarwin && atLeast "16") [ "LDFLAGS_EX_BE=-Wl,-export_dynamic" ]
+ ++ lib.optionals (atLeast "17") [ "--without-perl" ];
patches = [
(if atLeast "16" then ./patches/relative-to-symlinks-16+.patch else ./patches/relative-to-symlinks.patch)
@@ -163,7 +165,7 @@ let
src = ./patches/locale-binary-path.patch;
locale = "${if stdenv.hostPlatform.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
})
-
+ ] ++ lib.optionals (olderThan "17") [
# TODO: Remove this with the next set of minor releases
(fetchpatch (
if atLeast "14" then {
@@ -179,7 +181,7 @@ let
hash = "sha256-L8/ns/fxTh2ayfDQXtBIKaArFhMd+v86UxVFWQdmzUw=";
excludes = [ "doc/*" ];
})
- )
+ )
] ++ lib.optionals stdenv'.hostPlatform.isMusl (
# Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141
map fetchurl (lib.attrValues muslPatches)
@@ -295,8 +297,7 @@ let
withPackages = postgresqlWithPackages {
inherit buildEnv;
postgresql = this;
- }
- this.pkgs;
+ };
tests = {
postgresql-wal-receiver = import ../../../../nixos/tests/postgresql-wal-receiver.nix {
@@ -337,9 +338,9 @@ let
};
});
- postgresqlWithPackages = { postgresql, buildEnv }: pkgs: f: buildEnv {
- name = "postgresql-and-plugins-${postgresql.version}";
- paths = f pkgs ++ [
+ postgresqlWithPackages = { postgresql, buildEnv }: f: buildEnv {
+ name = "${postgresql.pname}-and-plugins-${postgresql.version}";
+ paths = f postgresql.pkgs ++ [
postgresql
postgresql.man # in case user installs this into environment
];
@@ -348,6 +349,14 @@ let
passthru.version = postgresql.version;
passthru.psqlSchema = postgresql.psqlSchema;
+ passthru.withJIT = postgresqlWithPackages {
+ inherit buildEnv;
+ postgresql = postgresql.withJIT;
+ } f;
+ passthru.withoutJIT = postgresqlWithPackages {
+ inherit buildEnv;
+ postgresql = postgresql.withoutJIT;
+ } f;
};
in
diff --git a/pkgs/servers/sqlpage/default.nix b/pkgs/servers/sqlpage/default.nix
index c6055d601535..4b9009091004 100644
--- a/pkgs/servers/sqlpage/default.nix
+++ b/pkgs/servers/sqlpage/default.nix
@@ -42,13 +42,13 @@ in
rustPlatform.buildRustPackage rec {
pname = "sqlpage";
- version = "0.28.0";
+ version = "0.29.0";
src = fetchFromGitHub {
owner = "lovasoa";
repo = "SQLpage";
rev = "v${version}";
- hash = "sha256-veqkHjIbR4qENarmXHakDDG4Rxq9mUD/io+dfwaWAqg=";
+ hash = "sha256-wI+nXrjX98vqyCE6Ofa5KxKUvpLfHqd7KFCsILuOnGk=";
};
postPatch = ''
@@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec {
"$(cat ${tomselect})"
'';
- cargoHash = "sha256-idX3uU1nSI2a93srlJ1HvKcwVD0C4FmkQKTEYod5qgg=";
+ cargoHash = "sha256-/B8tayEbyOsc0/po1YQKtp694X12B3I50OU4cMwJo8Q=";
nativeBuildInputs = [
pkg-config
diff --git a/pkgs/servers/telegram-bot-api/default.nix b/pkgs/servers/telegram-bot-api/default.nix
deleted file mode 100644
index 3481b853715d..000000000000
--- a/pkgs/servers/telegram-bot-api/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, gperf, openssl, zlib }:
-
-stdenv.mkDerivation {
- pname = "telegram-bot-api";
- version = "7.3";
-
- src = fetchFromGitHub {
- repo = "telegram-bot-api";
- owner = "tdlib";
- rev = "5951bfbab8b1274437c613c1c48d91be2a050371";
- hash = "sha256-5aNZqP4K+zP7q1+yllr6fysEcewhh/V9Vl6GXQolanI=";
- fetchSubmodules = true;
- };
-
- nativeBuildInputs = [ cmake gperf ];
- buildInputs = [ openssl zlib ];
-
- meta = with lib; {
- description = "Telegram Bot API server";
- homepage = "https://github.com/tdlib/telegram-bot-api";
- license = licenses.boost;
- maintainers = with maintainers; [ Anillc Forden ];
- platforms = platforms.all;
- mainProgram = "telegram-bot-api";
- };
-}
diff --git a/pkgs/servers/teleport/15/default.nix b/pkgs/servers/teleport/15/default.nix
index 23ac2d2024d7..12cedd539696 100644
--- a/pkgs/servers/teleport/15/default.nix
+++ b/pkgs/servers/teleport/15/default.nix
@@ -1,9 +1,9 @@
{ wasm-bindgen-cli, ... }@args:
import ../generic.nix (args // {
- version = "15.4.11";
- hash = "sha256-vmJ76aRAsbSGXZ2HcuryOlUYrUOPMP6MaI8OjxxyiZ4=";
- vendorHash = "sha256-oJo8Ga6TAUz1xSYiRckzq8zZvgIZFCeEwZbiyyVOdkI=";
- yarnHash = "sha256-5ppgBa5CyQ49FSFhdWDbTcCTdt0vsXAzNTeyG4r7crg=";
+ version = "15.4.21";
+ hash = "sha256-n5dAJ5ilq5nHo3neQzCUFnDRwLhArwleMSho4/g0MT4=";
+ vendorHash = "sha256-bW8ztNeSzxUNtbuBtxIya9TeGfktC+/fz9iXB0GL0Mg=";
+ yarnHash = "sha256-ZaLLrcwAeq6TQ1SaA2few4s0HqktOZEpxCTcNGloGfk=";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
diff --git a/pkgs/servers/teleport/16/default.nix b/pkgs/servers/teleport/16/default.nix
index 75104b03d117..ecd714d77d06 100644
--- a/pkgs/servers/teleport/16/default.nix
+++ b/pkgs/servers/teleport/16/default.nix
@@ -1,9 +1,9 @@
{ wasm-bindgen-cli, ... }@args:
import ../generic.nix (args // {
- version = "16.2.0";
- hash = "sha256-3LLoO7SNJfEfDEU7JnAhmAOIdRO+TkgiJKjT8sqzelo=";
+ version = "16.4.6";
+ hash = "sha256-TdOCFs6YeqINM8aPryrjYPaXEjc/gIqu7kzVYDnMsjg=";
vendorHash = "sha256-iyYfht0aB9Vv2hsaqrieFHXbDhlotKQYfLn4JFqpve8=";
- pnpmHash = "sha256-lcev7VwTcuCuced8uZzLoobREWtNRDFRFdfmabJPLtc=";
+ pnpmHash = "sha256-NF45Wp4itYud01VzxC8bRHZ3xZ1T1du1QmZTDMS5nOk=";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix
index abeed3b24435..ed2ce5d8a7d1 100644
--- a/pkgs/servers/teleport/generic.nix
+++ b/pkgs/servers/teleport/generic.nix
@@ -150,7 +150,7 @@ buildGoModule rec {
patches = extPatches ++ [
./0001-fix-add-nix-path-to-exec-env.patch
./rdpclient.patch
- (if lib.versionAtLeast version "16" then ./tsh_16.patch else ./tsh.patch)
+ ./tsh.patch
];
# Reduce closure size for client machines
diff --git a/pkgs/servers/teleport/tsh.patch b/pkgs/servers/teleport/tsh.patch
index 6344a3915717..f510b21d5dec 100644
--- a/pkgs/servers/teleport/tsh.patch
+++ b/pkgs/servers/teleport/tsh.patch
@@ -11,7 +11,7 @@ index 5de21c69d0..3995c19e3c 100644
if err != nil {
return trace.Wrap(err)
}
-+ cf.executablePath = path.Dir(tempBinaryPath) + "/tsh"
++ cf.executablePath = filepath.Dir(tempBinaryPath) + "/tsh"
// configs
setEnvFlags(&cf)
diff --git a/pkgs/servers/teleport/tsh_16.patch b/pkgs/servers/teleport/tsh_16.patch
deleted file mode 100644
index f510b21d5dec..000000000000
--- a/pkgs/servers/teleport/tsh_16.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/tool/tsh/common/tsh.go b/tool/tsh/common/tsh.go
-index 5de21c69d0..3995c19e3c 100644
---- a/tool/tsh/common/tsh.go
-+++ b/tool/tsh/common/tsh.go
-@@ -1084,10 +1084,11 @@ func Run(ctx context.Context, args []string, opts ...CliOption) error {
-
- var err error
-
-- cf.executablePath, err = os.Executable()
-+ tempBinaryPath, err := os.Executable()
- if err != nil {
- return trace.Wrap(err)
- }
-+ cf.executablePath = filepath.Dir(tempBinaryPath) + "/tsh"
-
- // configs
- setEnvFlags(&cf)
diff --git a/pkgs/servers/web-apps/discourse/action_mailer_ca_cert.patch b/pkgs/servers/web-apps/discourse/action_mailer_ca_cert.patch
index d6a4ff8f2a78..05204c540d96 100644
--- a/pkgs/servers/web-apps/discourse/action_mailer_ca_cert.patch
+++ b/pkgs/servers/web-apps/discourse/action_mailer_ca_cert.patch
@@ -1,12 +1,12 @@
-diff --git a/config/environments/production.rb b/config/environments/production.rb
-index 6b73c82e9d..0cefea6fc0 100644
---- a/config/environments/production.rb
-+++ b/config/environments/production.rb
-@@ -32,5 +32,6 @@ Discourse::Application.configure do
- user_name: GlobalSetting.smtp_user_name,
- password: GlobalSetting.smtp_password,
- authentication: GlobalSetting.smtp_authentication,
-+ ca_file: "/etc/ssl/certs/ca-certificates.crt",
- enable_starttls_auto: GlobalSetting.smtp_enable_start_tls,
- open_timeout: GlobalSetting.smtp_open_timeout,
- read_timeout: GlobalSetting.smtp_read_timeout
\ No newline at end of file
+diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb
+index 6e06e18039..b2bef31fe2 100644
+--- a/app/models/global_setting.rb
++++ b/app/models/global_setting.rb
+@@ -255,6 +255,7 @@ class GlobalSetting
+ domain: GlobalSetting.smtp_domain,
+ user_name: GlobalSetting.smtp_user_name,
+ password: GlobalSetting.smtp_password,
++ ca_file: "/etc/ssl/certs/ca-certificates.crt",
+ enable_starttls_auto: GlobalSetting.smtp_enable_start_tls,
+ open_timeout: GlobalSetting.smtp_open_timeout,
+ read_timeout: GlobalSetting.smtp_read_timeout,
diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix
index 6fb6aa9223f1..1f702d13502b 100644
--- a/pkgs/servers/web-apps/discourse/default.nix
+++ b/pkgs/servers/web-apps/discourse/default.nix
@@ -47,13 +47,13 @@
}@args:
let
- version = "3.2.5";
+ version = "3.3.2";
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse";
rev = "v${version}";
- sha256 = "sha256-+at4IiJ0yRPq9XyvAwa2Kuc0wYQOB5hw7E1jmQAAkc4=";
+ sha256 = "sha256-FaPcUta5z/8oasw+9zGBRZnUVYD8eCo1t/XwwsFoSM8=";
};
ruby = ruby_3_2;
@@ -202,14 +202,9 @@ let
pname = "discourse-assets";
inherit version src;
- yarnDevOfflineCache = fetchYarnDeps {
- yarnLock = src + "/yarn.lock";
- hash = "sha256-0s8c2V8Wl3f5kL1OIn2ps6hL7CUQD5+LJm+9LYHc+W0=";
- };
-
yarnOfflineCache = fetchYarnDeps {
- yarnLock = src + "/app/assets/javascripts/yarn-ember5.lock";
- hash = "sha256-ZBXvNdHHV92kSAswe6KA+OqaY5smf7ZKTTOiY8g78D0=";
+ yarnLock = src + "/yarn.lock";
+ hash = "sha256-cSQofaULCmPuWGxS+hK4KlRq9lSkCPiYvhax9X6Dor8=";
};
nativeBuildInputs = runtimeDeps ++ [
@@ -223,7 +218,7 @@ let
fixup-yarn-lock
];
- outputs = [ "out" "javascripts" ];
+ outputs = [ "out" "javascripts" "node_modules" ];
patches = [
# Use the Ruby API version in the plugin gem path, to match the
@@ -268,13 +263,13 @@ let
yarn --offline --ignore-scripts --cwd $(dirname $yarnLock) install
}
- # Install devDependencies for generating the theme-transpiler executed as
- # dependent task assets:precompile:theme_transpiler before db:migrate
- yarn_install $yarnDevOfflineCache yarn.lock
+ # Install runtime and devDependencies.
+ # The dev deps are necessary for generating the theme-transpiler executed as dependent task
+ # assets:precompile:theme_transpiler before db:migrate and unfortunately also in the runtime
+ yarn_install $yarnOfflineCache yarn.lock
- # Install the runtime dependencies
- yarn_install $yarnOfflineCache app/assets/javascripts/yarn-ember5.lock
# Patch before running postinstall hook script
+ patchShebangs node_modules/
patchShebangs --build app/assets/javascripts
yarn --offline --cwd app/assets/javascripts run postinstall
export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
@@ -314,6 +309,8 @@ let
mv public/assets $out
+ mv node_modules $node_modules
+
rm -r app/assets/javascripts/plugins
mv app/assets/javascripts $javascripts
ln -sf /run/discourse/assets/javascripts/plugins $javascripts/plugins
@@ -392,6 +389,9 @@ let
ln -sf /var/lib/discourse/tmp $out/share/discourse/tmp
ln -sf /run/discourse/config $out/share/discourse/config
ln -sf /run/discourse/public $out/share/discourse/public
+ # This needs to be copied because of symlinks in node_modules
+ # Also this needs to be full node_modules (including dev deps) because without loader.js it just throws 500
+ cp -r ${assets.node_modules} $out/share/discourse/node_modules
ln -sf ${assets} $out/share/discourse/public.dist/assets
rm -r $out/share/discourse/app/assets/javascripts
ln -sf ${assets.javascripts} $out/share/discourse/app/assets/javascripts
@@ -406,9 +406,6 @@ let
maintainers = with maintainers; [ talyz ];
license = licenses.gpl2Plus;
description = "Discourse is an open source discussion platform";
- knownVulnerabilities = [
- "https://meta.discourse.org/t/3-3-2-security-and-maintenance-release/329341/1"
- ];
};
passthru = {
diff --git a/pkgs/servers/web-apps/discourse/mail_receiver/default.nix b/pkgs/servers/web-apps/discourse/mail_receiver/default.nix
index d5fbb4fb3976..b44f5eb113c1 100644
--- a/pkgs/servers/web-apps/discourse/mail_receiver/default.nix
+++ b/pkgs/servers/web-apps/discourse/mail_receiver/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "discourse-mail-receiver";
- version = "4.0.7";
+ version = "4.1.0";
src = fetchFromGitHub {
owner = "discourse";
repo = "mail-receiver";
rev = "v${version}";
- sha256 = "0grifm5qyqazq63va3w26xjqnxwmfixhx0fx0zy7kd39378wwa6i";
+ sha256 = "sha256-ob4Hb88odlFf5vSC9qhikhJowo4C5LksVmMuJRMNoI4=";
};
nativeBuildInputs = [ replace makeWrapper ];
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix
index ff7df0dfc70e..289ed1b6599b 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-assign";
- rev = "b796ae3fcc89b48cf777de5ee3a4c21aada9271e";
- sha256 = "sha256-PnSD2ZuUVjH8TifHuzbkpmpfGSN/q4VWyJtkOPND44o=";
+ rev = "6472f4593e1a4abbb457288db012ddb10f0b16f5";
+ sha256 = "sha256-+jcL/6ddXldUG0VvcWiEMaFk0f37HyOf+bOFEMzuoXo=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-docs";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix
index ba20e3a9a00c..9dc50e51db03 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-bbcode-color";
- rev = "3336efe231e6c02e1dbe11ada71296af258cff58";
- sha256 = "sha256-C2PPF8kJm0agcYcRSUUBmmxZJliPatPM1vRtjufEd4M=";
+ rev = "6a26e5937b48bbf3ca9bd19e4f40adc513bcd774";
+ sha256 = "sha256-dWXvCZLxhCxte/88EnYOsy1gjBWjk24BjUM01s55CaU=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-bbcode-color";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix
index 235f5f717755..00f447b49c7b 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix
@@ -6,8 +6,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-calendar";
- rev = "455eeed541a9b5cacf627349e543028427178a44";
- sha256 = "sha256-RXjMpeqCvAvwNsHpc3Fyms4pRXXqvarU8hWo3o1VgXY=";
+ rev = "908ad614bc412f831f929ca726a4bda0b9ccaab6";
+ sha256 = "sha256-ZzzcmTY/w9wa5wTR7ofJiNVmXwoKTKaKN202O80DO9g=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-calendar";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix
index 701b5479ce1d..e5413340c1da 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-chat-integration";
- rev = "2e17b03e9a435de0079ae1c2eed1b48a11ad16a9";
- sha256 = "sha256-FOIQrpVFHak2PB8eNFv/oJwYiESJcHBqeC+MZMXnexo=";
+ rev = "e19808d4ad3f7d16cd9b93f315ca586f694e6288";
+ sha256 = "sha256-EplT9bQFtOvraSkFpBpe7TyNLROsdcRXz79j4MNPEs4=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-chat-integration";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix
index bb21a6bdb4f6..38c9507e1dc5 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-data-explorer";
- rev = "ebe71a7a138c856d88737eb11b5096a42d4fbaf3";
- sha256 = "sha256-3CdA4liSrPhucOGevEbKuIYETlXpAn9qtsG0+Tr67EQ=";
+ rev = "2d0dc39767f0c68d333f113c550731a5546c3137";
+ sha256 = "sha256-3eQDMzTjfcSip94BXy1/VcbulsTsL1EHjRs41c27+ns=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-data-explorer";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix
index eb4e2861ed55..7da74adeda00 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-docs";
- rev = "11dcab84669462b05eba3f1a59401727cafe8188";
- sha256 = "sha256-zVzmEfaANwX24rMq91gom6XmhKsEGraWon8vJu8j7iY=";
+ rev = "7721b1646dead4719c02868ef7965f1b27c74eb3";
+ sha256 = "sha256-k2m88wsUmxAXC2LLvElwHVlMp6UzGSLDzEB+HJmKm5g=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-docs";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock
index 87fbcc8f726b..46511cf34da4 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock
@@ -1,22 +1,26 @@
GEM
remote: https://rubygems.org/
specs:
- addressable (2.8.6)
- public_suffix (>= 2.0.2, < 6.0)
- faraday (2.9.0)
- faraday-net_http (>= 2.0, < 3.2)
- faraday-net_http (3.1.0)
+ addressable (2.8.7)
+ public_suffix (>= 2.0.2, < 7.0)
+ faraday (2.12.0)
+ faraday-net_http (>= 2.0, < 3.4)
+ json
+ logger
+ faraday-net_http (3.3.0)
net-http
+ json (2.7.3)
+ logger (1.6.1)
net-http (0.4.1)
uri
octokit (5.6.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
- public_suffix (5.0.5)
+ public_suffix (6.0.1)
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
- uri (0.13.0)
+ uri (0.13.1)
PLATFORMS
ruby
@@ -26,4 +30,4 @@ DEPENDENCIES
sawyer (= 0.9.2)
BUNDLED WITH
- 2.5.9
+ 2.4.22
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix
index c47454aad43c..b7f3d2472776 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix
@@ -6,8 +6,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-github";
- rev = "53e22ccbd32dd868435f66efa2d48e0389673dea";
- sha256 = "sha256-QaKmnftCxkgGUP5U9wNYm483D+GdpcU8F96CLl8woo8=";
+ rev = "e24de3f5cd6ec5cef17dc3e07dfb3bfac8867e08";
+ sha256 = "sha256-MbVYIsO2m0O5FriF5HphNhLcazgAJzIsl0aVd2YQGaA=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-github";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix
index 73552eb610ee..bed6505c5fe0 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix
@@ -5,21 +5,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr";
+ sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
type = "gem";
};
- version = "2.8.6";
+ version = "2.8.7";
};
faraday = {
- dependencies = ["faraday-net_http"];
+ dependencies = ["faraday-net_http" "json" "logger"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qqb1rmk0f9m82iijjlqadh5yby1bhnr6svjk9vxdvh6f181988s";
+ sha256 = "05s5pyxh7y68jphb0lgrh0ksxbp4lmbsc6a6qg0ahj15pjqx01ni";
type = "gem";
};
- version = "2.9.0";
+ version = "2.12.0";
};
faraday-net_http = {
dependencies = ["net-http"];
@@ -27,10 +27,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17w51yk4rrm9rpnbc3x509s619kba0jga3qrj4b17l30950vw9qn";
+ sha256 = "0rg54k4skaz8z7j358p6pdzc9pr84fjq7sdlpicf7s5ig7vb1rlk";
type = "gem";
};
- version = "3.1.0";
+ version = "3.3.0";
+ };
+ json = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1prbjd8r4rq6hjc6d5hn8hlpf4g9h62swxj7absjac7qqnzwrhvw";
+ type = "gem";
+ };
+ version = "2.7.3";
+ };
+ logger = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
+ type = "gem";
+ };
+ version = "1.6.1";
};
net-http = {
dependencies = ["uri"];
@@ -59,10 +79,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "14y4vzjwf5gp0mqgs880kis0k7n2biq8i6ci6q2n315kichl1hvj";
+ sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
type = "gem";
};
- version = "5.0.5";
+ version = "6.0.1";
};
sawyer = {
dependencies = ["addressable" "faraday"];
@@ -80,9 +100,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96";
+ sha256 = "07ndgxyhzd02cg94s6rnfhkb9rwx9z72lzk368sa9j78wc9qnbfz";
type = "gem";
};
- version = "0.13.0";
+ version = "0.13.1";
};
}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix
index 90fd6927ac94..58433a887e59 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-math";
- rev = "2984713f68044544129b3575b9e2f9be31105293";
- sha256 = "sha256-3jxSwjKGyKQy+ed6S2tQ27jseB9NygeiYvaldgV1XW4=";
+ rev = "19ab34b62ab75589419ee39af7d6ba2fec1bdc4a";
+ sha256 = "sha256-Z6+Bx1DKEE+s1flt5K/HfevzXsA+mA0YfQxmg7JQMfA=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-math";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix
index e397bf16c1e5..ac8d308b1fb8 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix
@@ -6,8 +6,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-openid-connect";
- rev = "f31a869611a2fad8efadd9b2504440215169a391";
- sha256 = "sha256-cEgAjf7EPAVKsJOmm9lj9Jm0YNFjRswOJFFHU12Q5/Y=";
+ rev = "07e30e59bf5ca3925328e936359a5564d7f5b0af";
+ sha256 = "sha256-uqxwUjbkS2o9r9pvnTgv+3jzFhUOb8KmorT3ody2d3o=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-openid-connect";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile
index 54a39883d060..3d802617c347 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile
@@ -3,5 +3,5 @@
source "https://rubygems.org"
# gem "rails"
-gem "webrick", "1.7.0"
+gem "webrick", "1.8.1"
gem "prometheus_exporter", "2.0.6"
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock
index e7939eadbb0e..69a3881ccabf 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock
@@ -3,14 +3,14 @@ GEM
specs:
prometheus_exporter (2.0.6)
webrick
- webrick (1.7.0)
+ webrick (1.8.1)
PLATFORMS
ruby
DEPENDENCIES
prometheus_exporter (= 2.0.6)
- webrick (= 1.7.0)
+ webrick (= 1.8.1)
BUNDLED WITH
- 2.5.9
+ 2.4.22
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix
index 29812ea63b62..d6af6a08476b 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix
@@ -6,8 +6,8 @@
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-prometheus";
- rev = "831dba15659055361966e0c42e6b517b3d7b133b";
- sha256 = "sha256-b7Du8rENY/gBbkqZSu6b9KHbvklYMkIRl8IGd1W4dHk=";
+ rev = "b1b899ca995783ef5eba90c35dbfc120a2949c38";
+ sha256 = "sha256-tSU1aba8EadObOsb/nRM4jAdQ6D1F9QiIaGoHi2GGDk=";
};
patches = [
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/gemset.nix
index b6f3158174c1..9e889f988414 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/gemset.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/gemset.nix
@@ -15,9 +15,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7";
+ sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r";
type = "gem";
};
- version = "1.7.0";
+ version = "1.8.1";
};
}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix
index 656acb2a9b1e..52bbc5ca2df4 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-reactions";
- rev = "354695cf5fce2bf516c9be451fe4bb56e487b95a";
- sha256 = "sha256-pTK7gcDgWAlRPrUnJikMOEd0N/DBrHE0hOP23t//MiE=";
+ rev = "c4cde3bb12841733d1f2ac4df1bb099aae15cece";
+ sha256 = "sha256-JXyXBJX7PBYmVylZ7PE+14RnlgR4EA1XBSue1ek0P/g=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-reactions";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix
index 150cf2216c20..3403667cc1b8 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-saved-searches";
- rev = "063e35ec5a905aac3332be6821b15eec6909f022";
- sha256 = "sha256-33aBhw00/tIF0Y0isYISctn3Bd+KntrRngj6sxW30EY=";
+ rev = "16bde9b0bcb3b517cfabc0ea740c10b091157799";
+ sha256 = "sha256-tn1AKiRPaunqlrtcC/6NETUnNxJq1uNi+IIF0TZPbDg=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-saved-searches";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix
index c44d5420941f..0e24578d3648 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-solved";
- rev = "a18ce6d712fafed286bcc99543dd173110c6dfb8";
- sha256 = "sha256-MUkQ/6ChMGqSNFZO2t8amecrYZbK1OyVq5lhPeB99ow=";
+ rev = "1bbdfd8f5681171dc3f0e9ea93cd56997dc7938a";
+ sha256 = "sha256-nuF/tCoHgsKE+wjQ3BRV1s1X77vjQiASLRCWErh64C4=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-solved";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix
index f479e16cfd92..554cce44ae8a 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-voting";
- rev = "fdb1f98a963adac049ffe9cd4fc506d77dd38cca";
- sha256 = "sha256-H1rTWfWlq1Hdo7UpcAgAz/zMFwick0nPSn4k1aUyYe0=";
+ rev = "4ebcd1187b59290b79db8c61c89df9f72bf1363c";
+ sha256 = "sha256-aDJKy7Qpsj1n+HrumoORUo+R9HF3gQ0juJBKXj7GHsY=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-voting";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix
index 2a5b3ff7f5ec..a75392526c6e 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
src = fetchFromGitHub {
owner = "discourse";
repo = "discourse-yearly-review";
- rev = "59b98bab5ee370da4774f60ea7b5122dddcbd83a";
- sha256 = "sha256-OIptI6T5n021AsWO/eYK3ntL0JJG7+f4OmZwdxGcfFg=";
+ rev = "bb124c211c37873c1d54e96e7063f1868c65d0ad";
+ sha256 = "sha256-xAFpt/uVW8+Y2wwL20u/rMixcFgygwrarsdRsywsbmQ=";
};
meta = with lib; {
homepage = "https://github.com/discourse/discourse-yearly-review";
diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile
index bae9d8b9852d..4aa1e315536c 100644
--- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile
+++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile
@@ -6,20 +6,20 @@ source "https://rubygems.org"
gem "bootsnap", require: false, platform: :mri
-gem "actionmailer", "< 7.1"
-gem "actionpack", "< 7.1"
-gem "actionview", "< 7.1"
-gem "activemodel", "< 7.1"
-gem "activerecord", "< 7.1"
-gem "activesupport", "< 7.1"
-gem "railties", "< 7.1"
+gem "actionmailer", "~> 7.1.0"
+gem "actionpack", "~> 7.1.0"
+gem "actionview", "~> 7.1.0"
+gem "activemodel", "~> 7.1.0"
+gem "activerecord", "~> 7.1.0"
+gem "activesupport", "~> 7.1.0"
+gem "railties", "~> 7.1.0"
gem "sprockets-rails"
gem "json"
# TODO: At the moment Discourse does not work with Sprockets 4, we would need to correct internals
# We intend to drop sprockets rather than upgrade to 4.x
-gem "sprockets", git: "https://github.com/rails/sprockets", branch: "3.x"
+gem "sprockets", "~> 3.7.3"
# this will eventually be added to rails,
# allows us to precompile all our templates in the unicorn master
@@ -31,7 +31,9 @@ gem "mail"
gem "mini_mime"
gem "mini_suffix"
-gem "redis"
+# config/initializers/006-mini_profiler.rb depends upon the RedisClient#call.
+# Rework this when upgrading to redis client 5.0 and above.
+gem "redis", "< 5.0"
# This is explicitly used by Sidekiq and is an optional dependency.
# We tell Sidekiq to use the namespace "sidekiq" which triggers this
@@ -87,6 +89,7 @@ gem "mini_sql"
gem "pry-rails", require: false
gem "pry-byebug", require: false
gem "rtlcss", require: false
+gem "messageformat-wrapper", require: false
gem "rake"
gem "thor", require: false
@@ -123,7 +126,6 @@ group :test do
gem "capybara", require: false
gem "webmock", require: false
gem "fakeweb", require: false
- gem "minitest", require: false
gem "simplecov", require: false
gem "selenium-webdriver", "~> 4.14", require: false
gem "selenium-devtools", require: false
@@ -145,6 +147,7 @@ group :test, :development do
gem "shoulda-matchers", require: false
gem "rspec-html-matchers"
+ gem "pry-stack_explorer", require: false
gem "byebug", require: ENV["RM_INFO"].nil?, platform: :mri
gem "rubocop-discourse", require: false
gem "parallel_tests"
@@ -210,7 +213,6 @@ gem "cppjieba_rb", require: false
gem "lograge", require: false
gem "logstash-event", require: false
-gem "logstash-logger", require: false
gem "logster"
# A fork of sassc with dart-sass support
@@ -270,3 +272,7 @@ gem "csv", require: false
# TODO: Can be removed once we upgrade to Rails 7.1
gem "mutex_m"
gem "drb"
+
+# dependencies for the automation plugin
+gem "iso8601"
+gem "rrule"
diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
index 4437a2d36817..361daa0c7037 100644
--- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
+++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
@@ -1,92 +1,92 @@
-GIT
- remote: https://github.com/rails/sprockets
- revision: f4d3dae71ef29c44b75a49cfbf8032cce07b423a
- branch: 3.x
- specs:
- sprockets (3.7.2)
- concurrent-ruby (~> 1.0)
- rack (> 1, < 3)
-
GEM
remote: https://rubygems.org/
specs:
- actionmailer (7.0.8)
- actionpack (= 7.0.8)
- actionview (= 7.0.8)
- activejob (= 7.0.8)
- activesupport (= 7.0.8)
+ actionmailer (7.1.3.4)
+ actionpack (= 7.1.3.4)
+ actionview (= 7.1.3.4)
+ activejob (= 7.1.3.4)
+ activesupport (= 7.1.3.4)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
- rails-dom-testing (~> 2.0)
- actionpack (7.0.8)
- actionview (= 7.0.8)
- activesupport (= 7.0.8)
- rack (~> 2.0, >= 2.2.4)
+ rails-dom-testing (~> 2.2)
+ actionpack (7.1.3.4)
+ actionview (= 7.1.3.4)
+ activesupport (= 7.1.3.4)
+ nokogiri (>= 1.8.5)
+ racc
+ rack (>= 2.2.4)
+ rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
- rails-dom-testing (~> 2.0)
- rails-html-sanitizer (~> 1.0, >= 1.2.0)
- actionview (7.0.8)
- activesupport (= 7.0.8)
+ rails-dom-testing (~> 2.2)
+ rails-html-sanitizer (~> 1.6)
+ actionview (7.1.3.4)
+ activesupport (= 7.1.3.4)
builder (~> 3.1)
- erubi (~> 1.4)
- rails-dom-testing (~> 2.0)
- rails-html-sanitizer (~> 1.1, >= 1.2.0)
+ erubi (~> 1.11)
+ rails-dom-testing (~> 2.2)
+ rails-html-sanitizer (~> 1.6)
actionview_precompiler (0.4.0)
actionview (>= 6.0.a)
active_model_serializers (0.8.4)
activemodel (>= 3.0)
- activejob (7.0.8)
- activesupport (= 7.0.8)
+ activejob (7.1.3.4)
+ activesupport (= 7.1.3.4)
globalid (>= 0.3.6)
- activemodel (7.0.8)
- activesupport (= 7.0.8)
- activerecord (7.0.8)
- activemodel (= 7.0.8)
- activesupport (= 7.0.8)
- activesupport (7.0.8)
+ activemodel (7.1.3.4)
+ activesupport (= 7.1.3.4)
+ activerecord (7.1.3.4)
+ activemodel (= 7.1.3.4)
+ activesupport (= 7.1.3.4)
+ timeout (>= 0.4.0)
+ activesupport (7.1.3.4)
+ base64
+ bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
+ connection_pool (>= 2.2.5)
+ drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
+ mutex_m
tzinfo (~> 2.0)
- addressable (2.8.6)
- public_suffix (>= 2.0.2, < 6.0)
+ addressable (2.8.7)
+ public_suffix (>= 2.0.2, < 7.0)
annotate (3.2.0)
activerecord (>= 3.2, < 8.0)
rake (>= 10.4, < 14.0)
ast (2.4.2)
aws-eventstream (1.3.0)
- aws-partitions (1.583.0)
- aws-sdk-core (3.130.2)
- aws-eventstream (~> 1, >= 1.0.2)
- aws-partitions (~> 1, >= 1.525.0)
+ aws-partitions (1.894.0)
+ aws-sdk-core (3.191.3)
+ aws-eventstream (~> 1, >= 1.3.0)
+ aws-partitions (~> 1, >= 1.651.0)
+ aws-sigv4 (~> 1.8)
+ jmespath (~> 1, >= 1.6.1)
+ aws-sdk-kms (1.77.0)
+ aws-sdk-core (~> 3, >= 3.191.0)
aws-sigv4 (~> 1.1)
- jmespath (~> 1.0)
- aws-sdk-kms (1.56.0)
- aws-sdk-core (~> 3, >= 3.127.0)
- aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.114.0)
- aws-sdk-core (~> 3, >= 3.127.0)
+ aws-sdk-s3 (1.143.0)
+ aws-sdk-core (~> 3, >= 3.191.0)
aws-sdk-kms (~> 1)
- aws-sigv4 (~> 1.4)
- aws-sdk-sns (1.53.0)
- aws-sdk-core (~> 3, >= 3.127.0)
+ aws-sigv4 (~> 1.8)
+ aws-sdk-sns (1.72.0)
+ aws-sdk-core (~> 3, >= 3.191.0)
aws-sigv4 (~> 1.1)
- aws-sigv4 (1.5.0)
+ aws-sigv4 (1.8.0)
aws-eventstream (~> 1, >= 1.0.2)
base64 (0.2.0)
better_errors (2.10.1)
erubi (>= 1.0.0)
rack (>= 0.9.0)
rouge (>= 1.0.0)
- bigdecimal (3.1.6)
- binding_of_caller (1.0.0)
- debug_inspector (>= 0.0.1)
- bootsnap (1.17.1)
+ bigdecimal (3.1.8)
+ binding_of_caller (1.0.1)
+ debug_inspector (>= 1.2.0)
+ bootsnap (1.18.3)
msgpack (~> 1.2)
- builder (3.2.4)
- bullet (7.1.6)
+ builder (3.3.0)
+ bullet (7.2.0)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
byebug (11.1.3)
@@ -105,22 +105,22 @@ GEM
chunky_png (1.4.0)
coderay (1.1.3)
colored2 (4.0.0)
- concurrent-ruby (1.2.3)
+ concurrent-ruby (1.3.3)
connection_pool (2.4.1)
cose (1.3.0)
cbor (~> 0.5.9)
openssl-signature_algorithm (~> 1.0)
cppjieba_rb (0.4.2)
- crack (0.4.6)
+ crack (1.0.0)
bigdecimal
rexml
crass (1.0.6)
- css_parser (1.16.0)
+ css_parser (1.17.1)
addressable
csv (3.3.0)
date (3.3.4)
debug_inspector (1.2.0)
- diff-lcs (1.5.0)
+ diff-lcs (1.5.1)
diffy (3.4.2)
digest (3.1.1)
discourse-fonts (0.0.9)
@@ -130,40 +130,50 @@ GEM
discourse_dev_assets (0.0.4)
faker (~> 2.16)
literate_randomizer
- docile (1.4.0)
+ docile (1.4.1)
drb (2.2.1)
email_reply_trimmer (0.1.13)
- erubi (1.12.0)
- excon (0.109.0)
+ erubi (1.13.0)
+ excon (0.111.0)
execjs (2.9.1)
exifr (1.4.0)
fabrication (2.31.0)
faker (2.23.0)
i18n (>= 1.8.11, < 2)
fakeweb (1.3.0)
- faraday (2.9.0)
+ faraday (2.10.0)
faraday-net_http (>= 2.0, < 3.2)
- faraday-net_http (3.1.0)
+ logger
+ faraday-net_http (3.1.1)
net-http
- faraday-retry (2.2.0)
+ faraday-retry (2.2.1)
faraday (~> 2.0)
fast_blank (1.0.1)
- fastimage (2.3.0)
- ffi (1.16.3)
+ fastimage (2.3.1)
+ ffi (1.17.0)
+ ffi (1.17.0-arm64-darwin)
+ ffi (1.17.0-x86_64-darwin)
fspath (3.1.2)
globalid (1.2.1)
activesupport (>= 6.1)
- google-protobuf (3.25.3)
- google-protobuf (3.25.3-arm64-darwin)
- google-protobuf (3.25.3-x86_64-darwin)
+ google-protobuf (4.27.2)
+ bigdecimal
+ rake (>= 13)
+ google-protobuf (4.27.2-arm64-darwin)
+ bigdecimal
+ rake (>= 13)
+ google-protobuf (4.27.2-x86_64-darwin)
+ bigdecimal
+ rake (>= 13)
guess_html_encoding (0.0.11)
hana (1.3.7)
hashdiff (1.1.0)
hashie (5.0.0)
- highline (3.0.1)
+ highline (3.1.0)
+ reline
htmlentities (4.3.4)
http_accept_language (2.1.1)
- i18n (1.14.1)
+ i18n (1.14.5)
concurrent-ruby (~> 1.0)
image_optim (0.31.3)
exifr (~> 1.2, >= 1.2.2)
@@ -173,33 +183,39 @@ GEM
progress (~> 3.0, >= 3.0.1)
image_size (3.4.0)
in_threads (1.6.0)
+ io-console (0.7.2)
+ irb (1.14.0)
+ rdoc (>= 4.0.0)
+ reline (>= 0.4.2)
+ iso8601 (0.13.0)
jmespath (1.6.2)
- json (2.7.1)
- json-schema (4.1.1)
+ json (2.7.2)
+ json-schema (4.3.1)
addressable (>= 2.8)
- json_schemer (2.1.1)
+ json_schemer (2.3.0)
+ bigdecimal
hana (~> 1.3)
regexp_parser (~> 2.0)
simpleidn (~> 0.2)
- jwt (2.7.1)
+ jwt (2.8.2)
+ base64
kgio (2.11.4)
language_server-protocol (3.17.0.3)
- libv8-node (18.16.0.0)
- libv8-node (18.16.0.0-arm64-darwin)
- libv8-node (18.16.0.0-x86_64-darwin)
- listen (3.8.0)
+ libv8-node (18.19.0.0)
+ libv8-node (18.19.0.0-arm64-darwin)
+ libv8-node (18.19.0.0-x86_64-darwin)
+ listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
literate_randomizer (0.4.0)
+ logger (1.6.0)
lograge (0.14.0)
actionpack (>= 4)
activesupport (>= 4)
railties (>= 4)
request_store (~> 1.0)
logstash-event (1.2.02)
- logstash-logger (0.26.1)
- logstash-event (~> 1.2)
- logster (2.16.0)
+ logster (2.20.0)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
@@ -212,46 +228,49 @@ GEM
net-smtp
matrix (0.4.2)
maxminddb (0.1.22)
- memory_profiler (1.0.1)
+ memory_profiler (1.0.2)
message_bus (4.3.8)
rack (>= 1.1.3)
- method_source (1.0.0)
+ messageformat-wrapper (1.1.0)
+ mini_racer (>= 0.6.3)
+ method_source (1.1.0)
mini_mime (1.1.5)
mini_portile2 (2.8.7)
- mini_racer (0.8.0)
- libv8-node (~> 18.16.0.0)
+ mini_racer (0.14.1)
+ libv8-node (~> 18.19.0.0)
mini_scheduler (0.16.0)
sidekiq (>= 4.2.3, < 7.0)
mini_sql (1.5.0)
mini_suffix (0.3.3)
ffi (~> 1.9)
minio_runner (0.1.2)
- minitest (5.21.2)
- mocha (2.1.0)
+ minitest (5.24.1)
+ mocha (2.4.5)
ruby2_keywords (>= 0.0.5)
msgpack (1.7.2)
multi_json (1.15.0)
- multi_xml (0.6.0)
+ multi_xml (0.7.1)
+ bigdecimal (~> 3.1)
mustache (1.1.1)
mutex_m (0.2.0)
net-http (0.4.1)
uri
- net-imap (0.4.9.1)
+ net-imap (0.4.14)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.2)
timeout
- net-smtp (0.4.0.1)
+ net-smtp (0.5.0)
net-protocol
- nio4r (2.7.0)
- nokogiri (1.16.0)
+ nio4r (2.7.3)
+ nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
- nokogiri (1.16.0-arm64-darwin)
+ nokogiri (1.16.7-arm64-darwin)
racc (~> 1.4)
- nokogiri (1.16.0-x86_64-darwin)
+ nokogiri (1.16.7-x86_64-darwin)
racc (~> 1.4)
oauth (1.1.0)
oauth-tty (~> 1.0, >= 1.0.1)
@@ -265,7 +284,7 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 4)
- oj (3.16.3)
+ oj (3.16.4)
bigdecimal (>= 3.0)
omniauth (1.9.2)
hashie (>= 3.4.6)
@@ -293,10 +312,10 @@ GEM
openssl-signature_algorithm (1.3.0)
openssl (> 2.0)
optimist (3.1.0)
- parallel (1.24.0)
- parallel_tests (4.4.0)
+ parallel (1.25.1)
+ parallel_tests (4.7.1)
parallel
- parser (3.3.0.5)
+ parser (3.3.4.0)
ast (~> 2.4.1)
racc
pg (1.5.4)
@@ -308,20 +327,30 @@ GEM
pry-byebug (3.10.1)
byebug (~> 11.0)
pry (>= 0.13, < 0.15)
- pry-rails (0.3.9)
- pry (>= 0.10.4)
- public_suffix (5.0.4)
+ pry-rails (0.3.11)
+ pry (>= 0.13.0)
+ pry-stack_explorer (0.6.1)
+ binding_of_caller (~> 1.0)
+ pry (~> 0.13)
+ psych (5.1.2)
+ stringio
+ public_suffix (6.0.1)
puma (6.4.2)
nio4r (~> 2.0)
- racc (1.7.3)
- rack (2.2.8)
- rack-mini-profiler (3.3.0)
+ racc (1.8.0)
+ rack (2.2.9)
+ rack-mini-profiler (3.3.1)
rack (>= 1.2.0)
rack-protection (3.2.0)
base64 (>= 0.1.0)
rack (~> 2.2, >= 2.2.4)
+ rack-session (1.0.2)
+ rack (< 3)
rack-test (2.1.0)
rack (>= 1.3)
+ rackup (1.0.0)
+ rack (< 3)
+ webrick
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
@@ -329,70 +358,78 @@ GEM
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
- rails_failover (2.0.1)
- activerecord (>= 6.1, <= 7.1)
+ rails_failover (2.1.1)
+ activerecord (>= 6.1, < 8.0)
concurrent-ruby
- railties (>= 6.1, <= 7.1)
- rails_multisite (5.0.0)
+ railties (>= 6.1, < 8.0)
+ rails_multisite (6.0.0)
activerecord (>= 6.0)
railties (>= 6.0)
- railties (7.0.8)
- actionpack (= 7.0.8)
- activesupport (= 7.0.8)
- method_source
+ railties (7.1.3.4)
+ actionpack (= 7.1.3.4)
+ activesupport (= 7.1.3.4)
+ irb
+ rackup (>= 1.0.0)
rake (>= 12.2)
- thor (~> 1.0)
- zeitwerk (~> 2.5)
+ thor (~> 1.0, >= 1.2.2)
+ zeitwerk (~> 2.6)
rainbow (3.1.1)
raindrops (0.20.1)
- rake (13.1.0)
+ rake (13.2.1)
rb-fsevent (0.11.2)
- rb-inotify (0.10.1)
+ rb-inotify (0.11.1)
ffi (~> 1.0)
rbtrace (0.5.1)
ffi (>= 1.0.6)
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
rchardet (1.8.0)
+ rdoc (6.7.0)
+ psych (>= 4.0.0)
redcarpet (3.6.0)
redis (4.8.1)
redis-namespace (1.11.0)
redis (>= 4)
- regexp_parser (2.9.0)
- request_store (1.5.1)
+ regexp_parser (2.9.2)
+ reline (0.5.9)
+ io-console (~> 0.5)
+ request_store (1.7.0)
rack (>= 1.4)
- rexml (3.2.6)
+ rexml (3.3.2)
+ strscan
rinku (2.0.6)
rotp (6.3.0)
- rouge (4.2.0)
+ rouge (4.3.0)
rqrcode (2.2.0)
chunky_png (~> 1.0)
rqrcode_core (~> 1.0)
rqrcode_core (1.2.0)
- rspec (3.12.0)
- rspec-core (~> 3.12.0)
- rspec-expectations (~> 3.12.0)
- rspec-mocks (~> 3.12.0)
- rspec-core (3.12.2)
- rspec-support (~> 3.12.0)
- rspec-expectations (3.12.3)
+ rrule (0.6.0)
+ activesupport (>= 2.3)
+ rspec (3.13.0)
+ rspec-core (~> 3.13.0)
+ rspec-expectations (~> 3.13.0)
+ rspec-mocks (~> 3.13.0)
+ rspec-core (3.13.0)
+ rspec-support (~> 3.13.0)
+ rspec-expectations (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.12.0)
+ rspec-support (~> 3.13.0)
rspec-html-matchers (0.10.0)
nokogiri (~> 1)
rspec (>= 3.0.0.a)
- rspec-mocks (3.12.6)
+ rspec-mocks (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.12.0)
- rspec-rails (6.1.1)
+ rspec-support (~> 3.13.0)
+ rspec-rails (6.1.3)
actionpack (>= 6.1)
activesupport (>= 6.1)
railties (>= 6.1)
- rspec-core (~> 3.12)
- rspec-expectations (~> 3.12)
- rspec-mocks (~> 3.12)
- rspec-support (~> 3.12)
- rspec-support (3.12.1)
+ rspec-core (~> 3.13)
+ rspec-expectations (~> 3.13)
+ rspec-mocks (~> 3.13)
+ rspec-support (~> 3.13)
+ rspec-support (3.13.1)
rss (0.3.0)
rexml
rswag-specs (2.13.0)
@@ -402,57 +439,69 @@ GEM
rspec-core (>= 2.14)
rtlcss (0.2.1)
mini_racer (>= 0.6.3)
- rubocop (1.60.2)
+ rubocop (1.65.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
- regexp_parser (>= 1.8, < 3.0)
+ regexp_parser (>= 2.4, < 3.0)
rexml (>= 3.2.5, < 4.0)
- rubocop-ast (>= 1.30.0, < 2.0)
+ rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
- rubocop-ast (1.30.0)
- parser (>= 3.2.1.0)
- rubocop-capybara (2.20.0)
+ rubocop-ast (1.31.3)
+ parser (>= 3.3.1.0)
+ rubocop-capybara (2.21.0)
rubocop (~> 1.41)
- rubocop-discourse (3.6.0)
+ rubocop-discourse (3.8.1)
+ activesupport (>= 6.1)
rubocop (>= 1.59.0)
- rubocop-rspec (>= 2.25.0)
- rubocop-factory_bot (2.25.1)
- rubocop (~> 1.41)
- rubocop-rspec (2.26.1)
- rubocop (~> 1.40)
- rubocop-capybara (~> 2.17)
- rubocop-factory_bot (~> 2.22)
+ rubocop-capybara (>= 2.0.0)
+ rubocop-factory_bot (>= 2.0.0)
+ rubocop-rails (>= 2.25.0)
+ rubocop-rspec (>= 3.0.1)
+ rubocop-rspec_rails (>= 2.30.0)
+ rubocop-factory_bot (2.26.1)
+ rubocop (~> 1.61)
+ rubocop-rails (2.25.1)
+ activesupport (>= 4.2.0)
+ rack (>= 1.1)
+ rubocop (>= 1.33.0, < 2.0)
+ rubocop-ast (>= 1.31.1, < 2.0)
+ rubocop-rspec (3.0.3)
+ rubocop (~> 1.61)
+ rubocop-rspec_rails (2.30.0)
+ rubocop (~> 1.61)
+ rubocop-rspec (~> 3, >= 3.0.1)
ruby-prof (1.7.0)
ruby-progressbar (1.13.0)
- ruby-readability (0.7.0)
+ ruby-readability (0.7.1)
guess_html_encoding (>= 0.0.4)
nokogiri (>= 1.6.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
- sanitize (6.1.0)
+ sanitize (6.1.2)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
- sass-embedded (1.70.0)
- google-protobuf (~> 3.25)
- rake (>= 13.0.0)
- sass-embedded (1.70.0-arm64-darwin)
- google-protobuf (~> 3.25)
- sass-embedded (1.70.0-x86_64-darwin)
- google-protobuf (~> 3.25)
- sassc-embedded (1.70.0)
- sass-embedded (~> 1.70)
- selenium-devtools (0.121.0)
+ sass-embedded (1.77.5)
+ google-protobuf (>= 3.25, < 5.0)
+ rake (>= 13)
+ sass-embedded (1.77.5-arm64-darwin)
+ google-protobuf (>= 3.25, < 5.0)
+ sass-embedded (1.77.5-x86_64-darwin)
+ google-protobuf (>= 3.25, < 5.0)
+ sassc-embedded (1.77.7)
+ sass-embedded (~> 1.77)
+ selenium-devtools (0.126.0)
selenium-webdriver (~> 4.2)
- selenium-webdriver (4.17.0)
+ selenium-webdriver (4.23.0)
base64 (~> 0.2)
+ logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
- shoulda-matchers (6.1.0)
+ shoulda-matchers (6.2.0)
activesupport (>= 5.2.0)
sidekiq (6.5.12)
connection_pool (>= 2.2.5, < 3)
@@ -464,30 +513,35 @@ GEM
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
- simpleidn (0.2.1)
- unf (~> 0.1.4)
+ simpleidn (0.2.3)
snaky_hash (2.0.1)
hashie
version_gem (~> 1.1, >= 1.1.1)
- sprockets-rails (3.4.2)
- actionpack (>= 5.2)
- activesupport (>= 5.2)
+ sprockets (3.7.3)
+ base64
+ concurrent-ruby (~> 1.0)
+ rack (> 1, < 3)
+ sprockets-rails (3.5.1)
+ actionpack (>= 6.1)
+ activesupport (>= 6.1)
sprockets (>= 3.0.0)
- sqlite3 (1.7.1)
+ sqlite3 (2.0.2)
mini_portile2 (~> 2.8.0)
- sqlite3 (1.7.1-arm64-darwin)
- sqlite3 (1.7.1-x86_64-darwin)
+ sqlite3 (2.0.2-arm64-darwin)
+ sqlite3 (2.0.2-x86_64-darwin)
sshkey (3.0.0)
stackprof (0.2.26)
+ stringio (3.1.1)
+ strscan (3.1.0)
syntax_tree (6.2.0)
prettier_print (>= 1.2.0)
syntax_tree-disable_ternary (1.0.0)
- test-prof (1.3.1)
- thor (1.3.0)
+ test-prof (1.3.3.1)
+ thor (1.3.1)
timeout (0.4.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
- tzinfo-data (1.2023.4)
+ tzinfo-data (1.2024.1)
tzinfo (>= 1.0.0)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
@@ -500,37 +554,39 @@ GEM
raindrops (~> 0.7)
uniform_notifier (1.16.0)
uri (0.13.0)
- version_gem (1.1.3)
+ version_gem (1.1.4)
web-push (3.0.1)
jwt (~> 2.0)
openssl (~> 3.0)
- webmock (3.19.1)
+ webmock (3.23.1)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
- websocket (1.2.10)
+ webrick (1.8.1)
+ websocket (1.2.11)
xpath (3.2.0)
nokogiri (~> 1.8)
yaml-lint (0.1.2)
- yard (0.9.34)
- zeitwerk (2.6.12)
+ yard (0.9.36)
+ zeitwerk (2.6.16)
PLATFORMS
arm64-darwin-21
arm64-darwin-22
arm64-darwin-23
+ arm64-darwin-24
ruby
x86_64-darwin-22
DEPENDENCIES
- actionmailer (< 7.1)
- actionpack (< 7.1)
- actionview (< 7.1)
+ actionmailer (~> 7.1.0)
+ actionpack (~> 7.1.0)
+ actionview (~> 7.1.0)
actionview_precompiler
active_model_serializers (~> 0.8.3)
- activemodel (< 7.1)
- activerecord (< 7.1)
- activesupport (< 7.1)
+ activemodel (~> 7.1.0)
+ activerecord (~> 7.1.0)
+ activesupport (~> 7.1.0)
addressable
annotate
aws-sdk-s3
@@ -569,12 +625,12 @@ DEPENDENCIES
htmlentities
http_accept_language
image_optim
+ iso8601
json
json_schemer
listen
lograge
logstash-event
- logstash-logger
logster
loofah
lru_redux
@@ -583,13 +639,13 @@ DEPENDENCIES
maxminddb
memory_profiler
message_bus
+ messageformat-wrapper
mini_mime
mini_racer
mini_scheduler
mini_sql
mini_suffix
minio_runner
- minitest
mocha
multi_json
mustache
@@ -610,6 +666,7 @@ DEPENDENCIES
pg
pry-byebug
pry-rails
+ pry-stack_explorer
puma
rack
rack-mini-profiler
@@ -617,17 +674,18 @@ DEPENDENCIES
rails-dom-testing
rails_failover
rails_multisite
- railties (< 7.1)
+ railties (~> 7.1.0)
rake
rb-fsevent
rbtrace
rchardet
redcarpet
- redis
+ redis (< 5.0)
redis-namespace
rinku
rotp
rqrcode
+ rrule
rspec
rspec-html-matchers
rspec-rails
@@ -645,7 +703,7 @@ DEPENDENCIES
shoulda-matchers
sidekiq
simplecov
- sprockets!
+ sprockets (~> 3.7.3)
sprockets-rails
sqlite3
sshkey
@@ -664,4 +722,4 @@ DEPENDENCIES
yard
BUNDLED WITH
- 2.5.11
+ 2.4.22
diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix
index 16474c336762..b6f82fc701f4 100644
--- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix
+++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix
@@ -5,21 +5,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0w6gvj7ybniq89834hqww9rj2xypz9l91f8niwaws2yq1qklymr2";
+ sha256 = "0l835a50h95wlzcy76c2vg54ix3i55kqmnrmz67b11q5fjb6068z";
type = "gem";
};
- version = "7.0.8";
+ version = "7.1.3.4";
};
actionpack = {
- dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
+ dependencies = ["actionview" "activesupport" "nokogiri" "racc" "rack" "rack-session" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1l319p0gipfgq8bp8dvbv97qqb72rad9zcqn5snhgv20cmpqr69b";
+ sha256 = "1lpd0lvn6abcq5k8g0qw8kmzx6igirlqxvd1hhwmr5vaxhdwgbyw";
type = "gem";
};
- version = "7.0.8";
+ version = "7.1.3.4";
};
actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@@ -27,10 +27,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xnpdwj1d8m6c2d90jp9cs50ggiz0jj02ls2h9lg68k4k8mnjbd2";
+ sha256 = "0nv1ifjhm59abc52k2hwazl38r9cc4bkfgdsl00f24gc5ljgbz21";
type = "gem";
};
- version = "7.0.8";
+ version = "7.1.3.4";
};
actionview_precompiler = {
dependencies = ["actionview"];
@@ -60,10 +60,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1cn1ic7ml75jm0c10s7cm5mvcgfnafj0kjvvjavpjcxgz6lxcqyb";
+ sha256 = "0qhg0izdckgyqmrsgigh1vkqg8ccrkdjhf36k9gxcbgvzpqfx2iz";
type = "gem";
};
- version = "7.0.8";
+ version = "7.1.3.4";
};
activemodel = {
dependencies = ["activesupport"];
@@ -71,32 +71,32 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "004w8zaz2g3y6lnrsvlcmljll0m3ndqpgwf0wfscgq6iysibiglm";
+ sha256 = "0wmdw440l4h75zk6c4ynbnv21bj26dh8kb1kwikqkjnzfvm3ij7l";
type = "gem";
};
- version = "7.0.8";
+ version = "7.1.3.4";
};
activerecord = {
- dependencies = ["activemodel" "activesupport"];
+ dependencies = ["activemodel" "activesupport" "timeout"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04wavps80q3pvhvfbmi4gs102y1p6mxbg8xylzvib35b6m92adpj";
+ sha256 = "1wihj9xhr7yj10hh8fqw6ralanbwlisncbam8pa92czjssjfqkkq";
type = "gem";
};
- version = "7.0.8";
+ version = "7.1.3.4";
};
activesupport = {
- dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+ dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5";
+ sha256 = "0283wk1zxb76lg79dk501kcf5xy9h25qiw15m86s4nrfv11vqns5";
type = "gem";
};
- version = "7.0.8";
+ version = "7.1.3.4";
};
addressable = {
dependencies = ["public_suffix"];
@@ -104,10 +104,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr";
+ sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
type = "gem";
};
- version = "2.8.6";
+ version = "2.8.7";
};
annotate = {
dependencies = ["activerecord" "rake"];
@@ -145,10 +145,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bg0v08n9mgvpnvkx8aznrax25lkrfsi5sjfdlccm7dadnada5fg";
+ sha256 = "0fhym2gsm9kzl74nvzk3hhw288n1l77kxinhik43p37ayranzcv5";
type = "gem";
};
- version = "1.583.0";
+ version = "1.894.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@@ -156,10 +156,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0hajbavfngn99hcz6n20162jygvwdflldvnlrza7z32hizawaaan";
+ sha256 = "088nq8yz9n4p7pnhjwp9nbxlkj7jwchpkzvnl4nybfb1dkvk4dns";
type = "gem";
};
- version = "3.130.2";
+ version = "3.191.3";
};
aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -167,10 +167,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "14dcfqqdx1dy7qwrdyqdvqjs53kswm4njvg34f61jpl9xi3h2yf3";
+ sha256 = "1gbxms3daszl4mk89swjrpq3fqgm9lg0wl65yjfp0nfz8jm4jyqf";
type = "gem";
};
- version = "1.56.0";
+ version = "1.77.0";
};
aws-sdk-s3 = {
dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@@ -178,10 +178,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1r6dxz3llgxbbm66jq5mkzk0i6qsxwv0d9s0ipwb23vv3bgp23yf";
+ sha256 = "1safbxycz517m2v981z8kbmdiqx9jypl093ia0mcrskkgh4fyb3s";
type = "gem";
};
- version = "1.114.0";
+ version = "1.143.0";
};
aws-sdk-sns = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -189,10 +189,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0d3fhll3hqc23fvj7p0ncjrr0fri7spy21r0hfkqjhijm0q1xqg9";
+ sha256 = "1ql1y276lfk27dyisk8ak1wdnysklw2dcir3kgy05glzzc9j4z1w";
type = "gem";
};
- version = "1.53.0";
+ version = "1.72.0";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@@ -200,10 +200,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z";
+ sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4";
type = "gem";
};
- version = "1.5.0";
+ version = "1.8.0";
};
base64 = {
groups = ["default" "test"];
@@ -231,25 +231,25 @@
version = "2.10.1";
};
bigdecimal = {
- groups = ["default" "test"];
+ groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w";
+ sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
type = "gem";
};
- version = "3.1.6";
+ version = "3.1.8";
};
binding_of_caller = {
dependencies = ["debug_inspector"];
- groups = ["development"];
+ groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "078n2dkpgsivcf0pr50981w95nfc2bsrp3wpf9wnxz1qsp8jbb9s";
+ sha256 = "16mjj15ks5ws53v2y31hxcmf46d0qjdvdaadpk7xsij2zymh4a9b";
type = "gem";
};
- version = "1.0.0";
+ version = "1.0.1";
};
bootsnap = {
dependencies = ["msgpack"];
@@ -261,20 +261,20 @@
}];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "028qif22isxa5sg5gf1322d0qjhir5rr0jpkaiwcic4lspacdcnv";
+ sha256 = "1srlq3gqirzdkhv12ljpnp5cb0f8jfrl3n8xs9iivyz2c7khvdyp";
type = "gem";
};
- version = "1.17.1";
+ version = "1.18.3";
};
builder = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr";
+ sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9";
type = "gem";
};
- version = "3.2.4";
+ version = "3.3.0";
};
bullet = {
dependencies = ["activesupport" "uniform_notifier"];
@@ -282,10 +282,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zs6dwspb0m9ygl7lwdmilhdn9ka85a0qfiip49m9rfpfj46lps0";
+ sha256 = "12gacycw1adsdjp14pm43619c6lcdaddhgbdizy7gnzmnjhwh0im";
type = "gem";
};
- version = "7.1.6";
+ version = "7.2.0";
};
byebug = {
groups = ["development" "test"];
@@ -381,10 +381,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2";
+ sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g";
type = "gem";
};
- version = "1.2.3";
+ version = "1.3.3";
};
connection_pool = {
groups = ["default"];
@@ -423,10 +423,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0r48q8csd1ld0yrzsp45wkfnpmkhk09gsldq8rlikarnmc51s9gf";
+ sha256 = "0jaa7is4fw1cxigm8vlyhg05bw4nqy4f91zjqxk7pp4c8bdyyfn8";
type = "gem";
};
- version = "0.4.6";
+ version = "1.0.0";
};
crass = {
groups = ["default" "development" "test"];
@@ -444,10 +444,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "18mii41bbl106rn940ah8v3xclj4yrxxa0bwlwp546244n9b83zp";
+ sha256 = "1rhqn05w27w2mjrf0a6ppb4fxpxbfvyhwgdxa8z886jr4qnhywzb";
type = "gem";
};
- version = "1.16.0";
+ version = "1.17.1";
};
csv = {
groups = ["default"];
@@ -484,10 +484,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9";
+ sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7";
type = "gem";
};
- version = "1.5.0";
+ version = "1.5.1";
};
diffy = {
groups = ["default"];
@@ -546,10 +546,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz";
+ sha256 = "07pj4z3h8wk4fgdn6s62vw1lwvhj0ac0x10vfbdkr9xzk7krn5cn";
type = "gem";
};
- version = "1.4.0";
+ version = "1.4.1";
};
drb = {
groups = ["default"];
@@ -580,20 +580,20 @@
}];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7";
+ sha256 = "0qnd6ff4az22ysnmni3730c41b979xinilahzg86bn7gv93ip9pw";
type = "gem";
};
- version = "1.12.0";
+ version = "1.13.0";
};
excon = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1kmmwgjzlrnc3nnrdnw1z67c95nbw0hv54a73yj8jw6pcvl9585x";
+ sha256 = "0ala6123d3cv965ss48iyi0q4hcbzrznfwv2f1mr91sy98cigq4h";
type = "gem";
};
- version = "0.109.0";
+ version = "0.111.0";
};
execjs = {
groups = ["assets" "default"];
@@ -647,15 +647,15 @@
version = "1.3.0";
};
faraday = {
- dependencies = ["faraday-net_http"];
+ dependencies = ["faraday-net_http" "logger"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qqb1rmk0f9m82iijjlqadh5yby1bhnr6svjk9vxdvh6f181988s";
+ sha256 = "1adx342h7s3imyrwwbda73g9ni1y07qj35br9lrzq4f5mh16qghs";
type = "gem";
};
- version = "2.9.0";
+ version = "2.10.0";
};
faraday-net_http = {
dependencies = ["net-http"];
@@ -663,10 +663,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17w51yk4rrm9rpnbc3x509s619kba0jga3qrj4b17l30950vw9qn";
+ sha256 = "0f49frpfdr8czwm2mjkfny4pini6fy49b6hamw4jrppl4vsg14ys";
type = "gem";
};
- version = "3.1.0";
+ version = "3.1.1";
};
faraday-retry = {
dependencies = ["faraday"];
@@ -674,10 +674,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ia19zgni6cw96rvsr0s004vjs9m2r6la4s00zcff36xaia4m0l0";
+ sha256 = "023ncwlagnf2irx2ckyj1pg1f1x436jgr4a5y45mih298p8zwij1";
type = "gem";
};
- version = "2.2.0";
+ version = "2.2.1";
};
fast_blank = {
groups = ["default"];
@@ -700,10 +700,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "104kn1lj55hifcpiw1x7x9slskvqmfanylcz3nj8acjgmri0av72";
+ sha256 = "1sfc7svf7h1ja6zmsq9f3ps6pg0q4hymphh6rk7ipmp7ygqjkii3";
type = "gem";
};
- version = "2.3.0";
+ version = "2.3.1";
};
ffi = {
groups = ["default" "development" "test"];
@@ -714,10 +714,10 @@
}];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd";
+ sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
type = "gem";
};
- version = "1.16.3";
+ version = "1.17.0";
};
fspath = {
groups = ["default"];
@@ -741,14 +741,15 @@
version = "1.2.1";
};
google-protobuf = {
+ dependencies = ["bigdecimal" "rake"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1mnxzcq8kmyfb9bkzqnp019d1hx1vprip3yzdkkha6b3qz5rgg9r";
+ sha256 = "0vwnr6fmxig4pkag86yzbznpxk8ii7rhjz0rrprkqvnymhhfnscz";
type = "gem";
};
- version = "3.25.3";
+ version = "4.27.2";
};
guess_html_encoding = {
groups = ["default"];
@@ -791,14 +792,15 @@
version = "5.0.0";
};
highline = {
+ dependencies = ["reline"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02ghhvigqbq4252gsi4w8a9klkdkybmbz29ghfp1y6sqzlcb466a";
+ sha256 = "1sxqnaz6wvkwbwzsipwsqcg1zw2kn67x7l362whv87zl5133w60l";
type = "gem";
};
- version = "3.0.1";
+ version = "3.1.0";
};
htmlentities = {
groups = ["default"];
@@ -826,10 +828,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
+ sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16";
type = "gem";
};
- version = "1.14.1";
+ version = "1.14.5";
};
image_optim = {
dependencies = ["exifr" "fspath" "image_size" "in_threads" "progress"];
@@ -862,6 +864,37 @@
};
version = "1.6.0";
};
+ io-console = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "08d2lx42pa8jjav0lcjbzfzmw61b8imxr9041pva8xzqabrczp7h";
+ type = "gem";
+ };
+ version = "0.7.2";
+ };
+ irb = {
+ dependencies = ["rdoc" "reline"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "05g6vpz3997q4j3xhrliswfx3g5flsn5cfn1p1s4h6dx7c0hbn2k";
+ type = "gem";
+ };
+ version = "1.14.0";
+ };
+ iso8601 = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "18js898rhh6byp0znvchiv6mcxi5l8v3v0bj2ddajpxynwajp319";
+ type = "gem";
+ };
+ version = "0.13.0";
+ };
jmespath = {
groups = ["default"];
platforms = [];
@@ -877,10 +910,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq";
+ sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q";
type = "gem";
};
- version = "2.7.1";
+ version = "2.7.2";
};
json-schema = {
dependencies = ["addressable"];
@@ -888,31 +921,32 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0j9dz9sf7swwmfahlngph8n9ibm0cx7mdy9zpv3w44578nbkka49";
+ sha256 = "09bq393nrxa7hmphc3li8idgxdnb5hwgj15d0q5qsh4l5g1qvrnm";
type = "gem";
};
- version = "4.1.1";
+ version = "4.3.1";
};
json_schemer = {
- dependencies = ["hana" "regexp_parser" "simpleidn"];
+ dependencies = ["bigdecimal" "hana" "regexp_parser" "simpleidn"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02gnz7wajg7f5n67vlswfi8yjvwahypy36z6hrg0qfx3cc3589qg";
+ sha256 = "0dgbrps0ydiyxcgj5n4dny0cmzwj125x1s792l7m5jjrp1rs27wz";
type = "gem";
};
- version = "2.1.1";
+ version = "2.3.0";
};
jwt = {
+ dependencies = ["base64"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "16z11alz13vfc4zs5l3fk6n51n2jw9lskvc4h4prnww0y797qd87";
+ sha256 = "04mw326i9vsdcqwm4bf0zvnqw237f8l7022nhlbmak92bqqpg62s";
type = "gem";
};
- version = "2.7.1";
+ version = "2.8.2";
};
kgio = {
groups = ["default"];
@@ -945,10 +979,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0n2kakfa4nmkkmjimkg2z4fsni9v0qbwkwn9hcm2xp69xqfcmxiq";
+ sha256 = "13gmrl4lq1rfpdn76v5nid2hsajhrw27s6n88j09v26f0axgp4vp";
type = "gem";
};
- version = "18.16.0.0";
+ version = "18.19.0.0";
};
listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
@@ -956,10 +990,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13rgkfar8pp31z1aamxf5y7cfq88wv6rxxcwy7cmm177qq508ycn";
+ sha256 = "0rwwsmvq79qwzl6324yc53py02kbrcww35si720490z5w0j497nv";
type = "gem";
};
- version = "3.8.0";
+ version = "3.9.0";
};
literate_randomizer = {
groups = ["default" "development"];
@@ -971,6 +1005,16 @@
};
version = "0.4.0";
};
+ logger = {
+ groups = ["default" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0gpg8gzi0xwymw4aaq2iafcbx31i3xzkg3fb30mdxn1d4qhc3dqa";
+ type = "gem";
+ };
+ version = "1.6.0";
+ };
lograge = {
dependencies = ["actionpack" "activesupport" "railties" "request_store"];
groups = ["default"];
@@ -992,26 +1036,15 @@
};
version = "1.2.02";
};
- logstash-logger = {
- dependencies = ["logstash-event"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1nh0jgz4rl46axqb9l0fa866kh34wb7yf11qc3j30xhprdqb8yjp";
- type = "gem";
- };
- version = "0.26.1";
- };
logster = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "036hw6iiy64d1q3cmqi026zspr8lyzh1qw00ds6l8l2jgg8m6fsc";
+ sha256 = "1bmvpa5mk779rgl4s4qy8nyhjh1lpf5gn4pmv40xyalnv2whryf3";
type = "gem";
};
- version = "2.16.0";
+ version = "2.20.0";
};
loofah = {
dependencies = ["crass" "nokogiri"];
@@ -1090,10 +1123,10 @@
}];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1c81d68r4wx0ckbmqxlfqc2qpd94jwcmqdm0xgr0s46r48pv9k9q";
+ sha256 = "1pv28xh8mss25fj4nd5r6zds1br8ssr2bpxr0md5pskv38m5qz0f";
type = "gem";
};
- version = "1.0.1";
+ version = "1.0.2";
};
message_bus = {
dependencies = ["rack"];
@@ -1106,15 +1139,26 @@
};
version = "4.3.8";
};
+ messageformat-wrapper = {
+ dependencies = ["mini_racer"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1g30y5qv6jx39qz5g0yai37n46mvzjn7si8whjyd24p44sb8gspc";
+ type = "gem";
+ };
+ version = "1.1.0";
+ };
method_source = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp";
+ sha256 = "1igmc3sq9ay90f8xjvfnswd1dybj1s3fi0dwd53inwsvqk4h24qq";
type = "gem";
};
- version = "1.0.0";
+ version = "1.1.0";
};
mini_mime = {
groups = ["default" "test"];
@@ -1142,10 +1186,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zjf3jsbara8fpfky28z1f64ymk5qsq40i527fxdnw061hlm4izy";
+ sha256 = "1ling4ynn7na1cw69wzn8zn00jifwjrnprnynn05rcca1pzs58d1";
type = "gem";
};
- version = "0.8.0";
+ version = "0.14.1";
};
mini_scheduler = {
dependencies = ["sidekiq"];
@@ -1194,10 +1238,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1hmszq7p4zp2ha3qjv1axam602rgnqhlz5zfzil7yk4nvfwcv1bn";
+ sha256 = "0jj629q3vw5yn90q4di4dyb87pil4a8qfm2srhgy5nc8j2n33v1i";
type = "gem";
};
- version = "5.21.2";
+ version = "5.24.1";
};
mocha = {
dependencies = ["ruby2_keywords"];
@@ -1205,10 +1249,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lsll8iba8612dypk718l9kx73m9syiscb2rhciljys1krc5g1zr";
+ sha256 = "04k1k9cmdv7q2p1b2z2y1k9dn1hhwjdlwkrp46gfq84v7887xhdl";
type = "gem";
};
- version = "2.1.0";
+ version = "2.4.5";
};
msgpack = {
groups = ["default"];
@@ -1235,14 +1279,15 @@
version = "1.15.0";
};
multi_xml = {
+ dependencies = ["bigdecimal"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj";
+ sha256 = "06x61ca5j84nyhr1mwh9r436yiphnc5hmacb3gwqyn5gd0611kjg";
type = "gem";
};
- version = "0.6.0";
+ version = "0.7.1";
};
mustache = {
groups = ["default"];
@@ -1281,10 +1326,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0z9f6kfxz9qanar534gs3mk6snyvw8rnx3f6ykjn2jiziv0rv1ig";
+ sha256 = "0rc08fxm10vv73bg0nqyp5bdvl4cvzb3y4cdk4kwmxx414zln652";
type = "gem";
};
- version = "0.4.9.1";
+ version = "0.4.14";
};
net-pop = {
dependencies = ["net-protocol"];
@@ -1314,20 +1359,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0csspzqrg7s2v2wdp6vqqs1rra6w5ilpgnps5h52ig6rp7x2i389";
+ sha256 = "0amlhz8fhnjfmsiqcjajip57ici2xhw089x7zqyhpk51drg43h2z";
type = "gem";
};
- version = "0.4.0.1";
+ version = "0.5.0";
};
nio4r = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xkjz56qc7hl7zy7i7bhiyw5pl85wwjsa4p70rj6s958xj2sd1lm";
+ sha256 = "017nbw87dpr4wyk81cgj8kxkxqgsgblrkxnmmadc77cg9gflrfal";
type = "gem";
};
- version = "2.7.0";
+ version = "2.7.3";
};
nokogiri = {
dependencies = ["mini_portile2" "racc"];
@@ -1335,10 +1380,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1l8b0i24h4irivyhwy9xmkjbggw86cxkzkiqdqg0jpcp9qc8h4rl";
+ sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq";
type = "gem";
};
- version = "1.16.0";
+ version = "1.16.7";
};
oauth = {
dependencies = ["oauth-tty" "snaky_hash" "version_gem"];
@@ -1379,10 +1424,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0g5nx99lrwmk6ynfaacqkyijnhvi4mckm77bmvpa0jmfg068l26h";
+ sha256 = "0b2narmcw4723lfyy7j0l4pfyv5n0qnmkm4mqgi832p5cg31k090";
type = "gem";
};
- version = "3.16.3";
+ version = "3.16.4";
};
omniauth = {
dependencies = ["hashie" "rack"];
@@ -1501,10 +1546,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15wkxrg1sj3n1h2g8jcrn7gcapwcgxr659ypjf75z1ipkgxqxwsv";
+ sha256 = "145bn5q7ysnjj02jdf1x4nc1f0xxrv7ihgz9yr1j7sinmawqkq0j";
type = "gem";
};
- version = "1.24.0";
+ version = "1.25.1";
};
parallel_tests = {
dependencies = ["parallel"];
@@ -1512,10 +1557,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0mahfvfq56d476wb6p1zg3f2gph4zggb4dcly0h5rbvvkaysfvfw";
+ sha256 = "0q5q38sfrpwgcqwf5sl6xals5w11xayh8i9nq1vxya2sbrzrgbcq";
type = "gem";
};
- version = "4.4.0";
+ version = "4.7.1";
};
parser = {
dependencies = ["ast" "racc"];
@@ -1523,10 +1568,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "11r6kp8wam0nkfvnwyc1fmvky102r1vcfr84vi2p1a2wa0z32j3p";
+ sha256 = "10ly2wind06nylyqa5724ld2l0l46d3ag4fm04ifjgw7qdlpf94d";
type = "gem";
};
- version = "3.3.0.5";
+ version = "3.3.4.0";
};
pg = {
groups = ["default"];
@@ -1586,20 +1631,42 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1cf4ii53w2hdh7fn8vhqpzkymmchjbwij4l3m7s6fsxvb9bn51j6";
+ sha256 = "0garafb0lxbm3sx2r9pqgs7ky9al58cl3wmwc0gmvmrl9bi2i7m6";
type = "gem";
};
- version = "0.3.9";
+ version = "0.3.11";
+ };
+ pry-stack_explorer = {
+ dependencies = ["binding_of_caller" "pry"];
+ groups = ["development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0h7kp99r8vpvpbvia079i58932qjz2ci9qhwbk7h1bf48ydymnx2";
+ type = "gem";
+ };
+ version = "0.6.1";
+ };
+ psych = {
+ dependencies = ["stringio"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0s5383m6004q76xm3lb732bp4sjzb6mxb6rbgn129gy2izsj4wrk";
+ type = "gem";
+ };
+ version = "5.1.2";
};
public_suffix = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m";
+ sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
type = "gem";
};
- version = "5.0.4";
+ version = "6.0.1";
};
puma = {
dependencies = ["nio4r"];
@@ -1617,10 +1684,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp";
+ sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09";
type = "gem";
};
- version = "1.7.3";
+ version = "1.8.0";
};
rack = {
groups = ["default" "development" "test"];
@@ -1631,10 +1698,10 @@
}];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv";
+ sha256 = "0hj0rkw2z9r1lcg2wlrcld2n3phwrcgqcp7qd1g9a7hwgalh2qzx";
type = "gem";
};
- version = "2.2.8";
+ version = "2.2.9";
};
rack-mini-profiler = {
dependencies = ["rack"];
@@ -1642,10 +1709,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1cbz4ih4ji2ika935x03in060kh236lyxfwk0c09p2l1wim59xcv";
+ sha256 = "00d80wjavaakhs177b7g542qs3n55kj4icjkwj0lbxcmaxyxxw1b";
type = "gem";
};
- version = "3.3.0";
+ version = "3.3.1";
};
rack-protection = {
dependencies = ["base64" "rack"];
@@ -1658,6 +1725,17 @@
};
version = "3.2.0";
};
+ rack-session = {
+ dependencies = ["rack"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xhxhlsz6shh8nm44jsmd9276zcnyzii364vhcvf0k8b8bjia8d0";
+ type = "gem";
+ };
+ version = "1.0.2";
+ };
rack-test = {
dependencies = ["rack"];
groups = ["default" "development" "test"];
@@ -1669,6 +1747,17 @@
};
version = "2.1.0";
};
+ rackup = {
+ dependencies = ["rack" "webrick"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1wbr03334ba9ilcq25wh9913xciwj0j117zs60vsqm0zgwdkwpp9";
+ type = "gem";
+ };
+ version = "1.0.0";
+ };
rails-dom-testing = {
dependencies = ["activesupport" "minitest" "nokogiri"];
groups = ["default" "development" "test"];
@@ -1697,10 +1786,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "102v7928nyl1w1cmi70zbx42nw25v842r84gwchwijwnd2f30gvy";
+ sha256 = "1yxbh9xim46jqv9ap63ygvwv9bglbkqssn5hvr065gqly32mi407";
type = "gem";
};
- version = "2.0.1";
+ version = "2.1.1";
};
rails_multisite = {
dependencies = ["activerecord" "railties"];
@@ -1708,21 +1797,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0hilr3yhnzvzn3p2cl77im9ypvbfjk1vw7f72i1j7fi2bmq1h2hi";
+ sha256 = "1zlfmm19k0p19jzknimqhhzs1phswmfgispph9b5fkag0w3ajxci";
type = "gem";
};
- version = "5.0.0";
+ version = "6.0.0";
};
railties = {
- dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor" "zeitwerk"];
+ dependencies = ["actionpack" "activesupport" "irb" "rackup" "rake" "thor" "zeitwerk"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0sfc16zrcn4jgf5xczb08n6prhmqqgg9f0b4mn73zlzg6cwmqchj";
+ sha256 = "1z0slb2dlwrwgqijbk37hl4r9bh4h8vzcyswz6a9srl8lzrljq3c";
type = "gem";
};
- version = "7.0.8";
+ version = "7.1.3.4";
};
rainbow = {
groups = ["default" "development" "test"];
@@ -1755,10 +1844,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy";
+ sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
type = "gem";
};
- version = "13.1.0";
+ version = "13.2.1";
};
rb-fsevent = {
groups = ["development" "test"];
@@ -1776,10 +1865,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005";
+ sha256 = "0vmy8xgahixcz6hzwy4zdcyn2y6d6ri8dqv5xccgzc1r292019x0";
type = "gem";
};
- version = "0.10.1";
+ version = "0.11.1";
};
rbtrace = {
dependencies = ["ffi" "msgpack" "optimist"];
@@ -1806,6 +1895,17 @@
};
version = "1.8.0";
};
+ rdoc = {
+ dependencies = ["psych"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0ygk2zk0ky3d88v3ll7qh6xqvbvw5jin0hqdi1xkv1dhaw7myzdi";
+ type = "gem";
+ };
+ version = "6.7.0";
+ };
redcarpet = {
groups = ["generic_import"];
platforms = [];
@@ -1842,10 +1942,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ndxm0xnv27p4gv6xynk6q41irckj76q1jsqpysd9h6f86hhp841";
+ sha256 = "0ik40vcv7mqigsfpqpca36hpmnx0536xa825ai5qlkv3mmkyf9ss";
type = "gem";
};
- version = "2.9.0";
+ version = "2.9.2";
+ };
+ reline = {
+ dependencies = ["io-console"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0y6kyz7kcilwdpfy3saqfgnar38vr5ys9sp40ndffy6h1znxfbax";
+ type = "gem";
+ };
+ version = "0.5.9";
};
request_store = {
dependencies = ["rack"];
@@ -1853,20 +1964,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13ppgmsbrqah08j06bybd3cddv6dml79yzyjn7r8j1src78h98h7";
+ sha256 = "1jw89j9s5p5cq2k7ffj5p4av4j4fxwvwjs1a4i9g85d38r9mvdz1";
type = "gem";
};
- version = "1.5.1";
+ version = "1.7.0";
};
rexml = {
+ dependencies = ["strscan"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
+ sha256 = "0zr5qpa8lampaqzhdcjcvyqnrqcjl7439mqjlkjz43wdhmpnh4s5";
type = "gem";
};
- version = "3.2.6";
+ version = "3.3.2";
};
rinku = {
groups = ["default"];
@@ -1897,10 +2009,10 @@
}];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fkfa0iq3r9b0zzrxpxha17avmyzci3kidzmfbf6fd1279mndpb0";
+ sha256 = "072qvvrcqj0yfr3b0j932mlhvn41i38bq37z7z07i3ikagndkqwy";
type = "gem";
};
- version = "4.2.0";
+ version = "4.3.0";
};
rqrcode = {
dependencies = ["chunky_png" "rqrcode_core"];
@@ -1923,16 +2035,27 @@
};
version = "1.2.0";
};
+ rrule = {
+ dependencies = ["activesupport"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "05ln9vfx1m2hb8cpmi8i7m1hhdxdra77xi6ri1inl27byx6kn4mx";
+ type = "gem";
+ };
+ version = "0.6.0";
+ };
rspec = {
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c";
+ sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l";
type = "gem";
};
- version = "3.12.0";
+ version = "3.13.0";
};
rspec-core = {
dependencies = ["rspec-support"];
@@ -1940,10 +2063,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0l95bnjxdabrn79hwdhn2q1n7mn26pj7y1w5660v5qi81x458nqm";
+ sha256 = "0k252n7s80bvjvpskgfm285a3djjjqyjcarlh3aq7a4dx2s94xsm";
type = "gem";
};
- version = "3.12.2";
+ version = "3.13.0";
};
rspec-expectations = {
dependencies = ["diff-lcs" "rspec-support"];
@@ -1951,10 +2074,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05j44jfqlv7j2rpxb5vqzf9hfv7w8ba46wwgxwcwd8p0wzi1hg89";
+ sha256 = "0022nxs9gqfhx35n4klibig770n0j31pnkd8anz00yvrvkdghk41";
type = "gem";
};
- version = "3.12.3";
+ version = "3.13.1";
};
rspec-html-matchers = {
dependencies = ["nokogiri" "rspec"];
@@ -1973,10 +2096,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1gq7gviwpck7fhp4y5ibljljvxgjklza18j62qf6zkm2icaa8lfy";
+ sha256 = "0f3vgp43hajw716vmgjv6f4ar6f97zf50snny6y3fy9kkj4qjw88";
type = "gem";
};
- version = "3.12.6";
+ version = "3.13.1";
};
rspec-rails = {
dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"];
@@ -1984,20 +2107,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1clmx6qzdbpm1g8ycg38gjbqsbr8ccqi6hqyx88g8yckz1hrx55x";
+ sha256 = "0nqwvyma86zchh4ki416h7cms38h521ghyypaq27b6yvkmp3h8yw";
type = "gem";
};
- version = "6.1.1";
+ version = "6.1.3";
};
rspec-support = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ky86j3ksi26ng9ybd7j0qsdf1lpr8mzrmn98yy9gzv801fvhsgr";
+ sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8";
type = "gem";
};
- version = "3.12.1";
+ version = "3.13.1";
};
rss = {
dependencies = ["rexml"];
@@ -2038,10 +2161,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0v67rgbhzanbf02fy5xasaxgmhxghlqb2cxjvbplinm2zfzs0380";
+ sha256 = "18g462bccr0rvszc7kirr89laggdf6254p7pqsckk3izg901chv2";
type = "gem";
};
- version = "1.60.2";
+ version = "1.65.0";
};
rubocop-ast = {
dependencies = ["parser"];
@@ -2049,10 +2172,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1cs9cc5p9q70valk4na3lki4xs88b52486p2v46yx3q1n5969bgs";
+ sha256 = "063qgvqbyv354icl2sgx758z22wzq38hd9skc3n96sbpv0cdc1qv";
type = "gem";
};
- version = "1.30.0";
+ version = "1.31.3";
};
rubocop-capybara = {
dependencies = ["rubocop"];
@@ -2060,21 +2183,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0f5r9di123hc4x2h453a143986plfzz9935bwc7267wj8awl8s1a";
+ sha256 = "1aw0n8jwhsr39r9q2k90xjmcz8ai2k7xx2a87ld0iixnv3ylw9jx";
type = "gem";
};
- version = "2.20.0";
+ version = "2.21.0";
};
rubocop-discourse = {
- dependencies = ["rubocop" "rubocop-rspec"];
+ dependencies = ["activesupport" "rubocop" "rubocop-capybara" "rubocop-factory_bot" "rubocop-rails" "rubocop-rspec" "rubocop-rspec_rails"];
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0f133ky0rl3zn2kb0dnzb4fvnx3w731a47f0sb91n5pisdz3ncyq";
+ sha256 = "1bcy1zl88f4fxjsda2nf6k13kqrj60z8nsqdv9z51fdkv0aj82wk";
type = "gem";
};
- version = "3.6.0";
+ version = "3.8.1";
};
rubocop-factory_bot = {
dependencies = ["rubocop"];
@@ -2082,21 +2205,43 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0d012phc7z5h1j1d2aisnbkmqlb95sld5jriia5qg2gpgbg1nxb2";
+ sha256 = "1aljadsjx7affcarzbhz7pydpy6fgqb8hl951y0cmrffxpa3rqcd";
+ type = "gem";
+ };
+ version = "2.26.1";
+ };
+ rubocop-rails = {
+ dependencies = ["activesupport" "rack" "rubocop" "rubocop-ast"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "19g6m8ladix1dq8darrqnhbj6n3cgp2ivxnh48yj3nrgw0z97229";
type = "gem";
};
version = "2.25.1";
};
rubocop-rspec = {
- dependencies = ["rubocop" "rubocop-capybara" "rubocop-factory_bot"];
+ dependencies = ["rubocop"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0n24wy34shczlr5fnim7vcbrgvs0hffzw89n06fxziim9iws406s";
+ sha256 = "0495y1bwv5j6r9dak7860i6qnm68c53vz2bx2js5lwm6p7py147f";
type = "gem";
};
- version = "2.26.1";
+ version = "3.0.3";
+ };
+ rubocop-rspec_rails = {
+ dependencies = ["rubocop" "rubocop-rspec"];
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0ijc1kw81884k0wjq1sgwaxa854n1fdddscp4fnzfzlx7zl150c8";
+ type = "gem";
+ };
+ version = "2.30.0";
};
ruby-prof = {
groups = ["development"];
@@ -2128,10 +2273,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15ivhbry7hf82lww1bzcrwfyjymijfb3rb0wdd32g2z0942wdspa";
+ sha256 = "11kqx5yp6syd99k1ksnw84b0sc3cr7icf63dibn2m025qg27ml2i";
type = "gem";
};
- version = "0.7.0";
+ version = "0.7.1";
};
ruby2_keywords = {
groups = ["default" "development" "test"];
@@ -2159,10 +2304,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wsw05y0h1ln3x2kvcw26fs9ivryb4xbjrb4hsk2pishkhydkz4j";
+ sha256 = "1c9j1rwdp87k7b7mawf8agpdycdr2dsl2wvjipmcy1c55kllp2qp";
type = "gem";
};
- version = "6.1.0";
+ version = "6.1.2";
};
sass-embedded = {
dependencies = ["google-protobuf" "rake"];
@@ -2170,10 +2315,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pmsiivj7azcmbxadkkvnmkhj1w6r1knbg0gwcg1g1pafpnpf7p7";
+ sha256 = "1nmy052pm46781s7ca6x3l4yb5p3glh8sf201xwcwpk9rv2av9m2";
type = "gem";
};
- version = "1.70.0";
+ version = "1.77.5";
};
sassc-embedded = {
dependencies = ["sass-embedded"];
@@ -2181,10 +2326,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ym7kh6zyygnxpjdsqbflwl0gjnyr25qn1dxygajaj4ww464ibya";
+ sha256 = "07pddxi18asxzkn652kvgh43dl1b0nf5p8ha62yhg2r0vzapzzvv";
type = "gem";
};
- version = "1.70.0";
+ version = "1.77.7";
};
selenium-devtools = {
dependencies = ["selenium-webdriver"];
@@ -2192,21 +2337,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1l2qf5w0bk01s50gzx8clzw4zchff9a01kk2s8fnpz65g7rgh4g9";
+ sha256 = "0ph7b947h5cgqyhb5a4jk467bggx48xy619ggh6p38ys8bjszp1l";
type = "gem";
};
- version = "0.121.0";
+ version = "0.126.0";
};
selenium-webdriver = {
- dependencies = ["base64" "rexml" "rubyzip" "websocket"];
+ dependencies = ["base64" "logger" "rexml" "rubyzip" "websocket"];
groups = ["test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0g3l3invk95w1f72mpp0r4hc3vsc3070c1xd1wg76kfg2r182xnq";
+ sha256 = "00dq3450kadsvxh1lpndasy0bab0ilrjhrnvlicfmkvrx3gfs2j9";
type = "gem";
};
- version = "4.17.0";
+ version = "4.23.0";
};
shoulda-matchers = {
dependencies = ["activesupport"];
@@ -2214,10 +2359,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1p83ca48h812h5gksw2q0x5289jsc4c417f8s6w9d4a12jzw86zi";
+ sha256 = "1pfq0w167v4055k0km64sxik1qslhsi32wl2jlidmfzkqmcw00m7";
type = "gem";
};
- version = "6.1.0";
+ version = "6.2.0";
};
sidekiq = {
dependencies = ["connection_pool" "rack" "redis"];
@@ -2262,15 +2407,14 @@
version = "0.1.4";
};
simpleidn = {
- dependencies = ["unf"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "06f7w6ph3bzzqk212yylfp4jfx275shgp9zg3xszbpv1ny2skp9m";
+ sha256 = "0a9c1mdy12y81ck7mcn9f9i2s2wwzjh1nr92ps354q517zq9dkh8";
type = "gem";
};
- version = "0.2.1";
+ version = "0.2.3";
};
snaky_hash = {
dependencies = ["hashie" "version_gem"];
@@ -2284,17 +2428,15 @@
version = "2.0.1";
};
sprockets = {
- dependencies = ["concurrent-ruby" "rack"];
+ dependencies = ["base64" "concurrent-ruby" "rack"];
groups = ["default"];
platforms = [];
source = {
- fetchSubmodules = false;
- rev = "f4d3dae71ef29c44b75a49cfbf8032cce07b423a";
- sha256 = "0ps1zb411nrwih0rdp6vrnx0n4n18jcwks2x06iw52gvswlv49ry";
- type = "git";
- url = "https://github.com/rails/sprockets";
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lyc6mx4yalsnxc9yp4a5xra4nz1nwwbk5634wlfncml0ll1bnnw";
+ type = "gem";
};
- version = "3.7.2";
+ version = "3.7.3";
};
sprockets-rails = {
dependencies = ["actionpack" "activesupport" "sprockets"];
@@ -2302,10 +2444,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1b9i14qb27zs56hlcc2hf139l0ghbqnjpmfi0054dxycaxvk5min";
+ sha256 = "0j7gwm749b3ff6544wxa878fpd1kvf2qc9fafassi8c7735jcin4";
type = "gem";
};
- version = "3.4.2";
+ version = "3.5.1";
};
sqlite3 = {
dependencies = ["mini_portile2"];
@@ -2313,10 +2455,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vkgmg63fa0m0fbyxdv7sn5mq3jpiz6r88yix2g3vdc6w0h94gcr";
+ sha256 = "0k8myqn1g7sfmxs1h0x7jijh5ybszxw5153l0aq0w1cxp3zm6vij";
type = "gem";
};
- version = "1.7.1";
+ version = "2.0.2";
};
sshkey = {
groups = ["default"];
@@ -2342,6 +2484,26 @@
};
version = "0.2.26";
};
+ stringio = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "07mfqb40b2wh53k33h91zva78f9zwcdnl85jiq74wnaw2wa6wiak";
+ type = "gem";
+ };
+ version = "3.1.1";
+ };
+ strscan = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01";
+ type = "gem";
+ };
+ version = "3.1.0";
+ };
syntax_tree = {
dependencies = ["prettier_print"];
groups = ["development" "test"];
@@ -2368,20 +2530,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08vm33d51zdan4zj4cccw3lx06p6flc1h40kgdfm9rp4x83csdda";
+ sha256 = "0lxik4ngvbphivyhss9i59c67zxkc0z7k0r683qshw1gdkfxzd8f";
type = "gem";
};
- version = "1.3.1";
+ version = "1.3.3.1";
};
thor = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s";
+ sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps";
type = "gem";
};
- version = "1.3.0";
+ version = "1.3.1";
};
timeout = {
groups = ["default"];
@@ -2410,10 +2572,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1v3k61zcbxfmf150d4vky6cbdmyrn3yljsl9na1y3i52v7zsbdnx";
+ sha256 = "1rg1dmx6mknjazb8qq0j9sb9fah470my5sbjb6f3pa6si5018682";
type = "gem";
};
- version = "1.2023.4";
+ version = "1.2024.1";
};
uglifier = {
dependencies = ["execjs"];
@@ -2499,10 +2661,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0q6zs0wgcrql9671fw6lmbvgh155snaak4fia24iji5wk9klpfh7";
+ sha256 = "08a6agx7xk1f6cr9a95dq42vl45si2ln21h33b96li59sv3555y6";
type = "gem";
};
- version = "1.1.3";
+ version = "1.1.4";
};
web-push = {
dependencies = ["jwt" "openssl"];
@@ -2521,20 +2683,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0vfispr7wd2p1fs9ckn1qnby1yyp4i1dl7qz8n482iw977iyxrza";
+ sha256 = "158d2ikjfzw43kgm095klp43ihphk0cv5xjprk44w73xfv03i9qg";
type = "gem";
};
- version = "3.19.1";
+ version = "3.23.1";
+ };
+ webrick = {
+ groups = ["default" "development" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r";
+ type = "gem";
+ };
+ version = "1.8.1";
};
websocket = {
groups = ["default" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1a4zc8d0d91c3xqwapda3j3zgpfwdbj76hkb69xn6qvfkfks9h9c";
+ sha256 = "0dr78vh3ag0d1q5gfd8960g1ca9g6arjd2w54mffid8h4i7agrxp";
type = "gem";
};
- version = "1.2.10";
+ version = "1.2.11";
};
xpath = {
dependencies = ["nokogiri"];
@@ -2562,19 +2734,19 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "013yrnwx1zhzhn1fnc19zck22a1qgimsaglp2iwgf5bz9l8h93js";
+ sha256 = "1r0b8w58p7gy06wph1qdjv2p087hfnmhd9jk23vjdj803dn761am";
type = "gem";
};
- version = "0.9.34";
+ version = "0.9.36";
};
zeitwerk = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1gir0if4nryl1jhwi28669gjwhxb7gzrm1fcc8xzsch3bnbi47jn";
+ sha256 = "08cfb35232p9s1r4jqv8wacv38vxh699mgbr9y03ga89gx9lipqp";
type = "gem";
};
- version = "2.6.12";
+ version = "2.6.16";
};
}
diff --git a/pkgs/servers/web-apps/discourse/unicorn_logging_and_timeout.patch b/pkgs/servers/web-apps/discourse/unicorn_logging_and_timeout.patch
index d85e4bf98676..897cad1b66ea 100644
--- a/pkgs/servers/web-apps/discourse/unicorn_logging_and_timeout.patch
+++ b/pkgs/servers/web-apps/discourse/unicorn_logging_and_timeout.patch
@@ -1,24 +1,25 @@
diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb
-index 9fd348b074..40eb73b96e 100644
+index b8c549bc0f..a7d3592013 100644
--- a/config/unicorn.conf.rb
+++ b/config/unicorn.conf.rb
-@@ -27,17 +27,9 @@ pid(ENV["UNICORN_PID_PATH"] || "#{discourse_path}/tmp/pids/unicorn.pid")
+@@ -35,19 +35,7 @@ FileUtils.mkdir_p("#{discourse_path}/tmp/pids") if !File.exist?("#{discourse_pat
+ # feel free to point this anywhere accessible on the filesystem
+ pid(ENV["UNICORN_PID_PATH"] || "#{discourse_path}/tmp/pids/unicorn.pid")
- if ENV["RAILS_ENV"] != "production"
- logger Logger.new(STDOUT)
-- # we want a longer timeout in dev cause first request can be really slow
-- timeout(ENV["UNICORN_TIMEOUT"] && ENV["UNICORN_TIMEOUT"].to_i || 60)
--else
+-if ENV["RAILS_ENV"] == "production"
- # By default, the Unicorn logger will write to stderr.
- # Additionally, some applications/frameworks log to stderr or stdout,
- # so prevent them from going to /dev/null when daemonized here:
-- stderr_path "#{discourse_path}/log/unicorn.stderr.log"
-- stdout_path "#{discourse_path}/log/unicorn.stdout.log"
+- stderr_path unicorn_stderr_path
+- stdout_path unicorn_stdout_path
+-
- # nuke workers after 30 seconds instead of 60 seconds (the default)
- timeout 30
- end
-
+-else
+- # we want a longer timeout in dev cause first request can be really slow
+- timeout(ENV["UNICORN_TIMEOUT"] && ENV["UNICORN_TIMEOUT"].to_i || 60)
+-end
+timeout(ENV["UNICORN_TIMEOUT"] && ENV["UNICORN_TIMEOUT"].to_i || 60)
-+
+
# important for Ruby 2.0
preload_app true
diff --git a/pkgs/servers/web-apps/discourse/update.py b/pkgs/servers/web-apps/discourse/update.py
index 972054904b29..65e97ec5b212 100755
--- a/pkgs/servers/web-apps/discourse/update.py
+++ b/pkgs/servers/web-apps/discourse/update.py
@@ -234,17 +234,12 @@ def update(rev):
_call_nix_update('discourse', version.version)
old_yarn_hash = _nix_eval('discourse.assets.yarnOfflineCache.outputHash')
- new_yarn_hash = repo.get_yarn_lock_hash(version.tag, "app/assets/javascripts/yarn-ember5.lock")
+ new_yarn_hash = repo.get_yarn_lock_hash(version.tag, "yarn.lock")
click.echo(f"Updating yarn lock hash: {old_yarn_hash} -> {new_yarn_hash}")
- old_yarn_dev_hash = _nix_eval('discourse.assets.yarnDevOfflineCache.outputHash')
- new_yarn_dev_hash = repo.get_yarn_lock_hash(version.tag, "yarn.lock")
- click.echo(f"Updating yarn dev lock hash: {old_yarn_dev_hash} -> {new_yarn_dev_hash}")
-
with open(Path(__file__).parent / "default.nix", 'r+') as f:
content = f.read()
content = content.replace(old_yarn_hash, new_yarn_hash)
- content = content.replace(old_yarn_dev_hash, new_yarn_dev_hash)
f.seek(0)
f.write(content)
f.truncate()
diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/servers/web-apps/mediawiki/default.nix
index 0bfed296331a..7b8b72f1af7b 100644
--- a/pkgs/servers/web-apps/mediawiki/default.nix
+++ b/pkgs/servers/web-apps/mediawiki/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenvNoCC, fetchurl, nixosTests }:
+{ lib, stdenvNoCC, fetchurl, imagemagick, nixosTests }:
stdenvNoCC.mkDerivation rec {
pname = "mediawiki";
@@ -11,6 +11,10 @@ stdenvNoCC.mkDerivation rec {
postPatch = ''
sed -i 's|$vars = Installer::getExistingLocalSettings();|$vars = null;|' includes/installer/CliInstaller.php
+
+ # fix generating previews for SVGs
+ substituteInPlace includes/config-schema.php \
+ --replace-fail "\$path/convert" "${imagemagick}/bin/convert"
'';
installPhase = ''
diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix
index 1459ee23920c..d494d128e5b0 100644
--- a/pkgs/servers/web-apps/netbox/default.nix
+++ b/pkgs/servers/web-apps/netbox/default.nix
@@ -1,26 +1,12 @@
-{ lib, nixosTests, callPackage, }:
+{
+ lib,
+ nixosTests,
+ callPackage,
+}:
let
generic = import ./generic.nix;
in
-lib.fix (self: {
- netbox = self.netbox_3_7;
-
- netbox_3_6 = callPackage generic {
- version = "3.6.9";
- hash = "sha256-R/hcBKrylW3GnEy10DkrLVr8YJtsSCvCP9H9LhafO9I=";
- extraPatches = [
- # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL
- ./config.patch
- ];
- tests = {
- netbox = nixosTests.netbox_3_6;
- inherit (nixosTests) netbox-upgrade;
- };
-
- maintainers = with lib.maintainers; [ minijackson n0emis raitobezarius ];
- eol = true;
- };
-
+{
netbox_3_7 = callPackage generic {
version = "3.7.8";
hash = "sha256-61pJbMWXNFnvWI0z9yWvsutdCAP4VydeceANNw0nKsk=";
@@ -28,11 +14,13 @@ lib.fix (self: {
# Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL
./config.patch
];
- tests = {
- netbox = nixosTests.netbox_3_7;
- inherit (nixosTests) netbox-upgrade;
- };
+ tests.netbox = nixosTests.netbox_3_7;
- maintainers = with lib.maintainers; [ minijackson n0emis raitobezarius ];
+ maintainers = with lib.maintainers; [
+ minijackson
+ n0emis
+ raitobezarius
+ ];
+ eol = true;
};
-})
+}
diff --git a/pkgs/servers/web-apps/nifi/default.nix b/pkgs/servers/web-apps/nifi/default.nix
index 3a65cb0fecfa..480b101098ac 100644
--- a/pkgs/servers/web-apps/nifi/default.nix
+++ b/pkgs/servers/web-apps/nifi/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nifi";
- version = "1.27.0";
+ version = "1.28.0";
src = fetchzip {
url = "mirror://apache/nifi/${version}/nifi-${version}-bin.zip";
- hash = "sha256-D3o7MLn8vdDqzk6/AJ7Lmq6Yx2swy8CwOyDTlxFSVME=";
+ hash = "sha256-EQqosdwNdaSUIcP3QlvzJZhDNu1JbHg08FlnZo6ogmQ=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/servers/web-apps/rss-bridge/default.nix b/pkgs/servers/web-apps/rss-bridge/default.nix
index 34296541fdf5..6d5be6e40233 100644
--- a/pkgs/servers/web-apps/rss-bridge/default.nix
+++ b/pkgs/servers/web-apps/rss-bridge/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, nixosTests }:
+{ stdenv, lib, fetchFromGitHub, nixosTests, nix-update-script }:
stdenv.mkDerivation rec {
pname = "rss-bridge";
@@ -16,8 +16,11 @@ stdenv.mkDerivation rec {
cp -R ./* $out
'';
- passthru.tests = {
- basic-functionality = nixosTests.rss-bridge;
+ passthru = {
+ tests = {
+ basic-functionality = nixosTests.rss-bridge;
+ };
+ updateScript = nix-update-script { };
};
meta = with lib; {
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index e25f09c5f077..e31e1fc75b22 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -28,11 +28,11 @@ self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
bdftopcf = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: {
pname = "bdftopcf";
- version = "1.1.1";
+ version = "1.1.2";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/util/bdftopcf-1.1.1.tar.xz";
- sha256 = "026rzs92h9jsc7r0kvvyvwhm22q0805gp38rs14x6ghg7kam7j8i";
+ url = "mirror://xorg/individual/util/bdftopcf-1.1.2.tar.xz";
+ sha256 = "0fjjn1z0cbsmhxkms93w73j2jbzf9f3xgbnjvnisl3rk0icvwq5w";
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
@@ -854,11 +854,11 @@ self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
fonttosfnt = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: {
pname = "fonttosfnt";
- version = "1.2.3";
+ version = "1.2.4";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/app/fonttosfnt-1.2.3.tar.xz";
- sha256 = "1bv1glfz4jqvkwx8hmv2vqilvxxl6jww3rvbzv6zbl6b83r96yma";
+ url = "mirror://xorg/individual/app/fonttosfnt-1.2.4.tar.xz";
+ sha256 = "0wk3fs038sh2sl1sqayzfjvygmcdp903qa1pd3aankxrgzv3b5i4";
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
@@ -1018,11 +1018,11 @@ self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
libAppleWM = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, testers }: stdenv.mkDerivation (finalAttrs: {
pname = "libAppleWM";
- version = "1.4.1";
+ version = "be972ebc3a97292e7d2b2350eff55ae12df99a42";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2";
- sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y";
+ url = "https://gitlab.freedesktop.org/xorg/lib/libAppleWM/-/archive/be972ebc3a97292e7d2b2350eff55ae12df99a42/libAppleWM-be972ebc3a97292e7d2b2350eff55ae12df99a42.tar.bz2";
+ sha256 = "1hrq03pahmrbb05r6a7j7m1nxl65wlfi6d2lwm1kvra63q91f9ph";
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
@@ -2418,11 +2418,11 @@ self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
xcmsdb = callPackage ({ stdenv, pkg-config, fetchurl, libX11, testers }: stdenv.mkDerivation (finalAttrs: {
pname = "xcmsdb";
- version = "1.0.6";
+ version = "1.0.7";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/app/xcmsdb-1.0.6.tar.xz";
- sha256 = "0magrza0i5qwpf0zlpqjychp3bzxgdw3p5v616xl4nbxag2fwxrw";
+ url = "mirror://xorg/individual/app/xcmsdb-1.0.7.tar.xz";
+ sha256 = "0f5wddi707cjqm21hynckkqr12mpjqn3dq9fm5gb11w19270di2y";
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
@@ -2618,11 +2618,11 @@ self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
xf86inputevdev = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libevdev, udev, mtdev, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: {
pname = "xf86-input-evdev";
- version = "2.10.6";
+ version = "2.11.0";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2";
- sha256 = "1h1y0fwnawlp4yc5llr1l7hwfcxxpln2fxhy6arcf6w6h4z0f9l7";
+ url = "mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz";
+ sha256 = "058k0xdf4hkn8lz5gx4c08mgbzvv58haz7a32axndhscjgg2403k";
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
@@ -2678,11 +2678,11 @@ self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
xf86inputlibinput = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libinput, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: {
pname = "xf86-input-libinput";
- version = "1.4.0";
+ version = "1.5.0";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/driver/xf86-input-libinput-1.4.0.tar.xz";
- sha256 = "1673ydfrvfqd4inz3vx1qyxa0mhr0f4bi0r7mrcmpisxi76i8g9s";
+ url = "mirror://xorg/individual/driver/xf86-input-libinput-1.5.0.tar.xz";
+ sha256 = "1rl06l0gdqmc4v08mya93m74ana76b7s3fzkmq8ylm3535gw6915";
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
@@ -3078,11 +3078,11 @@ self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
xf86videomga = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: {
pname = "xf86-video-mga";
- version = "2.0.1";
+ version = "2.1.0";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/driver/xf86-video-mga-2.0.1.tar.xz";
- sha256 = "1aq3aqh2yg09gy864kkshfx5pjl5w05jdz97bx5bnrbrhdq3p8r7";
+ url = "mirror://xorg/individual/driver/xf86-video-mga-2.1.0.tar.xz";
+ sha256 = "0wxbcgg5i4yq22pbc50567877z8irxhqzgl3sk6vf5zs9szmvy3v";
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
@@ -3238,11 +3238,11 @@ self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
xf86videor128 = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libdrm, libpciaccess, xorgserver, testers }: stdenv.mkDerivation (finalAttrs: {
pname = "xf86-video-r128";
- version = "6.12.1";
+ version = "6.13.0";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/driver/xf86-video-r128-6.12.1.tar.xz";
- sha256 = "0hf7h54wxgs8njavp0kgadjq1787fhbd588j7pj685hz2wmkq0kx";
+ url = "mirror://xorg/individual/driver/xf86-video-r128-6.13.0.tar.xz";
+ sha256 = "0igpfgls5nx4sz8a7yppr42qi37prqmxsy08zqbxbv81q9dfs2zj";
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
@@ -3858,11 +3858,11 @@ self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
xkbprint = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: {
pname = "xkbprint";
- version = "1.0.6";
+ version = "1.0.7";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/app/xkbprint-1.0.6.tar.xz";
- sha256 = "1c57kb8d8cbf720n9bcjhhaqpk08lac0sk4l0jp8j0mryw299k4r";
+ url = "mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz";
+ sha256 = "1k2rm8lvc2klcdz2s3mymb9a2ahgwqwkgg67v3phv7ij6304jkqw";
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
@@ -4016,18 +4016,18 @@ self: with self; {
})) {};
# THIS IS A GENERATED FILE. DO NOT EDIT!
- xmag = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, libXt, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: {
+ xmag = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: {
pname = "xmag";
- version = "1.0.7";
+ version = "1.0.8";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/app/xmag-1.0.7.tar.xz";
- sha256 = "0qblrqrhxml2asgbck53a1v7c4y7ap7jcyqjg500h1i7bb63d680";
+ url = "mirror://xorg/individual/app/xmag-1.0.8.tar.xz";
+ sha256 = "0clm0vm35lkcir5w3bkypax9j57vyzkl9l89qqxbanvr7mc3qv9j";
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ];
- buildInputs = [ libX11 libXaw libXmu libXt ];
+ buildInputs = [ libX11 libXaw libXmu xorgproto libXt ];
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
meta = {
pkgConfigModules = [ ];
@@ -4478,11 +4478,11 @@ self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
xwud = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: {
pname = "xwud";
- version = "1.0.6";
+ version = "1.0.7";
builder = ./builder.sh;
src = fetchurl {
- url = "mirror://xorg/individual/app/xwud-1.0.6.tar.xz";
- sha256 = "1zhsih1l3x1038fi1wi9npvfnn8j7580ca73saixjg5sbv8qq134";
+ url = "mirror://xorg/individual/app/xwud-1.0.7.tar.xz";
+ sha256 = "07n6q1z33sjkx8lx8lbd26m8ri5gi145k3mz39kmyykdngdbwp75";
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 128bd2d76ba3..7ed53ee22212 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -169,10 +169,8 @@ self: super:
});
libAppleWM = super.libAppleWM.overrideAttrs (attrs: {
- buildInputs = attrs.buildInputs ++ [ ApplicationServices ];
- preConfigure = ''
- substituteInPlace src/Makefile.in --replace -F/System -F${ApplicationServices}
- '';
+ nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ];
+ buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ];
});
libXau = super.libXau.overrideAttrs (attrs: {
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 3e77aa833ec9..9577547033b7 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -9,7 +9,7 @@ mirror://xorg/individual/xcb/xcb-util-wm-0.4.2.tar.xz
mirror://xorg/individual/app/appres-1.0.7.tar.xz
mirror://xorg/individual/app/bitmap-1.1.1.tar.xz
mirror://xorg/individual/app/editres-1.0.9.tar.xz
-mirror://xorg/individual/app/fonttosfnt-1.2.3.tar.xz
+mirror://xorg/individual/app/fonttosfnt-1.2.4.tar.xz
mirror://xorg/individual/app/iceauth-1.0.10.tar.xz
mirror://xorg/individual/app/ico-1.0.6.tar.xz
mirror://xorg/individual/app/listres-1.0.6.tar.xz
@@ -26,7 +26,7 @@ mirror://xorg/individual/app/xauth-1.1.3.tar.xz
mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2
mirror://xorg/individual/app/xcalc-1.1.2.tar.xz
mirror://xorg/individual/app/xclock-1.1.1.tar.xz
-mirror://xorg/individual/app/xcmsdb-1.0.6.tar.xz
+mirror://xorg/individual/app/xcmsdb-1.0.7.tar.xz
mirror://xorg/individual/app/xcompmgr-1.1.9.tar.xz
mirror://xorg/individual/app/xconsole-1.1.0.tar.xz
mirror://xorg/individual/app/xcursorgen-1.0.8.tar.xz
@@ -46,14 +46,14 @@ mirror://xorg/individual/app/xinit-1.4.2.tar.xz
mirror://xorg/individual/app/xinput-1.6.4.tar.xz
mirror://xorg/individual/app/xkbcomp-1.4.7.tar.xz
mirror://xorg/individual/app/xkbevd-1.1.5.tar.xz
-mirror://xorg/individual/app/xkbprint-1.0.6.tar.xz
+mirror://xorg/individual/app/xkbprint-1.0.7.tar.xz
mirror://xorg/individual/app/xkbutils-1.0.6.tar.xz
mirror://xorg/individual/app/xkill-1.0.6.tar.xz
mirror://xorg/individual/app/xload-1.2.0.tar.xz
mirror://xorg/individual/app/xlsatoms-1.1.4.tar.xz
mirror://xorg/individual/app/xlsclients-1.1.5.tar.xz
mirror://xorg/individual/app/xlsfonts-1.0.8.tar.xz
-mirror://xorg/individual/app/xmag-1.0.7.tar.xz
+mirror://xorg/individual/app/xmag-1.0.8.tar.xz
mirror://xorg/individual/app/xmessage-1.0.7.tar.xz
mirror://xorg/individual/app/xmodmap-1.0.11.tar.xz
mirror://xorg/individual/app/xmore-1.0.4.tar.xz
@@ -70,16 +70,16 @@ mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2
mirror://xorg/individual/app/xvinfo-1.1.5.tar.xz
mirror://xorg/individual/app/xwd-1.0.9.tar.xz
mirror://xorg/individual/app/xwininfo-1.1.6.tar.xz
-mirror://xorg/individual/app/xwud-1.0.6.tar.xz
+mirror://xorg/individual/app/xwud-1.0.7.tar.xz
mirror://xorg/individual/data/xbitmaps-1.1.3.tar.xz
mirror://xorg/individual/data/xcursor-themes-1.0.7.tar.xz
mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.43.tar.xz
mirror://xorg/individual/doc/xorg-docs-1.7.3.tar.xz
mirror://xorg/individual/doc/xorg-sgml-doctools-1.12.1.tar.xz
-mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2
+mirror://xorg/individual/driver/xf86-input-evdev-2.11.0.tar.xz
mirror://xorg/individual/driver/xf86-input-joystick-1.6.4.tar.xz
mirror://xorg/individual/driver/xf86-input-keyboard-2.0.0.tar.xz
-mirror://xorg/individual/driver/xf86-input-libinput-1.4.0.tar.xz
+mirror://xorg/individual/driver/xf86-input-libinput-1.5.0.tar.xz
mirror://xorg/individual/driver/xf86-input-mouse-1.9.5.tar.xz
mirror://xorg/individual/driver/xf86-input-synaptics-1.9.2.tar.xz
mirror://xorg/individual/driver/xf86-input-vmmouse-13.2.0.tar.xz
@@ -99,7 +99,7 @@ mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2
mirror://xorg/individual/driver/xf86-video-i128-1.4.1.tar.xz
mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2
-mirror://xorg/individual/driver/xf86-video-mga-2.0.1.tar.xz
+mirror://xorg/individual/driver/xf86-video-mga-2.1.0.tar.xz
mirror://xorg/individual/driver/xf86-video-neomagic-1.3.1.tar.xz
mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2
https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/-/archive/3ee7cbca8f9144a3bb5be7f71ce70558f548d268/xf86-video-nouveau-3ee7cbca8f9144a3bb5be7f71ce70558f548d268.tar.bz2
@@ -107,7 +107,7 @@ mirror://xorg/individual/driver/xf86-video-nv-2.1.23.tar.xz
mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-qxl-0.1.6.tar.xz
-mirror://xorg/individual/driver/xf86-video-r128-6.12.1.tar.xz
+mirror://xorg/individual/driver/xf86-video-r128-6.13.0.tar.xz
mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2
mirror://xorg/individual/driver/xf86-video-s3virge-1.11.1.tar.xz
mirror://xorg/individual/driver/xf86-video-savage-2.4.1.tar.xz
@@ -165,7 +165,7 @@ mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz
mirror://xorg/individual/font/font-util-1.4.1.tar.xz
mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz
mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz
-mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2
+https://gitlab.freedesktop.org/xorg/lib/libAppleWM/-/archive/be972ebc3a97292e7d2b2350eff55ae12df99a42/libAppleWM-be972ebc3a97292e7d2b2350eff55ae12df99a42.tar.bz2
mirror://xorg/individual/lib/libdmx-1.1.5.tar.xz
mirror://xorg/individual/lib/libfontenc-1.1.8.tar.xz
mirror://xorg/individual/lib/libFS-1.0.10.tar.xz
@@ -211,7 +211,7 @@ mirror://xorg/individual/lib/xcb-util-cursor-0.1.5.tar.xz
mirror://xorg/individual/lib/xtrans-1.5.1.tar.xz
mirror://xorg/individual/proto/xcb-proto-1.17.0.tar.xz
mirror://xorg/individual/proto/xorgproto-2024.1.tar.xz
-mirror://xorg/individual/util/bdftopcf-1.1.1.tar.xz
+mirror://xorg/individual/util/bdftopcf-1.1.2.tar.xz
mirror://xorg/individual/util/gccmakedep-1.0.4.tar.xz
mirror://xorg/individual/util/imake-1.0.10.tar.xz
mirror://xorg/individual/util/lndir-1.0.5.tar.xz
diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index db6d8c3259e3..8bfc01d79933 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/pkgs/servers/x11/xorg/xwayland.nix
@@ -49,11 +49,11 @@
stdenv.mkDerivation rec {
pname = "xwayland";
- version = "24.1.3";
+ version = "24.1.4";
src = fetchurl {
url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz";
- hash = "sha256-3NtXpmzJsSTI+TZ2BZJiisTnRKfXsxeaqGGJrX6kyxA=";
+ hash = "sha256-2Wp426uBn1V1AXNERESZW1Ax69zBW3ev672NvAKvNPQ=";
};
postPatch = ''
diff --git a/pkgs/shells/ksh/default.nix b/pkgs/shells/ksh/default.nix
index ae9dba16aedf..0751ef64dbb0 100644
--- a/pkgs/shells/ksh/default.nix
+++ b/pkgs/shells/ksh/default.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "att";
repo = "ast";
- rev = finalAttrs.version;
sha256 = "0cdxz0nhpq03gb9rd76fn0x1yzs2c8q289b7vcxnzlsrz1imz65j";
+ rev = "refs/tags/${finalAttrs.version}";
};
patches = [
diff --git a/pkgs/shells/nushell/plugins/net.nix b/pkgs/shells/nushell/plugins/net.nix
index 755285e5509b..681b48666701 100644
--- a/pkgs/shells/nushell/plugins/net.nix
+++ b/pkgs/shells/nushell/plugins/net.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-nKcB919M9FkDloulh9IusWYPhf8vlhUmKVs6Gd6w3Bw=";
};
- cargoHash = "sha256-3FMalpgKYZ4xM2fHXTFOVu5I8yS06K1bDiKg4we7jF4=";
+ cargoHash = "sha256-bsrpdQS0wA3T0jZTG476sSkMRngEAOjgr4wX7svyMP4=";
nativeBuildInputs = [ rustPlatform.bindgenHook ];
diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix
index a29bb9c99010..d9b74cf564dc 100644
--- a/pkgs/shells/powershell/default.nix
+++ b/pkgs/shells/powershell/default.nix
@@ -29,7 +29,7 @@ let
in
stdenv.mkDerivation rec {
pname = "powershell";
- version = "7.4.5";
+ version = "7.4.6";
src = passthru.sources.${stdenv.hostPlatform.system}
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -84,19 +84,19 @@ stdenv.mkDerivation rec {
sources = {
aarch64-darwin = fetchurl {
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-arm64.tar.gz";
- hash = "sha256-pN0wv/jV1luaLO1NF4QRwXI8FzcBev8VCkiMcSs3r1I=";
+ hash = "sha256-pILWaHh++Yw38KWnaWEH3/2z3DQMW+PRwVPsnSOQcqg=";
};
aarch64-linux = fetchurl {
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz";
- hash = "sha256-8JaGSezUfVUAzLdmxP9No04NeCVMzpCYx/QtDlSEtRM=";
+ hash = "sha256-wBWbA+hfRK4edpeBigEVWNpsgT0KroSL9awTv0NdhiQ=";
};
x86_64-darwin = fetchurl {
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz";
- hash = "sha256-1DE6D4AZBwKz9UIPpLy3a9hlgsF4QoGf2+eYO5SANYA=";
+ hash = "sha256-ehja7RBbfPyAv4zAB2L+eZAQXdI/lRzDLOt0RlFlDj0=";
};
x86_64-linux = fetchurl {
url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz";
- hash = "sha256-wjUJzE0Ixiuf9uom9XnuTFD5eKo0JpM0qF7aL+w29Fs=";
+ hash = "sha256-b2AVIDxHgGxcxETBnY7QGWleYQ+9lIFUJkv5yo4VdWE=";
};
};
tests.version = testers.testVersion {
diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix
index b09fb37002f4..2fe86fa4a73a 100644
--- a/pkgs/shells/zsh/spaceship-prompt/default.nix
+++ b/pkgs/shells/zsh/spaceship-prompt/default.nix
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "spaceship-prompt";
- version = "4.16.2";
+ version = "4.17.0";
src = fetchFromGitHub {
owner = "denysdovhan";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-2CuGiPXZ4C/KvHho08jz0RCdUcLVBnWmT+PlL1KHAx0=";
+ sha256 = "sha256-a7z/z++dmwMqIrutOc74ljz/Tu/wuEuQaN2XRBMtOvw=";
};
strictDeps = true;
diff --git a/pkgs/shells/zsh/zsh-abbr/default.nix b/pkgs/shells/zsh/zsh-abbr/default.nix
index 5294d7831a49..c9e0e9de85f8 100644
--- a/pkgs/shells/zsh/zsh-abbr/default.nix
+++ b/pkgs/shells/zsh/zsh-abbr/default.nix
@@ -2,6 +2,7 @@
stdenv,
lib,
fetchFromGitHub,
+ installShellFiles,
}:
stdenv.mkDerivation rec {
pname = "zsh-abbr";
@@ -15,12 +16,18 @@ stdenv.mkDerivation rec {
};
strictDeps = true;
+ nativeBuildInputs = [ installShellFiles ];
installPhase = ''
- install -D zsh-abbr.zsh $out/share/zsh/${pname}/abbr.plugin.zsh
- # Needed so that `man` can find the manpage, since it looks via PATH
- mkdir -p $out/bin
- mv man $out/share/man
+ runHook preInstall
+
+ install zsh-abbr.plugin.zsh zsh-abbr.zsh -Dt $out/share/zsh/zsh-abbr/
+ install completions/_abbr -Dt $out/share/zsh/zsh-abbr/completions/
+
+ # Required for `man` to find the manpage of abbr, since it looks via PATH
+ installManPage man/man1/*
+
+ runHook postInstall
'';
meta = with lib; {
diff --git a/pkgs/shells/zsh/zsh-system-clipboard/default.nix b/pkgs/shells/zsh/zsh-system-clipboard/default.nix
index 10853b4dc0f1..3cfe47e77f70 100644
--- a/pkgs/shells/zsh/zsh-system-clipboard/default.nix
+++ b/pkgs/shells/zsh/zsh-system-clipboard/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zsh-system-clipboard";
- version = "0.7.0";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "kutsan";
repo = "zsh-system-clipboard";
rev = "v${version}";
- sha256 = "09lqav1mz5zajklr3xa0iaivhpykv3azkjb7yj9wyp0hq3vymp8i";
+ hash = "sha256-VWTEJGudlQlNwLOUfpo0fvh0MyA2DqV+aieNPx/WzSI=";
};
strictDeps = true;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/kutsan/zsh-system-clipboard";
description = "Plugin that adds key bindings support for ZLE (Zsh Line Editor) clipboard operations for vi emulation keymaps";
license = licenses.gpl3Only;
- maintainers = with maintainers; [ _0qq ];
+ maintainers = with maintainers; [ _0qq satoqz ];
platforms = platforms.all;
};
}
diff --git a/pkgs/test/build-environment-info/default.nix b/pkgs/test/build-environment-info/default.nix
new file mode 100644
index 000000000000..dce91edbf4d1
--- /dev/null
+++ b/pkgs/test/build-environment-info/default.nix
@@ -0,0 +1,39 @@
+{
+ lib,
+ stdenv,
+ runCommand,
+ getent,
+ xcbuild,
+}:
+
+# Prints information about the state of the build environment for
+# assistance debugging Hydra. Feel free to add anything you would find
+# useful to this.
+runCommand "build-environment-info"
+ {
+ nativeBuildInputs = [ getent ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ xcbuild ];
+ }
+ ''
+ # It’s useful to get more info even if a command fails.
+ set +e
+
+ run() {
+ echoCmd : "$@"
+ "$@"
+ }
+
+ run uname -a
+
+ ${lib.optionalString stdenv.buildPlatform.isDarwin ''
+ run env SYSTEM_VERSION_COMPAT=0 plutil -p /System/Library/CoreServices/SystemVersion.plist
+ ''}
+
+ run id
+
+ run getent passwd "$(id -un)"
+
+ run ulimit -a
+
+ # Always fail so that this job can easily be restarted.
+ run exit 1
+ ''
diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix
index 9e25be460e25..45ff442ae9da 100644
--- a/pkgs/test/cc-wrapper/default.nix
+++ b/pkgs/test/cc-wrapper/default.nix
@@ -8,7 +8,7 @@ let
|| (stdenv.cc.isGNU && stdenv.hostPlatform.isLinux)
);
staticLibc = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "-L ${glibc.static}/lib";
- emulator = stdenv.hostPlatform.emulator buildPackages;
+ emulator = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) (stdenv.hostPlatform.emulator buildPackages);
isCxx = stdenv.cc.libcxx != null;
libcxxStdenvSuffix = lib.optionalString isCxx "-libcxx";
CC = "PATH= ${lib.getExe' stdenv.cc "${stdenv.cc.targetPrefix}cc"}";
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index e300672ddcac..c87a4a15222f 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -47,31 +47,21 @@ with pkgs;
builtGCC =
let
inherit (lib) filterAttrs;
- sets = lib.pipe gccTests ([
+ sets = lib.pipe gccTests [
(filterAttrs (_: v: lib.meta.availableOn stdenv.hostPlatform v.stdenv.cc))
# Broken
(filterAttrs (n: _: n != "gccMultiStdenv"))
- ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
- # fails with things like
- # ld: warning: ld: warning: object file (trunctfsf2_s.o) was built for newer macOS version (11.0) than being linked (10.5)
- # ld: warning: ld: warning: could not create compact unwind for ___fixunstfdi: register 20 saved somewhere other than in frame
- (filterAttrs (n: _: n != "gcc11Stdenv"))
- ]);
+ ];
in
toJSON sets;
builtLLVM =
let
inherit (lib) filterAttrs;
- sets = lib.pipe llvmTests ([
+ sets = lib.pipe llvmTests [
(filterAttrs (_: v: lib.meta.availableOn stdenv.hostPlatform v.clang.stdenv.cc))
(filterAttrs (_: v: lib.meta.availableOn stdenv.hostPlatform v.libcxx.stdenv.cc))
-
- # libcxxStdenv broken
- # fix in https://github.com/NixOS/nixpkgs/pull/216273
- ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
- (filterAttrs (n: _: n != "llvmPackages_9"))
- ]);
+ ];
in
toJSON sets;
buildCommand = ''
@@ -185,4 +175,6 @@ with pkgs;
replaceVars = recurseIntoAttrs (callPackage ./replace-vars { });
substitute = recurseIntoAttrs (callPackage ./substitute { });
+
+ build-environment-info = callPackage ./build-environment-info { };
}
diff --git a/pkgs/test/nixos-functions/default.nix b/pkgs/test/nixos-functions/default.nix
index bdd5e3c6d8b4..fc9a726570ff 100644
--- a/pkgs/test/nixos-functions/default.nix
+++ b/pkgs/test/nixos-functions/default.nix
@@ -17,15 +17,13 @@ let
versionSuffix = "test";
label = "test";
};
-in lib.optionalAttrs stdenv.hostPlatform.isLinux (
- pkgs.recurseIntoAttrs {
+in pkgs.recurseIntoAttrs {
- nixos-test = (pkgs.nixos {
- system.nixos = dummyVersioning;
- boot.loader.grub.enable = false;
- fileSystems."/".device = "/dev/null";
- system.stateVersion = lib.trivial.release;
- }).toplevel;
+ nixos-test = (pkgs.nixos {
+ system.nixos = dummyVersioning;
+ boot.loader.grub.enable = false;
+ fileSystems."/".device = "/dev/null";
+ system.stateVersion = lib.trivial.release;
+ }).toplevel;
- }
-)
+}
diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix
index b53e3d6f8ada..3c07a5e7756c 100644
--- a/pkgs/tools/admin/clair/default.nix
+++ b/pkgs/tools/admin/clair/default.nix
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "clair";
- version = "4.7.4";
+ version = "4.8.0";
src = fetchFromGitHub {
owner = "quay";
repo = pname;
rev = "v${version}";
- hash = "sha256-NEivDkcMB6Upc8UJFFnCs4yjsENXP/qOK3X582VVbmY=";
+ hash = "sha256-itIjDdTKQ0PCfOkefXxqu6MpdWK3F1j6ArvaInQd/hc=";
};
- vendorHash = "sha256-12nrMAGS7CRTq2Dr8Lnm9B/HTZAzJOaJ8TqTOHknCRE=";
+ vendorHash = "sha256-CpIOQiEjQGC6qeoxRS/jFohUnELefAX0KOERudL6BGM=";
nativeBuildInputs = [
makeWrapper
diff --git a/pkgs/tools/admin/colmena/default.nix b/pkgs/tools/admin/colmena/default.nix
index 0ef27f2ee560..d9efd878bbce 100644
--- a/pkgs/tools/admin/colmena/default.nix
+++ b/pkgs/tools/admin/colmena/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, rustPlatform, fetchFromGitHub, installShellFiles, nix-eval-jobs
+{ stdenv, lib, rustPlatform, fetchFromGitHub, installShellFiles, makeBinaryWrapper, nix-eval-jobs, nixVersions
, colmena, testers }:
rustPlatform.buildRustPackage rec {
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-rk2atWWJIR95duUXxAiARegjeCyfAsqTDwEr5P0eIr8=";
- nativeBuildInputs = [ installShellFiles ];
+ nativeBuildInputs = [ installShellFiles makeBinaryWrapper ];
buildInputs = [ nix-eval-jobs ];
@@ -25,6 +25,9 @@ rustPlatform.buildRustPackage rec {
--bash <($out/bin/colmena gen-completions bash) \
--zsh <($out/bin/colmena gen-completions zsh) \
--fish <($out/bin/colmena gen-completions fish)
+
+ wrapProgram $out/bin/colmena \
+ --prefix PATH ":" "${lib.makeBinPath [ nixVersions.nix_2_18 ]}"
'';
# Recursive Nix is not stable yet
diff --git a/pkgs/tools/admin/gimme-aws-creds/default.nix b/pkgs/tools/admin/gimme-aws-creds/default.nix
index 49a7f60e3342..69db86d4591d 100644
--- a/pkgs/tools/admin/gimme-aws-creds/default.nix
+++ b/pkgs/tools/admin/gimme-aws-creds/default.nix
@@ -8,23 +8,7 @@
, gimme-aws-creds
}:
-let
- python = python3.override {
- self = python;
- packageOverrides = self: super: {
- fido2 = super.fido2.overridePythonAttrs (oldAttrs: rec {
- version = "0.9.3";
- format = "setuptools";
- src = fetchPypi {
- inherit (oldAttrs) pname;
- inherit version;
- hash = "sha256-tF6JphCc/Lfxu1E3dqotZAjpXEgi+DolORi5RAg0Zuw=";
- };
- });
- };
- };
-in
-python.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
pname = "gimme-aws-creds";
version = "2.8.2"; # N.B: if you change this, check if overrides are still up-to-date
format = "setuptools";
@@ -36,7 +20,7 @@ python.pkgs.buildPythonApplication rec {
hash = "sha256-fsFYcfbLeYV6tpOGgNrFmYjcUAmdsx5zwUbvcctwFVs=";
};
- nativeBuildInputs = with python.pkgs; [
+ nativeBuildInputs = with python3.pkgs; [
installShellFiles
];
@@ -44,9 +28,8 @@ python.pkgs.buildPythonApplication rec {
"configparser"
];
- propagatedBuildInputs = with python.pkgs; [
+ dependencies = with python3.pkgs; [
boto3
- fido2
beautifulsoup4
ctap-keyring-device
requests
@@ -61,7 +44,7 @@ python.pkgs.buildPythonApplication rec {
export PYTHON_KEYRING_BACKEND="keyring.backends.fail.Keyring"
'';
- checkInputs = with python.pkgs; [
+ nativeCheckInputs = with python3.pkgs; [
pytestCheckHook
responses
];
@@ -82,7 +65,6 @@ python.pkgs.buildPythonApplication rec {
'';
passthru = {
- inherit python;
updateScript = nix-update-script { };
tests.version = testers.testVersion {
package = gimme-aws-creds;
diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix
index 4e574e407e2e..f2e543302262 100644
--- a/pkgs/tools/admin/procs/default.nix
+++ b/pkgs/tools/admin/procs/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "procs";
- version = "0.14.6";
+ version = "0.14.7";
src = fetchFromGitHub {
owner = "dalance";
repo = "procs";
rev = "v${version}";
- hash = "sha256-Dp0XdARZrDrZ9QOv+V2ZKYV7J89t135ie5LSWz/KKHY=";
+ hash = "sha256-KYKHH41lGKm+En4vUDi6KG6J/zJtYxeJr8vY3WOgkl0=";
};
- cargoHash = "sha256-EifER0wt2Nw7WrlVwc49tZHH/av4OkzTPYSzl9mVJI8=";
+ cargoHash = "sha256-mGjxXetGgYBBXuaQ3ARS/6wWG5+YdBTmXcy22npPeBY=";
nativeBuildInputs = [ installShellFiles ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ];
diff --git a/pkgs/tools/admin/ssh-import-id/default.nix b/pkgs/tools/admin/ssh-import-id/default.nix
deleted file mode 100644
index e4202033b99c..000000000000
--- a/pkgs/tools/admin/ssh-import-id/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ buildPythonPackage
-, lib
-, fetchgit
-, requests
-, distro
-, makeWrapper
-, installShellFiles
-, extraHandlers ? []
-}:
-
-buildPythonPackage rec {
- pname = "ssh-import-id";
- version = "5.11";
-
- src = fetchgit {
- url = "https://git.launchpad.net/ssh-import-id";
- rev = version;
- sha256 = "sha256-tYbaJGH59qyvjp4kwo3ZFVs0EaE0Lsd2CQ6iraFkAdI=";
- };
-
- propagatedBuildInputs = [
- requests
- distro
- ] ++ extraHandlers;
-
- nativeBuildInputs = [
- makeWrapper
- installShellFiles
- ];
-
- postInstall = ''
- installManPage $src/usr/share/man/man1/ssh-import-id.1
- '';
-
- # handlers require main bin, main bin requires handlers
- makeWrapperArgs = [ "--prefix" ":" "$out/bin" ];
-
- meta = with lib; {
- description = "Retrieves an SSH public key and installs it locally";
- license = licenses.gpl3;
- maintainers = with maintainers; [ mkg20001 viraptor ];
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix
index 18988edc8f64..6f1fa3ff291f 100644
--- a/pkgs/tools/admin/stripe-cli/default.nix
+++ b/pkgs/tools/admin/stripe-cli/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "stripe-cli";
- version = "1.21.7";
+ version = "1.21.10";
src = fetchFromGitHub {
owner = "stripe";
repo = pname;
rev = "v${version}";
- hash = "sha256-3UZD5zBSCFwq4lhiH8MAxFX4vtyGYh3h3Em+7w8id1k=";
+ hash = "sha256-L2ydkrm2foSIh67LsMYNvV53Hdj9TdV7C4tKeHe+AK0=";
};
vendorHash = "sha256-TuxYJ3u4/5PJYRoRgom+M1au9XerZ+vj9X3jUWTPM58=";
diff --git a/pkgs/tools/admin/swapspace/default.nix b/pkgs/tools/admin/swapspace/default.nix
index fa379e6a2d28..c7c453f05be5 100644
--- a/pkgs/tools/admin/swapspace/default.nix
+++ b/pkgs/tools/admin/swapspace/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, installShellFiles, util-linux }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, installShellFiles, util-linux, binlore, swapspace }:
stdenv.mkDerivation rec {
pname = "swapspace";
@@ -35,6 +35,12 @@ stdenv.mkDerivation rec {
install --mode=444 -D 'swapspace.service' "$out/etc/systemd/system/swapspace.service"
'';
+ # Nothing in swapspace --help or swapspace’s man page mentions
+ # anything about swapspace executing its arguments.
+ passthru.binlore.out = binlore.synthesize swapspace ''
+ execer cannot bin/swapspace
+ '';
+
meta = with lib; {
description = "Dynamic swap manager for Linux";
homepage = "https://github.com/Tookmund/Swapspace";
diff --git a/pkgs/tools/archivers/xarchive/default.nix b/pkgs/tools/archivers/xarchive/default.nix
deleted file mode 100644
index 193e319cafdd..000000000000
--- a/pkgs/tools/archivers/xarchive/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, gtk2, pkg-config }:
-
-stdenv.mkDerivation rec {
- version = "0.2.8-6";
- pname = "xarchive";
-
- src = fetchurl {
- url = "mirror://sourceforge/xarchive/${pname}-${version}.tar.gz";
- sha256 = "0chfim7z27s00naf43a61zsngwhvim14mg1p3csbv5i3f6m50xx4";
- };
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ gtk2 ];
-
- hardeningDisable = [ "format" ];
-
- meta = {
- description = "GTK front-end for command line archiving tools";
- maintainers = [ lib.maintainers.domenkozar ];
- license = lib.licenses.gpl2Plus;
- platforms = lib.platforms.all;
- mainProgram = "xarchive";
- };
-}
diff --git a/pkgs/tools/audio/alsaequal/caps_9.x.patch b/pkgs/tools/audio/alsaequal/caps_9.x.patch
deleted file mode 100644
index 282e04049747..000000000000
--- a/pkgs/tools/audio/alsaequal/caps_9.x.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./ctl_equal.c
-+++ ./ctl_equal.c
-@@ -167,7 +167,7 @@
- snd_ctl_equal_t *equal;
- const char *controls = ".alsaequal.bin";
- const char *library = "/usr/lib/ladspa/caps.so";
-- const char *module = "Eq";
-+ const char *module = "Eq10";
- long channels = 2;
- const char *sufix = " Playback Volume";
- int err, i, index;
---- ./pcm_equal.c
-+++ ./pcm_equal.c
-@@ -151,7 +151,7 @@
- snd_config_t *sconf = NULL;
- const char *controls = ".alsaequal.bin";
- const char *library = "/usr/lib/ladspa/caps.so";
-- const char *module = "Eq";
-+ const char *module = "Eq10";
- long channels = 2;
- int err;
diff --git a/pkgs/tools/audio/alsaequal/default.nix b/pkgs/tools/audio/alsaequal/default.nix
index 73b95f9fe7cc..d35facd6c3d9 100644
--- a/pkgs/tools/audio/alsaequal/default.nix
+++ b/pkgs/tools/audio/alsaequal/default.nix
@@ -1,17 +1,23 @@
-{ lib, stdenv, fetchurl
-, alsa-lib, caps
+{ lib, stdenv, fetchFromGitHub
+, alsa-lib, caps,
+ ladspaH
}:
stdenv.mkDerivation rec {
pname = "alsaequal";
- version = "0.6";
+ version = "0.7.1";
- src = fetchurl {
- url = "https://thedigitalmachine.net/tools/alsaequal-${version}.tar.bz2";
- sha256 = "1w3g9q5z3nrn3mwdhaq6zsg0jila8d102dgwgrhj9vfx58apsvli";
+ src = fetchFromGitHub {
+ owner = "bassdr";
+ repo = "alsaequal";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-jI+w/jCFslQSNeIS7mwb+LZSawU4XjbSNNgpvuShH1g=";
};
- buildInputs = [ alsa-lib ];
+ buildInputs = [
+ alsa-lib
+ ladspaH
+ ];
makeFlags = [ "DESTDIR=$(out)" ];
@@ -20,10 +26,6 @@ stdenv.mkDerivation rec {
# Adds executable permissions to resulting libraries
# and changes their destination directory from "usr/lib/alsa-lib" to "lib/alsa-lib" to better align with nixpkgs filesystem hierarchy.
./makefile.patch
- # Fixes control port check, which resulted in false error.
- ./false_error.patch
- # Fixes name change of an "Eq" to "Eq10" method in version 9 of caps library.
- ./caps_9.x.patch
];
postPatch = ''
@@ -36,7 +38,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Real-time adjustable equalizer plugin for ALSA";
- homepage = "https://thedigitalmachine.net/alsaequal.html";
+ homepage = "https://github.com/bassdr/alsaequal";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ymeister ];
};
diff --git a/pkgs/tools/audio/alsaequal/false_error.patch b/pkgs/tools/audio/alsaequal/false_error.patch
deleted file mode 100644
index 1a8413da2741..000000000000
--- a/pkgs/tools/audio/alsaequal/false_error.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./ctl_equal.c
-+++ ./ctl_equal.c
-@@ -263,8 +263,8 @@
- for(i = 0; i < equal->num_input_controls; i++) {
- if(equal->control_data->control[i].type == LADSPA_CNTRL_INPUT) {
- index = equal->control_data->control[i].index;
-- if(equal->klass->PortDescriptors[index] !=
-- (LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL)) {
-+ if(equal->klass->PortDescriptors[index] &
-+ (LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL) == 0) {
- SNDERR("Problem with control file %s, %d.", controls, index);
- return -1;
- }
diff --git a/pkgs/tools/audio/alsaequal/makefile.patch b/pkgs/tools/audio/alsaequal/makefile.patch
index ee8aa170d60b..2dc46a4c8d2b 100644
--- a/pkgs/tools/audio/alsaequal/makefile.patch
+++ b/pkgs/tools/audio/alsaequal/makefile.patch
@@ -4,10 +4,12 @@
install: all
@echo Installing...
-- $(Q)install -m 644 $(SND_PCM_BIN) ${DESTDIR}/usr/lib/alsa-lib/
-- $(Q)install -m 644 $(SND_CTL_BIN) ${DESTDIR}/usr/lib/alsa-lib/
-+ $(Q)install -m 755 $(SND_PCM_BIN) ${DESTDIR}/lib/alsa-lib/
-+ $(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/lib/alsa-lib/
+- $(Q)mkdir -p ${DESTDIR}/usr/$(LIBDIR)/alsa-lib/
+- $(Q)install -m 755 $(SND_PCM_BIN) ${DESTDIR}/usr/$(LIBDIR)/alsa-lib/
+- $(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/usr/$(LIBDIR)/alsa-lib/
++ $(Q)mkdir -p ${DESTDIR}/$(LIBDIR)/alsa-lib/
++ $(Q)install -m 755 $(SND_PCM_BIN) ${DESTDIR}/$(LIBDIR)/alsa-lib/
++ $(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/$(LIBDIR)/alsa-lib/
uninstall:
@echo Un-installing...
diff --git a/pkgs/tools/audio/mpris-scrobbler/default.nix b/pkgs/tools/audio/mpris-scrobbler/default.nix
index 4628ad4910d1..749a90336ae4 100644
--- a/pkgs/tools/audio/mpris-scrobbler/default.nix
+++ b/pkgs/tools/audio/mpris-scrobbler/default.nix
@@ -75,5 +75,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ emantor ];
platforms = platforms.unix;
+ mainProgram = "mpris-scrobbler";
};
}
diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix
index f0098f3700e2..35dfc707474f 100644
--- a/pkgs/tools/backup/kopia/default.nix
+++ b/pkgs/tools/backup/kopia/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, gitUpdater, testers, kopia }:
buildGoModule rec {
pname = "kopia";
@@ -22,6 +22,15 @@ buildGoModule rec {
"-X github.com/kopia/kopia/repo.BuildInfo=${src.rev}"
];
+ passthru = {
+ updateScript = gitUpdater { rev-prefix = "v"; };
+ tests = {
+ kopia-version = testers.testVersion {
+ package = kopia;
+ };
+ };
+ };
+
meta = with lib; {
homepage = "https://kopia.io";
description = "Cross-platform backup tool with fast, incremental backups, client-side end-to-end encryption, compression and data deduplication";
diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index 11498abb458a..bf3c93ab518a 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -3,13 +3,13 @@
buildGoModule rec {
pname = "restic";
- version = "0.17.1";
+ version = "0.17.2";
src = fetchFromGitHub {
owner = "restic";
repo = "restic";
rev = "v${version}";
- hash = "sha256-/kgZgHmIxZkkmLyR246CcU+8wAekuK8SruY5GBLxJXI=";
+ hash = "sha256-CNQUqhFnuxoZpkVKyp/tDEfX91R8kjC2R41o2HA9eaM=";
};
patches = [
diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix
index 7fd51d5d254f..7aa400e51f07 100644
--- a/pkgs/tools/cd-dvd/cdrkit/default.nix
+++ b/pkgs/tools/cd-dvd/cdrkit/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, cmake, libcap, zlib, bzip2, perl, iconv, darwin}:
+{lib, stdenv, fetchurl, cmake, libcap, zlib, bzip2, perl}:
stdenv.mkDerivation rec {
pname = "cdrkit";
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ zlib bzip2 perl ] ++
- lib.optionals stdenv.hostPlatform.isLinux [ libcap ] ++
- lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon IOKit iconv ]);
+ lib.optionals stdenv.hostPlatform.isLinux [ libcap ];
hardeningDisable = [ "format" ];
env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isMusl [
@@ -44,10 +43,8 @@ stdenv.mkDerivation rec {
'';
postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
- for f in */CMakeFiles/*.dir/link.txt ; do
- substituteInPlace "$f" \
- --replace "-lrt" "-framework IOKit"
- done
+ substituteInPlace */CMakeFiles/*.dir/link.txt \
+ --replace-warn "-lrt" "-framework IOKit -framework CoreFoundation"
'';
postInstall = ''
diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix
index a95309053ad0..18cc52146087 100644
--- a/pkgs/tools/filesystems/xfsprogs/default.nix
+++ b/pkgs/tools/filesystems/xfsprogs/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "xfsprogs";
- version = "6.9.0";
+ version = "6.11.0";
src = fetchurl {
url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz";
- hash = "sha256-l1KEeD+z+8ThrmQL2ATXiOQjeoawdYKs7oa25I9lIbc=";
+ hash = "sha256-2uO7QyGW97GDsua9XcRL8z7b19DoW9N9JcI134G4EAo=";
};
outputs = [ "bin" "dev" "out" "doc" ];
@@ -29,10 +29,13 @@ stdenv.mkDerivation rec {
enableParallelInstalling = false;
# @sbindir@ is replaced with /run/current-system/sw/bin to fix dependency cycles
+ # and '@pkg_state_dir@' should not point to the nix store, but we cannot use the configure parameter
+ # because then it will try to install to /var
preConfigure = ''
- for file in scrub/{xfs_scrub_all.cron.in,xfs_scrub@.service.in,xfs_scrub_all.service.in}; do
+ for file in scrub/*.in; do
substituteInPlace "$file" \
- --replace '@sbindir@' '/run/current-system/sw/bin'
+ --replace-quiet '@sbindir@' '/run/current-system/sw/bin' \
+ --replace-quiet '@pkg_state_dir@' '/var'
done
patchShebangs ./install-sh
'';
diff --git a/pkgs/tools/graphics/goverlay/default.nix b/pkgs/tools/graphics/goverlay/default.nix
index 01e6b80efafc..f4c827d334b8 100644
--- a/pkgs/tools/graphics/goverlay/default.nix
+++ b/pkgs/tools/graphics/goverlay/default.nix
@@ -111,7 +111,7 @@ in stdenv.mkDerivation rec {
description = "Opensource project that aims to create a Graphical UI to help manage Linux overlays";
homepage = "https://github.com/benjamimgois/goverlay";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ kira-bruneau ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
mainProgram = "goverlay";
};
diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix
deleted file mode 100644
index 433c11d95628..000000000000
--- a/pkgs/tools/graphics/gromit-mpx/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
-, gtk, glib, pcre, libappindicator, libpthreadstubs, xorg
-, libxkbcommon, libepoxy, at-spi2-core, dbus, libdbusmenu
-, wrapGAppsHook3
-}:
-
-stdenv.mkDerivation rec {
- pname = "gromit-mpx";
- version = "1.6.0";
-
- src = fetchFromGitHub {
- owner = "bk138";
- repo = "gromit-mpx";
- rev = version;
- sha256 = "sha256-olDQGw0qDWwXpqRopVoEPDXLRpFiiBo+/jiVeL7R6QA=";
- };
-
- nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 ];
- buildInputs = [
- gtk glib pcre libappindicator libpthreadstubs
- xorg.libXdmcp libxkbcommon libepoxy at-spi2-core
- dbus libdbusmenu
- ];
-
- meta = with lib; {
- description = "Desktop annotation tool";
-
- longDescription = ''
- Gromit-MPX (GRaphics Over MIscellaneous Things) is a small tool
- to make annotations on the screen.
- '';
-
- homepage = "https://github.com/bk138/gromit-mpx";
- maintainers = with maintainers; [ pjones ];
- platforms = platforms.linux;
- license = licenses.gpl2Plus;
- mainProgram = "gromit-mpx";
- };
-}
diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index 8426fbcc2032..107b36e5515e 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -20,14 +20,14 @@ stdenv.mkDerivation {
# Determine version and revision from:
# https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
pname = "netpbm";
- version = "11.7.1";
+ version = "11.8.1";
outputs = [ "bin" "out" "dev" ];
src = fetchsvn {
url = "https://svn.code.sf.net/p/netpbm/code/advanced";
- rev = "4932";
- sha256 = "bmPqUPOlkQ0vKim+t8ct2ErFU4uWw6L5foODGWrrExs=";
+ rev = "4966";
+ sha256 = "sha256-Vy7aKyMn3C2P3N9jdRayDu35+8jzvQv4rYIEsKdyWDU=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix
index c9e8512b7755..69b69d1c4c8b 100644
--- a/pkgs/tools/graphics/pstoedit/default.nix
+++ b/pkgs/tools/graphics/pstoedit/default.nix
@@ -1,24 +1,19 @@
{ stdenv, fetchurl, pkg-config, darwin, lib
, zlib, ghostscript, imagemagick, plotutils, gd
-, libjpeg, libwebp, libiconv
+, libjpeg, libwebp, libiconv, makeWrapper
}:
stdenv.mkDerivation rec {
pname = "pstoedit";
- version = "3.78";
+ version = "4.01";
src = fetchurl {
url = "mirror://sourceforge/pstoedit/pstoedit-${version}.tar.gz";
- sha256 = "sha256-jMKONLx/iNkTeA+AdOgT3VqqCsIFams21L8ASg6Q2AE=";
+ hash = "sha256-RZdlq3NssQ+VVKesAsXqfzVcbC6fz9IXYRx9UQKxB2s=";
};
- #
- # Turn on "-rdb" option (REALLYDELAYBIND) by default to ensure compatibility with gs-9.22
- #
- patches = [ ./pstoedit-gs-9.22-compat.patch ];
-
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ makeWrapper pkg-config ];
buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ]
++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
libiconv ApplicationServices
@@ -30,6 +25,11 @@ stdenv.mkDerivation rec {
substituteInPlace config/pstoedit.pc.in --replace '@LIBPNG_LDFLAGS@' ""
'';
+ postInstall = ''
+ wrapProgram $out/bin/pstoedit \
+ --prefix PATH : ${lib.makeBinPath [ ghostscript ]}
+ '';
+
meta = with lib; {
description = "Translates PostScript and PDF graphics into other vector formats";
homepage = "https://sourceforge.net/projects/pstoedit/";
diff --git a/pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch b/pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch
deleted file mode 100644
index 64fe805d5015..000000000000
--- a/pkgs/tools/graphics/pstoedit/pstoedit-gs-9.22-compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/pstoeditoptions.h b/src/pstoeditoptions.h
-index 7846883..0fb6a6f 100755
---- a/src/pstoeditoptions.h
-+++ b/src/pstoeditoptions.h
-@@ -453,7 +453,7 @@ private:
- "Later versions of Ghostscript will probably support -dDELAYBIND again. "
- "But also in that case the security risk remains. So be careful with what "
- "files you process with pstoedit and Ghostscript.",
-- false), //
-+ true), //
- #endif
- pagetoextract (true, "-page","page number",g_t,"extract a specific page: 0 means all pages",
- "Select a single page from a multi-page PostScript or PDF file.",
diff --git a/pkgs/tools/graphics/xcur2png/default.nix b/pkgs/tools/graphics/xcur2png/default.nix
index 6419752cac8a..768207cf676d 100644
--- a/pkgs/tools/graphics/xcur2png/default.nix
+++ b/pkgs/tools/graphics/xcur2png/default.nix
@@ -28,6 +28,13 @@ stdenv.mkDerivation rec {
url = "https://github.com/eworm-de/xcur2png/commit/aa035462d950fab35d322cb87fd2f0d702251e82.patch";
hash = "sha256-hlmJ/bcDSl1ADs0jp+JrAgAaMzielUSRVPad+plnSZg=";
})
+
+ # fix gcc-14-build:
+ # https://github.com/eworm-de/xcur2png/pull/4
+ (fetchpatch {
+ url = "https://github.com/eworm-de/xcur2png/commit/6fb03957aba8aebc3dc98a479fff9cddf85b9e7b.patch";
+ hash = "sha256-COG4/MKfBAwQU5FqZeqEE4jJT4XII7AQ6ayRSuFcUmY=";
+ })
];
nativeBuildInputs = [
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix
deleted file mode 100644
index e58db09f706c..000000000000
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix
+++ /dev/null
@@ -1,129 +0,0 @@
-{ lib, clangStdenv, fetchFromGitHub, fetchurl, fetchpatch
-, python3Packages, ninja, pkg-config, protobuf, zinnia, qt5, fcitx5
-, jsoncpp, gtest, which, gtk2, unzip, abseil-cpp, breakpad, nixosTests }:
-let
- inherit (python3Packages) python gyp six;
- utdic = fetchurl {
- url = "https://osdn.net/downloads/users/39/39056/mozcdic-ut-20220904.tar.bz2";
- sha256 = "sha256-pmLBCcw2Zsirzl1PjYkviRIZoyfUz5rpESeABDxuhtU=";
- };
- japanese_usage_dictionary = fetchFromGitHub {
- owner = "hiroyuki-komatsu";
- repo = "japanese-usage-dictionary";
- rev = "e5b3425575734c323e1d947009dd74709437b684";
- sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm";
- };
- zipcode_rel = "202011";
- jigyosyo = fetchurl {
- url = "https://osdn.net/projects/ponsfoot-aur/storage/mozc/jigyosyo-${zipcode_rel}.zip";
- sha256 = "j7MkNtd4+QTi91EreVig4/OV0o5y1+KIjEJBEmLK/mY=";
- };
- x-ken-all = fetchurl {
- url =
- "https://osdn.net/projects/ponsfoot-aur/storage/mozc/x-ken-all-${zipcode_rel}.zip";
- sha256 = "ExS0Cg3rs0I9IOVbZHLt8UEfk8/LmY9oAHPVVlYuTPw=";
- };
-
-in clangStdenv.mkDerivation {
- pname = "fcitx5-mozc";
- version = "2.26.4220.102";
-
- src = fetchFromGitHub {
- owner = "fcitx";
- repo = "mozc";
- rev = "1882e33b61673b66d63277f82b4c80ae4e506c10";
- sha256 = "R+w0slVFpqtt7PIr1pyupJjRoQsABVZiMdZ9fKGKAqw=";
- };
-
- nativeBuildInputs = [ gyp ninja python pkg-config qt5.wrapQtAppsHook six which unzip ];
-
- buildInputs = [ protobuf zinnia qt5.qtbase fcitx5 abseil-cpp jsoncpp gtest gtk2 ];
-
- patches = [
- # Support linking system abseil-cpp
- (fetchpatch {
- url = "https://salsa.debian.org/debian/mozc/-/raw/debian/sid/debian/patches/0007-Update-src-base-absl.gyp.patch";
- sha256 = "UiS0UScDKyAusXOhc7Bg8dF8ARQQiVTylEhAOxqaZt8=";
- })
-
- ];
-
- postUnpack = ''
- unzip ${x-ken-all} -d $sourceRoot/src/
- unzip ${jigyosyo} -d $sourceRoot/src/
- mkdir $TMPDIR/unpack
- tar xf ${utdic} -C $TMPDIR/unpack
- cat $TMPDIR/unpack/mozcdic-ut-20220904/mozcdic-ut-20220904.txt >> $sourceRoot/src/data/dictionary_oss/dictionary00.txt
-
- rmdir $sourceRoot/src/third_party/breakpad/
- ln -s ${breakpad} $sourceRoot/src/third_party/breakpad
- rmdir $sourceRoot/src/third_party/gtest/
- ln -s ${gtest} $sourceRoot/src/third_party/gtest
- rmdir $sourceRoot/src/third_party/gyp/
- ln -s ${gyp} $sourceRoot/src/third_party/gyp
- rmdir $sourceRoot/src/third_party/japanese_usage_dictionary/
- ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary
- '';
-
- # Copied from https://github.com/archlinux/svntogit-community/blob/packages/fcitx5-mozc/trunk/PKGBUILD
- configurePhase = ''
- cd src
- export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 use_libabseil=1"
-
- # disable fcitx4
- rm unix/fcitx/fcitx.gyp
-
- # gen zip code seed
- PYTHONPATH="$PWD:$PYTHONPATH" python dictionary/gen_zip_code_seed.py --zip_code="x-ken-all.csv" --jigyosyo="JIGYOSYO.CSV" >> data/dictionary_oss/dictionary09.txt
-
- # use libstdc++ instead of libc++
- sed "/stdlib=libc++/d;/-lc++/d" -i gyp/common.gypi
-
- # run gyp
- python build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc
- '';
-
- buildPhase = ''
- runHook preBuild
-
- python build_mozc.py build -c Release \
- server/server.gyp:mozc_server \
- gui/gui.gyp:mozc_tool \
- unix/fcitx5/fcitx5.gyp:fcitx5-mozc
-
- runHook postBuild
- '';
-
- installPhase = ''
- runHook preInstall
-
- export PREFIX=$out
- export _bldtype=Release
- ../scripts/install_server
- install -d $out/share/licenses/fcitx5-mozc
- head -n 29 server/mozc_server.cc > $out/share/licenses/fcitx5-mozc/LICENSE
- install -m644 data/installer/*.html $out/share/licenses/fcitx5-mozc/
- install -d $out/share/fcitx5/addon
- install -d $out/share/fcitx5/inputmethod
- install -d $out/lib/fcitx5
- ../scripts/install_fcitx5
-
- runHook postInstall
- '';
-
- preFixup = ''
- wrapQtApp $out/lib/mozc/mozc_tool
- '';
-
- passthru.tests = {
- inherit (nixosTests) fcitx5;
- };
-
- meta = with lib; {
- description = "Fcitx5 Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)";
- homepage = "https://github.com/fcitx/mozc";
- license = licenses.bsd3;
- maintainers = with maintainers; [ berberman govanify ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/tools/inputmethods/libinput-gestures/default.nix
index bb466e38ba53..07489693e1d3 100644
--- a/pkgs/tools/inputmethods/libinput-gestures/default.nix
+++ b/pkgs/tools/inputmethods/libinput-gestures/default.nix
@@ -1,17 +1,24 @@
-{ lib, stdenv, fetchFromGitHub, makeWrapper,
- libinput, wmctrl, python3,
- coreutils, xdotool ? null,
- extraUtilsPath ? lib.optional (xdotool != null) xdotool
+{
+ lib,
+ stdenv,
+ fetchFromGitHub,
+ makeWrapper,
+ libinput,
+ wmctrl,
+ python3,
+ coreutils,
+ xdotool ? null,
+ extraUtilsPath ? lib.optional (xdotool != null) xdotool,
}:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
pname = "libinput-gestures";
- version = "2.76";
+ version = "2.77";
src = fetchFromGitHub {
owner = "bulletmark";
repo = "libinput-gestures";
- rev = version;
- sha256 = "sha256-Tb/gQ/2Ul4JzEiLEUPJBj9T6ZAqzMSPdgiofdnDj73Q=";
+ rev = "refs/tags/${finalAttrs.version}";
+ hash = "sha256-eMXNlSgQSuN+/5SXJQjsylC1ygHS87sIEmnVGFk3pzA=";
};
patches = [
./0001-hardcode-name.patch
@@ -21,36 +28,35 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ python3 ];
- postPatch =
- ''
- substituteInPlace libinput-gestures-setup --replace /usr/ /
+ postPatch = ''
+ substituteInPlace libinput-gestures-setup --replace-fail /usr/ /
- substituteInPlace libinput-gestures \
- --replace /etc "$out/etc" \
- --subst-var-by libinput "${libinput}/bin/libinput" \
- --subst-var-by wmctrl "${wmctrl}/bin/wmctrl"
- '';
- installPhase =
- ''
- runHook preInstall
- ${stdenv.shell} libinput-gestures-setup -d "$out" install
- runHook postInstall
- '';
- postFixup =
- ''
- rm "$out/bin/libinput-gestures-setup"
- substituteInPlace "$out/share/systemd/user/libinput-gestures.service" --replace "/usr" "$out"
- substituteInPlace "$out/share/applications/libinput-gestures.desktop" --replace "/usr" "$out"
- chmod +x "$out/share/applications/libinput-gestures.desktop"
- wrapProgram "$out/bin/libinput-gestures" --prefix PATH : "${lib.makeBinPath ([coreutils] ++ extraUtilsPath)}"
- '';
+ substituteInPlace libinput-gestures \
+ --replace-fail /etc "$out/etc" \
+ --subst-var-by libinput "${libinput}/bin/libinput" \
+ --subst-var-by wmctrl "${wmctrl}/bin/wmctrl"
+ '';
+ installPhase = ''
+ runHook preInstall
+ ${stdenv.shell} libinput-gestures-setup -d "$out" install
+ runHook postInstall
+ '';
+ postFixup = ''
+ rm "$out/bin/libinput-gestures-setup"
+ substituteInPlace "$out/share/systemd/user/libinput-gestures.service" --replace "/usr" "$out"
+ substituteInPlace "$out/share/applications/libinput-gestures.desktop" --replace "/usr" "$out"
+ chmod +x "$out/share/applications/libinput-gestures.desktop"
+ wrapProgram "$out/bin/libinput-gestures" --prefix PATH : "${
+ lib.makeBinPath ([ coreutils ] ++ extraUtilsPath)
+ }"
+ '';
- meta = with lib; {
+ meta = {
homepage = "https://github.com/bulletmark/libinput-gestures";
description = "Gesture mapper for libinput";
mainProgram = "libinput-gestures";
- license = licenses.gpl3Plus;
- platforms = platforms.linux;
- maintainers = with maintainers; [ teozkr ];
+ license = lib.licenses.gpl3Plus;
+ platforms = lib.platforms.linux;
+ maintainers = with lib.maintainers; [ teozkr ];
};
-}
+})
diff --git a/pkgs/tools/misc/arch-install-scripts/default.nix b/pkgs/tools/misc/arch-install-scripts/default.nix
index a87268309252..307b298a7ebf 100644
--- a/pkgs/tools/misc/arch-install-scripts/default.nix
+++ b/pkgs/tools/misc/arch-install-scripts/default.nix
@@ -1,12 +1,13 @@
{ lib
, resholve
-, fetchFromGitHub
+, fetchFromGitLab
, asciidoc
, bash
, coreutils
, gawk
, gnugrep
, gnum4
+, gnused
, pacman
, util-linux
, chrootPath ? [
@@ -21,13 +22,14 @@
resholve.mkDerivation rec {
pname = "arch-install-scripts";
- version = "28";
+ version = "29";
- src = fetchFromGitHub {
+ src = fetchFromGitLab {
+ domain = "gitlab.archlinux.org";
owner = "archlinux";
repo = "arch-install-scripts";
rev = "v${version}";
- hash = "sha256-TytCeejhjWYDzWFjGubUl08OrsAQa9fFULoamDfbdDY=";
+ hash = "sha256-XWcZZ+ET3J4dB6M9CdXESf0iQh+2vYxlxoJ6TZ3vFUk=";
};
nativeBuildInputs = [ asciidoc gnum4 ];
@@ -61,7 +63,7 @@ resholve.mkDerivation rec {
interpreter = "${bash}/bin/bash";
# packages resholve should resolve executables from
- inputs = [ coreutils gawk gnugrep pacman util-linux ];
+ inputs = [ coreutils gawk gnugrep gnused pacman util-linux ];
execer = [ "cannot:${pacman}/bin/pacman-key" ];
diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix
index 8e9b0ce6e094..8e67cbab6111 100644
--- a/pkgs/tools/misc/bepasty/default.nix
+++ b/pkgs/tools/misc/bepasty/default.nix
@@ -54,7 +54,6 @@ bepastyPython.pkgs.buildPythonPackage rec {
nativeCheckInputs = with bepastyPython.pkgs; [
build
- codecov
flake8
pytestCheckHook
pytest-cov
diff --git a/pkgs/tools/misc/colorpicker/default.nix b/pkgs/tools/misc/colorpicker/default.nix
deleted file mode 100644
index 8b45da17626c..000000000000
--- a/pkgs/tools/misc/colorpicker/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, gtk2 }:
-
-stdenv.mkDerivation rec {
- pname = "colorpicker";
- version = "unstable-2017-09-01";
-
- src = fetchFromGitHub {
- owner = "Jack12816";
- repo = "colorpicker";
- rev = "a4455b92fde1dfbac81e7852f171093932154a30";
- sha256 = "z2asxTIP8WcsWcePmIg0k4bOF2JwkqOxNqSpQv4/a40=";
- };
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ gtk2 ];
-
- installPhase = ''
- install -Dt $out/bin colorpicker
- '';
-
- meta = with lib; {
- description = "Click on a pixel on your screen and print its color value in RGB";
- homepage = "https://github.com/Jack12816/colorpicker";
- maintainers = with maintainers; [ jb55 ];
- license = licenses.mit;
- mainProgram = "colorpicker";
- };
-}
diff --git a/pkgs/tools/misc/conserver/default.nix b/pkgs/tools/misc/conserver/default.nix
index ca066c834b8a..1c550033c3ea 100644
--- a/pkgs/tools/misc/conserver/default.nix
+++ b/pkgs/tools/misc/conserver/default.nix
@@ -53,6 +53,13 @@ stdenv.mkDerivation rec {
# Disabled due to exist upstream cases failing 8/15 tests
doCheck = false;
+ postPatch = ''
+ # install -s calls the wrong strip program when cross compiling
+ substituteInPlace \
+ console/Makefile.in conserver/Makefile.in autologin/Makefile.in contrib/chat/Makefile.in \
+ --replace-fail "@INSTALL_PROGRAM@ -s" "@INSTALL_PROGRAM@"
+ '';
+
meta = with lib; {
homepage = "https://www.conserver.com/";
description = "Application that allows multiple users to watch a serial console at the same time";
diff --git a/pkgs/tools/misc/depotdownloader/default.nix b/pkgs/tools/misc/depotdownloader/default.nix
index 25c250b83f42..b7c3e1414be9 100644
--- a/pkgs/tools/misc/depotdownloader/default.nix
+++ b/pkgs/tools/misc/depotdownloader/default.nix
@@ -6,13 +6,13 @@
buildDotnetModule rec {
pname = "depotdownloader";
- version = "2.7.2";
+ version = "2.7.3";
src = fetchFromGitHub {
owner = "SteamRE";
repo = "DepotDownloader";
rev = "DepotDownloader_${version}";
- sha256 = "c8hgeFTgOjRTjaOSrUazko74GdTW5p9i7+YJIqR28hw=";
+ sha256 = "TKPUE9PzTUoYmhT1O+Qvb0lukPY6fGs70wSiCdEJUMQ=";
};
projectFile = "DepotDownloader.sln";
diff --git a/pkgs/tools/misc/depotdownloader/deps.nix b/pkgs/tools/misc/depotdownloader/deps.nix
index 0970c8ba3799..998c6a8b5563 100644
--- a/pkgs/tools/misc/depotdownloader/deps.nix
+++ b/pkgs/tools/misc/depotdownloader/deps.nix
@@ -11,7 +11,7 @@
(fetchNuGet { pname = "protobuf-net"; version = "3.2.30"; hash = "sha256-keRy5OWT+/tlZt3D7x+9PEdjTvEJcZdYsf/i1ZBtciE="; })
(fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.30"; hash = "sha256-GMpJNecoBfrV2VgpYOhcZnKZaLFDObNLcX2LBTThrwY="; })
(fetchNuGet { pname = "QRCoder"; version = "1.6.0"; hash = "sha256-2Ev/6d7PH6K4dVYQQHlZ+ZggkCnDtrlaGygs65mDo28="; })
- (fetchNuGet { pname = "SteamKit2"; version = "3.0.0-beta.3"; hash = "sha256-G3Apy5g0TT273Ake6/4DnrJGY4lWrTbyHDJMntiSuzE="; })
+ (fetchNuGet { pname = "SteamKit2"; version = "3.0.0-beta.4"; hash = "sha256-7cXlpCuUD8ZuTMtqsT5MdklkZb+XIGBdoI28anjUXtg="; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; })
(fetchNuGet { pname = "System.IO.Hashing"; version = "8.0.0"; hash = "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE="; })
(fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; })
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 1dc01c72faae..fc85e55b6630 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -102,11 +102,11 @@ in
# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
python.pkgs.buildPythonApplication rec {
pname = "diffoscope";
- version = "279";
+ version = "282";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
- hash = "sha256-mP/l1/lFklFDBhXvnBjbcS8LZYqtfuCcG5SlD75RC/o=";
+ hash = "sha256-hp1SW9vHBZnlSNKCKW7AUPheyMntxvrPo0McDHZw96c=";
};
outputs = [
diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix
index 70df226929df..b30cc6101209 100644
--- a/pkgs/tools/misc/esphome/default.nix
+++ b/pkgs/tools/misc/esphome/default.nix
@@ -49,7 +49,8 @@ python.pkgs.buildPythonApplication rec {
postPatch = ''
substituteInPlace pyproject.toml \
- --replace-fail "setuptools==" "setuptools>="
+ --replace-fail "setuptools==" "setuptools>=" \
+ --replace-fail "wheel~=" "wheel>="
# ensure component dependencies are available
cat requirements_optional.txt >> requirements.txt
diff --git a/pkgs/tools/misc/google-cloud-sql-proxy/default.nix b/pkgs/tools/misc/google-cloud-sql-proxy/default.nix
index 1c5d3c19b9ae..c7a4f328fa0d 100644
--- a/pkgs/tools/misc/google-cloud-sql-proxy/default.nix
+++ b/pkgs/tools/misc/google-cloud-sql-proxy/default.nix
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "google-cloud-sql-proxy";
- version = "2.12.0";
+ version = "2.14.0";
src = fetchFromGitHub {
owner = "GoogleCloudPlatform";
repo = "cloud-sql-proxy";
rev = "v${version}";
- hash = "sha256-nEbrNRrEXXvLYi1vIvukUaq+WQn2HlonaaMn57yIA3I=";
+ hash = "sha256-SM74Z9+oo472BIM/moSj9zyZh2HefkAkqoC4L1tu+X8=";
};
subPackages = [ "." ];
- vendorHash = "sha256-EI2PDVdS9JB8ACkRTsfCBLz4JEmHQ6hApFSSfSvD/cQ=";
+ vendorHash = "sha256-Ao/kSC4gcsZpRaSu7FhqJs1ulUbfrzOpO4CMropCywo=";
checkFlags = [
"-short"
diff --git a/pkgs/tools/misc/grizzly/default.nix b/pkgs/tools/misc/grizzly/default.nix
index a994aead4176..07d26e1ca195 100644
--- a/pkgs/tools/misc/grizzly/default.nix
+++ b/pkgs/tools/misc/grizzly/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "grizzly";
- version = "0.4.5";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "grafana";
repo = pname;
rev = "v${version}";
- hash = "sha256-cHPF+WHiUU0Cd30mEe+vMbkoG2mh2jMwlKhd851woH0=";
+ hash = "sha256-zk6qcFWoRYyjy3mVSJdqwEj279QjWVF8fFYojOoD5jc=";
};
vendorHash = "sha256-lioFmaFzqaxN1wnYJaoHA54to1xGZjaLGaqAFIfTaTs=";
diff --git a/pkgs/tools/misc/hostmux/default.nix b/pkgs/tools/misc/hostmux/default.nix
index 27e714a5e7f7..405383d648be 100644
--- a/pkgs/tools/misc/hostmux/default.nix
+++ b/pkgs/tools/misc/hostmux/default.nix
@@ -4,17 +4,18 @@
, installShellFiles
, openssh
, tmux
+, gitUpdater
}:
stdenv.mkDerivation (finalAttrs: {
pname = "hostmux";
- version = "1.4.0";
+ version = "1.4.1";
src = fetchFromGitHub {
owner = "hukl";
repo = "hostmux";
rev = finalAttrs.version;
- hash = "sha256-odN7QFsU3MsWW8VabVjZH+8+AUFOUio8eF9ORv9iPEA=";
+ hash = "sha256-Rh8eyKoUydixj+X7muWleZW9u8djCQAyexIfRWIOr0o=";
};
nativeBuildInputs = [
@@ -28,9 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
substituteInPlace hostmux \
- --replace "SSH_CMD=ssh" "SSH_CMD=${openssh}/bin/ssh" \
- --replace "tmux -2" "${tmux}/bin/tmux -2" \
- --replace "tmux s" "${tmux}/bin/tmux s"
+ --replace "SSH_CMD=ssh" "SSH_CMD=${lib.getExe openssh}" \
+ --replace "TMUX_CMD=tmux" "TMUX_CMD=${lib.getExe tmux}"
'';
installPhase = ''
@@ -43,9 +43,12 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstall
'';
+ passthru.updateScript = gitUpdater { };
+
meta = {
description = "Small wrapper script for tmux to easily connect to a series of hosts via ssh and open a split pane for each of the hosts";
homepage = "https://github.com/hukl/hostmux";
+ changelog = "https://github.com/hukl/hostmux/releases/tag/${finalAttrs.version}";
license = lib.licenses.mit;
mainProgram = "hostmux";
maintainers = with lib.maintainers; [ fernsehmuell ];
diff --git a/pkgs/tools/misc/instaloader/default.nix b/pkgs/tools/misc/instaloader/default.nix
index 2ab8395eca85..f1201a2d50c8 100644
--- a/pkgs/tools/misc/instaloader/default.nix
+++ b/pkgs/tools/misc/instaloader/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "instaloader";
- version = "4.13.1";
+ version = "4.13.2";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "instaloader";
repo = "instaloader";
rev = "refs/tags/v${version}";
- sha256 = "sha256-eu2Hp3uomtPuMNjJGprcqK5HApKEjtXU9IQ5yT55cic=";
+ sha256 = "sha256-ysyHCdgednd+cddcXDmEIY1RO8RPHTDitj4NT1IpE8Y=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/misc/microplane/default.nix b/pkgs/tools/misc/microplane/default.nix
index 5fb431d38741..1b16066b488a 100644
--- a/pkgs/tools/misc/microplane/default.nix
+++ b/pkgs/tools/misc/microplane/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "microplane";
- version = "0.0.34";
+ version = "0.0.35";
src = fetchFromGitHub {
owner = "Clever";
repo = "microplane";
rev = "v${version}";
- sha256 = "sha256-ZrBkVXRGZp8yGFIBo7sLGvJ8pMQq7Cq0xJiko57z164=";
+ sha256 = "sha256-3QPxH4ZR02bkL2uKoJpLW9e7q1LjSlWw5jo0jxegeiM=";
};
- vendorHash = "sha256-PqSjSFTVrIsQ065blIxZ9H/ARku6BEcnjboH+0K0G14=";
+ vendorHash = "sha256-DizwNph3hmSRoozvJgs3Qw/c9iMTRR1gMGC60pBCFSk=";
ldflags = [
"-s" "-w" "-X main.version=${version}"
diff --git a/pkgs/tools/misc/mpremote/default.nix b/pkgs/tools/misc/mpremote/default.nix
index b55efaa3b0a0..1765b864dcb6 100644
--- a/pkgs/tools/misc/mpremote/default.nix
+++ b/pkgs/tools/misc/mpremote/default.nix
@@ -9,13 +9,13 @@
}:
buildPythonApplication rec {
pname = "mpremote";
- version = "1.23.0";
+ version = "1.24.0";
src = fetchFromGitHub {
owner = "micropython";
repo = "micropython";
rev = "refs/tags/v${version}";
- hash = "sha256-TEW9aDXodPYWlm7xxodaG/2sXOCPpDUKtYVzYZgAzf4=";
+ hash = "sha256-nBz4m5YxD6MV5SyyzvJcwBTttV8uJGdcCUY6HYxZ4nY=";
};
sourceRoot = "${src.name}/tools/mpremote";
format = "pyproject";
diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix
index 80875dec8f71..5a89b997512e 100644
--- a/pkgs/tools/misc/multitail/default.nix
+++ b/pkgs/tools/misc/multitail/default.nix
@@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, ncurses, pkg-config, cmake }:
stdenv.mkDerivation rec {
- version = "7.1.3";
+ version = "7.1.5";
pname = "multitail";
src = fetchFromGitHub {
owner = "folkertvanheusden";
repo = pname;
rev = version;
- sha256 = "sha256-4iAFxDAS3gthYPECzyFj0AKzIGwZ9hTJ96fCnQGLbXU=";
+ hash = "sha256-c9NlQLgHngNBbADZ6/legWFaKHJAQR/LZIfh8bJoc4Y=";
};
nativeBuildInputs = [ pkg-config cmake ];
@@ -16,8 +16,11 @@ stdenv.mkDerivation rec {
buildInputs = [ ncurses ];
installPhase = ''
- mkdir -p $out/bin
- cp bin/multitail $out/bin
+ runHook preInstall
+
+ install -Dm755 multitail -t $out/bin/
+
+ runHook postInstall
'';
hardeningDisable = [ "format" ];
diff --git a/pkgs/tools/misc/mutagen-compose/default.nix b/pkgs/tools/misc/mutagen-compose/default.nix
index 33358017f24a..ad6e236f04e1 100644
--- a/pkgs/tools/misc/mutagen-compose/default.nix
+++ b/pkgs/tools/misc/mutagen-compose/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "mutagen-compose";
- version = "0.17.6";
+ version = "0.18.0";
src = fetchFromGitHub {
owner = "mutagen-io";
repo = pname;
rev = "v${version}";
- hash = "sha256-ZcfwpEfdoSMCGtw5Icj1hXbk5CRYS4LBtdaiX62E4I0=";
+ hash = "sha256-Y81m3kUu8R1uFLA+IRXP0llB6iC0uHeSW0SjTBGLmUc=";
};
- vendorHash = "sha256-XyWi06siSHOKZca0w4WLIFGM63wnF//2rRP4aH5rFAo=";
+ vendorHash = "sha256-2+1PTUvhAS28lMXMLockLvX6aJyZsjuXZq8kIx4un8E=";
doCheck = false;
diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix
index 78bd166a5f6f..4905c0cbb4fd 100644
--- a/pkgs/tools/misc/panoply/default.nix
+++ b/pkgs/tools/misc/panoply/default.nix
@@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation rec {
pname = "panoply";
- version = "5.5.3";
+ version = "5.5.4";
src = fetchurl {
url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz";
- hash = "sha256-TCuCLWMVp7t0JpHA6TbwUdURj/aBggzLa9I7llRY0TU=";
+ hash = "sha256-rC2vQcaanK2nNSDtiXNhyBiV0SN3QqtwU8WNBc7D/Nw=";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/misc/pferd/default.nix b/pkgs/tools/misc/pferd/default.nix
index 260ba3de5650..df6465ff85a8 100644
--- a/pkgs/tools/misc/pferd/default.nix
+++ b/pkgs/tools/misc/pferd/default.nix
@@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "pferd";
- version = "3.5.2";
+ version = "3.6.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "Garmelon";
repo = "PFERD";
rev = "refs/tags/v${version}";
- sha256 = "sha256-qN4GtQhiQpXZIagtphcn+oSYXroA9kk7E34IKoKMu7c=";
+ sha256 = "sha256-BUYu04Ie7GNJYUGSH30VbVUQirg1tAl1LY39mnEsLf8=";
};
nativeBuildInputs = with python3Packages; [
diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index 587d07eaf5bd..66fac2661a2c 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -13,13 +13,13 @@
rustPlatform.buildRustPackage rec {
pname = "starship";
- version = "1.20.1";
+ version = "1.21.1";
src = fetchFromGitHub {
owner = "starship";
repo = "starship";
rev = "v${version}";
- hash = "sha256-Y7jX0XXrSMEex1HG0o69Q1rTtnFL0UuIEgfa1e7D1Nc=";
+ hash = "sha256-Xn9qV26/ST+3VtVq6OJP823lIVIo0zEdno+nIUv8B9c=";
};
nativeBuildInputs = [ installShellFiles cmake ];
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
--zsh <($out/bin/starship completions zsh)
'';
- cargoHash = "sha256-yJ32HFaRpujJ9mQa+07b5cQcl1ATO/56dpm1IeKcbzs=";
+ cargoHash = "sha256-YbZCe2OcX/wq0OWvWK61nWvRT0O+CyW0QY0J7vv6QaM=";
nativeCheckInputs = [ git ];
diff --git a/pkgs/tools/misc/steampipe-packages/default.nix b/pkgs/tools/misc/steampipe-packages/default.nix
index 4e20b6abbcae..b7cb46247435 100644
--- a/pkgs/tools/misc/steampipe-packages/default.nix
+++ b/pkgs/tools/misc/steampipe-packages/default.nix
@@ -2,5 +2,6 @@
{
steampipe-plugin-aws = callPackage ./steampipe-plugin-aws { };
+ steampipe-plugin-azure = callPackage ./steampipe-plugin-azure { };
steampipe-plugin-github = callPackage ./steampipe-plugin-github { };
}
diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix
index 33c09ba83e82..8b6703ac35f3 100644
--- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix
+++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix
@@ -43,7 +43,7 @@ buildGoModule rec {
changelog = "https://github.com/turbot/steampipe-plugin-aws/blob/v${version}/CHANGELOG.md";
description = "AWS Plugin for Steampipe";
homepage = "https://github.com/turbot/steampipe-plugin-aws";
- license = lib.licenses.apsl20;
+ license = lib.licenses.asl20;
longDescription = "Use SQL to instantly query AWS resources across regions and accounts.";
maintainers = with lib.maintainers; [ anthonyroussel ];
platforms = steampipe.meta.platforms;
diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix
new file mode 100644
index 000000000000..413329e7874d
--- /dev/null
+++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix
@@ -0,0 +1,51 @@
+{
+ buildGoModule,
+ fetchFromGitHub,
+ lib,
+ nix-update-script,
+ steampipe,
+}:
+
+buildGoModule rec {
+ pname = "steampipe-plugin-azure";
+ version = "1.0.0";
+
+ src = fetchFromGitHub {
+ owner = "turbot";
+ repo = "steampipe-plugin-azure";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-tIAVYZ+gZnvUJPDYP1WqZb7kAZ1f0YXJ4VWy2Cw2QMo=";
+ };
+
+ vendorHash = "sha256-M97SnuWVB7Xw2xXRLBiGCWgATZCYh0BoV4bzhF57x5o=";
+
+ ldflags = [
+ "-s"
+ "-w"
+ ];
+
+ doCheck = true;
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out
+ cp $GOPATH/bin/steampipe-plugin-azure $out/steampipe-plugin-azure.plugin
+ cp -R docs $out/.
+ cp -R config $out/.
+
+ runHook postInstall
+ '';
+
+ passthru.updateScript = nix-update-script { };
+
+ meta = {
+ changelog = "https://github.com/turbot/steampipe-plugin-azure/blob/v${version}/CHANGELOG.md";
+ description = "Azure Plugin for Steampipe";
+ homepage = "https://github.com/turbot/steampipe-plugin-azure";
+ license = lib.licenses.apsl20;
+ longDescription = "Use SQL to instantly query Azure resources across regions and subscriptions.";
+ maintainers = with lib.maintainers; [ petee ];
+ platforms = steampipe.meta.platforms;
+ };
+}
diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix
index d09191633c4a..12cda347fc22 100644
--- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix
+++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix
@@ -43,7 +43,7 @@ buildGoModule rec {
changelog = "https://github.com/turbot/steampipe-plugin-github/blob/v${version}/CHANGELOG.md";
description = "GitHub Plugin for Steampipe";
homepage = "https://github.com/turbot/steampipe-plugin-github";
- license = lib.licenses.apsl20;
+ license = lib.licenses.asl20;
longDescription = "Use SQL to instantly query repositories, users, gists and more from GitHub.";
maintainers = with lib.maintainers; [ anthonyroussel ];
platforms = steampipe.meta.platforms;
diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index e0a0cfe9804c..c39b98f1627d 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -21,7 +21,7 @@ let
requests-mock
;
- version = "4.97.1";
+ version = "4.101";
in
@@ -34,7 +34,7 @@ buildPythonApplication {
owner = "spaam";
repo = "svtplay-dl";
rev = version;
- hash = "sha256-9h3hHRRL7DKeCpEXL5w72hYi1nTS+a+x5e9ArMmVgYQ=";
+ hash = "sha256-bHUrpkGBguI8oZB1h1ToFkFsGiMeyV7TyDtgJ8+2TzI=";
};
build-system = [ setuptools ];
diff --git a/pkgs/tools/misc/tailspin/default.nix b/pkgs/tools/misc/tailspin/default.nix
index 25aba0ebb95d..51e0c19590c8 100644
--- a/pkgs/tools/misc/tailspin/default.nix
+++ b/pkgs/tools/misc/tailspin/default.nix
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "tailspin";
- version = "3.0.2";
+ version = "4.0.0";
src = fetchFromGitHub {
owner = "bensadeh";
repo = "tailspin";
rev = version;
- hash = "sha256-STQtWLrRS76sowGOBLZqeE8bYcDUjI5ErQD3D7z98M8=";
+ hash = "sha256-5VbxQDK69If5N8EiS8sIKNqHkCAfquOz8nUS7ynp+nA=";
};
- cargoHash = "sha256-gNyegmr7Iv7dRe/bCwxLbhVkhex0D9ylF5Eulix26tg=";
+ cargoHash = "sha256-ohfza2ti7Ar/9TV/WoTL5g6CPaONrxtr7nW0qmLdB/8=";
meta = with lib; {
description = "Log file highlighter";
diff --git a/pkgs/tools/misc/taoup/default.nix b/pkgs/tools/misc/taoup/default.nix
index cdf0b9518c4f..6b1f0778e3ee 100644
--- a/pkgs/tools/misc/taoup/default.nix
+++ b/pkgs/tools/misc/taoup/default.nix
@@ -4,13 +4,13 @@ let
in
stdenv.mkDerivation rec {
pname = "taoup";
- version = "1.21";
+ version = "1.1.23";
src = fetchFromGitHub {
owner = "globalcitizen";
repo = "taoup";
rev = "v${version}";
- hash = "sha256-UHo3c+DQn77CJONy/QXM55rpIdhVkJbhR82tqmUltPQ=";
+ hash = "sha256-9J46fKyeSZW71r67R8y9KVPeCH8fn27hOk/XpusqGmk=";
};
buildInputs = [ rubyEnv bash ncurses ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
--subst-var-by pname taoup
substituteInPlace taoup-fortune \
--subst-var-by out $out \
- --replace "/bin/bash" "${bash}/bin/bash"
+ --replace-fail "/bin/bash" "${bash}/bin/bash"
'';
dontConfigure = true;
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
EOF
chmod +x $out/bin/taoup
- # Populate the cache created by cachedir.patch above
+ # Populate the cache created by cachefile.patch above
$out/bin/taoup > $out/lib/taoup/cache
cp taoup-fortune $out/bin
diff --git a/pkgs/tools/misc/tmux-sessionizer/default.nix b/pkgs/tools/misc/tmux-sessionizer/default.nix
index e60ef9fb4c50..2d2deb07dbd2 100644
--- a/pkgs/tools/misc/tmux-sessionizer/default.nix
+++ b/pkgs/tools/misc/tmux-sessionizer/default.nix
@@ -7,11 +7,12 @@
, Security
, testers
, tmux-sessionizer
+, installShellFiles
}:
let
name = "tmux-sessionizer";
- version = "0.4.3";
+ version = "0.4.4";
in
rustPlatform.buildRustPackage {
@@ -22,10 +23,10 @@ rustPlatform.buildRustPackage {
owner = "jrmoulton";
repo = name;
rev = "v${version}";
- hash = "sha256-wwu3h2eQrim/RbxTYqt+EnFmn0uD6PQzo1Xs1qCVQ3o=";
+ hash = "sha256-4xwpenoAVGKdVO3eSS4BhaEcwpNPGA5Ozie53focDlA=";
};
- cargoHash = "sha256-5OIiDz66GD3DrNKzxH+bpyweS7Ycn2IOf4f9mdHAaCo=";
+ cargoHash = "sha256-ajeCB1w/JHMT5e7mSwsh++lzLNfp0qfutONStpJpFDo=";
passthru.tests.version = testers.testVersion {
package = tmux-sessionizer;
@@ -35,9 +36,16 @@ rustPlatform.buildRustPackage {
# Needed to get openssl-sys to use pkg-config.
OPENSSL_NO_VENDOR = 1;
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config installShellFiles ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
+ postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+ installShellCompletion --cmd tms \
+ --bash <($out/bin/tms --generate bash) \
+ --fish <($out/bin/tms --generate fish) \
+ --zsh <($out/bin/tms --generate zsh)
+ '';
+
meta = with lib; {
description = "Fastest way to manage projects as tmux sessions";
homepage = "https://github.com/jrmoulton/tmux-sessionizer";
diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix
index 91c05e53024d..596407b5b4b5 100644
--- a/pkgs/tools/misc/tmuxinator/default.nix
+++ b/pkgs/tools/misc/tmuxinator/default.nix
@@ -8,8 +8,8 @@ buildRubyGem rec {
inherit ruby;
name = "${gemName}-${version}";
gemName = "tmuxinator";
- version = "3.3.1";
- source.sha256 = "sha256-xixLYzDIvX3D+vbe9SccST37TnyZx/YjePLPjagHsOU=";
+ version = "3.3.2";
+ source.sha256 = "sha256-q1VS4ChHVqIpHHO/fGANG5IjgwUfBT2VqT9WAkQeGh4=";
erubi = buildRubyGem rec {
inherit ruby;
diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix
index e2282008ce8e..19b25edf65d2 100644
--- a/pkgs/tools/misc/vector/default.nix
+++ b/pkgs/tools/misc/vector/default.nix
@@ -20,28 +20,6 @@
cmake,
perl,
git,
- # nix has a problem with the `?` in the feature list
- # enabling kafka will produce a vector with no features at all
- enableKafka ? false,
- # TODO investigate adding various "vendor-*"
- # "disk-buffer" is using leveldb TODO: investigate how useful
- # it would be, perhaps only for massive scale?
- features ? (
- [
- "api"
- "api-client"
- "enrichment-tables"
- "sinks"
- "sources"
- "sources-dnstap"
- "transforms"
- "component-validation-runner"
- ]
- # the second feature flag is passed to the rdkafka dependency
- # building on linux fails without this feature flag (both x86_64 and AArch64)
- ++ lib.optionals enableKafka [ "rdkafka?/gssapi-vendored" ]
- ++ lib.optional stdenv.hostPlatform.isUnix "unix"
- ),
nixosTests,
nix-update-script,
}:
@@ -119,9 +97,6 @@ rustPlatform.buildRustPackage {
CARGO_PROFILE_RELEASE_LTO = "fat";
CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";
- buildNoDefaultFeatures = true;
- buildFeatures = features;
-
# TODO investigate compilation failure for tests
# there are about 100 tests failing (out of 1100) for version 0.22.0
doCheck = false;
@@ -158,7 +133,6 @@ rustPlatform.buildRustPackage {
'';
passthru = {
- inherit features;
tests = {
inherit (nixosTests) vector;
};
diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix
index cddabd79db23..33f866dd56d7 100644
--- a/pkgs/tools/misc/vtm/default.nix
+++ b/pkgs/tools/misc/vtm/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "vtm";
- version = "0.9.99.13";
+ version = "0.9.99.35";
src = fetchFromGitHub {
owner = "netxs-group";
repo = "vtm";
rev = "v${finalAttrs.version}";
- hash = "sha256-IXxbEwwwqqy5zepdJULlIsrz2csnpGXQhBzbc5AW7II=";
+ hash = "sha256-XPBInofzFNBMuJ0oP7ZooDuRukuXBWkEzdEq09MHykA=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix
index 0d04a21219bc..a073ef9473fe 100644
--- a/pkgs/tools/misc/watchexec/default.nix
+++ b/pkgs/tools/misc/watchexec/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "watchexec";
- version = "2.1.2";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- hash = "sha256-mH670pBxSQQ4mTtX6O71aRRxRVyz0J7r4227UsUJ5LE=";
+ hash = "sha256-kbcSm1plh5QS87hGQj9OL1rq2eK6jbGn/kfjPF6kNzo=";
};
- cargoHash = "sha256-cBxFaERUDaOxAYfpvBdJa9LxvrG2niJqVovcZDucbUA=";
+ cargoHash = "sha256-xLUI7B7clpdJQOMDd32ag87yQ99XgbLgPqahPwUHMZQ=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix
index e069d0c8d87f..2097787f4855 100644
--- a/pkgs/tools/misc/zellij/default.nix
+++ b/pkgs/tools/misc/zellij/default.nix
@@ -3,7 +3,6 @@
, rustPlatform
, stdenv
, installShellFiles
-, perl
, pkg-config
, libiconv
, openssl
@@ -30,10 +29,11 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [
mandown
installShellFiles
- perl
pkg-config
];
+ OPENSSL_NO_VENDOR = 1;
+
buildInputs = [
openssl
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/tools/networking/aardvark-dns/default.nix
index 35d59d11feeb..2adbb0a73932 100644
--- a/pkgs/tools/networking/aardvark-dns/default.nix
+++ b/pkgs/tools/networking/aardvark-dns/default.nix
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "aardvark-dns";
- version = "1.12.2";
+ version = "1.13.0";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
- hash = "sha256-1fYJ0G75sbg97HiN6HNWwlG82jqENqVTC/sXgH+oXWA=";
+ hash = "sha256-1I0YcnHGxblfSWlx5bbR4v3UXxKPnYQ90AKnUny2vDg=";
};
- cargoHash = "sha256-COZmd5sqaewK0La78/1J9bGJdsPNyeT18wV2qr/b6cM=";
+ cargoHash = "sha256-vZHFZL3dwFVyLfifpUq4uaqaUac7Itimf2pJGZ4qWMM=";
passthru.tests = { inherit (nixosTests) podman; };
diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix
index 43ed2dc16c8a..96672515e4d3 100644
--- a/pkgs/tools/networking/assh/default.nix
+++ b/pkgs/tools/networking/assh/default.nix
@@ -43,7 +43,7 @@ buildGoModule rec {
homepage = "https://github.com/moul/assh";
changelog = "https://github.com/moul/assh/releases/tag/v${version}";
license = licenses.mit;
- maintainers = with maintainers; [ zzamboni ];
+ maintainers = with maintainers; [ ];
platforms = with platforms; linux ++ darwin;
};
}
diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix
index 45205721c4c8..0f2930f8fabf 100644
--- a/pkgs/tools/networking/burpsuite/default.nix
+++ b/pkgs/tools/networking/burpsuite/default.nix
@@ -70,7 +70,7 @@ buildFHSEnv {
jython
libcanberra-gtk3
libdrm
- libudev0-shim
+ udev
libxkbcommon
mesa
nspr
diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix
index 0a3a7ae351d0..43da147e06ec 100644
--- a/pkgs/tools/networking/dd-agent/datadog-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix
@@ -120,6 +120,9 @@ in buildGoModule rec {
license = licenses.bsd3;
maintainers = with maintainers; [ thoughtpolice domenkozar ];
# never built on aarch64-darwin since first introduction in nixpkgs
- broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
+ # broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
+
+ # Upstream does not support Go > 1.21; for update refer to https://github.com/NixOS/nixpkgs/issues/351119
+ broken = true;
};
}
diff --git a/pkgs/tools/networking/dnsmonster/default.nix b/pkgs/tools/networking/dnsmonster/default.nix
index 0b32a8c90869..782bd8518596 100644
--- a/pkgs/tools/networking/dnsmonster/default.nix
+++ b/pkgs/tools/networking/dnsmonster/default.nix
@@ -1,31 +1,30 @@
-{ lib
-, stdenv
-, buildGoModule
-, fetchFromGitHub
-, libpcap
+{
+ lib,
+ stdenv,
+ buildGoModule,
+ fetchFromGitHub,
+ libpcap,
}:
buildGoModule rec {
pname = "dnsmonster";
- version = "0.9.9";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "mosajjal";
- repo = pname;
- rev = "v${version}";
- hash = "sha256-2k/WyAM8h2P2gCLt2J9m/ZekrzCyf/LULGOQYy5bsZs=";
+ repo = "dnsmonster";
+ rev = "refs/tags/v${version}";
+ hash = "sha256-0WHTrqnc3vYQro+nSsQipAPVymR8L4uOwtd9GJHxhVM=";
};
- vendorHash = "sha256-gAjR1MoudBAx1dxGObIVPqJdfehWkKckKtwM7sTP0w4=";
+ vendorHash = "sha256-QCG/rhs4Y3lLDVU15cBNUZqbKc4faNAqKMhMOFwK2SY=";
- buildInputs = [
- libpcap
- ];
+ buildInputs = [ libpcap ];
ldflags = [
"-s"
"-w"
- "-X github.com/mosajjal/dnsmonster/util.releaseVersion=${version}"
+ "-X=github.com/mosajjal/dnsmonster/util.releaseVersion=${version}"
];
meta = with lib; {
diff --git a/pkgs/tools/networking/edgedb/Cargo.lock b/pkgs/tools/networking/edgedb/Cargo.lock
index 1b6d03c1665b..9daf276a4ba7 100644
--- a/pkgs/tools/networking/edgedb/Cargo.lock
+++ b/pkgs/tools/networking/edgedb/Cargo.lock
@@ -4,19 +4,13 @@ version = 3
[[package]]
name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
dependencies = [
"gimli",
]
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
[[package]]
name = "adler2"
version = "2.0.0"
@@ -61,6 +55,21 @@ dependencies = [
"memchr",
]
+[[package]]
+name = "alloc-no-stdlib"
+version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
+
+[[package]]
+name = "alloc-stdlib"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
+dependencies = [
+ "alloc-no-stdlib",
+]
+
[[package]]
name = "allocator-api2"
version = "0.2.18"
@@ -124,15 +133,15 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.86"
+version = "1.0.90"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95"
[[package]]
name = "append-only-vec"
-version = "0.1.5"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d9f7083455f1a474276ccd32374958d2cb591024aac45101c7623b10271347"
+checksum = "7992085ec035cfe96992dd31bfd495a2ebd31969bb95f624471cb6c0b349e571"
[[package]]
name = "arbitrary"
@@ -151,9 +160,9 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
[[package]]
name = "arrayref"
-version = "0.3.8"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
[[package]]
name = "arrayvec"
@@ -201,15 +210,29 @@ dependencies = [
]
[[package]]
-name = "async-executor"
-version = "1.13.0"
+name = "async-compression"
+version = "0.4.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
+checksum = "0cb8f1d480b0ea3783ab015936d2a55c87e219676f0c0b7dec61494043f21857"
+dependencies = [
+ "brotli",
+ "flate2",
+ "futures-core",
+ "memchr",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec"
dependencies = [
"async-task",
"concurrent-queue",
- "fastrand 2.1.1",
- "futures-lite 2.3.0",
+ "fastrand",
+ "futures-lite",
"slab",
]
@@ -221,47 +244,27 @@ checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
dependencies = [
"async-channel 2.3.1",
"async-executor",
- "async-io 2.3.4",
- "async-lock 3.4.0",
+ "async-io",
+ "async-lock",
"blocking",
- "futures-lite 2.3.0",
+ "futures-lite",
"once_cell",
]
-[[package]]
-name = "async-io"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
-dependencies = [
- "async-lock 2.8.0",
- "autocfg",
- "cfg-if",
- "concurrent-queue",
- "futures-lite 1.13.0",
- "log",
- "parking",
- "polling 2.8.0",
- "rustix 0.37.27",
- "slab",
- "socket2 0.4.10",
- "waker-fn",
-]
-
[[package]]
name = "async-io"
version = "2.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8"
dependencies = [
- "async-lock 3.4.0",
+ "async-lock",
"cfg-if",
"concurrent-queue",
"futures-io",
- "futures-lite 2.3.0",
+ "futures-lite",
"parking",
- "polling 3.7.3",
- "rustix 0.38.36",
+ "polling",
+ "rustix",
"slab",
"tracing",
"windows-sys 0.59.0",
@@ -276,15 +279,6 @@ dependencies = [
"async-std",
]
-[[package]]
-name = "async-lock"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
-dependencies = [
- "event-listener 2.5.3",
-]
-
[[package]]
name = "async-lock"
version = "3.4.0"
@@ -298,19 +292,19 @@ dependencies = [
[[package]]
name = "async-std"
-version = "1.12.0"
+version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
+checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615"
dependencies = [
"async-channel 1.9.0",
"async-global-executor",
- "async-io 1.13.0",
- "async-lock 2.8.0",
+ "async-io",
+ "async-lock",
"crossbeam-utils",
"futures-channel",
"futures-core",
"futures-io",
- "futures-lite 1.13.0",
+ "futures-lite",
"gloo-timers",
"kv-log-macro",
"log",
@@ -330,13 +324,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
[[package]]
name = "async-trait"
-version = "0.1.82"
+version = "0.1.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.82",
]
[[package]]
@@ -358,23 +352,23 @@ dependencies = [
[[package]]
name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
dependencies = [
"addr2line",
- "cc",
"cfg-if",
"libc",
- "miniz_oxide 0.7.4",
+ "miniz_oxide",
"object",
"rustc-demangle",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -481,10 +475,31 @@ dependencies = [
"async-channel 2.3.1",
"async-task",
"futures-io",
- "futures-lite 2.3.0",
+ "futures-lite",
"piper",
]
+[[package]]
+name = "brotli"
+version = "7.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+ "brotli-decompressor",
+]
+
+[[package]]
+name = "brotli-decompressor"
+version = "4.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+]
+
[[package]]
name = "bstr"
version = "1.10.0"
@@ -510,9 +525,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
-version = "1.7.1"
+version = "1.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
[[package]]
name = "bzip2"
@@ -537,9 +552,9 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.1.16"
+version = "1.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b"
+checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
dependencies = [
"jobserver",
"libc",
@@ -585,9 +600,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.5.17"
+version = "4.5.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
dependencies = [
"clap_builder",
"clap_derive",
@@ -595,9 +610,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.17"
+version = "4.5.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
dependencies = [
"anstream",
"anstyle",
@@ -608,23 +623,23 @@ dependencies = [
[[package]]
name = "clap_complete"
-version = "4.5.26"
+version = "4.5.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "205d5ef6d485fa47606b98b0ddc4ead26eb850aaa86abfb562a94fb3280ecba0"
+checksum = "9646e2e245bf62f45d39a0f3f36f1171ad1ea0d6967fd114bca72cb02a8fcdfb"
dependencies = [
"clap",
]
[[package]]
name = "clap_derive"
-version = "4.5.13"
+version = "4.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.82",
]
[[package]]
@@ -682,7 +697,7 @@ dependencies = [
"nom",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.82",
]
[[package]]
@@ -916,7 +931,7 @@ dependencies = [
"crossterm_winapi",
"mio 1.0.2",
"parking_lot 0.12.3",
- "rustix 0.38.36",
+ "rustix",
"signal-hook",
"signal-hook-mio",
"winapi",
@@ -953,9 +968,9 @@ dependencies = [
[[package]]
name = "dary_heap"
-version = "0.3.6"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca"
+checksum = "04d2cd9c18b9f454ed67da600630b021a8a80bf33f8c95896ab33aaf1c26b728"
[[package]]
name = "deflate64"
@@ -980,7 +995,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.82",
]
[[package]]
@@ -1056,7 +1071,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.82",
]
[[package]]
@@ -1079,7 +1094,7 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
[[package]]
name = "edgedb-cli"
-version = "5.4.1"
+version = "5.5.2"
dependencies = [
"ansi-escapes",
"anyhow",
@@ -1132,7 +1147,6 @@ dependencies = [
"libflate",
"log",
"minimad",
- "native-tls",
"nix 0.29.0",
"nom",
"notify",
@@ -1140,6 +1154,7 @@ dependencies = [
"once_cell",
"open",
"openssl",
+ "openssl-sys",
"os-release",
"pem",
"predicates",
@@ -1154,7 +1169,7 @@ dependencies = [
"rexpect",
"ring",
"rpassword",
- "rustls 0.23.12",
+ "rustls 0.23.15",
"rustyline",
"scram",
"semver",
@@ -1210,7 +1225,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.82",
"termimad",
"trybuild",
]
@@ -1218,18 +1233,18 @@ dependencies = [
[[package]]
name = "edgedb-derive"
version = "0.5.2"
-source = "git+https://github.com/edgedb/edgedb-rust/#42c94da5b286d40195a02be55dda679d12115d47"
+source = "git+https://github.com/edgedb/edgedb-rust/#479e57085f600b54a7f61c11c3d578e545bac7db"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.82",
"trybuild",
]
[[package]]
name = "edgedb-errors"
version = "0.4.2"
-source = "git+https://github.com/edgedb/edgedb-rust/#42c94da5b286d40195a02be55dda679d12115d47"
+source = "git+https://github.com/edgedb/edgedb-rust/#479e57085f600b54a7f61c11c3d578e545bac7db"
dependencies = [
"bytes",
]
@@ -1237,7 +1252,7 @@ dependencies = [
[[package]]
name = "edgedb-protocol"
version = "0.6.1"
-source = "git+https://github.com/edgedb/edgedb-rust/#42c94da5b286d40195a02be55dda679d12115d47"
+source = "git+https://github.com/edgedb/edgedb-rust/#479e57085f600b54a7f61c11c3d578e545bac7db"
dependencies = [
"bigdecimal",
"bitflags 2.6.0",
@@ -1246,6 +1261,8 @@ dependencies = [
"edgedb-errors",
"num-bigint",
"num-traits",
+ "serde",
+ "serde_json",
"snafu",
"uuid",
]
@@ -1253,7 +1270,7 @@ dependencies = [
[[package]]
name = "edgedb-tokio"
version = "0.5.1"
-source = "git+https://github.com/edgedb/edgedb-rust/#42c94da5b286d40195a02be55dda679d12115d47"
+source = "git+https://github.com/edgedb/edgedb-rust/#479e57085f600b54a7f61c11c3d578e545bac7db"
dependencies = [
"anyhow",
"arc-swap",
@@ -1269,15 +1286,15 @@ dependencies = [
"log",
"once_cell",
"rand",
- "rustls 0.23.12",
- "rustls-native-certs",
+ "rustls 0.23.15",
+ "rustls-native-certs 0.7.3",
"rustls-pemfile",
"rustls-webpki",
"scram-2",
"serde",
"serde_json",
"sha1",
- "socket2 0.5.7",
+ "socket2",
"tls-api-2",
"tls-api-not-tls-2",
"tls-api-rustls-2",
@@ -1290,7 +1307,7 @@ dependencies = [
[[package]]
name = "edgeql-parser"
version = "0.1.0"
-source = "git+https://github.com/edgedb/edgedb#9f0195ea2d1b568abf6e56e462734614e1c17419"
+source = "git+https://github.com/edgedb/edgedb#2390bc3869dd29b5a6b5e7e85c346cd1848b46a1"
dependencies = [
"append-only-vec",
"base32",
@@ -1381,9 +1398,9 @@ dependencies = [
[[package]]
name = "error-code"
-version = "3.2.0"
+version = "3.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b"
+checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f"
[[package]]
name = "event-listener"
@@ -1412,15 +1429,6 @@ dependencies = [
"pin-project-lite",
]
-[[package]]
-name = "fastrand"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
-
[[package]]
name = "fastrand"
version = "2.1.1"
@@ -1434,7 +1442,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947"
dependencies = [
"cfg-if",
- "rustix 0.38.36",
+ "rustix",
"windows-sys 0.52.0",
]
@@ -1452,12 +1460,12 @@ dependencies = [
[[package]]
name = "flate2"
-version = "1.0.33"
+version = "1.0.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
+checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
dependencies = [
"crc32fast",
- "miniz_oxide 0.8.0",
+ "miniz_oxide",
]
[[package]]
@@ -1477,7 +1485,7 @@ checksum = "2cd66269887534af4b0c3e3337404591daa8dc8b9b2b3db71f9523beb4bafb41"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.82",
]
[[package]]
@@ -1542,9 +1550,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
[[package]]
name = "futures"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
dependencies = [
"futures-channel",
"futures-core",
@@ -1557,9 +1565,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
dependencies = [
"futures-core",
"futures-sink",
@@ -1567,15 +1575,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
[[package]]
name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
dependencies = [
"futures-core",
"futures-task",
@@ -1584,24 +1592,9 @@ dependencies = [
[[package]]
name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
-
-[[package]]
-name = "futures-lite"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
-dependencies = [
- "fastrand 1.9.0",
- "futures-core",
- "futures-io",
- "memchr",
- "parking",
- "pin-project-lite",
- "waker-fn",
-]
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
[[package]]
name = "futures-lite"
@@ -1609,7 +1602,7 @@ version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
dependencies = [
- "fastrand 2.1.1",
+ "fastrand",
"futures-core",
"futures-io",
"parking",
@@ -1618,32 +1611,32 @@ dependencies = [
[[package]]
name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.82",
]
[[package]]
name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
[[package]]
name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
[[package]]
name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
dependencies = [
"futures-channel",
"futures-core",
@@ -1673,7 +1666,7 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc3655aa6818d65bc620d6911f05aa7b6aeb596291e1e9f79e52df85583d1e30"
dependencies = [
- "rustix 0.38.36",
+ "rustix",
"windows-targets 0.52.6",
]
@@ -1692,9 +1685,9 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
[[package]]
name = "glob"
@@ -1704,9 +1697,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "gloo-timers"
-version = "0.2.6"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
+checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
dependencies = [
"futures-channel",
"futures-core",
@@ -1762,6 +1755,12 @@ dependencies = [
"allocator-api2",
]
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
[[package]]
name = "headers"
version = "0.3.9"
@@ -1898,9 +1897,9 @@ dependencies = [
[[package]]
name = "httparse"
-version = "1.9.4"
+version = "1.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
[[package]]
name = "httpdate"
@@ -1926,9 +1925,9 @@ dependencies = [
[[package]]
name = "hyper"
-version = "0.14.30"
+version = "0.14.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
+checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85"
dependencies = [
"bytes",
"futures-channel",
@@ -1941,7 +1940,7 @@ dependencies = [
"httpdate",
"itoa",
"pin-project-lite",
- "socket2 0.5.7",
+ "socket2",
"tokio",
"tower-service",
"tracing",
@@ -1950,9 +1949,9 @@ dependencies = [
[[package]]
name = "hyper"
-version = "1.4.1"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a"
dependencies = [
"bytes",
"futures-channel",
@@ -1976,47 +1975,31 @@ checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
dependencies = [
"futures-util",
"http 1.1.0",
- "hyper 1.4.1",
+ "hyper 1.5.0",
"hyper-util",
- "rustls 0.23.12",
+ "rustls 0.23.15",
+ "rustls-native-certs 0.8.0",
"rustls-pki-types",
"tokio",
"tokio-rustls 0.26.0",
"tower-service",
]
-[[package]]
-name = "hyper-tls"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
-dependencies = [
- "bytes",
- "http-body-util",
- "hyper 1.4.1",
- "hyper-util",
- "native-tls",
- "tokio",
- "tokio-native-tls",
- "tower-service",
-]
-
[[package]]
name = "hyper-util"
-version = "0.1.7"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
dependencies = [
"bytes",
"futures-channel",
"futures-util",
"http 1.1.0",
"http-body 1.0.1",
- "hyper 1.4.1",
+ "hyper 1.5.0",
"pin-project-lite",
- "socket2 0.5.7",
+ "socket2",
"tokio",
- "tower",
"tower-service",
"tracing",
]
@@ -2042,12 +2025,12 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "2.5.0"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
dependencies = [
"equivalent",
- "hashbrown",
+ "hashbrown 0.15.0",
"serde",
]
@@ -2105,22 +2088,11 @@ dependencies = [
"web-sys",
]
-[[package]]
-name = "io-lifetimes"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
-dependencies = [
- "hermit-abi 0.3.9",
- "libc",
- "windows-sys 0.48.0",
-]
-
[[package]]
name = "ipnet"
-version = "2.9.0"
+version = "2.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
[[package]]
name = "is-docker"
@@ -2175,9 +2147,9 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.70"
+version = "0.3.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
dependencies = [
"wasm-bindgen",
]
@@ -2231,7 +2203,7 @@ dependencies = [
"proc-macro2",
"quote",
"regex",
- "syn 2.0.77",
+ "syn 2.0.82",
]
[[package]]
@@ -2242,9 +2214,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "libc"
-version = "0.2.158"
+version = "0.2.161"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
[[package]]
name = "libflate"
@@ -2266,7 +2238,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6e0d73b369f386f1c44abd9c570d5318f55ccde816ff4b562fa452e5182863d"
dependencies = [
"core2",
- "hashbrown",
+ "hashbrown 0.14.5",
"rle-decode-fast",
]
@@ -2284,15 +2256,9 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
dependencies = [
"bitflags 2.6.0",
"libc",
- "redox_syscall 0.5.3",
+ "redox_syscall 0.5.7",
]
-[[package]]
-name = "linux-raw-sys"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
-
[[package]]
name = "linux-raw-sys"
version = "0.4.14"
@@ -2386,15 +2352,6 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
-]
-
[[package]]
name = "miniz_oxide"
version = "0.8.0"
@@ -2429,23 +2386,6 @@ dependencies = [
"windows-sys 0.52.0",
]
-[[package]]
-name = "native-tls"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
-dependencies = [
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
[[package]]
name = "nibble_vec"
version = "0.1.0"
@@ -2581,18 +2521,18 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
[[package]]
name = "object"
-version = "0.36.4"
+version = "0.36.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
dependencies = [
"memchr",
]
[[package]]
name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
[[package]]
name = "open"
@@ -2607,9 +2547,9 @@ dependencies = [
[[package]]
name = "openssl"
-version = "0.10.66"
+version = "0.10.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
dependencies = [
"bitflags 2.6.0",
"cfg-if",
@@ -2628,7 +2568,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.82",
]
[[package]]
@@ -2648,9 +2588,9 @@ dependencies = [
[[package]]
name = "openssl-sys"
-version = "0.9.103"
+version = "0.9.104"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
dependencies = [
"cc",
"libc",
@@ -2676,9 +2616,9 @@ dependencies = [
[[package]]
name = "parking"
-version = "2.2.0"
+version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
[[package]]
name = "parking_lot"
@@ -2723,16 +2663,16 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall 0.5.3",
+ "redox_syscall 0.5.7",
"smallvec",
"windows-targets 0.52.6",
]
[[package]]
name = "pathdiff"
-version = "0.2.1"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
+checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361"
[[package]]
name = "pbkdf2"
@@ -2790,7 +2730,7 @@ dependencies = [
"phf_shared",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.82",
]
[[package]]
@@ -2804,22 +2744,22 @@ dependencies = [
[[package]]
name = "pin-project"
-version = "1.1.5"
+version = "1.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.82",
]
[[package]]
@@ -2841,31 +2781,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
dependencies = [
"atomic-waker",
- "fastrand 2.1.1",
+ "fastrand",
"futures-io",
]
[[package]]
name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
-
-[[package]]
-name = "polling"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
-dependencies = [
- "autocfg",
- "bitflags 1.3.2",
- "cfg-if",
- "concurrent-queue",
- "libc",
- "log",
- "pin-project-lite",
- "windows-sys 0.48.0",
-]
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
[[package]]
name = "polling"
@@ -2877,16 +2801,16 @@ dependencies = [
"concurrent-queue",
"hermit-abi 0.4.0",
"pin-project-lite",
- "rustix 0.38.36",
+ "rustix",
"tracing",
"windows-sys 0.59.0",
]
[[package]]
name = "portable-atomic"
-version = "1.7.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
[[package]]
name = "powerfmt"
@@ -2935,9 +2859,9 @@ dependencies = [
[[package]]
name = "pretty_assertions"
-version = "1.4.0"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
+checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
dependencies = [
"diff",
"yansi",
@@ -2987,13 +2911,61 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.88"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
dependencies = [
"unicode-ident",
]
+[[package]]
+name = "quinn"
+version = "0.11.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684"
+dependencies = [
+ "bytes",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash",
+ "rustls 0.23.15",
+ "socket2",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6"
+dependencies = [
+ "bytes",
+ "rand",
+ "ring",
+ "rustc-hash",
+ "rustls 0.23.15",
+ "slab",
+ "thiserror",
+ "tinyvec",
+ "tracing",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b"
+dependencies = [
+ "libc",
+ "once_cell",
+ "socket2",
+ "tracing",
+ "windows-sys 0.59.0",
+]
+
[[package]]
name = "quote"
version = "1.0.37"
@@ -3060,9 +3032,9 @@ dependencies = [
[[package]]
name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
dependencies = [
"bitflags 2.6.0",
]
@@ -3080,9 +3052,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.10.6"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
dependencies = [
"aho-corasick",
"memchr",
@@ -3092,9 +3064,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
dependencies = [
"aho-corasick",
"memchr",
@@ -3103,9 +3075,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "renamore"
@@ -3119,10 +3091,11 @@ dependencies = [
[[package]]
name = "reqwest"
-version = "0.12.7"
+version = "0.12.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
+checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b"
dependencies = [
+ "async-compression",
"base64 0.22.1",
"bytes",
"encoding_rs",
@@ -3132,26 +3105,28 @@ dependencies = [
"http 1.1.0",
"http-body 1.0.1",
"http-body-util",
- "hyper 1.4.1",
+ "hyper 1.5.0",
"hyper-rustls",
- "hyper-tls",
"hyper-util",
"ipnet",
"js-sys",
"log",
"mime",
- "native-tls",
"once_cell",
"percent-encoding",
"pin-project-lite",
+ "quinn",
+ "rustls 0.23.15",
+ "rustls-native-certs 0.8.0",
"rustls-pemfile",
+ "rustls-pki-types",
"serde",
"serde_json",
"serde_urlencoded",
"sync_wrapper",
- "system-configuration",
"tokio",
- "tokio-native-tls",
+ "tokio-rustls 0.26.0",
+ "tokio-util",
"tower-service",
"url",
"wasm-bindgen",
@@ -3186,7 +3161,7 @@ dependencies = [
"futures",
"getrandom",
"http 1.1.0",
- "hyper 1.4.1",
+ "hyper 1.5.0",
"parking_lot 0.11.2",
"reqwest",
"reqwest-middleware",
@@ -3266,29 +3241,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
[[package]]
-name = "rustix"
-version = "0.37.27"
+name = "rustc-hash"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
-dependencies = [
- "bitflags 1.3.2",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys 0.3.8",
- "windows-sys 0.48.0",
-]
+checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
[[package]]
name = "rustix"
-version = "0.38.36"
+version = "0.38.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
dependencies = [
"bitflags 2.6.0",
"errno",
"libc",
- "linux-raw-sys 0.4.14",
+ "linux-raw-sys",
"windows-sys 0.52.0",
]
@@ -3308,9 +3275,9 @@ dependencies = [
[[package]]
name = "rustls"
-version = "0.23.12"
+version = "0.23.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993"
dependencies = [
"once_cell",
"ring",
@@ -3334,26 +3301,38 @@ dependencies = [
]
[[package]]
-name = "rustls-pemfile"
-version = "2.1.3"
+name = "rustls-native-certs"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a"
+dependencies = [
+ "openssl-probe",
+ "rustls-pemfile",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
dependencies = [
- "base64 0.22.1",
"rustls-pki-types",
]
[[package]]
name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
[[package]]
name = "rustls-webpki"
-version = "0.102.7"
+version = "0.102.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
dependencies = [
"ring",
"rustls-pki-types",
@@ -3362,9 +3341,9 @@ dependencies = [
[[package]]
name = "rustversion"
-version = "1.0.17"
+version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
[[package]]
name = "rustyline"
@@ -3405,11 +3384,11 @@ dependencies = [
[[package]]
name = "schannel"
-version = "0.1.23"
+version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -3460,9 +3439,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
-version = "2.11.1"
+version = "2.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
dependencies = [
"core-foundation-sys",
"libc",
@@ -3479,29 +3458,29 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.209"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.209"
+version = "1.0.210"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.82",
]
[[package]]
name = "serde_json"
-version = "1.0.128"
+version = "1.0.132"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
dependencies = [
"indexmap",
"itoa",
@@ -3531,9 +3510,9 @@ dependencies = [
[[package]]
name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
dependencies = [
"serde",
]
@@ -3677,33 +3656,23 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
[[package]]
name = "snafu"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b835cb902660db3415a672d862905e791e54d306c6e8189168c7f3d9ae1c79d"
+checksum = "223891c85e2a29c3fe8fb900c1fae5e69c2e42415e3177752e8718475efa5019"
dependencies = [
"snafu-derive",
]
[[package]]
name = "snafu-derive"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d1e02fca405f6280643174a50c942219f0bbf4dbf7d480f1dd864d6f211ae5"
+checksum = "03c3c6b7927ffe7ecaa769ee0e3994da3b8cafc8f444578982c83ecb161af917"
dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "socket2"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
-dependencies = [
- "libc",
- "winapi",
+ "syn 2.0.82",
]
[[package]]
@@ -3753,9 +3722,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.77"
+version = "2.0.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021"
dependencies = [
"proc-macro2",
"quote",
@@ -3771,27 +3740,6 @@ dependencies = [
"futures-core",
]
-[[package]]
-name = "system-configuration"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
-dependencies = [
- "bitflags 2.6.0",
- "core-foundation",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
[[package]]
name = "tap"
version = "1.0.1"
@@ -3800,9 +3748,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
[[package]]
name = "tar"
-version = "0.4.41"
+version = "0.4.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909"
+checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020"
dependencies = [
"filetime",
"libc",
@@ -3810,15 +3758,21 @@ dependencies = [
]
[[package]]
-name = "tempfile"
-version = "3.12.0"
+name = "target-triple"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "42a4d50cdb458045afc8131fd91b64904da29548bcb63c7236e0844936c13078"
+
+[[package]]
+name = "tempfile"
+version = "3.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
dependencies = [
"cfg-if",
- "fastrand 2.1.1",
+ "fastrand",
"once_cell",
- "rustix 0.38.36",
+ "rustix",
"windows-sys 0.59.0",
]
@@ -3854,9 +3808,9 @@ dependencies = [
[[package]]
name = "termimad"
-version = "0.30.0"
+version = "0.30.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "920e7c4671e79f3d9df269da9c8edf0dbc580044fd727d3594f7bfba5eb6107a"
+checksum = "22117210909e9dfff30a558f554c7fb3edb198ef614e7691386785fb7679677c"
dependencies = [
"coolor",
"crokey",
@@ -3870,12 +3824,12 @@ dependencies = [
[[package]]
name = "terminal_size"
-version = "0.3.0"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
+checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef"
dependencies = [
- "rustix 0.38.36",
- "windows-sys 0.48.0",
+ "rustix",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -3902,7 +3856,7 @@ dependencies = [
"cfg-if",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.82",
]
[[package]]
@@ -3913,7 +3867,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.82",
"test-case-core",
]
@@ -3956,22 +3910,22 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.63"
+version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.82",
]
[[package]]
@@ -4041,7 +3995,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "acb91e1438413f83f63652934fb5413a6c2132db4a9e14bdca6fa8d2dda8f1b3"
dependencies = [
"anyhow",
- "rustls 0.23.12",
+ "rustls 0.23.15",
"thiserror",
"tls-api-2",
"tls-api-test-2",
@@ -4078,7 +4032,7 @@ dependencies = [
"mio 1.0.2",
"pin-project-lite",
"signal-hook-registry",
- "socket2 0.5.7",
+ "socket2",
"tokio-macros",
"windows-sys 0.52.0",
]
@@ -4091,17 +4045,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
-]
-
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
+ "syn 2.0.82",
]
[[package]]
@@ -4121,7 +4065,7 @@ version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
dependencies = [
- "rustls 0.23.12",
+ "rustls 0.23.15",
"rustls-pki-types",
"tokio",
]
@@ -4173,9 +4117,9 @@ dependencies = [
[[package]]
name = "toml_edit"
-version = "0.22.20"
+version = "0.22.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
dependencies = [
"indexmap",
"serde",
@@ -4184,27 +4128,6 @@ dependencies = [
"winnow",
]
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tokio",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
-
[[package]]
name = "tower-service"
version = "0.3.3"
@@ -4231,7 +4154,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.82",
]
[[package]]
@@ -4251,14 +4174,15 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]]
name = "trybuild"
-version = "1.0.99"
+version = "1.0.101"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "207aa50d36c4be8d8c6ea829478be44a372c6a77669937bb39c698e52f1491e8"
+checksum = "8dcd332a5496c026f1e14b7f3d2b7bd98e509660c04239c58b0ba38a12daded4"
dependencies = [
"glob",
"serde",
"serde_derive",
"serde_json",
+ "target-triple",
"termcolor",
"toml",
]
@@ -4271,24 +4195,21 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
[[package]]
name = "unicase"
-version = "2.7.0"
+version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check",
-]
+checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
[[package]]
name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
[[package]]
name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
[[package]]
name = "unicode-linebreak"
@@ -4298,24 +4219,24 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
[[package]]
name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
dependencies = [
"tinyvec",
]
[[package]]
name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
[[package]]
name = "unicode-width"
-version = "0.1.13"
+version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
[[package]]
name = "untrusted"
@@ -4349,9 +4270,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "uuid"
-version = "1.10.0"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
dependencies = [
"getrandom",
"rand",
@@ -4385,12 +4306,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "waker-fn"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
-
[[package]]
name = "walkdir"
version = "2.5.0"
@@ -4420,7 +4335,7 @@ dependencies = [
"futures-util",
"headers",
"http 0.2.12",
- "hyper 0.14.30",
+ "hyper 0.14.31",
"log",
"mime",
"mime_guess",
@@ -4452,9 +4367,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
[[package]]
name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
dependencies = [
"cfg-if",
"once_cell",
@@ -4463,24 +4378,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.82",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
dependencies = [
"cfg-if",
"js-sys",
@@ -4490,9 +4405,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -4500,22 +4415,22 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.82",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
[[package]]
name = "wasm-timer"
@@ -4556,9 +4471,9 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.70"
+version = "0.3.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -4576,9 +4491,9 @@ dependencies = [
[[package]]
name = "webpki-roots"
-version = "0.26.5"
+version = "0.26.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
dependencies = [
"rustls-pki-types",
]
@@ -4591,7 +4506,7 @@ checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f"
dependencies = [
"either",
"home",
- "rustix 0.38.36",
+ "rustix",
"winsafe",
]
@@ -4601,7 +4516,7 @@ version = "1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
dependencies = [
- "redox_syscall 0.5.3",
+ "redox_syscall 0.5.7",
"wasite",
"web-sys",
]
@@ -4817,9 +4732,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winnow"
-version = "0.6.18"
+version = "0.6.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
dependencies = [
"memchr",
]
@@ -4867,15 +4782,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
dependencies = [
"libc",
- "linux-raw-sys 0.4.14",
- "rustix 0.38.36",
+ "linux-raw-sys",
+ "rustix",
]
[[package]]
name = "yansi"
-version = "0.5.1"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
[[package]]
name = "zerocopy"
@@ -4895,7 +4810,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.82",
]
[[package]]
@@ -4915,7 +4830,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.77",
+ "syn 2.0.82",
]
[[package]]
diff --git a/pkgs/tools/networking/edgedb/default.nix b/pkgs/tools/networking/edgedb/default.nix
index 00f444d922fd..08a129090b28 100644
--- a/pkgs/tools/networking/edgedb/default.nix
+++ b/pkgs/tools/networking/edgedb/default.nix
@@ -19,24 +19,24 @@
}:
rustPlatform.buildRustPackage rec {
pname = "edgedb";
- version = "5.4.1";
+ version = "5.5.2";
src = fetchFromGitHub {
owner = "edgedb";
repo = "edgedb-cli";
rev = "refs/tags/v${version}";
- hash = "sha256-qythVPcNijYmdH/IvyoYZIB8WfYiB8ByYLz+VuWGRAM=";
+ hash = "sha256-CSs1Ql0zsGgSmZrlZIfj2pJdtAax7HUlfCq8oTbReng=";
fetchSubmodules = true;
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
- "edgedb-derive-0.5.2" = "sha256-mKgJ0Jge/eZHCT89BEOR4/Pzbu63UUoeHSp7w9GgANs=";
- "edgeql-parser-0.1.0" = "sha256-v3B7aKEVWweTXxdl6GfutdqHGw+qkI6OPZw7OBPVn0w=";
+ "edgedb-derive-0.5.2" = "sha256-5nvpkmTRcGO4a/Mc+qLp2+u9bWSnHQ/1NT2FW9ii0AU=";
+ "edgeql-parser-0.1.0" = "sha256-dhLwBW4ellai9R9TjlJ/qEhZQRXE9D/+QxZsq3I9PRk=";
"rexpect-0.5.0" = "sha256-vstAL/fJWWx7WbmRxNItKpzvgGF3SvJDs5isq9ym/OA=";
- "serde_str-1.0.0" = "sha256-CMBh5lxdQb2085y0jc/DrV6B8iiXvVO2aoZH/lFFjak=";
"scram-0.7.0" = "sha256-QTPxyXBpMXCDkRRJEMYly1GKp90khrwwuMI1eHc2H+Y=";
+ "serde_str-1.0.0" = "sha256-CMBh5lxdQb2085y0jc/DrV6B8iiXvVO2aoZH/lFFjak=";
"test-utils-0.1.0" = "sha256-FoF/U89Q9E2Dlmpoh+cfDcScmhcsSNut+rE7BECJSJI=";
"warp-0.3.6" = "sha256-knDt2aw/PJ0iabhKg+okwwnEzCY+vQVhE7HKCTM6QbE=";
};
@@ -82,15 +82,15 @@ rustPlatform.buildRustPackage rec {
command = "edgedb --version";
};
- meta = with lib; {
+ meta = {
description = "EdgeDB cli";
homepage = "https://www.edgedb.com/docs/cli/index";
- license = with licenses; [
+ license = with lib.licenses; [
asl20
# or
mit
];
- maintainers = with maintainers; [
+ maintainers = with lib.maintainers; [
ahirner
kirillrdy
];
diff --git a/pkgs/tools/networking/gvproxy/default.nix b/pkgs/tools/networking/gvproxy/default.nix
index 742c24659db6..5520ee7a05ca 100644
--- a/pkgs/tools/networking/gvproxy/default.nix
+++ b/pkgs/tools/networking/gvproxy/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gvproxy";
- version = "0.7.5";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "containers";
repo = "gvisor-tap-vsock";
rev = "v${version}";
- hash = "sha256-A2nG3Or5EhUSjTIpV05rWVcLJpGHtAWP5/n07KjM/E8=";
+ hash = "sha256-lRQqwbhSIvoPcoOesdTumVcrjWVdOGZU1XiSBaGyke8=";
};
vendorHash = null;
diff --git a/pkgs/tools/networking/hblock/default.nix b/pkgs/tools/networking/hblock/default.nix
index 0aa3a75208e4..329dadedbad2 100644
--- a/pkgs/tools/networking/hblock/default.nix
+++ b/pkgs/tools/networking/hblock/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "hblock";
- version = "3.4.5";
+ version = "3.5.0";
src = fetchFromGitHub {
owner = "hectorm";
repo = "hblock";
rev = "v${version}";
- hash = "sha256-HPQ3SKaQlPEEgWjDCs6tCxi6+3pz1gIqDhHMsPT1hVg=";
+ hash = "sha256-XnBmKOZBHWyjNlv+L24LYns05oGTOJnNNzM0jCwZMuI=";
};
buildInputs = [ coreutils curl gnugrep gawk ];
diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 2504ca0ff14a..260ce8a79b14 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -3,7 +3,6 @@
, boost, zlib, openssl
, upnpSupport ? true, miniupnpc
, aesniSupport ? stdenv.hostPlatform.aesSupport
-, avxSupport ? stdenv.hostPlatform.avxSupport
}:
stdenv.mkDerivation rec {
@@ -27,7 +26,6 @@ stdenv.mkDerivation rec {
makeFlags =
let ynf = a: b: a + "=" + (if b then "yes" else "no"); in
[ (ynf "USE_AESNI" aesniSupport)
- (ynf "USE_AVX" avxSupport)
(ynf "USE_UPNP" upnpSupport)
];
@@ -46,5 +44,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ edwtjo ];
platforms = platforms.unix;
mainProgram = "i2pd";
+ broken = stdenv.hostPlatform.isDarwin;
};
}
diff --git a/pkgs/tools/networking/moodle-dl/default.nix b/pkgs/tools/networking/moodle-dl/default.nix
index d0a70efec716..132b9bcedd78 100644
--- a/pkgs/tools/networking/moodle-dl/default.nix
+++ b/pkgs/tools/networking/moodle-dl/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
pname = "moodle-dl";
- version = "2.3.11";
+ version = "2.3.12";
src = fetchFromGitHub {
owner = "C0D3D3V";
repo = "Moodle-DL";
rev = "refs/tags/${version}";
- hash = "sha256-Rts7J4MdMo1TqUOYF1MDjwCIP66gHzxw/szIYcKZYrg=";
+ hash = "sha256-gf8s0+WhPQwLhS4eg3wzcDPvmhrNEgDx5yiBadpf4kI=";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index f58851df6a4b..b698978b2fd0 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -17,7 +17,7 @@
stdenv.mkDerivation rec {
pname = "mu";
- version = "1.12.6";
+ version = "1.12.7";
outputs = [ "out" "mu4e" ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
owner = "djcb";
repo = "mu";
rev = "v${version}";
- hash = "sha256-/aWKhqDWkdOGuLViBkzqQ3WdULaEdcPnWTSthQZ8j4s=";
+ hash = "sha256-FhmxF+ID8w1aVRKQ3gg5aY/dYWiGlO0TC9SDak7uzGI=";
};
postPatch = ''
diff --git a/pkgs/tools/networking/networkmanager/dmenu/default.nix b/pkgs/tools/networking/networkmanager/dmenu/default.nix
index 78a0414807e2..a2724ed73c27 100644
--- a/pkgs/tools/networking/networkmanager/dmenu/default.nix
+++ b/pkgs/tools/networking/networkmanager/dmenu/default.nix
@@ -4,13 +4,13 @@
let inherit (python3Packages) python pygobject3;
in stdenv.mkDerivation rec {
pname = "networkmanager_dmenu";
- version = "2.4.0";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "firecat53";
repo = "networkmanager-dmenu";
rev = "v${version}";
- sha256 = "sha256-ibZgXpHC3ueshN1BQkAaN/tW3+qulyufI3VOnxPwi7Q=";
+ sha256 = "sha256-aw6TwRtlb9x/JOuJqPZTZB2+srlnteEOmYiOPS1tAbM=";
};
nativeBuildInputs = [ gobject-introspection ];
diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix
index b2317ef44c2f..a0b69e54c6d0 100644
--- a/pkgs/tools/networking/obfs4/default.nix
+++ b/pkgs/tools/networking/obfs4/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "obfs4";
- version = "0.1.0";
+ version = "0.4.0";
src = fetchFromGitLab {
domain = "gitlab.torproject.org";
@@ -12,18 +12,20 @@ buildGoModule rec {
# will collide with lyrebird Gtk3 program.
repo = "lyrebird";
rev = "lyrebird-${version}";
- hash = "sha256-2qBSmAsaR3hfxuoR5U5UAFQAepUOEUnIGoxc/GZ5LmY=";
+ hash = "sha256-aPALWvngC/BVQO73yUAykHvEb6T0DZcGMowXINDqhpQ=";
};
- vendorHash = "sha256-O8CsvpwL9cfipl4M0BquSnG9tBrt/+i+i80OYk2mNiI=";
+ vendorHash = "sha256-iR3+ZMEF0SB3EoLTf2gtqTe3CQcjtDRhfwwbwGj3pXo=";
ldflags = [ "-s" "-w" ];
+ subPackages = [ "cmd/lyrebird" ];
+
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
- installManPage doc/obfs4proxy.1
- ln -s $out/share/man/man1/{obfs4proxy,lyrebird}.1
+ installManPage doc/lyrebird.1
+ ln -s $out/share/man/man1/{lyrebird,obfs4proxy}.1
'';
meta = with lib; {
diff --git a/pkgs/tools/networking/octodns/default.nix b/pkgs/tools/networking/octodns/default.nix
index 42c8acf5618e..da33abb56736 100644
--- a/pkgs/tools/networking/octodns/default.nix
+++ b/pkgs/tools/networking/octodns/default.nix
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "octodns";
- version = "1.9.1";
+ version = "1.10.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "octodns";
repo = "octodns";
rev = "refs/tags/v${version}";
- hash = "sha256-5EKa5G1rX/BRMMpGd861qTaACa2tBgNrKX52uJPV+N8=";
+ hash = "sha256-L3c4lYt/fgMctJFArc1XlR+hvpz10kcBcYYXajnNQr0=";
};
build-system = [
diff --git a/pkgs/tools/networking/oha/default.nix b/pkgs/tools/networking/oha/default.nix
index efd8fe7534ac..85f02f8c3d42 100644
--- a/pkgs/tools/networking/oha/default.nix
+++ b/pkgs/tools/networking/oha/default.nix
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "oha";
- version = "1.4.6";
+ version = "1.4.7";
src = fetchFromGitHub {
owner = "hatoo";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-SqspsXVFeYNyTm6Pvt8i/W7MAbary7chs+C+ku8z4Eo=";
+ hash = "sha256-9nyQvzxOwBFsh6TzczYZ5Tlu7LyxuFYVECBXL5IX6TY=";
};
- cargoHash = "sha256-ks7n/x3RhjQbITL2hxiFkjxpZ5tcYMUyyfR/T7Kq/uU=";
+ cargoHash = "sha256-EPF/NU6qFTS4K3UWd2c2poshZkACljrxfCHyDahDWxY=";
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
pkg-config
diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix
index b92f770018ac..85347c24418f 100644
--- a/pkgs/tools/networking/openssh/common.nix
+++ b/pkgs/tools/networking/openssh/common.nix
@@ -30,13 +30,17 @@
, libxcrypt
, hostname
, nixosTests
-, withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl
+, withSecurityKey ? !stdenv.hostPlatform.isStatic
+, withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl && withSecurityKey
, withPAM ? stdenv.hostPlatform.isLinux
, dsaKeysSupport ? false
, linkOpenssl ? true
, isNixos ? stdenv.hostPlatform.isLinux
}:
+# FIDO support requires SK support
+assert withFIDO -> withSecurityKey;
+
stdenv.mkDerivation (finalAttrs: {
inherit pname version src;
@@ -103,6 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.withFeature withPAM "pam")
(lib.enableFeature dsaKeysSupport "dsa-keys")
] ++ lib.optional (etcDir != null) "--sysconfdir=${etcDir}"
+ ++ lib.optional (!withSecurityKey) "--disable-security-key"
++ lib.optional withFIDO "--with-security-key-builtin=yes"
++ lib.optional withKerberos (assert krb5 != null; "--with-kerberos5=${lib.getDev krb5}")
++ lib.optional stdenv.hostPlatform.isDarwin "--disable-libutil"
@@ -110,7 +115,9 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optional withLdns "--with-ldns"
++ extraConfigureFlags;
- ${if stdenv.hostPlatform.isStatic then "NIX_LDFLAGS" else null}= [ "-laudit" ] ++ lib.optionals withKerberos [ "-lkeyutils" ];
+ ${if stdenv.hostPlatform.isStatic then "NIX_LDFLAGS" else null} = [ "-laudit" ]
+ ++ lib.optional withKerberos "-lkeyutils"
+ ++ lib.optional withLdns "-lcrypto";
buildFlags = [ "SSH_KEYSIGN=ssh-keysign" ];
diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/tools/networking/ripmime/default.nix
index 70ff2cbe7305..f1bcc58f4dcd 100644
--- a/pkgs/tools/networking/ripmime/default.nix
+++ b/pkgs/tools/networking/ripmime/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, libiconv }:
+{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "ripmime";
@@ -8,13 +8,16 @@ stdenv.mkDerivation rec {
sha256 = "0sj06ibmlzy34n8v0mnlq2gwidy7n2aqcwgjh0xssz3vi941aqc9";
};
- buildInputs = [ libiconv ];
preInstall = ''
sed -i Makefile -e "s@LOCATION=.*@LOCATION=$out@" -e "s@man/man1@share/&@"
mkdir -p "$out/bin" "$out/share/man/man1"
'';
- env.NIX_CFLAGS_COMPILE = " -Wno-error ";
+ env = {
+ NIX_CFLAGS_COMPILE = " -Wno-error ";
+ } // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+ NIX_LDFLAGS = "-liconv";
+ };
meta = with lib; {
description = "Attachment extractor for MIME messages";
diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix
index 18c7ca632d0b..07aec23d206a 100644
--- a/pkgs/tools/networking/shadowsocks-rust/default.nix
+++ b/pkgs/tools/networking/shadowsocks-rust/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "shadowsocks-rust";
- version = "1.21.0";
+ version = "1.21.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "shadowsocks";
repo = pname;
- hash = "sha256-B4RufyxqcKd5FJulKRV+33sos+cYrL2/QPmKEYw3aTU=";
+ hash = "sha256-h18+233lxKNTRCRXUKYA4VzSfJy3ZHgU1KVZn7U36Z4=";
};
- cargoHash = "sha256-2uYLrYFuzvaOZxw2hN4DcrEbwW5rnXxqKoI2q6yZaGU=";
+ cargoHash = "sha256-rcLcbAH9f1xuLhvaZA9akg84o2E8G1CRfaAY0bWYby0=";
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix
index ad39514f0e34..c0b38eec4aab 100644
--- a/pkgs/tools/networking/ssldump/default.nix
+++ b/pkgs/tools/networking/ssldump/default.nix
@@ -1,7 +1,7 @@
{ lib
, stdenv
-, autoreconfHook
, fetchFromGitHub
+, cmake
, json_c
, libnet
, libpcap
@@ -10,17 +10,17 @@
stdenv.mkDerivation rec {
pname = "ssldump";
- version = "1.7";
+ version = "1.8-unstable-2024-10-16";
src = fetchFromGitHub {
owner = "adulau";
repo = "ssldump";
- rev = "v${version}";
- sha256 = "sha256-BFE42wWqnGGTTjwej3LkH4XW2M4jP7XNSKHLnF2GFJo=";
+ rev = "a7534300bb09184fec991b3b4f19a40538b8adea";
+ hash = "sha256-6jmIPkyT5QCqQw07unc6nKTlxpajiLO05IFshWtCh7w=";
};
nativeBuildInputs = [
- autoreconfHook
+ cmake
];
buildInputs = [
@@ -30,18 +30,6 @@ stdenv.mkDerivation rec {
openssl
];
- prePatch = ''
- sed -i -e 's|#include.*net/bpf.h|#include |' \
- base/pcap-snoop.c
- '';
-
- configureFlags = [
- "--with-pcap-lib=${libpcap}/lib"
- "--with-pcap-inc=${libpcap}/include"
- "--with-openssl-lib=${openssl}/lib"
- "--with-openssl-inc=${openssl}/include"
- ];
-
meta = with lib; {
description = "SSLv3/TLS network protocol analyzer";
homepage = "https://ssldump.sourceforge.net";
diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix
index 1b4bb71f4ab5..f973d7fae5c5 100644
--- a/pkgs/tools/networking/subfinder/default.nix
+++ b/pkgs/tools/networking/subfinder/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "subfinder";
- version = "2.6.6";
+ version = "2.6.7";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "subfinder";
rev = "refs/tags/v${version}";
- hash = "sha256-A9qSrgQB7AE+9S3SW1eXRGA65RfEzrjYR2XgU8e+zMk=";
+ hash = "sha256-2IO7TyMcKUB2B9agCoIdjybEjr0RLCv+vhXn9e5eL28=";
};
- vendorHash = "sha256-j2WO+LLvioBB2EU/6ahyTn9H614Dmiskm0p7GOgqYNY=";
+ vendorHash = "sha256-+JOrephdT0k3onbgA3CKLeF8iLWycybwtJxalC0n0Ys=";
modRoot = "./v2";
diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix
index 41767f735c56..1eec3cf0653d 100644
--- a/pkgs/tools/networking/urlwatch/default.nix
+++ b/pkgs/tools/networking/urlwatch/default.nix
@@ -1,32 +1,20 @@
{ lib
, fetchFromGitHub
-, fetchpatch
, python3Packages
}:
python3Packages.buildPythonApplication rec {
pname = "urlwatch";
- version = "2.28";
+ version = "2.29";
src = fetchFromGitHub {
owner = "thp";
repo = "urlwatch";
rev = version;
- hash = "sha256-dGohG2+HrsuKegPAn1fmpLYPpovEEUsx+C/0sp2/cX0=";
+ hash = "sha256-X1UR9JrQuujOIUg87W0YqfXsM3A5nttWjjJMIe3hgk8=";
};
- patches = [
- # lxml 5 compatibility fix
- # FIXME: remove in next release
- (fetchpatch {
- url = "https://github.com/thp/urlwatch/commit/123de66d019aef7fc18fab6d56cc2a54d81fea3f.patch";
- excludes = [ "CHANGELOG.md" ];
- hash = "sha256-C9qb6TYeNcdszunE2B5DWRyXyqnANd32H7m9KmidCD0=";
- })
- ];
-
propagatedBuildInputs = with python3Packages; [
- appdirs
cssselect
jq
keyring
@@ -35,6 +23,7 @@ python3Packages.buildPythonApplication rec {
matrix-client
minidb
playwright
+ platformdirs
pushbullet-py
pycodestyle
pyyaml
diff --git a/pkgs/tools/networking/veilid/Cargo.lock b/pkgs/tools/networking/veilid/Cargo.lock
index 15b292710468..a622b39e554d 100644
--- a/pkgs/tools/networking/veilid/Cargo.lock
+++ b/pkgs/tools/networking/veilid/Cargo.lock
@@ -1193,25 +1193,6 @@ dependencies = [
"crossbeam-utils",
]
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
-dependencies = [
- "crossbeam-utils",
-]
-
[[package]]
name = "crossbeam-utils"
version = "0.8.20"
@@ -4115,26 +4096,6 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
-[[package]]
-name = "rayon"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
[[package]]
name = "redox_syscall"
version = "0.2.16"
@@ -4995,7 +4956,6 @@ dependencies = [
"libc",
"ntapi",
"once_cell",
- "rayon",
"windows 0.52.0",
]
@@ -5751,7 +5711,7 @@ dependencies = [
[[package]]
name = "veilid-cli"
-version = "0.4.0"
+version = "0.4.1"
dependencies = [
"arboard",
"async-std",
@@ -5792,7 +5752,7 @@ dependencies = [
[[package]]
name = "veilid-core"
-version = "0.4.0"
+version = "0.4.1"
dependencies = [
"argon2",
"async-io 1.13.0",
@@ -5896,7 +5856,7 @@ dependencies = [
[[package]]
name = "veilid-flutter"
-version = "0.4.0"
+version = "0.4.1"
dependencies = [
"allo-isolate",
"android_log-sys 0.3.1",
@@ -5954,7 +5914,7 @@ dependencies = [
[[package]]
name = "veilid-server"
-version = "0.4.0"
+version = "0.4.1"
dependencies = [
"ansi_term",
"async-std",
@@ -6009,7 +5969,7 @@ dependencies = [
[[package]]
name = "veilid-tools"
-version = "0.4.0"
+version = "0.4.1"
dependencies = [
"android_logger 0.13.3",
"async-lock 3.4.0",
@@ -6067,7 +6027,7 @@ dependencies = [
[[package]]
name = "veilid-wasm"
-version = "0.4.0"
+version = "0.4.1"
dependencies = [
"cfg-if 1.0.0",
"console_error_panic_hook",
diff --git a/pkgs/tools/networking/veilid/default.nix b/pkgs/tools/networking/veilid/default.nix
index 9f74fd42918d..35e4166c85ab 100644
--- a/pkgs/tools/networking/veilid/default.nix
+++ b/pkgs/tools/networking/veilid/default.nix
@@ -14,13 +14,13 @@
rustPlatform.buildRustPackage rec {
pname = "veilid";
- version = "0.4.0";
+ version = "0.4.1";
src = fetchFromGitLab {
owner = "veilid";
repo = pname;
rev = "v${version}";
- hash = "sha256-5Xjdc66VA7FFk75jnTARCs2oGT/hWX8VPlZV48q6kpI=";
+ hash = "sha256-/RdPq2rHs+lfB3odwO7yRGFi3j0INdJvbWccTsGO54g=";
};
cargoLock = {
diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix
index 2ab8be19c44f..679a162a54e2 100644
--- a/pkgs/tools/networking/xh/default.nix
+++ b/pkgs/tools/networking/xh/default.nix
@@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "xh";
- version = "0.22.2";
+ version = "0.23.0";
src = fetchFromGitHub {
owner = "ducaale";
repo = "xh";
rev = "v${version}";
- sha256 = "sha256-FhhVodpIdcB+2s4AkFk6phvoXFLYll/CFJV2/lHS0ww=";
+ hash = "sha256-rHhL2IWir+DpbNFu2KddslmhhiSpkpU633JYFYCoWvY=";
};
- cargoHash = "sha256-P/OLzMpqWThrdCReWcPlVPGqVSjVD1veq3xL0TJ/soM=";
+ cargoHash = "sha256-5V27ZV+5jWFoGMFe5EXmLdX2BjPuWDMdn4DK54ZIfUY=";
buildFeatures = lib.optional withNativeTls "native-tls";
@@ -59,6 +59,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/ducaale/xh";
changelog = "https://github.com/ducaale/xh/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
- maintainers = with maintainers; [ figsoda bhankas ];
+ maintainers = with maintainers; [ figsoda aaronjheng ];
+ mainProgram = "xh";
};
}
diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix
deleted file mode 100644
index 60da8d7e6e21..000000000000
--- a/pkgs/tools/networking/xrootd/default.nix
+++ /dev/null
@@ -1,152 +0,0 @@
-{ lib
-, stdenv
-, callPackage
-, fetchFromGitHub
-, davix
-, cmake
-, cppunit
-, gtest
-, makeWrapper
-, pkg-config
-, curl
-, fuse
-, libkrb5
-, libuuid
-, libxcrypt
-, libxml2
-, openssl
-, readline
-, scitokens-cpp
-, systemd
-, voms
-, zlib
- # Build bin/test-runner
-, enableTestRunner ? true
- # If not null, the builder will
- # move "$out/etc" to "$out/etc.orig" and symlink "$out/etc" to externalEtc.
-, externalEtc ? "/etc"
-, removeReferencesTo
-}:
-
-stdenv.mkDerivation (finalAttrs: {
- pname = "xrootd";
- version = "5.6.6";
-
- src = fetchFromGitHub {
- owner = "xrootd";
- repo = "xrootd";
- rev = "v${finalAttrs.version}";
- fetchSubmodules = true;
- hash = "sha256-vSZKTsDMY5bhfniFOQ11VA30gjfb4Y8tCC7JNjNw8Y0=";
- };
-
- outputs = [ "bin" "out" "dev" "man" ]
- ++ lib.optional (externalEtc != null) "etc";
-
- passthru.fetchxrd = callPackage ./fetchxrd.nix { xrootd = finalAttrs.finalPackage; };
- passthru.tests =
- lib.optionalAttrs stdenv.hostPlatform.isLinux {
- test-runner = callPackage ./test-runner.nix { xrootd = finalAttrs.finalPackage; };
- } // {
- test-xrdcp = finalAttrs.passthru.fetchxrd {
- pname = "xrootd-test-xrdcp";
- # Use the the bin output hash of xrootd as version to ensure that
- # the test gets rebuild everytime xrootd gets rebuild
- version = finalAttrs.version + "-" + builtins.substring (builtins.stringLength builtins.storeDir + 1) 32 "${finalAttrs.finalPackage}";
- url = "root://eospublic.cern.ch//eos/opendata/alice/2010/LHC10h/000138275/ESD/0000/AliESDs.root";
- hash = "sha256-tIcs2oi+8u/Qr+P7AAaPTbQT+DEt26gEdc4VNerlEHY=";
- };
- }
- ;
-
- nativeBuildInputs = [
- cmake
- makeWrapper
- pkg-config
- removeReferencesTo
- ];
-
- buildInputs = [
- davix
- curl
- libkrb5
- libuuid
- libxcrypt
- libxml2
- openssl
- readline
- scitokens-cpp
- zlib
- ]
- ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
- # https://github.com/xrootd/xrootd/blob/5b5a1f6957def2816b77ec773c7e1bfb3f1cfc5b/cmake/XRootDFindLibs.cmake#L58
- fuse
- ]
- ++ lib.optionals stdenv.hostPlatform.isLinux [
- systemd
- voms
- ]
- ++ lib.optionals enableTestRunner [
- gtest
- cppunit
- ];
-
- preConfigure = ''
- patchShebangs genversion.sh
- substituteInPlace cmake/XRootDConfig.cmake.in \
- --replace-fail "@PACKAGE_CMAKE_INSTALL_" "@CMAKE_INSTALL_FULL_"
- '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
- sed -i cmake/XRootDOSDefs.cmake -e '/set( MacOSX TRUE )/ainclude( GNUInstallDirs )'
- '';
-
- # https://github.com/xrootd/xrootd/blob/master/packaging/rhel/xrootd.spec.in#L665-L675=
- postInstall = ''
- mkdir -p "$out/lib/tmpfiles.d"
- install -m 644 -T ../packaging/rhel/xrootd.tmpfiles "$out/lib/tmpfiles.d/xrootd.conf"
- mkdir -p "$out/etc/xrootd"
- install -m 644 -t "$out/etc/xrootd" ../packaging/common/*.cfg
- install -m 644 -t "$out/etc/xrootd" ../packaging/common/client.conf
- mkdir -p "$out/etc/xrootd/client.plugins.d"
- install -m 644 -t "$out/etc/xrootd/client.plugins.d" ../packaging/common/client-plugin.conf.example
- mkdir -p "$out/etc/logrotate.d"
- install -m 644 -T ../packaging/common/xrootd.logrotate "$out/etc/logrotate.d/xrootd"
- ''
- # Leaving those in bin/ leads to a cyclic reference between $dev and $bin
- # This happens since https://github.com/xrootd/xrootd/commit/fe268eb622e2192d54a4230cea54c41660bd5788
- # So far, this xrootd-config script does not seem necessary in $bin
- + ''
- moveToOutput "bin/xrootd-config" "$dev"
- moveToOutput "bin/.xrootd-config-wrapped" "$dev"
- '' + lib.optionalString stdenv.hostPlatform.isLinux ''
- mkdir -p "$out/lib/systemd/system"
- install -m 644 -t "$out/lib/systemd/system" ../packaging/common/*.service ../packaging/common/*.socket
- '';
-
- cmakeFlags = [
- "-DXRootD_VERSION_STRING=${finalAttrs.version}"
- ] ++ lib.optionals enableTestRunner [
- "-DFORCE_ENABLED=TRUE"
- "-DENABLE_DAVIX=TRUE"
- "-DENABLE_FUSE=${if (!stdenv.hostPlatform.isDarwin) then "TRUE" else "FALSE"}" # not supported
- "-DENABLE_MACAROONS=OFF"
- "-DENABLE_PYTHON=FALSE" # built separately
- "-DENABLE_SCITOKENS=TRUE"
- "-DENABLE_TESTS=TRUE"
- "-DENABLE_VOMS=${if stdenv.hostPlatform.isLinux then "TRUE" else "FALSE"}"
- ];
-
- postFixup = lib.optionalString (externalEtc != null) ''
- moveToOutput etc "$etc"
- ln -s ${lib.escapeShellArg externalEtc} "$out/etc"
- '';
-
- dontPatchELF = true; # shrinking rpath will cause runtime failures in dlopen
-
- meta = with lib; {
- description = "High performance, scalable fault tolerant data access";
- homepage = "https://xrootd.slac.stanford.edu";
- license = licenses.lgpl3Plus;
- platforms = platforms.all;
- maintainers = with maintainers; [ ShamrockLee ];
- };
-})
diff --git a/pkgs/tools/networking/xrootd/test-runner.nix b/pkgs/tools/networking/xrootd/test-runner.nix
deleted file mode 100644
index b878febc7bff..000000000000
--- a/pkgs/tools/networking/xrootd/test-runner.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ runCommand, xrootd }:
-
-# These tests are specified in the test procedure of the upstream CD:
-# https://github.com/xrootd/xrootd/blob/master/.github/workflows/build.yml#L90-L98
-runCommand "${xrootd.pname}-run-tests-${xrootd.version}" {
- testRunnerPath = "${xrootd}/bin/test-runner";
- testLibraries = [ "XrdClTests" ];
- XrdClTestsSuites = [ "UtilsTest" "SocketTest" "PollerTest" ];
- pname = "${xrootd.pname}-run-tests";
- inherit (xrootd) version;
- meta.mainProgram = "test-runner";
-} ''
- for testLibrary in $testLibraries; do
- echo "Testing $testLibrary"
- testLibraryPath="${xrootd.out}/lib/lib''${testLibrary}.so"
- testsuiteVarname="''${testLibrary}Suites"
- for testsuite in ''${!testsuiteVarname}; do
- echo "Doing test $testsuite"
- "$testRunnerPath" "$testLibraryPath" "All Tests/$testsuite/"
- done
- done
- mkdir -p "$out/bin"
- ln -s "$testRunnerPath" "$out/bin/test-runner"
-''
diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix
index f8e181e9fa21..2ece72b66bf1 100644
--- a/pkgs/tools/package-management/nix-serve/default.nix
+++ b/pkgs/tools/package-management/nix-serve/default.nix
@@ -58,6 +58,8 @@ stdenv.mkDerivation {
description = "Utility for sharing a Nix store as a binary cache";
maintainers = [ maintainers.eelco ];
license = licenses.lgpl21;
+ # See https://github.com/edolstra/nix-serve/issues/57
+ broken = stdenv.isDarwin;
platforms = nix.meta.platforms;
mainProgram = "nix-serve";
};
diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix
index 4d04cbb6274d..07e58a41e400 100644
--- a/pkgs/tools/package-management/nix/common.nix
+++ b/pkgs/tools/package-management/nix/common.nix
@@ -16,6 +16,7 @@ let
atLeast210 = lib.versionAtLeast version "2.10pre";
atLeast213 = lib.versionAtLeast version "2.13pre";
atLeast214 = lib.versionAtLeast version "2.14pre";
+ atLeast218 = lib.versionAtLeast version "2.18pre";
atLeast219 = lib.versionAtLeast version "2.19pre";
atLeast220 = lib.versionAtLeast version "2.20pre";
atLeast221 = lib.versionAtLeast version "2.21pre";
@@ -42,6 +43,7 @@ in
, callPackage
, coreutils
, curl
+, darwin
, docbook_xsl_ns
, docbook5
, editline
@@ -158,6 +160,8 @@ self = stdenv.mkDerivation {
libseccomp
] ++ lib.optionals withAWS [
aws-sdk-cpp
+ ] ++ lib.optional (atLeast218 && stdenv.hostPlatform.isDarwin) [
+ darwin.apple_sdk.libs.sandbox
];
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index adfa793f1d35..377dbc43a288 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -178,42 +178,85 @@ in lib.makeExtensible (self: ({
version = "2.18.8";
hash = "sha256-0rHRifdjzzxMh/im8pRx6XoY62irDTDUes+Pn0CR65I=";
self_attribute_name = "nix_2_18";
+ patches = [
+ ./patches/2_18/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
+ ./patches/2_18/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch
+ ./patches/2_18/0003-local-derivation-goal-Refactor.patch
+ ./patches/2_18/0004-local-derivation-goal-Move-builder-preparation-to-no.patch
+ ];
};
nix_2_19 = common {
version = "2.19.6";
hash = "sha256-XT5xiwOLgXf+TdyOjbJVOl992wu9mBO25WXHoyli/Tk=";
self_attribute_name = "nix_2_19";
+ patches = [
+ ./patches/2_19/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
+ ./patches/2_19/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch
+ ./patches/2_19/0003-local-derivation-goal-Refactor.patch
+ ./patches/2_19/0004-local-derivation-goal-Move-builder-preparation-to-no.patch
+ ];
};
nix_2_20 = common {
version = "2.20.8";
hash = "sha256-M2tkMtjKi8LDdNLsKi3IvD8oY/i3rtarjMpvhybS3WY=";
self_attribute_name = "nix_2_20";
+ patches = [
+ ./patches/2_20/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
+ ./patches/2_20/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch
+ ./patches/2_20/0003-local-derivation-goal-Refactor.patch
+ ./patches/2_20/0004-local-derivation-goal-Move-builder-preparation-to-no.patch
+ ];
};
nix_2_21 = common {
version = "2.21.4";
hash = "sha256-c6nVZ0pSrfhFX3eVKqayS+ioqyAGp3zG9ZPO5rkXFRQ=";
self_attribute_name = "nix_2_21";
+ patches = [
+ ./patches/2_21/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
+ ./patches/2_21/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch
+ ./patches/2_21/0003-local-derivation-goal-Refactor.patch
+ ./patches/2_21/0004-local-derivation-goal-Move-builder-preparation-to-no.patch
+ ];
};
nix_2_22 = common {
version = "2.22.3";
hash = "sha256-l04csH5rTWsK7eXPWVxJBUVRPMZXllFoSkYFTq/i8WU=";
self_attribute_name = "nix_2_22";
+ patches = [
+ ./patches/2_22/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
+ ./patches/2_22/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch
+ ./patches/2_22/0003-local-derivation-goal-Refactor.patch
+ ./patches/2_22/0004-local-derivation-goal-Move-builder-preparation-to-no.patch
+ ];
};
nix_2_23 = common {
version = "2.23.3";
hash = "sha256-lAoLGVIhRFrfgv7wcyduEkyc83QKrtsfsq4of+WrBeg=";
self_attribute_name = "nix_2_23";
+ patches = [
+ ./patches/2_23/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
+ ./patches/2_23/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch
+ ./patches/2_23/0003-local-derivation-goal-Refactor.patch
+ ./patches/2_23/0004-local-derivation-goal-Move-builder-preparation-to-no.patch
+ ];
};
nix_2_24 = (common {
version = "2.24.9";
hash = "sha256-OwJByTdCz1t91ysBqynK+ifszkoIGEXUn6HE2t82+c8=";
self_attribute_name = "nix_2_24";
+ patches = [
+ ./patches/2_24/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
+ ./patches/2_24/0002-packaging-Add-darwin-lsandbox-in-meson.patch
+ ./patches/2_24/0003-local-derivation-goal-Print-sandbox-error-detail-on-.patch
+ ./patches/2_24/0004-local-derivation-goal-Refactor.patch
+ ./patches/2_24/0005-local-derivation-goal-Move-builder-preparation-to-no.patch
+ ];
}).override (lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) {
# Fix the following error with the default x86_64-darwin SDK:
#
@@ -234,6 +277,14 @@ in lib.makeExtensible (self: ({
rev = "ca3fc1693b309ab6b8b0c09408a08d0055bf0363";
hash = "sha256-Hp7dkx7zfB9a4l5QusXUob0b1T2qdZ23LFo5dcp3xrU=";
};
+ patches = [
+ ./patches/git/0001-Fix-meson-build-on-darwin.patch
+ ./patches/git/0002-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
+ ./patches/git/0003-packaging-Add-darwin-lsandbox-in-meson.patch
+ ./patches/git/0004-local-derivation-goal-Print-sandbox-error-detail-on-.patch
+ ./patches/git/0005-local-derivation-goal-Refactor.patch
+ ./patches/git/0006-local-derivation-goal-Move-builder-preparation-to-no.patch
+ ];
self_attribute_name = "git";
}).override (lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) {
# Fix the following error with the default x86_64-darwin SDK:
diff --git a/pkgs/tools/package-management/nix/patches/2_18/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch b/pkgs/tools/package-management/nix/patches/2_18/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
new file mode 100644
index 000000000000..c13844f8bdd7
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_18/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
@@ -0,0 +1,315 @@
+From 3c4bc6929eb13cf648c54931a28797bb1c289052 Mon Sep 17 00:00:00 2001
+From: Puck Meerburg
+Date: Fri, 1 Mar 2024 11:42:24 -0500
+Subject: [PATCH 1/4] fix: Run all derivation builders inside the sandbox on
+ macOS
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim
+---
+ configure.ac | 6 +-
+ flake.nix | 1 +
+ src/libstore/build/local-derivation-goal.cc | 221 ++++++++++----------
+ 3 files changed, 114 insertions(+), 114 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4e50d0913..44852ad79 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -58,13 +58,17 @@ AC_CHECK_TOOL([AR], [ar])
+ AC_SYS_LARGEFILE
+
+
+-# Solaris-specific stuff.
++# OS-specific stuff.
+ AC_STRUCT_DIRENT_D_TYPE
+ case "$host_os" in
+ solaris*)
+ # Solaris requires -lsocket -lnsl for network functions
+ LDFLAGS="-lsocket -lnsl $LDFLAGS"
+ ;;
++ darwin*)
++ # Need to link to libsandbox.
++ LDFLAGS="-lsandbox $LDFLAGS"
++ ;;
+ esac
+
+
+diff --git a/flake.nix b/flake.nix
+index 6c9bef4d8..66ac1bfd8 100644
+--- a/flake.nix
++++ b/flake.nix
+@@ -173,6 +173,7 @@
+ boost
+ lowdown-nix
+ ]
++ ++ lib.optionals stdenv.isDarwin [darwin.apple_sdk.libs.sandbox]
+ ++ lib.optionals stdenv.isLinux [(libseccomp.overrideAttrs (_: rec {
+ version = "2.5.5";
+ src = fetchurl {
+diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
+index 4d690beaf..fb83cfdc7 100644
+--- a/src/libstore/build/local-derivation-goal.cc
++++ b/src/libstore/build/local-derivation-goal.cc
+@@ -53,6 +53,10 @@
+ #if __APPLE__
+ #include
+ #include
++#include
++
++/* This definition is undocumented but depended upon by all major browsers. */
++extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags, const char *const parameters[], char **errorbuf);
+ #endif
+
+ #include
+@@ -2034,141 +2038,132 @@ void LocalDerivationGoal::runChild()
+
+ std::string builder = "invalid";
+
+- if (drv->isBuiltin()) {
+- ;
+- }
+ #if __APPLE__
+- else {
+- /* This has to appear before import statements. */
+- std::string sandboxProfile = "(version 1)\n";
+-
+- if (useChroot) {
+-
+- /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */
+- PathSet ancestry;
+-
+- /* We build the ancestry before adding all inputPaths to the store because we know they'll
+- all have the same parents (the store), and there might be lots of inputs. This isn't
+- particularly efficient... I doubt it'll be a bottleneck in practice */
+- for (auto & i : dirsInChroot) {
+- Path cur = i.first;
+- while (cur.compare("/") != 0) {
+- cur = dirOf(cur);
+- ancestry.insert(cur);
+- }
+- }
++ /* This has to appear before import statements. */
++ std::string sandboxProfile = "(version 1)\n";
+
+- /* And we want the store in there regardless of how empty dirsInChroot. We include the innermost
+- path component this time, since it's typically /nix/store and we care about that. */
+- Path cur = worker.store.storeDir;
++ if (useChroot) {
++
++ /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */
++ PathSet ancestry;
++
++ /* We build the ancestry before adding all inputPaths to the store because we know they'll
++ all have the same parents (the store), and there might be lots of inputs. This isn't
++ particularly efficient... I doubt it'll be a bottleneck in practice */
++ for (auto & i : dirsInChroot) {
++ Path cur = i.first;
+ while (cur.compare("/") != 0) {
+- ancestry.insert(cur);
+ cur = dirOf(cur);
++ ancestry.insert(cur);
+ }
++ }
+
+- /* Add all our input paths to the chroot */
+- for (auto & i : inputPaths) {
+- auto p = worker.store.printStorePath(i);
+- dirsInChroot[p] = p;
+- }
+-
+- /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */
+- if (settings.darwinLogSandboxViolations) {
+- sandboxProfile += "(deny default)\n";
+- } else {
+- sandboxProfile += "(deny default (with no-log))\n";
+- }
++ /* And we want the store in there regardless of how empty dirsInChroot. We include the innermost
++ path component this time, since it's typically /nix/store and we care about that. */
++ Path cur = worker.store.storeDir;
++ while (cur.compare("/") != 0) {
++ ancestry.insert(cur);
++ cur = dirOf(cur);
++ }
+
+- sandboxProfile +=
+- #include "sandbox-defaults.sb"
+- ;
++ /* Add all our input paths to the chroot */
++ for (auto & i : inputPaths) {
++ auto p = worker.store.printStorePath(i);
++ dirsInChroot[p] = p;
++ }
+
+- if (!derivationType->isSandboxed())
+- sandboxProfile +=
+- #include "sandbox-network.sb"
+- ;
+-
+- /* Add the output paths we'll use at build-time to the chroot */
+- sandboxProfile += "(allow file-read* file-write* process-exec\n";
+- for (auto & [_, path] : scratchOutputs)
+- sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path));
+-
+- sandboxProfile += ")\n";
+-
+- /* Our inputs (transitive dependencies and any impurities computed above)
+-
+- without file-write* allowed, access() incorrectly returns EPERM
+- */
+- sandboxProfile += "(allow file-read* file-write* process-exec\n";
+- for (auto & i : dirsInChroot) {
+- if (i.first != i.second.source)
+- throw Error(
+- "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin",
+- i.first, i.second.source);
+-
+- std::string path = i.first;
+- struct stat st;
+- if (lstat(path.c_str(), &st)) {
+- if (i.second.optional && errno == ENOENT)
+- continue;
+- throw SysError("getting attributes of path '%s", path);
+- }
+- if (S_ISDIR(st.st_mode))
+- sandboxProfile += fmt("\t(subpath \"%s\")\n", path);
+- else
+- sandboxProfile += fmt("\t(literal \"%s\")\n", path);
+- }
+- sandboxProfile += ")\n";
++ /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */
++ if (settings.darwinLogSandboxViolations) {
++ sandboxProfile += "(deny default)\n";
++ } else {
++ sandboxProfile += "(deny default (with no-log))\n";
++ }
+
+- /* Allow file-read* on full directory hierarchy to self. Allows realpath() */
+- sandboxProfile += "(allow file-read*\n";
+- for (auto & i : ancestry) {
+- sandboxProfile += fmt("\t(literal \"%s\")\n", i);
+- }
+- sandboxProfile += ")\n";
++ sandboxProfile +=
++ #include "sandbox-defaults.sb"
++ ;
+
+- sandboxProfile += additionalSandboxProfile;
+- } else
++ if (!derivationType->isSandboxed())
+ sandboxProfile +=
+- #include "sandbox-minimal.sb"
++ #include "sandbox-network.sb"
+ ;
+
+- debug("Generated sandbox profile:");
+- debug(sandboxProfile);
++ /* Add the output paths we'll use at build-time to the chroot */
++ sandboxProfile += "(allow file-read* file-write* process-exec\n";
++ for (auto & [_, path] : scratchOutputs)
++ sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path));
+
+- Path sandboxFile = tmpDir + "/.sandbox.sb";
++ sandboxProfile += ")\n";
+
+- writeFile(sandboxFile, sandboxProfile);
++ /* Our inputs (transitive dependencies and any impurities computed above)
+
+- bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking");
++ without file-write* allowed, access() incorrectly returns EPERM
++ */
++ sandboxProfile += "(allow file-read* file-write* process-exec\n";
++ for (auto & i : dirsInChroot) {
++ if (i.first != i.second.source)
++ throw Error(
++ "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin",
++ i.first, i.second.source);
+
+- /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms
+- to find temporary directories, so we want to open up a broader place for them to dump their files, if needed. */
+- Path globalTmpDir = canonPath(defaultTempDir(), true);
++ std::string path = i.first;
++ struct stat st;
++ if (lstat(path.c_str(), &st)) {
++ if (i.second.optional && errno == ENOENT)
++ continue;
++ throw SysError("getting attributes of path '%s", path);
++ }
++ if (S_ISDIR(st.st_mode))
++ sandboxProfile += fmt("\t(subpath \"%s\")\n", path);
++ else
++ sandboxProfile += fmt("\t(literal \"%s\")\n", path);
++ }
++ sandboxProfile += ")\n";
+
+- /* They don't like trailing slashes on subpath directives */
+- while (!globalTmpDir.empty() && globalTmpDir.back() == '/')
+- globalTmpDir.pop_back();
++ /* Allow file-read* on full directory hierarchy to self. Allows realpath() */
++ sandboxProfile += "(allow file-read*\n";
++ for (auto & i : ancestry) {
++ sandboxProfile += fmt("\t(literal \"%s\")\n", i);
++ }
++ sandboxProfile += ")\n";
+
+- if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") {
+- builder = "/usr/bin/sandbox-exec";
+- args.push_back("sandbox-exec");
+- args.push_back("-f");
+- args.push_back(sandboxFile);
+- args.push_back("-D");
+- args.push_back("_GLOBAL_TMP_DIR=" + globalTmpDir);
+- if (allowLocalNetworking) {
+- args.push_back("-D");
+- args.push_back(std::string("_ALLOW_LOCAL_NETWORKING=1"));
+- }
+- args.push_back(drv->builder);
+- } else {
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
++ sandboxProfile += additionalSandboxProfile;
++ } else
++ sandboxProfile +=
++ #include "sandbox-minimal.sb"
++ ;
++
++ debug("Generated sandbox profile:");
++ debug(sandboxProfile);
++
++ bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking");
++
++ /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms
++ to find temporary directories, so we want to open up a broader place for them to dump their files, if needed. */
++ Path globalTmpDir = canonPath(defaultTempDir(), true);
++
++ /* They don't like trailing slashes on subpath directives */
++ while (!globalTmpDir.empty() && globalTmpDir.back() == '/')
++ globalTmpDir.pop_back();
++
++ if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") {
++ Strings sandboxArgs;
++ sandboxArgs.push_back("_GLOBAL_TMP_DIR");
++ sandboxArgs.push_back(globalTmpDir);
++ if (allowLocalNetworking) {
++ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING");
++ sandboxArgs.push_back("1");
++ }
++ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) {
++ writeFull(STDERR_FILENO, "failed to configure sandbox\n");
++ _exit(1);
+ }
+ }
++
++ builder = drv->builder;
++ args.push_back(std::string(baseNameOf(drv->builder)));
+ #else
+- else {
++ if (!drv->isBuiltin()) {
+ builder = drv->builder;
+ args.push_back(std::string(baseNameOf(drv->builder)));
+ }
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_18/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch b/pkgs/tools/package-management/nix/patches/2_18/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch
new file mode 100644
index 000000000000..a3bc4f05cdaf
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_18/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch
@@ -0,0 +1,34 @@
+From 4ac099d6ab4b6851aeb8b7a1e37f5794716d5138 Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:44:12 +0200
+Subject: [PATCH 2/4] local-derivation-goal: Print sandbox error detail on
+ darwin
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Co-Authored-By: Théophane Hufschmitt
+Signed-off-by: Jörg Thalheim
+---
+ src/libstore/build/local-derivation-goal.cc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
+index fb83cfdc7..d41d1c1e5 100644
+--- a/src/libstore/build/local-derivation-goal.cc
++++ b/src/libstore/build/local-derivation-goal.cc
+@@ -2154,8 +2154,9 @@ void LocalDerivationGoal::runChild()
+ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING");
+ sandboxArgs.push_back("1");
+ }
+- if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) {
+- writeFull(STDERR_FILENO, "failed to configure sandbox\n");
++ char * sandbox_errbuf = nullptr;
++ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), &sandbox_errbuf)) {
++ writeFull(STDERR_FILENO, fmt("failed to configure sandbox: %s\n", sandbox_errbuf ? sandbox_errbuf : "(null)"));
+ _exit(1);
+ }
+ }
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_18/0003-local-derivation-goal-Refactor.patch b/pkgs/tools/package-management/nix/patches/2_18/0003-local-derivation-goal-Refactor.patch
new file mode 100644
index 000000000000..81997405a5f7
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_18/0003-local-derivation-goal-Refactor.patch
@@ -0,0 +1,41 @@
+From 6fe3a5e26def808b99856099d74aa3017ecf6d9d Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:50:27 +0200
+Subject: [PATCH 3/4] local-derivation-goal: Refactor
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This works because the `builder` and `args` variables are only used
+in the non-builtin code path.
+
+Co-Authored-By: Théophane Hufschmitt
+Signed-off-by: Jörg Thalheim
+---
+ src/libstore/build/local-derivation-goal.cc | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
+index d41d1c1e5..faecc403b 100644
+--- a/src/libstore/build/local-derivation-goal.cc
++++ b/src/libstore/build/local-derivation-goal.cc
+@@ -2160,15 +2160,12 @@ void LocalDerivationGoal::runChild()
+ _exit(1);
+ }
+ }
++#endif
+
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
+-#else
+ if (!drv->isBuiltin()) {
+ builder = drv->builder;
+ args.push_back(std::string(baseNameOf(drv->builder)));
+ }
+-#endif
+
+ for (auto & i : drv->args)
+ args.push_back(rewriteStrings(i, inputRewrites));
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_18/0004-local-derivation-goal-Move-builder-preparation-to-no.patch b/pkgs/tools/package-management/nix/patches/2_18/0004-local-derivation-goal-Move-builder-preparation-to-no.patch
new file mode 100644
index 000000000000..4a17ccedbdbd
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_18/0004-local-derivation-goal-Move-builder-preparation-to-no.patch
@@ -0,0 +1,75 @@
+From d219faa93badcfc8134c81ba0d2b821775eb947c Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:57:00 +0200
+Subject: [PATCH 4/4] local-derivation-goal: Move builder preparation to
+ non-builtin code path
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim
+---
+ src/libstore/build/local-derivation-goal.cc | 25 +++++++++------------
+ 1 file changed, 10 insertions(+), 15 deletions(-)
+
+diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
+index faecc403b..23d5d5e3f 100644
+--- a/src/libstore/build/local-derivation-goal.cc
++++ b/src/libstore/build/local-derivation-goal.cc
+@@ -2033,11 +2033,6 @@ void LocalDerivationGoal::runChild()
+ throw SysError("setuid failed");
+ }
+
+- /* Fill in the arguments. */
+- Strings args;
+-
+- std::string builder = "invalid";
+-
+ #if __APPLE__
+ /* This has to appear before import statements. */
+ std::string sandboxProfile = "(version 1)\n";
+@@ -2162,14 +2157,6 @@ void LocalDerivationGoal::runChild()
+ }
+ #endif
+
+- if (!drv->isBuiltin()) {
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
+- }
+-
+- for (auto & i : drv->args)
+- args.push_back(rewriteStrings(i, inputRewrites));
+-
+ /* Indicate that we managed to set up the build environment. */
+ writeFull(STDERR_FILENO, std::string("\2\n"));
+
+@@ -2199,6 +2186,14 @@ void LocalDerivationGoal::runChild()
+ }
+ }
+
++ // Now builder is not builtin
++
++ Strings args;
++ args.push_back(std::string(baseNameOf(drv->builder)));
++
++ for (auto & i : drv->args)
++ args.push_back(rewriteStrings(i, inputRewrites));
++
+ #if __APPLE__
+ posix_spawnattr_t attrp;
+
+@@ -2220,9 +2215,9 @@ void LocalDerivationGoal::runChild()
+ posix_spawnattr_setbinpref_np(&attrp, 1, &cpu, NULL);
+ }
+
+- posix_spawn(NULL, builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
++ posix_spawn(NULL, drv->builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
+ #else
+- execve(builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
++ execve(drv->builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
+ #endif
+
+ throw SysError("executing '%1%'", drv->builder);
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_19/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch b/pkgs/tools/package-management/nix/patches/2_19/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
new file mode 100644
index 000000000000..dfe091b48c7d
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_19/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
@@ -0,0 +1,312 @@
+From 172734f47a8062285cec0055133efcc45df03e54 Mon Sep 17 00:00:00 2001
+From: Puck Meerburg
+Date: Fri, 1 Mar 2024 11:42:24 -0500
+Subject: [PATCH 1/4] fix: Run all derivation builders inside the sandbox on
+ macOS
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim
+---
+ configure.ac | 6 +-
+ flake.nix | 1 +
+ src/libstore/build/local-derivation-goal.cc | 217 ++++++++++----------
+ 3 files changed, 112 insertions(+), 112 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 281ba2c32..6d73804e2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -58,13 +58,17 @@ AC_CHECK_TOOL([AR], [ar])
+ AC_SYS_LARGEFILE
+
+
+-# Solaris-specific stuff.
++# OS-specific stuff.
+ AC_STRUCT_DIRENT_D_TYPE
+ case "$host_os" in
+ solaris*)
+ # Solaris requires -lsocket -lnsl for network functions
+ LDFLAGS="-lsocket -lnsl $LDFLAGS"
+ ;;
++ darwin*)
++ # Need to link to libsandbox.
++ LDFLAGS="-lsandbox $LDFLAGS"
++ ;;
+ esac
+
+
+diff --git a/flake.nix b/flake.nix
+index 6deb09f22..98f9cc25f 100644
+--- a/flake.nix
++++ b/flake.nix
+@@ -202,6 +202,7 @@
+ libsodium
+ ]
+ ++ lib.optionals stdenv.isLinux [libseccomp]
++ ++ lib.optionals stdenv.isDarwin [darwin.apple_sdk.libs.sandbox]
+ ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid;
+
+ checkDeps = [
+diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
+index b6c7666e5..effd9c613 100644
+--- a/src/libstore/build/local-derivation-goal.cc
++++ b/src/libstore/build/local-derivation-goal.cc
+@@ -55,6 +55,10 @@
+ #if __APPLE__
+ #include
+ #include
++#include
++
++/* This definition is undocumented but depended upon by all major browsers. */
++extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags, const char *const parameters[], char **errorbuf);
+ #endif
+
+ #include
+@@ -2031,140 +2035,131 @@ void LocalDerivationGoal::runChild()
+
+ std::string builder = "invalid";
+
+- if (drv->isBuiltin()) {
+- ;
+- }
+ #if __APPLE__
+- else {
+- /* This has to appear before import statements. */
+- std::string sandboxProfile = "(version 1)\n";
+-
+- if (useChroot) {
+-
+- /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */
+- PathSet ancestry;
+-
+- /* We build the ancestry before adding all inputPaths to the store because we know they'll
+- all have the same parents (the store), and there might be lots of inputs. This isn't
+- particularly efficient... I doubt it'll be a bottleneck in practice */
+- for (auto & i : pathsInChroot) {
+- Path cur = i.first;
+- while (cur.compare("/") != 0) {
+- cur = dirOf(cur);
+- ancestry.insert(cur);
+- }
+- }
++ /* This has to appear before import statements. */
++ std::string sandboxProfile = "(version 1)\n";
+
+- /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost
+- path component this time, since it's typically /nix/store and we care about that. */
+- Path cur = worker.store.storeDir;
++ if (useChroot) {
++
++ /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */
++ PathSet ancestry;
++
++ /* We build the ancestry before adding all inputPaths to the store because we know they'll
++ all have the same parents (the store), and there might be lots of inputs. This isn't
++ particularly efficient... I doubt it'll be a bottleneck in practice */
++ for (auto & i : pathsInChroot) {
++ Path cur = i.first;
+ while (cur.compare("/") != 0) {
+- ancestry.insert(cur);
+ cur = dirOf(cur);
++ ancestry.insert(cur);
+ }
++ }
+
+- /* Add all our input paths to the chroot */
+- for (auto & i : inputPaths) {
+- auto p = worker.store.printStorePath(i);
+- pathsInChroot[p] = p;
+- }
++ /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost
++ path component this time, since it's typically /nix/store and we care about that. */
++ Path cur = worker.store.storeDir;
++ while (cur.compare("/") != 0) {
++ ancestry.insert(cur);
++ cur = dirOf(cur);
++ }
+
+- /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */
+- if (settings.darwinLogSandboxViolations) {
+- sandboxProfile += "(deny default)\n";
+- } else {
+- sandboxProfile += "(deny default (with no-log))\n";
+- }
++ /* Add all our input paths to the chroot */
++ for (auto & i : inputPaths) {
++ auto p = worker.store.printStorePath(i);
++ pathsInChroot[p] = p;
++ }
++
++ /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */
++ if (settings.darwinLogSandboxViolations) {
++ sandboxProfile += "(deny default)\n";
++ } else {
++ sandboxProfile += "(deny default (with no-log))\n";
++ }
+
++ sandboxProfile +=
++ #include "sandbox-defaults.sb"
++ ;
++
++ if (!derivationType->isSandboxed())
+ sandboxProfile +=
+- #include "sandbox-defaults.sb"
++ #include "sandbox-network.sb"
+ ;
+
+- if (!derivationType->isSandboxed())
+- sandboxProfile +=
+- #include "sandbox-network.sb"
+- ;
+-
+- /* Add the output paths we'll use at build-time to the chroot */
+- sandboxProfile += "(allow file-read* file-write* process-exec\n";
+- for (auto & [_, path] : scratchOutputs)
+- sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path));
+-
+- sandboxProfile += ")\n";
+-
+- /* Our inputs (transitive dependencies and any impurities computed above)
+-
+- without file-write* allowed, access() incorrectly returns EPERM
+- */
+- sandboxProfile += "(allow file-read* file-write* process-exec\n";
+- for (auto & i : pathsInChroot) {
+- if (i.first != i.second.source)
+- throw Error(
+- "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin",
+- i.first, i.second.source);
+-
+- std::string path = i.first;
+- struct stat st;
+- if (lstat(path.c_str(), &st)) {
+- if (i.second.optional && errno == ENOENT)
+- continue;
+- throw SysError("getting attributes of path '%s", path);
+- }
+- if (S_ISDIR(st.st_mode))
+- sandboxProfile += fmt("\t(subpath \"%s\")\n", path);
+- else
+- sandboxProfile += fmt("\t(literal \"%s\")\n", path);
+- }
+- sandboxProfile += ")\n";
++ /* Add the output paths we'll use at build-time to the chroot */
++ sandboxProfile += "(allow file-read* file-write* process-exec\n";
++ for (auto & [_, path] : scratchOutputs)
++ sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path));
+
+- /* Allow file-read* on full directory hierarchy to self. Allows realpath() */
+- sandboxProfile += "(allow file-read*\n";
+- for (auto & i : ancestry) {
+- sandboxProfile += fmt("\t(literal \"%s\")\n", i);
+- }
+- sandboxProfile += ")\n";
++ sandboxProfile += ")\n";
+
+- sandboxProfile += additionalSandboxProfile;
+- } else
+- sandboxProfile +=
+- #include "sandbox-minimal.sb"
+- ;
++ /* Our inputs (transitive dependencies and any impurities computed above)
++
++ without file-write* allowed, access() incorrectly returns EPERM
++ */
++ sandboxProfile += "(allow file-read* file-write* process-exec\n";
++ for (auto & i : pathsInChroot) {
++ if (i.first != i.second.source)
++ throw Error(
++ "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin",
++ i.first, i.second.source);
++
++ std::string path = i.first;
++ struct stat st;
++ if (lstat(path.c_str(), &st)) {
++ if (i.second.optional && errno == ENOENT)
++ continue;
++ throw SysError("getting attributes of path '%s", path);
++ }
++ if (S_ISDIR(st.st_mode))
++ sandboxProfile += fmt("\t(subpath \"%s\")\n", path);
++ else
++ sandboxProfile += fmt("\t(literal \"%s\")\n", path);
++ }
++ sandboxProfile += ")\n";
+
+- debug("Generated sandbox profile:");
+- debug(sandboxProfile);
++ /* Allow file-read* on full directory hierarchy to self. Allows realpath() */
++ sandboxProfile += "(allow file-read*\n";
++ for (auto & i : ancestry) {
++ sandboxProfile += fmt("\t(literal \"%s\")\n", i);
++ }
++ sandboxProfile += ")\n";
+
+- Path sandboxFile = tmpDir + "/.sandbox.sb";
++ sandboxProfile += additionalSandboxProfile;
++ } else
++ sandboxProfile +=
++ #include "sandbox-minimal.sb"
++ ;
+
+- writeFile(sandboxFile, sandboxProfile);
++ debug("Generated sandbox profile:");
++ debug(sandboxProfile);
+
+- bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking");
++ bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking");
+
+- /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms
+- to find temporary directories, so we want to open up a broader place for them to dump their files, if needed. */
+- Path globalTmpDir = canonPath(getEnvNonEmpty("TMPDIR").value_or("/tmp"), true);
++ /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms
++ to find temporary directories, so we want to open up a broader place for them to dump their files, if needed. */
++ Path globalTmpDir = canonPath(getEnvNonEmpty("TMPDIR").value_or("/tmp"), true);
+
+- /* They don't like trailing slashes on subpath directives */
+- if (globalTmpDir.back() == '/') globalTmpDir.pop_back();
++ /* They don't like trailing slashes on subpath directives */
++ if (globalTmpDir.back() == '/') globalTmpDir.pop_back();
+
+- if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") {
+- builder = "/usr/bin/sandbox-exec";
+- args.push_back("sandbox-exec");
+- args.push_back("-f");
+- args.push_back(sandboxFile);
+- args.push_back("-D");
+- args.push_back("_GLOBAL_TMP_DIR=" + globalTmpDir);
+- if (allowLocalNetworking) {
+- args.push_back("-D");
+- args.push_back(std::string("_ALLOW_LOCAL_NETWORKING=1"));
+- }
+- args.push_back(drv->builder);
+- } else {
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
++ if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") {
++ Strings sandboxArgs;
++ sandboxArgs.push_back("_GLOBAL_TMP_DIR");
++ sandboxArgs.push_back(globalTmpDir);
++ if (allowLocalNetworking) {
++ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING");
++ sandboxArgs.push_back("1");
++ }
++ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) {
++ writeFull(STDERR_FILENO, "failed to configure sandbox\n");
++ _exit(1);
+ }
+ }
++
++ builder = drv->builder;
++ args.push_back(std::string(baseNameOf(drv->builder)));
+ #else
+- else {
++ if (!drv->isBuiltin()) {
+ builder = drv->builder;
+ args.push_back(std::string(baseNameOf(drv->builder)));
+ }
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_19/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch b/pkgs/tools/package-management/nix/patches/2_19/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch
new file mode 100644
index 000000000000..8378f739dd7e
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_19/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch
@@ -0,0 +1,34 @@
+From 4a5018019e969537fdba36314fe5c19fe91828af Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:44:12 +0200
+Subject: [PATCH 2/4] local-derivation-goal: Print sandbox error detail on
+ darwin
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Co-Authored-By: Théophane Hufschmitt
+Signed-off-by: Jörg Thalheim
+---
+ src/libstore/build/local-derivation-goal.cc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
+index effd9c613..a67347b59 100644
+--- a/src/libstore/build/local-derivation-goal.cc
++++ b/src/libstore/build/local-derivation-goal.cc
+@@ -2150,8 +2150,9 @@ void LocalDerivationGoal::runChild()
+ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING");
+ sandboxArgs.push_back("1");
+ }
+- if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) {
+- writeFull(STDERR_FILENO, "failed to configure sandbox\n");
++ char * sandbox_errbuf = nullptr;
++ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), &sandbox_errbuf)) {
++ writeFull(STDERR_FILENO, fmt("failed to configure sandbox: %s\n", sandbox_errbuf ? sandbox_errbuf : "(null)"));
+ _exit(1);
+ }
+ }
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_19/0003-local-derivation-goal-Refactor.patch b/pkgs/tools/package-management/nix/patches/2_19/0003-local-derivation-goal-Refactor.patch
new file mode 100644
index 000000000000..f98d7069b554
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_19/0003-local-derivation-goal-Refactor.patch
@@ -0,0 +1,41 @@
+From f9e5b3b52323fdcac4e21bfec4d03bd66ea6a503 Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:50:27 +0200
+Subject: [PATCH 3/4] local-derivation-goal: Refactor
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This works because the `builder` and `args` variables are only used
+in the non-builtin code path.
+
+Co-Authored-By: Théophane Hufschmitt
+Signed-off-by: Jörg Thalheim
+---
+ src/libstore/build/local-derivation-goal.cc | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
+index a67347b59..eeb2635ee 100644
+--- a/src/libstore/build/local-derivation-goal.cc
++++ b/src/libstore/build/local-derivation-goal.cc
+@@ -2156,15 +2156,12 @@ void LocalDerivationGoal::runChild()
+ _exit(1);
+ }
+ }
++#endif
+
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
+-#else
+ if (!drv->isBuiltin()) {
+ builder = drv->builder;
+ args.push_back(std::string(baseNameOf(drv->builder)));
+ }
+-#endif
+
+ for (auto & i : drv->args)
+ args.push_back(rewriteStrings(i, inputRewrites));
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_19/0004-local-derivation-goal-Move-builder-preparation-to-no.patch b/pkgs/tools/package-management/nix/patches/2_19/0004-local-derivation-goal-Move-builder-preparation-to-no.patch
new file mode 100644
index 000000000000..523e0edea3d9
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_19/0004-local-derivation-goal-Move-builder-preparation-to-no.patch
@@ -0,0 +1,75 @@
+From 126a1fd3385175ac94ae4000a9798e0cafb3c168 Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:57:00 +0200
+Subject: [PATCH 4/4] local-derivation-goal: Move builder preparation to
+ non-builtin code path
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim
+---
+ src/libstore/build/local-derivation-goal.cc | 25 +++++++++------------
+ 1 file changed, 10 insertions(+), 15 deletions(-)
+
+diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
+index eeb2635ee..e29330f0e 100644
+--- a/src/libstore/build/local-derivation-goal.cc
++++ b/src/libstore/build/local-derivation-goal.cc
+@@ -2030,11 +2030,6 @@ void LocalDerivationGoal::runChild()
+ throw SysError("setuid failed");
+ }
+
+- /* Fill in the arguments. */
+- Strings args;
+-
+- std::string builder = "invalid";
+-
+ #if __APPLE__
+ /* This has to appear before import statements. */
+ std::string sandboxProfile = "(version 1)\n";
+@@ -2158,14 +2153,6 @@ void LocalDerivationGoal::runChild()
+ }
+ #endif
+
+- if (!drv->isBuiltin()) {
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
+- }
+-
+- for (auto & i : drv->args)
+- args.push_back(rewriteStrings(i, inputRewrites));
+-
+ /* Indicate that we managed to set up the build environment. */
+ writeFull(STDERR_FILENO, std::string("\2\n"));
+
+@@ -2195,6 +2182,14 @@ void LocalDerivationGoal::runChild()
+ }
+ }
+
++ // Now builder is not builtin
++
++ Strings args;
++ args.push_back(std::string(baseNameOf(drv->builder)));
++
++ for (auto & i : drv->args)
++ args.push_back(rewriteStrings(i, inputRewrites));
++
+ #if __APPLE__
+ posix_spawnattr_t attrp;
+
+@@ -2216,9 +2211,9 @@ void LocalDerivationGoal::runChild()
+ posix_spawnattr_setbinpref_np(&attrp, 1, &cpu, NULL);
+ }
+
+- posix_spawn(NULL, builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
++ posix_spawn(NULL, drv->builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
+ #else
+- execve(builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
++ execve(drv->builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
+ #endif
+
+ throw SysError("executing '%1%'", drv->builder);
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_20/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch b/pkgs/tools/package-management/nix/patches/2_20/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
new file mode 100644
index 000000000000..6c5d8b785990
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_20/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
@@ -0,0 +1,320 @@
+From aa54b01af503644a393e4e4055c4ce2a23ce9139 Mon Sep 17 00:00:00 2001
+From: Puck Meerburg
+Date: Fri, 1 Mar 2024 11:42:24 -0500
+Subject: [PATCH 1/4] fix: Run all derivation builders inside the sandbox on
+ macOS
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim
+---
+ configure.ac | 6 +-
+ package.nix | 2 +
+ src/libstore/build/local-derivation-goal.cc | 217 ++++++++++----------
+ 3 files changed, 113 insertions(+), 112 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8c29c1e62..8c524fd93 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -58,13 +58,17 @@ AC_CHECK_TOOL([AR], [ar])
+ AC_SYS_LARGEFILE
+
+
+-# Solaris-specific stuff.
++# OS-specific stuff.
+ AC_STRUCT_DIRENT_D_TYPE
+ case "$host_os" in
+ solaris*)
+ # Solaris requires -lsocket -lnsl for network functions
+ LDFLAGS="-lsocket -lnsl $LDFLAGS"
+ ;;
++ darwin*)
++ # Need to link to libsandbox.
++ LDFLAGS="-lsandbox $LDFLAGS"
++ ;;
+ esac
+
+
+diff --git a/package.nix b/package.nix
+index d1d14d10e..40283ffcf 100644
+--- a/package.nix
++++ b/package.nix
+@@ -24,6 +24,7 @@
+ , libgit2
+ , libseccomp
+ , libsodium
++, darwin
+ , lowdown
+ , mdbook
+ , mdbook-linkcheck
+@@ -233,6 +234,7 @@ in {
+ gtest
+ rapidcheck
+ ] ++ lib.optional stdenv.isLinux libseccomp
++ ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.sandbox
+ ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid
+ # There have been issues building these dependencies
+ ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin))
+diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
+index b8228bc11..9ab676429 100644
+--- a/src/libstore/build/local-derivation-goal.cc
++++ b/src/libstore/build/local-derivation-goal.cc
+@@ -57,6 +57,10 @@
+ #if __APPLE__
+ #include
+ #include
++#include
++
++/* This definition is undocumented but depended upon by all major browsers. */
++extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags, const char *const parameters[], char **errorbuf);
+ #endif
+
+ #include
+@@ -2023,140 +2027,131 @@ void LocalDerivationGoal::runChild()
+
+ std::string builder = "invalid";
+
+- if (drv->isBuiltin()) {
+- ;
+- }
+ #if __APPLE__
+- else {
+- /* This has to appear before import statements. */
+- std::string sandboxProfile = "(version 1)\n";
+-
+- if (useChroot) {
+-
+- /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */
+- PathSet ancestry;
+-
+- /* We build the ancestry before adding all inputPaths to the store because we know they'll
+- all have the same parents (the store), and there might be lots of inputs. This isn't
+- particularly efficient... I doubt it'll be a bottleneck in practice */
+- for (auto & i : pathsInChroot) {
+- Path cur = i.first;
+- while (cur.compare("/") != 0) {
+- cur = dirOf(cur);
+- ancestry.insert(cur);
+- }
+- }
++ /* This has to appear before import statements. */
++ std::string sandboxProfile = "(version 1)\n";
+
+- /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost
+- path component this time, since it's typically /nix/store and we care about that. */
+- Path cur = worker.store.storeDir;
++ if (useChroot) {
++
++ /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */
++ PathSet ancestry;
++
++ /* We build the ancestry before adding all inputPaths to the store because we know they'll
++ all have the same parents (the store), and there might be lots of inputs. This isn't
++ particularly efficient... I doubt it'll be a bottleneck in practice */
++ for (auto & i : pathsInChroot) {
++ Path cur = i.first;
+ while (cur.compare("/") != 0) {
+- ancestry.insert(cur);
+ cur = dirOf(cur);
++ ancestry.insert(cur);
+ }
++ }
+
+- /* Add all our input paths to the chroot */
+- for (auto & i : inputPaths) {
+- auto p = worker.store.printStorePath(i);
+- pathsInChroot[p] = p;
+- }
++ /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost
++ path component this time, since it's typically /nix/store and we care about that. */
++ Path cur = worker.store.storeDir;
++ while (cur.compare("/") != 0) {
++ ancestry.insert(cur);
++ cur = dirOf(cur);
++ }
+
+- /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */
+- if (settings.darwinLogSandboxViolations) {
+- sandboxProfile += "(deny default)\n";
+- } else {
+- sandboxProfile += "(deny default (with no-log))\n";
+- }
++ /* Add all our input paths to the chroot */
++ for (auto & i : inputPaths) {
++ auto p = worker.store.printStorePath(i);
++ pathsInChroot[p] = p;
++ }
++
++ /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */
++ if (settings.darwinLogSandboxViolations) {
++ sandboxProfile += "(deny default)\n";
++ } else {
++ sandboxProfile += "(deny default (with no-log))\n";
++ }
+
++ sandboxProfile +=
++ #include "sandbox-defaults.sb"
++ ;
++
++ if (!derivationType->isSandboxed())
+ sandboxProfile +=
+- #include "sandbox-defaults.sb"
++ #include "sandbox-network.sb"
+ ;
+
+- if (!derivationType->isSandboxed())
+- sandboxProfile +=
+- #include "sandbox-network.sb"
+- ;
+-
+- /* Add the output paths we'll use at build-time to the chroot */
+- sandboxProfile += "(allow file-read* file-write* process-exec\n";
+- for (auto & [_, path] : scratchOutputs)
+- sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path));
+-
+- sandboxProfile += ")\n";
+-
+- /* Our inputs (transitive dependencies and any impurities computed above)
+-
+- without file-write* allowed, access() incorrectly returns EPERM
+- */
+- sandboxProfile += "(allow file-read* file-write* process-exec\n";
+- for (auto & i : pathsInChroot) {
+- if (i.first != i.second.source)
+- throw Error(
+- "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin",
+- i.first, i.second.source);
+-
+- std::string path = i.first;
+- struct stat st;
+- if (lstat(path.c_str(), &st)) {
+- if (i.second.optional && errno == ENOENT)
+- continue;
+- throw SysError("getting attributes of path '%s", path);
+- }
+- if (S_ISDIR(st.st_mode))
+- sandboxProfile += fmt("\t(subpath \"%s\")\n", path);
+- else
+- sandboxProfile += fmt("\t(literal \"%s\")\n", path);
+- }
+- sandboxProfile += ")\n";
++ /* Add the output paths we'll use at build-time to the chroot */
++ sandboxProfile += "(allow file-read* file-write* process-exec\n";
++ for (auto & [_, path] : scratchOutputs)
++ sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path));
+
+- /* Allow file-read* on full directory hierarchy to self. Allows realpath() */
+- sandboxProfile += "(allow file-read*\n";
+- for (auto & i : ancestry) {
+- sandboxProfile += fmt("\t(literal \"%s\")\n", i);
+- }
+- sandboxProfile += ")\n";
++ sandboxProfile += ")\n";
+
+- sandboxProfile += additionalSandboxProfile;
+- } else
+- sandboxProfile +=
+- #include "sandbox-minimal.sb"
+- ;
++ /* Our inputs (transitive dependencies and any impurities computed above)
++
++ without file-write* allowed, access() incorrectly returns EPERM
++ */
++ sandboxProfile += "(allow file-read* file-write* process-exec\n";
++ for (auto & i : pathsInChroot) {
++ if (i.first != i.second.source)
++ throw Error(
++ "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin",
++ i.first, i.second.source);
++
++ std::string path = i.first;
++ struct stat st;
++ if (lstat(path.c_str(), &st)) {
++ if (i.second.optional && errno == ENOENT)
++ continue;
++ throw SysError("getting attributes of path '%s", path);
++ }
++ if (S_ISDIR(st.st_mode))
++ sandboxProfile += fmt("\t(subpath \"%s\")\n", path);
++ else
++ sandboxProfile += fmt("\t(literal \"%s\")\n", path);
++ }
++ sandboxProfile += ")\n";
+
+- debug("Generated sandbox profile:");
+- debug(sandboxProfile);
++ /* Allow file-read* on full directory hierarchy to self. Allows realpath() */
++ sandboxProfile += "(allow file-read*\n";
++ for (auto & i : ancestry) {
++ sandboxProfile += fmt("\t(literal \"%s\")\n", i);
++ }
++ sandboxProfile += ")\n";
+
+- Path sandboxFile = tmpDir + "/.sandbox.sb";
++ sandboxProfile += additionalSandboxProfile;
++ } else
++ sandboxProfile +=
++ #include "sandbox-minimal.sb"
++ ;
+
+- writeFile(sandboxFile, sandboxProfile);
++ debug("Generated sandbox profile:");
++ debug(sandboxProfile);
+
+- bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking");
++ bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking");
+
+- /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms
+- to find temporary directories, so we want to open up a broader place for them to dump their files, if needed. */
+- Path globalTmpDir = canonPath(getEnvNonEmpty("TMPDIR").value_or("/tmp"), true);
++ /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms
++ to find temporary directories, so we want to open up a broader place for them to dump their files, if needed. */
++ Path globalTmpDir = canonPath(getEnvNonEmpty("TMPDIR").value_or("/tmp"), true);
+
+- /* They don't like trailing slashes on subpath directives */
+- if (globalTmpDir.back() == '/') globalTmpDir.pop_back();
++ /* They don't like trailing slashes on subpath directives */
++ if (globalTmpDir.back() == '/') globalTmpDir.pop_back();
+
+- if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") {
+- builder = "/usr/bin/sandbox-exec";
+- args.push_back("sandbox-exec");
+- args.push_back("-f");
+- args.push_back(sandboxFile);
+- args.push_back("-D");
+- args.push_back("_GLOBAL_TMP_DIR=" + globalTmpDir);
+- if (allowLocalNetworking) {
+- args.push_back("-D");
+- args.push_back(std::string("_ALLOW_LOCAL_NETWORKING=1"));
+- }
+- args.push_back(drv->builder);
+- } else {
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
++ if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") {
++ Strings sandboxArgs;
++ sandboxArgs.push_back("_GLOBAL_TMP_DIR");
++ sandboxArgs.push_back(globalTmpDir);
++ if (allowLocalNetworking) {
++ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING");
++ sandboxArgs.push_back("1");
++ }
++ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) {
++ writeFull(STDERR_FILENO, "failed to configure sandbox\n");
++ _exit(1);
+ }
+ }
++
++ builder = drv->builder;
++ args.push_back(std::string(baseNameOf(drv->builder)));
+ #else
+- else {
++ if (!drv->isBuiltin()) {
+ builder = drv->builder;
+ args.push_back(std::string(baseNameOf(drv->builder)));
+ }
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_20/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch b/pkgs/tools/package-management/nix/patches/2_20/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch
new file mode 100644
index 000000000000..d644be6703e7
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_20/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch
@@ -0,0 +1,34 @@
+From b78e489f79165457b59faa2270fd89769d0fc17d Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:44:12 +0200
+Subject: [PATCH 2/4] local-derivation-goal: Print sandbox error detail on
+ darwin
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Co-Authored-By: Théophane Hufschmitt
+Signed-off-by: Jörg Thalheim
+---
+ src/libstore/build/local-derivation-goal.cc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
+index 9ab676429..8476e038e 100644
+--- a/src/libstore/build/local-derivation-goal.cc
++++ b/src/libstore/build/local-derivation-goal.cc
+@@ -2142,8 +2142,9 @@ void LocalDerivationGoal::runChild()
+ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING");
+ sandboxArgs.push_back("1");
+ }
+- if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) {
+- writeFull(STDERR_FILENO, "failed to configure sandbox\n");
++ char * sandbox_errbuf = nullptr;
++ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), &sandbox_errbuf)) {
++ writeFull(STDERR_FILENO, fmt("failed to configure sandbox: %s\n", sandbox_errbuf ? sandbox_errbuf : "(null)"));
+ _exit(1);
+ }
+ }
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_20/0003-local-derivation-goal-Refactor.patch b/pkgs/tools/package-management/nix/patches/2_20/0003-local-derivation-goal-Refactor.patch
new file mode 100644
index 000000000000..05e8c5843ace
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_20/0003-local-derivation-goal-Refactor.patch
@@ -0,0 +1,41 @@
+From db6bcf3f7714929d5a21b655c5f8ccd2ddbdf7f2 Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:50:27 +0200
+Subject: [PATCH 3/4] local-derivation-goal: Refactor
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This works because the `builder` and `args` variables are only used
+in the non-builtin code path.
+
+Co-Authored-By: Théophane Hufschmitt
+Signed-off-by: Jörg Thalheim
+---
+ src/libstore/build/local-derivation-goal.cc | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
+index 8476e038e..12b67df69 100644
+--- a/src/libstore/build/local-derivation-goal.cc
++++ b/src/libstore/build/local-derivation-goal.cc
+@@ -2148,15 +2148,12 @@ void LocalDerivationGoal::runChild()
+ _exit(1);
+ }
+ }
++#endif
+
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
+-#else
+ if (!drv->isBuiltin()) {
+ builder = drv->builder;
+ args.push_back(std::string(baseNameOf(drv->builder)));
+ }
+-#endif
+
+ for (auto & i : drv->args)
+ args.push_back(rewriteStrings(i, inputRewrites));
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_20/0004-local-derivation-goal-Move-builder-preparation-to-no.patch b/pkgs/tools/package-management/nix/patches/2_20/0004-local-derivation-goal-Move-builder-preparation-to-no.patch
new file mode 100644
index 000000000000..852940d3b711
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_20/0004-local-derivation-goal-Move-builder-preparation-to-no.patch
@@ -0,0 +1,75 @@
+From 55be7deee1471e77e3ad408c5e23842df0d5bc28 Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:57:00 +0200
+Subject: [PATCH 4/4] local-derivation-goal: Move builder preparation to
+ non-builtin code path
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim
+---
+ src/libstore/build/local-derivation-goal.cc | 25 +++++++++------------
+ 1 file changed, 10 insertions(+), 15 deletions(-)
+
+diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
+index 12b67df69..ada86dbb8 100644
+--- a/src/libstore/build/local-derivation-goal.cc
++++ b/src/libstore/build/local-derivation-goal.cc
+@@ -2022,11 +2022,6 @@ void LocalDerivationGoal::runChild()
+ throw SysError("setuid failed");
+ }
+
+- /* Fill in the arguments. */
+- Strings args;
+-
+- std::string builder = "invalid";
+-
+ #if __APPLE__
+ /* This has to appear before import statements. */
+ std::string sandboxProfile = "(version 1)\n";
+@@ -2150,14 +2145,6 @@ void LocalDerivationGoal::runChild()
+ }
+ #endif
+
+- if (!drv->isBuiltin()) {
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
+- }
+-
+- for (auto & i : drv->args)
+- args.push_back(rewriteStrings(i, inputRewrites));
+-
+ /* Indicate that we managed to set up the build environment. */
+ writeFull(STDERR_FILENO, std::string("\2\n"));
+
+@@ -2187,6 +2174,14 @@ void LocalDerivationGoal::runChild()
+ }
+ }
+
++ // Now builder is not builtin
++
++ Strings args;
++ args.push_back(std::string(baseNameOf(drv->builder)));
++
++ for (auto & i : drv->args)
++ args.push_back(rewriteStrings(i, inputRewrites));
++
+ #if __APPLE__
+ posix_spawnattr_t attrp;
+
+@@ -2208,9 +2203,9 @@ void LocalDerivationGoal::runChild()
+ posix_spawnattr_setbinpref_np(&attrp, 1, &cpu, NULL);
+ }
+
+- posix_spawn(NULL, builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
++ posix_spawn(NULL, drv->builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
+ #else
+- execve(builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
++ execve(drv->builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
+ #endif
+
+ throw SysError("executing '%1%'", drv->builder);
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_21/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch b/pkgs/tools/package-management/nix/patches/2_21/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
new file mode 100644
index 000000000000..d35d20896e6b
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_21/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
@@ -0,0 +1,320 @@
+From ae8a38d29cc0fbd6394acd72fdaaa62b3798f698 Mon Sep 17 00:00:00 2001
+From: Puck Meerburg
+Date: Fri, 1 Mar 2024 11:42:24 -0500
+Subject: [PATCH 1/4] fix: Run all derivation builders inside the sandbox on
+ macOS
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim
+---
+ configure.ac | 6 +-
+ package.nix | 2 +
+ src/libstore/build/local-derivation-goal.cc | 217 ++++++++++----------
+ 3 files changed, 113 insertions(+), 112 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 676b145a5..f6fa35c81 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,13 +62,17 @@ AC_CHECK_TOOL([AR], [ar])
+ AC_SYS_LARGEFILE
+
+
+-# Solaris-specific stuff.
++# OS-specific stuff.
+ AC_STRUCT_DIRENT_D_TYPE
+ case "$host_os" in
+ solaris*)
+ # Solaris requires -lsocket -lnsl for network functions
+ LDFLAGS="-lsocket -lnsl $LDFLAGS"
+ ;;
++ darwin*)
++ # Need to link to libsandbox.
++ LDFLAGS="-lsandbox $LDFLAGS"
++ ;;
+ esac
+
+
+diff --git a/package.nix b/package.nix
+index 7d9a39771..de2e1aff1 100644
+--- a/package.nix
++++ b/package.nix
+@@ -25,6 +25,7 @@
+ , libseccomp
+ , libsodium
+ , man
++, darwin
+ , lowdown
+ , mdbook
+ , mdbook-linkcheck
+@@ -239,6 +240,7 @@ in {
+ gtest
+ rapidcheck
+ ] ++ lib.optional stdenv.isLinux libseccomp
++ ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.sandbox
+ ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid
+ # There have been issues building these dependencies
+ ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin))
+diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
+index 710304b67..c73b30b80 100644
+--- a/src/libstore/build/local-derivation-goal.cc
++++ b/src/libstore/build/local-derivation-goal.cc
+@@ -58,6 +58,10 @@
+ #if __APPLE__
+ #include
+ #include
++#include
++
++/* This definition is undocumented but depended upon by all major browsers. */
++extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags, const char *const parameters[], char **errorbuf);
+ #endif
+
+ #include
+@@ -2018,140 +2022,131 @@ void LocalDerivationGoal::runChild()
+
+ std::string builder = "invalid";
+
+- if (drv->isBuiltin()) {
+- ;
+- }
+ #if __APPLE__
+- else {
+- /* This has to appear before import statements. */
+- std::string sandboxProfile = "(version 1)\n";
+-
+- if (useChroot) {
+-
+- /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */
+- PathSet ancestry;
+-
+- /* We build the ancestry before adding all inputPaths to the store because we know they'll
+- all have the same parents (the store), and there might be lots of inputs. This isn't
+- particularly efficient... I doubt it'll be a bottleneck in practice */
+- for (auto & i : pathsInChroot) {
+- Path cur = i.first;
+- while (cur.compare("/") != 0) {
+- cur = dirOf(cur);
+- ancestry.insert(cur);
+- }
+- }
++ /* This has to appear before import statements. */
++ std::string sandboxProfile = "(version 1)\n";
+
+- /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost
+- path component this time, since it's typically /nix/store and we care about that. */
+- Path cur = worker.store.storeDir;
++ if (useChroot) {
++
++ /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */
++ PathSet ancestry;
++
++ /* We build the ancestry before adding all inputPaths to the store because we know they'll
++ all have the same parents (the store), and there might be lots of inputs. This isn't
++ particularly efficient... I doubt it'll be a bottleneck in practice */
++ for (auto & i : pathsInChroot) {
++ Path cur = i.first;
+ while (cur.compare("/") != 0) {
+- ancestry.insert(cur);
+ cur = dirOf(cur);
++ ancestry.insert(cur);
+ }
++ }
+
+- /* Add all our input paths to the chroot */
+- for (auto & i : inputPaths) {
+- auto p = worker.store.printStorePath(i);
+- pathsInChroot[p] = p;
+- }
++ /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost
++ path component this time, since it's typically /nix/store and we care about that. */
++ Path cur = worker.store.storeDir;
++ while (cur.compare("/") != 0) {
++ ancestry.insert(cur);
++ cur = dirOf(cur);
++ }
+
+- /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */
+- if (settings.darwinLogSandboxViolations) {
+- sandboxProfile += "(deny default)\n";
+- } else {
+- sandboxProfile += "(deny default (with no-log))\n";
+- }
++ /* Add all our input paths to the chroot */
++ for (auto & i : inputPaths) {
++ auto p = worker.store.printStorePath(i);
++ pathsInChroot[p] = p;
++ }
++
++ /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */
++ if (settings.darwinLogSandboxViolations) {
++ sandboxProfile += "(deny default)\n";
++ } else {
++ sandboxProfile += "(deny default (with no-log))\n";
++ }
+
++ sandboxProfile +=
++ #include "sandbox-defaults.sb"
++ ;
++
++ if (!derivationType->isSandboxed())
+ sandboxProfile +=
+- #include "sandbox-defaults.sb"
++ #include "sandbox-network.sb"
+ ;
+
+- if (!derivationType->isSandboxed())
+- sandboxProfile +=
+- #include "sandbox-network.sb"
+- ;
+-
+- /* Add the output paths we'll use at build-time to the chroot */
+- sandboxProfile += "(allow file-read* file-write* process-exec\n";
+- for (auto & [_, path] : scratchOutputs)
+- sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path));
+-
+- sandboxProfile += ")\n";
+-
+- /* Our inputs (transitive dependencies and any impurities computed above)
+-
+- without file-write* allowed, access() incorrectly returns EPERM
+- */
+- sandboxProfile += "(allow file-read* file-write* process-exec\n";
+- for (auto & i : pathsInChroot) {
+- if (i.first != i.second.source)
+- throw Error(
+- "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin",
+- i.first, i.second.source);
+-
+- std::string path = i.first;
+- struct stat st;
+- if (lstat(path.c_str(), &st)) {
+- if (i.second.optional && errno == ENOENT)
+- continue;
+- throw SysError("getting attributes of path '%s", path);
+- }
+- if (S_ISDIR(st.st_mode))
+- sandboxProfile += fmt("\t(subpath \"%s\")\n", path);
+- else
+- sandboxProfile += fmt("\t(literal \"%s\")\n", path);
+- }
+- sandboxProfile += ")\n";
++ /* Add the output paths we'll use at build-time to the chroot */
++ sandboxProfile += "(allow file-read* file-write* process-exec\n";
++ for (auto & [_, path] : scratchOutputs)
++ sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path));
+
+- /* Allow file-read* on full directory hierarchy to self. Allows realpath() */
+- sandboxProfile += "(allow file-read*\n";
+- for (auto & i : ancestry) {
+- sandboxProfile += fmt("\t(literal \"%s\")\n", i);
+- }
+- sandboxProfile += ")\n";
++ sandboxProfile += ")\n";
+
+- sandboxProfile += additionalSandboxProfile;
+- } else
+- sandboxProfile +=
+- #include "sandbox-minimal.sb"
+- ;
++ /* Our inputs (transitive dependencies and any impurities computed above)
++
++ without file-write* allowed, access() incorrectly returns EPERM
++ */
++ sandboxProfile += "(allow file-read* file-write* process-exec\n";
++ for (auto & i : pathsInChroot) {
++ if (i.first != i.second.source)
++ throw Error(
++ "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin",
++ i.first, i.second.source);
++
++ std::string path = i.first;
++ struct stat st;
++ if (lstat(path.c_str(), &st)) {
++ if (i.second.optional && errno == ENOENT)
++ continue;
++ throw SysError("getting attributes of path '%s", path);
++ }
++ if (S_ISDIR(st.st_mode))
++ sandboxProfile += fmt("\t(subpath \"%s\")\n", path);
++ else
++ sandboxProfile += fmt("\t(literal \"%s\")\n", path);
++ }
++ sandboxProfile += ")\n";
+
+- debug("Generated sandbox profile:");
+- debug(sandboxProfile);
++ /* Allow file-read* on full directory hierarchy to self. Allows realpath() */
++ sandboxProfile += "(allow file-read*\n";
++ for (auto & i : ancestry) {
++ sandboxProfile += fmt("\t(literal \"%s\")\n", i);
++ }
++ sandboxProfile += ")\n";
+
+- Path sandboxFile = tmpDir + "/.sandbox.sb";
++ sandboxProfile += additionalSandboxProfile;
++ } else
++ sandboxProfile +=
++ #include "sandbox-minimal.sb"
++ ;
+
+- writeFile(sandboxFile, sandboxProfile);
++ debug("Generated sandbox profile:");
++ debug(sandboxProfile);
+
+- bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking");
++ bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking");
+
+- /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms
+- to find temporary directories, so we want to open up a broader place for them to dump their files, if needed. */
+- Path globalTmpDir = canonPath(getEnvNonEmpty("TMPDIR").value_or("/tmp"), true);
++ /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms
++ to find temporary directories, so we want to open up a broader place for them to dump their files, if needed. */
++ Path globalTmpDir = canonPath(getEnvNonEmpty("TMPDIR").value_or("/tmp"), true);
+
+- /* They don't like trailing slashes on subpath directives */
+- if (globalTmpDir.back() == '/') globalTmpDir.pop_back();
++ /* They don't like trailing slashes on subpath directives */
++ if (globalTmpDir.back() == '/') globalTmpDir.pop_back();
+
+- if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") {
+- builder = "/usr/bin/sandbox-exec";
+- args.push_back("sandbox-exec");
+- args.push_back("-f");
+- args.push_back(sandboxFile);
+- args.push_back("-D");
+- args.push_back("_GLOBAL_TMP_DIR=" + globalTmpDir);
+- if (allowLocalNetworking) {
+- args.push_back("-D");
+- args.push_back(std::string("_ALLOW_LOCAL_NETWORKING=1"));
+- }
+- args.push_back(drv->builder);
+- } else {
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
++ if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") {
++ Strings sandboxArgs;
++ sandboxArgs.push_back("_GLOBAL_TMP_DIR");
++ sandboxArgs.push_back(globalTmpDir);
++ if (allowLocalNetworking) {
++ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING");
++ sandboxArgs.push_back("1");
++ }
++ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) {
++ writeFull(STDERR_FILENO, "failed to configure sandbox\n");
++ _exit(1);
+ }
+ }
++
++ builder = drv->builder;
++ args.push_back(std::string(baseNameOf(drv->builder)));
+ #else
+- else {
++ if (!drv->isBuiltin()) {
+ builder = drv->builder;
+ args.push_back(std::string(baseNameOf(drv->builder)));
+ }
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_21/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch b/pkgs/tools/package-management/nix/patches/2_21/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch
new file mode 100644
index 000000000000..053d3eb672d9
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_21/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch
@@ -0,0 +1,34 @@
+From b429e96583e2d005c77df8c82261022397f20648 Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:44:12 +0200
+Subject: [PATCH 2/4] local-derivation-goal: Print sandbox error detail on
+ darwin
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Co-Authored-By: Théophane Hufschmitt
+Signed-off-by: Jörg Thalheim
+---
+ src/libstore/build/local-derivation-goal.cc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
+index c73b30b80..e6f4c397d 100644
+--- a/src/libstore/build/local-derivation-goal.cc
++++ b/src/libstore/build/local-derivation-goal.cc
+@@ -2137,8 +2137,9 @@ void LocalDerivationGoal::runChild()
+ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING");
+ sandboxArgs.push_back("1");
+ }
+- if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) {
+- writeFull(STDERR_FILENO, "failed to configure sandbox\n");
++ char * sandbox_errbuf = nullptr;
++ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), &sandbox_errbuf)) {
++ writeFull(STDERR_FILENO, fmt("failed to configure sandbox: %s\n", sandbox_errbuf ? sandbox_errbuf : "(null)"));
+ _exit(1);
+ }
+ }
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_21/0003-local-derivation-goal-Refactor.patch b/pkgs/tools/package-management/nix/patches/2_21/0003-local-derivation-goal-Refactor.patch
new file mode 100644
index 000000000000..97809a556b57
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_21/0003-local-derivation-goal-Refactor.patch
@@ -0,0 +1,41 @@
+From 74b93c1edba00c2601e20b8acdcc78e29bd3f092 Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:50:27 +0200
+Subject: [PATCH 3/4] local-derivation-goal: Refactor
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This works because the `builder` and `args` variables are only used
+in the non-builtin code path.
+
+Co-Authored-By: Théophane Hufschmitt
+Signed-off-by: Jörg Thalheim
+---
+ src/libstore/build/local-derivation-goal.cc | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
+index e6f4c397d..e81818fa8 100644
+--- a/src/libstore/build/local-derivation-goal.cc
++++ b/src/libstore/build/local-derivation-goal.cc
+@@ -2143,15 +2143,12 @@ void LocalDerivationGoal::runChild()
+ _exit(1);
+ }
+ }
++#endif
+
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
+-#else
+ if (!drv->isBuiltin()) {
+ builder = drv->builder;
+ args.push_back(std::string(baseNameOf(drv->builder)));
+ }
+-#endif
+
+ for (auto & i : drv->args)
+ args.push_back(rewriteStrings(i, inputRewrites));
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_21/0004-local-derivation-goal-Move-builder-preparation-to-no.patch b/pkgs/tools/package-management/nix/patches/2_21/0004-local-derivation-goal-Move-builder-preparation-to-no.patch
new file mode 100644
index 000000000000..b2f3b2b7815c
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_21/0004-local-derivation-goal-Move-builder-preparation-to-no.patch
@@ -0,0 +1,75 @@
+From c8de35f74cbce58651c3b64ba66061040f546b9f Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:57:00 +0200
+Subject: [PATCH 4/4] local-derivation-goal: Move builder preparation to
+ non-builtin code path
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim
+---
+ src/libstore/build/local-derivation-goal.cc | 25 +++++++++------------
+ 1 file changed, 10 insertions(+), 15 deletions(-)
+
+diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
+index e81818fa8..078f1a5be 100644
+--- a/src/libstore/build/local-derivation-goal.cc
++++ b/src/libstore/build/local-derivation-goal.cc
+@@ -2017,11 +2017,6 @@ void LocalDerivationGoal::runChild()
+ throw SysError("setuid failed");
+ }
+
+- /* Fill in the arguments. */
+- Strings args;
+-
+- std::string builder = "invalid";
+-
+ #if __APPLE__
+ /* This has to appear before import statements. */
+ std::string sandboxProfile = "(version 1)\n";
+@@ -2145,14 +2140,6 @@ void LocalDerivationGoal::runChild()
+ }
+ #endif
+
+- if (!drv->isBuiltin()) {
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
+- }
+-
+- for (auto & i : drv->args)
+- args.push_back(rewriteStrings(i, inputRewrites));
+-
+ /* Indicate that we managed to set up the build environment. */
+ writeFull(STDERR_FILENO, std::string("\2\n"));
+
+@@ -2183,6 +2170,14 @@ void LocalDerivationGoal::runChild()
+ }
+ }
+
++ // Now builder is not builtin
++
++ Strings args;
++ args.push_back(std::string(baseNameOf(drv->builder)));
++
++ for (auto & i : drv->args)
++ args.push_back(rewriteStrings(i, inputRewrites));
++
+ #if __APPLE__
+ posix_spawnattr_t attrp;
+
+@@ -2204,9 +2199,9 @@ void LocalDerivationGoal::runChild()
+ posix_spawnattr_setbinpref_np(&attrp, 1, &cpu, NULL);
+ }
+
+- posix_spawn(NULL, builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
++ posix_spawn(NULL, drv->builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
+ #else
+- execve(builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
++ execve(drv->builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
+ #endif
+
+ throw SysError("executing '%1%'", drv->builder);
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_22/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch b/pkgs/tools/package-management/nix/patches/2_22/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
new file mode 100644
index 000000000000..72470dec5fd2
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_22/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
@@ -0,0 +1,327 @@
+From 8217054e3554ffd376f42fb0a65087a7af2ddfab Mon Sep 17 00:00:00 2001
+From: Puck Meerburg
+Date: Fri, 1 Mar 2024 11:42:24 -0500
+Subject: [PATCH 1/4] fix: Run all derivation builders inside the sandbox on
+ macOS
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim
+---
+ configure.ac | 6 +-
+ package.nix | 5 +-
+ .../unix/build/local-derivation-goal.cc | 223 +++++++++---------
+ 3 files changed, 118 insertions(+), 116 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8f60bf4be..5e67e04be 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,13 +62,17 @@ AC_CHECK_TOOL([AR], [ar])
+ AC_SYS_LARGEFILE
+
+
+-# Solaris-specific stuff.
++# OS-specific stuff.
+ AC_STRUCT_DIRENT_D_TYPE
+ case "$host_os" in
+ solaris*)
+ # Solaris requires -lsocket -lnsl for network functions
+ LDFLAGS="-lsocket -lnsl $LDFLAGS"
+ ;;
++ darwin*)
++ # Need to link to libsandbox.
++ LDFLAGS="-lsandbox $LDFLAGS"
++ ;;
+ esac
+
+
+diff --git a/package.nix b/package.nix
+index 59265f522..28be97400 100644
+--- a/package.nix
++++ b/package.nix
+@@ -27,6 +27,7 @@
+ , libseccomp
+ , libsodium
+ , man
++, darwin
+ , lowdown
+ , mdbook
+ , mdbook-linkcheck
+@@ -249,7 +250,9 @@ in {
+ ] ++ lib.optionals buildUnitTests [
+ gtest
+ rapidcheck
+- ] ++ lib.optional stdenv.isLinux (libseccomp.overrideAttrs (_: rec {
++ ]
++ ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.sandbox
++ ++ lib.optional stdenv.isLinux (libseccomp.overrideAttrs (_: rec {
+ version = "2.5.5";
+ src = fetchurl {
+ url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz";
+diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
+index b8ccdf834..449d4b07c 100644
+--- a/src/libstore/unix/build/local-derivation-goal.cc
++++ b/src/libstore/unix/build/local-derivation-goal.cc
+@@ -58,6 +58,10 @@
+ #if __APPLE__
+ #include
+ #include
++#include
++
++/* This definition is undocumented but depended upon by all major browsers. */
++extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags, const char *const parameters[], char **errorbuf);
+ #endif
+
+ #include
+@@ -2026,141 +2030,132 @@ void LocalDerivationGoal::runChild()
+
+ std::string builder = "invalid";
+
+- if (drv->isBuiltin()) {
+- ;
+- }
+ #if __APPLE__
+- else {
+- /* This has to appear before import statements. */
+- std::string sandboxProfile = "(version 1)\n";
+-
+- if (useChroot) {
+-
+- /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */
+- PathSet ancestry;
+-
+- /* We build the ancestry before adding all inputPaths to the store because we know they'll
+- all have the same parents (the store), and there might be lots of inputs. This isn't
+- particularly efficient... I doubt it'll be a bottleneck in practice */
+- for (auto & i : pathsInChroot) {
+- Path cur = i.first;
+- while (cur.compare("/") != 0) {
+- cur = dirOf(cur);
+- ancestry.insert(cur);
+- }
+- }
++ /* This has to appear before import statements. */
++ std::string sandboxProfile = "(version 1)\n";
++
++ if (useChroot) {
+
+- /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost
+- path component this time, since it's typically /nix/store and we care about that. */
+- Path cur = worker.store.storeDir;
++ /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */
++ PathSet ancestry;
++
++ /* We build the ancestry before adding all inputPaths to the store because we know they'll
++ all have the same parents (the store), and there might be lots of inputs. This isn't
++ particularly efficient... I doubt it'll be a bottleneck in practice */
++ for (auto & i : pathsInChroot) {
++ Path cur = i.first;
+ while (cur.compare("/") != 0) {
+- ancestry.insert(cur);
+ cur = dirOf(cur);
++ ancestry.insert(cur);
+ }
++ }
+
+- /* Add all our input paths to the chroot */
+- for (auto & i : inputPaths) {
+- auto p = worker.store.printStorePath(i);
+- pathsInChroot[p] = p;
+- }
+-
+- /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */
+- if (settings.darwinLogSandboxViolations) {
+- sandboxProfile += "(deny default)\n";
+- } else {
+- sandboxProfile += "(deny default (with no-log))\n";
+- }
++ /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost
++ path component this time, since it's typically /nix/store and we care about that. */
++ Path cur = worker.store.storeDir;
++ while (cur.compare("/") != 0) {
++ ancestry.insert(cur);
++ cur = dirOf(cur);
++ }
+
+- sandboxProfile +=
+- #include "sandbox-defaults.sb"
+- ;
++ /* Add all our input paths to the chroot */
++ for (auto & i : inputPaths) {
++ auto p = worker.store.printStorePath(i);
++ pathsInChroot[p] = p;
++ }
+
+- if (!derivationType->isSandboxed())
+- sandboxProfile +=
+- #include "sandbox-network.sb"
+- ;
+-
+- /* Add the output paths we'll use at build-time to the chroot */
+- sandboxProfile += "(allow file-read* file-write* process-exec\n";
+- for (auto & [_, path] : scratchOutputs)
+- sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path));
+-
+- sandboxProfile += ")\n";
+-
+- /* Our inputs (transitive dependencies and any impurities computed above)
+-
+- without file-write* allowed, access() incorrectly returns EPERM
+- */
+- sandboxProfile += "(allow file-read* file-write* process-exec\n";
+- for (auto & i : pathsInChroot) {
+- if (i.first != i.second.source)
+- throw Error(
+- "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin",
+- i.first, i.second.source);
+-
+- std::string path = i.first;
+- auto optSt = maybeLstat(path.c_str());
+- if (!optSt) {
+- if (i.second.optional)
+- continue;
+- throw SysError("getting attributes of required path '%s", path);
+- }
+- if (S_ISDIR(optSt->st_mode))
+- sandboxProfile += fmt("\t(subpath \"%s\")\n", path);
+- else
+- sandboxProfile += fmt("\t(literal \"%s\")\n", path);
+- }
+- sandboxProfile += ")\n";
++ /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */
++ if (settings.darwinLogSandboxViolations) {
++ sandboxProfile += "(deny default)\n";
++ } else {
++ sandboxProfile += "(deny default (with no-log))\n";
++ }
+
+- /* Allow file-read* on full directory hierarchy to self. Allows realpath() */
+- sandboxProfile += "(allow file-read*\n";
+- for (auto & i : ancestry) {
+- sandboxProfile += fmt("\t(literal \"%s\")\n", i);
+- }
+- sandboxProfile += ")\n";
++ sandboxProfile +=
++ #include "sandbox-defaults.sb"
++ ;
+
+- sandboxProfile += additionalSandboxProfile;
+- } else
++ if (!derivationType->isSandboxed())
+ sandboxProfile +=
+- #include "sandbox-minimal.sb"
++ #include "sandbox-network.sb"
+ ;
+
+- debug("Generated sandbox profile:");
+- debug(sandboxProfile);
+-
+- Path sandboxFile = tmpDir + "/.sandbox.sb";
++ /* Add the output paths we'll use at build-time to the chroot */
++ sandboxProfile += "(allow file-read* file-write* process-exec\n";
++ for (auto & [_, path] : scratchOutputs)
++ sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path));
+
+- writeFile(sandboxFile, sandboxProfile);
++ sandboxProfile += ")\n";
+
+- bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking");
++ /* Our inputs (transitive dependencies and any impurities computed above)
+
+- /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms
+- to find temporary directories, so we want to open up a broader place for them to put their files, if needed. */
+- Path globalTmpDir = canonPath(defaultTempDir(), true);
++ without file-write* allowed, access() incorrectly returns EPERM
++ */
++ sandboxProfile += "(allow file-read* file-write* process-exec\n";
++ for (auto & i : pathsInChroot) {
++ if (i.first != i.second.source)
++ throw Error(
++ "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin",
++ i.first, i.second.source);
++
++ std::string path = i.first;
++ auto optSt = maybeLstat(path.c_str());
++ if (!optSt) {
++ if (i.second.optional)
++ continue;
++ throw SysError("getting attributes of required path '%s", path);
++ }
++ if (S_ISDIR(optSt->st_mode))
++ sandboxProfile += fmt("\t(subpath \"%s\")\n", path);
++ else
++ sandboxProfile += fmt("\t(literal \"%s\")\n", path);
++ }
++ sandboxProfile += ")\n";
+
+- /* They don't like trailing slashes on subpath directives */
+- while (!globalTmpDir.empty() && globalTmpDir.back() == '/')
+- globalTmpDir.pop_back();
++ /* Allow file-read* on full directory hierarchy to self. Allows realpath() */
++ sandboxProfile += "(allow file-read*\n";
++ for (auto & i : ancestry) {
++ sandboxProfile += fmt("\t(literal \"%s\")\n", i);
++ }
++ sandboxProfile += ")\n";
+
+- if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") {
+- builder = "/usr/bin/sandbox-exec";
+- args.push_back("sandbox-exec");
+- args.push_back("-f");
+- args.push_back(sandboxFile);
+- args.push_back("-D");
+- args.push_back("_GLOBAL_TMP_DIR=" + globalTmpDir);
+- if (allowLocalNetworking) {
+- args.push_back("-D");
+- args.push_back(std::string("_ALLOW_LOCAL_NETWORKING=1"));
+- }
+- args.push_back(drv->builder);
+- } else {
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
++ sandboxProfile += additionalSandboxProfile;
++ } else
++ sandboxProfile +=
++ #include "sandbox-minimal.sb"
++ ;
++
++ debug("Generated sandbox profile:");
++ debug(sandboxProfile);
++
++ bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking");
++
++ /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms
++ to find temporary directories, so we want to open up a broader place for them to put their files, if needed. */
++ Path globalTmpDir = canonPath(defaultTempDir(), true);
++
++ /* They don't like trailing slashes on subpath directives */
++ while (!globalTmpDir.empty() && globalTmpDir.back() == '/')
++ globalTmpDir.pop_back();
++
++ if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") {
++ Strings sandboxArgs;
++ sandboxArgs.push_back("_GLOBAL_TMP_DIR");
++ sandboxArgs.push_back(globalTmpDir);
++ if (allowLocalNetworking) {
++ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING");
++ sandboxArgs.push_back("1");
++ }
++ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) {
++ writeFull(STDERR_FILENO, "failed to configure sandbox\n");
++ _exit(1);
+ }
+ }
++
++ builder = drv->builder;
++ args.push_back(std::string(baseNameOf(drv->builder)));
+ #else
+- else {
++ if (!drv->isBuiltin()) {
+ builder = drv->builder;
+ args.push_back(std::string(baseNameOf(drv->builder)));
+ }
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_22/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch b/pkgs/tools/package-management/nix/patches/2_22/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch
new file mode 100644
index 000000000000..6ac281e6316c
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_22/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch
@@ -0,0 +1,34 @@
+From f0677f190d0bd042c3a864508a5307b19a2c2d26 Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:44:12 +0200
+Subject: [PATCH 2/4] local-derivation-goal: Print sandbox error detail on
+ darwin
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Co-Authored-By: Théophane Hufschmitt
+Signed-off-by: Jörg Thalheim
+---
+ src/libstore/unix/build/local-derivation-goal.cc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
+index 449d4b07c..b74bd2e64 100644
+--- a/src/libstore/unix/build/local-derivation-goal.cc
++++ b/src/libstore/unix/build/local-derivation-goal.cc
+@@ -2146,8 +2146,9 @@ void LocalDerivationGoal::runChild()
+ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING");
+ sandboxArgs.push_back("1");
+ }
+- if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) {
+- writeFull(STDERR_FILENO, "failed to configure sandbox\n");
++ char * sandbox_errbuf = nullptr;
++ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), &sandbox_errbuf)) {
++ writeFull(STDERR_FILENO, fmt("failed to configure sandbox: %s\n", sandbox_errbuf ? sandbox_errbuf : "(null)"));
+ _exit(1);
+ }
+ }
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_22/0003-local-derivation-goal-Refactor.patch b/pkgs/tools/package-management/nix/patches/2_22/0003-local-derivation-goal-Refactor.patch
new file mode 100644
index 000000000000..dfb5add1978d
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_22/0003-local-derivation-goal-Refactor.patch
@@ -0,0 +1,41 @@
+From 1b39753f4d63465c709d18482945ce680b6f3f1e Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:50:27 +0200
+Subject: [PATCH 3/4] local-derivation-goal: Refactor
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This works because the `builder` and `args` variables are only used
+in the non-builtin code path.
+
+Co-Authored-By: Théophane Hufschmitt
+Signed-off-by: Jörg Thalheim
+---
+ src/libstore/unix/build/local-derivation-goal.cc | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
+index b74bd2e64..9b8b3c51b 100644
+--- a/src/libstore/unix/build/local-derivation-goal.cc
++++ b/src/libstore/unix/build/local-derivation-goal.cc
+@@ -2152,15 +2152,12 @@ void LocalDerivationGoal::runChild()
+ _exit(1);
+ }
+ }
++#endif
+
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
+-#else
+ if (!drv->isBuiltin()) {
+ builder = drv->builder;
+ args.push_back(std::string(baseNameOf(drv->builder)));
+ }
+-#endif
+
+ for (auto & i : drv->args)
+ args.push_back(rewriteStrings(i, inputRewrites));
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_22/0004-local-derivation-goal-Move-builder-preparation-to-no.patch b/pkgs/tools/package-management/nix/patches/2_22/0004-local-derivation-goal-Move-builder-preparation-to-no.patch
new file mode 100644
index 000000000000..8e200685dc73
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_22/0004-local-derivation-goal-Move-builder-preparation-to-no.patch
@@ -0,0 +1,75 @@
+From 9e198a75f76ac08f835975d4b2743e156616a219 Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:57:00 +0200
+Subject: [PATCH 4/4] local-derivation-goal: Move builder preparation to
+ non-builtin code path
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim
+---
+ .../unix/build/local-derivation-goal.cc | 25 ++++++++-----------
+ 1 file changed, 10 insertions(+), 15 deletions(-)
+
+diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
+index 9b8b3c51b..08366712c 100644
+--- a/src/libstore/unix/build/local-derivation-goal.cc
++++ b/src/libstore/unix/build/local-derivation-goal.cc
+@@ -2025,11 +2025,6 @@ void LocalDerivationGoal::runChild()
+ throw SysError("setuid failed");
+ }
+
+- /* Fill in the arguments. */
+- Strings args;
+-
+- std::string builder = "invalid";
+-
+ #if __APPLE__
+ /* This has to appear before import statements. */
+ std::string sandboxProfile = "(version 1)\n";
+@@ -2154,14 +2149,6 @@ void LocalDerivationGoal::runChild()
+ }
+ #endif
+
+- if (!drv->isBuiltin()) {
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
+- }
+-
+- for (auto & i : drv->args)
+- args.push_back(rewriteStrings(i, inputRewrites));
+-
+ /* Indicate that we managed to set up the build environment. */
+ writeFull(STDERR_FILENO, std::string("\2\n"));
+
+@@ -2192,6 +2179,14 @@ void LocalDerivationGoal::runChild()
+ }
+ }
+
++ // Now builder is not builtin
++
++ Strings args;
++ args.push_back(std::string(baseNameOf(drv->builder)));
++
++ for (auto & i : drv->args)
++ args.push_back(rewriteStrings(i, inputRewrites));
++
+ #if __APPLE__
+ posix_spawnattr_t attrp;
+
+@@ -2213,9 +2208,9 @@ void LocalDerivationGoal::runChild()
+ posix_spawnattr_setbinpref_np(&attrp, 1, &cpu, NULL);
+ }
+
+- posix_spawn(NULL, builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
++ posix_spawn(NULL, drv->builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
+ #else
+- execve(builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
++ execve(drv->builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
+ #endif
+
+ throw SysError("executing '%1%'", drv->builder);
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_23/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch b/pkgs/tools/package-management/nix/patches/2_23/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
new file mode 100644
index 000000000000..f309ff6818d4
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_23/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
@@ -0,0 +1,323 @@
+From 05994033d58e358ddafe51d1d04626eb76b8a192 Mon Sep 17 00:00:00 2001
+From: Puck Meerburg
+Date: Fri, 1 Mar 2024 11:42:24 -0500
+Subject: [PATCH 1/4] fix: Run all derivation builders inside the sandbox on
+ macOS
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim
+---
+ configure.ac | 6 +-
+ package.nix | 2 +
+ .../unix/build/local-derivation-goal.cc | 223 +++++++++---------
+ 3 files changed, 116 insertions(+), 115 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 90a6d45d5..f98a0a5ea 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,12 +62,16 @@ AC_CHECK_TOOL([AR], [ar])
+ AC_SYS_LARGEFILE
+
+
+-# Solaris-specific stuff.
++# OS-specific stuff.
+ case "$host_os" in
+ solaris*)
+ # Solaris requires -lsocket -lnsl for network functions
+ LDFLAGS="-lsocket -lnsl $LDFLAGS"
+ ;;
++ darwin*)
++ # Need to link to libsandbox.
++ LDFLAGS="-lsandbox $LDFLAGS"
++ ;;
+ esac
+
+
+diff --git a/package.nix b/package.nix
+index cf1654c6a..1dfe7ab31 100644
+--- a/package.nix
++++ b/package.nix
+@@ -27,6 +27,7 @@
+ , libseccomp
+ , libsodium
+ , man
++, darwin
+ , lowdown
+ , mdbook
+ , mdbook-linkcheck
+@@ -250,6 +251,7 @@ in {
+ gtest
+ rapidcheck
+ ] ++ lib.optional stdenv.isLinux libseccomp
++ ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.sandbox
+ ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid
+ # There have been issues building these dependencies
+ ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin))
+diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
+index ae9c715d6..878644fa5 100644
+--- a/src/libstore/unix/build/local-derivation-goal.cc
++++ b/src/libstore/unix/build/local-derivation-goal.cc
+@@ -58,6 +58,10 @@
+ #if __APPLE__
+ #include
+ #include
++#include
++
++/* This definition is undocumented but depended upon by all major browsers. */
++extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags, const char *const parameters[], char **errorbuf);
+ #endif
+
+ #include
+@@ -2017,141 +2021,132 @@ void LocalDerivationGoal::runChild()
+
+ std::string builder = "invalid";
+
+- if (drv->isBuiltin()) {
+- ;
+- }
+ #if __APPLE__
+- else {
+- /* This has to appear before import statements. */
+- std::string sandboxProfile = "(version 1)\n";
+-
+- if (useChroot) {
+-
+- /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */
+- PathSet ancestry;
+-
+- /* We build the ancestry before adding all inputPaths to the store because we know they'll
+- all have the same parents (the store), and there might be lots of inputs. This isn't
+- particularly efficient... I doubt it'll be a bottleneck in practice */
+- for (auto & i : pathsInChroot) {
+- Path cur = i.first;
+- while (cur.compare("/") != 0) {
+- cur = dirOf(cur);
+- ancestry.insert(cur);
+- }
+- }
++ /* This has to appear before import statements. */
++ std::string sandboxProfile = "(version 1)\n";
++
++ if (useChroot) {
+
+- /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost
+- path component this time, since it's typically /nix/store and we care about that. */
+- Path cur = worker.store.storeDir;
++ /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */
++ PathSet ancestry;
++
++ /* We build the ancestry before adding all inputPaths to the store because we know they'll
++ all have the same parents (the store), and there might be lots of inputs. This isn't
++ particularly efficient... I doubt it'll be a bottleneck in practice */
++ for (auto & i : pathsInChroot) {
++ Path cur = i.first;
+ while (cur.compare("/") != 0) {
+- ancestry.insert(cur);
+ cur = dirOf(cur);
++ ancestry.insert(cur);
+ }
++ }
+
+- /* Add all our input paths to the chroot */
+- for (auto & i : inputPaths) {
+- auto p = worker.store.printStorePath(i);
+- pathsInChroot[p] = p;
+- }
+-
+- /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */
+- if (settings.darwinLogSandboxViolations) {
+- sandboxProfile += "(deny default)\n";
+- } else {
+- sandboxProfile += "(deny default (with no-log))\n";
+- }
++ /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost
++ path component this time, since it's typically /nix/store and we care about that. */
++ Path cur = worker.store.storeDir;
++ while (cur.compare("/") != 0) {
++ ancestry.insert(cur);
++ cur = dirOf(cur);
++ }
+
+- sandboxProfile +=
+- #include "sandbox-defaults.sb"
+- ;
++ /* Add all our input paths to the chroot */
++ for (auto & i : inputPaths) {
++ auto p = worker.store.printStorePath(i);
++ pathsInChroot[p] = p;
++ }
+
+- if (!derivationType->isSandboxed())
+- sandboxProfile +=
+- #include "sandbox-network.sb"
+- ;
+-
+- /* Add the output paths we'll use at build-time to the chroot */
+- sandboxProfile += "(allow file-read* file-write* process-exec\n";
+- for (auto & [_, path] : scratchOutputs)
+- sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path));
+-
+- sandboxProfile += ")\n";
+-
+- /* Our inputs (transitive dependencies and any impurities computed above)
+-
+- without file-write* allowed, access() incorrectly returns EPERM
+- */
+- sandboxProfile += "(allow file-read* file-write* process-exec\n";
+- for (auto & i : pathsInChroot) {
+- if (i.first != i.second.source)
+- throw Error(
+- "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin",
+- i.first, i.second.source);
+-
+- std::string path = i.first;
+- auto optSt = maybeLstat(path.c_str());
+- if (!optSt) {
+- if (i.second.optional)
+- continue;
+- throw SysError("getting attributes of required path '%s", path);
+- }
+- if (S_ISDIR(optSt->st_mode))
+- sandboxProfile += fmt("\t(subpath \"%s\")\n", path);
+- else
+- sandboxProfile += fmt("\t(literal \"%s\")\n", path);
+- }
+- sandboxProfile += ")\n";
++ /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */
++ if (settings.darwinLogSandboxViolations) {
++ sandboxProfile += "(deny default)\n";
++ } else {
++ sandboxProfile += "(deny default (with no-log))\n";
++ }
+
+- /* Allow file-read* on full directory hierarchy to self. Allows realpath() */
+- sandboxProfile += "(allow file-read*\n";
+- for (auto & i : ancestry) {
+- sandboxProfile += fmt("\t(literal \"%s\")\n", i);
+- }
+- sandboxProfile += ")\n";
++ sandboxProfile +=
++ #include "sandbox-defaults.sb"
++ ;
+
+- sandboxProfile += additionalSandboxProfile;
+- } else
++ if (!derivationType->isSandboxed())
+ sandboxProfile +=
+- #include "sandbox-minimal.sb"
++ #include "sandbox-network.sb"
+ ;
+
+- debug("Generated sandbox profile:");
+- debug(sandboxProfile);
+-
+- Path sandboxFile = tmpDir + "/.sandbox.sb";
++ /* Add the output paths we'll use at build-time to the chroot */
++ sandboxProfile += "(allow file-read* file-write* process-exec\n";
++ for (auto & [_, path] : scratchOutputs)
++ sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path));
+
+- writeFile(sandboxFile, sandboxProfile);
++ sandboxProfile += ")\n";
+
+- bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking");
++ /* Our inputs (transitive dependencies and any impurities computed above)
+
+- /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms
+- to find temporary directories, so we want to open up a broader place for them to put their files, if needed. */
+- Path globalTmpDir = canonPath(defaultTempDir(), true);
++ without file-write* allowed, access() incorrectly returns EPERM
++ */
++ sandboxProfile += "(allow file-read* file-write* process-exec\n";
++ for (auto & i : pathsInChroot) {
++ if (i.first != i.second.source)
++ throw Error(
++ "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin",
++ i.first, i.second.source);
++
++ std::string path = i.first;
++ auto optSt = maybeLstat(path.c_str());
++ if (!optSt) {
++ if (i.second.optional)
++ continue;
++ throw SysError("getting attributes of required path '%s", path);
++ }
++ if (S_ISDIR(optSt->st_mode))
++ sandboxProfile += fmt("\t(subpath \"%s\")\n", path);
++ else
++ sandboxProfile += fmt("\t(literal \"%s\")\n", path);
++ }
++ sandboxProfile += ")\n";
+
+- /* They don't like trailing slashes on subpath directives */
+- while (!globalTmpDir.empty() && globalTmpDir.back() == '/')
+- globalTmpDir.pop_back();
++ /* Allow file-read* on full directory hierarchy to self. Allows realpath() */
++ sandboxProfile += "(allow file-read*\n";
++ for (auto & i : ancestry) {
++ sandboxProfile += fmt("\t(literal \"%s\")\n", i);
++ }
++ sandboxProfile += ")\n";
+
+- if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") {
+- builder = "/usr/bin/sandbox-exec";
+- args.push_back("sandbox-exec");
+- args.push_back("-f");
+- args.push_back(sandboxFile);
+- args.push_back("-D");
+- args.push_back("_GLOBAL_TMP_DIR=" + globalTmpDir);
+- if (allowLocalNetworking) {
+- args.push_back("-D");
+- args.push_back(std::string("_ALLOW_LOCAL_NETWORKING=1"));
+- }
+- args.push_back(drv->builder);
+- } else {
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
++ sandboxProfile += additionalSandboxProfile;
++ } else
++ sandboxProfile +=
++ #include "sandbox-minimal.sb"
++ ;
++
++ debug("Generated sandbox profile:");
++ debug(sandboxProfile);
++
++ bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking");
++
++ /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms
++ to find temporary directories, so we want to open up a broader place for them to put their files, if needed. */
++ Path globalTmpDir = canonPath(defaultTempDir(), true);
++
++ /* They don't like trailing slashes on subpath directives */
++ while (!globalTmpDir.empty() && globalTmpDir.back() == '/')
++ globalTmpDir.pop_back();
++
++ if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") {
++ Strings sandboxArgs;
++ sandboxArgs.push_back("_GLOBAL_TMP_DIR");
++ sandboxArgs.push_back(globalTmpDir);
++ if (allowLocalNetworking) {
++ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING");
++ sandboxArgs.push_back("1");
++ }
++ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) {
++ writeFull(STDERR_FILENO, "failed to configure sandbox\n");
++ _exit(1);
+ }
+ }
++
++ builder = drv->builder;
++ args.push_back(std::string(baseNameOf(drv->builder)));
+ #else
+- else {
++ if (!drv->isBuiltin()) {
+ builder = drv->builder;
+ args.push_back(std::string(baseNameOf(drv->builder)));
+ }
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_23/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch b/pkgs/tools/package-management/nix/patches/2_23/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch
new file mode 100644
index 000000000000..e264b4f1b4dc
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_23/0002-local-derivation-goal-Print-sandbox-error-detail-on-.patch
@@ -0,0 +1,34 @@
+From c43954ffac356b4168cbcfe2a67b4bad3f0dff5d Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:44:12 +0200
+Subject: [PATCH 2/4] local-derivation-goal: Print sandbox error detail on
+ darwin
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Co-Authored-By: Théophane Hufschmitt
+Signed-off-by: Jörg Thalheim
+---
+ src/libstore/unix/build/local-derivation-goal.cc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
+index 878644fa5..0df1f0683 100644
+--- a/src/libstore/unix/build/local-derivation-goal.cc
++++ b/src/libstore/unix/build/local-derivation-goal.cc
+@@ -2137,8 +2137,9 @@ void LocalDerivationGoal::runChild()
+ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING");
+ sandboxArgs.push_back("1");
+ }
+- if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) {
+- writeFull(STDERR_FILENO, "failed to configure sandbox\n");
++ char * sandbox_errbuf = nullptr;
++ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), &sandbox_errbuf)) {
++ writeFull(STDERR_FILENO, fmt("failed to configure sandbox: %s\n", sandbox_errbuf ? sandbox_errbuf : "(null)"));
+ _exit(1);
+ }
+ }
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_23/0003-local-derivation-goal-Refactor.patch b/pkgs/tools/package-management/nix/patches/2_23/0003-local-derivation-goal-Refactor.patch
new file mode 100644
index 000000000000..27c632b041dd
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_23/0003-local-derivation-goal-Refactor.patch
@@ -0,0 +1,41 @@
+From 53b4bdcb8b0f114bea978cffbea325fd73f779b5 Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:50:27 +0200
+Subject: [PATCH 3/4] local-derivation-goal: Refactor
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This works because the `builder` and `args` variables are only used
+in the non-builtin code path.
+
+Co-Authored-By: Théophane Hufschmitt
+Signed-off-by: Jörg Thalheim
+---
+ src/libstore/unix/build/local-derivation-goal.cc | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
+index 0df1f0683..9e67283c9 100644
+--- a/src/libstore/unix/build/local-derivation-goal.cc
++++ b/src/libstore/unix/build/local-derivation-goal.cc
+@@ -2143,15 +2143,12 @@ void LocalDerivationGoal::runChild()
+ _exit(1);
+ }
+ }
++#endif
+
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
+-#else
+ if (!drv->isBuiltin()) {
+ builder = drv->builder;
+ args.push_back(std::string(baseNameOf(drv->builder)));
+ }
+-#endif
+
+ for (auto & i : drv->args)
+ args.push_back(rewriteStrings(i, inputRewrites));
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_23/0004-local-derivation-goal-Move-builder-preparation-to-no.patch b/pkgs/tools/package-management/nix/patches/2_23/0004-local-derivation-goal-Move-builder-preparation-to-no.patch
new file mode 100644
index 000000000000..6ef5c8e48c4c
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_23/0004-local-derivation-goal-Move-builder-preparation-to-no.patch
@@ -0,0 +1,75 @@
+From 67b5c7004302cbd344f63ccd306673a9adec4520 Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:57:00 +0200
+Subject: [PATCH 4/4] local-derivation-goal: Move builder preparation to
+ non-builtin code path
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim
+---
+ .../unix/build/local-derivation-goal.cc | 25 ++++++++-----------
+ 1 file changed, 10 insertions(+), 15 deletions(-)
+
+diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
+index 9e67283c9..1f4bafb56 100644
+--- a/src/libstore/unix/build/local-derivation-goal.cc
++++ b/src/libstore/unix/build/local-derivation-goal.cc
+@@ -2016,11 +2016,6 @@ void LocalDerivationGoal::runChild()
+ throw SysError("setuid failed");
+ }
+
+- /* Fill in the arguments. */
+- Strings args;
+-
+- std::string builder = "invalid";
+-
+ #if __APPLE__
+ /* This has to appear before import statements. */
+ std::string sandboxProfile = "(version 1)\n";
+@@ -2145,14 +2140,6 @@ void LocalDerivationGoal::runChild()
+ }
+ #endif
+
+- if (!drv->isBuiltin()) {
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
+- }
+-
+- for (auto & i : drv->args)
+- args.push_back(rewriteStrings(i, inputRewrites));
+-
+ /* Indicate that we managed to set up the build environment. */
+ writeFull(STDERR_FILENO, std::string("\2\n"));
+
+@@ -2183,6 +2170,14 @@ void LocalDerivationGoal::runChild()
+ }
+ }
+
++ // Now builder is not builtin
++
++ Strings args;
++ args.push_back(std::string(baseNameOf(drv->builder)));
++
++ for (auto & i : drv->args)
++ args.push_back(rewriteStrings(i, inputRewrites));
++
+ #if __APPLE__
+ posix_spawnattr_t attrp;
+
+@@ -2204,9 +2199,9 @@ void LocalDerivationGoal::runChild()
+ posix_spawnattr_setbinpref_np(&attrp, 1, &cpu, NULL);
+ }
+
+- posix_spawn(NULL, builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
++ posix_spawn(NULL, drv->builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
+ #else
+- execve(builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
++ execve(drv->builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
+ #endif
+
+ throw SysError("executing '%1%'", drv->builder);
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_24/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch b/pkgs/tools/package-management/nix/patches/2_24/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
new file mode 100644
index 000000000000..9c3d5f987da2
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_24/0001-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
@@ -0,0 +1,323 @@
+From 170242cf0ca3e9fadbad2004126793634d56623e Mon Sep 17 00:00:00 2001
+From: Puck Meerburg
+Date: Fri, 1 Mar 2024 11:42:24 -0500
+Subject: [PATCH 1/5] fix: Run all derivation builders inside the sandbox on
+ macOS
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim
+---
+ configure.ac | 6 +-
+ package.nix | 2 +
+ .../unix/build/local-derivation-goal.cc | 223 +++++++++---------
+ 3 files changed, 116 insertions(+), 115 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5c22ed176..dff35981b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,12 +62,16 @@ AC_CHECK_TOOL([AR], [ar])
+ AC_SYS_LARGEFILE
+
+
+-# Solaris-specific stuff.
++# OS-specific stuff.
+ case "$host_os" in
+ solaris*)
+ # Solaris requires -lsocket -lnsl for network functions
+ LDFLAGS="-lsocket -lnsl $LDFLAGS"
+ ;;
++ darwin*)
++ # Need to link to libsandbox.
++ LDFLAGS="-lsandbox $LDFLAGS"
++ ;;
+ esac
+
+
+diff --git a/package.nix b/package.nix
+index a7c8923e8..fcd1e1898 100644
+--- a/package.nix
++++ b/package.nix
+@@ -23,6 +23,7 @@
+ , libseccomp
+ , libsodium
+ , man
++, darwin
+ , lowdown
+ , mdbook
+ , mdbook-linkcheck
+@@ -235,6 +236,7 @@ in {
+ gtest
+ rapidcheck
+ ] ++ lib.optional stdenv.isLinux libseccomp
++ ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.sandbox
+ ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid
+ # There have been issues building these dependencies
+ ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin))
+diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
+index 54ca69580..7ce266122 100644
+--- a/src/libstore/unix/build/local-derivation-goal.cc
++++ b/src/libstore/unix/build/local-derivation-goal.cc
+@@ -58,6 +58,10 @@
+ #if __APPLE__
+ #include
+ #include
++#include
++
++/* This definition is undocumented but depended upon by all major browsers. */
++extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags, const char *const parameters[], char **errorbuf);
+ #endif
+
+ #include
+@@ -2039,141 +2043,132 @@ void LocalDerivationGoal::runChild()
+
+ std::string builder = "invalid";
+
+- if (drv->isBuiltin()) {
+- ;
+- }
+ #if __APPLE__
+- else {
+- /* This has to appear before import statements. */
+- std::string sandboxProfile = "(version 1)\n";
+-
+- if (useChroot) {
+-
+- /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */
+- PathSet ancestry;
+-
+- /* We build the ancestry before adding all inputPaths to the store because we know they'll
+- all have the same parents (the store), and there might be lots of inputs. This isn't
+- particularly efficient... I doubt it'll be a bottleneck in practice */
+- for (auto & i : pathsInChroot) {
+- Path cur = i.first;
+- while (cur.compare("/") != 0) {
+- cur = dirOf(cur);
+- ancestry.insert(cur);
+- }
+- }
++ /* This has to appear before import statements. */
++ std::string sandboxProfile = "(version 1)\n";
++
++ if (useChroot) {
+
+- /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost
+- path component this time, since it's typically /nix/store and we care about that. */
+- Path cur = worker.store.storeDir;
++ /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */
++ PathSet ancestry;
++
++ /* We build the ancestry before adding all inputPaths to the store because we know they'll
++ all have the same parents (the store), and there might be lots of inputs. This isn't
++ particularly efficient... I doubt it'll be a bottleneck in practice */
++ for (auto & i : pathsInChroot) {
++ Path cur = i.first;
+ while (cur.compare("/") != 0) {
+- ancestry.insert(cur);
+ cur = dirOf(cur);
++ ancestry.insert(cur);
+ }
++ }
+
+- /* Add all our input paths to the chroot */
+- for (auto & i : inputPaths) {
+- auto p = worker.store.printStorePath(i);
+- pathsInChroot[p] = p;
+- }
+-
+- /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */
+- if (settings.darwinLogSandboxViolations) {
+- sandboxProfile += "(deny default)\n";
+- } else {
+- sandboxProfile += "(deny default (with no-log))\n";
+- }
++ /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost
++ path component this time, since it's typically /nix/store and we care about that. */
++ Path cur = worker.store.storeDir;
++ while (cur.compare("/") != 0) {
++ ancestry.insert(cur);
++ cur = dirOf(cur);
++ }
+
+- sandboxProfile +=
+- #include "sandbox-defaults.sb"
+- ;
++ /* Add all our input paths to the chroot */
++ for (auto & i : inputPaths) {
++ auto p = worker.store.printStorePath(i);
++ pathsInChroot[p] = p;
++ }
+
+- if (!derivationType->isSandboxed())
+- sandboxProfile +=
+- #include "sandbox-network.sb"
+- ;
+-
+- /* Add the output paths we'll use at build-time to the chroot */
+- sandboxProfile += "(allow file-read* file-write* process-exec\n";
+- for (auto & [_, path] : scratchOutputs)
+- sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path));
+-
+- sandboxProfile += ")\n";
+-
+- /* Our inputs (transitive dependencies and any impurities computed above)
+-
+- without file-write* allowed, access() incorrectly returns EPERM
+- */
+- sandboxProfile += "(allow file-read* file-write* process-exec\n";
+- for (auto & i : pathsInChroot) {
+- if (i.first != i.second.source)
+- throw Error(
+- "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin",
+- i.first, i.second.source);
+-
+- std::string path = i.first;
+- auto optSt = maybeLstat(path.c_str());
+- if (!optSt) {
+- if (i.second.optional)
+- continue;
+- throw SysError("getting attributes of required path '%s", path);
+- }
+- if (S_ISDIR(optSt->st_mode))
+- sandboxProfile += fmt("\t(subpath \"%s\")\n", path);
+- else
+- sandboxProfile += fmt("\t(literal \"%s\")\n", path);
+- }
+- sandboxProfile += ")\n";
++ /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */
++ if (settings.darwinLogSandboxViolations) {
++ sandboxProfile += "(deny default)\n";
++ } else {
++ sandboxProfile += "(deny default (with no-log))\n";
++ }
+
+- /* Allow file-read* on full directory hierarchy to self. Allows realpath() */
+- sandboxProfile += "(allow file-read*\n";
+- for (auto & i : ancestry) {
+- sandboxProfile += fmt("\t(literal \"%s\")\n", i);
+- }
+- sandboxProfile += ")\n";
++ sandboxProfile +=
++ #include "sandbox-defaults.sb"
++ ;
+
+- sandboxProfile += additionalSandboxProfile;
+- } else
++ if (!derivationType->isSandboxed())
+ sandboxProfile +=
+- #include "sandbox-minimal.sb"
++ #include "sandbox-network.sb"
+ ;
+
+- debug("Generated sandbox profile:");
+- debug(sandboxProfile);
+-
+- Path sandboxFile = tmpDir + "/.sandbox.sb";
++ /* Add the output paths we'll use at build-time to the chroot */
++ sandboxProfile += "(allow file-read* file-write* process-exec\n";
++ for (auto & [_, path] : scratchOutputs)
++ sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path));
+
+- writeFile(sandboxFile, sandboxProfile);
++ sandboxProfile += ")\n";
+
+- bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking");
++ /* Our inputs (transitive dependencies and any impurities computed above)
+
+- /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms
+- to find temporary directories, so we want to open up a broader place for them to put their files, if needed. */
+- Path globalTmpDir = canonPath(defaultTempDir(), true);
++ without file-write* allowed, access() incorrectly returns EPERM
++ */
++ sandboxProfile += "(allow file-read* file-write* process-exec\n";
++ for (auto & i : pathsInChroot) {
++ if (i.first != i.second.source)
++ throw Error(
++ "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin",
++ i.first, i.second.source);
++
++ std::string path = i.first;
++ auto optSt = maybeLstat(path.c_str());
++ if (!optSt) {
++ if (i.second.optional)
++ continue;
++ throw SysError("getting attributes of required path '%s", path);
++ }
++ if (S_ISDIR(optSt->st_mode))
++ sandboxProfile += fmt("\t(subpath \"%s\")\n", path);
++ else
++ sandboxProfile += fmt("\t(literal \"%s\")\n", path);
++ }
++ sandboxProfile += ")\n";
+
+- /* They don't like trailing slashes on subpath directives */
+- while (!globalTmpDir.empty() && globalTmpDir.back() == '/')
+- globalTmpDir.pop_back();
++ /* Allow file-read* on full directory hierarchy to self. Allows realpath() */
++ sandboxProfile += "(allow file-read*\n";
++ for (auto & i : ancestry) {
++ sandboxProfile += fmt("\t(literal \"%s\")\n", i);
++ }
++ sandboxProfile += ")\n";
+
+- if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") {
+- builder = "/usr/bin/sandbox-exec";
+- args.push_back("sandbox-exec");
+- args.push_back("-f");
+- args.push_back(sandboxFile);
+- args.push_back("-D");
+- args.push_back("_GLOBAL_TMP_DIR=" + globalTmpDir);
+- if (allowLocalNetworking) {
+- args.push_back("-D");
+- args.push_back(std::string("_ALLOW_LOCAL_NETWORKING=1"));
+- }
+- args.push_back(drv->builder);
+- } else {
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
++ sandboxProfile += additionalSandboxProfile;
++ } else
++ sandboxProfile +=
++ #include "sandbox-minimal.sb"
++ ;
++
++ debug("Generated sandbox profile:");
++ debug(sandboxProfile);
++
++ bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking");
++
++ /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms
++ to find temporary directories, so we want to open up a broader place for them to put their files, if needed. */
++ Path globalTmpDir = canonPath(defaultTempDir(), true);
++
++ /* They don't like trailing slashes on subpath directives */
++ while (!globalTmpDir.empty() && globalTmpDir.back() == '/')
++ globalTmpDir.pop_back();
++
++ if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") {
++ Strings sandboxArgs;
++ sandboxArgs.push_back("_GLOBAL_TMP_DIR");
++ sandboxArgs.push_back(globalTmpDir);
++ if (allowLocalNetworking) {
++ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING");
++ sandboxArgs.push_back("1");
++ }
++ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) {
++ writeFull(STDERR_FILENO, "failed to configure sandbox\n");
++ _exit(1);
+ }
+ }
++
++ builder = drv->builder;
++ args.push_back(std::string(baseNameOf(drv->builder)));
+ #else
+- else {
++ if (!drv->isBuiltin()) {
+ builder = drv->builder;
+ args.push_back(std::string(baseNameOf(drv->builder)));
+ }
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_24/0002-packaging-Add-darwin-lsandbox-in-meson.patch b/pkgs/tools/package-management/nix/patches/2_24/0002-packaging-Add-darwin-lsandbox-in-meson.patch
new file mode 100644
index 000000000000..c709ea62354d
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_24/0002-packaging-Add-darwin-lsandbox-in-meson.patch
@@ -0,0 +1,53 @@
+From f8a1a149c73113e01c44b73ce9e1005575d52a9a Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:23:17 +0200
+Subject: [PATCH 2/5] packaging: Add darwin -lsandbox in meson
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim
+---
+ src/libstore/meson.build | 5 +++++
+ src/libstore/package.nix | 2 ++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/src/libstore/meson.build b/src/libstore/meson.build
+index 50b15e15d..b23c85061 100644
+--- a/src/libstore/meson.build
++++ b/src/libstore/meson.build
+@@ -68,6 +68,11 @@ has_acl_support = cxx.has_header('sys/xattr.h') \
+ and cxx.has_function('lremovexattr')
+ configdata.set('HAVE_ACL_SUPPORT', has_acl_support.to_int())
+
++if host_machine.system() == 'darwin'
++ sandbox = cxx.find_library('sandbox')
++ deps_other += [sandbox]
++endif
++
+ subdir('build-utils-meson/threads')
+
+ boost = dependency(
+diff --git a/src/libstore/package.nix b/src/libstore/package.nix
+index 4582ba0d2..d98bac16d 100644
+--- a/src/libstore/package.nix
++++ b/src/libstore/package.nix
+@@ -7,6 +7,7 @@
+ , ninja
+ , pkg-config
+ , unixtools
++, darwin
+
+ , nix-util
+ , boost
+@@ -65,6 +66,7 @@ mkMesonDerivation (finalAttrs: {
+ sqlite
+ ] ++ lib.optional stdenv.hostPlatform.isLinux libseccomp
+ # There have been issues building these dependencies
++ ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.sandbox
+ ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin))
+ aws-sdk-cpp
+ ;
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_24/0003-local-derivation-goal-Print-sandbox-error-detail-on-.patch b/pkgs/tools/package-management/nix/patches/2_24/0003-local-derivation-goal-Print-sandbox-error-detail-on-.patch
new file mode 100644
index 000000000000..2c984b6343db
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_24/0003-local-derivation-goal-Print-sandbox-error-detail-on-.patch
@@ -0,0 +1,34 @@
+From ae7a2ea74136363c2f6ac6e624ea95da7abfafcc Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:44:12 +0200
+Subject: [PATCH 3/5] local-derivation-goal: Print sandbox error detail on
+ darwin
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Co-Authored-By: Théophane Hufschmitt
+Signed-off-by: Jörg Thalheim
+---
+ src/libstore/unix/build/local-derivation-goal.cc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
+index 7ce266122..706771e8e 100644
+--- a/src/libstore/unix/build/local-derivation-goal.cc
++++ b/src/libstore/unix/build/local-derivation-goal.cc
+@@ -2159,8 +2159,9 @@ void LocalDerivationGoal::runChild()
+ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING");
+ sandboxArgs.push_back("1");
+ }
+- if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) {
+- writeFull(STDERR_FILENO, "failed to configure sandbox\n");
++ char * sandbox_errbuf = nullptr;
++ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), &sandbox_errbuf)) {
++ writeFull(STDERR_FILENO, fmt("failed to configure sandbox: %s\n", sandbox_errbuf ? sandbox_errbuf : "(null)"));
+ _exit(1);
+ }
+ }
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_24/0004-local-derivation-goal-Refactor.patch b/pkgs/tools/package-management/nix/patches/2_24/0004-local-derivation-goal-Refactor.patch
new file mode 100644
index 000000000000..dbf54c5020c9
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_24/0004-local-derivation-goal-Refactor.patch
@@ -0,0 +1,41 @@
+From 047ee50db2f660eb3f50fab8f7543ce95e814b7c Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:50:27 +0200
+Subject: [PATCH 4/5] local-derivation-goal: Refactor
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This works because the `builder` and `args` variables are only used
+in the non-builtin code path.
+
+Co-Authored-By: Théophane Hufschmitt
+Signed-off-by: Jörg Thalheim
+---
+ src/libstore/unix/build/local-derivation-goal.cc | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
+index 706771e8e..d9738a1ea 100644
+--- a/src/libstore/unix/build/local-derivation-goal.cc
++++ b/src/libstore/unix/build/local-derivation-goal.cc
+@@ -2165,15 +2165,12 @@ void LocalDerivationGoal::runChild()
+ _exit(1);
+ }
+ }
++#endif
+
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
+-#else
+ if (!drv->isBuiltin()) {
+ builder = drv->builder;
+ args.push_back(std::string(baseNameOf(drv->builder)));
+ }
+-#endif
+
+ for (auto & i : drv->args)
+ args.push_back(rewriteStrings(i, inputRewrites));
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/2_24/0005-local-derivation-goal-Move-builder-preparation-to-no.patch b/pkgs/tools/package-management/nix/patches/2_24/0005-local-derivation-goal-Move-builder-preparation-to-no.patch
new file mode 100644
index 000000000000..c4fc9b2c2117
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/2_24/0005-local-derivation-goal-Move-builder-preparation-to-no.patch
@@ -0,0 +1,75 @@
+From 50f83e4bbd9107576399f94449ac9cb4e80d575e Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:57:00 +0200
+Subject: [PATCH 5/5] local-derivation-goal: Move builder preparation to
+ non-builtin code path
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim
+---
+ .../unix/build/local-derivation-goal.cc | 25 ++++++++-----------
+ 1 file changed, 10 insertions(+), 15 deletions(-)
+
+diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
+index d9738a1ea..2a09e3dd4 100644
+--- a/src/libstore/unix/build/local-derivation-goal.cc
++++ b/src/libstore/unix/build/local-derivation-goal.cc
+@@ -2038,11 +2038,6 @@ void LocalDerivationGoal::runChild()
+ throw SysError("setuid failed");
+ }
+
+- /* Fill in the arguments. */
+- Strings args;
+-
+- std::string builder = "invalid";
+-
+ #if __APPLE__
+ /* This has to appear before import statements. */
+ std::string sandboxProfile = "(version 1)\n";
+@@ -2167,14 +2162,6 @@ void LocalDerivationGoal::runChild()
+ }
+ #endif
+
+- if (!drv->isBuiltin()) {
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
+- }
+-
+- for (auto & i : drv->args)
+- args.push_back(rewriteStrings(i, inputRewrites));
+-
+ /* Indicate that we managed to set up the build environment. */
+ writeFull(STDERR_FILENO, std::string("\2\n"));
+
+@@ -2205,6 +2192,14 @@ void LocalDerivationGoal::runChild()
+ }
+ }
+
++ // Now builder is not builtin
++
++ Strings args;
++ args.push_back(std::string(baseNameOf(drv->builder)));
++
++ for (auto & i : drv->args)
++ args.push_back(rewriteStrings(i, inputRewrites));
++
+ #if __APPLE__
+ posix_spawnattr_t attrp;
+
+@@ -2226,9 +2221,9 @@ void LocalDerivationGoal::runChild()
+ posix_spawnattr_setbinpref_np(&attrp, 1, &cpu, NULL);
+ }
+
+- posix_spawn(NULL, builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
++ posix_spawn(NULL, drv->builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
+ #else
+- execve(builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
++ execve(drv->builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
+ #endif
+
+ throw SysError("executing '%1%'", drv->builder);
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/git/0001-Fix-meson-build-on-darwin.patch b/pkgs/tools/package-management/nix/patches/git/0001-Fix-meson-build-on-darwin.patch
new file mode 100644
index 000000000000..e03bed014561
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/git/0001-Fix-meson-build-on-darwin.patch
@@ -0,0 +1,28 @@
+From 766263d53ae69d70c5915426e6e8f58abd988226 Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Tue, 22 Oct 2024 15:28:04 +0200
+Subject: [PATCH 1/6] Fix meson build on darwin
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+std::stringbuf is defined in
+Signed-off-by: Jörg Thalheim
+---
+ src/libutil/strings.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libutil/strings.cc b/src/libutil/strings.cc
+index d1c9f700c..c221a43c6 100644
+--- a/src/libutil/strings.cc
++++ b/src/libutil/strings.cc
+@@ -1,5 +1,6 @@
+ #include
+ #include
++#include
+
+ #include "strings-inline.hh"
+ #include "os-string.hh"
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/git/0002-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch b/pkgs/tools/package-management/nix/patches/git/0002-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
new file mode 100644
index 000000000000..36218646f3b6
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/git/0002-fix-Run-all-derivation-builders-inside-the-sandbox-o.patch
@@ -0,0 +1,323 @@
+From d2c880b03f58eb4fdd6d19eb3ffa4345a0477419 Mon Sep 17 00:00:00 2001
+From: Puck Meerburg
+Date: Fri, 1 Mar 2024 11:42:24 -0500
+Subject: [PATCH 2/6] fix: Run all derivation builders inside the sandbox on
+ macOS
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim
+---
+ configure.ac | 6 +-
+ package.nix | 2 +
+ .../unix/build/local-derivation-goal.cc | 223 +++++++++---------
+ 3 files changed, 116 insertions(+), 115 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 198198dea..c7c9b3f4b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,12 +62,16 @@ AC_CHECK_TOOL([AR], [ar])
+ AC_SYS_LARGEFILE
+
+
+-# Solaris-specific stuff.
++# OS-specific stuff.
+ case "$host_os" in
+ solaris*)
+ # Solaris requires -lsocket -lnsl for network functions
+ LDFLAGS="-lsocket -lnsl $LDFLAGS"
+ ;;
++ darwin*)
++ # Need to link to libsandbox.
++ LDFLAGS="-lsandbox $LDFLAGS"
++ ;;
+ esac
+
+
+diff --git a/package.nix b/package.nix
+index 00621d475..77f1de58c 100644
+--- a/package.nix
++++ b/package.nix
+@@ -23,6 +23,7 @@
+ , libseccomp
+ , libsodium
+ , man
++, darwin
+ , lowdown
+ , mdbook
+ , mdbook-linkcheck
+@@ -232,6 +233,7 @@ in {
+ gtest
+ rapidcheck
+ ] ++ lib.optional stdenv.isLinux libseccomp
++ ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.sandbox
+ ++ lib.optional stdenv.hostPlatform.isx86_64 libcpuid
+ # There have been issues building these dependencies
+ ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin))
+diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
+index b4685b3a7..067755c0d 100644
+--- a/src/libstore/unix/build/local-derivation-goal.cc
++++ b/src/libstore/unix/build/local-derivation-goal.cc
+@@ -58,6 +58,10 @@
+ #if __APPLE__
+ #include
+ #include
++#include
++
++/* This definition is undocumented but depended upon by all major browsers. */
++extern "C" int sandbox_init_with_parameters(const char *profile, uint64_t flags, const char *const parameters[], char **errorbuf);
+ #endif
+
+ #include
+@@ -2088,141 +2092,132 @@ void LocalDerivationGoal::runChild()
+
+ std::string builder = "invalid";
+
+- if (drv->isBuiltin()) {
+- ;
+- }
+ #if __APPLE__
+- else {
+- /* This has to appear before import statements. */
+- std::string sandboxProfile = "(version 1)\n";
+-
+- if (useChroot) {
+-
+- /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */
+- PathSet ancestry;
+-
+- /* We build the ancestry before adding all inputPaths to the store because we know they'll
+- all have the same parents (the store), and there might be lots of inputs. This isn't
+- particularly efficient... I doubt it'll be a bottleneck in practice */
+- for (auto & i : pathsInChroot) {
+- Path cur = i.first;
+- while (cur.compare("/") != 0) {
+- cur = dirOf(cur);
+- ancestry.insert(cur);
+- }
+- }
++ /* This has to appear before import statements. */
++ std::string sandboxProfile = "(version 1)\n";
++
++ if (useChroot) {
+
+- /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost
+- path component this time, since it's typically /nix/store and we care about that. */
+- Path cur = worker.store.storeDir;
++ /* Lots and lots and lots of file functions freak out if they can't stat their full ancestry */
++ PathSet ancestry;
++
++ /* We build the ancestry before adding all inputPaths to the store because we know they'll
++ all have the same parents (the store), and there might be lots of inputs. This isn't
++ particularly efficient... I doubt it'll be a bottleneck in practice */
++ for (auto & i : pathsInChroot) {
++ Path cur = i.first;
+ while (cur.compare("/") != 0) {
+- ancestry.insert(cur);
+ cur = dirOf(cur);
++ ancestry.insert(cur);
+ }
++ }
+
+- /* Add all our input paths to the chroot */
+- for (auto & i : inputPaths) {
+- auto p = worker.store.printStorePath(i);
+- pathsInChroot[p] = p;
+- }
+-
+- /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */
+- if (settings.darwinLogSandboxViolations) {
+- sandboxProfile += "(deny default)\n";
+- } else {
+- sandboxProfile += "(deny default (with no-log))\n";
+- }
++ /* And we want the store in there regardless of how empty pathsInChroot. We include the innermost
++ path component this time, since it's typically /nix/store and we care about that. */
++ Path cur = worker.store.storeDir;
++ while (cur.compare("/") != 0) {
++ ancestry.insert(cur);
++ cur = dirOf(cur);
++ }
+
+- sandboxProfile +=
+- #include "sandbox-defaults.sb"
+- ;
++ /* Add all our input paths to the chroot */
++ for (auto & i : inputPaths) {
++ auto p = worker.store.printStorePath(i);
++ pathsInChroot[p] = p;
++ }
+
+- if (!derivationType->isSandboxed())
+- sandboxProfile +=
+- #include "sandbox-network.sb"
+- ;
+-
+- /* Add the output paths we'll use at build-time to the chroot */
+- sandboxProfile += "(allow file-read* file-write* process-exec\n";
+- for (auto & [_, path] : scratchOutputs)
+- sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path));
+-
+- sandboxProfile += ")\n";
+-
+- /* Our inputs (transitive dependencies and any impurities computed above)
+-
+- without file-write* allowed, access() incorrectly returns EPERM
+- */
+- sandboxProfile += "(allow file-read* file-write* process-exec\n";
+- for (auto & i : pathsInChroot) {
+- if (i.first != i.second.source)
+- throw Error(
+- "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin",
+- i.first, i.second.source);
+-
+- std::string path = i.first;
+- auto optSt = maybeLstat(path.c_str());
+- if (!optSt) {
+- if (i.second.optional)
+- continue;
+- throw SysError("getting attributes of required path '%s", path);
+- }
+- if (S_ISDIR(optSt->st_mode))
+- sandboxProfile += fmt("\t(subpath \"%s\")\n", path);
+- else
+- sandboxProfile += fmt("\t(literal \"%s\")\n", path);
+- }
+- sandboxProfile += ")\n";
++ /* Violations will go to the syslog if you set this. Unfortunately the destination does not appear to be configurable */
++ if (settings.darwinLogSandboxViolations) {
++ sandboxProfile += "(deny default)\n";
++ } else {
++ sandboxProfile += "(deny default (with no-log))\n";
++ }
+
+- /* Allow file-read* on full directory hierarchy to self. Allows realpath() */
+- sandboxProfile += "(allow file-read*\n";
+- for (auto & i : ancestry) {
+- sandboxProfile += fmt("\t(literal \"%s\")\n", i);
+- }
+- sandboxProfile += ")\n";
++ sandboxProfile +=
++ #include "sandbox-defaults.sb"
++ ;
+
+- sandboxProfile += additionalSandboxProfile;
+- } else
++ if (!derivationType->isSandboxed())
+ sandboxProfile +=
+- #include "sandbox-minimal.sb"
++ #include "sandbox-network.sb"
+ ;
+
+- debug("Generated sandbox profile:");
+- debug(sandboxProfile);
+-
+- Path sandboxFile = tmpDir + "/.sandbox.sb";
++ /* Add the output paths we'll use at build-time to the chroot */
++ sandboxProfile += "(allow file-read* file-write* process-exec\n";
++ for (auto & [_, path] : scratchOutputs)
++ sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path));
+
+- writeFile(sandboxFile, sandboxProfile);
++ sandboxProfile += ")\n";
+
+- bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking");
++ /* Our inputs (transitive dependencies and any impurities computed above)
+
+- /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms
+- to find temporary directories, so we want to open up a broader place for them to put their files, if needed. */
+- Path globalTmpDir = canonPath(defaultTempDir(), true);
++ without file-write* allowed, access() incorrectly returns EPERM
++ */
++ sandboxProfile += "(allow file-read* file-write* process-exec\n";
++ for (auto & i : pathsInChroot) {
++ if (i.first != i.second.source)
++ throw Error(
++ "can't map '%1%' to '%2%': mismatched impure paths not supported on Darwin",
++ i.first, i.second.source);
++
++ std::string path = i.first;
++ auto optSt = maybeLstat(path.c_str());
++ if (!optSt) {
++ if (i.second.optional)
++ continue;
++ throw SysError("getting attributes of required path '%s", path);
++ }
++ if (S_ISDIR(optSt->st_mode))
++ sandboxProfile += fmt("\t(subpath \"%s\")\n", path);
++ else
++ sandboxProfile += fmt("\t(literal \"%s\")\n", path);
++ }
++ sandboxProfile += ")\n";
+
+- /* They don't like trailing slashes on subpath directives */
+- while (!globalTmpDir.empty() && globalTmpDir.back() == '/')
+- globalTmpDir.pop_back();
++ /* Allow file-read* on full directory hierarchy to self. Allows realpath() */
++ sandboxProfile += "(allow file-read*\n";
++ for (auto & i : ancestry) {
++ sandboxProfile += fmt("\t(literal \"%s\")\n", i);
++ }
++ sandboxProfile += ")\n";
+
+- if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") {
+- builder = "/usr/bin/sandbox-exec";
+- args.push_back("sandbox-exec");
+- args.push_back("-f");
+- args.push_back(sandboxFile);
+- args.push_back("-D");
+- args.push_back("_GLOBAL_TMP_DIR=" + globalTmpDir);
+- if (allowLocalNetworking) {
+- args.push_back("-D");
+- args.push_back(std::string("_ALLOW_LOCAL_NETWORKING=1"));
+- }
+- args.push_back(drv->builder);
+- } else {
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
++ sandboxProfile += additionalSandboxProfile;
++ } else
++ sandboxProfile +=
++ #include "sandbox-minimal.sb"
++ ;
++
++ debug("Generated sandbox profile:");
++ debug(sandboxProfile);
++
++ bool allowLocalNetworking = parsedDrv->getBoolAttr("__darwinAllowLocalNetworking");
++
++ /* The tmpDir in scope points at the temporary build directory for our derivation. Some packages try different mechanisms
++ to find temporary directories, so we want to open up a broader place for them to put their files, if needed. */
++ Path globalTmpDir = canonPath(defaultTempDir(), true);
++
++ /* They don't like trailing slashes on subpath directives */
++ while (!globalTmpDir.empty() && globalTmpDir.back() == '/')
++ globalTmpDir.pop_back();
++
++ if (getEnv("_NIX_TEST_NO_SANDBOX") != "1") {
++ Strings sandboxArgs;
++ sandboxArgs.push_back("_GLOBAL_TMP_DIR");
++ sandboxArgs.push_back(globalTmpDir);
++ if (allowLocalNetworking) {
++ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING");
++ sandboxArgs.push_back("1");
++ }
++ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) {
++ writeFull(STDERR_FILENO, "failed to configure sandbox\n");
++ _exit(1);
+ }
+ }
++
++ builder = drv->builder;
++ args.push_back(std::string(baseNameOf(drv->builder)));
+ #else
+- else {
++ if (!drv->isBuiltin()) {
+ builder = drv->builder;
+ args.push_back(std::string(baseNameOf(drv->builder)));
+ }
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/git/0003-packaging-Add-darwin-lsandbox-in-meson.patch b/pkgs/tools/package-management/nix/patches/git/0003-packaging-Add-darwin-lsandbox-in-meson.patch
new file mode 100644
index 000000000000..0dfbd10ab1e8
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/git/0003-packaging-Add-darwin-lsandbox-in-meson.patch
@@ -0,0 +1,53 @@
+From f7335530619f9b18d6cc249a297e4dca369101a5 Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:23:17 +0200
+Subject: [PATCH 3/6] packaging: Add darwin -lsandbox in meson
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim
+---
+ src/libstore/meson.build | 5 +++++
+ src/libstore/package.nix | 2 ++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/src/libstore/meson.build b/src/libstore/meson.build
+index 6a6aabf97..c2aa5bff3 100644
+--- a/src/libstore/meson.build
++++ b/src/libstore/meson.build
+@@ -69,6 +69,11 @@ has_acl_support = cxx.has_header('sys/xattr.h') \
+ and cxx.has_function('lremovexattr')
+ configdata.set('HAVE_ACL_SUPPORT', has_acl_support.to_int())
+
++if host_machine.system() == 'darwin'
++ sandbox = cxx.find_library('sandbox')
++ deps_other += [sandbox]
++endif
++
+ subdir('build-utils-meson/threads')
+
+ boost = dependency(
+diff --git a/src/libstore/package.nix b/src/libstore/package.nix
+index 9568462b5..f04e3b95f 100644
+--- a/src/libstore/package.nix
++++ b/src/libstore/package.nix
+@@ -3,6 +3,7 @@
+ , mkMesonLibrary
+
+ , unixtools
++, darwin
+
+ , nix-util
+ , boost
+@@ -56,6 +57,7 @@ mkMesonLibrary (finalAttrs: {
+ sqlite
+ ] ++ lib.optional stdenv.hostPlatform.isLinux libseccomp
+ # There have been issues building these dependencies
++ ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.sandbox
+ ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin))
+ aws-sdk-cpp
+ ;
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/git/0004-local-derivation-goal-Print-sandbox-error-detail-on-.patch b/pkgs/tools/package-management/nix/patches/git/0004-local-derivation-goal-Print-sandbox-error-detail-on-.patch
new file mode 100644
index 000000000000..4bff61efdf7f
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/git/0004-local-derivation-goal-Print-sandbox-error-detail-on-.patch
@@ -0,0 +1,34 @@
+From 14d09e0b55898ac22d4cdeade3bf6c4174052ffd Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:44:12 +0200
+Subject: [PATCH 4/6] local-derivation-goal: Print sandbox error detail on
+ darwin
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Co-Authored-By: Théophane Hufschmitt
+Signed-off-by: Jörg Thalheim
+---
+ src/libstore/unix/build/local-derivation-goal.cc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
+index 067755c0d..f34d68403 100644
+--- a/src/libstore/unix/build/local-derivation-goal.cc
++++ b/src/libstore/unix/build/local-derivation-goal.cc
+@@ -2208,8 +2208,9 @@ void LocalDerivationGoal::runChild()
+ sandboxArgs.push_back("_ALLOW_LOCAL_NETWORKING");
+ sandboxArgs.push_back("1");
+ }
+- if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), NULL)) {
+- writeFull(STDERR_FILENO, "failed to configure sandbox\n");
++ char * sandbox_errbuf = nullptr;
++ if (sandbox_init_with_parameters(sandboxProfile.c_str(), 0, stringsToCharPtrs(sandboxArgs).data(), &sandbox_errbuf)) {
++ writeFull(STDERR_FILENO, fmt("failed to configure sandbox: %s\n", sandbox_errbuf ? sandbox_errbuf : "(null)"));
+ _exit(1);
+ }
+ }
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/git/0005-local-derivation-goal-Refactor.patch b/pkgs/tools/package-management/nix/patches/git/0005-local-derivation-goal-Refactor.patch
new file mode 100644
index 000000000000..cec9d67513ed
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/git/0005-local-derivation-goal-Refactor.patch
@@ -0,0 +1,41 @@
+From 06e27042e176b79561f50decb0fdf836b7bec3f5 Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:50:27 +0200
+Subject: [PATCH 5/6] local-derivation-goal: Refactor
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This works because the `builder` and `args` variables are only used
+in the non-builtin code path.
+
+Co-Authored-By: Théophane Hufschmitt
+Signed-off-by: Jörg Thalheim
+---
+ src/libstore/unix/build/local-derivation-goal.cc | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
+index f34d68403..f781a84c6 100644
+--- a/src/libstore/unix/build/local-derivation-goal.cc
++++ b/src/libstore/unix/build/local-derivation-goal.cc
+@@ -2214,15 +2214,12 @@ void LocalDerivationGoal::runChild()
+ _exit(1);
+ }
+ }
++#endif
+
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
+-#else
+ if (!drv->isBuiltin()) {
+ builder = drv->builder;
+ args.push_back(std::string(baseNameOf(drv->builder)));
+ }
+-#endif
+
+ for (auto & i : drv->args)
+ args.push_back(rewriteStrings(i, inputRewrites));
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/nix/patches/git/0006-local-derivation-goal-Move-builder-preparation-to-no.patch b/pkgs/tools/package-management/nix/patches/git/0006-local-derivation-goal-Move-builder-preparation-to-no.patch
new file mode 100644
index 000000000000..4e63db1f183e
--- /dev/null
+++ b/pkgs/tools/package-management/nix/patches/git/0006-local-derivation-goal-Move-builder-preparation-to-no.patch
@@ -0,0 +1,75 @@
+From d1e0bae55afb3c3ef0bcad5d644b0e04da6279b3 Mon Sep 17 00:00:00 2001
+From: Robert Hensing
+Date: Thu, 3 Oct 2024 12:57:00 +0200
+Subject: [PATCH 6/6] local-derivation-goal: Move builder preparation to
+ non-builtin code path
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim
+---
+ .../unix/build/local-derivation-goal.cc | 25 ++++++++-----------
+ 1 file changed, 10 insertions(+), 15 deletions(-)
+
+diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
+index f781a84c6..dcfaadeef 100644
+--- a/src/libstore/unix/build/local-derivation-goal.cc
++++ b/src/libstore/unix/build/local-derivation-goal.cc
+@@ -2087,11 +2087,6 @@ void LocalDerivationGoal::runChild()
+ throw SysError("setuid failed");
+ }
+
+- /* Fill in the arguments. */
+- Strings args;
+-
+- std::string builder = "invalid";
+-
+ #if __APPLE__
+ /* This has to appear before import statements. */
+ std::string sandboxProfile = "(version 1)\n";
+@@ -2216,14 +2211,6 @@ void LocalDerivationGoal::runChild()
+ }
+ #endif
+
+- if (!drv->isBuiltin()) {
+- builder = drv->builder;
+- args.push_back(std::string(baseNameOf(drv->builder)));
+- }
+-
+- for (auto & i : drv->args)
+- args.push_back(rewriteStrings(i, inputRewrites));
+-
+ /* Indicate that we managed to set up the build environment. */
+ writeFull(STDERR_FILENO, std::string("\2\n"));
+
+@@ -2254,6 +2241,14 @@ void LocalDerivationGoal::runChild()
+ }
+ }
+
++ // Now builder is not builtin
++
++ Strings args;
++ args.push_back(std::string(baseNameOf(drv->builder)));
++
++ for (auto & i : drv->args)
++ args.push_back(rewriteStrings(i, inputRewrites));
++
+ #if __APPLE__
+ posix_spawnattr_t attrp;
+
+@@ -2275,9 +2270,9 @@ void LocalDerivationGoal::runChild()
+ posix_spawnattr_setbinpref_np(&attrp, 1, &cpu, NULL);
+ }
+
+- posix_spawn(NULL, builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
++ posix_spawn(NULL, drv->builder.c_str(), NULL, &attrp, stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
+ #else
+- execve(builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
++ execve(drv->builder.c_str(), stringsToCharPtrs(args).data(), stringsToCharPtrs(envStrs).data());
+ #endif
+
+ throw SysError("executing '%1%'", drv->builder);
+--
+2.46.1
+
diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix
index f1af411fa5a0..a7b7f26f17a9 100644
--- a/pkgs/tools/package-management/pdm/default.nix
+++ b/pkgs/tools/package-management/pdm/default.nix
@@ -10,7 +10,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "pdm";
- version = "2.19.2";
+ version = "2.19.3";
pyproject = true;
disabled = python3.pkgs.pythonOlder "3.8";
@@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "pdm-project";
repo = "pdm";
rev = "refs/tags/${version}";
- hash = "sha256-m+ZVaAZZ4+/qqJs3B8/CEj+in/mrBKgfrx1OD3GpXLU=";
+ hash = "sha256-xgwIPHlTtmgCNN4R6/BJsqmI9hbA0wFAiq4YCa+r/UM=";
};
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/tools/security/baboossh/default.nix b/pkgs/tools/security/baboossh/default.nix
index 66712eb99b2c..1cec997ff3af 100644
--- a/pkgs/tools/security/baboossh/default.nix
+++ b/pkgs/tools/security/baboossh/default.nix
@@ -1,12 +1,13 @@
-{ lib
-, python3
-, fetchFromGitHub
+{
+ lib,
+ fetchFromGitHub,
+ python3,
}:
python3.pkgs.buildPythonApplication rec {
pname = "baboossh";
version = "1.2.1";
- format = "setuptools";
+ pyproject = true;
src = fetchFromGitHub {
owner = "cybiere";
@@ -15,26 +16,26 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-E/a6dL6BpQ6D8v010d8/qav/fkxpCYNvSvoPAZsm0Hk=";
};
- propagatedBuildInputs = with python3.pkgs; [
+ build-system = with python3.pkgs; [ setuptools ];
+
+ dependencies = with python3.pkgs; [
cmd2
- tabulate
paramiko
python-libnmap
+ tabulate
];
# No tests available
doCheck = false;
- pythonImportsCheck = [
- "baboossh"
- ];
+ pythonImportsCheck = [ "baboossh" ];
meta = with lib; {
description = "Tool to do SSH spreading";
homepage = "https://github.com/cybiere/baboossh";
changelog = "https://github.com/cybiere/baboossh/releases/tag/v${version}";
license = licenses.gpl3Only;
- mainProgram = "baboossh";
maintainers = with maintainers; [ fab ];
+ mainProgram = "baboossh";
};
}
diff --git a/pkgs/tools/security/certdump/default.nix b/pkgs/tools/security/certdump/default.nix
deleted file mode 100644
index 409650ac938b..000000000000
--- a/pkgs/tools/security/certdump/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ lib
-, buildDotnetModule
-, fetchFromGitHub
-, dotnetCorePackages
-, stdenv
-}:
-
-buildDotnetModule rec {
- pname = "certdump";
- version = "unstable-2023-07-12";
-
- src = fetchFromGitHub {
- owner = "secana";
- repo = "CertDump";
- rev = "1300005115786b3c214d73fa506de2de06a62cbb";
- sha256 = "sha256-VqKOoW4fAXr0MtY5rgWvRqay1dazF+ZpzJUHkDeXpPs=";
- };
-
- projectFile = [ "CertDump.sln" ];
- nugetDeps = ./deps.nix;
-
- selfContainedBuild = true;
- executables = [ "CertDump" ];
- xBuildFiles = [ "CertDump/CertDump.csproj" ];
-
- dotnet-runtime = dotnetCorePackages.aspnetcore_7_0;
- dotnet-sdk = dotnetCorePackages.sdk_7_0;
-
- dotnetFlags = [
- "-property:ImportByWildcardBeforeSolution=false"
- "-property:GenerateAssemblyInfo=false"
- ];
-
- meta = with lib; {
- description = "Dump certificates from PE files in different formats";
- mainProgram = "CertDump";
- homepage = "https://github.com/secana/CertDump";
- longDescription = ''
- Cross-Platform tool to dump the signing certificate from a Portable Executable (PE) file.
- '';
- license = licenses.asl20;
- maintainers = [ maintainers.baloo ];
- # net5 has no osx-arm64 target available
- broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
- };
-}
diff --git a/pkgs/tools/security/certdump/deps.nix b/pkgs/tools/security/certdump/deps.nix
deleted file mode 100644
index cd7641823629..000000000000
--- a/pkgs/tools/security/certdump/deps.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file was automatically generated by passthru.fetch-deps.
-# Please dont edit it manually, your changes might get overwritten!
-
-{ fetchNuGet }: [
- (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; })
- (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "5.0.0"; sha256 = "0d7sjr89zwq0wxirf8la05hfalv9nhvlczg1c7a508k8aw79jvfg"; })
- (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "5.0.17"; sha256 = "183xgqzlwd5lhacxdwcjl8vcq7r7xypv0hddps9k32mmmwf83d8h"; })
- (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.17"; sha256 = "066fwdlssbv556zd9w1x87x1j8j4kafj9rxyy0692bssdb4gcyc8"; })
- (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.17"; sha256 = "1qvvqf8mmzzc7a7fhx324dprnbxhknr3qxspb2xhsn3yyg44xn2d"; })
- (fetchNuGet { pname = "Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "06hg5q1nbbqcz2s2pl8g941jmjzfl3x06hcpi8km4ikzvp25l5bd"; })
- (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "5.0.17"; sha256 = "07v7vyqm556xr1ypkazfp6gh6drgf20zkwbhkpja8bwdcr6lphbb"; })
- (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "5.0.17"; sha256 = "1lc2jhr4ikffi5ylyf8f6ya6k0hdj0wp1l0017grrwd4m5ajj4vv"; })
- (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.17"; sha256 = "02g5w41ivrw3n6cy3l3ixhcl8bw1fsv4bzs2m34k9h5fqmliaf3c"; })
- (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "5.0.0"; sha256 = "1p62khf9zk23lh91lvz7plv3g1nzmm3b5szqrcm6mb8w3sjk03wi"; })
- (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "5.0.17"; sha256 = "16whaq82pj6fqa0vam3a0va9ly843aa1z12hza040vn6252kk9fq"; })
- (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.17"; sha256 = "0jgcfs3jc98jfyaaamssznckbpnaygplk8pjsp6dswpansz5bnnq"; })
- (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.17"; sha256 = "1ph5kx18syinp8bpzw80bgq3njl65gwzws727xcmxnysgm7snmjp"; })
- (fetchNuGet { pname = "PeNet"; version = "3.0.0"; sha256 = "1qbb970b4f6ymic1l7cy3kdkgy0605wpm0nyqa50mkzdq03c192j"; })
- (fetchNuGet { pname = "PeNet.Asn1"; version = "2.0.1"; sha256 = "14nzz1w69bcxnc2yhfca4g5ahl53czfpbmbv32w0cf2mpssjk4na"; })
- (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "0hpbb13459izw1c5qw7lh1sy5fbnmg7n8977jci5far584zbf3im"; })
- (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "0crf80nb3pw4wr83bvsx7f48i63f2l1b2zc18sny4xhqlvbcfick"; })
- (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "1370mahfnshdy63vlxbyqpbhmv5rby5azfbnyc72xb7zglf9aqcb"; })
- (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; })
- (fetchNuGet { pname = "System.Formats.Asn1"; version = "7.0.0"; sha256 = "1a14kgpqz4k7jhi7bs2gpgf67ym5wpj99203zxgwjypj7x47xhbq"; })
- (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; })
- (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "5.0.0"; sha256 = "06hkx2za8jifpslkh491dfwzm5dxrsyxzj5lsc0achb6yzg4zqlw"; })
- (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "7.0.0"; sha256 = "0834gh4k84xbv73mk6s9djkksq3bd6m2k1ixincjnaawv0pyz7fw"; })
-]
diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix
index cfc608820aaf..df13c004b1a7 100644
--- a/pkgs/tools/security/cfssl/default.nix
+++ b/pkgs/tools/security/cfssl/default.nix
@@ -38,5 +38,6 @@ buildGoModule rec {
description = "Cloudflare's PKI and TLS toolkit";
license = licenses.bsd2;
maintainers = with maintainers; [ mbrgm ];
+ mainProgram = "cfssl";
};
}
diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix
index a13b265a640e..7da7cddc59d9 100644
--- a/pkgs/tools/security/cnspec/default.nix
+++ b/pkgs/tools/security/cnspec/default.nix
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "cnspec";
- version = "11.27.0";
+ version = "11.28.0";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnspec";
rev = "refs/tags/v${version}";
- hash = "sha256-6B+OiIX/9NkbroOhM4zNbWoKDbequS1sBk6QNlVEG1I=";
+ hash = "sha256-vtefht623aXx6tUXb+MyKjGTyF4YQYQ/Huy8kEkjrVc=";
};
proxyVendor = true;
- vendorHash = "sha256-RjJ/UN0EvKTzR7XazRLStIht6wR0X7XIUDghMzRqEX4=";
+ vendorHash = "sha256-D8AZ1qPon4Ujiw96N79AAA14P0LFDL2W3kmpR4mhOa0=";
subPackages = [ "apps/cnspec" ];
diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/tools/security/dnsrecon/default.nix
index 3c7b66fcbf5e..458fe5789fed 100644
--- a/pkgs/tools/security/dnsrecon/default.nix
+++ b/pkgs/tools/security/dnsrecon/default.nix
@@ -6,22 +6,24 @@
python3.pkgs.buildPythonApplication rec {
pname = "dnsrecon";
- version = "1.2.0";
+ version = "1.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "darkoperator";
repo = "dnsrecon";
rev = "refs/tags/${version}";
- hash = "sha256-XboRxq3ZDIDtuECVSnncQ2Pa8YAvva4KUNm0O5ED6rc=";
+ hash = "sha256-h87sNorCKxUmXZAbF7FaOqruUCv84FepFwKMYrIl70M=";
};
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
dnspython
- netaddr
+ loguru
lxml
+ netaddr
+ requests
setuptools
];
diff --git a/pkgs/tools/security/gau/default.nix b/pkgs/tools/security/gau/default.nix
index 6e04afae53db..fca2c6963c69 100644
--- a/pkgs/tools/security/gau/default.nix
+++ b/pkgs/tools/security/gau/default.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "gau";
- version = "2.2.3";
+ version = "2.2.4";
src = fetchFromGitHub {
owner = "lc";
repo = "gau";
rev = "refs/tags/v${version}";
- hash = "sha256-1sF33uat6nwtTaXbZzO8YF4jewyQJ6HvI2l/zyTrJsg=";
+ hash = "sha256-B2l5joHeFDjYmdb3F1FFDKjIKENZu92O2sMlkf3Sf6Y=";
};
vendorHash = "sha256-nhsGhuX5AJMHg+zQUt1G1TwVgMCxnuJ2T3uBrx7bJNs=";
diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix
index dafad76dd829..fa17828c303c 100644
--- a/pkgs/tools/security/gitleaks/default.nix
+++ b/pkgs/tools/security/gitleaks/default.nix
@@ -11,16 +11,16 @@
buildGoModule rec {
pname = "gitleaks";
- version = "8.21.0";
+ version = "8.21.2";
src = fetchFromGitHub {
owner = "zricethezav";
repo = "gitleaks";
rev = "refs/tags/v${version}";
- hash = "sha256-oBX9V7OQ+t1hBLsYvX3u5BY8VSj2YGNJ/6qdJH6BVhg=";
+ hash = "sha256-1MCSGFpjYD4XdES+kJTz/NTN/B00TWMQ1Rmk/nsKf2Q=";
};
- vendorHash = "sha256-BxuqNe021wfvFHpTRQtDImallBg2PcIX5qM7aLB+uH0=";
+ vendorHash = "sha256-iIgS0fXdiVMYKr3FZTYlCSEqqaH9sxZh1MFry9pGET8=";
ldflags = [
"-s"
diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix
index 7c9ea7788895..a7b9bbad2d94 100644
--- a/pkgs/tools/security/gotrue/supabase.nix
+++ b/pkgs/tools/security/gotrue/supabase.nix
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "auth";
- version = "2.161.0";
+ version = "2.163.2";
src = fetchFromGitHub {
owner = "supabase";
repo = "auth";
rev = "v${version}";
- hash = "sha256-+tWCA1FGmvqivYI/wqaVY0zJKwqUqpZfotuHhHmuDwc=";
+ hash = "sha256-Y+A8uYC6FUmAgD4TMXShhknVdlmSZ5UwiqEfJUEpq6k=";
};
- vendorHash = "sha256-nmvZKkSfOflsrcos3cCZHrq4DVF23TQG9kST0AcjN7E=";
+ vendorHash = "sha256-Tg2X4vLuff5XTegDl4vrbvCycbuq4BgEq+O5FhWO+Ds=";
ldflags = [
"-s"
diff --git a/pkgs/tools/security/gowitness/default.nix b/pkgs/tools/security/gowitness/default.nix
index 57a82168bdb9..1719a6f272d5 100644
--- a/pkgs/tools/security/gowitness/default.nix
+++ b/pkgs/tools/security/gowitness/default.nix
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "gowitness";
- version = "3.0.4";
+ version = "3.0.5";
src = fetchFromGitHub {
owner = "sensepost";
repo = "gowitness";
rev = "refs/tags/${version}";
- hash = "sha256-ygnYqX8il0nDvF5+jd52CypmHH8iiLMlOZWdoTsR0ig=";
+ hash = "sha256-oEEq4f5G0kOpaj4KORbVhZqW4RPkBXC33PXYUHhoMxo=";
};
vendorHash = "sha256-2hG+93LzJ+kUVCOXFGk83Asvn7zLWq2BSqrq+eOJhQ0=";
diff --git a/pkgs/tools/security/grap/default.nix b/pkgs/tools/security/grap/default.nix
deleted file mode 100644
index 7f8d931fbb6a..000000000000
--- a/pkgs/tools/security/grap/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, boost, libseccomp, flex, swig, bison, cmake, python3 }:
-
-stdenv.mkDerivation rec {
- pname = "grap";
- version = "1.3.1";
-
- src = fetchFromGitHub {
- owner = "QuoSecGmbH";
- repo = "grap";
- rev = "v${version}";
- sha256 = "1fkdi7adfffxg1k4h6r9i69i3wi93s44c1j4cvr69blxsfh0mcnc";
- };
-
- nativeBuildInputs = [
- bison
- cmake
- flex
- python3
- swig
- ];
-
- buildInputs = [
- boost.all
- libseccomp
- ];
-
- strictDeps = true;
-
- cmakeFlags = [
- "-DPYTHON_SITE_DIR=$out/${python3.sitePackages}"
- "../src"
- ];
-
- postPatch = ''
- substituteInPlace src/tools/grap-match/CMakeLists.txt --replace "/usr/local/bin" "$out/bin"
- substituteInPlace src/tools/grap/CMakeLists.txt --replace "/usr/local/bin" "$out/bin"
- '';
-
- meta = with lib; {
- description = "Define and match graph patterns within binaries";
- longDescription = ''
- grap takes patterns and binary files, uses a Casptone-based disassembler to obtain the control flow graphs from the binaries, then matches the patterns against them.
-
- Patterns are user-defined graphs with instruction conditions ("opcode is xor and arg1 is eax") and repetition conditions (3 identical instructions, basic blocks...).
- '';
- homepage = "https://github.com/QuoSecGmbH/grap/";
- license = licenses.mit;
- maintainers = [ maintainers.s1341 ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/tools/security/hashrat/default.nix b/pkgs/tools/security/hashrat/default.nix
index c19f683f4bea..f7ebc1179093 100644
--- a/pkgs/tools/security/hashrat/default.nix
+++ b/pkgs/tools/security/hashrat/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
}:
stdenv.mkDerivation rec {
@@ -14,6 +15,15 @@ stdenv.mkDerivation rec {
hash = "sha256-mjjK315OUUFVdUY+zcCvm7yeo7XxourR1sghWbeFT7c=";
};
+ patches = [
+ # fix cross compilation by replacing hardcoded ar with AC_PROG_AR
+ # https://github.com/ColumPaget/Hashrat/pull/27
+ (fetchpatch {
+ url = "https://github.com/ColumPaget/Hashrat/commit/a82615e02021245850a1703e613055da2520c8fd.patch";
+ hash = "sha256-tjyhM2ahZBRoRP8WjyQhrI3l20oaqMtfYmOeAZVEZqU=";
+ })
+ ];
+
configureFlags = [ "--enable-xattr" ];
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/tools/security/ipscan/default.nix b/pkgs/tools/security/ipscan/default.nix
index 149cd322219b..be0ecf0b1d04 100644
--- a/pkgs/tools/security/ipscan/default.nix
+++ b/pkgs/tools/security/ipscan/default.nix
@@ -7,6 +7,8 @@
, makeWrapper
, xorg
, dpkg
+, gtk3
+, glib
}:
stdenv.mkDerivation rec {
@@ -30,7 +32,7 @@ stdenv.mkDerivation rec {
cp usr/lib/ipscan/ipscan-linux64-${version}.jar $out/share/${pname}-${version}.jar
makeWrapper ${jre}/bin/java $out/bin/ipscan \
- --prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt xorg.libXtst ]}" \
+ --prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt xorg.libXtst gtk3 glib ]}" \
--add-flags "-Xmx256m -cp $out/share/${pname}-${version}.jar:${swt}/jars/swt.jar net.azib.ipscan.Main"
mkdir -p $out/share/applications
diff --git a/pkgs/tools/security/jd-cli/default.nix b/pkgs/tools/security/jd-cli/default.nix
deleted file mode 100644
index d99c1e687ac3..000000000000
--- a/pkgs/tools/security/jd-cli/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib, fetchFromGitHub, jre, makeWrapper, maven }:
-
-maven.buildMavenPackage rec {
- pname = "jd-cli";
- version = "1.2.1";
-
- src = fetchFromGitHub {
- owner = "intoolswetrust";
- repo = pname;
- rev = "${pname}-${version}";
- hash = "sha256-rRttA5H0A0c44loBzbKH7Waoted3IsOgxGCD2VM0U/Q=";
- };
-
- mvnHash = "sha256-lEcAq0H8Uacv02ItjVGfxvtRip5206HtpREBrQDzBDo=";
-
- mvnParameters = "-DskipTests";
-
- nativeBuildInputs = [ makeWrapper ];
-
- installPhase = ''
- mkdir -p $out/bin $out/share/jd-cli
- install -Dm644 jd-cli/target/jd-cli.jar $out/share/jd-cli
-
- makeWrapper ${jre}/bin/java $out/bin/jd-cli \
- --add-flags "-jar $out/share/jd-cli/jd-cli.jar"
- '';
-
- meta = with lib; {
- description = "Simple command line wrapper around JD Core Java Decompiler project";
- homepage = "https://github.com/intoolswetrust/jd-cli";
- license = licenses.gpl3;
- maintainers = with maintainers; [ majiir ];
- };
-}
diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix
deleted file mode 100644
index a9ef78f3f5e4..000000000000
--- a/pkgs/tools/security/jd-gui/default.nix
+++ /dev/null
@@ -1,96 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, fetchpatch
-, jre
-, jdk
-, gradle_6
-, makeDesktopItem
-, copyDesktopItems
-, runtimeShell
-}:
-
-let
- pname = "jd-gui";
- version = "1.6.6";
-
- name = "${pname}-${version}";
-
- src = fetchFromGitHub {
- owner = "java-decompiler";
- repo = pname;
- rev = "v${version}";
- hash = "sha256-QHiZPYFwDQzbXVSuhwzQqBRXlkG9QVU+Jl6SKvBoCwQ=";
- };
-
- gradle = gradle_6;
-
- desktopItem = makeDesktopItem {
- name = "jd-gui";
- exec = "jd-gui %F";
- icon = "jd-gui";
- comment = "Java Decompiler JD-GUI";
- desktopName = "JD-GUI";
- genericName = "Java Decompiler";
- mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ];
- categories = [ "Development" "Debugger" ];
- startupWMClass = "org-jd-gui-App";
- };
-
-in stdenv.mkDerivation rec {
- inherit pname version src;
-
- patches = [
- # https://github.com/java-decompiler/jd-gui/pull/362
- (fetchpatch {
- name = "nebula-plugin-gradle-6-compatibility.patch";
- url = "https://github.com/java-decompiler/jd-gui/commit/91f805f9dc8ce0097460e63c8095ccea870687e6.patch";
- hash = "sha256-9eaM9Mx2FaKIhGSOHjATKN/CrtvJeXyrH8Mdx8LNtpE=";
- })
- ];
-
- nativeBuildInputs = [ jdk gradle copyDesktopItems ];
-
- mitmCache = gradle.fetchDeps {
- inherit pname;
- data = ./deps.json;
- };
-
- __darwinAllowLocalNetworking = true;
-
- gradleBuildTask = "jar";
-
- installPhase = let
- jar = "$out/share/jd-gui/${name}.jar";
- in ''
- runHook preInstall
-
- mkdir -p $out/bin $out/share/{jd-gui,icons/hicolor/128x128/apps}
- cp build/libs/${name}.jar ${jar}
- cp src/linux/resources/jd_icon_128.png $out/share/icons/hicolor/128x128/apps/jd-gui.png
-
- cat > $out/bin/jd-gui < 7.0.0)
@@ -25,6 +25,7 @@ GIT
dnsruby
drb
ed25519
+ elftools
em-http-request
eventmachine
faker
@@ -45,7 +46,7 @@ GIT
metasploit-model
metasploit-payloads (= 2.0.183)
metasploit_data_models
- metasploit_payloads-mettle (= 1.0.32)
+ metasploit_payloads-mettle (= 1.0.35)
mqtt
msgpack (~> 1.6.0)
mutex_m
@@ -196,6 +197,8 @@ GEM
domain_name (0.6.20240107)
drb (2.2.1)
ed25519 (1.3.0)
+ elftools (1.3.1)
+ bindata (~> 2)
em-http-request (1.1.7)
addressable (>= 2.3.4)
cookiejar (!= 0.3.1)
@@ -282,7 +285,7 @@ GEM
railties (~> 7.0)
recog
webrick
- metasploit_payloads-mettle (1.0.32)
+ metasploit_payloads-mettle (1.0.35)
method_source (1.1.0)
mini_portile2 (2.8.6)
minitest (5.23.1)
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index 71b6556b100c..074b6b8ceffe 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -15,13 +15,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
- version = "6.4.32";
+ version = "6.4.33";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = "refs/tags/${version}";
- hash = "sha256-vNJxWj7B7LOWw1hE3bK6dX5kumfspWIaheGHpDit4kM=";
+ hash = "sha256-RMQEFRIArj2RuYk6GFDsGXpWRPANxD8OUJUQMtQUBW4=";
};
nativeBuildInputs = [
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index a2367cc4b787..7f748cbe4769 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -399,6 +399,16 @@
};
version = "1.3.0";
};
+ elftools = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1y5ahqk24ngjiyfbj5xapxwfb34yslcpn4l0khdq4pkxkajgqilx";
+ type = "gem";
+ };
+ version = "1.3.1";
+ };
em-http-request = {
groups = ["default"];
platforms = [];
@@ -724,12 +734,12 @@
platforms = [];
source = {
fetchSubmodules = false;
- rev = "a13f85c09fbf85c2f5f713b5b9a32b6200cc910d";
- sha256 = "0hz2mlwa91z1hld659gccyx68zkmpardsi2qqfbb7v617rd73lmw";
+ rev = "1939065b94ee3c2033e720b753c5a6bd70e09c07";
+ sha256 = "0vh52ka3444ma073zi0dy125cyhrxi81hfl9p68kvbh028ah9i24";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
- version = "6.4.32";
+ version = "6.4.33";
};
metasploit-model = {
groups = ["default"];
@@ -766,10 +776,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0dbdcbqmi7l1y3nw6nv1sabjwy5qpkzl7pg8wqhq33mgnswi4afp";
+ sha256 = "0fsnr4i0660nhlkq9iyy5x214l2ds3akf6jnngf2hlp8j01w1x4w";
type = "gem";
};
- version = "1.0.32";
+ version = "1.0.35";
};
method_source = {
groups = ["default"];
diff --git a/pkgs/tools/security/naabu/default.nix b/pkgs/tools/security/naabu/default.nix
index cf82ca531195..eb7edf309cbe 100644
--- a/pkgs/tools/security/naabu/default.nix
+++ b/pkgs/tools/security/naabu/default.nix
@@ -6,16 +6,16 @@
buildGoModule rec {
pname = "naabu";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "naabu";
rev = "refs/tags/v${version}";
- hash = "sha256-BICNSizc5DD538ZUoRUC1jSDCEkyrh7iYOM4a6cBqkQ=";
+ hash = "sha256-zGZpXnMQ8KvY4oBn0729WmG80AQ4748Gz6UO/+O8i3o=";
};
- vendorHash = "sha256-GhnEjlV6b61VH/eswBQ9Lelc0IgGawjDRZHzGt7653Q=";
+ vendorHash = "sha256-Mcp3sfaCNTsBOiDYn3iVolSd9cK2LAGNscoUtYhsRkA=";
buildInputs = [
libpcap
diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix
index 844e3d0771f2..b23f3abdc4b0 100644
--- a/pkgs/tools/security/qdigidoc/default.nix
+++ b/pkgs/tools/security/qdigidoc/default.nix
@@ -18,27 +18,27 @@
mkDerivation rec {
pname = "qdigidoc";
- version = "4.5.1";
+ version = "4.6.0";
src = fetchurl {
url =
"https://github.com/open-eid/DigiDoc4-Client/releases/download/v${version}/qdigidoc4-${version}.tar.gz";
- hash = "sha256-grhSuexp5yd/s8h5AdmdSLBmQY85l9HKZ15oTTvC6PI=";
- };
-
- tsl = fetchurl {
- url = "https://ec.europa.eu/tools/lotl/eu-lotl-pivot-300.xml";
- sha256 = "1cikz36w9phgczcqnwk4k3mx3kk919wy2327jksmfa4cjfjq4a8d";
+ hash = "sha256-szFLY9PpZMMYhfV5joueShfu92YDVmcCC3MOWIOAKVg=";
};
patches = [
- # https://github.com/open-eid/DigiDoc4-Client/pull/1251
(fetchpatch {
- url = "https://github.com/open-eid/DigiDoc4-Client/commit/30281d14c5fb5582832eafbc254b56f8d685227d.patch";
- hash = "sha256-nv23NbPUogOhS8No3SMIrAcPChl+d1HkxnePpCKIoUw=";
+ url = "https://github.com/open-eid/DigiDoc4-Client/commit/bb324d18f0452c2ab1b360ff6c42bb7f11ea60d7.patch";
+ hash = "sha256-JpaU9inupSDsZKhHk+sp5g+oUynVFxR7lshjTXoFIbU=";
})
];
+ # Check https://dss.nowina.lu/tl-info, "Pivots loaded" section
+ tsl = fetchurl {
+ url = "https://ec.europa.eu/tools/lotl/eu-lotl-pivot-341.xml";
+ hash = "sha256-/TI8qYxXzourjGFPBpsQzi9Depi7lLQ2JaV+FyP0FtE=";
+ };
+
nativeBuildInputs = [ cmake gettext pkg-config qttools ];
postPatch = ''
diff --git a/pkgs/tools/security/sonar-scanner-cli/default.nix b/pkgs/tools/security/sonar-scanner-cli/default.nix
deleted file mode 100644
index b97a2bc3a105..000000000000
--- a/pkgs/tools/security/sonar-scanner-cli/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, lib, fetchurl, unzip, jre }:
-
-let
-
- version = "4.7.0.2747";
-
- sonarScannerArchPackage = {
- "x86_64-linux" = {
- url = "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${version}-linux.zip";
- sha256 = "0qy97lcn9nfwg0x32v9x5kh5jswnjyw3wpvxj45z7cddlj2is4iy";
- };
- "x86_64-darwin" = {
- url = "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${version}-macosx.zip";
- sha256 = "0f8km7wqkw09g01l03kcrjgvq7b6xclzpvb5r64ymsmrc39p0ylp";
- };
- };
-
-in stdenv.mkDerivation rec {
- inherit version;
- pname = "sonar-scanner-cli";
-
- src = fetchurl sonarScannerArchPackage.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
-
- nativeBuildInputs = [ unzip ];
-
- installPhase = ''
- mkdir -p $out/lib
- cp -r lib/* $out/lib/
- mkdir -p $out/bin
- cp bin/* $out/bin/
- mkdir -p $out/conf
- cp conf/* $out/conf/
- '';
-
- fixupPhase = ''
- substituteInPlace $out/bin/sonar-scanner \
- --replace "\$sonar_scanner_home/jre" "${lib.getBin jre}"
- '';
-
- meta = with lib; {
- homepage = "https://github.com/SonarSource/sonar-scanner-cli";
- description = "SonarQube Scanner used to start code analysis";
- license = licenses.gpl3Plus;
- maintainers = with maintainers; [ peterromfeldhk ];
- platforms = builtins.attrNames sonarScannerArchPackage;
- };
-}
diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 164526a8e133..62cd7cfa7f26 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -30,11 +30,11 @@ let
in
stdenv.mkDerivation rec {
pname = "tor";
- version = "0.4.8.12";
+ version = "0.4.8.13";
src = fetchurl {
url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
- sha256 = "sha256-ynzHNdmON0e1jy88wU+ATdeJ+g+zM6hNy2vXCtu4yHQ=";
+ sha256 = "sha256-m68mw4eiggs5QtpXIUbm63fCvGaGKvYpfNAqB05vuig=";
};
outputs = [ "out" "geoip" ];
diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix
index d1f7465c02f3..3d4824d77135 100644
--- a/pkgs/tools/security/trufflehog/default.nix
+++ b/pkgs/tools/security/trufflehog/default.nix
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "trufflehog";
- version = "3.82.12";
+ version = "3.82.13";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
rev = "refs/tags/v${version}";
- hash = "sha256-eTZ+Bee9t0cf9uaG+Cwvq+sWalQt2IhrM6eGhs90GIk=";
+ hash = "sha256-QAo6BvkqG0EklyKLRMExNv+AZZeuTELYY0FdP8LDbZs=";
};
- vendorHash = "sha256-MexqvYRGBHEVED3y0hWGGTwxRFI/LfyYE2IFLqChgWE=";
+ vendorHash = "sha256-P/Kt/ZLdjiULcRIXRVfUT9nkDGpl46VHRkeqt0mwaWc=";
proxyVendor = true;
diff --git a/pkgs/tools/security/trustymail/default.nix b/pkgs/tools/security/trustymail/default.nix
index 8c54cbf05047..f032691e3455 100644
--- a/pkgs/tools/security/trustymail/default.nix
+++ b/pkgs/tools/security/trustymail/default.nix
@@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec {
dnspython
docopt
publicsuffixlist
- pydns
+ py3dns
pyspf
requests
]
diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix
index 7bfc0c29a4c6..571dfcc8d53e 100644
--- a/pkgs/tools/security/vaultwarden/default.nix
+++ b/pkgs/tools/security/vaultwarden/default.nix
@@ -9,16 +9,16 @@ in
rustPlatform.buildRustPackage rec {
pname = "vaultwarden";
- version = "1.32.2";
+ version = "1.32.3";
src = fetchFromGitHub {
owner = "dani-garcia";
repo = "vaultwarden";
rev = version;
- hash = "sha256-69uTSZJrqDqaOVm504XbegqyBFIQCVMPBk4lybFZctE=";
+ hash = "sha256-dtzC5T96fBrIvy5LFDnwLfx1wF9aVGv/FuAUDH56yto=";
};
- cargoHash = "sha256-lw/FmMiDE2fSVZgpjSvZXLC5635C8uNLSv0tczSOB4g=";
+ cargoHash = "sha256-a4OwL7yD2i4uJLnSzWpwfRZRSgFFammfUOE+PHA2iw0=";
# used for "Server Installed" version in admin panel
env.VW_VERSION = version;
diff --git a/pkgs/tools/security/xortool/default.nix b/pkgs/tools/security/xortool/default.nix
deleted file mode 100644
index 1e8b6aee5d37..000000000000
--- a/pkgs/tools/security/xortool/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib
-, buildPythonApplication
-, docopt
-, fetchFromGitHub
-, importlib-metadata
-, poetry-core
-}:
-
-buildPythonApplication rec {
- pname = "xortool";
- version = "1.0.0";
- format = "pyproject";
-
- src = fetchFromGitHub {
- owner = "hellman";
- repo = pname;
- rev = "v${version}";
- sha256 = "19lfadi28r89bl5q8fhrxgjgs3nx3kgjd4rdg7wbvzi1cn29c5n7";
- };
-
- nativeBuildInputs = [ poetry-core ];
-
- propagatedBuildInputs = [ docopt importlib-metadata ];
-
- # Project has no tests
- doCheck = false;
- pythonImportsCheck = [ "xortool" ];
-
- meta = with lib; {
- description = "Tool to analyze multi-byte XOR cipher";
- homepage = "https://github.com/hellman/xortool";
- license = with licenses; [ mit ];
- maintainers = with maintainers; [ fab ];
- };
-}
diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index b93dde182c84..9f3a24665d4b 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "bfs";
- version = "4.0.2";
+ version = "4.0.3";
src = fetchFromGitHub {
repo = "bfs";
owner = "tavianator";
rev = version;
- hash = "sha256-WIJyCpnlD6/c7PG+ZPmUT8qfPelRY9Od1Dk9Ro1y1yY=";
+ hash = "sha256-7sHuOk1QTBNaGaIQ3sFc+y7TzBFT6DqKdRLndy4ahc8=";
};
buildInputs = [ oniguruma ] ++
diff --git a/pkgs/tools/system/dool/default.nix b/pkgs/tools/system/dool/default.nix
index 4a958d621606..b7ff128131e8 100644
--- a/pkgs/tools/system/dool/default.nix
+++ b/pkgs/tools/system/dool/default.nix
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
# fix the plugins directory
postPatch = ''
substituteInPlace dool \
- --replace \
- "os.path.abspath(os.path.dirname(sys.argv[0])) + '/plugins/'" \
+ --replace-fail \
+ "os.path.dirname(os.path.abspath(__file__)) + '/plugins/'" \
"'$out/share/dool/'"
'';
diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix
index 518d54898d9b..3e805834bd35 100644
--- a/pkgs/tools/system/fakeroot/default.nix
+++ b/pkgs/tools/system/fakeroot/default.nix
@@ -13,7 +13,7 @@
}:
stdenv.mkDerivation (finalAttrs: {
- version = "1.32.2";
+ version = "1.36";
pname = "fakeroot";
src = fetchFromGitLab {
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
repo = "fakeroot";
rev = "upstream/${finalAttrs.version}";
domain = "salsa.debian.org";
- hash = "sha256-j1qSMPNCtAxClqYqWkRNQmtxkitYi7g/9KtQ5XqcX3w=";
+ hash = "sha256-QNScrkX2Vffsj/I5EJO8qs5AHQ9b5s6nHLHQKUdRzLE=";
};
patches = lib.optionals stdenv.hostPlatform.isLinux [
@@ -29,22 +29,11 @@ stdenv.mkDerivation (finalAttrs: {
# patches needed for musl libc, borrowed from alpine packaging.
# it is applied regardless of the environment to prevent patchrot
- (fetchpatch {
- name = "do-not-redefine-id_t.patch";
- url = "https://git.alpinelinux.org/aports/plain/main/fakeroot/do-not-redefine-id_t.patch?id=f68c541324ad07cc5b7f5228501b5f2ce4b36158";
- sha256 = "sha256-i9PoWriSrQ7kLZzbvZT3Kq1oXzK9mTyBqq808BGepOw=";
- })
(fetchpatch {
name = "fakeroot-no64.patch";
url = "https://git.alpinelinux.org/aports/plain/main/fakeroot/fakeroot-no64.patch?id=f68c541324ad07cc5b7f5228501b5f2ce4b36158";
sha256 = "sha256-NCDaB4nK71gvz8iQxlfaQTazsG0SBUQ/RAnN+FqwKkY=";
})
- ] ++ [
- (fetchpatch {
- name = "addendum-charset-conversion.patch";
- url = "https://salsa.debian.org/clint/fakeroot/-/commit/b769fb19fd89d696a5e0fd70b974f833f6a0655a.patch";
- hash = "sha256-3z1g+xzlyTpa055kpsoumP/E8srDlZss6B7Fv5A0QkU=";
- })
];
nativeBuildInputs = [ autoreconfHook po4a ];
diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix
index c0a689c4c621..e9e1b2db6754 100644
--- a/pkgs/tools/system/htop/default.nix
+++ b/pkgs/tools/system/htop/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, stdenv, autoreconfHook, pkg-config
+{ lib, fetchFromGitHub, fetchpatch2, stdenv, autoreconfHook, pkg-config
, ncurses
, IOKit
, libcap
@@ -20,6 +20,16 @@ stdenv.mkDerivation rec {
hash = "sha256-qDhQkzY2zj2yxbgFUXwE0MGEgAFOsAhnapUuetO9WTw=";
};
+ patches = [
+ # See https://github.com/htop-dev/htop/pull/1412
+ # Remove when updating to 3.4.0
+ (fetchpatch2 {
+ name = "htop-resolve-configuration-path.patch";
+ url = "https://github.com/htop-dev/htop/commit/0dac8e7d38ec3aeae901a987717b5177986197e4.patch";
+ hash = "sha256-Er1d/yV1fioYfEmXNlLO5ayAyXkyy+IaGSx1KWXvlv0=";
+ })
+ ];
+
nativeBuildInputs = [ autoreconfHook ]
++ lib.optional stdenv.hostPlatform.isLinux pkg-config
;
diff --git a/pkgs/tools/text/asciigraph/default.nix b/pkgs/tools/text/asciigraph/default.nix
index 46166d8c6370..1b88b5041f14 100644
--- a/pkgs/tools/text/asciigraph/default.nix
+++ b/pkgs/tools/text/asciigraph/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "asciigraph";
- version = "0.7.2";
+ version = "0.7.3";
src = fetchFromGitHub {
owner = "guptarohit";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Y+RRFFCeuDjzTznpfC7Wn3j96ZCFSOzvb8ND/ATW+JI=";
+ sha256 = "sha256-+4aGkumO42cloHWV8qEEJ5bj8TTdtfXTWGFCgCRE4Mg=";
};
vendorHash = null;
diff --git a/pkgs/tools/text/autocorrect/Cargo.lock b/pkgs/tools/text/autocorrect/Cargo.lock
index 07a2ac13a932..db77e85f8829 100644
--- a/pkgs/tools/text/autocorrect/Cargo.lock
+++ b/pkgs/tools/text/autocorrect/Cargo.lock
@@ -4,18 +4,18 @@ version = 3
[[package]]
name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
dependencies = [
"gimli",
]
[[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
[[package]]
name = "aho-corasick"
@@ -34,9 +34,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
[[package]]
name = "anstream"
-version = "0.6.14"
+version = "0.6.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338"
dependencies = [
"anstyle",
"anstyle-parse",
@@ -49,47 +49,47 @@ dependencies = [
[[package]]
name = "anstyle"
-version = "1.0.7"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56"
[[package]]
name = "anstyle-parse"
-version = "0.2.4"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
-version = "1.1.0"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
name = "anstyle-wincon"
-version = "3.0.3"
+version = "3.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
dependencies = [
"anstyle",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
name = "async-trait"
-version = "0.1.80"
+version = "0.1.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.67",
+ "syn 2.0.85",
]
[[package]]
@@ -100,18 +100,18 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.67",
+ "syn 2.0.85",
]
[[package]]
name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "autocorrect"
-version = "2.11.1"
+version = "2.13.0"
dependencies = [
"autocorrect-derive 0.3.0",
"criterion",
@@ -132,9 +132,9 @@ dependencies = [
[[package]]
name = "autocorrect"
-version = "2.11.1"
+version = "2.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b34aec492eb0959a3ba75da869455ce2a91eb0f310b44018add14d7b72845ad"
+checksum = "f3dbfcf450a8941768e27de85c70a9288328f6e829e90b7479ba63b8deb02004"
dependencies = [
"autocorrect-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"diff",
@@ -152,9 +152,9 @@ dependencies = [
[[package]]
name = "autocorrect-cli"
-version = "2.11.1"
+version = "2.13.0"
dependencies = [
- "autocorrect 2.11.1",
+ "autocorrect 2.13.0",
"autocorrect-lsp",
"clap",
"ignore",
@@ -188,9 +188,9 @@ dependencies = [
[[package]]
name = "autocorrect-java"
-version = "2.11.1"
+version = "2.13.0"
dependencies = [
- "autocorrect 2.11.1",
+ "autocorrect 2.13.0",
"jni",
]
@@ -198,16 +198,16 @@ dependencies = [
name = "autocorrect-lsp"
version = "2.9.4"
dependencies = [
- "autocorrect 2.11.1",
+ "autocorrect 2.13.0",
"tokio",
"tower-lsp",
]
[[package]]
name = "autocorrect-node"
-version = "2.11.1"
+version = "2.13.0"
dependencies = [
- "autocorrect 2.11.1",
+ "autocorrect 2.13.0",
"autocorrect-cli",
"napi",
"napi-build",
@@ -216,42 +216,42 @@ dependencies = [
[[package]]
name = "autocorrect-py"
-version = "2.11.1"
+version = "2.13.0"
dependencies = [
- "autocorrect 2.11.1",
+ "autocorrect 2.13.0",
"pyo3",
]
[[package]]
name = "autocorrect-rb"
-version = "2.11.1"
+version = "2.13.0"
dependencies = [
- "autocorrect 2.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocorrect 2.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
"magnus",
]
[[package]]
name = "autocorrect-wasm"
-version = "2.11.1"
+version = "2.13.0"
dependencies = [
- "autocorrect 2.11.1",
+ "autocorrect 2.13.0",
"serde_json",
"wasm-bindgen",
]
[[package]]
name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
dependencies = [
"addr2line",
- "cc",
"cfg-if",
"libc",
"miniz_oxide",
"object",
"rustc-demangle",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -262,11 +262,11 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
[[package]]
name = "bindgen"
-version = "0.69.4"
+version = "0.69.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"cexpr",
"clang-sys",
"itertools 0.12.1",
@@ -277,7 +277,7 @@ dependencies = [
"regex",
"rustc-hash",
"shlex",
- "syn 2.0.67",
+ "syn 2.0.85",
]
[[package]]
@@ -288,9 +288,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
[[package]]
name = "block-buffer"
@@ -303,9 +303,9 @@ dependencies = [
[[package]]
name = "bstr"
-version = "1.9.1"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
+checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
dependencies = [
"memchr",
"serde",
@@ -319,9 +319,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
[[package]]
name = "bytes"
-version = "1.6.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
[[package]]
name = "cast"
@@ -331,9 +331,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
[[package]]
name = "cc"
-version = "1.0.99"
+version = "1.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
+checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
+dependencies = [
+ "shlex",
+]
[[package]]
name = "cesu8"
@@ -396,9 +399,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.5.7"
+version = "4.5.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
dependencies = [
"clap_builder",
"clap_derive",
@@ -406,9 +409,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.7"
+version = "4.5.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
dependencies = [
"anstream",
"anstyle",
@@ -418,27 +421,27 @@ dependencies = [
[[package]]
name = "clap_derive"
-version = "4.5.5"
+version = "4.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.67",
+ "syn 2.0.85",
]
[[package]]
name = "clap_lex"
-version = "0.7.1"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
[[package]]
name = "colorchoice"
-version = "1.0.1"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
[[package]]
name = "combine"
@@ -483,15 +486,15 @@ dependencies = [
[[package]]
name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
[[package]]
name = "cpufeatures"
-version = "0.2.12"
+version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
dependencies = [
"libc",
]
@@ -589,7 +592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f"
dependencies = [
"quote",
- "syn 2.0.67",
+ "syn 2.0.85",
]
[[package]]
@@ -599,7 +602,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
dependencies = [
"cfg-if",
- "hashbrown",
+ "hashbrown 0.14.5",
"lock_api",
"once_cell",
"parking_lot_core",
@@ -623,9 +626,9 @@ dependencies = [
[[package]]
name = "either"
-version = "1.12.0"
+version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
[[package]]
name = "encode_unicode"
@@ -635,9 +638,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
[[package]]
name = "encoding_rs"
-version = "0.8.34"
+version = "0.8.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
dependencies = [
"cfg-if",
]
@@ -660,27 +663,27 @@ dependencies = [
[[package]]
name = "fastrand"
-version = "2.1.0"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
[[package]]
name = "filetime"
-version = "0.2.23"
+version = "0.2.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall 0.4.1",
- "windows-sys 0.52.0",
+ "libredox",
+ "windows-sys 0.59.0",
]
[[package]]
name = "flate2"
-version = "1.0.30"
+version = "1.0.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
dependencies = [
"crc32fast",
"miniz_oxide",
@@ -703,9 +706,9 @@ dependencies = [
[[package]]
name = "futures"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
dependencies = [
"futures-channel",
"futures-core",
@@ -717,9 +720,9 @@ dependencies = [
[[package]]
name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
dependencies = [
"futures-core",
"futures-sink",
@@ -727,44 +730,44 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
[[package]]
name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
[[package]]
name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.67",
+ "syn 2.0.85",
]
[[package]]
name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
[[package]]
name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
[[package]]
name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
dependencies = [
"futures-channel",
"futures-core",
@@ -801,9 +804,9 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
[[package]]
name = "glob"
@@ -813,9 +816,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "globset"
-version = "0.4.14"
+version = "0.4.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
+checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"
dependencies = [
"aho-corasick",
"bstr",
@@ -859,6 +862,12 @@ version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
[[package]]
name = "heck"
version = "0.5.0"
@@ -871,6 +880,12 @@ version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+
[[package]]
name = "http"
version = "0.2.12"
@@ -895,9 +910,9 @@ dependencies = [
[[package]]
name = "httparse"
-version = "1.9.4"
+version = "1.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
[[package]]
name = "httpdate"
@@ -907,9 +922,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
[[package]]
name = "hyper"
-version = "0.14.29"
+version = "0.14.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33"
+checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85"
dependencies = [
"bytes",
"futures-channel",
@@ -955,9 +970,9 @@ dependencies = [
[[package]]
name = "ignore"
-version = "0.4.22"
+version = "0.4.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1"
+checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b"
dependencies = [
"crossbeam-deque",
"globset",
@@ -971,12 +986,12 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "2.2.6"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
dependencies = [
"equivalent",
- "hashbrown",
+ "hashbrown 0.15.0",
]
[[package]]
@@ -999,26 +1014,26 @@ checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306"
[[package]]
name = "ipnet"
-version = "2.9.0"
+version = "2.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
[[package]]
name = "is-terminal"
-version = "0.4.12"
+version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
+checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
dependencies = [
- "hermit-abi",
+ "hermit-abi 0.4.0",
"libc",
"windows-sys 0.52.0",
]
[[package]]
name = "is_terminal_polyfill"
-version = "1.70.0"
+version = "1.70.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
[[package]]
name = "itertools"
@@ -1066,9 +1081,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
[[package]]
name = "js-sys"
-version = "0.3.69"
+version = "0.3.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
dependencies = [
"wasm-bindgen",
]
@@ -1087,18 +1102,29 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "libc"
-version = "0.2.155"
+version = "0.2.161"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
[[package]]
name = "libloading"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
dependencies = [
"cfg-if",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+ "redox_syscall",
]
[[package]]
@@ -1119,9 +1145,9 @@ dependencies = [
[[package]]
name = "log"
-version = "0.4.21"
+version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
[[package]]
name = "lsp-types"
@@ -1156,7 +1182,7 @@ checksum = "5968c820e2960565f647819f5928a42d6e874551cab9d88d75e3e0660d7f71e3"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.67",
+ "syn 2.0.85",
]
[[package]]
@@ -1188,31 +1214,32 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
dependencies = [
- "adler",
+ "adler2",
]
[[package]]
name = "mio"
-version = "0.8.11"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
dependencies = [
+ "hermit-abi 0.3.9",
"libc",
"wasi",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
]
[[package]]
name = "napi"
-version = "2.16.6"
+version = "2.16.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc300228808a0e6aea5a58115c82889240bcf8dab16fc25ad675b33e454b368"
+checksum = "214f07a80874bb96a8433b3cdfc84980d56c7b02e1a0d7ba4ba0db5cef785e2b"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"ctor",
"napi-derive",
"napi-sys",
@@ -1228,23 +1255,23 @@ checksum = "e1c0f5d67ee408a4685b61f5ab7e58605c8ae3f2b4189f0127d804ff13d5560a"
[[package]]
name = "napi-derive"
-version = "2.16.5"
+version = "2.16.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0e034ddf6155192cf83f267ede763fe6c164dfa9971585436b16173718d94c4"
+checksum = "17435f7a00bfdab20b0c27d9c56f58f6499e418252253081bfff448099da31d1"
dependencies = [
"cfg-if",
"convert_case",
"napi-derive-backend",
"proc-macro2",
"quote",
- "syn 2.0.67",
+ "syn 2.0.85",
]
[[package]]
name = "napi-derive-backend"
-version = "1.0.67"
+version = "1.0.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff2c00437f3b3266391eb5e6aa25d0029187daf5caf05b8e3271468fb5ae73e"
+checksum = "967c485e00f0bf3b1bdbe510a38a4606919cf1d34d9a37ad41f25a81aa077abe"
dependencies = [
"convert_case",
"once_cell",
@@ -1252,7 +1279,7 @@ dependencies = [
"quote",
"regex",
"semver",
- "syn 2.0.67",
+ "syn 2.0.85",
]
[[package]]
@@ -1289,7 +1316,7 @@ version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.9",
"libc",
]
@@ -1301,24 +1328,24 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
[[package]]
name = "object"
-version = "0.36.0"
+version = "0.36.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
dependencies = [
"memchr",
]
[[package]]
name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
[[package]]
name = "oorandom"
-version = "11.1.3"
+version = "11.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
+checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
[[package]]
name = "owo-colors"
@@ -1344,9 +1371,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall 0.5.2",
+ "redox_syscall",
"smallvec",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
]
[[package]]
@@ -1357,9 +1384,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]]
name = "pest"
-version = "2.7.10"
+version = "2.7.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8"
+checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442"
dependencies = [
"memchr",
"thiserror",
@@ -1368,9 +1395,9 @@ dependencies = [
[[package]]
name = "pest_derive"
-version = "2.7.10"
+version = "2.7.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459"
+checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd"
dependencies = [
"pest",
"pest_generator",
@@ -1378,22 +1405,22 @@ dependencies = [
[[package]]
name = "pest_generator"
-version = "2.7.10"
+version = "2.7.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687"
+checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e"
dependencies = [
"pest",
"pest_meta",
"proc-macro2",
"quote",
- "syn 2.0.67",
+ "syn 2.0.85",
]
[[package]]
name = "pest_meta"
-version = "2.7.10"
+version = "2.7.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd"
+checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d"
dependencies = [
"once_cell",
"pest",
@@ -1402,29 +1429,29 @@ dependencies = [
[[package]]
name = "pin-project"
-version = "1.1.5"
+version = "1.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.67",
+ "syn 2.0.85",
]
[[package]]
name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
[[package]]
name = "pin-utils"
@@ -1434,9 +1461,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "plotters"
-version = "0.3.6"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3"
+checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
dependencies = [
"num-traits",
"plotters-backend",
@@ -1447,24 +1474,24 @@ dependencies = [
[[package]]
name = "plotters-backend"
-version = "0.3.6"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7"
+checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
[[package]]
name = "plotters-svg"
-version = "0.3.6"
+version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705"
+checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
dependencies = [
"plotters-backend",
]
[[package]]
name = "pretty_assertions"
-version = "1.4.0"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
+checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
dependencies = [
"diff",
"yansi",
@@ -1472,9 +1499,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
dependencies = [
"unicode-ident",
]
@@ -1550,9 +1577,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.36"
+version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2",
]
@@ -1579,18 +1606,18 @@ dependencies = [
[[package]]
name = "rb-sys"
-version = "0.9.97"
+version = "0.9.102"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47d30bcad206b51f2f66121190ca678dce1fdf3a2eae0ac5d838d1818b19bdf5"
+checksum = "df4dec4b1d304c3b308a2cd86b1216ea45dd4361f4e9fa056f108332d0a450c1"
dependencies = [
"rb-sys-build",
]
[[package]]
name = "rb-sys-build"
-version = "0.9.97"
+version = "0.9.102"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cbd92f281615f3c2dcb9dcb0f0576624752afbf9a7f99173b37c4b55b62dd8a"
+checksum = "1d71de3e29d174b8fb17b5d4470f27d7aa2605f8a9d05fda0d3aeff30e05a570"
dependencies = [
"bindgen",
"lazy_static",
@@ -1598,7 +1625,7 @@ dependencies = [
"quote",
"regex",
"shell-words",
- "syn 2.0.67",
+ "syn 2.0.85",
]
[[package]]
@@ -1609,27 +1636,18 @@ checksum = "a35802679f07360454b418a5d1735c89716bde01d35b1560fc953c1415a0b3bb"
[[package]]
name = "redox_syscall"
-version = "0.4.1"
+version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
-dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
]
[[package]]
name = "regex"
-version = "1.10.5"
+version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
dependencies = [
"aho-corasick",
"memchr",
@@ -1639,9 +1657,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
dependencies = [
"aho-corasick",
"memchr",
@@ -1650,9 +1668,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "reqwest"
@@ -1724,11 +1742,11 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "rustix"
-version = "0.38.34"
+version = "0.38.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a"
dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
"errno",
"libc",
"linux-raw-sys",
@@ -1831,31 +1849,32 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"
[[package]]
name = "serde"
-version = "1.0.203"
+version = "1.0.213"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.203"
+version = "1.0.213"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.67",
+ "syn 2.0.85",
]
[[package]]
name = "serde_json"
-version = "1.0.117"
+version = "1.0.132"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
dependencies = [
"itoa",
+ "memchr",
"ryu",
"serde",
]
@@ -1868,7 +1887,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.67",
+ "syn 2.0.85",
]
[[package]]
@@ -1979,9 +1998,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.67"
+version = "2.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90"
+checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
dependencies = [
"proc-macro2",
"quote",
@@ -2017,9 +2036,9 @@ dependencies = [
[[package]]
name = "tar"
-version = "0.4.41"
+version = "0.4.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909"
+checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020"
dependencies = [
"filetime",
"libc",
@@ -2028,40 +2047,41 @@ dependencies = [
[[package]]
name = "target-lexicon"
-version = "0.12.14"
+version = "0.12.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "tempfile"
-version = "3.10.1"
+version = "3.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
dependencies = [
"cfg-if",
"fastrand",
+ "once_cell",
"rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
name = "thiserror"
-version = "1.0.61"
+version = "1.0.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.61"
+version = "1.0.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.67",
+ "syn 2.0.85",
]
[[package]]
@@ -2085,9 +2105,9 @@ dependencies = [
[[package]]
name = "tinyvec"
-version = "1.6.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
dependencies = [
"tinyvec_macros",
]
@@ -2100,30 +2120,29 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.38.0"
+version = "1.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb"
dependencies = [
"backtrace",
"bytes",
"libc",
"mio",
- "num_cpus",
"pin-project-lite",
"socket2",
"tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
]
[[package]]
name = "tokio-macros"
-version = "2.3.0"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.67",
+ "syn 2.0.85",
]
[[package]]
@@ -2138,9 +2157,9 @@ dependencies = [
[[package]]
name = "tokio-util"
-version = "0.7.11"
+version = "0.7.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
dependencies = [
"bytes",
"futures-core",
@@ -2165,9 +2184,9 @@ dependencies = [
[[package]]
name = "tower-layer"
-version = "0.3.2"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
[[package]]
name = "tower-lsp"
@@ -2200,14 +2219,14 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.67",
+ "syn 2.0.85",
]
[[package]]
name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
[[package]]
name = "tracing"
@@ -2228,7 +2247,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.67",
+ "syn 2.0.85",
]
[[package]]
@@ -2254,36 +2273,36 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
[[package]]
name = "ucd-trie"
-version = "0.1.6"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
[[package]]
name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
[[package]]
name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
[[package]]
name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
dependencies = [
"tinyvec",
]
[[package]]
name = "unicode-segmentation"
-version = "1.11.0"
+version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
[[package]]
name = "unindent"
@@ -2323,9 +2342,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]]
name = "walkdir"
@@ -2354,11 +2373,12 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
dependencies = [
"cfg-if",
+ "once_cell",
"serde",
"serde_json",
"wasm-bindgen-macro",
@@ -2366,24 +2386,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.67",
+ "syn 2.0.85",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.42"
+version = "0.4.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
dependencies = [
"cfg-if",
"js-sys",
@@ -2393,9 +2413,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -2403,28 +2423,28 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.67",
+ "syn 2.0.85",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
[[package]]
name = "web-sys"
-version = "0.3.69"
+version = "0.3.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -2438,11 +2458,11 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
[[package]]
name = "winapi-util"
-version = "0.1.8"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -2460,7 +2480,16 @@ version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
]
[[package]]
@@ -2480,18 +2509,18 @@ dependencies = [
[[package]]
name = "windows-targets"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
"windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
]
[[package]]
@@ -2502,9 +2531,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_msvc"
@@ -2514,9 +2543,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_i686_gnu"
@@ -2526,15 +2555,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
[[package]]
name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
[[package]]
name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_msvc"
@@ -2544,9 +2573,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
[[package]]
name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_x86_64_gnu"
@@ -2556,9 +2585,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnullvm"
@@ -2568,9 +2597,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_msvc"
@@ -2580,9 +2609,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winreg"
@@ -2607,6 +2636,6 @@ dependencies = [
[[package]]
name = "yansi"
-version = "0.5.1"
+version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
diff --git a/pkgs/tools/text/autocorrect/default.nix b/pkgs/tools/text/autocorrect/default.nix
index c752c9cf11c1..457bdf9243dc 100644
--- a/pkgs/tools/text/autocorrect/default.nix
+++ b/pkgs/tools/text/autocorrect/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "autocorrect";
- version = "2.11.1";
+ version = "2.13.0";
src = fetchFromGitHub {
owner = "huacnlee";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-iBwF8rMm4MbHwJSDmENDgGJKCl05psStxsi6BIliZP0=";
+ sha256 = "sha256-12Ell1C5sKj+0HHmlZ3U2Vx5hXvMl/DqAXnfhcfLeF8=";
};
cargoLock = {
diff --git a/pkgs/tools/text/cconv/default.nix b/pkgs/tools/text/cconv/default.nix
index 872db0a44970..c47b6371d345 100644
--- a/pkgs/tools/text/cconv/default.nix
+++ b/pkgs/tools/text/cconv/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ libiconv ];
+ configureFlags = lib.optional stdenv.hostPlatform.isDarwin "LDFLAGS=-liconv";
meta = with lib; {
description = "Iconv based simplified-traditional chinese conversion tool";
diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix
index 14f33ae0c518..88fe8b8c3a59 100644
--- a/pkgs/tools/text/crowdin-cli/default.nix
+++ b/pkgs/tools/text/crowdin-cli/default.nix
@@ -13,11 +13,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "crowdin-cli";
- version = "4.2.0";
+ version = "4.3.0";
src = fetchurl {
url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip";
- hash = "sha256-158zbgYw4FP/vQVsSs9tt9VcisBWpRn/D4ORiM24PYY=";
+ hash = "sha256-Bzh8srMKTHTaA396sPAbICXKGJ/zM+IYMD91zfPLc7I=";
};
nativeBuildInputs = [ installShellFiles makeWrapper unzip ];
diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix
index a6e833de76e6..54360185cd8f 100644
--- a/pkgs/tools/text/opencc/default.nix
+++ b/pkgs/tools/text/opencc/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "opencc";
- version = "1.1.8";
+ version = "1.1.9";
src = fetchFromGitHub {
owner = "BYVoid";
repo = "OpenCC";
rev = "ver.${version}";
- sha256 = "sha256-JKudwA2C7gHihjPnsqPq5i7X8TvG8yQYZEG5f/xu3yo=";
+ sha256 = "sha256-JBTegQs9ALp4LdKKYMNp9GYEgqR9O8IkX6LqatvaTic=";
};
nativeBuildInputs =
diff --git a/pkgs/tools/text/sgml/linuxdoc-tools/default.nix b/pkgs/tools/text/sgml/linuxdoc-tools/default.nix
index 58d3ace63caf..18356356cdca 100644
--- a/pkgs/tools/text/sgml/linuxdoc-tools/default.nix
+++ b/pkgs/tools/text/sgml/linuxdoc-tools/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "linuxdoc-tools";
- version = "0.9.83";
+ version = "0.9.85";
src = fetchFromGitLab {
owner = "agmartin";
repo = "linuxdoc-tools";
rev = version;
- hash = "sha256-1F3MDYJ9UH7ypgTSfYZV59PfLirlTmw6XBMEnz5Jtyk=";
+ hash = "sha256-8nsCfcxqVt16br6Vhk8tW3cxJMJFSZYX2g3MjO7JoT4=";
};
outputs = [ "out" "man" "doc" ];
diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix
index 1384d0219466..ef38bbda1a51 100644
--- a/pkgs/tools/text/ugrep/default.nix
+++ b/pkgs/tools/text/ugrep/default.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ugrep";
- version = "6.5.0";
+ version = "7.0.2";
src = fetchFromGitHub {
owner = "Genivia";
repo = "ugrep";
rev = "v${finalAttrs.version}";
- hash = "sha256-IG1HH/mducD6VyQHAvO2xHT+rMFAT1cqAO06TGeIFik=";
+ hash = "sha256-3kqarrbg7VB0fUQSjqZCVBmr4Mc09NMr+03A5qhe54Y=";
};
buildInputs = [
diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix
index 6a55a5d9e8b1..6119151e5294 100644
--- a/pkgs/tools/text/xidel/default.nix
+++ b/pkgs/tools/text/xidel/default.nix
@@ -62,10 +62,14 @@ in stdenv.mkDerivation rec {
preBuildPhase = ''
mkdir -p import/{flre,synapse,pasdblstrutils} rcmdline internettools
cp -R ${flreSrc}/. import/flre
- cp -R ${synapseSrc}/. import/synapse
cp -R ${pasdblstrutilsSrc}/. import/pasdblstrutils
cp -R ${rcmdlineSrc}/. rcmdline
cp -R ${internettoolsSrc}/. internettools
+
+ cp -R ${synapseSrc}/. import/synapse
+ substituteInPlace import/synapse/ssl_openssl{,11}_lib.pas \
+ --replace-fail 'libcrypto.dylib' '${lib.getLib openssl}/lib/libcrypto.dylib' \
+ --replace-fail 'libssl.dylib' '${lib.getLib openssl}/lib/libssl.dylib'
'';
buildPhase = ''
diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock
index da7c2fccb1b6..203407169bda 100644
--- a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock
+++ b/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock
@@ -1,28 +1,31 @@
GEM
remote: https://rubygems.org/
specs:
- Ascii85 (1.1.0)
- addressable (2.8.5)
- public_suffix (>= 2.0.2, < 6.0)
+ Ascii85 (1.1.1)
+ addressable (2.8.7)
+ public_suffix (>= 2.0.2, < 7.0)
afm (0.2.2)
- asciidoctor (2.0.20)
- asciidoctor-bibtex (0.8.0)
+ asciidoctor (2.0.23)
+ asciidoctor-bibtex (0.9.0)
asciidoctor (~> 2.0)
- bibtex-ruby (~> 5.1)
+ bibtex-ruby (~> 6.1)
citeproc-ruby (~> 1)
csl-styles (~> 1)
latex-decode (~> 0.2)
- asciidoctor-diagram (2.2.11)
+ asciidoctor-diagram (2.3.1)
asciidoctor (>= 1.5.7, < 3.x)
asciidoctor-diagram-ditaamini (~> 1.0)
asciidoctor-diagram-plantuml (~> 1.2021)
rexml
+ asciidoctor-diagram-batik (1.17)
asciidoctor-diagram-ditaamini (1.0.3)
- asciidoctor-diagram-plantuml (1.2023.10)
- asciidoctor-epub3 (1.5.1)
- asciidoctor (>= 1.5.6, < 3.0.0)
- gepub (~> 1.0.0)
+ asciidoctor-diagram-plantuml (1.2024.6)
+ asciidoctor-diagram-batik (~> 1.17)
+ asciidoctor-epub3 (2.1.3)
+ asciidoctor (~> 2.0)
+ gepub (>= 1.0.0, <= 1.0.15)
mime-types (~> 3.0)
+ sass
asciidoctor-html5s (0.5.1)
asciidoctor (>= 1.5.7, < 3.0)
thread_safe (~> 0.3.4)
@@ -30,59 +33,63 @@ GEM
asciidoctor (~> 2.0)
asciimath (~> 2.0)
mathematical (~> 1.6.0)
- asciidoctor-multipage (0.0.16)
+ asciidoctor-multipage (0.0.19)
asciidoctor (>= 2.0.11, < 2.1)
- asciidoctor-pdf (2.3.9)
+ asciidoctor-pdf (2.3.19)
asciidoctor (~> 2.0)
concurrent-ruby (~> 1.1)
matrix (~> 0.4)
prawn (~> 2.4.0)
prawn-icon (~> 3.0.0)
- prawn-svg (~> 0.32.0)
+ prawn-svg (~> 0.34.0)
prawn-table (~> 0.2.0)
prawn-templates (~> 0.1.0)
treetop (~> 1.6.0)
- asciidoctor-reducer (1.0.5)
+ ttfunk (~> 1.7.0)
+ asciidoctor-reducer (1.0.6)
asciidoctor (~> 2.0)
- asciidoctor-revealjs (5.0.1)
+ asciidoctor-revealjs (5.1.0)
asciidoctor (>= 2.0.0, < 3.0.0)
asciimath (2.0.5)
- bibtex-ruby (5.1.6)
+ bibtex-ruby (6.1.0)
latex-decode (~> 0.0)
+ racc (~> 1.7)
citeproc (1.0.10)
namae (~> 1.0)
citeproc-ruby (1.1.14)
citeproc (~> 1.0, >= 1.0.9)
csl (~> 1.6)
coderay (1.1.3)
- concurrent-ruby (1.2.2)
+ concurrent-ruby (1.3.4)
csl (1.6.0)
namae (~> 1.0)
rexml
csl-styles (1.0.1.11)
csl (~> 1.0)
- css_parser (1.14.0)
+ css_parser (1.19.1)
addressable
+ ffi (1.17.0)
gepub (1.0.15)
nokogiri (>= 1.8.2, < 2.0)
rubyzip (> 1.1.1, < 2.4)
hashery (2.1.2)
- i18n (1.14.1)
- concurrent-ruby (~> 1.0)
latex-decode (0.4.0)
- mathematical (1.6.14)
- ruby-enum (~> 0.4)
+ logger (1.6.1)
+ mathematical (1.6.20)
+ ruby-enum (>= 0.4, < 2.0)
matrix (0.4.2)
- mime-types (3.5.0)
+ mime-types (3.6.0)
+ logger
mime-types-data (~> 3.2015)
- mime-types-data (3.2023.0808)
- mini_portile2 (2.8.4)
- namae (1.1.1)
- nokogiri (1.15.4)
+ mime-types-data (3.2024.1001)
+ mini_portile2 (2.8.7)
+ namae (1.2.0)
+ racc (~> 1.7)
+ nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
pdf-core (0.9.0)
- pdf-reader (2.11.0)
+ pdf-reader (2.12.0)
Ascii85 (~> 1.0)
afm (~> 0.2.1)
hashery (~> 2.0)
@@ -94,8 +101,9 @@ GEM
ttfunk (~> 1.7)
prawn-icon (3.0.0)
prawn (>= 1.1.0, < 3.0.0)
- prawn-svg (0.32.0)
+ prawn-svg (0.34.2)
css_parser (~> 1.6)
+ matrix (~> 0.4.2)
prawn (>= 0.11.1, < 3)
rexml (~> 3.2)
prawn-table (0.2.2)
@@ -103,15 +111,22 @@ GEM
prawn-templates (0.1.2)
pdf-reader (~> 2.0)
prawn (~> 2.2)
- public_suffix (5.0.3)
- pygments.rb (2.4.0)
- racc (1.7.1)
- rexml (3.2.6)
- rouge (4.1.3)
- ruby-enum (0.9.0)
- i18n
+ public_suffix (6.0.1)
+ pygments.rb (3.0.0)
+ racc (1.8.1)
+ rb-fsevent (0.11.2)
+ rb-inotify (0.11.1)
+ ffi (~> 1.0)
+ rexml (3.3.9)
+ rouge (4.4.0)
+ ruby-enum (1.0.0)
ruby-rc4 (0.1.5)
rubyzip (2.3.2)
+ sass (3.7.4)
+ sass-listen (~> 4.0.0)
+ sass-listen (4.0.0)
+ rb-fsevent (~> 0.9, >= 0.9.4)
+ rb-inotify (~> 0.9, >= 0.9.7)
thread_safe (0.3.6)
treetop (1.6.12)
polyglot (~> 0.3)
@@ -136,4 +151,4 @@ DEPENDENCIES
rouge
BUNDLED WITH
- 2.4.17
+ 2.5.16
diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix b/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix
index ac3fb75898fb..415b5baaa89f 100644
--- a/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix
+++ b/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33";
+ sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
type = "gem";
};
- version = "2.8.5";
+ version = "2.8.7";
};
afm = {
groups = ["default"];
@@ -25,20 +25,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ds4v9xgsyvijnlflak4dzf1qwmda9yd5bv8jwsb56nngd399rlw";
+ sha256 = "1c62cx96r0v265mywnlik43qx0wf6bjbzl54qa47x6dzjg861mvk";
type = "gem";
};
- version = "1.1.0";
+ version = "1.1.1";
};
asciidoctor = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0yblqlbix3is5ihiqrpbfazb44in7ichfkjzdbsqibp48paanpl3";
+ sha256 = "1wyxgwmnz9bw377r3lba26b090hbsq9qnbw8575a1prpy83qh82j";
type = "gem";
};
- version = "2.0.20";
+ version = "2.0.23";
};
asciidoctor-bibtex = {
dependencies = ["asciidoctor" "bibtex-ruby" "citeproc-ruby" "csl-styles" "latex-decode"];
@@ -46,10 +46,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0fx80bpykixvnlscyz2c4dnjr1063r5ar7j1zn2977vsr8fi8ial";
+ sha256 = "16l7s926h6cjzy4y582sf3x32l4w10klmdnphxi7p4g6d8vhb61y";
type = "gem";
};
- version = "0.8.0";
+ version = "0.9.0";
};
asciidoctor-diagram = {
dependencies = ["asciidoctor" "asciidoctor-diagram-ditaamini" "asciidoctor-diagram-plantuml" "rexml"];
@@ -57,10 +57,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0j6622x9525xbshvbds4gkavvy72lqjqq1jw9flljr8vvsv7xjcs";
+ sha256 = "1214scxm36k409gfy3wilfqx3akrm52r530zmra6cmmf6d22c5q4";
type = "gem";
};
- version = "2.2.11";
+ version = "2.3.1";
+ };
+ asciidoctor-diagram-batik = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0220xqxmkmimxmhsqhlbr0hslijvnhzdds3s6h6fxbxqrrmm0jrl";
+ type = "gem";
+ };
+ version = "1.17";
};
asciidoctor-diagram-ditaamini = {
groups = ["default"];
@@ -73,25 +83,26 @@
version = "1.0.3";
};
asciidoctor-diagram-plantuml = {
+ dependencies = ["asciidoctor-diagram-batik"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0c1pz97fvc0hwvh0by5i682mxnwngqpxb5hp85fly9k8q9hb2hwg";
+ sha256 = "173mp5vnzvn3yv9fw0p66rsbxaip9lhphw22yn19l62d1drlmhia";
type = "gem";
};
- version = "1.2023.10";
+ version = "1.2024.6";
};
asciidoctor-epub3 = {
- dependencies = ["asciidoctor" "gepub" "mime-types"];
+ dependencies = ["asciidoctor" "gepub" "mime-types" "sass"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05lylv2k18vcnf3647n47zdqxpa70bg16znzn252ymp8say25zzg";
+ sha256 = "1yn2nhr7fr5rx7fn0nhw44gf7iampiy53bw59agpfl7h2dyazjll";
type = "gem";
};
- version = "1.5.1";
+ version = "2.1.3";
};
asciidoctor-html5s = {
dependencies = ["asciidoctor" "thread_safe"];
@@ -121,21 +132,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1c72ys845dvcfdrgmkzk3zx6d2f1vh8q8fnvyp4rwy6qcvhpjg4d";
+ sha256 = "1hjqqiibqrmx0147m8b372s57rmhixmpxgv4kwdpnkqbkqgykh7i";
type = "gem";
};
- version = "0.0.16";
+ version = "0.0.19";
};
asciidoctor-pdf = {
- dependencies = ["asciidoctor" "concurrent-ruby" "matrix" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "treetop"];
+ dependencies = ["asciidoctor" "concurrent-ruby" "matrix" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "treetop" "ttfunk"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19c98a6riqhxxlc7kmksjslnyxdjp106ppsqy1vdbkjb39zfign3";
+ sha256 = "1ybkw3xjv75xsc0wbwg76bk83sfspr50k2phshpvh9ynchli8jh3";
type = "gem";
};
- version = "2.3.9";
+ version = "2.3.19";
};
asciidoctor-reducer = {
dependencies = ["asciidoctor"];
@@ -143,10 +154,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1708fi4bxjpkdszm6a4naa0qcsl0vqnhcklryn2sysl24zaz07h5";
+ sha256 = "1fbrk97mdn26zk118dav2ckyiw6kgrlbkkhdcasawsl42hj16slw";
type = "gem";
};
- version = "1.0.5";
+ version = "1.0.6";
};
asciidoctor-revealjs = {
dependencies = ["asciidoctor"];
@@ -154,10 +165,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xh8ax5pv7cc9wa4sx0njpyj20gzfbhramca31qwldgi6hwk4wm8";
+ sha256 = "0jgazcfzn577xlichfj0rvci0fayp63xcng11ss9mmwqgk48ri53";
type = "gem";
};
- version = "5.0.1";
+ version = "5.1.0";
};
asciimath = {
groups = ["default"];
@@ -170,15 +181,15 @@
version = "2.0.5";
};
bibtex-ruby = {
- dependencies = ["latex-decode"];
+ dependencies = ["latex-decode" "racc"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0adh2x935r69nm8qmns5fjsjw034xlyaqddzza2jr2npvf41g34r";
+ sha256 = "1ggx2j1gi46f1a6p45l1abk3nryfg1pj0cdlyrnilnqqpr1cfc96";
type = "gem";
};
- version = "5.1.6";
+ version = "6.1.0";
};
citeproc = {
dependencies = ["namae"];
@@ -217,10 +228,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
+ sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
type = "gem";
};
- version = "1.2.2";
+ version = "1.3.4";
};
csl = {
dependencies = ["namae" "rexml"];
@@ -250,10 +261,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04q1vin8slr3k8mp76qz0wqgap6f9kdsbryvgfq9fljhrm463kpj";
+ sha256 = "17i0fn99kswvfps8r698zw2cr16rc98xdrl0d26y36rv3vhdqh0r";
type = "gem";
};
- version = "1.14.0";
+ version = "1.19.1";
+ };
+ ffi = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
+ type = "gem";
+ };
+ version = "1.17.0";
};
gepub = {
dependencies = ["nokogiri" "rubyzip"];
@@ -276,17 +297,6 @@
};
version = "2.1.2";
};
- i18n = {
- dependencies = ["concurrent-ruby"];
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
- type = "gem";
- };
- version = "1.14.1";
- };
latex-decode = {
groups = ["default"];
platforms = [];
@@ -297,16 +307,26 @@
};
version = "0.4.0";
};
+ logger = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
+ type = "gem";
+ };
+ version = "1.6.1";
+ };
mathematical = {
dependencies = ["ruby-enum"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05mn68gxhfa37qsnzsmdqaa005hf511j5lga76qsrad2gcnhan1b";
+ sha256 = "0y103dvfjswm5r0xafyjrw6ybvz1qrqfa4lvpk9gdhbzwpaiwy4r";
type = "gem";
};
- version = "1.6.14";
+ version = "1.6.20";
};
matrix = {
groups = ["default"];
@@ -319,45 +339,46 @@
version = "0.4.2";
};
mime-types = {
- dependencies = ["mime-types-data"];
+ dependencies = ["logger" "mime-types-data"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1s95nyppk5wrpfgqrzf6f00g7nk0662zmxm4mr2vbdbl83q3k72x";
+ sha256 = "0r34mc3n7sxsbm9mzyzy8m3dvq7pwbryyc8m452axkj0g2axnwbg";
type = "gem";
};
- version = "3.5.0";
+ version = "3.6.0";
};
mime-types-data = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17zdim7kzrh5j8c97vjqp4xp78wbyz7smdp4hi5iyzk0s9imdn5a";
+ sha256 = "06dbn0j13jwdrmlvrjd50mxqrjlkh3lvxp0afh4glyzbliqvqpsd";
type = "gem";
};
- version = "3.2023.0808";
+ version = "3.2024.1001";
};
mini_portile2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq";
+ sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk";
type = "gem";
};
- version = "2.8.4";
+ version = "2.8.7";
};
namae = {
+ dependencies = ["racc"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1j3nl1klkx3gymrdxfc1hlq4a8qlvhhl9aj5v1v08b9fz27sky0l";
+ sha256 = "17fmp6p74ai2w984xayv3kz2nh44w81hqqvn4cfrim3g115wwh9m";
type = "gem";
};
- version = "1.1.1";
+ version = "1.2.0";
};
nokogiri = {
dependencies = ["mini_portile2" "racc"];
@@ -365,10 +386,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0k9w2z0953mnjrsji74cshqqp08q7m1r6zhadw1w0g34xzjh3a74";
+ sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq";
type = "gem";
};
- version = "1.15.4";
+ version = "1.16.7";
};
pdf-core = {
groups = ["default"];
@@ -386,10 +407,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09sx25jpnip2sp6wh5sn5ad7za78rfi95qp5iiczfh43z4jqa8q3";
+ sha256 = "0n0pp7blk3np3fqsb54l34fsamrww80cp3dhlhskfayg7542mrv1";
type = "gem";
};
- version = "2.11.0";
+ version = "2.12.0";
};
polyglot = {
groups = ["default"];
@@ -424,15 +445,15 @@
version = "3.0.0";
};
prawn-svg = {
- dependencies = ["css_parser" "prawn" "rexml"];
+ dependencies = ["css_parser" "matrix" "prawn" "rexml"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0mbxzw7r7hv43db9422flc24ib9d8bdy1nasbni2h998jc5a5lb6";
+ sha256 = "143sfwadbdrgi57am8ikalryjijdyl82h2sdc1cns3wl6b9pkzxg";
type = "gem";
};
- version = "0.32.0";
+ version = "0.34.2";
};
prawn-table = {
dependencies = ["prawn"];
@@ -461,61 +482,81 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k";
+ sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
type = "gem";
};
- version = "5.0.3";
+ version = "6.0.1";
};
"pygments.rb" = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "080kb51l3m0n7xbbzmlcy78wsi03wr995v932v3b6lf6xa6nq8rg";
+ sha256 = "14xhvfnj188pypy6pxj29hrn60pznv6dc4ycdgyd6jv2d769wwj1";
type = "gem";
};
- version = "2.4.0";
+ version = "3.0.0";
};
racc = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g";
+ sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa";
type = "gem";
};
- version = "1.7.1";
+ version = "1.8.1";
+ };
+ rb-fsevent = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423";
+ type = "gem";
+ };
+ version = "0.11.2";
+ };
+ rb-inotify = {
+ dependencies = ["ffi"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0vmy8xgahixcz6hzwy4zdcyn2y6d6ri8dqv5xccgzc1r292019x0";
+ type = "gem";
+ };
+ version = "0.11.1";
};
rexml = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
+ sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p";
type = "gem";
};
- version = "3.2.6";
+ version = "3.3.9";
};
rouge = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19drl3x8fw65v3mpy7fk3cf3dfrywz5alv98n2rm4pp04vdn71lw";
+ sha256 = "0r0b48945hakgy0y7lg6h1bb7pkfz8jqd0r6777f80ij3sansvbs";
type = "gem";
};
- version = "4.1.3";
+ version = "4.4.0";
};
ruby-enum = {
- dependencies = ["i18n"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pys90hxylhyg969iw9lz3qai5lblf8xwbdg1g5aj52731a9k83p";
+ sha256 = "1ry6ha94a5jqbj5y3x9k0szyy3jgnsfyxvva98nivg6yx1dfyrz7";
type = "gem";
};
- version = "0.9.0";
+ version = "1.0.0";
};
ruby-rc4 = {
groups = ["default"];
@@ -537,6 +578,28 @@
};
version = "2.3.2";
};
+ sass = {
+ dependencies = ["sass-listen"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0";
+ type = "gem";
+ };
+ version = "3.7.4";
+ };
+ sass-listen = {
+ dependencies = ["rb-fsevent" "rb-inotify"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
+ type = "gem";
+ };
+ version = "4.0.0";
+ };
thread_safe = {
groups = ["default"];
platforms = [];
diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
index 96da0d8178b8..0a8b2fae43fd 100644
--- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
+++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock
@@ -1,29 +1,30 @@
GEM
remote: https://rubygems.org/
specs:
- Ascii85 (1.1.0)
- addressable (2.8.5)
- public_suffix (>= 2.0.2, < 6.0)
+ Ascii85 (1.1.1)
+ addressable (2.8.7)
+ public_suffix (>= 2.0.2, < 7.0)
afm (0.2.2)
- asciidoctor (2.0.20)
- asciidoctor-pdf (2.3.9)
+ asciidoctor (2.0.23)
+ asciidoctor-pdf (2.3.19)
asciidoctor (~> 2.0)
concurrent-ruby (~> 1.1)
matrix (~> 0.4)
prawn (~> 2.4.0)
prawn-icon (~> 3.0.0)
- prawn-svg (~> 0.32.0)
+ prawn-svg (~> 0.34.0)
prawn-table (~> 0.2.0)
prawn-templates (~> 0.1.0)
treetop (~> 1.6.0)
+ ttfunk (~> 1.7.0)
coderay (1.1.3)
- concurrent-ruby (1.2.2)
- css_parser (1.14.0)
+ concurrent-ruby (1.3.4)
+ css_parser (1.19.1)
addressable
hashery (2.1.2)
matrix (0.4.2)
pdf-core (0.9.0)
- pdf-reader (2.11.0)
+ pdf-reader (2.12.0)
Ascii85 (~> 1.0)
afm (~> 0.2.1)
hashery (~> 2.0)
@@ -35,8 +36,9 @@ GEM
ttfunk (~> 1.7)
prawn-icon (3.0.0)
prawn (>= 1.1.0, < 3.0.0)
- prawn-svg (0.32.0)
+ prawn-svg (0.34.2)
css_parser (~> 1.6)
+ matrix (~> 0.4.2)
prawn (>= 0.11.1, < 3)
rexml (~> 3.2)
prawn-table (0.2.2)
@@ -44,12 +46,12 @@ GEM
prawn-templates (0.1.2)
pdf-reader (~> 2.0)
prawn (~> 2.2)
- public_suffix (5.0.3)
- pygments.rb (2.4.0)
- rexml (3.2.6)
- rouge (4.1.3)
+ public_suffix (6.0.1)
+ pygments.rb (3.0.0)
+ rexml (3.3.9)
+ rouge (4.4.0)
ruby-rc4 (0.1.5)
- tilt (2.2.0)
+ tilt (2.4.0)
treetop (1.6.12)
polyglot (~> 0.3)
ttfunk (1.7.0)
@@ -66,4 +68,4 @@ DEPENDENCIES
tilt
BUNDLED WITH
- 2.4.17
+ 2.5.16
diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix
index 9ae8ea567f00..b192ced5368f 100644
--- a/pkgs/tools/typesetting/asciidoctor/gemset.nix
+++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33";
+ sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
type = "gem";
};
- version = "2.8.5";
+ version = "2.8.7";
};
afm = {
groups = ["default"];
@@ -25,31 +25,31 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ds4v9xgsyvijnlflak4dzf1qwmda9yd5bv8jwsb56nngd399rlw";
+ sha256 = "1c62cx96r0v265mywnlik43qx0wf6bjbzl54qa47x6dzjg861mvk";
type = "gem";
};
- version = "1.1.0";
+ version = "1.1.1";
};
asciidoctor = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0yblqlbix3is5ihiqrpbfazb44in7ichfkjzdbsqibp48paanpl3";
+ sha256 = "1wyxgwmnz9bw377r3lba26b090hbsq9qnbw8575a1prpy83qh82j";
type = "gem";
};
- version = "2.0.20";
+ version = "2.0.23";
};
asciidoctor-pdf = {
- dependencies = ["asciidoctor" "concurrent-ruby" "matrix" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "treetop"];
+ dependencies = ["asciidoctor" "concurrent-ruby" "matrix" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "treetop" "ttfunk"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19c98a6riqhxxlc7kmksjslnyxdjp106ppsqy1vdbkjb39zfign3";
+ sha256 = "1ybkw3xjv75xsc0wbwg76bk83sfspr50k2phshpvh9ynchli8jh3";
type = "gem";
};
- version = "2.3.9";
+ version = "2.3.19";
};
coderay = {
groups = ["default"];
@@ -66,10 +66,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
+ sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
type = "gem";
};
- version = "1.2.2";
+ version = "1.3.4";
};
css_parser = {
dependencies = ["addressable"];
@@ -77,10 +77,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04q1vin8slr3k8mp76qz0wqgap6f9kdsbryvgfq9fljhrm463kpj";
+ sha256 = "17i0fn99kswvfps8r698zw2cr16rc98xdrl0d26y36rv3vhdqh0r";
type = "gem";
};
- version = "1.14.0";
+ version = "1.19.1";
};
hashery = {
groups = ["default"];
@@ -118,10 +118,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "09sx25jpnip2sp6wh5sn5ad7za78rfi95qp5iiczfh43z4jqa8q3";
+ sha256 = "0n0pp7blk3np3fqsb54l34fsamrww80cp3dhlhskfayg7542mrv1";
type = "gem";
};
- version = "2.11.0";
+ version = "2.12.0";
};
polyglot = {
groups = ["default"];
@@ -156,15 +156,15 @@
version = "3.0.0";
};
prawn-svg = {
- dependencies = ["css_parser" "prawn" "rexml"];
+ dependencies = ["css_parser" "matrix" "prawn" "rexml"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0mbxzw7r7hv43db9422flc24ib9d8bdy1nasbni2h998jc5a5lb6";
+ sha256 = "143sfwadbdrgi57am8ikalryjijdyl82h2sdc1cns3wl6b9pkzxg";
type = "gem";
};
- version = "0.32.0";
+ version = "0.34.2";
};
prawn-table = {
dependencies = ["prawn"];
@@ -193,40 +193,40 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k";
+ sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
type = "gem";
};
- version = "5.0.3";
+ version = "6.0.1";
};
"pygments.rb" = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "080kb51l3m0n7xbbzmlcy78wsi03wr995v932v3b6lf6xa6nq8rg";
+ sha256 = "14xhvfnj188pypy6pxj29hrn60pznv6dc4ycdgyd6jv2d769wwj1";
type = "gem";
};
- version = "2.4.0";
+ version = "3.0.0";
};
rexml = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
+ sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p";
type = "gem";
};
- version = "3.2.6";
+ version = "3.3.9";
};
rouge = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19drl3x8fw65v3mpy7fk3cf3dfrywz5alv98n2rm4pp04vdn71lw";
+ sha256 = "0r0b48945hakgy0y7lg6h1bb7pkfz8jqd0r6777f80ij3sansvbs";
type = "gem";
};
- version = "4.1.3";
+ version = "4.4.0";
};
ruby-rc4 = {
groups = ["default"];
@@ -243,10 +243,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7";
+ sha256 = "0kds7wkxmb038cwp6ravnwn8k65ixc68wpm8j5jx5bhx8ndg4x6z";
type = "gem";
};
- version = "2.2.0";
+ version = "2.4.0";
};
treetop = {
dependencies = ["polyglot"];
diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix
index d5b529b75594..5477be8743c4 100644
--- a/pkgs/tools/typesetting/lowdown/default.nix
+++ b/pkgs/tools/typesetting/lowdown/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "lowdown${lib.optionalString (stdenv.hostPlatform.isDarwin && !enableDarwinSandbox) "-unsandboxed"}";
- version = "1.1.2";
+ version = "1.2.0";
outputs = [ "out" "lib" "dev" "man" ];
src = fetchurl {
url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";
- hash = "sha512-KHQi5NpMU6Kw4Ij+BoGE52aU0vIP1pgMhjnBAUdMh6GV/xHCxfTXJduqh9bSfVMeOim08aZSIM7iq1io0VS8LA==";
+ hash = "sha512-D50eoU95ref2Q6jfRCktgiL8j7143Kuv3RxUWbzBZl9aWjyh0nKnjgl709dMM/YQwCl9PDnmYHhYH6J3ULsnXg==";
};
nativeBuildInputs = [ which dieHook ]
diff --git a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix
index 1356fc325047..ac4375c1960d 100644
--- a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix
+++ b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix
@@ -66,6 +66,11 @@ let
'';
# discourage nix-env from matching this package
priority = 10;
+ platforms = lib.platforms.all;
+ # These create a large number of jobs, which puts load on Hydra
+ # without any appreciable benefit (as the combined packages already
+ # cause them all to be built and cached anyway).
+ hydraPlatforms = [ ];
} // lib.optionalAttrs (args ? shortdesc) {
description = args.shortdesc;
};
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index acb4a20314ed..39859d6f5529 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -139,7 +139,7 @@ let
mainDrv = set.out or set.tex or set.tlpkg or set.texdoc or set.texsource; in
builtins.removeAttrs mainDrv [ "outputSpecified" ];
toTLPkgSets = { pkgs, ... }: lib.mapAttrsToList toTLPkgSet
- (builtins.groupBy (p: p.pname) pkgs);
+ (lib.groupBy (p: p.pname) pkgs);
# export TeX packages as { pkgs = [ ... ]; } in the top attribute set
allPkgLists = lib.mapAttrs (n: drv: { pkgs = toTLPkgList drv; }) tl;
diff --git a/pkgs/tools/video/go2rtc/default.nix b/pkgs/tools/video/go2rtc/default.nix
index 39be2d40369b..6c672837b1ad 100644
--- a/pkgs/tools/video/go2rtc/default.nix
+++ b/pkgs/tools/video/go2rtc/default.nix
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "go2rtc";
- version = "1.9.4";
+ version = "1.9.6";
src = fetchFromGitHub {
owner = "AlexxIT";
repo = "go2rtc";
rev = "refs/tags/v${version}";
- hash = "sha256-LK2+hNgP9EhnAL9QKzvfn0+pYjuJJDB7l1fd57jeCWw=";
+ hash = "sha256-Vq0w3JldUVUh4soULyWQI9D2yknkx529n4aAwhpdfdU=";
};
- vendorHash = "sha256-mUdUMZf3KhJyE0iv2yvWtkHa+pyXcv2RTZY+JtBLrSQ=";
+ vendorHash = "sha256-N8aJmxNQ/p2ddJG9DuIVVjcgzEC6TzD0sz992h3q0RU=";
CGO_ENABLED = 0;
diff --git a/pkgs/tools/wayland/swayrbar/default.nix b/pkgs/tools/wayland/swayrbar/default.nix
index db0095a973c3..caf81c055bb6 100644
--- a/pkgs/tools/wayland/swayrbar/default.nix
+++ b/pkgs/tools/wayland/swayrbar/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "swayrbar";
- version = "0.3.8";
+ version = "0.4.0";
src = fetchFromSourcehut {
owner = "~tsdh";
repo = "swayr";
rev = "swayrbar-${version}";
- sha256 = "sha256-pCXkgIesHqXI/m8ecytlq+U62lIrf7bOv95Hi/nyf/g=";
+ sha256 = "sha256-mMcY5TatVHSAsB1E9rcpMh4/yX7j6alZX6ed0yVHFn4=";
};
- cargoHash = "sha256-RSdNYr6l9ayn9anczeGGh2rkKt6COqj+H71d14Gb8r0=";
+ cargoHash = "sha256-fr4hzKDU1n/nSn1Sn7SoI/ZMYm7VU884Rl3Vx+aXInY=";
# don't build swayr
buildAndTestSubdir = pname;
diff --git a/pkgs/top-level/ada-packages.nix b/pkgs/top-level/ada-packages.nix
index 2d3d0c4dc3fa..ad29103deb22 100644
--- a/pkgs/top-level/ada-packages.nix
+++ b/pkgs/top-level/ada-packages.nix
@@ -12,6 +12,8 @@ makeScopeWithSplicing' {
f = (self: {
inherit gnat;
+ gpr2 = self.callPackage ../development/ada-modules/gpr2 { };
+
gprbuild-boot = self.callPackage ../development/ada-modules/gprbuild/boot.nix { };
gprbuild = self.callPackage ../development/ada-modules/gprbuild { };
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3349abac8f70..f223cbff3828 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -60,6 +60,9 @@ mapAliases {
forceSystem = system: _:
(import self.path { localSystem = { inherit system; }; });
+ ### _ ###
+ _1password = lib.warn "_1password has been renamed to _1password-cli to better follow upstream name usage" _1password-cli; # Added 2024-10-24
+
### A ###
AusweisApp2 = ausweisapp; # Added 2023-11-08
@@ -129,6 +132,8 @@ mapAliases {
bashInteractive_5 = throw "'bashInteractive_5' has been renamed to/replaced by 'bashInteractive'"; # Converted to throw 2024-10-17
bash_5 = throw "'bash_5' has been renamed to/replaced by 'bash'"; # Converted to throw 2024-10-17
BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12
+ betterbird = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25
+ betterbird-unwrapped = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25
bibata-extra-cursors = throw "bibata-cursors has been removed as it was broken"; # Added 2024-07-15
bitcoin-unlimited = throw "bitcoin-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15
bitcoind-unlimited = throw "bitcoind-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15
@@ -152,6 +157,7 @@ mapAliases {
inherit (libsForQt5.mauiPackages) buho; # added 2022-05-17
butler = throw "butler was removed because it was broken and abandoned upstream"; # added 2024-06-18
+ bwidget = tclPackages.bwidget; # Added 2024-10-02
# Shorter names; keep the longer name for back-compat. Added 2023-04-11
buildFHSUserEnv = buildFHSEnv;
buildFHSUserEnvChroot = buildFHSEnvChroot;
@@ -177,17 +183,17 @@ mapAliases {
cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API";
certmgr-selfsigned = certmgr; # Added 2023-11-30
challenger = taler-challenger; # Added 2024-09-04
- check_smartmon = throw "'check_smartmon' has been renamed to 'nagiosPlugins.check_smartmon'"; # Added 2024-05-03
- check_systemd = throw "'check_systemd' has been renamed to 'nagiosPlugins.check_systemd'"; # Added 2024-05-03
- check_zfs = throw "'check_zfs' has been renamed to 'nagiosPlugins.check_zfs'"; # Added 2024-05-03
- check-esxi-hardware = throw "'check-esxi-hardware' has been renamed to 'nagiosPlugins.check_esxi_hardware'"; # Added 2024-05-03
- check-mssql-health = throw "'check-mssql-health' has been renamed to 'nagiosPlugins.check_mssql_health'"; # Added 2024-05-03
- check-nwc-health = throw "'check-nwc-health' has been renamed to 'nagiosPlugins.check_nwc_health'"; # Added 2024-05-03
- check-openvpn = throw "'check-openvpn' has been renamed to 'nagiosPlugins.check_openvpn'"; # Added 2024-05-03
- check-ups-health = throw "'check-ups-health' has been renamed to 'nagiosPlugins.check_ups_health'"; # Added 2024-05-03
- check-uptime = throw "'check-uptime' has been renamed to 'nagiosPlugins.check_uptime'"; # Added 2024-05-03
- check-wmiplus = throw "'check-wmiplus' has been renamed to 'nagiosPlugins.check_wmi_plus'"; # Added 2024-05-03
- checkSSLCert = throw "'checkSSLCert' has been renamed to 'nagiosPlugins.check_ssl_cert'"; # Added 2024-05-03
+ check_smartmon = nagiosPlugins.check_smartmon; # Added 2024-05-03
+ check_systemd = nagiosPlugins.check_systemd; # Added 2024-05-03
+ check_zfs = nagiosPlugins.check_zfs; # Added 2024-05-03
+ check-esxi-hardware = nagiosPlugins.check_esxi_hardware; # Added 2024-05-03
+ check-mssql-health = nagiosPlugins.check_mssql_health; # Added 2024-05-03
+ check-nwc-health = nagiosPlugins.check_nwc_health; # Added 2024-05-03
+ check-openvpn = nagiosPlugins.check_openvpn; # Added 2024-05-03
+ check-ups-health = nagiosPlugins.check_ups_health; # Added 2024-05-03
+ check-uptime = nagiosPlugins.check_uptime; # Added 2024-05-03
+ check-wmiplus = nagiosPlugins.check_wmi_plus; # Added 2024-05-03
+ checkSSLCert = nagiosPlugins.check_ssl_cert; # Added 2024-05-03
chiaki4deck = chiaki-ng; # Added 2024-08-04
chocolateDoom = chocolate-doom; # Added 2023-05-01
ChowCentaur = chow-centaur; # Added 2024-06-12
@@ -204,6 +210,7 @@ mapAliases {
clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
CoinMP = coinmp; # Added 2024-06-12
collada-dom = opencollada; # added 2024-02-21
+ colorpicker = throw "'colorpicker' has been removed due to lack of maintenance upstream. Consider using 'gcolor3' or 'eyedropper' instead"; # Added 2024-10-19
coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27
corretto19 = throw "Corretto 19 was removed as it has reached its end of life"; # Added 2024-08-01
cosmic-tasks = tasks; # Added 2024-07-04
@@ -220,6 +227,7 @@ mapAliases {
concurrencykit = throw "'concurrencykit' has been renamed to/replaced by 'libck'"; # Converted to throw 2024-10-17
containerpilot = throw "'containerpilot' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-09
crackmapexec = throw "'crackmapexec' has been removed as it was unmaintained. Use 'netexec' instead"; # 2024-08-11
+ critcl = tclPackages.critcl; # Added 2024-10-02
cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12
cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17
@@ -285,6 +293,7 @@ mapAliases {
EBTKS = ebtks; # Added 2024-01-21
eask = eask-cli; # Added 2024-09-05
+ eboard = throw "'eboard' has been removed due to lack of maintenance upstream. Consider using 'kdePackages.knights' instead"; # Added 2024-10-19
ec2_ami_tools = throw "'ec2_ami_tools' has been renamed to/replaced by 'ec2-ami-tools'"; # Converted to throw 2024-10-17
ec2_api_tools = throw "'ec2_api_tools' has been renamed to/replaced by 'ec2-api-tools'"; # Converted to throw 2024-10-17
ec2-utils = amazon-ec2-utils; # Added 2022-02-01
@@ -308,6 +317,7 @@ mapAliases {
EmptyEpsilon = empty-epsilon; # Added 2024-07-14
enyo-doom = enyo-launcher; # Added 2022-09-09
+ epdfview = throw "'epdfview' has been removed due to lack of maintenance upstream. Consider using 'qpdfview' instead"; # Added 2024-10-19
epoxy = throw "'epoxy' has been renamed to/replaced by 'libepoxy'"; # Converted to throw 2024-10-17
erlang_27-rc3 = throw "erlang_27-rc3 has been removed in favor of erlang_27"; # added 2024-05-20
@@ -394,6 +404,7 @@ mapAliases {
gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10
gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11
ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18
+ gmp5 = throw "'gmp5' has been removed as it is unmaintained. Consider using 'gmp' instead"; # Added 2024-10-28
gmpc = throw "'gmpc' has been removed due to lack of maintenance upstream. Consider using 'plattenalbum' instead"; # Added 2024-09-14
gmtk = throw "'gmtk' has been removed due to lack of maintenance upstream"; # Added 2024-09-14
gmtp = throw "'gmtp' has been removed due to lack of maintenance upstream. Consider using 'gnome-music' instead"; # Added 2024-09-14
@@ -456,6 +467,8 @@ mapAliases {
gnuradio3_9Minimal = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28
gnuradio3_9Packages = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified it's distribution"; # Added 2024-07-28
gobby5 = throw "'gobby5' has been renamed to/replaced by 'gobby'"; # Converted to throw 2024-10-17
+ gradle_6 = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30
+ gradle_6-unwrapped = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30
#godot
@@ -475,6 +488,7 @@ mapAliases {
gringo = clingo; # added 2022-11-27
grub2_full = grub2; # Added 2022-11-18
gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27
+ gtk2fontsel = throw "'gtk2fontsel' has been removed due to lack of maintenance upstream. GTK now has a built-in font chooser so it's no longer needed for newer apps"; # Added 2024-10-19
gtkcord4 = dissent; # Added 2024-03-10
gtkperf = throw "'gtkperf' has been removed due to lack of maintenance upstream"; # Added 2024-09-14
guardian-agent = throw "'guardian-agent' has been removed, as it hasn't been maintained upstream in years and accumulated many vulnerabilities"; # Added 2024-06-09
@@ -499,6 +513,7 @@ mapAliases {
imagemagick7 = throw "'imagemagick7' has been renamed to/replaced by 'imagemagick'"; # Converted to throw 2024-10-17
imagemagick7_light = throw "'imagemagick7_light' has been renamed to/replaced by 'imagemagick_light'"; # Converted to throw 2024-10-17
immersed-vr = lib.warn "'immersed-vr' has been renamed to 'immersed'" immersed; # Added 2024-08-11
+ incrtcl = tclPackages.incrtcl; # Added 2024-10-02
input-utils = throw "The input-utils package was dropped since it was unmaintained."; # Added 2024-06-21
index-fm = libsForQt5.mauiPackages.index; # added 2022-05-17
inotifyTools = inotify-tools;
@@ -512,6 +527,7 @@ mapAliases {
isl_0_11 = throw "isl_0_11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
isl_0_14 = throw "isl_0_14 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
iso-flags-png-320x420 = lib.warn "iso-flags-png-320x420 has been renamed to iso-flags-png-320x240" iso-flags-png-320x240; # Added 2024-07-17
+ itktcl = tclPackages.itktcl; # Added 2024-10-02
### J ###
@@ -520,6 +536,8 @@ mapAliases {
jami-client-qt = jami-client; # Added 2022-11-06
jami-client = jami; # Added 2023-02-10
jami-daemon = jami.daemon; # Added 2023-02-10
+ jd-cli = throw "jd-cli has been removed due to upstream being unmaintained since 2019. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30
+ jd-gui = throw "jd-gui has been removed due to a dependency on the dead JCenter Bintray. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30
jsawk = throw "'jsawk' has been removed because it is unmaintained upstream"; # Added 2028-08-07
# Julia
@@ -565,6 +583,7 @@ mapAliases {
LASzip = laszip; # Added 2024-06-12
LASzip2 = laszip_2; # Added 2024-06-12
latinmodern-math = lmmath;
+ leafpad = throw "'leafpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-10-19
ledger_agent = ledger-agent; # Added 2024-01-07
lfs = dysk; # Added 2023-07-03
libAfterImage = throw "'libAfterImage' has been removed from nixpkgs, as it's no longer in development for a long time"; # Added 2024-06-01
@@ -701,6 +720,7 @@ mapAliases {
lobster-two = throw "'lobster-two' has been renamed to/replaced by 'google-fonts'"; # Converted to throw 2024-10-17
lsh = throw "lsh has been removed as it had no maintainer in Nixpkgs and hasn't seen an upstream release in over a decade"; # Added 2024-08-14
+ luna-icons = throw "luna-icons has been removed as it was removed upstream"; # Added 2024-10-29
lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18
lxd = lib.warn "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01
lxd-unwrapped = lib.warn "lxd-unwrapped has been renamed to lxd-unwrapped-lts" lxd-unwrapped-lts; # Added 2024-04-01
@@ -763,6 +783,7 @@ mapAliases {
mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10
msp430NewlibCross = msp430Newlib; # Added 2024-09-06
mupdf_1_17 = throw "'mupdf_1_17' has been removed due to being outdated and insecure. Consider using 'mupdf' instead."; # Added 2024-08-22
+ mustache-tcl = tclPackages.mustache-tcl; # Added 2024-10-02
mutt-with-sidebar = mutt; # Added 2022-09-17
mysql-client = hiPrio mariadb.client;
mysql = throw "'mysql' has been renamed to/replaced by 'mariadb'"; # Converted to throw 2024-10-17
@@ -772,6 +793,8 @@ mapAliases {
ncdu_2 = ncdu; # Added 2022-07-22
neocities-cli = neocities; # Added 2024-07-31
+ netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02
+ netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22
nextcloud27 = throw ''
Nextcloud v27 has been removed from `nixpkgs` as the support for is dropped
by upstream in 2024-06. Please upgrade to at least Nextcloud v28 by declaring
@@ -886,6 +909,7 @@ mapAliases {
patchelfStable = patchelf; # Added 2024-01-25
pcsctools = pcsc-tools; # Added 2023-12-07
pcsxr = throw "pcsxr was removed as it has been abandoned for over a decade; please use DuckStation, Mednafen, or the RetroArch PCSX ReARMed core"; # Added 2024-08-20
+ pdf4tcl = tclPackages.pdf4tcl; # Added 2024-10-02
peach = asouldocs; # Added 2022-08-28
percona-server_innovation = lib.warn "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-server; # Added 2024-10-13
percona-server_lts = percona-server; # Added 2024-10-13
@@ -950,6 +974,7 @@ mapAliases {
prometheus-dovecot-exporter = dovecot_exporter; # Added 2024-06-10
prometheus-openldap-exporter = throw "'prometheus-openldap-exporter' has been removed from nixpkgs, as it was unmaintained"; # Added 2024-09-01
prometheus-minio-exporter = throw "'prometheus-minio-exporter' has been removed from nixpkgs, use Minio's built-in Prometheus integration instead"; # Added 2024-06-10
+ prometheus-tor-exporter = throw "'prometheus-tor-exporter' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-10-30
protobuf3_24 = protobuf_24;
protobuf3_23 = protobuf_23;
protobuf3_21 = protobuf_21;
@@ -986,6 +1011,7 @@ mapAliases {
quicklispPackagesFor = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
quicklispPackagesGCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
quicklispPackagesSBCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
+ qxw = throw "'qxw' has been removed due to lack of maintenance upstream. Consider using 'crosswords' instead"; # Added 2024-10-19
### R ###
@@ -1105,7 +1131,6 @@ mapAliases {
swiPrologWithGui = lib.warn "swiPrologWithGui has been renamed to swi-prolog-gui" swi-prolog-gui; # Added 2024-09-07
swig1 = throw "swig1 has been removed as it is obsolete"; # Added 2024-08-23
swig2 = throw "swig2 has been removed as it is obsolete"; # Added 2024-08-23
- swig3 = throw "swig3 has been removed as it is obsolete"; # Added 2024-09-12
swig4 = swig; # Added 2024-09-12
swigWithJava = throw "swigWithJava has been removed as the main swig package has supported Java since 2009"; # Added 2024-09-12
swtpm-tpm2 = throw "'swtpm-tpm2' has been renamed to/replaced by 'swtpm'"; # Converted to throw 2024-10-17
@@ -1123,7 +1148,16 @@ mapAliases {
taplo-cli = taplo; # Added 2022-07-30
taplo-lsp = taplo; # Added 2022-07-30
taro = taproot-assets; # Added 2023-07-04
+ tcl-fcgi = tclPackages.tcl-fcgi; # Added 2024-10-02
+ tclcurl = tclPackages.tclcurl; # Added 2024-10-02
+ tcllib = tclPackages.tcllib; # Added 2024-10-02
+ tclmagick = tclPackages.tclmagick; # Added 2024-10-02
+ tcltls = tclPackages.tcltls; # Added 2024-10-02
+ tcludp = tclPackages.tcludp; # Added 2024-10-02
+ tclvfs = tclPackages.tclvfs; # Added 2024-10-02
+ tclx = tclPackages.tclx; # Added 2024-10-02
tdesktop = telegram-desktop; # Added 2023-04-07
+ tdom = tclPackages.tdom; # Added 2024-10-02
teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23
teleport_13 = throw "teleport 13 has been removed as it is EOL. Please upgrade to Teleport 14 or later"; # Added 2024-05-26
teleport_14 = throw "teleport 14 has been removed as it is EOL. Please upgrade to Teleport 15 or later"; # Added 2024-10-18
@@ -1142,7 +1176,9 @@ mapAliases {
invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05
timescale-prometheus = throw "'timescale-prometheus' has been renamed to/replaced by 'promscale'"; # Converted to throw 2024-10-17
tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22
+ tix = tclPackages.tix; # Added 2024-10-02
tkcvs = tkrev; # Added 2022-03-07
+ tkimg = tclPackages.tkimg; # Added 2024-10-02
toil = throw "toil was removed as it was broken and requires obsolete versions of libraries"; # Added 2024-09-22
tokodon = plasma5Packages.tokodon;
tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28
@@ -1222,6 +1258,7 @@ mapAliases {
### W ###
wakatime = wakatime-cli; # 2024-05-30
wal_e = throw "wal_e was removed as it is unmaintained upstream and depends on the removed boto package; upstream recommends using wal-g or pgbackrest"; # Added 2024-09-22
+ wapp = tclPackages.wapp; # Added 2024-10-02
wayfireApplications-unwrapped = throw ''
'wayfireApplications-unwrapped.wayfire' has been renamed to/replaced by 'wayfire'
'wayfireApplications-unwrapped.wayfirePlugins' has been renamed to/replaced by 'wayfirePlugins'
@@ -1248,6 +1285,7 @@ mapAliases {
### X ###
x509-limbo = throw "'x509-limbo' has been removed from nixpkgs"; # Added 2024-10-22
+ xarchive = throw "'xarchive' has been removed due to lack of maintenance upstream. Consider using 'file-roller' instead"; # Added 2024-10-19
xbmc-retroarch-advanced-launchers = throw "'xbmc-retroarch-advanced-launchers' has been renamed to/replaced by 'kodi-retroarch-advanced-launchers'"; # Converted to throw 2024-10-17
xdg_utils = throw "'xdg_utils' has been renamed to/replaced by 'xdg-utils'"; # Converted to throw 2024-10-17
xen-light = throw "'xen-light' has been renamed to/replaced by 'xen-slim'"; # Added 2024-06-30
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c62030e9944c..674ea3b55897 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -466,6 +466,11 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AppKit;
};
+ cope = callPackage ../by-name/co/cope/package.nix {
+ perl = perl538;
+ perlPackages = perl538Packages;
+ };
+
cmark = callPackage ../development/libraries/cmark { };
cmark-gfm = callPackage ../development/libraries/cmark-gfm { };
@@ -494,8 +499,6 @@ with pkgs;
colorpanes = callPackage ../tools/misc/colorpanes { };
- colorpicker = callPackage ../tools/misc/colorpicker { };
-
colorstorm = callPackage ../applications/misc/colorstorm { };
comedilib = callPackage ../development/libraries/comedilib { };
@@ -530,8 +533,6 @@ with pkgs;
crackql = callPackage ../tools/security/crackql { };
- crow-translate = libsForQt5.callPackage ../applications/misc/crow-translate { };
-
dae = callPackage ../tools/networking/dae { };
darling = callPackage ../applications/emulators/darling { };
@@ -624,8 +625,6 @@ with pkgs;
fh = callPackage ../tools/nix/fh { };
- figma-agent = callPackage ../applications/graphics/figma-agent { };
-
firefly-desktop = callPackage ../applications/misc/firefly-desktop { };
frece = callPackage ../development/tools/frece { };
@@ -680,6 +679,8 @@ with pkgs;
inherit (darwin) DarwinTools;
};
+ mumps_par = callPackage ../by-name/mu/mumps/package.nix { mpiSupport = true; };
+
mix2nix = callPackage ../development/tools/mix2nix { };
n98-magerun = callPackage ../development/tools/misc/n98-magerun { };
@@ -1427,8 +1428,6 @@ with pkgs;
_3mux = callPackage ../tools/misc/3mux { };
- _1password = callPackage ../applications/misc/1password { };
-
_1password-gui = callPackage ../applications/misc/1password-gui { };
_1password-gui-beta = callPackage ../applications/misc/1password-gui { channel = "beta"; };
@@ -1466,8 +1465,6 @@ with pkgs;
alsaequal = callPackage ../tools/audio/alsaequal { };
- amdgpu_top = callPackage ../tools/system/amdgpu_top { };
-
acquire = with python3Packages; toPythonApplication acquire;
actdiag = with python3.pkgs; toPythonApplication actdiag;
@@ -2036,11 +2033,6 @@ with pkgs;
xpaste = callPackage ../tools/text/xpaste { };
- xrootd = callPackage ../tools/networking/xrootd {
- # Workaround systemd static build breakage
- systemd = if systemd.meta.broken then null else systemd;
- };
-
yabridge = callPackage ../tools/audio/yabridge {
wine = wineWowPackages.staging;
};
@@ -3843,8 +3835,6 @@ with pkgs;
ssh-agents = callPackage ../tools/networking/ssh-agents { };
- ssh-import-id = python3Packages.callPackage ../tools/admin/ssh-import-id { };
-
ssh-key-confirmer = callPackage ../tools/networking/ssh-key-confirmer { };
ssh-mitm = callPackage ../tools/security/ssh-mitm { };
@@ -4196,12 +4186,6 @@ with pkgs;
burpsuite = callPackage ../tools/networking/burpsuite { };
- ciano = callPackage ../applications/graphics/ciano {
- inherit (pantheon) granite;
- python = python3;
- gtk = gtk3;
- };
-
c3d = callPackage ../applications/graphics/c3d {
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
@@ -4423,7 +4407,7 @@ with pkgs;
shotman = callPackage ../tools/wayland/shotman { };
sway-unwrapped = callPackage ../by-name/sw/sway-unwrapped/package.nix {
- wlroots = wlroots_0_17;
+ wlroots = wlroots_0_18;
};
swayr = callPackage ../tools/wayland/swayr { };
@@ -5170,8 +5154,6 @@ with pkgs;
hexio = callPackage ../development/tools/hexio { };
- hexyl = callPackage ../tools/misc/hexyl { };
-
hid-listen = callPackage ../tools/misc/hid-listen { };
hid-tools = callPackage ../tools/misc/hid-tools { };
@@ -5215,6 +5197,10 @@ with pkgs;
hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { };
+ hyprpolkitagent = callPackage ../by-name/hy/hyprpolkitagent/package.nix {
+ stdenv = gcc14Stdenv;
+ };
+
hyprshade = python311Packages.callPackage ../applications/window-managers/hyprwm/hyprshade { };
hyprlandPlugins = recurseIntoAttrs (callPackage ../applications/window-managers/hyprwm/hyprland-plugins { });
@@ -5874,10 +5860,6 @@ with pkgs;
callPackage ../tools/misc/steampipe-packages { }
);
- step-ca = callPackage ../tools/security/step-ca {
- inherit (darwin.apple_sdk.frameworks) PCSC;
- };
-
step-kms-plugin = callPackage ../tools/security/step-kms-plugin { };
string-machine = callPackage ../applications/audio/string-machine { };
@@ -6473,18 +6455,7 @@ with pkgs;
m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { };
- inherit mozc;
-
- mozc-ut = mozc.override { dictionaries = [
- mozcdic-ut-alt-cannadic
- mozcdic-ut-edict2
- mozcdic-ut-jawiki
- mozcdic-ut-neologd
- mozcdic-ut-personal-names
- mozcdic-ut-place-names
- mozcdic-ut-skk-jisyo
- mozcdic-ut-sudachidict
- ]; };
+ inherit mozc mozc-ut;
openbangla-keyboard = libsForQt5.callPackage ../applications/misc/openbangla-keyboard { withIbusSupport = true; };
@@ -6571,8 +6542,6 @@ with pkgs;
code-browser-gtk2 = callPackage ../applications/editors/code-browser { withGtk2 = true; };
code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk3 = true; };
- certdump = callPackage ../tools/security/certdump { };
-
certstrap = callPackage ../tools/security/certstrap { };
cffconvert = python3Packages.toPythonApplication python3Packages.cffconvert;
@@ -6975,10 +6944,6 @@ with pkgs;
dockbarx = callPackage ../applications/misc/dockbarx { };
- doctave = callPackage ../applications/misc/doctave {
- inherit (darwin.apple_sdk.frameworks) CoreServices;
- };
-
dog = callPackage ../tools/system/dog { };
dogdns = callPackage ../tools/networking/dogdns {
@@ -7395,7 +7360,7 @@ with pkgs;
extundelete = callPackage ../tools/filesystems/extundelete { };
- expect = callPackage ../tools/misc/expect { };
+ expect = tclPackages.expect;
expected-lite = callPackage ../development/libraries/expected-lite { };
@@ -7427,12 +7392,6 @@ with pkgs;
fcitx5-bamboo = callPackage ../tools/inputmethods/fcitx5/fcitx5-bamboo.nix { };
- fcitx5-mozc = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-mozc.nix {
- abseil-cpp = abseil-cpp.override {
- cxxStandard = "17";
- };
- };
-
fcitx5-skk = qt6Packages.callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { };
fcitx5-anthy = callPackage ../tools/inputmethods/fcitx5/fcitx5-anthy.nix { };
@@ -7534,8 +7493,6 @@ with pkgs;
flashrom = callPackage ../tools/misc/flashrom { };
- flent = python3Packages.callPackage ../applications/networking/flent { };
-
flexoptix-app = callPackage ../tools/misc/flexoptix-app { };
flpsed = callPackage ../applications/editors/flpsed { };
@@ -7693,8 +7650,6 @@ with pkgs;
fswebcam = callPackage ../os-specific/linux/fswebcam { };
- fulcio = callPackage ../tools/security/fulcio { };
-
fuseiso = callPackage ../tools/filesystems/fuseiso { };
fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { });
@@ -8055,8 +8010,6 @@ with pkgs;
gopro = callPackage ../tools/video/gopro { };
- goreleaser = callPackage ../tools/misc/goreleaser { };
-
goreplay = callPackage ../tools/networking/goreplay { };
gost = callPackage ../tools/networking/gost { };
@@ -8159,11 +8112,6 @@ with pkgs;
groff = callPackage ../tools/text/groff { };
- gromit-mpx = callPackage ../tools/graphics/gromit-mpx {
- gtk = gtk3;
- libappindicator = libappindicator-gtk3;
- };
-
gron = callPackage ../development/tools/gron { };
groonga = callPackage ../servers/search/groonga { };
@@ -8501,8 +8449,6 @@ with pkgs;
http-prompt = callPackage ../tools/networking/http-prompt { };
- http-getter = callPackage ../applications/networking/flent/http-getter.nix { };
-
httpdump = callPackage ../tools/security/httpdump { };
httpie = with python3Packages; toPythonApplication httpie;
@@ -8780,12 +8726,8 @@ with pkgs;
jc = with python3Packages; toPythonApplication jc;
- jd-cli = callPackage ../tools/security/jd-cli { };
-
jd-diff-patch = callPackage ../development/tools/jd-diff-patch { };
- jd-gui = callPackage ../tools/security/jd-gui { };
-
jdiskreport = callPackage ../tools/misc/jdiskreport { };
jekyll = callPackage ../applications/misc/jekyll { };
@@ -9492,10 +9434,14 @@ with pkgs;
nodejs-slim_22 = callPackage ../development/web/nodejs/v22.nix { enableNpm = false; };
corepack_22 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_22; });
+ nodejs_23 = callPackage ../development/web/nodejs/v23.nix { };
+ nodejs-slim_23 = callPackage ../development/web/nodejs/v23.nix { enableNpm = false; };
+ corepack_23 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_23; });
+
# Update this when adding the newest nodejs major version!
- nodejs_latest = nodejs_22;
- nodejs-slim_latest = nodejs-slim_22;
- corepack_latest = hiPrio corepack_22;
+ nodejs_latest = nodejs_23;
+ nodejs-slim_latest = nodejs-slim_23;
+ corepack_latest = hiPrio corepack_23;
buildNpmPackage = callPackage ../build-support/node/build-npm-package { };
@@ -9568,8 +9514,6 @@ with pkgs;
ldns = callPackage ../development/libraries/ldns { };
- leafpad = callPackage ../applications/editors/leafpad { };
-
leanblueprint = with python3Packages; toPythonApplication leanblueprint;
leanify = callPackage ../tools/misc/leanify { };
@@ -9600,8 +9544,6 @@ with pkgs;
libcork = callPackage ../development/libraries/libcork { };
- libconfig = callPackage ../development/libraries/libconfig { };
-
libcmis = callPackage ../development/libraries/libcmis { };
libee = callPackage ../development/libraries/libee { };
@@ -10263,8 +10205,10 @@ with pkgs;
netbootxyz-efi = callPackage ../tools/misc/netbootxyz-efi { };
- inherit (callPackage ../servers/web-apps/netbox { })
- netbox netbox_3_6 netbox_3_7;
+ inherit (callPackage ../servers/web-apps/netbox { }) netbox_3_7;
+
+ # Not in aliases because it wouldn't get picked up by callPackage
+ netbox = netbox_4_1;
netbox2netshot = callPackage ../tools/admin/netbox2netshot { };
@@ -10371,8 +10315,6 @@ with pkgs;
nomad-driver-podman = callPackage ../applications/networking/cluster/nomad-driver-podman { };
- nomad-pack = callPackage ../applications/networking/cluster/nomad-pack { };
-
nova = callPackage ../applications/networking/cluster/nova { };
nomino = callPackage ../tools/misc/nomino { };
@@ -11460,10 +11402,6 @@ with pkgs;
ticktick = callPackage ../applications/office/ticktick { };
- pyditz = callPackage ../applications/misc/pyditz {
- pythonPackages = python3Packages;
- };
-
py-spy = darwin.apple_sdk_11_0.callPackage ../development/tools/py-spy {
# https://github.com/benfred/py-spy/issues/633
python3 = python311;
@@ -11487,9 +11425,7 @@ with pkgs;
remarshal = with python3Packages; toPythonApplication remarshal;
- rehex = darwin.apple_sdk_11_0.callPackage ../applications/editors/rehex {
- inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa IOKit;
- };
+ rehex = callPackage ../applications/editors/rehex { };
rio = callPackage ../applications/terminal-emulators/rio { };
@@ -11667,8 +11603,6 @@ with pkgs;
react-native-debugger = callPackage ../development/tools/react-native-debugger { };
- readarr = callPackage ../servers/readarr { };
-
read-edid = callPackage ../os-specific/linux/read-edid { };
readstat = callPackage ../applications/science/math/readstat { };
@@ -12367,8 +12301,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
- sonar-scanner-cli = callPackage ../tools/security/sonar-scanner-cli { };
-
snapshot = callPackage ../applications/graphics/snapshot { };
solvespace = callPackage ../applications/graphics/solvespace { };
@@ -12946,8 +12878,6 @@ with pkgs;
tran = callPackage ../tools/networking/tran { };
- trayscale = callPackage ../applications/networking/trayscale { };
-
tpmmanager = libsForQt5.callPackage ../applications/misc/tpmmanager { };
tpm-quote-tools = callPackage ../tools/security/tpm-quote-tools { };
@@ -13630,8 +13560,6 @@ with pkgs;
buildGoModule = buildGo123Module;
};
- xarchive = callPackage ../tools/archivers/xarchive { };
-
xarchiver = callPackage ../tools/archivers/xarchiver { };
xbanish = callPackage ../tools/X11/xbanish { };
@@ -14031,8 +13959,6 @@ with pkgs;
zet = callPackage ../tools/text/zet { };
- zfp = callPackage ../tools/compression/zfp { };
-
zfs-autobackup = callPackage ../tools/backup/zfs-autobackup { };
zfsbackup = callPackage ../tools/backup/zfsbackup { };
@@ -14056,10 +13982,6 @@ with pkgs;
zip = callPackage ../tools/archivers/zip { };
- zincsearch = callPackage ../servers/search/zincsearch {
- buildGoModule = buildGo122Module;
- };
-
zkfuse = callPackage ../tools/filesystems/zkfuse { };
zpaq = callPackage ../tools/archivers/zpaq { };
@@ -14440,21 +14362,20 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
- critcl = callPackage ../development/compilers/critcl {
- tcllib = tcllib.override { withCritcl = false; };
- };
-
inherit (darwin.apple_sdk_11_0.callPackage ../development/compilers/crystal { })
crystal_1_2
crystal_1_7
crystal_1_8
crystal_1_9
+ crystal_1_11
+ crystal_1_12
+ crystal_1_14
crystal;
crystal2nix = callPackage ../development/compilers/crystal2nix { };
crystalline = callPackage ../development/tools/language-servers/crystalline {
- llvmPackages = llvmPackages_15;
+ llvmPackages = crystal.llvmPackages;
};
icr = callPackage ../development/tools/icr { };
@@ -14501,14 +14422,13 @@ with pkgs;
flasm = callPackage ../development/compilers/flasm { };
- flyctl = callPackage ../development/web/flyctl { };
-
fluidd = callPackage ../applications/misc/fluidd { };
flutterPackages-bin = recurseIntoAttrs (callPackage ../development/compilers/flutter { });
flutterPackages-source = recurseIntoAttrs (callPackage ../development/compilers/flutter { useNixpkgsEngine = true; });
flutterPackages = flutterPackages-bin;
flutter = flutterPackages.stable;
+ flutter327 = flutterPackages.v3_27;
flutter326 = flutterPackages.v3_26;
flutter324 = flutterPackages.v3_24;
flutter319 = flutterPackages.v3_19;
@@ -14771,6 +14691,7 @@ with pkgs;
gnat12Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat12; });
gnat13Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat13; });
+ gnat14Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat14; });
gnatPackages = gnat12Packages;
inherit (gnatPackages)
@@ -14859,6 +14780,7 @@ with pkgs;
gleam = callPackage ../development/compilers/gleam {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
+ erlang = erlang_27;
};
gmqcc = callPackage ../development/compilers/gmqcc { };
@@ -15372,11 +15294,14 @@ with pkgs;
muonlang = callPackage ../development/compilers/muonlang { };
- inherit (callPackages ../development/compilers/nim
- { inherit (darwin) Security; }
- ) nim-unwrapped-1 nim-unwrapped-2 nim1 nim2;
nim = nim2;
- buildNimPackage = callPackage ../development/compilers/nim/build-nim-package.nix { };
+ nim1 = nim-1_0;
+ nim2 = nim-2_2;
+ nim-unwrapped = nim-unwrapped-2_2;
+ nim-unwrapped-1 = nim-unwrapped-1_0;
+ nim-unwrapped-2 = nim-unwrapped-2_2;
+
+ buildNimPackage = callPackage ../build-support/build-nim-package.nix { };
nimOverrides = callPackage ./nim-overrides.nix { };
neko = callPackage ../development/compilers/neko { };
@@ -15639,7 +15564,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
cargo-limit = callPackage ../development/tools/rust/cargo-limit { };
- cargo-modules = callPackage ../development/tools/rust/cargo-modules { };
cargo-mommy = callPackage ../development/tools/rust/cargo-mommy { };
cargo-msrv = callPackage ../development/tools/rust/cargo-msrv {
inherit (darwin.apple_sdk.frameworks) Security;
@@ -16628,7 +16552,10 @@ with pkgs;
tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { };
tcl-9_0 = callPackage ../development/interpreters/tcl/9.0.nix { };
- tclreadline = callPackage ../development/interpreters/tclreadline { };
+ # We don't need versioned package sets thanks to the tcl stubs mechanism
+ tclPackages = recurseIntoAttrs (callPackage ./tcl-packages.nix {});
+
+ tclreadline = tclPackages.tclreadline;
eltclsh = callPackage ../development/tools/eltclsh { };
@@ -16716,7 +16643,7 @@ with pkgs;
asdf-vm = callPackage ../tools/misc/asdf-vm { };
- mise = callPackage ../tools/misc/mise {
+ mise = callPackage ../by-name/mi/mise/package.nix {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
@@ -16859,10 +16786,6 @@ with pkgs;
ansible-lint = callPackage ../tools/admin/ansible/lint.nix { };
- antares = callPackage ../by-name/an/antares/package.nix {
- electron = electron_30;
- };
-
antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { };
antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { };
@@ -16940,7 +16863,7 @@ with pkgs;
electron_27 = electron_27-bin;
electron_28 = electron_28-bin;
electron_29 = electron_29-bin;
- electron_30 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_30 then electron-source.electron_30 else electron_30-bin;
+ electron_30 = electron_30-bin;
electron_31 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_31 then electron-source.electron_31 else electron_31-bin;
electron_32 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_32 then electron-source.electron_32 else electron_32-bin;
electron_33 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_33 then electron-source.electron_33 else electron_33-bin;
@@ -17617,8 +17540,6 @@ with pkgs;
flexcpp = callPackage ../development/tools/parsing/flexc++ { };
- geis = callPackage ../development/libraries/geis { };
-
gi-docgen = callPackage ../development/tools/documentation/gi-docgen { };
git2-cpp = callPackage ../development/libraries/git2-cpp { };
@@ -17681,15 +17602,13 @@ with pkgs;
gradleGen = gradle-packages.gen;
wrapGradle = callPackage gradle-packages.wrapGradle { };
- gradle_6-unwrapped = callPackage gradle-packages.gradle_6 { };
gradle_7-unwrapped = callPackage gradle-packages.gradle_7 { };
gradle_8-unwrapped = callPackage gradle-packages.gradle_8 { };
gradle-unwrapped = gradle_8-unwrapped;
- gradle_6 = wrapGradle gradle_6-unwrapped;
- gradle_7 = wrapGradle gradle_7-unwrapped;
- gradle_8 = wrapGradle gradle_8-unwrapped;
- gradle = wrapGradle gradle-unwrapped;
+ gradle_7 = wrapGradle gradle_7-unwrapped null;
+ gradle_8 = wrapGradle gradle_8-unwrapped null;
+ gradle = wrapGradle gradle-unwrapped "gradle-unwrapped";
gperf = callPackage ../development/tools/misc/gperf { };
# 3.1 changed some parameters from int to size_t, leading to mismatches.
@@ -17890,8 +17809,6 @@ with pkgs;
lemon = callPackage ../development/tools/parsing/lemon { };
- lenmus = callPackage ../applications/misc/lenmus { };
-
libtool = libtool_2;
libtool_1_5 = callPackage ../development/tools/misc/libtool { };
@@ -18382,7 +18299,7 @@ with pkgs;
slimerjs = callPackage ../development/tools/slimerjs { };
- slint-lsp = callPackage ../development/tools/misc/slint-lsp {
+ slint-lsp = callPackage ../by-name/sl/slint-lsp/package.nix {
inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL;
};
@@ -18434,8 +18351,6 @@ with pkgs;
sqlboiler-crdb = callPackage ../development/tools/database/sqlboiler-crdb { };
- sqlc = callPackage ../development/tools/database/sqlc { };
-
sqlcheck = callPackage ../development/tools/database/sqlcheck { };
sqlcmd = callPackage ../development/tools/database/sqlcmd { };
@@ -19004,8 +18919,6 @@ with pkgs;
bulletml = callPackage ../development/libraries/bulletml { };
- bwidget = callPackage ../development/libraries/bwidget { };
-
bzrtp = callPackage ../development/libraries/bzrtp { };
c-ares = callPackage ../development/libraries/c-ares { };
@@ -19857,7 +19770,6 @@ with pkgs;
gmm = callPackage ../development/libraries/gmm { };
gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; # required by older GHC versions
- gmp5 = callPackage ../development/libraries/gmp/5.1.x.nix { };
gmp6 = callPackage ../development/libraries/gmp/6.x.nix { };
gmp = gmp6;
gmpxx = gmp.override { cxx = true; };
@@ -20274,13 +20186,8 @@ with pkgs;
impy = callPackage ../development/libraries/impy { };
- ineffassign = callPackage ../development/tools/ineffassign { };
-
ijs = callPackage ../development/libraries/ijs { };
- itktcl = callPackage ../development/libraries/itktcl { };
- incrtcl = callPackage ../development/libraries/incrtcl { };
-
indicator-application-gtk2 = callPackage ../development/libraries/indicator-application/gtk2.nix { };
indicator-application-gtk3 = callPackage ../development/libraries/indicator-application/gtk3.nix { };
@@ -20329,7 +20236,6 @@ with pkgs;
isort = with python3Packages; toPythonApplication isort;
ispc = callPackage ../development/compilers/ispc {
- xcode = darwin.xcode_14;
llvmPackages = llvmPackages_17;
};
@@ -23245,14 +23151,6 @@ with pkgs;
tclap_1_4 = callPackage ../development/libraries/tclap/1.4.nix { };
- tcllib = callPackage ../development/libraries/tcllib { };
-
- tcltls = callPackage ../development/libraries/tcltls { };
-
- tclx = callPackage ../development/libraries/tclx { };
-
- tcl-fcgi = callPackage ../development/libraries/tcl-fcgi { };
-
tdb = callPackage ../development/libraries/tdb { };
tdlib = callPackage ../development/libraries/tdlib { };
@@ -23301,16 +23199,12 @@ with pkgs;
tivodecode = callPackage ../applications/video/tivodecode { };
- tix = callPackage ../development/libraries/tix { };
-
tk = tk-8_6;
tk-9_0 = callPackage ../development/libraries/tk/9.0.nix { tcl = tcl-9_0; };
tk-8_6 = callPackage ../development/libraries/tk/8.6.nix { };
tk-8_5 = callPackage ../development/libraries/tk/8.5.nix { tcl = tcl-8_5; };
- tkimg = callPackage ../development/libraries/tkimg { };
-
tkrzw = callPackage ../development/libraries/tkrzw { };
tl-expected = callPackage ../development/libraries/tl-expected { };
@@ -23323,8 +23217,6 @@ with pkgs;
kyotocabinet = callPackage ../development/libraries/kyotocabinet { };
- tomlplusplus = callPackage ../development/libraries/tomlplusplus { };
-
tokyocabinet = callPackage ../development/libraries/tokyo-cabinet { };
tokyotyrant = callPackage ../development/libraries/tokyo-tyrant { };
@@ -23479,8 +23371,6 @@ with pkgs;
wangle = darwin.apple_sdk_11_0.callPackage ../development/libraries/wangle { };
- wapp = callPackage ../development/libraries/wapp { };
-
wavpack = callPackage ../development/libraries/wavpack { };
wayland = darwin.apple_sdk_11_0.callPackage ../development/libraries/wayland { };
@@ -24254,8 +24144,6 @@ with pkgs;
etcd_3_4 = callPackage ../servers/etcd/3.4.nix { };
etcd_3_5 = callPackage ../servers/etcd/3.5 { };
- ejabberd = callPackage ../servers/xmpp/ejabberd { };
-
exhaustive = callPackage ../development/tools/exhaustive { };
hyp = callPackage ../servers/http/hyp { };
@@ -24870,7 +24758,7 @@ with pkgs;
nagios = callPackage ../servers/monitoring/nagios { };
- nagiosPlugins = callPackages ../servers/monitoring/nagios-plugins { };
+ nagiosPlugins = recurseIntoAttrs (callPackages ../servers/monitoring/nagios-plugins { });
monitoring-plugins = callPackage ../servers/monitoring/plugins { };
@@ -24933,12 +24821,14 @@ with pkgs;
postgresql_14
postgresql_15
postgresql_16
+ postgresql_17
postgresql_12_jit
postgresql_13_jit
postgresql_14_jit
postgresql_15_jit
postgresql_16_jit
+ postgresql_17_jit
;
postgresql = postgresql_16;
postgresql_jit = postgresql_16_jit;
@@ -24948,12 +24838,14 @@ with pkgs;
postgresql13Packages = recurseIntoAttrs postgresql_13.pkgs;
postgresql14Packages = recurseIntoAttrs postgresql_14.pkgs;
postgresql15Packages = recurseIntoAttrs postgresql_15.pkgs;
+ postgresql16Packages = recurseIntoAttrs postgresql_16.pkgs;
+ postgresql17Packages = recurseIntoAttrs postgresql_17.pkgs;
postgresql12JitPackages = recurseIntoAttrs postgresql_12_jit.pkgs;
postgresql13JitPackages = recurseIntoAttrs postgresql_13_jit.pkgs;
postgresql14JitPackages = recurseIntoAttrs postgresql_14_jit.pkgs;
postgresql15JitPackages = recurseIntoAttrs postgresql_15_jit.pkgs;
postgresql16JitPackages = recurseIntoAttrs postgresql_16_jit.pkgs;
- postgresql16Packages = postgresqlPackages;
+ postgresql17JitPackages = recurseIntoAttrs postgresql_17_jit.pkgs;
postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
@@ -24966,7 +24858,6 @@ with pkgs;
liquibase_redshift_extension = callPackage ../development/java-modules/liquibase_redshift_extension { };
prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
- prometheus = callPackage ../servers/monitoring/prometheus { };
prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { };
prometheus-artifactory-exporter = callPackage ../servers/monitoring/prometheus/artifactory-exporter.nix { };
@@ -25017,7 +24908,6 @@ with pkgs;
prometheus-postfix-exporter = callPackage ../servers/monitoring/prometheus/postfix-exporter.nix { };
prometheus-postgres-exporter = callPackage ../servers/monitoring/prometheus/postgres-exporter.nix { };
prometheus-process-exporter = callPackage ../servers/monitoring/prometheus/process-exporter.nix { };
- prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { };
prometheus-pve-exporter = callPackage ../servers/monitoring/prometheus/pve-exporter.nix { };
prometheus-redis-exporter = callPackage ../servers/monitoring/prometheus/redis-exporter.nix { };
prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { };
@@ -25033,7 +24923,6 @@ with pkgs;
prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { };
prometheus-sql-exporter = callPackage ../servers/monitoring/prometheus/sql-exporter.nix { };
prometheus-systemd-exporter = callPackage ../servers/monitoring/prometheus/systemd-exporter.nix { };
- prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { };
prometheus-unbound-exporter = callPackage ../servers/monitoring/prometheus/unbound-exporter.nix { };
prometheus-v2ray-exporter = callPackage ../servers/monitoring/prometheus/v2ray-exporter.nix { };
prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { };
@@ -25222,7 +25111,10 @@ with pkgs;
inherit (callPackages ../servers/http/tomcat { })
tomcat9
- tomcat10;
+ tomcat10
+ tomcat11;
+
+ tomcat = tomcat11;
tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { };
@@ -25677,6 +25569,7 @@ with pkgs;
};
btop = darwin.apple_sdk_11_0.callPackage ../tools/system/btop { };
+ btop-rocm = btop.override { rocmSupport = true; };
nmon = callPackage ../os-specific/linux/nmon { };
@@ -26379,8 +26272,8 @@ with pkgs;
sdparm = callPackage ../os-specific/linux/sdparm { };
- sdrangel = libsForQt5.callPackage ../applications/radio/sdrangel {
- stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
+ sdrangel = qt6Packages.callPackage ../applications/radio/sdrangel {
+ stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "12.3" else stdenv;
};
setools = callPackage ../os-specific/linux/setools { };
@@ -27295,10 +27188,6 @@ with pkgs;
luculent = callPackage ../data/fonts/luculent { };
- luna-icons = callPackage ../data/icons/luna-icons {
- inherit (plasma5Packages) breeze-icons;
- };
-
maia-icon-theme = libsForQt5.callPackage ../data/icons/maia-icon-theme { };
mailcap = callPackage ../data/misc/mailcap { };
@@ -27375,8 +27264,6 @@ with pkgs;
mustache-spec = callPackage ../data/documentation/mustache-spec { };
- mustache-tcl = callPackage ../development/libraries/mustache-tcl { };
-
mustache-go = callPackage ../development/tools/mustache-go { };
mustache-hpp = callPackage ../development/libraries/mustache-hpp { };
@@ -27991,6 +27878,7 @@ with pkgs;
inherit (qt6Packages.callPackage ../applications/office/activitywatch { })
aw-qt
+ aw-notify
aw-server-rust
aw-watcher-afk
aw-watcher-window;
@@ -28013,13 +27901,20 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
- pdfstudio2021 = callPackage ../applications/misc/pdfstudio { year = "2021"; };
-
- pdfstudio2022 = callPackage ../applications/misc/pdfstudio { year = "2022"; };
-
- pdfstudio2023 = callPackage ../applications/misc/pdfstudio { year = "2023"; };
-
- pdfstudioviewer = callPackage ../applications/misc/pdfstudio { program = "pdfstudioviewer"; };
+ inherit
+ ({
+ pdfstudio2021 = callPackage ../applications/misc/pdfstudio { year = "2021"; };
+ pdfstudio2022 = callPackage ../applications/misc/pdfstudio { year = "2022"; };
+ pdfstudio2023 = callPackage ../applications/misc/pdfstudio { year = "2023"; };
+ pdfstudio2024 = callPackage ../applications/misc/pdfstudio { year = "2024"; };
+ pdfstudioviewer = callPackage ../applications/misc/pdfstudio { program = "pdfstudioviewer"; };
+ })
+ pdfstudio2021
+ pdfstudio2022
+ pdfstudio2023
+ pdfstudio2024
+ pdfstudioviewer
+ ;
abaddon = callPackage ../applications/networking/instant-messengers/abaddon { };
@@ -28370,8 +28265,6 @@ with pkgs;
buzztrax = callPackage ../applications/audio/buzztrax { };
- brave = callPackage ../applications/networking/browsers/brave { };
-
break-time = callPackage ../applications/misc/break-time { };
breezy = with python3Packages; toPythonApplication breezy;
@@ -28727,7 +28620,7 @@ with pkgs;
dmenu = callPackage ../applications/misc/dmenu { };
dmenu-wayland = callPackage ../applications/misc/dmenu/wayland.nix { };
- dmenu-rs = callPackage ../applications/misc/dmenu-rs { };
+ dmenu-rs-enable-plugins = dmenu-rs.override { enablePlugins = true; };
dmensamenu = callPackage ../applications/misc/dmensamenu {
inherit (python3Packages) buildPythonApplication requests;
@@ -28929,8 +28822,6 @@ with pkgs;
eos-installer = callPackage ../applications/misc/eos-installer { };
- epdfview = callPackage ../applications/misc/epdfview { };
-
epeg = callPackage ../applications/graphics/epeg { };
epgstation = callPackage ../applications/video/epgstation { };
@@ -29742,8 +29633,6 @@ with pkgs;
gst123 = callPackage ../applications/audio/gst123 { };
- gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { };
-
gtklock = callPackage ../tools/wayland/gtklock { };
gtklock-playerctl-module = callPackage ../tools/wayland/gtklock/playerctl-module.nix { };
@@ -29929,8 +29818,6 @@ with pkgs;
passky-desktop = callPackage ../applications/misc/passky-desktop { };
- pat = callPackage ../applications/radio/pat { };
-
pinboard = with python3Packages; toPythonApplication pinboard;
pinboard-notes-backup = haskell.lib.compose.justStaticExecutables haskellPackages.pinboard-notes-backup;
@@ -30381,8 +30268,6 @@ with pkgs;
kile = callPackage ../applications/editors/kile { };
- kitsas = libsForQt5.callPackage ../applications/office/kitsas { };
-
kiwix = libsForQt5.callPackage ../applications/misc/kiwix { };
kiwix-tools = callPackage ../applications/misc/kiwix/tools.nix { };
@@ -30407,7 +30292,7 @@ with pkgs;
kondo = callPackage ../applications/misc/kondo { };
- kotatogram-desktop = kdePackages.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop {
+ kotatogram-desktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop {
stdenv = if stdenv.hostPlatform.isDarwin
then overrideSDK stdenv "11.0"
else stdenv;
@@ -30488,8 +30373,6 @@ with pkgs;
kubevpn = callPackage ../applications/networking/cluster/kubevpn { };
- k8sgpt = callPackage ../applications/networking/cluster/k8sgpt { };
-
k9s = callPackage ../applications/networking/cluster/k9s { };
kubecm = callPackage ../applications/networking/cluster/kubecm { };
@@ -31377,6 +31260,8 @@ with pkgs;
scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { };
+ scx = recurseIntoAttrs (callPackage ../os-specific/linux/scx { });
+
shod = callPackage ../applications/window-managers/shod { };
shogun = callPackage ../applications/science/machine-learning/shogun {
@@ -32121,8 +32006,6 @@ with pkgs;
inherit (__splicedPackages.libsForQt5) qtbase qtwebengine wrapQtAppsHook qtwayland;
};
- qxw = callPackage ../applications/editors/qxw { };
-
rakarrack = callPackage ../applications/audio/rakarrack {
fltk = fltk13;
};
@@ -32504,15 +32387,7 @@ with pkgs;
super-slicer-latest = super-slicer.latest;
- bambu-studio = callPackage ../applications/misc/bambu-studio {
- inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good;
-
- wxGTK31 = wxGTK31.override {
- withCurl = true;
- withPrivateFonts = true;
- withWebKit = true;
- };
- };
+ bambu-studio = callPackage ../applications/misc/bambu-studio { };
orca-slicer = callPackage ../applications/misc/bambu-studio/orca-slicer.nix {};
@@ -32746,8 +32621,6 @@ with pkgs;
else stdenv;
};
- telegram-bot-api = callPackage ../servers/telegram-bot-api { };
-
tektoncd-cli = callPackage ../applications/networking/cluster/tektoncd-cli { };
tg = python3Packages.callPackage ../applications/networking/instant-messengers/telegram/tg { };
@@ -32814,12 +32687,6 @@ with pkgs;
thokr = callPackage ../applications/misc/thokr { };
- betterbird-unwrapped = callPackage ../applications/networking/mailreaders/betterbird { };
- betterbird = wrapThunderbird betterbird-unwrapped {
- desktopName = "Betterbird";
- pname = "betterbird";
- };
-
thunderbirdPackages = recurseIntoAttrs (callPackage ../applications/networking/mailreaders/thunderbird/packages.nix {
callPackage = newScope {
inherit (rustPackages) cargo rustc;
@@ -32829,7 +32696,6 @@ with pkgs;
thunderbird-unwrapped = thunderbirdPackages.thunderbird;
thunderbird = wrapThunderbird thunderbird-unwrapped { };
- thunderbird-115 = wrapThunderbird thunderbirdPackages.thunderbird-115 { };
thunderbird-128 = wrapThunderbird thunderbirdPackages.thunderbird-128 { };
thunderbird-bin = wrapThunderbird thunderbird-bin-unwrapped {
@@ -33354,6 +33220,10 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security Foundation;
};
+ warp-plus = callPackage ../by-name/wa/warp-plus/package.nix {
+ buildGoModule = buildGo122Module;
+ };
+
warpd = callPackage ../applications/misc/warpd { };
watershot = callPackage ../applications/misc/watershot { };
@@ -33417,7 +33287,7 @@ with pkgs;
webcord = callPackage ../by-name/we/webcord/package.nix { electron = electron_32; };
- webcord-vencord = callPackage ../by-name/we/webcord-vencord/package.nix { electron = electron_30; };
+ webcord-vencord = callPackage ../by-name/we/webcord-vencord/package.nix { electron = electron_31; };
webex = callPackage ../applications/networking/instant-messengers/webex { };
@@ -33724,8 +33594,6 @@ with pkgs;
xrestop = callPackage ../tools/X11/xrestop { };
- xrgears = callPackage ../applications/graphics/xrgears { };
-
xsd = callPackage ../development/libraries/xsd {
stdenv = gcc9Stdenv;
};
@@ -33960,8 +33828,6 @@ with pkgs;
btcpayserver-altcoins = callPackage ../applications/blockchains/btcpayserver { altcoinSupport = true; };
- charge-lnd = callPackage ../applications/blockchains/charge-lnd { };
-
cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { };
dcrctl = callPackage ../applications/blockchains/dcrctl { };
@@ -33996,8 +33862,6 @@ with pkgs;
erigon = callPackage ../applications/blockchains/erigon { };
- exodus = callPackage ../applications/blockchains/exodus { };
-
faraday = callPackage ../applications/blockchains/faraday { };
fulcrum = libsForQt5.callPackage ../applications/blockchains/fulcrum { };
@@ -34549,8 +34413,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Foundation AudioUnit AudioToolbox;
};
- eboard = callPackage ../games/eboard { };
-
ecwolf = callPackage ../games/ecwolf { };
egoboo = callPackage ../games/egoboo { };
@@ -36596,8 +36458,6 @@ with pkgs;
xoscope = callPackage ../applications/science/electronics/xoscope { };
- xschem = callPackage ../applications/science/electronics/xschem { };
-
xyce = callPackage ../applications/science/electronics/xyce { };
xyce-parallel = callPackage ../applications/science/electronics/xyce {
@@ -36738,8 +36598,6 @@ with pkgs;
gplates = libsForQt5.callPackage ../applications/science/misc/gplates { };
- grap = callPackage ../tools/security/grap { };
-
gravit = callPackage ../applications/science/astronomy/gravit { };
golly = callPackage ../applications/science/misc/golly {
@@ -37635,8 +37493,6 @@ with pkgs;
pyupgrade = with python3Packages; toPythonApplication pyupgrade;
- pwncat = python3Packages.callPackage ../tools/security/pwncat { };
-
pwntools = with python3Packages; toPythonApplication pwntools;
putty = callPackage ../applications/networking/remote/putty {
@@ -38148,8 +38004,6 @@ with pkgs;
xboxdrv = callPackage ../misc/drivers/xboxdrv { };
- xortool = python3Packages.callPackage ../tools/security/xortool { };
-
xorex = callPackage ../tools/security/xorex { };
xbps = callPackage ../tools/package-management/xbps { };
@@ -38478,8 +38332,6 @@ with pkgs;
nanoizeNewlib = true;
};
- omnisharp-roslyn = callPackage ../development/tools/omnisharp-roslyn { };
-
wasmtime = callPackage ../development/interpreters/wasmtime {
inherit (darwin.apple_sdk.frameworks) Security;
};
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 7b6dd161bd22..cfdfe93f4462 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -99,22 +99,33 @@ let
mathcomp-character = self.mathcomp.character;
mathcomp-abel = callPackage ../development/coq-modules/mathcomp-abel {};
mathcomp-algebra-tactics = callPackage ../development/coq-modules/mathcomp-algebra-tactics {};
+ mathcomp-altreals = self.mathcomp-analysis.altreals;
mathcomp-analysis = callPackage ../development/coq-modules/mathcomp-analysis {};
+ mathcomp-analysis-stdlib = self.mathcomp-analysis.analysis-stdlib;
mathcomp-apery = callPackage ../development/coq-modules/mathcomp-apery {};
mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough {};
mathcomp-classical = self.mathcomp-analysis.classical;
mathcomp-finmap = callPackage ../development/coq-modules/mathcomp-finmap {};
mathcomp-infotheo = callPackage ../development/coq-modules/mathcomp-infotheo {};
mathcomp-real-closed = callPackage ../development/coq-modules/mathcomp-real-closed {};
+ mathcomp-reals = self.mathcomp-analysis.reals;
+ mathcomp-reals-stdlib = self.mathcomp-analysis.reals-stdlib;
mathcomp-tarjan = callPackage ../development/coq-modules/mathcomp-tarjan {};
mathcomp-word = callPackage ../development/coq-modules/mathcomp-word {};
mathcomp-zify = callPackage ../development/coq-modules/mathcomp-zify {};
MenhirLib = callPackage ../development/coq-modules/MenhirLib {};
metacoq = callPackage ../development/coq-modules/metacoq { };
- metacoq-template-coq = self.metacoq.template-coq;
- metacoq-pcuic = self.metacoq.pcuic;
- metacoq-safechecker = self.metacoq.safechecker;
- metacoq-erasure = self.metacoq.erasure;
+ metacoq-utils = self.metacoq.utils;
+ metacoq-common = self.metacoq.common;
+ metacoq-template-coq = self.metacoq.template-coq;
+ metacoq-pcuic = self.metacoq.pcuic;
+ metacoq-safechecker = self.metacoq.safechecker;
+ metacoq-template-pcuic = self.metacoq.template-pcuic;
+ metacoq-erasure = self.metacoq.erasure;
+ metacoq-quotation = self.metacoq.quotation;
+ metacoq-safechecker-plugin = self.metacoq.safechecker-plugin;
+ metacoq-erasure-plugin = self.metacoq.erasure-plugin;
+ metacoq-translations = self.metacoq.translations;
metalib = callPackage ../development/coq-modules/metalib { };
mtac2 = callPackage ../development/coq-modules/mtac2 {};
multinomials = callPackage ../development/coq-modules/multinomials {};
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index 52559c01d36b..ab8d9c387b40 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -222,7 +222,8 @@ impure-cmds // apple-source-packages // apple-source-headers // stubs // {
xcode_12 xcode_12_0_1 xcode_12_1 xcode_12_2 xcode_12_3 xcode_12_4 xcode_12_5 xcode_12_5_1
xcode_13 xcode_13_1 xcode_13_2 xcode_13_3 xcode_13_3_1 xcode_13_4 xcode_13_4_1
xcode_14 xcode_14_1
- xcode_15 xcode_15_1 xcode_15_2 xcode_15_3 xcode_15_4
+ xcode_15 xcode_15_0_1 xcode_15_1 xcode_15_2 xcode_15_3 xcode_15_4
+ xcode_16 xcode_16_1
xcode;
xcodeProjectCheckHook = pkgs.makeSetupHook {
diff --git a/pkgs/top-level/gnuradio-packages.nix b/pkgs/top-level/gnuradio-packages.nix
index 5adac2cf98e6..e8aec4de1c63 100644
--- a/pkgs/top-level/gnuradio-packages.nix
+++ b/pkgs/top-level/gnuradio-packages.nix
@@ -21,6 +21,7 @@ let
volk
logLib
python
+ qwt
;
inherit mkDerivationWith mkDerivation;
inherit gnuradio;
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index bef177372945..020d505d9825 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -31,9 +31,9 @@ with pkgs;
openjdk23 = mkOpenjdk "23" ../development/compilers/zulu/23.nix;
# Legacy aliases
- openjdk8-bootstrap = openjdk8.jdk-bootstrap;
- openjdk11-bootstrap = openjdk11.jdk-bootstrap;
- openjdk17-bootstrap = openjdk17.jdk-bootstrap;
+ openjdk8-bootstrap = temurin-bin.jdk-8;
+ openjdk11-bootstrap = temurin-bin.jdk-11;
+ openjdk17-bootstrap = temurin-bin.jdk-17;
temurin-bin = recurseIntoAttrs (callPackage (
if stdenv.hostPlatform.isLinux
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index f83e88993450..8d6d9b4d0d05 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -528,6 +528,8 @@ in {
turbostat = callPackage ../os-specific/linux/turbostat { };
+ corefreq = callPackage ../os-specific/linux/corefreq { };
+
trelay = callPackage ../os-specific/linux/trelay { };
universal-pidff = callPackage ../os-specific/linux/universal-pidff { };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index ef556b0f52e3..2f0ce2558934 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -913,6 +913,8 @@ let
kcas = callPackage ../development/ocaml-modules/kcas { };
+ kdf = callPackage ../development/ocaml-modules/kdf { };
+
ke = callPackage ../development/ocaml-modules/ke { };
kicadsch = callPackage ../development/ocaml-modules/kicadsch { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 281c9b2b526f..0d703f43124e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7,7 +7,7 @@
{ config
, stdenv, lib, buildPackages, pkgs, darwin
-, fetchurl, fetchpatch, fetchFromGitHub, fetchFromGitLab
+, fetchurl, fetchpatch, fetchpatch2, fetchFromGitHub, fetchFromGitLab
, perl, shortenPerlShebang
, nixosTests
}:
@@ -959,10 +959,10 @@ with self; {
Appperlbrew = buildPerlModule {
pname = "App-perlbrew";
- version = "0.98";
+ version = "1.00";
src = fetchurl {
- url = "mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-0.98.tar.gz";
- hash = "sha256-oWD3ESJYjdU12pTbsLgwHkjlONJaRCobE/cZCWKIWTI=";
+ url = "mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-1.00.tar.gz";
+ hash = "sha256-PKNFnK6f/VHef2i95CEtBx1hOLZEUo9izJDHikhSyss=";
};
buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ];
propagatedBuildInputs = [ CPANPerlReleases CaptureTiny DevelPatchPerl PodParser locallib ];
@@ -992,15 +992,14 @@ with self; {
};
AppSqitch = buildPerlModule {
- version = "1.4.0";
+ version = "1.4.1";
pname = "App-Sqitch";
src = fetchurl {
- url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.4.0.tar.gz";
- hash = "sha256-sNs4cDH3dWJmLgA7xV16EComOAtK1/25qKO61XaeUBw=";
+ url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.4.1.tar.gz";
+ hash = "sha256-yvMcyPdy46TJ1LP/Oo9oSm61sbPCYfTdwPkKiMNgB8Y=";
};
- buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestMockObject TestNoWarnings TestWarn ];
- propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict PodParser StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl-perl ];
- doCheck = false; # Can't find home directory.
+ buildInputs = [ CaptureTiny TestExit TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestMockObject TestNoWarnings TestWarn ];
+ propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict PodParser StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl-perl AlgorithmBackoff ];
meta = {
description = "Sensible database change management";
homepage = "https://sqitch.org";
@@ -15719,6 +15718,21 @@ with self; {
};
};
+ meta = buildPerlModule {
+ pname = "meta";
+ version = "0.012";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/P/PE/PEVANS/meta-0.012.tar.gz";
+ hash = "sha256-Fx0J0wn4APVTTQE4tXMDmpYfEDtDaKhBC3dogzFuuFk=";
+ };
+ buildInputs = [ Test2Suite ];
+ meta = {
+ description = "Meta-programming API";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ maintainers = [ maintainers.zakame ];
+ };
+ };
+
MetaBuilder = buildPerlModule {
pname = "Meta-Builder";
version = "0.004";
@@ -19108,6 +19122,8 @@ with self; {
};
};
+ NetRemctl = callPackage ../development/perl-modules/NetRemctl { };
+
NetServer = buildPerlPackage {
pname = "Net-Server";
version = "2.014";
@@ -19221,7 +19237,39 @@ with self; {
url = "mirror://cpan/authors/id/D/DT/DTOWN/Net-SNMP-v6.0.1.tar.gz";
hash = "sha256-FMN7wcuz883H1sE+DyeoWfFM3P1epUoEZ6iLwlmwt0E=";
};
- doCheck = false; # The test suite fails, see https://rt.cpan.org/Public/Bug/Display.html?id=85799
+ patches = [
+ (fetchpatch2 {
+ url = "https://src.fedoraproject.org/rpms/perl-Net-SNMP/raw/6e1d3e8ff2b9bd38dab48301a9d8b5d81ef3b7fe/f/Net-SNMP-v6.0.1-Switch_from_Socket6_to_Socket.patch";
+ hash = "sha256-IpVhqI+dXqzauTkLF0Doulg5U33FxHUhqFTp0jeMtMY=";
+ })
+ (fetchpatch2 {
+ url = "https://src.fedoraproject.org/rpms/perl-Net-SNMP/raw/6e1d3e8ff2b9bd38dab48301a9d8b5d81ef3b7fe/f/Net-SNMP-v6.0.1-Simple_rewrite_to_Digest-HMAC-helpers.patch";
+ hash = "sha256-ZXo9w2YLtPmM1SJLvIiLWefw7SwrTFyTo4eX6DG1yfA=";
+ })
+ (fetchpatch2 {
+ url = "https://src.fedoraproject.org/rpms/perl-Net-SNMP/raw/6e1d3e8ff2b9bd38dab48301a9d8b5d81ef3b7fe/f/Net-SNMP-v6.0.1-Split_usm.t_to_two_parts.patch";
+ hash = "sha256-A2gsD6DIX1aFSVLbSL/1zKSM1xiM6hWBadJJH7f5E8o=";
+ })
+ (fetchpatch2 {
+ url = "https://src.fedoraproject.org/rpms/perl-Net-SNMP/raw/6e1d3e8ff2b9bd38dab48301a9d8b5d81ef3b7fe/f/Net-SNMP-v6.0.1-Add_tests_for_another_usm_scenarios.patch";
+ hash = "sha256-U7nNuL35l/zdSzx1jgjp1PmLQn3xzzDw9DGnyeydi2E=";
+ })
+ (fetchpatch2 {
+ url = "https://src.fedoraproject.org/rpms/perl-Net-SNMP/raw/6e1d3e8ff2b9bd38dab48301a9d8b5d81ef3b7fe/f/Net-SNMP-v6.0.1-Rewrite_from_Digest-SHA1-to-Digest-SHA.patch";
+ hash = "sha256-dznhj1Fcy0iBBl92p825InjkNZixR2MURVQ/b9bVjtc=";
+ })
+ ../development/perl-modules/net-snmp-add-sha-algorithms.patch
+ ];
+ preCheck =
+ (lib.optionalString stdenv.hostPlatform.isLinux ''
+ export NIX_REDIRECTS=/etc/protocols=${pkgs.iana-etc}/etc/protocols
+ export LD_PRELOAD=${pkgs.libredirect}/lib/libredirect.so
+ '');
+ propagatedBuildInputs = [
+ CryptDES
+ CryptRijndael
+ DigestHMAC
+ ];
meta = {
description = "Object oriented interface to SNMP";
license = with lib.licenses; [ artistic1 gpl1Plus ];
@@ -22113,6 +22161,21 @@ with self; {
};
};
+ ReturnMultiLevel = buildPerlPackage {
+ pname = "Return-MultiLevel";
+ version = "0.08";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/P/PL/PLICEASE/Return-MultiLevel-0.08.tar.gz";
+ hash = "sha256-UbGu8wxcQAn2QCZ6CFiSEuh9zRAYAPDSD5xjXJ/+iKE=";
+ };
+ buildInputs = [ TestFatal ];
+ meta = {
+ homepage = "https://metacpan.org/pod/Return::MultiLevel";
+ description = "Return across multiple call levels";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
ReturnValue = buildPerlPackage {
pname = "Return-Value";
version = "1.666005";
@@ -24097,9 +24160,9 @@ with self; {
hash = "sha256-+DhYd6Sp7Z89OQPS0PfNcPrDzmgyxg9gCmghzuP7WHI=";
};
propagatedBuildInputs = [
- pkgs.bwidget
+ pkgs.tclPackages.bwidget
pkgs.tcl
- pkgs.tix
+ pkgs.tclPackages.tix
pkgs.tk
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.CoreServices ];
@@ -25047,6 +25110,20 @@ with self; {
};
};
+ TestExit = buildPerlPackage {
+ pname = "Test-Exit";
+ version = "0.11";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/A/AR/ARODLAND/Test-Exit-0.11.tar.gz";
+ hash = "sha256-+9qS034EgdGO68geSNAlIotXGExZstWm9r34cELox7I=";
+ };
+ propagatedBuildInputs = [ ReturnMultiLevel ];
+ meta = {
+ description = "Test whether code exits without terminating testing";
+ license = with lib.licenses; [ artistic1 gpl1Plus ];
+ };
+ };
+
TestExpect = buildPerlPackage {
pname = "Test-Expect";
version = "0.34";
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index de8c6ccd5837..0d864e837ff2 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -181,8 +181,8 @@ in {
meta = {
description = "PHP upstream extension: ${name}";
- inherit (php.meta) maintainers homepage license;
- };
+ inherit (php.meta) maintainers homepage license platforms;
+ } // args.meta or { };
}));
php = phpPackage;
@@ -301,6 +301,8 @@ in {
openswoole = callPackage ../development/php-packages/openswoole { };
+ parallel = callPackage ../development/php-packages/parallel { };
+
pdlib = callPackage ../development/php-packages/pdlib { };
pcov = callPackage ../development/php-packages/pcov { };
@@ -404,10 +406,13 @@ in {
})
] ++ lib.optionals (lib.versions.majorMinor php.version == "8.1") [
# Backport of PHP_LIBXML_IGNORE_DEPRECATIONS_START and PHP_LIBXML_IGNORE_DEPRECATIONS_END
- ../development/interpreters/php/php81-fix-libxml2-2.13-compatibility.patch
+ (fetchpatch {
+ url = "https://github.com/php/php-src/commit/e2d97314ab342d434e778cd00a2f34e4bdb07664.patch";
+ hash = "sha256-w0hyYUgbRGpvIBfWeDTSEUGpiJdyrtNjKy+Fn1vyAO0=";
+ })
# Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch.
(fetchpatch {
- url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch";
+ url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch";
hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
})
];
@@ -456,13 +461,6 @@ in {
env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = "-liconv"; };
doCheck = stdenv.hostPlatform.isLinux;
}
- {
- name = "imap";
- buildInputs = [ uwimap openssl pam pcre2 libkrb5 ];
- configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" "--with-kerberos" ];
- # Using version from PECL on new PHP versions.
- enable = lib.versionOlder php.version "8.3";
- }
{
name = "intl";
buildInputs = [ icu73 ];
@@ -558,7 +556,7 @@ in {
internalDeps = [ php.extensions.pdo ];
configureFlags = [ "--with-pdo-dblib=${freetds}" ];
# Doesn't seem to work on darwin.
- enable = (!stdenv.hostPlatform.isDarwin);
+ meta.broken = (!stdenv.hostPlatform.isDarwin);
doCheck = false;
}
{
@@ -637,10 +635,13 @@ in {
})
# Backport of PHP_LIBXML_IGNORE_DEPRECATIONS_START and PHP_LIBXML_IGNORE_DEPRECATIONS_END
# Required for libxml2 2.13 compatibility patch.
- ../development/interpreters/php/php81-fix-libxml2-2.13-compatibility.patch
+ (fetchpatch {
+ url = "https://github.com/php/php-src/commit/e2d97314ab342d434e778cd00a2f34e4bdb07664.patch";
+ hash = "sha256-w0hyYUgbRGpvIBfWeDTSEUGpiJdyrtNjKy+Fn1vyAO0=";
+ })
# Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch.
(fetchpatch {
- url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch";
+ url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch";
hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
})
];
@@ -650,7 +651,7 @@ in {
buildInputs = [ net-snmp openssl ];
configureFlags = [ "--with-snmp" ];
# net-snmp doesn't build on darwin.
- enable = (!stdenv.hostPlatform.isDarwin);
+ meta.broken = (!stdenv.hostPlatform.isDarwin);
doCheck = false;
}
{
@@ -675,10 +676,13 @@ in {
})
# Backport of PHP_LIBXML_IGNORE_DEPRECATIONS_START and PHP_LIBXML_IGNORE_DEPRECATIONS_END
# Required for libxml2 2.13 compatibility patch.
- ../development/interpreters/php/php81-fix-libxml2-2.13-compatibility.patch
+ (fetchpatch {
+ url = "https://github.com/php/php-src/commit/e2d97314ab342d434e778cd00a2f34e4bdb07664.patch";
+ hash = "sha256-w0hyYUgbRGpvIBfWeDTSEUGpiJdyrtNjKy+Fn1vyAO0=";
+ })
# Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch.
(fetchpatch {
- url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch";
+ url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch";
hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
})
];
@@ -725,10 +729,13 @@ in {
})
# Backport of PHP_LIBXML_IGNORE_DEPRECATIONS_START and PHP_LIBXML_IGNORE_DEPRECATIONS_END
# Required for libxml2 2.13 compatibility patch.
- ../development/interpreters/php/php81-fix-libxml2-2.13-compatibility.patch
+ (fetchpatch {
+ url = "https://github.com/php/php-src/commit/e2d97314ab342d434e778cd00a2f34e4bdb07664.patch";
+ hash = "sha256-w0hyYUgbRGpvIBfWeDTSEUGpiJdyrtNjKy+Fn1vyAO0=";
+ })
# Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch.
(fetchpatch {
- url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch";
+ url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch";
hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
})
];
@@ -760,10 +767,13 @@ in {
})
# Backport of PHP_LIBXML_IGNORE_DEPRECATIONS_START and PHP_LIBXML_IGNORE_DEPRECATIONS_END
# Required for libxml2 2.13 compatibility patch.
- ../development/interpreters/php/php81-fix-libxml2-2.13-compatibility.patch
+ (fetchpatch {
+ url = "https://github.com/php/php-src/commit/e2d97314ab342d434e778cd00a2f34e4bdb07664.patch";
+ hash = "sha256-w0hyYUgbRGpvIBfWeDTSEUGpiJdyrtNjKy+Fn1vyAO0=";
+ })
# Fix build with libxml2 2.13+. Has to be applied after libxml2 2.12 patch.
(fetchpatch {
- url = "https://github.com/php/php-src/commit/9b4f6b09d58a4e54ee60443bf9a8b166852c03e0.patch";
+ url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch";
hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
})
];
@@ -796,6 +806,13 @@ in {
"--with-zlib"
];
}
+ ] ++ lib.optionals (lib.versionOlder php.version "8.3") [
+ # Using version from PECL on new PHP versions.
+ {
+ name = "imap";
+ buildInputs = [ uwimap openssl pam pcre2 libkrb5 ];
+ configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" "--with-kerberos" ];
+ }
];
# Convert the list of attrs:
@@ -804,14 +821,12 @@ in {
# [ { name = ; value = ; } ... ]
#
# which we later use listToAttrs to make all attrs available by name.
- #
- # Also filter out extensions based on the enable property.
namedExtensions = builtins.map
(drv: {
name = drv.name;
- value = mkExtension (builtins.removeAttrs drv [ "enable" ]);
+ value = mkExtension drv;
})
- (builtins.filter (i: i.enable or true) extensionData);
+ extensionData;
# Produce the final attribute set of all extensions defined.
in
diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json
index 96561fc7b7da..4c2286a47e90 100644
--- a/pkgs/top-level/pkg-config/pkg-config-data.json
+++ b/pkgs/top-level/pkg-config/pkg-config-data.json
@@ -824,7 +824,7 @@
},
"wayland-scanner": {
"attrPath": [
- "wayland"
+ "wayland-scanner"
]
},
"wayland-server": {
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index b55e051e41a5..6255cdb9559e 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -114,6 +114,7 @@ mapAliases ({
clvm-tools = throw "clvm-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
clvm-tools-rs = throw "clvm-tools-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
cntk = throw "cntk has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-10-09
+ codecov = throw "python-codecov has been removed, as it was broken and archived by upstream."; # Added 2024-10-24
codespell = throw "codespell has been promoted to a top-level attribute name: `pkgs.codespell`"; # Added 2022-10-02
ColanderAlchemy = colanderalchemy; # added 2023-02-19
command_runner = command-runner; # added 2024-03-06
@@ -439,6 +440,7 @@ mapAliases ({
pyblake2 = throw "pyblake2 is deprecated in favor of hashlib"; # added 2023-04-23
pyblock = throw "pyblock has been removed, since it is abandoned and broken"; # added 2023-06-20
pycontracts = throw "pycontracts has been removed, since upstream is no longer active and it is broken on modern Python versions."; # added 2024-08-09
+ pydns = py3dns; # added 2024-10-25
pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01
pyjet = throw "pyjet is deprecated, use fastjet instead"; # added 2023-05-10
pygame_sdl2 = pygame-sdl2; # added 2024-01-07
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bc41e8b2046f..2b91ac96acde 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1036,6 +1036,8 @@ self: super: with self; {
automate-home = callPackage ../development/python-modules/automate-home { };
+ automower-ble = callPackage ../development/python-modules/automower-ble { };
+
automx2 = callPackage ../development/python-modules/automx2 { };
autopage = callPackage ../development/python-modules/autopage { };
@@ -1175,6 +1177,8 @@ self: super: with self; {
azure-mgmt-authorization = callPackage ../development/python-modules/azure-mgmt-authorization { };
+ azure-mgmt-automation = callPackage ../development/python-modules/azure-mgmt-automation { };
+
azure-mgmt-batchai = callPackage ../development/python-modules/azure-mgmt-batchai { };
azure-mgmt-batch = callPackage ../development/python-modules/azure-mgmt-batch { };
@@ -1478,6 +1482,8 @@ self: super: with self; {
basemap-data = callPackage ../development/python-modules/basemap-data { };
+ basemap-data-hires = callPackage ../development/python-modules/basemap-data-hires { };
+
bases = callPackage ../development/python-modules/bases { };
bash-kernel = callPackage ../development/python-modules/bash-kernel { };
@@ -1755,6 +1761,8 @@ self: super: with self; {
bokeh = callPackage ../development/python-modules/bokeh { };
+ bokeh-sampledata = callPackage ../development/python-modules/bokeh-sampledata { };
+
boltons = callPackage ../development/python-modules/boltons { };
boltztrap2 = callPackage ../development/python-modules/boltztrap2 { };
@@ -2436,8 +2444,6 @@ self: super: with self; {
cocotb-bus = callPackage ../development/python-modules/cocotb-bus { };
- codecov = callPackage ../development/python-modules/codecov { };
-
codepy = callPackage ../development/python-modules/codepy { };
cogapp = callPackage ../development/python-modules/cogapp { };
@@ -3338,6 +3344,8 @@ self: super: with self; {
django-celery-results = callPackage ../development/python-modules/django-celery-results { };
+ django-choices-field = callPackage ../development/python-modules/django-choices-field { };
+
django-ckeditor = callPackage ../development/python-modules/django-ckeditor { };
django-classy-tags = callPackage ../development/python-modules/django-classy-tags { };
@@ -3368,6 +3376,8 @@ self: super: with self; {
django-crispy-forms = callPackage ../development/python-modules/django-crispy-forms { };
+ django-crossdomainmedia = callPackage ../development/python-modules/django-crossdomainmedia { };
+
django-cryptography = callPackage ../development/python-modules/django-cryptography { };
django-csp = callPackage ../development/python-modules/django-csp { };
@@ -3408,6 +3418,8 @@ self: super: with self; {
django-hijack = callPackage ../development/python-modules/django-hijack { };
+ django-htmx = callPackage ../development/python-modules/django-htmx { };
+
django-i18nfield = callPackage ../development/python-modules/django-i18nfield { };
django-import-export = callPackage ../development/python-modules/django-import-export { };
@@ -3418,6 +3430,8 @@ self: super: with self; {
django-jquery-js = callPackage ../development/python-modules/django-jquery-js { };
+ django-json-widget = callPackage ../development/python-modules/django-json-widget { };
+
django-js-asset = callPackage ../development/python-modules/django-js-asset { };
django-js-reverse = callPackage ../development/python-modules/django-js-reverse { };
@@ -3438,6 +3452,8 @@ self: super: with self; {
django-markdownx = callPackage ../development/python-modules/django-markdownx { };
+ django-mfa3 = callPackage ../development/python-modules/django-mfa3 { };
+
django-model-utils = callPackage ../development/python-modules/django-model-utils { };
django-modelcluster = callPackage ../development/python-modules/django-modelcluster { };
@@ -3570,6 +3586,8 @@ self: super: with self; {
django-timezone-field = callPackage ../development/python-modules/django-timezone-field { };
+ django-tinymce = callPackage ../development/python-modules/django-tinymce { };
+
django-treebeard = callPackage ../development/python-modules/django-treebeard { };
django-two-factor-auth = callPackage ../development/python-modules/django-two-factor-auth { };
@@ -3614,6 +3632,8 @@ self: super: with self; {
dmenu-python = callPackage ../development/python-modules/dmenu { };
+ dmgbuild = callPackage ../development/python-modules/dmgbuild { };
+
dmt-core = callPackage ../development/python-modules/dmt-core { };
dm-control = callPackage ../development/python-modules/dm-control { };
@@ -3953,6 +3973,8 @@ self: super: with self; {
einops = callPackage ../development/python-modules/einops { };
+ einx = callPackage ../development/python-modules/einx { };
+
eiswarnung = callPackage ../development/python-modules/eiswarnung { };
elgato = callPackage ../development/python-modules/elgato { };
@@ -5148,6 +5170,8 @@ self: super: with self; {
gnureadline = callPackage ../development/python-modules/gnureadline { };
+ go2rtc-client = callPackage ../development/python-modules/go2rtc-client { };
+
goalzero = callPackage ../development/python-modules/goalzero { };
gocardless-pro = callPackage ../development/python-modules/gocardless-pro { };
@@ -6998,6 +7022,8 @@ self: super: with self; {
leanblueprint = callPackage ../development/python-modules/leanblueprint { };
+ leaone-ble = callPackage ../development/python-modules/leaone-ble { };
+
leb128 = callPackage ../development/python-modules/leb128 { };
led-ble = callPackage ../development/python-modules/led-ble { };
@@ -7829,6 +7855,8 @@ self: super: with self; {
meld3 = callPackage ../development/python-modules/meld3 { };
+ melnor-bluetooth = callPackage ../development/python-modules/melnor-bluetooth { };
+
memestra = callPackage ../development/python-modules/memestra { };
memory-allocator = callPackage ../development/python-modules/memory-allocator { };
@@ -7928,6 +7956,8 @@ self: super: with self; {
microsoft-kiota-serialization-text = callPackage ../development/python-modules/microsoft-kiota-serialization-text { };
+ microsoft-security-utilities-secret-masker = callPackage ../development/python-modules/microsoft-security-utilities-secret-masker { };
+
midea-beautiful-air = callPackage ../development/python-modules/midea-beautiful-air { };
midiutil = callPackage ../development/python-modules/midiutil { };
@@ -8889,6 +8919,8 @@ self: super: with self; {
netapp-ontap = callPackage ../development/python-modules/netapp-ontap { };
+ netbox-bgp = callPackage ../development/python-modules/netbox-bgp { };
+
netbox-documents = callPackage ../development/python-modules/netbox-documents { };
netbox-reorder-rack = callPackage ../development/python-modules/netbox-reorder-rack { };
@@ -9141,6 +9173,8 @@ self: super: with self; {
nutils-poly = callPackage ../development/python-modules/nutils-poly { };
+ nutpie = callPackage ../development/python-modules/nutpie { };
+
nvchecker = callPackage ../development/python-modules/nvchecker { };
nvdlib = callPackage ../development/python-modules/nvdlib { };
@@ -9183,6 +9217,8 @@ self: super: with self; {
py-expression-eval = callPackage ../development/python-modules/py-expression-eval { };
+ py-improv-ble-client = callPackage ../development/python-modules/py-improv-ble-client { };
+
py-machineid = callPackage ../development/python-modules/py-machineid { };
py-ocsf-models = callPackage ../development/python-modules/py-ocsf-models { };
@@ -9366,6 +9402,8 @@ self: super: with self; {
pythonPackages = self;
});
+ opencv-python-headless = callPackage ../development/python-modules/opencv-python-headless { };
+
openerz-api = callPackage ../development/python-modules/openerz-api { };
openevsewifi = callPackage ../development/python-modules/openevsewifi { };
@@ -9399,6 +9437,8 @@ self: super: with self; {
opensimplex = callPackage ../development/python-modules/opensimplex { };
+ openslide = callPackage ../development/python-modules/openslide { inherit (pkgs) openslide; };
+
openstackdocstheme = callPackage ../development/python-modules/openstackdocstheme { };
openstacksdk = callPackage ../development/python-modules/openstacksdk { };
@@ -9520,6 +9560,8 @@ self: super: with self; {
ordered-set = callPackage ../development/python-modules/ordered-set { };
+ orderly-set = callPackage ../development/python-modules/orderly-set { };
+
orderedset = callPackage ../development/python-modules/orderedset { };
orgparse = callPackage ../development/python-modules/orgparse { };
@@ -9578,9 +9620,7 @@ self: super: with self; {
oslo-serialization = callPackage ../development/python-modules/oslo-serialization { };
- oslo-utils = callPackage ../development/python-modules/oslo-utils {
- qemu = pkgs.qemu;
- };
+ oslo-utils = callPackage ../development/python-modules/oslo-utils { };
oslotest = callPackage ../development/python-modules/oslotest { };
@@ -9882,6 +9922,8 @@ self: super: with self; {
pep8-naming = callPackage ../development/python-modules/pep8-naming { };
+ pepit = callPackage ../development/python-modules/pepit { };
+
peppercorn = callPackage ../development/python-modules/peppercorn { };
percol = callPackage ../development/python-modules/percol { };
@@ -10278,12 +10320,16 @@ self: super: with self; {
pykrakenapi = callPackage ../development/python-modules/pykrakenapi { };
- pylance = callPackage ../development/python-modules/pylance { };
+ pylance = callPackage ../development/python-modules/pylance {
+ inherit (pkgs) protobuf;
+ };
pylddwrap = callPackage ../development/python-modules/pylddwrap { };
pyloadapi = callPackage ../development/python-modules/pyloadapi { };
+ pylsl = callPackage ../development/python-modules/pylsl { };
+
pyngo = callPackage ../development/python-modules/pyngo { };
pyngrok = callPackage ../development/python-modules/pyngrok { };
@@ -10374,6 +10420,8 @@ self: super: with self; {
pytest-pudb = callPackage ../development/python-modules/pytest-pudb { };
+ pytest-ruff = callPackage ../development/python-modules/pytest-ruff { };
+
pytlv = callPackage ../development/python-modules/pytlv { };
pywebcopy = callPackage ../development/python-modules/pywebcopy { };
@@ -10450,6 +10498,8 @@ self: super: with self; {
python-owasp-zap-v2-4 = callPackage ../development/python-modules/python-owasp-zap-v2-4 { };
+ python-poppler = callPackage ../development/python-modules/python-poppler { };
+
python-pptx = callPackage ../development/python-modules/python-pptx { };
python-songpal = callPackage ../development/python-modules/python-songpal { };
@@ -10471,6 +10521,8 @@ self: super: with self; {
pytomorrowio = callPackage ../development/python-modules/pytomorrowio { };
+ pytorch3d = callPackage ../development/python-modules/pytorch3d { };
+
pytouchlinesl = callPackage ../development/python-modules/pytouchlinesl { };
pyuca = callPackage ../development/python-modules/pyuca { };
@@ -11190,6 +11242,8 @@ self: super: with self; {
pydbus = callPackage ../development/python-modules/pydbus { };
+ pydeako = callPackage ../development/python-modules/pydeako { };
+
pydeck = callPackage ../development/python-modules/pydeck { };
pydeconz = callPackage ../development/python-modules/pydeconz { };
@@ -11230,7 +11284,7 @@ self: super: with self; {
pydmd = callPackage ../development/python-modules/pydmd { };
- pydns = callPackage ../development/python-modules/py3dns { };
+ py3dns = callPackage ../development/python-modules/py3dns { };
pydocstyle = callPackage ../development/python-modules/pydocstyle { };
@@ -13549,6 +13603,10 @@ self: super: with self; {
remarshal = callPackage ../development/python-modules/remarshal { };
+ remctl = callPackage ../development/python-modules/remctl {
+ remctl-c = pkgs.remctl;
+ };
+
remi = callPackage ../development/python-modules/remi { };
remote-pdb = callPackage ../development/python-modules/remote-pdb { };
@@ -13679,6 +13737,8 @@ self: super: with self; {
retry-decorator = callPackage ../development/python-modules/retry-decorator { };
+ retry2 = callPackage ../development/python-modules/retry2 { };
+
retrying = callPackage ../development/python-modules/retrying { };
returns = callPackage ../development/python-modules/returns { };
@@ -13919,6 +13979,10 @@ self: super: with self; {
rubymarshal = callPackage ../development/python-modules/rubymarshal { };
+ ruff = toPythonModule (pkgs.ruff.override {
+ python3Packages = self;
+ });
+
ruff-api = callPackage ../development/python-modules/ruff-api { };
ruffus = callPackage ../development/python-modules/ruffus { };
@@ -14773,6 +14837,8 @@ self: super: with self; {
sphinx-jupyterbook-latex = callPackage ../development/python-modules/sphinx-jupyterbook-latex { };
+ sphinx-lv2-theme = callPackage ../development/python-modules/sphinx-lv2-theme { };
+
sphinx-multitoc-numbering = callPackage ../development/python-modules/sphinx-multitoc-numbering { };
sphinx-notfound-page = callPackage ../development/python-modules/sphinx-notfound-page { };
@@ -15097,8 +15163,12 @@ self: super: with self; {
stravalib = callPackage ../development/python-modules/stravalib { };
+ stravaweblib = callPackage ../development/python-modules/stravaweblib { };
+
strawberry-graphql = callPackage ../development/python-modules/strawberry-graphql { };
+ strawberry-django = callPackage ../development/python-modules/strawberry-django { };
+
strct = callPackage ../development/python-modules/strct { };
streamcontroller-plugin-tools = callPackage ../development/python-modules/streamcontroller-plugin-tools { };
@@ -15127,6 +15197,8 @@ self: super: with self; {
stringparser = callPackage ../development/python-modules/stringparser { };
+ stringzilla = callPackage ../development/python-modules/stringzilla { };
+
stripe = callPackage ../development/python-modules/stripe { };
striprtf = callPackage ../development/python-modules/striprtf { };
@@ -15772,6 +15844,8 @@ self: super: with self; {
toposort = callPackage ../development/python-modules/toposort { };
+ toptica-lasersdk = callPackage ../development/python-modules/toptica-lasersdk { };
+
torch = callPackage ../development/python-modules/torch { };
# Required to test triton
@@ -17398,9 +17472,7 @@ self: super: with self; {
wat = callPackage ../development/python-modules/wat { };
- watchdog = callPackage ../development/python-modules/watchdog {
- inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
- };
+ watchdog = callPackage ../development/python-modules/watchdog { };
watchdog-gevent = callPackage ../development/python-modules/watchdog-gevent { };
@@ -17472,6 +17544,8 @@ self: super: with self; {
webob = callPackage ../development/python-modules/webob { };
+ webrtc-models = callPackage ../development/python-modules/webrtc-models { };
+
webrtc-noise-gain = callPackage ../development/python-modules/webrtc-noise-gain { };
webrtcvad = callPackage ../development/python-modules/webrtcvad { };
@@ -17937,6 +18011,8 @@ self: super: with self; {
zetup = callPackage ../development/python-modules/zetup { };
+ zeversolar = callPackage ../development/python-modules/zeversolar { };
+
zeversolarlocal = callPackage ../development/python-modules/zeversolarlocal { };
zfec = callPackage ../development/python-modules/zfec { };
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index e27b65dbd49a..41221f8b89f3 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -169,7 +169,7 @@ let
if isDerivation value then
value.meta.hydraPlatforms
or (subtractLists (value.meta.badPlatforms or [])
- (value.meta.platforms or [ "x86_64-linux" ]))
+ (value.meta.platforms or supportedSystems))
else if value.recurseForDerivations or false || value.recurseForRelease or false then
packagePlatforms value
else
diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix
index 05a7be580b0e..6c33cde39021 100644
--- a/pkgs/top-level/ruby-packages.nix
+++ b/pkgs/top-level/ruby-packages.nix
@@ -1548,6 +1548,17 @@
};
version = "0.4.0";
};
+ jekyll-compose = {
+ dependencies = ["jekyll"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ny8xps0mrmx2w0xxc9rwa15ch1wkxvdrzxiwnqramqwja566y04";
+ type = "gem";
+ };
+ version = "0.12.0";
+ };
jekyll-default-layout = {
dependencies = ["jekyll"];
groups = ["default"];
@@ -2796,10 +2807,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0i2vaww6qcazj0ywva1plmjnj6rk23b01szswc5jhcq7s2cikd1y";
+ sha256 = "sha256-JKRkXABoEdg/JIAFfR9UqW52J7a5DhyZsmC53GMOtD4=";
type = "gem";
};
- version = "6.4.2";
+ version = "6.4.3";
};
pwntools = {
dependencies = ["crabstone" "dentaku" "elftools" "keystone-engine" "method_source" "one_gadget" "rainbow" "ruby2ruby" "rubyserial"];
diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix
index 66e624985dc4..3b600c22f60e 100644
--- a/pkgs/top-level/splice.nix
+++ b/pkgs/top-level/splice.nix
@@ -128,6 +128,15 @@ let
"packages"
];
+ packagesWithXorg = pkgs // builtins.removeAttrs pkgs.xorg [
+ "callPackage"
+ "newScope"
+ "overrideScope"
+ "packages"
+ ];
+
+ pkgsForCall = if actuallySplice then splicedPackagesWithXorg else packagesWithXorg;
+
in
{
@@ -138,9 +147,9 @@ in
# `newScope' for sets of packages in `pkgs' (see e.g. `gnome' below).
callPackage = pkgs.newScope { };
- callPackages = lib.callPackagesWith splicedPackagesWithXorg;
+ callPackages = lib.callPackagesWith pkgsForCall;
- newScope = extra: lib.callPackageWith (splicedPackagesWithXorg // extra);
+ newScope = extra: lib.callPackageWith (pkgsForCall // extra);
# prefill 2 fields of the function for convenience
makeScopeWithSplicing = lib.makeScopeWithSplicing splicePackages pkgs.newScope;
@@ -169,5 +178,5 @@ in
# Haskell package sets need this because they reimplement their own
# `newScope`.
- __splicedPackages = splicedPackages // { recurseForDerivations = false; };
+ __splicedPackages = if actuallySplice then splicedPackages // { recurseForDerivations = false; } else pkgs;
}
diff --git a/pkgs/top-level/tcl-packages.nix b/pkgs/top-level/tcl-packages.nix
new file mode 100644
index 000000000000..6be1844b4c36
--- /dev/null
+++ b/pkgs/top-level/tcl-packages.nix
@@ -0,0 +1,21 @@
+let
+ autoCalledPackages = import ./by-name-overlay.nix ../development/tcl-modules/by-name;
+in
+
+{
+ lib,
+ newScope,
+ tcl,
+ tk,
+}:
+
+lib.makeScope newScope (
+ lib.extends autoCalledPackages (self: {
+ inherit tcl tk;
+ inherit (tcl) mkTclDerivation tclPackageHook;
+
+ critcl = self.callPackage ../development/tcl-modules/critcl {
+ tcllib = self.tcllib.override { withCritcl = false; };
+ };
+ })
+)