diff --git a/ops/nixos/bvm-forgejo/default.nix b/ops/nixos/bvm-forgejo/default.nix index cb42b5575b..d3ab29ab22 100644 --- a/ops/nixos/bvm-forgejo/default.nix +++ b/ops/nixos/bvm-forgejo/default.nix @@ -9,6 +9,7 @@ let in { imports = [ ../lib/bvm.nix + ../lib/pomerium.nix ]; # Networking! @@ -40,8 +41,8 @@ in { allowedUDPPorts = [ 443 ]; }; }; - #my.ip.tailscale = "100.94.23.105"; - #my.ip.tailscale6 = "fd7a:115c:a1e0:ab12:4843:cd96:625e:1769"; + my.ip.tailscale = "100.103.26.78"; + my.ip.tailscale6 = "fd7a:115c:a1e0::8d01:1a4e"; services.openssh.ports = [ 20022 ]; my.deploy.args = "-p 20022"; @@ -51,8 +52,8 @@ in { services.postfix = { enable = true; - domain = "hg.lukegb.com"; - hostname = "hg.lukegb.com"; + domain = "git.lukegb.com"; + hostname = "git.lukegb.com"; extraConfig = '' milter_protocol = 2 milter_default_action = accept @@ -63,9 +64,76 @@ in { }; services.opendkim = { enable = true; - domains = "csl:hg.lukegb.com"; + domains = "csl:git.lukegb.com"; selector = "bvm-forgejo"; }; + services.pomerium = { + settings = { + services = "proxy"; + autocert = true; + routes = [{ + from = "https://git.lukegb.com"; + to = "http://localhost:3000"; + pass_identity_headers = true; + remove_request_headers = [ + "X-WebAuth-User" + "X-WebAuth-Email" + "X-WebAuth-FullName" + ]; + }]; + }; + }; + + environment.systemPackages = with pkgs; [ forgejo-cli forgejo ]; + services.forgejo = { + enable = true; + lfs.enable = true; + package = pkgs.forgejo; + secrets = let + customDir = config.services.forgejo.customDir; + in { + storage.MINIO_SECRET_ACCESS_KEY = "${customDir}/conf/s3_secret_key"; + }; + settings = { + server = { + DOMAIN = "git.lukegb.com"; + ROOT_URL = "https://git.lukegb.com/"; + }; + session = { + COOKIE_SECURE = true; + }; + storage = { + STORAGE_TYPE = "minio"; + MINIO_ENDPOINT = "objdump.zxcvbnm.ninja"; + MINIO_BUCKET = "lukegb-forgejo"; + MINIO_LOCATION = "london"; + MINIO_USE_SSL = true; + MINIO_BUCKET_LOOKUP = "dns"; + MINIO_ACCESS_KEY_ID = "AKIALUKEGBFORGEJO000"; + }; + security = { + COOKIE_REMEMBER_NAME = "forgejo_remember_me"; + REVERSE_PROXY_AUTHENTICATION_EMAIL = "X-Pomerium-Claim-Email"; + }; + service = { + DISABLE_REGISTRATION = true; + ENABLE_REVERSE_PROXY_AUTHENTICATION = true; + ENABLE_REVERSE_PROXY_EMAIL = true; + }; + mailer = { + ENABLED = true; + PROTOCOL = "smtp"; + SMTP_ADDR = "localhost"; + SMTP_PORT = 25; + FROM = "lukegb.com Forgejo "; + }; + cron = { + ENABLED = true; + }; + log.LEVEL = "Trace"; + }; + }; + system.stateVersion = "24.11"; } diff --git a/ops/nixos/etheroute-lon01/default.nix b/ops/nixos/etheroute-lon01/default.nix index 06d7a80443..9ea2f0bd5d 100644 --- a/ops/nixos/etheroute-lon01/default.nix +++ b/ops/nixos/etheroute-lon01/default.nix @@ -7,6 +7,7 @@ imports = [ ../lib/bgp.nix ../lib/zfs.nix + ../lib/pomerium.nix ../totoro/barf.nix # eww ]; @@ -270,41 +271,18 @@ bind = "127.0.0.1"; }; services.pomerium = { - enable = true; - secretsFile = config.my.vault.secrets.pomerium.path; - settings = { - address = ":443"; - http_redirect_addr = ":80"; - dns_lookup_family = "AUTO"; - - idp_provider = "google"; - idp_client_id = "136257844546-qsa6hi1oqqoq2bnt93deo4e70ggbn1p8.apps.googleusercontent.com"; - idp_request_params = { - hd = "lukegb.com"; - login_hint = "lukegb@lukegb.com"; - }; - - jwt_claims_headers = [ - "email" - "user" - ]; - - timeout_read = "0"; # We have some long-lived connections... - timeout_write = "0"; - timeout_idle = "0"; - - forward_auth_url = "https://fwdauth.int.lukegb.com"; - authenticate_service_url = "https://auth.int.lukegb.com"; - signout_redirect_url = "https://logged-out.int.lukegb.com"; - certificates = [ { cert = "/var/lib/acme/lukegb.com/fullchain.pem"; key = "/var/lib/acme/lukegb.com/privkey.pem"; } ]; - policy = let + routes = let baseConfig = { - allowed_domains = [ "lukegb.com" ]; + policy = [{ + allow.and = [{ + domain.is = "lukegb.com"; + }]; + }]; pass_identity_headers = true; timeout = "30s"; }; @@ -319,7 +297,7 @@ } // extraConfig); public = extraConfig: { allow_public_unauthenticated_access = true; - allowed_domains = null; + policy = null; } // extraConfig; in [ (service "localhost:12001" "barf.lukegb.com" (public {})) @@ -384,6 +362,20 @@ allow_websockets = true; timeout = "0"; }) + + # These services are included for policy reasons only. + # They have their own reverse proxy instances. + (service "localhost:3000" "git.lukegb.com" { + policy = [{ + allow.not = [{ + http_path.starts_with = "/user/login"; + }]; + } { + allow.and = [{ + domain.is = "lukegb.com"; + }]; + }]; + }) ]; }; }; @@ -403,19 +395,6 @@ ]; reloadOrRestartUnits = [ "pomerium.service" ]; }; - my.vault.secrets.pomerium = { - template = '' - {{ with secret "kv/apps/pomerium" }} - COOKIE_SECRET={{ .Data.data.cookieSecret }} - SHARED_SECRET={{ .Data.data.sharedSecret }} - IDP_CLIENT_SECRET={{ .Data.data.idpClientSecret }} - SIGNING_KEY={{ .Data.data.signingKey }} - IDP_SERVICE_ACCOUNT={{ .Data.data.googleServiceAccount }} - {{ end }} - ''; - group = "root"; - reloadOrRestartUnits = [ "pomerium.service" ]; - }; users.groups.acme = {}; system.stateVersion = "22.11"; diff --git a/ops/nixos/lib/coredns/zones/db.as205479.net b/ops/nixos/lib/coredns/zones/db.as205479.net index d2c5ebd0eb..1a26903766 100644 --- a/ops/nixos/lib/coredns/zones/db.as205479.net +++ b/ops/nixos/lib/coredns/zones/db.as205479.net @@ -3,7 +3,7 @@ ; SPDX-License-Identifier: Apache-2.0 ; MNAME RNAME SERIAL REFRESH RETRY EXPIRE TTL -@ 600 IN SOA frantech-lux01.as205479.net. hostmaster.lukegb.com. 59 600 450 3600 300 +@ 600 IN SOA frantech-lux01.as205479.net. hostmaster.lukegb.com. 60 600 450 3600 300 ; NB: this are also glue records in Google Domains. $INCLUDE tmpl.ns @@ -101,6 +101,8 @@ bvm-logger.int 3600 IN A 100.68.134.82 bvm-logger.int 3600 IN AAAA fd7a:115c:a1e0:ab12:4843:cd96:6244:8652 bvm-paperless.int 3600 IN A 100.85.236.121 bvm-paperless.int 3600 IN AAAA fd7a:115c:a1e0:ab12:4843:cd96:6255:ec79 +bvm-forgejo.int 3600 IN A 100.103.26.78 +bvm-forgejo.int 3600 IN AAAA fd7a:115c:a1e0::8d01:1a4e mac-mini.int 3600 IN A 100.91.188.84 mac-mini.int 3600 IN AAAA fd7a:115c:a1e0:ab12:4843:cd96:625b:bc54 diff --git a/ops/nixos/lib/pomerium.nix b/ops/nixos/lib/pomerium.nix new file mode 100644 index 0000000000..d4040405a6 --- /dev/null +++ b/ops/nixos/lib/pomerium.nix @@ -0,0 +1,61 @@ +{ config, ... }: + +{ + services.pomerium = { + enable = true; + secretsFile = config.my.vault.secrets.pomerium.path; + + settings = { + address = ":443"; + grpc_address = ":5443"; + http_redirect_addr = ":80"; + dns_lookup_family = "AUTO"; + + idp_provider = "google"; + idp_client_id = "136257844546-qsa6hi1oqqoq2bnt93deo4e70ggbn1p8.apps.googleusercontent.com"; + idp_request_params = { + hd = "lukegb.com"; + login_hint = "lukegb@lukegb.com"; + }; + + jwt_claims_headers = [ + "email" + "user" + ]; + + # Note autocert = true; not set here. + autocert_ca = "https://dv.acme-v02.api.pki.goog/directory"; + autocert_email = "acme@lukegb.com"; + autocert_must_staple = true; + autocert_dir = "/var/lib/pomerium/autocert"; + + grpc_insecure = true; + + timeout_read = "0"; # We have some long-lived connections... + timeout_write = "0"; + timeout_idle = "0"; + + forward_auth_url = "https://fwdauth.int.lukegb.com"; + authenticate_service_url = "https://auth.int.lukegb.com"; + signout_redirect_url = "https://logged-out.int.lukegb.com"; + authorize_service_url = "http://etheroute-lon01.int.as205479.net:5443"; + databroker_service_url = "http://etheroute-lon01.int.as205479.net:5443"; + }; + }; + + my.vault.secrets.pomerium = { + template = '' + {{ with secret "kv/apps/pomerium" }} + COOKIE_SECRET={{ .Data.data.cookieSecret }} + SHARED_SECRET={{ .Data.data.sharedSecret }} + IDP_CLIENT_SECRET={{ .Data.data.idpClientSecret }} + SIGNING_KEY={{ .Data.data.signingKey }} + IDP_SERVICE_ACCOUNT={{ .Data.data.googleServiceAccount }} + AUTOCERT_EAB_KEY_ID={{ .Data.data.eabKeyID }} + AUTOCERT_EAB_MAC_KEY={{ .Data.data.eabMacKey }} + {{ end }} + ''; + group = "root"; + reloadOrRestartUnits = [ "pomerium.service" ]; + }; +} diff --git a/ops/vault/cfg/config.nix b/ops/vault/cfg/config.nix index f5213f859c..1445a695ae 100644 --- a/ops/vault/cfg/config.nix +++ b/ops/vault/cfg/config.nix @@ -78,6 +78,7 @@ my.apps.bsky-pds = {}; my.servers.etheroute-lon01.apps = [ "pomerium" ]; + my.servers.bvm-forgejo.apps = [ "pomerium" ]; my.servers.howl.apps = [ "nixbuild" ]; my.servers.porcorosso.apps = [ "quotesdb" "nixbuild" ]; my.servers.nausicaa.apps = [ "quotesdb" "nixbuild" "hacky-vouchproxy" "hackyplayer" "emfminiserv" ]; diff --git a/third_party/nixpkgs/.git-blame-ignore-revs b/third_party/nixpkgs/.git-blame-ignore-revs index 4714b843f2..7778595da4 100644 --- a/third_party/nixpkgs/.git-blame-ignore-revs +++ b/third_party/nixpkgs/.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/third_party/nixpkgs/.github/ISSUE_TEMPLATE.md b/third_party/nixpkgs/.github/ISSUE_TEMPLATE.md index 1913e321a8..e6fc993c76 100644 --- a/third_party/nixpkgs/.github/ISSUE_TEMPLATE.md +++ b/third_party/nixpkgs/.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/third_party/nixpkgs/.github/ISSUE_TEMPLATE/bug_report.md b/third_party/nixpkgs/.github/ISSUE_TEMPLATE/bug_report.md index d0473b9473..dd9e22e9a6 100644 --- a/third_party/nixpkgs/.github/ISSUE_TEMPLATE/bug_report.md +++ b/third_party/nixpkgs/.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/third_party/nixpkgs/.github/ISSUE_TEMPLATE/build_failure.md b/third_party/nixpkgs/.github/ISSUE_TEMPLATE/build_failure.md index cd01f2b063..5e6c300b56 100644 --- a/third_party/nixpkgs/.github/ISSUE_TEMPLATE/build_failure.md +++ b/third_party/nixpkgs/.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/third_party/nixpkgs/.github/labeler.yml b/third_party/nixpkgs/.github/labeler.yml index 485bcce6a8..2a22d38cff 100644 --- a/third_party/nixpkgs/.github/labeler.yml +++ b/third_party/nixpkgs/.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/third_party/nixpkgs/.github/workflows/backport.yml b/third_party/nixpkgs/.github/workflows/backport.yml index 5ca7977fa9..bbeb72a701 100644 --- a/third_party/nixpkgs/.github/workflows/backport.yml +++ b/third_party/nixpkgs/.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/third_party/nixpkgs/.github/workflows/basic-eval.yml b/third_party/nixpkgs/.github/workflows/basic-eval.yml index b3a85c2979..be60504561 100644 --- a/third_party/nixpkgs/.github/workflows/basic-eval.yml +++ b/third_party/nixpkgs/.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/third_party/nixpkgs/.github/workflows/check-cherry-picks.yml b/third_party/nixpkgs/.github/workflows/check-cherry-picks.yml index ee2832ca93..cbd5d66c42 100644 --- a/third_party/nixpkgs/.github/workflows/check-cherry-picks.yml +++ b/third_party/nixpkgs/.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/third_party/nixpkgs/.github/workflows/check-maintainers-sorted.yaml b/third_party/nixpkgs/.github/workflows/check-maintainers-sorted.yaml index b9d811aa02..7092cf3fee 100644 --- a/third_party/nixpkgs/.github/workflows/check-maintainers-sorted.yaml +++ b/third_party/nixpkgs/.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/third_party/nixpkgs/.github/workflows/check-nix-format.yml b/third_party/nixpkgs/.github/workflows/check-nix-format.yml index e771386619..16574d28cc 100644 --- a/third_party/nixpkgs/.github/workflows/check-nix-format.yml +++ b/third_party/nixpkgs/.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/third_party/nixpkgs/.github/workflows/check-nixf-tidy.yml b/third_party/nixpkgs/.github/workflows/check-nixf-tidy.yml index 7facdeee79..de74ae8b53 100644 --- a/third_party/nixpkgs/.github/workflows/check-nixf-tidy.yml +++ b/third_party/nixpkgs/.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/third_party/nixpkgs/.github/workflows/check-shell.yml b/third_party/nixpkgs/.github/workflows/check-shell.yml index 0ece4946f6..82bc43fb92 100644 --- a/third_party/nixpkgs/.github/workflows/check-shell.yml +++ b/third_party/nixpkgs/.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/third_party/nixpkgs/.github/workflows/codeowners.yml b/third_party/nixpkgs/.github/workflows/codeowners-v2.yml similarity index 67% rename from third_party/nixpkgs/.github/workflows/codeowners.yml rename to third_party/nixpkgs/.github/workflows/codeowners-v2.yml index 9d781c6ef0..3c64675a8f 100644 --- a/third_party/nixpkgs/.github/workflows/codeowners.yml +++ b/third_party/nixpkgs/.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/third_party/nixpkgs/.github/workflows/editorconfig.yml b/third_party/nixpkgs/.github/workflows/editorconfig-v2.yml similarity index 90% rename from third_party/nixpkgs/.github/workflows/editorconfig.yml rename to third_party/nixpkgs/.github/workflows/editorconfig-v2.yml index b4ef16a734..b14f766374 100644 --- a/third_party/nixpkgs/.github/workflows/editorconfig.yml +++ b/third_party/nixpkgs/.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/third_party/nixpkgs/.github/workflows/manual-nixos.yml b/third_party/nixpkgs/.github/workflows/manual-nixos-v2.yml similarity index 87% rename from third_party/nixpkgs/.github/workflows/manual-nixos.yml rename to third_party/nixpkgs/.github/workflows/manual-nixos-v2.yml index 2ae4d929c1..0678568e52 100644 --- a/third_party/nixpkgs/.github/workflows/manual-nixos.yml +++ b/third_party/nixpkgs/.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/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml b/third_party/nixpkgs/.github/workflows/manual-nixpkgs-v2.yml similarity index 88% rename from third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml rename to third_party/nixpkgs/.github/workflows/manual-nixpkgs-v2.yml index 676a554107..0410cfd904 100644 --- a/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml +++ b/third_party/nixpkgs/.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/third_party/nixpkgs/.github/workflows/nix-parse.yml b/third_party/nixpkgs/.github/workflows/nix-parse-v2.yml similarity index 89% rename from third_party/nixpkgs/.github/workflows/nix-parse.yml rename to third_party/nixpkgs/.github/workflows/nix-parse-v2.yml index 352cb81d87..be4bad5f27 100644 --- a/third_party/nixpkgs/.github/workflows/nix-parse.yml +++ b/third_party/nixpkgs/.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/third_party/nixpkgs/.github/workflows/nixpkgs-vet.yml b/third_party/nixpkgs/.github/workflows/nixpkgs-vet.yml index 2dc325b4c6..a7eb1b0eed 100644 --- a/third_party/nixpkgs/.github/workflows/nixpkgs-vet.yml +++ b/third_party/nixpkgs/.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/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml b/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml index a33074797f..919d927cdb 100644 --- a/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml +++ b/third_party/nixpkgs/.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/third_party/nixpkgs/.github/workflows/periodic-merge-6h.yml b/third_party/nixpkgs/.github/workflows/periodic-merge-6h.yml index 42b9bdbdd4..1f7cfce34a 100644 --- a/third_party/nixpkgs/.github/workflows/periodic-merge-6h.yml +++ b/third_party/nixpkgs/.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/third_party/nixpkgs/CONTRIBUTING.md b/third_party/nixpkgs/CONTRIBUTING.md index 70e45094f2..b9599f4a2e 100644 --- a/third_party/nixpkgs/CONTRIBUTING.md +++ b/third_party/nixpkgs/CONTRIBUTING.md @@ -392,14 +392,10 @@ Here is a Git history diagram showing the flow of commits between the three bran } }%% gitGraph commit id:" " - branch staging-next branch staging + commit id:" " + branch staging-next - checkout master - checkout staging - checkout master - commit id:" " - checkout staging-next merge master id:"automatic" checkout staging merge staging-next id:"automatic " @@ -659,9 +655,11 @@ This goes hand in hand with [Writing good commit messages](#writing-good-commit- For the code quality assessment, you cannot do anything yourself as only the committer can do this and they already have your code to look at. In order to minimise the need for back and forth though, do take a look over your code changes yourself and try to put yourself into the shoes of someone who didn't just write that code. -Would you immediately know what the code does by glancing at it? +Would you immediately know what the code does or why it is needed by glancing at it? If not, reviewers will notice this and will ask you to clarify the code by refactoring it and/or adding a few explanations in code comments. Doing this preemptively can save you and the committer a lot of time. +To better convey the "story" of your change, consider dividing your change into multiple atomic commits. +There is a balance to strike however: over-fragmentation causes friction. The code artefacts are the hardest for committers to assess because PRs touch all sorts of components: applications, libraries, NixOS modules, editor plugins and many many other things. Any individual committer can only really assess components that they themselves know how to use however and yet they must still be convinced somehow. @@ -689,7 +687,9 @@ Ask them nicely whether they still intend to review your PR and find yourself an ### How can I get a committer to look at my PR? -- Simply wait. Reviewers frequently browse open PRs and may happen to run across yours and take a look. +- Improve skimmability: use a simple descriptive PR title (details go in commit titles) outlining _what_ is done and _why_. +- Improve discoverability: apply all relevant labels, tick all relevant PR body checkboxes. +- Wait. Reviewers frequently browse open PRs and may happen to run across yours and take a look. - Get non-committers to review/approve. Many committers filter open PRs for low-hanging fruit that are already been reviewed. - [@-mention](https://github.blog/news-insights/mention-somebody-they-re-notified/) someone and ask them nicely - Post in one of the channels made for this purpose if there has been no activity for at least one week @@ -710,7 +710,7 @@ Don't worry about it. If there is a build failure however and it happened due to a package related to your change, you need to investigate it of course. If ofBorg reveals the build to be broken on some platform and you don't have access to that platform, you should set your package's `meta.broken` accordingly. -When in any doubt, please simply ask via a comment in your PR or through one of the help channels. +When in any doubt, please ask via a comment in your PR or through one of the help channels. ## I received a review on my PR, how do I get it over the finish line? @@ -730,6 +730,13 @@ There may be constraints you had to work with which they're not aware of or qual There are some further pitfalls and realities which this section intends to make you aware of. +### Aim to reduce cycles + +Please be prepared for it to take a while before the reviewer gets back to you after you respond. +This is simply the reality of community projects at the scale of Nixpkgs. +As such, make sure to respond to _all_ feedback, either by applying suggested changes or argue in favor of something else or no change. +It wastes everyone time waiting for a couple of days just for the reviewer to remind you to address something they asked for. + ### A reviewer requested a bunch of insubstantial changes on my PR The people involved in Nixpkgs care about code quality because, once in Nixpkgs, it needs to be maintained for many years to come. @@ -742,11 +749,11 @@ It is convention to mark review comments that are not critical to the PR as nitp As the PR author, you should still take a look at these as they will often reveal best practices and unwritten rules that usually have good reasons behind them and you may want to incorporate them into your modus operandi. Please keep in mind that reviewers almost always mean well here. -Their intent is not to denounce your code, they simply want your code to be as good as it can be. +Their intent is not to denounce your code, they want your code to be as good as it can be. Through their experience, they may also take notice of a seemingly insignificant issues that have caused significant burden before. Sometimes however, they can also get a bit carried away and become too perfectionistic. -If you feel some of the requests are unreasonable or merely a matter of personal preference, try to nicely remind the reviewers that you may not intend this code to be 100% perfect or that you have different taste in some regards and press them on whether they think that these requests are *critical* to the PR's success. +If you feel some of the requests are unreasonable, out of scope, or merely a matter of personal preference, try to nicely remind the reviewers that you may not intend this code to be 100% perfect or that you have different taste in some regards and press them on whether they think that these requests are *critical* to the PR's success. While we do have a set of [official standards for the Nix community](https://github.com/NixOS/rfcs/), we don't have standards for everything and there are often multiple valid ways to achieve the same goal. Unless there are standards forbidding the patterns used in your code or there are serious technical, maintainability or readability issues with your code, you can insist to keep the code the way you made it and disregard the requests. @@ -768,9 +775,11 @@ If someone left an approving review on your PR and didn't merge a few days later Please see it as your responsibility to actively remind reviewers of your open PRs. -The easiest way to do so is to simply cause them a Github notification. -Github notifies people involved in the PR when you add a comment to your PR, push your PR or re-request their review. +The easiest way to do so is to cause them a Github notification. +Github notifies people involved in the PR whenever you add a comment to your PR, push your PR or re-request their review. Doing any of that will get you people's attention again. +Everyone deserves proper attention, and yes that includes you! +However please be mindful that committers can sadly not always give everyone the attention they deserve. It may very well be the case that you have to do this every time you need the committer to follow up upon your PR. Again, this is a community project so please be mindful of people's circumstances here; be nice when requesting reviews again. diff --git a/third_party/nixpkgs/ci/OWNERS b/third_party/nixpkgs/ci/OWNERS index 4ab451624a..cf2e1a86d3 100644 --- a/third_party/nixpkgs/ci/OWNERS +++ b/third_party/nixpkgs/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/third_party/nixpkgs/doc/build-helpers/special/vm-tools.section.md b/third_party/nixpkgs/doc/build-helpers/special/vm-tools.section.md index 8feab04902..46ced7cd99 100644 --- a/third_party/nixpkgs/doc/build-helpers/special/vm-tools.section.md +++ b/third_party/nixpkgs/doc/build-helpers/special/vm-tools.section.md @@ -125,6 +125,8 @@ A set of functions that build a predefined set of minimal Linux distributions im * `debian10x86_64` * `debian11i386` * `debian11x86_64` + * `debian12i386` + * `debian12x86_64` ### Attributes {#vm-tools-diskImageFuns-attributes} diff --git a/third_party/nixpkgs/doc/build-helpers/trivial-build-helpers.chapter.md b/third_party/nixpkgs/doc/build-helpers/trivial-build-helpers.chapter.md index ff00548e04..13b1835ee5 100644 --- a/third_party/nixpkgs/doc/build-helpers/trivial-build-helpers.chapter.md +++ b/third_party/nixpkgs/doc/build-helpers/trivial-build-helpers.chapter.md @@ -732,7 +732,7 @@ writeShellApplication { ## `symlinkJoin` {#trivial-builder-symlinkJoin} -This can be used to put many derivations into the same directory structure. It works by creating a new derivation and adding symlinks to each of the paths listed. It expects two arguments, `name`, and `paths`. `name` is the name used in the Nix store path for the created derivation. `paths` is a list of paths that will be symlinked. These paths can be to Nix store derivations or any other subdirectory contained within. +This can be used to put many derivations into the same directory structure. It works by creating a new derivation and adding symlinks to each of the paths listed. It expects two arguments, `name`, and `paths`. `name` (or alternatively `pname` and `version`) is the name used in the Nix store path for the created derivation. `paths` is a list of paths that will be symlinked. These paths can be to Nix store derivations or any other subdirectory contained within. Here is an example: ```nix # adds symlinks of hello and stack to current build and prints "links added" diff --git a/third_party/nixpkgs/doc/doc-support/lib-function-docs.nix b/third_party/nixpkgs/doc/doc-support/lib-function-docs.nix index 4306fa9262..61671bd390 100644 --- a/third_party/nixpkgs/doc/doc-support/lib-function-docs.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/doc/languages-frameworks/index.md b/third_party/nixpkgs/doc/languages-frameworks/index.md index c21f73e69a..a8a13ce5b9 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/index.md +++ b/third_party/nixpkgs/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/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md b/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md index e68a29b0b3..9acfd41811 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md @@ -428,7 +428,26 @@ NOTE: It is highly recommended to use a pinned version of pnpm (i.e. `pnpm_8` or In case you are patching `package.json` or `pnpm-lock.yaml`, make sure to pass `finalAttrs.patches` to the function as well (i.e. `inherit (finalAttrs) patches`. -`pnpm.configHook` supports adding additional `pnpm install` flags via `pnpmInstallFlags` which can be set to a Nix string array. +`pnpm.configHook` supports adding additional `pnpm install` flags via `pnpmInstallFlags` which can be set to a Nix string array: + +```nix +{ + pnpm, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "foo"; + version = "0-unstable-1980-01-01"; + + src = ...; + + pnpmInstallFlags = [ "--shamefully-hoist" ]; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pnpmInstallFlags; + }; +}) +``` #### Dealing with `sourceRoot` {#javascript-pnpm-sourceRoot} @@ -459,16 +478,16 @@ Assuming the following directory structure, we can define `sourceRoot` and `pnpm #### PNPM Workspaces {#javascript-pnpm-workspaces} -If you need to use a PNPM workspace for your project, then set `pnpmWorkspace = ""` in your `pnpm.fetchDeps` call, -which will make PNPM only install dependencies for that workspace package. +If you need to use a PNPM workspace for your project, then set `pnpmWorkspaces = [ "" "" ]`, etc, in your `pnpm.fetchDeps` call, +which will make PNPM only install dependencies for those workspace packages. For example: ```nix ... -pnpmWorkspace = "@astrojs/language-server"; +pnpmWorkspaces = [ "@astrojs/language-server" ]; pnpmDeps = pnpm.fetchDeps { - inherit (finalAttrs) pnpmWorkspace; + inherit (finalAttrs) pnpmWorkspaces; ... } ``` @@ -476,7 +495,7 @@ pnpmDeps = pnpm.fetchDeps { The above would make `pnpm.fetchDeps` call only install dependencies for the `@astrojs/language-server` workspace package. Note that you do not need to set `sourceRoot` to make this work. -Usually in such cases, you'd want to use `pnpm --filter=$pnpmWorkspace build` to build your project, as `npmHooks.npmBuildHook` probably won't work. A `buildPhase` based on the following example will probably fit most workspace projects: +Usually in such cases, you'd want to use `pnpm --filter= build` to build your project, as `npmHooks.npmBuildHook` probably won't work. A `buildPhase` based on the following example will probably fit most workspace projects: ```nix buildPhase = '' diff --git a/third_party/nixpkgs/doc/languages-frameworks/tcl.section.md b/third_party/nixpkgs/doc/languages-frameworks/tcl.section.md new file mode 100644 index 0000000000..71ec9d89eb --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/lib/licenses.nix b/third_party/nixpkgs/lib/licenses.nix index fb7b6c2e83..6ba244b88b 100644 --- a/third_party/nixpkgs/lib/licenses.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 93ecaaf309..73a33c907f 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/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"; @@ -5870,7 +5906,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 +6303,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 +7211,11 @@ githubId = 183879; name = "Florian Klink"; }; + florensie = { + github = "florensie"; + githubId = 13403842; + name = "Florens Pauwels"; + }; florentc = { github = "florentc"; githubId = 1149048; @@ -7408,7 +7458,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 +8675,12 @@ githubId = 6430643; name = "Henry Till"; }; + hensoko = { + email = "hensoko@pub.solar"; + github = "hensoko"; + githubId = 13552930; + name = "hensoko"; + }; heph2 = { email = "srht@mrkeebs.eu"; github = "heph2"; @@ -9431,6 +9487,13 @@ github = "istoph"; githubId = 114227790; }; + itepastra = { + name = "Noa Aarts"; + github = "itepastra"; + githubId = 27058689; + email = "itepastra@gmail.com"; + keys = [ { fingerprint = "E681 4CAF 06AE B076 D55D 3E32 A16C DCBF 1472 541F"; } ]; + }; ius = { email = "j.de.gram@gmail.com"; name = "Joerie de Gram"; @@ -9493,6 +9556,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"; @@ -9726,6 +9795,12 @@ githubId = 3874017; name = "Jappie Klooster"; }; + jappie3 = { + name = "Jappie3"; + matrix = "@jappie:jappie.dev"; + github = "Jappie3"; + githubId = 42720120; + }; jaredmontoya = { name = "Jared Montoya"; github = "jaredmontoya"; @@ -10481,6 +10556,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"; @@ -12370,6 +12452,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"; @@ -14484,7 +14573,7 @@ }; moraxyc = { name = "Moraxyc Xu"; - email = "nix@qaq.li"; + email = "i@qaq.li"; github = "Moraxyc"; githubId = 69713071; }; @@ -14796,6 +14885,11 @@ githubId = 96225281; name = "Mustafa Çalışkan"; }; + musjj = { + name = "musjj"; + github = "musjj"; + githubId = 72612857; + }; mvisonneau = { name = "Maxime VISONNEAU"; email = "maxime@visonneau.fr"; @@ -16341,6 +16435,11 @@ githubId = 33182938; name = "Pankaj"; }; + PapayaJackal = { + github = "PapayaJackal"; + githubId = 145766029; + name = "PapayaJackal"; + }; paperdigits = { email = "mica@silentumbrella.com"; github = "paperdigits"; @@ -17996,6 +18095,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"; @@ -18857,6 +18962,12 @@ githubId = 10908495; name = "Ran Xiao"; }; + ryan4yin = { + email = "xiaoyin_c@qq.com"; + github = "ryan4yin"; + githubId = 22363274; + name = "Ryan Yin"; + }; ryanartecona = { email = "ryanartecona@gmail.com"; github = "ryanartecona"; @@ -19146,6 +19257,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"; @@ -19604,10 +19721,11 @@ }; shadowrz = { email = "shadowrz+nixpkgs@disroot.org"; - matrix = "@ShadowRZ:matrixim.cc"; + matrix = "@shadowrz:nixos.dev"; github = "ShadowRZ"; githubId = 23130178; name = "夜坂雅"; + keys = [ { fingerprint = "3237 D49E 8F81 5A45 2133 64EA 4FF3 5790 F405 53A9"; } ]; }; shahrukh330 = { email = "shahrukh330@gmail.com"; @@ -19701,12 +19819,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"; @@ -20021,6 +20151,12 @@ githubId = 49844593; name = "skovati"; }; + skyesoss = { + name = "Skye Soss"; + matrix = "@skyesoss:matrix.org"; + github = "Skyb0rg007"; + githubId = 30806179; + }; skykanin = { github = "skykanin"; githubId = 3789764; @@ -20428,6 +20564,12 @@ github = "srounce"; githubId = 60792; }; + Srylax = { + name = "Srylax"; + email = "srylax+nixpkgs@srylax.dev"; + github = "Srylax"; + githubId = 71783705; + }; sshine = { email = "simon@simonshine.dk"; github = "sshine"; @@ -20501,6 +20643,12 @@ githubId = 94006354; name = "steamwalker"; }; + steeleduncan = { + email = "steeleduncan@hotmail.com"; + github = "steeleduncan"; + githubId = 866573; + name = "Duncan Steele"; + }; steell = { email = "steve@steellworks.com"; github = "Steell"; @@ -21795,6 +21943,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"; @@ -23085,6 +23239,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"; @@ -23159,6 +23320,17 @@ githubId = 36118348; keys = [ { fingerprint = "69C9 876B 5797 1B2E 11C5 7C39 80A1 F76F C9F9 54AE"; } ]; }; + wizardlink = { + name = "wizardlink"; + email = "contact@thewizard.link"; + github = "wizardlink"; + githubId = 26727907; + keys = [ + { + fingerprint = "A1D3 A2B4 E14B D7C0 445B B749 A576 7B54 367C FBDF"; + } + ]; + }; wizeman = { email = "rcorreia@wizy.org"; github = "wizeman"; @@ -23238,6 +23410,12 @@ githubId = 28888242; name = "WORLDofPEACE"; }; + WoutSwinkels = { + name = "Wout Swinkels"; + email = "nixpkgs@woutswinkels.com"; + github = "WoutSwinkels"; + githubId = 113464111; + }; wozeparrot = { email = "wozeparrot@gmail.com"; github = "wozeparrot"; @@ -24181,12 +24359,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/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv index f502e569aa..5b1aed463d 100644 --- a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv +++ b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv @@ -1,16 +1,16 @@ name,rockspec,ref,server,version,luaversion,maintainers alt-getopt,,,,,,arobyn ansicolors,,,,,,Freed-Wu -bit32,,,,5.3.0-1,5.1,lblasc argparse,,,,,, basexx,,,,,, binaryheap,,,,,,vcunat +bit32,,,,5.3.0-1,5.1,lblasc busted,,,,,, busted-htest,,,,,,mrcjkb cassowary,,,,,,alerque cldr,,,,,,alerque -compat53,,,,,,vcunat commons.nvim,,,,,,mrcjkb +compat53,,,,,,vcunat cosmo,,,,,, coxpcall,,,,1.17.0-1,, cqueues,,,,,,vcunat @@ -50,6 +50,7 @@ lua-cjson,,,,,, lua-cmsgpack,,,,,, lua-curl,,,,,, lua-ffi-zlib,,,,,, +lua-iconv,,,,7.0.0,, lua-lsp,,,,,, lua-messagepack,,,,,, lua-protobuf,,,,,,lockejan @@ -62,6 +63,8 @@ lua-rtoml,https://raw.githubusercontent.com/lblasc/lua-rtoml/main/lua-rtoml-0.2- lua-subprocess,https://raw.githubusercontent.com/0x0ade/lua-subprocess/master/subprocess-scm-1.rockspec,,,,5.1,scoder12 lua-term,,,,,, lua-toml,,,,,, +lua-utils.nvim,,,,,,mrcjkb +lua-yajl,,,,,,pstn lua-zlib,,,,,,koral lua_cliargs,,,,,, luabitop,https://raw.githubusercontent.com/teto/luabitop/master/luabitop-1.0.2-3.rockspec,,,,, @@ -97,12 +100,9 @@ luaunbound,,,,,, luaunit,,,,,,lockejan luautf8,,,,,,pstn luazip,,,,,, -lua-utils.nvim,,,,,,mrcjkb -lua-yajl,,,,,,pstn -lua-iconv,,,,7.0.0,, +lush.nvim,,,https://luarocks.org/dev,,,teto luuid,,,,20120509-2,, luv,,,,1.48.0-2,, -lush.nvim,,,https://luarocks.org/dev,,,teto lyaml,,,,,,lblasc lz.n,,,,,,mrcjkb lze,,,,,,birdee @@ -112,8 +112,8 @@ markdown,,,,,, mediator_lua,,,,,, middleclass,,,,,, mimetypes,,,,,, -mpack,,,,,, moonscript,https://raw.githubusercontent.com/leafo/moonscript/master/moonscript-dev-1.rockspec,,,,,arobyn +mpack,,,,,, neorg,,,,,,GaetanLepage neotest,,,,,,mrcjkb nlua,,,,,,teto @@ -126,10 +126,10 @@ plenary.nvim,https://raw.githubusercontent.com/nvim-lua/plenary.nvim/master/plen psl,,,,0.3,, rapidjson,,,,,, rest.nvim,,,,,5.1,teto -rocks.nvim,,,,,,mrcjkb -rocks-git.nvim,,,,,,mrcjkb rocks-config.nvim,,,,,,mrcjkb rocks-dev.nvim,,,,,,mrcjkb +rocks-git.nvim,,,,,,mrcjkb +rocks.nvim,,,,,,mrcjkb rtp.nvim,,,,,,mrcjkb rustaceanvim,,,,,,mrcjkb say,,,,,, @@ -139,10 +139,10 @@ std._debug,,,,,, std.normalize,,,,,, stdlib,,,,41.2.2,,vyp teal-language-server,,,http://luarocks.org/dev,,, -telescope.nvim,,,,,5.1, telescope-manix,,,,,, +telescope.nvim,,,,,5.1, tiktoken_core,,,,,,natsukium -tl,,,,,,mephistophiles +tl,,,,0.15.3-1,,mephistophiles toml-edit,,,,,5.1,mrcjkb tree-sitter-norg,,,,,5.1,mrcjkb vstruct,,,,,, diff --git a/third_party/nixpkgs/maintainers/scripts/rebuild-amount.sh b/third_party/nixpkgs/maintainers/scripts/rebuild-amount.sh index 32810f6b98..0058e8c04b 100755 --- a/third_party/nixpkgs/maintainers/scripts/rebuild-amount.sh +++ b/third_party/nixpkgs/maintainers/scripts/rebuild-amount.sh @@ -81,11 +81,13 @@ newPkgs() { # could eat too much memory for a standard 4GiB machine. local -a list for i in 1 2; do - local l="$($MKTEMP)" + local l + l="$($MKTEMP)" list[$i]="$l" toRemove+=("$l") - local expr="$($MKTEMP)" + local expr + expr="$($MKTEMP)" toRemove+=("$expr") nixexpr "${!i}" > "$expr" diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.section.md b/third_party/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.section.md index f9a5221d6c..f2012d9c24 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.section.md @@ -90,16 +90,30 @@ Hello, world! Most pre-built executables will not work on NixOS. There are two notable exceptions: flatpaks and AppImages. For flatpaks see the [dedicated -section](#module-services-flatpak). AppImages will not run "as-is" on NixOS. -First you need to install `appimage-run`: add to `/etc/nixos/configuration.nix` +section](#module-services-flatpak). AppImages can run "as-is" on NixOS. + +First you need to enable AppImage support: add to `/etc/nixos/configuration.nix` ```nix { - environment.systemPackages = [ pkgs.appimage-run ]; + programs.appimage.enable = true; + programs.appimage.binfmt = true; } ``` -Then instead of running the AppImage "as-is", run `appimage-run foo.appimage`. +Then you can run the AppImage "as-is" or with `appimage-run foo.appimage`. + +If there are shared libraries missing add them with + +```nix +{ + programs.appimage.package = pkgs.appimage-run.override { + extraPkgs = pkgs: [ + # missing libraries here, e.g.: `pkgs.libepoxy` + ]; + } +} +``` To make other pre-built executables work on NixOS, you need to package them with Nix and special helpers like `autoPatchelfHook` or `buildFHSEnv`. See diff --git a/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.section.md b/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.section.md index 3ce12f41c6..bd588e2ba8 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.section.md +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md index d0c1e1af6f..a0600247bc 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md @@ -48,7 +48,7 @@ - The Rust rewrite of the `switch-to-configuration` program is now used for system activation by default. If you experience any issues, please report them. - The original Perl script can still be used for now by setting `system.switch.enableNg` to `false`. + 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`. - 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. @@ -104,6 +104,8 @@ - [Flood](https://flood.js.org/), a beautiful WebUI for various torrent clients. Available as [services.flood](options.html#opt-services.flood). +- [Niri](https://github.com/YaLTeR/niri), a scrollable-tiling Wayland compositor. Available as [programs.niri](options.html#opt-programs.niri.enable). + - [Firefly-iii Data Importer](https://github.com/firefly-iii/data-importer), a data importer for Firefly-III. Available as [services.firefly-iii-data-importer](options.html#opt-services.firefly-iii-data-importer) - [QGroundControl], a ground station support and configuration manager for the PX4 and APM Flight Stacks. Available as [programs.qgroundcontrol](options.html#opt-programs.qgroundcontrol.enable). @@ -188,7 +190,9 @@ - [Fedimint](https://github.com/fedimint/fedimint), a module based system for building federated applications (Federated E-Cash Mint). Available as [services.fedimintd](#opt-services.fedimintd). -- [Zapret](https://github.com/bol-van/zapret), a DPI bypass tool. Available as [services.zapret](option.html#opt-services.zapret). +- [Zapret](https://github.com/bol-van/zapret), a DPI bypass tool. Available as [services.zapret](options.html#opt-services.zapret). + +- [tiny-dfr](https://github.com/WhatAmISupposedToPutHere/tiny-dfr), a dynamic function row daemon for the Touch Bar found on some Apple laptops. Available as [hardware.apple.touchBar.enable](options.html#opt-hardware.apple.touchBar.enable). ## Backward Incompatibilities {#sec-release-24.11-incompatibilities} @@ -308,6 +312,14 @@ - 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`. @@ -372,6 +384,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). @@ -708,6 +722,9 @@ - Mikutter was removed because the package was broken and had no maintainers. +- The new option `services.getty.autologinOnce` was added to limit the automatic login to once per boot and on the first tty only. + When using full disk encryption, this option allows to unlock the system without retyping the passphrase while keeping the other ttys protected. + - Gollum was upgraded to major version 6. Read their [migration notes](https://github.com/gollum/gollum/wiki/6.0-Release-Notes). - The hooks `yarnConfigHook` and `yarnBuildHook` were added. These should replace `yarn2nix.mkYarnPackage` and other `yarn2nix` related tools. The motivation to get rid of `yarn2nix` tools is the fact that they are too complex and hard to maintain, and they rely upon too much Nix evaluation which is problematic if import-from-derivation is not allowed (see more details at [#296856](https://github.com/NixOS/nixpkgs/issues/296856). The transition from `mkYarnPackage` to `yarn{Config,Build}Hook` is tracked at [#324246](https://github.com/NixOS/nixpkgs/issues/324246). @@ -731,6 +748,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` @@ -759,6 +778,8 @@ - `services.localtimed.enable = true` will now set `time.timeZone = null`. This is to avoid silently shadowing a user's explicitly defined timezone without recognition on the user's part. +- `qgis` and `qgis-ltr` are now built without `grass` by default. `grass` support can be enabled with `qgis.override { withGrass = true; }`. + ## Detailed migration information {#sec-release-24.11-migration} ### `sound` options removal {#sec-release-24.11-migration-sound} diff --git a/third_party/nixpkgs/nixos/lib/testing/nodes.nix b/third_party/nixpkgs/nixos/lib/testing/nodes.nix index 8b14d0a3bf..4c528609fb 100644 --- a/third_party/nixpkgs/nixos/lib/testing/nodes.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix b/third_party/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix index 1b3724bfc1..e08cf572f7 100644 --- a/third_party/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix b/third_party/nixpkgs/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix index 9799f333ae..57022bd2f7 100644 --- a/third_party/nixpkgs/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/config/resolvconf.nix b/third_party/nixpkgs/nixos/modules/config/resolvconf.nix index f6241e9bf9..70ee02421c 100644 --- a/third_party/nixpkgs/nixos/modules/config/resolvconf.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/hardware/apple-touchbar.nix b/third_party/nixpkgs/nixos/modules/hardware/apple-touchbar.nix new file mode 100644 index 0000000000..700ef173a9 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/hardware/apple-touchbar.nix @@ -0,0 +1,43 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.hardware.apple.touchBar; + format = pkgs.formats.toml { }; + cfgFile = format.generate "config.toml" cfg.settings; +in +{ + options.hardware.apple.touchBar = { + enable = lib.mkEnableOption "support for the Touch Bar on some Apple laptops using tiny-dfr"; + package = lib.mkPackageOption pkgs "tiny-dfr" { }; + + settings = lib.mkOption { + type = format.type; + default = { }; + description = '' + Configuration for tiny-dfr. See [example configuration][1] for available options. + + [1]: https://github.com/WhatAmISupposedToPutHere/tiny-dfr/blob/master/share/tiny-dfr/config.toml + ''; + example = lib.literalExpression '' + { + MediaLayerDefault = true; + ShowButtonOutlines = false; + EnablePixelShift = true; + } + ''; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.packages = [ cfg.package ]; + services.udev.packages = [ cfg.package ]; + + environment.etc."tiny-dfr/config.toml".source = cfgFile; + systemd.services.tiny-dfr.restartTriggers = [ cfgFile ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index e84580f8f0..a014c93afe 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -48,6 +48,7 @@ ./config/zram.nix ./hardware/acpilight.nix ./hardware/all-firmware.nix + ./hardware/apple-touchbar.nix ./hardware/bladeRF.nix ./hardware/brillo.nix ./hardware/ckb-next.nix @@ -171,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 @@ -311,6 +313,7 @@ ./programs/wayland/hyprland.nix ./programs/wayland/labwc.nix ./programs/wayland/miracle-wm.nix + ./programs/wayland/niri.nix ./programs/wayland/river.nix ./programs/wayland/sway.nix ./programs/wayland/uwsm.nix @@ -1547,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/third_party/nixpkgs/nixos/modules/programs/_1password.nix b/third_party/nixpkgs/nixos/modules/programs/_1password.nix index 5dff199341..28ddb3b1a4 100644 --- a/third_party/nixpkgs/nixos/modules/programs/_1password.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/programs/corefreq.nix b/third_party/nixpkgs/nixos/modules/programs/corefreq.nix new file mode 100644 index 0000000000..c656b4a13d --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/programs/wayland/niri.nix b/third_party/nixpkgs/nixos/modules/programs/wayland/niri.nix new file mode 100644 index 0000000000..4092969a3e --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/programs/wayland/niri.nix @@ -0,0 +1,55 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.niri; +in +{ + options.programs.niri = { + enable = lib.mkEnableOption "Niri, a scrollable-tiling Wayland compositor"; + + package = lib.mkPackageOption pkgs "niri" { }; + }; + + config = lib.mkIf cfg.enable ( + lib.mkMerge [ + { + environment.systemPackages = [ cfg.package ]; + + services = { + displayManager.sessionPackages = [ cfg.package ]; + + # Recommended by upstream + # https://github.com/YaLTeR/niri/wiki/Important-Software#portals + gnome.gnome-keyring.enable = lib.mkDefault true; + }; + + systemd.packages = [ cfg.package ]; + + xdg.portal = { + enable = lib.mkDefault true; + + configPackages = [ cfg.package ]; + + # Recommended by upstream, required for screencast support + # https://github.com/YaLTeR/niri/wiki/Important-Software#portals + extraPortals = [ pkgs.xdg-desktop-portal-gnome ]; + }; + } + + (import ./wayland-session.nix { + inherit lib pkgs; + enableWlrPortal = false; + enableXWayland = false; + }) + ] + ); + + meta.maintainers = with lib.maintainers; [ + getchoo + sodiboo + ]; +} diff --git a/third_party/nixpkgs/nixos/modules/programs/wayland/sway.nix b/third_party/nixpkgs/nixos/modules/programs/wayland/sway.nix index 7c5f49ce6d..1fae6b1200 100644 --- a/third_party/nixpkgs/nixos/modules/programs/wayland/sway.nix +++ b/third_party/nixpkgs/nixos/modules/programs/wayland/sway.nix @@ -144,7 +144,19 @@ in services.displayManager.sessionPackages = lib.optional (cfg.package != null) cfg.package; # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050913 - xdg.portal.config.sway.default = lib.mkDefault [ "wlr" "gtk" ]; + # https://github.com/emersion/xdg-desktop-portal-wlr/blob/master/contrib/wlroots-portals.conf + # https://github.com/emersion/xdg-desktop-portal-wlr/pull/315 + xdg.portal.config.sway = { + # Use xdg-desktop-portal-gtk for every portal interface... + default = "gtk"; + # ... except for the ScreenCast, Screenshot and Secret + "org.freedesktop.impl.portal.ScreenCast" = "wlr"; + "org.freedesktop.impl.portal.Screenshot" = "wlr"; + # ignore inhibit bc gtk portal always returns as success, + # despite sway/the wlr portal not having an implementation, + # stopping firefox from using wayland idle-inhibit + "org.freedesktop.impl.portal.Inhibit" = "none"; + }; } (import ./wayland-session.nix { diff --git a/third_party/nixpkgs/nixos/modules/programs/wayland/uwsm.nix b/third_party/nixpkgs/nixos/modules/programs/wayland/uwsm.nix index 5497cc269e..18e7fdc1f6 100644 --- a/third_party/nixpkgs/nixos/modules/programs/wayland/uwsm.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.nix b/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.nix index 2120cf1af0..85dae5ba66 100644 --- a/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.nix +++ b/third_party/nixpkgs/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 force` (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/third_party/nixpkgs/nixos/modules/security/ca.nix b/third_party/nixpkgs/nixos/modules/security/ca.nix index 8aae6eb3f2..76c1010f41 100644 --- a/third_party/nixpkgs/nixos/modules/security/ca.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix b/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix index b5dae96d79..86e86585e4 100644 --- a/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/audio/jack.nix b/third_party/nixpkgs/nixos/modules/services/audio/jack.nix index 7344fdf4a2..767f1add1c 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/jack.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix index 300e4e72a0..b4cad5ee23 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -4,7 +4,7 @@ let cfg = config.services.buildbot-master; opt = options.services.buildbot-master; - package = pkgs.python3.pkgs.toPythonModule cfg.package; + package = cfg.package.python.pkgs.toPythonModule cfg.package; python = package.pythonModule; escapeStr = lib.escape [ "'" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/games/factorio.nix b/third_party/nixpkgs/nixos/modules/services/games/factorio.nix index a9a4f386e0..3e89c01dc8 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/factorio.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/factorio.nix @@ -36,7 +36,9 @@ let } // cfg.extraSettings; serverSettingsString = builtins.toJSON (lib.filterAttrsRecursive (n: v: v != null) serverSettings); serverSettingsFile = pkgs.writeText "server-settings.json" serverSettingsString; - serverAdminsFile = pkgs.writeText "server-adminlist.json" (builtins.toJSON cfg.admins); + playerListOption = name: list: + lib.optionalString (list != []) + "--${name}=${pkgs.writeText "${name}.json" (builtins.toJSON list)}"; modDir = pkgs.factorio-utils.mkModDirDrv cfg.mods cfg.mods-dat; in { @@ -59,6 +61,30 @@ in ''; }; + allowedPlayers = lib.mkOption { + # I would personally prefer for `allowedPlayers = []` to mean "no-one + # can connect" but Factorio seems to ignore empty whitelists (even with + # --use-server-whitelist) so we can't implement that behaviour, so we + # might as well match theirs. + type = lib.types.listOf lib.types.str; + default = []; + example = [ "Rseding91" "Oxyd" ]; + description = '' + If non-empty, only these player names are allowed to connect. The game + will not be able to save any changes made in-game with the /whitelist + console command, though they will still take effect until the server + is restarted. + + If empty, the whitelist defaults to open, but can be managed with the + in-game /whitelist console command (see: /help whitelist), which will + cause changes to be saved to the game's state directory (see also: + `stateDirName`). + ''; + }; + # Opting not to include the banlist in addition the the whitelist because: + # - banlists are not as often known in advance, + # - losing banlist changes on restart seems much more of a headache. + admins = lib.mkOption { type = lib.types.listOf lib.types.str; default = []; @@ -177,7 +203,7 @@ in extraSettings = lib.mkOption { type = lib.types.attrs; default = {}; - example = { admins = [ "username" ];}; + example = { max_players = 64; }; description = '' Extra game configuration that will go into server-settings.json ''; @@ -298,7 +324,9 @@ in }" (lib.optionalString cfg.loadLatestSave "--start-server-load-latest") (lib.optionalString (cfg.mods != []) "--mod-directory=${modDir}") - (lib.optionalString (cfg.admins != []) "--server-adminlist=${serverAdminsFile}") + (playerListOption "server-adminlist" cfg.admins) + (playerListOption "server-whitelist" cfg.allowedPlayers) + (lib.optionalString (cfg.allowedPlayers != []) "--use-server-whitelist") ]; # Sandboxing diff --git a/third_party/nixpkgs/nixos/modules/services/misc/anki-sync-server.md b/third_party/nixpkgs/nixos/modules/services/misc/anki-sync-server.md index 4796abf25c..1210cad6d0 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/anki-sync-server.md +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/misc/anki-sync-server.nix b/third_party/nixpkgs/nixos/modules/services/misc/anki-sync-server.nix index a653820094..c77afe8c38 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/anki-sync-server.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/misc/bazarr.nix b/third_party/nixpkgs/nixos/modules/services/misc/bazarr.nix index 0bf326a193..30924da936 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/bazarr.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/bazarr.nix @@ -37,7 +37,7 @@ in config = lib.mkIf cfg.enable { systemd.services.bazarr = { - description = "bazarr"; + description = "Bazarr"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; @@ -54,6 +54,8 @@ in --no-update True ''; Restart = "on-failure"; + KillSignal = "SIGINT"; + SuccessExitStatus = "0 156"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/calibre-server.nix b/third_party/nixpkgs/nixos/modules/services/misc/calibre-server.nix index 5fa3c11a48..160a1c1e53 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/calibre-server.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix b/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix index 619fbcf923..1869822a07 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/misc/dysnomia.nix b/third_party/nixpkgs/nixos/modules/services/misc/dysnomia.nix index 9f421d7ec3..36b6293843 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/dysnomia.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/misc/klipper.nix b/third_party/nixpkgs/nixos/modules/services/misc/klipper.nix index f0972f8caf..d9eef161eb 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/klipper.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/misc/nix-gc.nix b/third_party/nixpkgs/nixos/modules/services/misc/nix-gc.nix index 9caca5d740..69b25d6ae6 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nix-gc.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/nix-gc.nix @@ -26,7 +26,7 @@ in How often or when garbage collection is performed. For most desktop and server systems a sufficient garbage collection is once a week. - The format is described in + This value must be a calendar event in the format specified by {manpage}`systemd.time(7)`. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix b/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix index 73f09d804f..988d54d656 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/monitoring/nezha-agent.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/nezha-agent.nix index 7ebbc7f2f3..e51328e487 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/nezha-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/nezha-agent.nix @@ -31,6 +31,20 @@ in Enable GPU monitoring. ''; }; + temperature = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Enable temperature monitoring. + ''; + }; + useIPv6CountryCode = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Use ipv6 countrycode to report location. + ''; + }; disableCommandExecute = lib.mkOption { type = lib.types.bool; default = true; @@ -78,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. + ''; + }; }; }; @@ -96,7 +118,7 @@ in startLimitBurst = 3; script = lib.concatStringsSep " " ( [ - "${cfg.package}/bin/agent" + "${lib.getExe cfg.package}" "--disable-auto-update" "--disable-force-update" "--password $(cat ${cfg.passwordFile})" @@ -109,6 +131,9 @@ in ++ lib.optional cfg.skipProcess "--skip-procs" ++ lib.optional cfg.tls "--tls" ++ 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/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix index 4de80acfa9..d2b23bf175 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix index 29a30e938e..cf840a2d45 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -50,6 +50,7 @@ let "junos-czerwonk" "kea" "keylight" + "klipper" "knot" "lnd" "mail" diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/klipper.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/klipper.nix new file mode 100644 index 0000000000..2d38a5023a --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/klipper.nix @@ -0,0 +1,55 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.prometheus.exporters.klipper; + inherit (lib) + mkOption + mkMerge + mkIf + types + concatStringsSep + any + optionalString + ; + moonraker = config.services.moonraker; +in +{ + port = 9101; + extraOpts = { + package = lib.mkPackageOption pkgs "prometheus-klipper-exporter" { }; + + moonrakerApiKey = mkOption { + type = types.str; + default = ""; + description = '' + API Key to authenticate with the Moonraker APIs. + Only needed if the host running the exporter is not a trusted client to Moonraker. + ''; + }; + }; + serviceOpts = mkMerge ( + [ + { + serviceConfig = { + ExecStart = concatStringsSep " " [ + "${cfg.package}/bin/prometheus-klipper-exporter" + (optionalString (cfg.moonrakerApiKey != "") "--moonraker.apikey ${cfg.moonrakerApiKey}") + "--web.listen-address ${cfg.listenAddress}:${toString cfg.port}" + "${concatStringsSep " " cfg.extraFlags}" + ]; + }; + } + ] + ++ [ + (mkIf config.services.moonraker.enable { + after = [ "moonraker.service" ]; + requires = [ "moonraker.service" ]; + }) + ] + ); +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix b/third_party/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix index 72ccb91098..73fc210728 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/networking/coturn.nix b/third_party/nixpkgs/nixos/modules/services/networking/coturn.nix index 40c157d100..ab8806dc03 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/coturn.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix b/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix index a7c896cb28..059dc59e8a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/networking/ntp/ntpd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ntp/ntpd.nix index e7ea8866d7..bdc5adb394 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ntp/ntpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ntp/ntpd.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; @@ -8,10 +13,8 @@ let cfg = config.services.ntp; - stateDir = "/var/lib/ntp"; - configFile = pkgs.writeText "ntp.conf" '' - driftfile ${stateDir}/ntp.drift + driftfile /var/lib/ntp/ntp.drift restrict default ${toString cfg.restrictDefault} restrict -6 default ${toString cfg.restrictDefault} @@ -25,7 +28,12 @@ let ${cfg.extraConfig} ''; - ntpFlags = [ "-c" "${configFile}" "-u" "ntp:ntp" ] ++ cfg.extraFlags; + ntpFlags = [ + "-c" + "${configFile}" + "-u" + "ntp:ntp" + ] ++ cfg.extraFlags; in @@ -58,7 +66,14 @@ in recommended in section 6.5.1.1.3, answer "No" of https://support.ntp.org/Support/AccessRestrictions ''; - default = [ "limited" "kod" "nomodify" "notrap" "noquery" "nopeer" ]; + default = [ + "limited" + "kod" + "nomodify" + "notrap" + "noquery" + "nopeer" + ]; }; restrictSource = mkOption { @@ -69,7 +84,13 @@ in The default flags allow peers to be added by ntpd from configured pool(s), but not by other means. ''; - default = [ "limited" "kod" "nomodify" "notrap" "noquery" ]; + default = [ + "limited" + "kod" + "nomodify" + "notrap" + "noquery" + ]; }; servers = mkOption { @@ -96,14 +117,13 @@ in type = types.listOf types.str; description = "Extra flags passed to the ntpd command."; example = literalExpression ''[ "--interface=eth0" ]''; - default = []; + default = [ ]; }; }; }; - ###### implementation config = mkIf config.services.ntp.enable { @@ -113,34 +133,57 @@ in environment.systemPackages = [ pkgs.ntp ]; services.timesyncd.enable = mkForce false; - systemd.services.systemd-timedated.environment = { SYSTEMD_TIMEDATED_NTP_SERVICES = "ntpd.service"; }; + systemd.services.systemd-timedated.environment = { + SYSTEMD_TIMEDATED_NTP_SERVICES = "ntpd.service"; + }; - users.users.ntp = - { isSystemUser = true; - group = "ntp"; - description = "NTP daemon user"; - home = stateDir; - }; - users.groups.ntp = {}; - - systemd.services.ntpd = - { description = "NTP Daemon"; - - wantedBy = [ "multi-user.target" ]; - wants = [ "time-sync.target" ]; - before = [ "time-sync.target" ]; - - preStart = - '' - mkdir -m 0755 -p ${stateDir} - chown ntp ${stateDir} - ''; - - serviceConfig = { - ExecStart = "@${ntp}/bin/ntpd ntpd -g ${builtins.toString ntpFlags}"; - Type = "forking"; - }; + users.users.ntp = { + isSystemUser = true; + group = "ntp"; + description = "NTP daemon user"; + home = "/var/lib/ntp"; + }; + users.groups.ntp = { }; + + systemd.services.ntpd = { + description = "NTP Daemon"; + + wantedBy = [ "multi-user.target" ]; + wants = [ "time-sync.target" ]; + before = [ "time-sync.target" ]; + + serviceConfig = { + ExecStart = "@${ntp}/bin/ntpd ntpd -g ${builtins.toString ntpFlags}"; + Type = "forking"; + StateDirectory = "ntp"; + + # Hardening options + PrivateDevices = true; + PrivateIPC = true; + PrivateTmp = true; + ProtectClock = false; + ProtectHome = true; + + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = true; + + RestrictNamespaces = true; + RestrictRealtime = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + AmbientCapabilities = [ + "CAP_SYS_TIME" + ]; + + ProtectControlGroups = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + RestrictSUIDSGID = true; }; + }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/pptpd.nix b/third_party/nixpkgs/nixos/modules/services/networking/pptpd.nix index b28015800f..441ab52372 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/pptpd.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/networking/radicale.nix b/third_party/nixpkgs/nixos/modules/services/networking/radicale.nix index 62a242e88c..7037e68178 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/radicale.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/networking/soju.nix b/third_party/nixpkgs/nixos/modules/services/networking/soju.nix index 0f4969b930..808c708163 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/soju.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/networking/supplicant.nix b/third_party/nixpkgs/nixos/modules/services/networking/supplicant.nix index 52645500d4..2e1ce24976 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/supplicant.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/supplicant.nix @@ -26,12 +26,15 @@ let ifaceArg = concatStringsSep " -N " (map (i: "-i${i}") (splitString " " iface)); driverArg = optionalString (suppl.driver != null) "-D${suppl.driver}"; bridgeArg = optionalString (suppl.bridge!="") "-b${suppl.bridge}"; - confFileArg = optionalString (suppl.configFile.path!=null) "-c${suppl.configFile.path}"; extraConfFile = pkgs.writeText "supplicant-extra-conf-${replaceStrings [" "] ["-"] iface}" '' ${optionalString suppl.userControlled.enable "ctrl_interface=DIR=${suppl.userControlled.socketDir} GROUP=${suppl.userControlled.group}"} ${optionalString suppl.configFile.writable "update_config=1"} ${suppl.extraConf} ''; + confArgs = escapeShellArgs + (if suppl.configFile.path == null + then [ "-c${extraConfFile}" ] + else [ "-c${suppl.configFile.path}" "-I${extraConfFile}" ]); in { description = "Supplicant ${iface}${optionalString (iface=="WLAN"||iface=="LAN") " %I"}"; wantedBy = [ "multi-user.target" ] ++ deps; @@ -51,7 +54,7 @@ let ''} ''; - serviceConfig.ExecStart = "${pkgs.wpa_supplicant}/bin/wpa_supplicant -s ${driverArg} ${confFileArg} -I${extraConfFile} ${bridgeArg} ${suppl.extraCmdArgs} ${if (iface=="WLAN"||iface=="LAN") then "-i%I" else (if (iface=="DBUS") then "-u" else ifaceArg)}"; + serviceConfig.ExecStart = "${pkgs.wpa_supplicant}/bin/wpa_supplicant -s ${driverArg} ${confArgs} ${bridgeArg} ${suppl.extraCmdArgs} ${if (iface=="WLAN"||iface=="LAN") then "-i%I" else (if (iface=="DBUS") then "-u" else ifaceArg)}"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix b/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix index aaff9221d5..d30193ecc1 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/networking/xl2tpd.nix b/third_party/nixpkgs/nixos/modules/services/networking/xl2tpd.nix index 8d192be6c2..4ecd3c54e4 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/xl2tpd.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/security/oauth2-proxy.nix b/third_party/nixpkgs/nixos/modules/services/security/oauth2-proxy.nix index a897f04ea6..38da06e153 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/oauth2-proxy.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/ttys/getty.nix b/third_party/nixpkgs/nixos/modules/services/ttys/getty.nix index e88bb46286..fd9bd7aca0 100644 --- a/third_party/nixpkgs/nixos/modules/services/ttys/getty.nix +++ b/third_party/nixpkgs/nixos/modules/services/ttys/getty.nix @@ -7,14 +7,26 @@ let baseArgs = [ "--login-program" "${cfg.loginProgram}" - ] ++ optionals (cfg.autologinUser != null) [ + ] ++ optionals (cfg.autologinUser != null && !cfg.autologinOnce) [ "--autologin" cfg.autologinUser ] ++ optionals (cfg.loginOptions != null) [ "--login-options" cfg.loginOptions ] ++ cfg.extraArgs; gettyCmd = args: - "@${pkgs.util-linux}/sbin/agetty agetty ${escapeShellArgs baseArgs} ${args}"; + "${lib.getExe' pkgs.util-linux "agetty"} ${escapeShellArgs baseArgs} ${args}"; + + autologinScript = '' + otherArgs="--noclear --keep-baud $TTY 115200,38400,9600 $TERM"; + ${lib.optionalString cfg.autologinOnce '' + autologged="/run/agetty.autologged" + if test "$TTY" = tty1 && ! test -f "$autologged"; then + touch "$autologged" + exec ${gettyCmd "$otherArgs --autologin ${cfg.autologinUser}"} + fi + ''} + exec ${gettyCmd "$otherArgs"} + ''; in @@ -40,6 +52,16 @@ in ''; }; + autologinOnce = mkOption { + type = types.bool; + default = false; + description = '' + If enabled the automatic login will only happen in the first tty + once per boot. This can be useful to avoid retyping the account + password on systems with full disk encrypted. + ''; + }; + loginProgram = mkOption { type = types.path; default = "${pkgs.shadow}/bin/login"; @@ -106,9 +128,11 @@ in systemd.services."getty@" = { serviceConfig.ExecStart = [ - "" # override upstream default with an empty ExecStart - (gettyCmd "--noclear --keep-baud %I 115200,38400,9600 $TERM") + # override upstream default with an empty ExecStart + "" + (pkgs.writers.writeDash "getty" autologinScript) ]; + environment.TTY = "%I"; restartIfChanged = false; }; diff --git a/third_party/nixpkgs/nixos/modules/services/video/frigate.nix b/third_party/nixpkgs/nixos/modules/services/video/frigate.nix index b3f38eba66..a5fa6375c6 100644 --- a/third_party/nixpkgs/nixos/modules/services/video/frigate.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/web-apps/immich.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/immich.nix index 7973adccb7..c5820049c2 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/immich.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/immich.nix @@ -258,7 +258,7 @@ 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"; @@ -282,6 +282,7 @@ in ExecStart = lib.getExe cfg.package; EnvironmentFile = mkIf (cfg.secretsFile != null) cfg.secretsFile; StateDirectory = "immich"; + SyslogIdentifier = "immich"; RuntimeDirectory = "immich"; User = cfg.user; Group = cfg.group; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/netbox.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/netbox.nix index 7bcbde2a01..01319722af 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/netbox.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/web-apps/sftpgo.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/sftpgo.nix index 3ad6d0436a..4d9a8e44c2 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/sftpgo.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/sftpgo.nix @@ -35,13 +35,21 @@ in }; dataDir = mkOption { - type = types.str; + type = types.path; default = "/var/lib/sftpgo"; description = '' The directory where SFTPGo stores its data files. ''; }; + extraReadWriteDirs = mkOption { + type = types.listOf types.path; + default = []; + description = '' + Extra directories where SFTPGo is allowed to write to. + ''; + }; + user = mkOption { type = types.str; default = defaultUser; @@ -63,7 +71,7 @@ in type = with types; nullOr path; description = '' Path to a json file containing users and folders to load (or update) on startup. - Check the [documentation](https://github.com/drakkan/sftpgo/blob/main/docs/full-configuration.md) + Check the [documentation](https://sftpgo.github.io/latest/config-file/) for the `--loaddata-from` command line argument for more info. ''; }; @@ -72,7 +80,7 @@ in default = {}; description = '' The primary sftpgo configuration. See the - [configuration reference](https://github.com/drakkan/sftpgo/blob/main/docs/full-configuration.md) + [configuration reference](https://sftpgo.github.io/latest/config-file/) for possible values. ''; type = with types; submodule { @@ -324,7 +332,7 @@ in User = cfg.user; Group = cfg.group; WorkingDirectory = cfg.dataDir; - ReadWritePaths = [ cfg.dataDir ]; + ReadWritePaths = [ cfg.dataDir ] ++ cfg.extraReadWriteDirs; LimitNOFILE = 8192; # taken from upstream KillMode = "mixed"; ExecStart = "${cfg.package}/bin/sftpgo serve ${utils.escapeSystemdExecArgs cfg.extraArgs}"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/youtrack.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/youtrack.nix index ff48a978b7..e80cdda680 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/youtrack.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/youtrack.nix @@ -9,6 +9,8 @@ in (lib.mkRenamedOptionModule [ "services" "youtrack" "port" ] [ "services" "youtrack" "environmentalParameters" "listen-port" ]) (lib.mkRemovedOptionModule [ "services" "youtrack" "maxMemory" ] "Please instead use `services.youtrack.generalParameters`.") (lib.mkRemovedOptionModule [ "services" "youtrack" "maxMetaspaceSize" ] "Please instead use `services.youtrack.generalParameters`.") + (lib.mkRemovedOptionModule [ "services" "youtrack" "extraParams" ] "Please migrate to `services.youtrack.generalParameters`.") + (lib.mkRemovedOptionModule [ "services" "youtrack" "jvmOpts" ] "Please migrate to `services.youtrack.generalParameters`.") ]; options.services.youtrack = { @@ -22,33 +24,15 @@ in type = lib.types.str; }; - extraParams = lib.mkOption { - default = {}; - description = '' - Extra parameters to pass to youtrack. - Use to configure YouTrack 2022.x, deprecated with YouTrack 2023.x. Use `services.youtrack.generalParameters`. - https://www.jetbrains.com/help/youtrack/standalone/YouTrack-Java-Start-Parameters.html - for more information. - ''; - example = lib.literalExpression '' - { - "jetbrains.youtrack.overrideRootPassword" = "tortuga"; - } - ''; - type = lib.types.attrsOf lib.types.str; - visible = false; - }; - package = lib.mkOption { description = '' Package to use. ''; type = lib.types.package; - default = null; - relatedPackages = [ "youtrack_2022_3" "youtrack" ]; + default = pkgs.youtrack; + defaultText = lib.literalExpression "pkgs.youtrack"; }; - statePath = lib.mkOption { description = '' Path were the YouTrack state is stored. @@ -67,19 +51,6 @@ in type = lib.types.nullOr lib.types.str; }; - jvmOpts = lib.mkOption { - description = '' - Extra options to pass to the JVM. - Only has a use with YouTrack 2022.x, deprecated with YouTrack 2023.x. Use `serivces.youtrack.generalParameters`. - See https://www.jetbrains.com/help/youtrack/standalone/Configure-JVM-Options.html - for more information. - ''; - type = lib.types.separatedString " "; - example = "--J-XX:MetaspaceSize=250m"; - default = ""; - visible = false; - }; - autoUpgrade = lib.mkOption { type = lib.types.bool; default = true; @@ -90,7 +61,6 @@ in type = with lib.types; listOf str; description = '' General configuration parameters and other JVM options. - Only has an effect for YouTrack 2023.x. See https://www.jetbrains.com/help/youtrack/server/2023.3/youtrack-java-start-parameters.html#general-parameters for more information. ''; @@ -121,7 +91,6 @@ in }; description = '' Environmental configuration parameters, set imperatively. The values doesn't get removed, when removed in Nix. - Only has an effect for YouTrack 2023.x. See https://www.jetbrains.com/help/youtrack/server/2023.3/youtrack-java-start-parameters.html#environmental-parameters for more information. ''; @@ -135,90 +104,47 @@ in }; config = lib.mkIf cfg.enable { - warnings = lib.optional (lib.versions.major cfg.package.version <= "2022") - "YouTrack 2022.x is deprecated. See https://nixos.org/manual/nixos/unstable/index.html#module-services-youtrack for details on how to upgrade." - ++ lib.optional (cfg.extraParams != {} && (lib.versions.major cfg.package.version >= "2023")) - "'services.youtrack.extraParams' is deprecated and has no effect on YouTrack 2023.x and newer. Please migrate to 'services.youtrack.generalParameters'" - ++ lib.optional (cfg.jvmOpts != "" && (lib.versions.major cfg.package.version >= "2023")) - "'services.youtrack.jvmOpts' is deprecated and has no effect on YouTrack 2023.x and newer. Please migrate to 'services.youtrack.generalParameters'"; - - # XXX: Drop all version feature switches at the point when we consider YT 2022.3 as outdated. - services.youtrack.package = lib.mkDefault ( - if lib.versionAtLeast config.system.stateVersion "24.11" then pkgs.youtrack - else pkgs.youtrack_2022_3 - ); - - services.youtrack.generalParameters = lib.optional (lib.versions.major cfg.package.version >= "2023") - "-Ddisable.configuration.wizard.on.upgrade=${lib.boolToString cfg.autoUpgrade}" - ++ (lib.mapAttrsToList (k: v: "-D${k}=${v}") cfg.extraParams); + services.youtrack.generalParameters = [ "-Ddisable.configuration.wizard.on.upgrade=${lib.boolToString cfg.autoUpgrade}" ]; systemd.services.youtrack = let - service_jar = let - mergeAttrList = lib.foldl' lib.mergeAttrs {}; - stdParams = mergeAttrList [ - (lib.optionalAttrs (cfg.environmentalParameters ? base-url && cfg.environmentalParameters.base-url != null) { - "jetbrains.youtrack.baseUrl" = cfg.environmentalParameters.base-url; - }) - { - "java.aws.headless" = "true"; - "jetbrains.youtrack.disableBrowser" = "true"; - } - ]; - extraAttr = lib.concatStringsSep " " (lib.mapAttrsToList (k: v: "-D${k}=${v}") (stdParams // cfg.extraParams)); - in { - environment.HOME = cfg.statePath; - environment.YOUTRACK_JVM_OPTS = "${extraAttr}"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ unixtools.hostname ]; - serviceConfig = { + jvmoptions = pkgs.writeTextFile { + name = "youtrack.jvmoptions"; + text = (lib.concatStringsSep "\n" cfg.generalParameters); + }; + + package = cfg.package.override { + statePath = cfg.statePath; + }; + in { + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + path = with pkgs; [ unixtools.hostname ]; + preStart = '' + # This detects old (i.e. <= 2022.3) installations that were not migrated yet + # and migrates them to the new state directory style + if [[ -d ${cfg.statePath}/teamsysdata ]] && [[ ! -d ${cfg.statePath}/2022_3 ]] + then + mkdir -p ${cfg.statePath}/2022_3 + mv ${cfg.statePath}/teamsysdata ${cfg.statePath}/2022_3 + mv ${cfg.statePath}/.youtrack ${cfg.statePath}/2022_3 + fi + mkdir -p ${cfg.statePath}/{backups,conf,data,logs,temp} + ${pkgs.coreutils}/bin/ln -fs ${jvmoptions} ${cfg.statePath}/conf/youtrack.jvmoptions + ${package}/bin/youtrack configure ${lib.concatStringsSep " " (lib.mapAttrsToList (name: value: "--${name}=${toString value}") cfg.environmentalParameters )} + ''; + serviceConfig = lib.mkMerge [ + { Type = "simple"; User = "youtrack"; Group = "youtrack"; Restart = "on-failure"; - ExecStart = ''${cfg.package}/bin/youtrack ${cfg.jvmOpts} ${cfg.environmentalParameters.listen-address}:${toString cfg.environmentalParameters.listen-port}''; - }; - }; - service_zip = let - jvmoptions = pkgs.writeTextFile { - name = "youtrack.jvmoptions"; - text = (lib.concatStringsSep "\n" cfg.generalParameters); - }; - - package = cfg.package.override { - statePath = cfg.statePath; - }; - in { - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ unixtools.hostname ]; - preStart = '' - # This detects old (i.e. <= 2022.3) installations that were not migrated yet - # and migrates them to the new state directory style - if [[ -d ${cfg.statePath}/teamsysdata ]] && [[ ! -d ${cfg.statePath}/2022_3 ]] - then - mkdir -p ${cfg.statePath}/2022_3 - mv ${cfg.statePath}/teamsysdata ${cfg.statePath}/2022_3 - mv ${cfg.statePath}/.youtrack ${cfg.statePath}/2022_3 - fi - mkdir -p ${cfg.statePath}/{backups,conf,data,logs,temp} - ${pkgs.coreutils}/bin/ln -fs ${jvmoptions} ${cfg.statePath}/conf/youtrack.jvmoptions - ${package}/bin/youtrack configure ${lib.concatStringsSep " " (lib.mapAttrsToList (name: value: "--${name}=${toString value}") cfg.environmentalParameters )} - ''; - serviceConfig = lib.mkMerge [ - { - Type = "simple"; - User = "youtrack"; - Group = "youtrack"; - Restart = "on-failure"; - ExecStart = "${package}/bin/youtrack run"; - } - (lib.mkIf (cfg.statePath == "/var/lib/youtrack") { - StateDirectory = "youtrack"; - }) - ]; - }; - in if (lib.versions.major cfg.package.version >= "2023") then service_zip else service_jar; + ExecStart = "${package}/bin/youtrack run"; + } + (lib.mkIf (cfg.statePath == "/var/lib/youtrack") { + StateDirectory = "youtrack"; + }) + ]; + }; users.users.youtrack = { description = "Youtrack service user"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix index af7885c30a..1e43554b78 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix @@ -1218,6 +1218,7 @@ in ++ lib.optional cfg.recommendedZstdSettings pkgs.nginxModules.zstd; services.nginx.virtualHosts.localhost = mkIf cfg.statusPage { + serverAliases = [ "127.0.0.1" ] ++ lib.optional config.networking.enableIPv6 "[::1]"; listenAddresses = lib.mkDefault ([ "0.0.0.0" ] ++ lib.optional enableIPv6 "[::]"); @@ -1373,7 +1374,7 @@ in ]; services.logrotate.settings.nginx = mapAttrs (_: mkDefault) { - files = "/var/log/nginx/*.log"; + files = [ "/var/log/nginx/*.log" ]; frequency = "weekly"; su = "${cfg.user} ${cfg.group}"; rotate = 26; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/send.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/send.nix new file mode 100644 index 0000000000..696fbbdc7c --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/send.nix @@ -0,0 +1,228 @@ +{ + config, + lib, + pkgs, + ... +}: +let + inherit (lib) mkOption types; + cfg = config.services.send; +in +{ + options = { + services.send = { + enable = lib.mkEnableOption "Send, a file sharing web sevice for ffsend."; + + package = lib.mkPackageOption pkgs "send" { }; + + environment = mkOption { + type = + with types; + attrsOf ( + nullOr (oneOf [ + bool + int + str + (listOf int) + ]) + ); + description = '' + All the available config options and their defaults can be found here: https://github.com/timvisee/send/blob/master/server/config.js, + some descriptions can found here: https://github.com/timvisee/send/blob/master/docs/docker.md#environment-variables + + Values under {option}`services.send.environment` will override the predefined values in the Send service. + - Time/duration should be in seconds + - Filesize values should be in bytes + ''; + example = { + DEFAULT_DOWNLOADS = 1; + DETECT_BASE_URL = true; + EXPIRE_TIMES_SECONDS = [ + 300 + 3600 + 86400 + 604800 + ]; + }; + }; + + dataDir = lib.mkOption { + type = types.path; + readOnly = true; + default = "/var/lib/send"; + description = '' + Directory for uploaded files. + Due to limitations in {option}`systemd.services.send.serviceConfig.DynamicUser`, this item is read only. + ''; + }; + + baseUrl = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Base URL for the Send service. + Leave it blank to automatically detect the base url. + ''; + }; + + host = lib.mkOption { + type = types.str; + default = "127.0.0.1"; + description = "The hostname or IP address for Send to bind to."; + }; + + port = lib.mkOption { + type = types.port; + default = 1443; + description = "Port the Send service listens on."; + }; + + openFirewall = lib.mkOption { + type = types.bool; + default = false; + description = "Whether to open firewall ports for send"; + }; + + redis = { + createLocally = lib.mkOption { + type = types.bool; + default = true; + description = "Whether to create a local redis automatically."; + }; + + name = lib.mkOption { + type = types.str; + default = "send"; + description = '' + Name of the redis server. + Only used if {option}`services.send.redis.createLocally` is set to true. + ''; + }; + + host = lib.mkOption { + type = types.str; + default = "localhost"; + description = "Redis server address."; + }; + + port = lib.mkOption { + type = types.port; + default = 6379; + description = "Port of the redis server."; + }; + + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/agenix/send-redis-password"; + description = '' + The path to the file containing the Redis password. + + If {option}`services.send.redis.createLocally` is set to true, + the content of this file will be used as the password for the locally created Redis instance. + + Leave it blank if no password is required. + ''; + }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + + services.send.environment.DETECT_BASE_URL = cfg.baseUrl == null; + + assertions = [ + { + assertion = cfg.redis.createLocally -> 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/third_party/nixpkgs/nixos/modules/system/activation/switchable-system.nix b/third_party/nixpkgs/nixos/modules/system/activation/switchable-system.nix index 883584a32c..d1326a18e5 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/switchable-system.nix +++ b/third_party/nixpkgs/nixos/modules/system/activation/switchable-system.nix @@ -1,13 +1,19 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let - - perlWrapped = pkgs.perl.withPackages (p: with p; [ ConfigIniFiles FileSlurp ]); - + perlWrapped = pkgs.perl.withPackages ( + p: with p; [ + ConfigIniFiles + FileSlurp + ] + ); in - { - options.system.switch = { enable = lib.mkOption { type = lib.types.bool; @@ -36,6 +42,17 @@ in config = lib.mkMerge [ (lib.mkIf (config.system.switch.enable && !config.system.switch.enableNg) { + warnings = [ + '' + The Perl implementation of switch-to-configuration will be deprecated + and removed in the 25.05 release of NixOS. Please migrate to the + newer implementation by removing `system.switch.enableNg = false` + from your configuration. If you are unable to migrate due to any + issues with the new implementation, please create an issue and tag + the maintainers of `switch-to-configuration-ng`. + '' + ]; + system.activatableSystemBuilderCommands = '' mkdir $out/bin substitute ${./switch-to-configuration.pl} $out/bin/switch-to-configuration \ diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix index 6c70f50a60..6173fca20d 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/virtualisation/azure-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/azure-image.nix index ecb57483cc..76d8a3bb36 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/azure-image.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/virtualisation/digital-ocean-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/digital-ocean-image.nix index 53791e9114..b6ef01516e 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/digital-ocean-image.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/virtualisation/disk-size-option.nix b/third_party/nixpkgs/nixos/modules/virtualisation/disk-size-option.nix new file mode 100644 index 0000000000..487c3adfe2 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/virtualisation/google-compute-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/google-compute-image.nix index 8e7b31b439..c2529bb3db 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/google-compute-image.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/virtualisation/hyperv-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/hyperv-image.nix index eb1bbe9f3a..ea0603fa6a 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/hyperv-image.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/virtualisation/linode-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/linode-image.nix index 51f793ac01..ff61c5f5d1 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/linode-image.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/virtualisation/oci-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/oci-image.nix index 1e2b90bfd4..fe286853de 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/oci-image.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/virtualisation/oci-options.nix b/third_party/nixpkgs/nixos/modules/virtualisation/oci-options.nix index 76f3475a42..b8d66c0290 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/oci-options.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/virtualisation/proxmox-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/proxmox-image.nix index d390c78432..9bbe7a596f 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/proxmox-image.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix index c6084e5590..af2f13b003 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix index 4ab5d17ecd..22646011d3 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/release.nix b/third_party/nixpkgs/nixos/release.nix index 8a8c45f8f8..797a07ec57 100644 --- a/third_party/nixpkgs/nixos/release.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index fb85df8808..8b674bfb73 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -440,6 +440,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 +659,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 {}; @@ -699,8 +702,8 @@ in { nixops = handleTest ./nixops/default.nix {}; nixos-generate-config = handleTest ./nixos-generate-config.nix {}; nixos-rebuild-install-bootloader = handleTestOn ["x86_64-linux"] ./nixos-rebuild-install-bootloader.nix {}; - nixos-rebuild-specialisations = handleTestOn ["x86_64-linux"] ./nixos-rebuild-specialisations.nix {}; - nixos-rebuild-target-host = handleTest ./nixos-rebuild-target-host.nix {}; + nixos-rebuild-specialisations = runTestOn ["x86_64-linux"] ./nixos-rebuild-specialisations.nix; + nixos-rebuild-target-host = runTest ./nixos-rebuild-target-host.nix; nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; }; nixseparatedebuginfod = handleTest ./nixseparatedebuginfod.nix {}; node-red = handleTest ./node-red.nix {}; @@ -715,6 +718,7 @@ in { nsd = handleTest ./nsd.nix {}; ntfy-sh = handleTest ./ntfy-sh.nix {}; ntfy-sh-migration = handleTest ./ntfy-sh-migration.nix {}; + ntpd = handleTest ./ntpd.nix {}; ntpd-rs = handleTest ./ntpd-rs.nix {}; nvidia-container-toolkit = runTest ./nvidia-container-toolkit.nix; nvmetcfg = handleTest ./nvmetcfg.nix {}; @@ -824,8 +828,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 {}; @@ -845,8 +851,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 {}; @@ -900,6 +906,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/third_party/nixpkgs/nixos/tests/amazon-init-shell.nix b/third_party/nixpkgs/nixos/tests/amazon-init-shell.nix index 3c040841b6..da4480ed57 100644 --- a/third_party/nixpkgs/nixos/tests/amazon-init-shell.nix +++ b/third_party/nixpkgs/nixos/tests/amazon-init-shell.nix @@ -18,16 +18,21 @@ makeTest { meta = with maintainers; { maintainers = [ urbas ]; }; - nodes.machine = { ... }: + nodes.machine = { lib, pkgs, ... }: { imports = [ ../modules/profiles/headless.nix ../modules/virtualisation/amazon-init.nix ]; services.openssh.enable = true; + system.switch.enable = true; networking.hostName = ""; environment.etc."ec2-metadata/user-data" = { text = '' #!/usr/bin/bash echo successful > /tmp/evidence + + # Emulate running nixos-rebuild switch, just without any building. + # https://github.com/nixos/nixpkgs/blob/4c62505847d88f16df11eff3c81bf9a453a4979e/nixos/modules/virtualisation/amazon-init.nix#L55 + /run/current-system/bin/switch-to-configuration test ''; }; }; diff --git a/third_party/nixpkgs/nixos/tests/avahi.nix b/third_party/nixpkgs/nixos/tests/avahi.nix index 4ae2f919f2..7a2d4bbd0f 100644 --- a/third_party/nixpkgs/nixos/tests/avahi.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/coturn.nix b/third_party/nixpkgs/nixos/tests/coturn.nix index b44bf8d06e..b3c96dba35 100644 --- a/third_party/nixpkgs/nixos/tests/coturn.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/freetube.nix b/third_party/nixpkgs/nixos/tests/freetube.nix index 4b5b2ed343..c886f1ee11 100644 --- a/third_party/nixpkgs/nixos/tests/freetube.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/mollysocket.nix b/third_party/nixpkgs/nixos/tests/mollysocket.nix index 8cbd0c0272..5135d79fcb 100644 --- a/third_party/nixpkgs/nixos/tests/mollysocket.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/nixos-rebuild-specialisations.nix b/third_party/nixpkgs/nixos/tests/nixos-rebuild-specialisations.nix index ab67bbaba6..f12d0fc48c 100644 --- a/third_party/nixpkgs/nixos/tests/nixos-rebuild-specialisations.nix +++ b/third_party/nixpkgs/nixos/tests/nixos-rebuild-specialisations.nix @@ -1,6 +1,10 @@ -import ./make-test-python.nix ({ pkgs, ... }: { +{ hostPkgs, ... }: { name = "nixos-rebuild-specialisations"; + # TODO: remove overlay from nixos/modules/profiles/installation-device.nix + # make it a _small package instead, then remove pkgsReadOnly = false;. + node.pkgsReadOnly = false; + nodes = { machine = { lib, pkgs, ... }: { imports = [ @@ -32,7 +36,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { testScript = let - configFile = pkgs.writeText "configuration.nix" '' + configFile = hostPkgs.writeText "configuration.nix" '' { lib, pkgs, ... }: { imports = [ ./hardware-configuration.nix @@ -119,4 +123,4 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.fail("nixos-rebuild boot --specialisation foo") machine.fail("nixos-rebuild boot -c foo") ''; -}) +} diff --git a/third_party/nixpkgs/nixos/tests/nixos-rebuild-target-host.nix b/third_party/nixpkgs/nixos/tests/nixos-rebuild-target-host.nix index 4a210f94fd..0e4c3e5f39 100644 --- a/third_party/nixpkgs/nixos/tests/nixos-rebuild-target-host.nix +++ b/third_party/nixpkgs/nixos/tests/nixos-rebuild-target-host.nix @@ -1,8 +1,12 @@ -import ./make-test-python.nix ({ pkgs, ... }: { +{ hostPkgs, ... }: { name = "nixos-rebuild-target-host"; + # TODO: remove overlay from nixos/modules/profiles/installation-device.nix + # make it a _small package instead, then remove pkgsReadOnly = false;. + node.pkgsReadOnly = false; + nodes = { - deployer = { lib, ... }: let + deployer = { lib, pkgs, ... }: let inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; in { imports = [ ../modules/profiles/installation-device.nix ]; @@ -24,7 +28,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { system.build.privateKey = snakeOilPrivateKey; system.build.publicKey = snakeOilPublicKey; - # needed to provide STC implementation for target + # We don't switch on `deployer`, but we need it to have the dependencies + # available, to be picked up by system.includeBuildDependencies above. system.switch.enable = true; }; @@ -57,6 +62,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { system.build = { inherit targetConfig; }; + system.switch.enable = true; networking.hostName = "target"; } @@ -71,13 +77,13 @@ import ./make-test-python.nix ({ pkgs, ... }: { StrictHostKeyChecking=no ''; - targetConfigJSON = pkgs.writeText "target-configuration.json" + targetConfigJSON = hostPkgs.writeText "target-configuration.json" (builtins.toJSON nodes.target.system.build.targetConfig); - targetNetworkJSON = pkgs.writeText "target-network.json" + targetNetworkJSON = hostPkgs.writeText "target-network.json" (builtins.toJSON nodes.target.system.build.networkConfig); - configFile = hostname: pkgs.writeText "configuration.nix" '' + configFile = hostname: hostPkgs.writeText "configuration.nix" '' { lib, modulesPath, ... }: { imports = [ (modulesPath + "/virtualisation/qemu-vm.nix") @@ -140,4 +146,4 @@ import ./make-test-python.nix ({ pkgs, ... }: { deployer.succeed(f"mkdir -p {tmp_dir}") deployer.succeed(f"TMPDIR={tmp_dir} nixos-rebuild switch -I nixos-config=/root/configuration-1.nix --target-host root@target &>/dev/console") ''; -}) +} diff --git a/third_party/nixpkgs/nixos/tests/ntpd.nix b/third_party/nixpkgs/nixos/tests/ntpd.nix new file mode 100644 index 0000000000..1864044b64 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/ntpd.nix @@ -0,0 +1,25 @@ +import ./make-test-python.nix ( + { lib, ... }: + { + name = "ntpd"; + + meta = { + maintainers = with lib.maintainers; [ pyrox0 ]; + }; + + nodes.machine = { + services.ntp = { + enable = true; + }; + }; + + testScript = '' + start_all() + + machine.wait_for_unit('ntpd.service') + machine.wait_for_console_text('Listen normally on 10 eth*') + machine.succeed('systemctl is-active ntpd.service') + machine.succeed('ntpq -p') + ''; + } +) diff --git a/third_party/nixpkgs/nixos/tests/printing.nix b/third_party/nixpkgs/nixos/tests/printing.nix index b413996c67..5f719a5d97 100644 --- a/third_party/nixpkgs/nixos/tests/printing.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/qgis.nix b/third_party/nixpkgs/nixos/tests/qgis.nix index 7706b8c077..e8149e4885 100644 --- a/third_party/nixpkgs/nixos/tests/qgis.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/send.nix b/third_party/nixpkgs/nixos/tests/send.nix new file mode 100644 index 0000000000..b02f083fef --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/systemd.nix b/third_party/nixpkgs/nixos/tests/systemd.nix index 0742af6aa8..63c52227e7 100644 --- a/third_party/nixpkgs/nixos/tests/systemd.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/web-apps/netbox-upgrade.nix b/third_party/nixpkgs/nixos/tests/web-apps/netbox-upgrade.nix index 4c554e7ae6..b43313bc8a 100644 --- a/third_party/nixpkgs/nixos/tests/web-apps/netbox-upgrade.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/web-apps/netbox.nix b/third_party/nixpkgs/nixos/tests/web-apps/netbox.nix index 233f16a8fe..2fdd70cfb1 100644 --- a/third_party/nixpkgs/nixos/tests/web-apps/netbox.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/README.md b/third_party/nixpkgs/pkgs/README.md index 052120faa0..f907d79ef3 100644 --- a/third_party/nixpkgs/pkgs/README.md +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index 841570a619..0ab023e230 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/cava/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cava/default.nix deleted file mode 100644 index ed15a6df88..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/cava/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, autoconf-archive -, alsa-lib -, fftw -, iniparser -, libpulseaudio -, pipewire -, ncurses -, pkgconf -, SDL2 -, libGL -, withSDL2 ? false -, withPipewire ? true -}: - -stdenv.mkDerivation rec { - pname = "cava"; - version = "0.10.2"; - - src = fetchFromGitHub { - owner = "karlstav"; - repo = "cava"; - rev = version; - hash = "sha256-y6RslsU/zmr0Ai/rnr73N3OtjuBcWa3JCwh9P5GkNss="; - }; - - buildInputs = [ - alsa-lib - fftw - libpulseaudio - ncurses - iniparser - ] ++ lib.optionals withSDL2 [ - SDL2 - libGL - ] ++ lib.optionals withPipewire [ - pipewire - ]; - - nativeBuildInputs = [ - autoreconfHook - autoconf-archive - pkgconf - ]; - - preAutoreconf = '' - echo ${version} > version - ''; - - meta = with lib; { - description = "Console-based Audio Visualizer for Alsa"; - homepage = "https://github.com/karlstav/cava"; - license = licenses.mit; - maintainers = with maintainers; [ offline mirrexagon ]; - platforms = platforms.linux; - mainProgram = "cava"; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/geonkick/default.nix b/third_party/nixpkgs/pkgs/applications/audio/geonkick/default.nix index da22ade386..c3c1fbcc47 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/geonkick/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/jalv/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jalv/default.nix deleted file mode 100644 index b17460e4e2..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/jalv/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkg-config, python3 -, serd, sord , sratom, suil, wafHook }: - -stdenv.mkDerivation rec { - pname = "jalv"; - version = "1.6.6"; - - src = fetchurl { - url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ktFBeBtmQ3MgfDQ868XpuM7UYfryb9zLld8AB7BjnhY="; - }; - - nativeBuildInputs = [ pkg-config wafHook ]; - buildInputs = [ - gtk2 libjack2 lilv lv2 python3 serd sord sratom suil - ]; - - meta = with lib; { - description = "Simple but fully featured LV2 host for Jack"; - homepage = "http://drobilla.net/software/jalv"; - license = licenses.isc; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/minidsp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/minidsp/default.nix index 6691d3e950..f6affaeefc 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/minidsp/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/psst/Cargo.lock b/third_party/nixpkgs/pkgs/applications/audio/psst/Cargo.lock index a88b05440e..6ef92630ca 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/psst/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/audio/psst/Cargo.lock @@ -2,12 +2,27 @@ # 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 = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "aes" version = "0.8.4" @@ -36,12 +51,13 @@ checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" [[package]] name = "alsa" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce" +checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43" dependencies = [ "alsa-sys", "bitflags 2.6.0", + "cfg-if", "libc", ] @@ -72,9 +88,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", @@ -87,33 +103,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", @@ -139,14 +155,14 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[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 = "associative-cache" @@ -178,13 +194,13 @@ 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", + "fastrand 2.1.1", "futures-lite 2.3.0", "slab", ] @@ -217,15 +233,15 @@ dependencies = [ "polling 2.8.0", "rustix 0.37.27", "slab", - "socket2", + "socket2 0.4.10", "waker-fn", ] [[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 3.4.0", "cfg-if", @@ -233,11 +249,11 @@ dependencies = [ "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.2", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.35", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -273,7 +289,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.34", + "rustix 0.38.35", "windows-sys 0.48.0", ] @@ -285,25 +301,25 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[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-io 2.3.4", "async-lock 3.4.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.34", + "rustix 0.38.35", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -314,13 +330,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[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", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -396,6 +412,33 @@ dependencies = [ "arrayvec", ] +[[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 0.7.4", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + [[package]] name = "base64" version = "0.22.1" @@ -419,7 +462,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -451,9 +494,9 @@ dependencies = [ [[package]] name = "bitstream-io" -version = "2.4.2" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "415f8399438eb5e4b2f73ed3152a3448b98149dda642a957ee704e1daa5cf1d8" +checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452" [[package]] name = "block" @@ -494,9 +537,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", @@ -505,9 +548,9 @@ dependencies = [ [[package]] name = "built" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6a6c0b39c38fd754ac338b00a88066436389c0f029da5d37d1e01091d9b7c17" +checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" [[package]] name = "bumpalo" @@ -517,9 +560,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.1" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" [[package]] name = "byteorder" @@ -535,9 +578,9 @@ 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 = "cairo-rs" @@ -566,13 +609,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.104" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -616,8 +659,9 @@ dependencies = [ "iana-time-zone", "js-sys", "num-traits", + "serde", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -643,9 +687,9 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.50" +version = "0.1.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" dependencies = [ "cc", ] @@ -688,9 +732,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[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 = "combine" @@ -733,9 +777,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" @@ -818,9 +862,9 @@ 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", ] @@ -1001,7 +1045,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -1083,9 +1127,9 @@ dependencies = [ [[package]] name = "dwrote" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" +checksum = "2da3498378ed373237bdef1eddcc64e7be2d3ba4841f4c22a998e81cadeea83c" dependencies = [ "lazy_static", "libc", @@ -1126,14 +1170,14 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[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", @@ -1141,9 +1185,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -1216,7 +1260,7 @@ dependencies = [ "flume", "half", "lebe", - "miniz_oxide", + "miniz_oxide 0.7.4", "rayon-core", "smallvec", "zune-inflate", @@ -1239,9 +1283,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 = "fdeflate" @@ -1264,12 +1308,12 @@ dependencies = [ [[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]] @@ -1351,6 +1395,16 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + [[package]] name = "futures-channel" version = "0.3.30" @@ -1404,7 +1458,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", @@ -1419,7 +1473,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -1527,8 +1581,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -1541,6 +1597,12 @@ dependencies = [ "weezl", ] +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + [[package]] name = "gio" version = "0.16.7" @@ -1591,28 +1653,28 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] name = "gix-actor" -version = "0.31.3" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f52455500a0fac1fd62a1cf42d9121cfddef8cb3ded2f9e7adb5775deb1fc9" +checksum = "fc19e312cd45c4a66cd003f909163dc2f8e1623e30a0c0c6df3776e89b308665" dependencies = [ "bstr", "gix-date", "gix-utils", "itoa", "thiserror", - "winnow 0.6.13", + "winnow 0.6.18", ] [[package]] name = "gix-config" -version = "0.37.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fafe42957e11d98e354a66b6bd70aeea00faf2f62dd11164188224a507c840" +checksum = "78e797487e6ca3552491de1131b4f72202f282fb33f198b1c34406d765b42bb0" dependencies = [ "bstr", "gix-config-value", @@ -1626,14 +1688,14 @@ dependencies = [ "smallvec", "thiserror", "unicode-bom", - "winnow 0.6.13", + "winnow 0.6.18", ] [[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.6.0", "bstr", @@ -1644,14 +1706,14 @@ dependencies = [ [[package]] name = "gix-date" -version = "0.8.7" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eed6931f21491ee0aeb922751bd7ec97b4b2fe8fbfedcb678e2a2dce5f3b8c0" +checksum = "35c84b7af01e68daf7a6bb8bb909c1ff5edb3ce4326f1f43063a5a96d3c3c8a5" dependencies = [ "bstr", "itoa", + "jiff", "thiserror", - "time", ] [[package]] @@ -1671,20 +1733,20 @@ dependencies = [ [[package]] name = "gix-fs" -version = "0.11.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3338ff92a2164f5209f185ec0cd316f571a72676bb01d27e22f2867ba69f77a" +checksum = "f2bfe6249cfea6d0c0e0990d5226a4cb36f030444ba9e35e0639275db8f98575" dependencies = [ - "fastrand 2.1.0", + "fastrand 2.1.1", "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.6.0", "bstr", @@ -1715,9 +1777,9 @@ dependencies = [ [[package]] name = "gix-object" -version = "0.42.2" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe2dc4a41191c680c942e6ebd630c8107005983c4679214fdb1007dcf5ae1df" +checksum = "2f5b801834f1de7640731820c2df6ba88d95480dc4ab166a5882f8ff12b88efa" dependencies = [ "bstr", "gix-actor", @@ -1729,14 +1791,14 @@ dependencies = [ "itoa", "smallvec", "thiserror", - "winnow 0.6.13", + "winnow 0.6.18", ] [[package]] name = "gix-path" -version = "0.10.8" +version = "0.10.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca987128ffb056d732bd545db5db3d8b103d252fbf083c2567bb0796876619a4" +checksum = "38d5b8722112fa2fa87135298780bc833b0e9f6c56cc82795d209804b3a03484" dependencies = [ "bstr", "gix-trace", @@ -1747,12 +1809,11 @@ dependencies = [ [[package]] name = "gix-ref" -version = "0.44.1" +version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3394a2997e5bc6b22ebc1e1a87b41eeefbcfcff3dbfa7c4bd73cb0ac8f1f3e2e" +checksum = "ae0d8406ebf9aaa91f55a57f053c5a1ad1a39f60fdf0303142b7be7ea44311e5" dependencies = [ "gix-actor", - "gix-date", "gix-features", "gix-fs", "gix-hash", @@ -1764,14 +1825,14 @@ dependencies = [ "gix-validate", "memmap2", "thiserror", - "winnow 0.6.13", + "winnow 0.6.18", ] [[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.6.0", "gix-path", @@ -1781,9 +1842,9 @@ dependencies = [ [[package]] name = "gix-tempfile" -version = "14.0.0" +version = "14.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b0e276cd08eb2a22e9f286a4f13a222a01be2defafa8621367515375644b99" +checksum = "046b4927969fa816a150a0cda2e62c80016fe11fb3c3184e4dddf4e542f108aa" dependencies = [ "gix-fs", "libc", @@ -1804,15 +1865,15 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35192df7fd0fa112263bad8021e2df7167df4cc2a6e6d15892e1e55621d3d4dc" dependencies = [ - "fastrand 2.1.0", + "fastrand 2.1.1", "unicode-normalization", ] [[package]] name = "gix-validate" -version = "0.8.5" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c27dd34a49b1addf193c92070bcbf3beaf6e10f16a78544de6372e146a0acf" +checksum = "81f2badbb64e57b404593ee26b752c26991910fd0d81fe6f9a71c1a8309b6c86" dependencies = [ "bstr", "thiserror", @@ -1937,6 +1998,25 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "half" version = "2.4.1" @@ -2010,12 +2090,98 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "html5ever" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +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 = "humantime" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +[[package]] +name = "hyper" +version = "0.14.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http", + "hyper", + "rustls 0.21.12", + "tokio", + "tokio-rustls", +] + [[package]] name = "iana-time-zone" version = "0.1.60" @@ -2080,12 +2246,12 @@ dependencies = [ [[package]] name = "image" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "color_quant", "exr", "gif", @@ -2103,12 +2269,12 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" dependencies = [ "byteorder-lite", - "thiserror", + "quick-error", ] [[package]] @@ -2119,9 +2285,9 @@ checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" [[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", @@ -2156,7 +2322,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -2189,6 +2355,12 @@ dependencies = [ "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" @@ -2210,9 +2382,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 = "itertools" @@ -2238,6 +2410,31 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +[[package]] +name = "jiff" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "437651126da47900d4d70255ab15f5c69510ca4e0d88c9f01b5b8d41a45c3a9b" +dependencies = [ + "jiff-tzdb-platform", + "windows-sys 0.59.0", +] + +[[package]] +name = "jiff-tzdb" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05fac328b3df1c0f18a3c2ab6cb7e06e4e549f366017d796e3e66b6d6889abe6" + +[[package]] +name = "jiff-tzdb-platform" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8da387d5feaf355954c2c122c194d6df9c57d865125a67984bb453db5336940" +dependencies = [ + "jiff-tzdb", +] + [[package]] name = "jni" version = "0.21.1" @@ -2262,9 +2459,9 @@ 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", ] @@ -2277,9 +2474,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[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", ] @@ -2323,9 +2520,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[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 = "libdbus-sys" @@ -2349,12 +2546,12 @@ dependencies = [ [[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]] @@ -2428,6 +2625,12 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + [[package]] name = "mach" version = "0.3.2" @@ -2455,6 +2658,32 @@ dependencies = [ "libc", ] +[[package]] +name = "markup5ever" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45" +dependencies = [ + "log", + "phf", + "phf_codegen", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "markup5ever_rcdom" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edaa21ab3701bfee5099ade5f7e1f84553fd19228cf332f13cd6e964bf59be18" +dependencies = [ + "html5ever", + "markup5ever", + "tendril", + "xml5ever", +] + [[package]] name = "matches" version = "0.1.10" @@ -2468,7 +2697,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" dependencies = [ "cfg-if", - "rayon", ] [[package]] @@ -2504,6 +2732,12 @@ dependencies = [ "autocfg", ] +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -2520,6 +2754,27 @@ dependencies = [ "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 = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + [[package]] name = "ndk" version = "0.8.0" @@ -2618,7 +2873,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -2662,32 +2917,43 @@ 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 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] -name = "num_threads" -version = "0.1.7" +name = "oauth2" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +checksum = "c38841cdd844847e3e7c8d29cef9dcfed8877f8f56f9071f77843ecf3baf937f" dependencies = [ - "libc", + "base64 0.13.1", + "chrono", + "getrandom", + "http", + "rand", + "reqwest", + "serde", + "serde_json", + "serde_path_to_error", + "sha2", + "thiserror", + "url", ] [[package]] @@ -2733,6 +2999,15 @@ dependencies = [ "objc2", ] +[[package]] +name = "object" +version = "0.36.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +dependencies = [ + "memchr", +] + [[package]] name = "oboe" version = "0.6.1" @@ -2764,9 +3039,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2c909a3fce3bd80efef4cd1c6c056bd9376a8fe06fcfdbebaf32cb485a7e37" +checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3" dependencies = [ "is-wsl", "libc", @@ -2868,7 +3143,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2889,6 +3164,63 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand", +] + +[[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", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + [[package]] name = "piet" version = "0.6.2" @@ -2990,12 +3322,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 2.1.1", "futures-io", ] @@ -3024,7 +3356,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] @@ -3045,17 +3377,17 @@ 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", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.34", + "rustix 0.38.35", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3072,9 +3404,18 @@ 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" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "proc-macro-crate" @@ -3088,11 +3429,11 @@ dependencies = [ [[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 0.22.20", ] [[package]] @@ -3150,7 +3491,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -3181,6 +3522,7 @@ dependencies = [ "log", "num-bigint", "num-traits", + "oauth2", "once_cell", "parking_lot", "psst-protocol", @@ -3197,7 +3539,7 @@ dependencies = [ "tempfile", "ureq", "url", - "windows 0.57.0", + "windows 0.58.0", ] [[package]] @@ -3210,7 +3552,7 @@ dependencies = [ "druid-shell", "env_logger", "fs_extra", - "image 0.25.1", + "image 0.25.2", "itertools 0.13.0", "log", "lru-cache", @@ -3222,6 +3564,7 @@ dependencies = [ "rand", "raw-window-handle", "regex", + "sanitize_html", "serde", "serde_json", "souvlaki", @@ -3267,9 +3610,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", ] @@ -3356,16 +3699,15 @@ dependencies = [ [[package]] name = "ravif" -version = "0.11.7" +version = "0.11.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67376f469e7e7840d0040bbf4b9b3334005bb167f814621326e4c7ab8cd6e944" +checksum = "a8f0bfd976333248de2078d350bfdf182ff96e168a24d23d2436cef320dd4bdd" dependencies = [ "avif-serialize", "imgref", "loop9", "quick-error", "rav1e", - "rayon", "rgb", ] @@ -3403,18 +3745,18 @@ checksum = "56cf8381505b60ae18a4097f1d0be093287ca3bf4fbb23d36ac5ad3bba335daa" [[package]] name = "redox_syscall" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ "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", @@ -3423,9 +3765,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", @@ -3451,10 +3793,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] -name = "rgb" -version = "0.8.40" +name = "reqwest" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7439be6844e40133eda024efd85bf07f59d0dd2f59b10c00dd6cfb92cc5c741" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.21.12", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-rustls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots 0.25.4", + "winreg", +] + +[[package]] +name = "rgb" +version = "0.8.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] @@ -3474,6 +3857,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[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" @@ -3482,9 +3871,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", ] @@ -3505,9 +3894,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" dependencies = [ "bitflags 2.6.0", "errno", @@ -3518,29 +3907,61 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring", + "rustls-webpki 0.101.7", + "sct", +] + +[[package]] +name = "rustls" +version = "0.23.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +dependencies = [ + "log", + "once_cell", + "ring", "rustls-pki-types", - "rustls-webpki", + "rustls-webpki 0.102.7", "subtle", "zeroize", ] [[package]] -name = "rustls-pki-types" -version = "1.7.0" +name = "rustls-pemfile" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[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.4" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" dependencies = [ "ring", "rustls-pki-types", @@ -3562,12 +3983,34 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "sanitize_html" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4383365aa34a33238e8f6c7c1cd87be0ff89cebe6fce9476fc5f78fbf1c80bc0" +dependencies = [ + "html5ever", + "lazy_static", + "markup5ever_rcdom", + "regex", +] + [[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "self_cell" version = "0.10.3" @@ -3591,35 +4034,46 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] +[[package]] +name = "serde_path_to_error" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" +dependencies = [ + "itoa", + "serde", +] + [[package]] name = "serde_repr" version = "0.1.19" @@ -3628,18 +4082,30 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[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", ] +[[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 = "sha-1" version = "0.10.1" @@ -3664,9 +4130,20 @@ 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" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] [[package]] name = "shannon" @@ -3716,6 +4193,12 @@ dependencies = [ "quote", ] +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + [[package]] name = "sized-chunks" version = "0.6.5" @@ -3751,6 +4234,16 @@ dependencies = [ "winapi", ] +[[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 = "socks" version = "0.3.4" @@ -3795,6 +4288,32 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", +] + [[package]] name = "subtle" version = "2.6.1" @@ -3898,15 +4417,42 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.68" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[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]] name = "system-deps" version = "6.2.2" @@ -3916,46 +4462,58 @@ dependencies = [ "cfg-expr", "heck 0.5.0", "pkg-config", - "toml 0.8.14", + "toml 0.8.19", "version-compare", ] [[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.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 2.1.1", + "once_cell", + "rustix 0.38.35", + "windows-sys 0.59.0", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", ] [[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.77", ] [[package]] @@ -3996,9 +4554,7 @@ checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", - "libc", "num-conv", - "num_threads", "powerfmt", "serde", "time-core", @@ -4038,9 +4594,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", ] @@ -4051,6 +4607,44 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +[[package]] +name = "tokio" +version = "1.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "socket2 0.5.7", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.12", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + [[package]] name = "toml" version = "0.5.11" @@ -4062,21 +4656,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.14" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.14", + "toml_edit 0.22.20", ] [[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" dependencies = [ "serde", ] @@ -4094,28 +4688,23 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.20" 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" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.13", + "winnow 0.6.18", ] +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + [[package]] name = "tracing" version = "0.1.40" @@ -4135,7 +4724,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -4170,6 +4759,12 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + [[package]] name = "type-map" version = "0.5.0" @@ -4306,22 +4901,21 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.7" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" dependencies = [ - "base64", + "base64 0.22.1", "flate2", "log", "once_cell", - "rustls", + "rustls 0.23.12", "rustls-pki-types", - "rustls-webpki", "serde", "serde_json", "socks", "url", - "webpki-roots", + "webpki-roots 0.26.5", ] [[package]] @@ -4333,8 +4927,15 @@ dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + [[package]] name = "utf16_lit" version = "2.0.2" @@ -4366,9 +4967,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 = "waker-fn" @@ -4386,6 +4987,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -4394,34 +5004,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.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", @@ -4431,9 +5042,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", @@ -4441,28 +5052,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.68", + "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", @@ -4488,9 +5099,15 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + +[[package]] +name = "webpki-roots" +version = "0.26.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" dependencies = [ "rustls-pki-types", ] @@ -4519,11 +5136,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]] @@ -4548,17 +5165,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" dependencies = [ "windows-core 0.54.0", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] name = "windows" -version = "0.57.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" dependencies = [ - "windows-core 0.57.0", - "windows-targets 0.52.5", + "windows-core 0.58.0", + "windows-targets 0.52.6", ] [[package]] @@ -4567,7 +5184,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]] @@ -4576,42 +5193,43 @@ version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" dependencies = [ - "windows-result", - "windows-targets 0.52.5", + "windows-result 0.1.2", + "windows-targets 0.52.6", ] [[package]] name = "windows-core" -version = "0.57.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" dependencies = [ "windows-implement", "windows-interface", - "windows-result", - "windows-targets 0.52.5", + "windows-result 0.2.0", + "windows-strings", + "windows-targets 0.52.6", ] [[package]] name = "windows-implement" -version = "0.57.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] name = "windows-interface" -version = "0.57.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.77", ] [[package]] @@ -4620,7 +5238,26 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result 0.2.0", + "windows-targets 0.52.6", ] [[package]] @@ -4647,7 +5284,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]] @@ -4682,18 +5328,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]] @@ -4710,9 +5356,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" @@ -4728,9 +5374,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" @@ -4746,15 +5392,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" @@ -4770,9 +5416,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" @@ -4788,9 +5434,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" @@ -4806,9 +5452,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" @@ -4824,9 +5470,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" @@ -4839,13 +5485,23 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.13" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" 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 = "winres" version = "0.1.12" @@ -4866,12 +5522,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]] @@ -4880,6 +5536,17 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" +[[package]] +name = "xml5ever" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bbb26405d8e919bc1547a5aa9abc95cbfa438f04844f5fdd9dc7596b748bf69" +dependencies = [ + "log", + "mac", + "markup5ever", +] + [[package]] name = "zbus" version = "3.15.2" @@ -4946,6 +5613,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.77", +] + [[package]] name = "zeroize" version = "1.8.1" @@ -4969,9 +5657,9 @@ dependencies = [ [[package]] name = "zune-jpeg" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" dependencies = [ "zune-core", ] diff --git a/third_party/nixpkgs/pkgs/applications/audio/psst/default.nix b/third_party/nixpkgs/pkgs/applications/audio/psst/default.nix index 6a6f7efd61..af5b7a51f9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/psst/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/psst/default.nix @@ -16,13 +16,13 @@ let in rustPlatform.buildRustPackage rec { pname = "psst"; - version = "unstable-2024-08-19"; + version = "unstable-2024-10-07"; src = fetchFromGitHub { owner = "jpochyla"; repo = pname; - rev = "11bef15e66a3c9b0b991207d09a67c071b3dda02"; - hash = "sha256-lKxWIUDouUUul7CpuTy30z/cLJAjFE9e0J1zyZ/PnIo="; + rev = "38d1c75d59848c54cb88896a93e05da3c71c7df4"; + hash = "sha256-iMtrZ1Mto3j4lFXI2Sm2R85+m8LpR7V1WoJ3X5JyF60="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/applications/audio/psst/make-build-reproducible.patch b/third_party/nixpkgs/pkgs/applications/audio/psst/make-build-reproducible.patch index 866d082175..edaf46af94 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/psst/make-build-reproducible.patch +++ b/third_party/nixpkgs/pkgs/applications/audio/psst/make-build-reproducible.patch @@ -1,9 +1,9 @@ diff --git a/psst-core/build.rs b/psst-core/build.rs deleted file mode 100644 -index e05191d..0000000 +index cac2c23..0000000 --- a/psst-core/build.rs +++ /dev/null -@@ -1,39 +0,0 @@ +@@ -1,41 +0,0 @@ -use std::{env, fs, io::Write}; - -fn main() { @@ -13,12 +13,14 @@ index e05191d..0000000 - let mut fh = fs::File::create(outfile).unwrap(); - write!(fh, r#""{}""#, chrono::Local::now()).ok(); - -- let git_config = gix_config::File::from_git_dir("../.git/".into()).expect("Git Config not found!"); +- let git_config = +- gix_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", Some("origin".as_ref()), "url") +- .raw_value("remote.origin.url") - .expect("Couldn't extract origin url!") - .to_string(); +- - // Check whether origin is accessed via ssh - if remote_url.contains('@') { - // If yes, strip the `git@` prefix and split the domain and path @@ -44,7 +46,7 @@ index e05191d..0000000 - write!(file, r#""{}""#, remote_url).ok(); -} diff --git a/psst-core/src/lib.rs b/psst-core/src/lib.rs -index fcbd491..8f6e6f0 100644 +index 2faa317..7d7501d 100644 --- a/psst-core/src/lib.rs +++ b/psst-core/src/lib.rs @@ -2,9 +2,9 @@ @@ -54,7 +56,7 @@ index fcbd491..8f6e6f0 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 = "11bef15e66a3c9b0b991207d09a67c071b3dda02"; ++pub const GIT_VERSION: &str = "38d1c75d59848c54cb88896a93e05da3c71c7df4"; +pub const BUILD_TIME: &str = "1970-01-01 00:00:00"; +pub const REMOTE_URL: &str = "https://github.com/jpochyla/psst"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/puredata/default.nix b/third_party/nixpkgs/pkgs/applications/audio/puredata/default.nix index 5d1b11c4ef..f4206cb0ea 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/puredata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/puredata/default.nix @@ -49,8 +49,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = ''A real-time graphical programming environment for - audio, video, and graphical processing''; + description = ''A real-time graphical programming environment for audio, video, and graphical processing''; homepage = "http://puredata.info"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; diff --git a/third_party/nixpkgs/pkgs/applications/audio/seq66/default.nix b/third_party/nixpkgs/pkgs/applications/audio/seq66/default.nix index 500e85d684..304cc77670 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/seq66/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/setbfree/default.nix b/third_party/nixpkgs/pkgs/applications/audio/setbfree/default.nix index 550c0e8d04..2284df444e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/setbfree/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/setbfree/default.nix @@ -36,10 +36,12 @@ stdenv.mkDerivation rec { doInstallCheck = true; - installCheckPhase = ''( - set -x - test -e $out/bin/setBfreeUI - )''; + installCheckPhase = '' + ( + set -x; + test -e $out/bin/setBfreeUI + ) + ''; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/audio/stochas/default.nix b/third_party/nixpkgs/pkgs/applications/audio/stochas/default.nix index 33d9b050a1..84297760b3 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/stochas/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix index 6ed103a4b2..23157cd248 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/blockchains/optimism/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/optimism/default.nix index 945ef865f9..73f26ee494 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/optimism/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/optimism/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "optimism"; - version = "1.9.1"; + version = "1.9.4"; src = fetchFromGitHub { owner = "ethereum-optimism"; repo = "optimism"; rev = "op-node/v${version}"; - hash = "sha256-PlwpN8P1t0NNIU+Ys50dIXmfUQFIY9e1tLABiVK0JQo="; + hash = "sha256-pAmstWA6up0CvHEQW5RnDYumdwKP0i6fpz59EYTBsmU="; fetchSubmodules = true; }; subPackages = [ "op-node/cmd" "op-proposer/cmd" "op-batcher/cmd" ]; - vendorHash = "sha256-n1uJ/dkEjjsTdmL7TeHU4PKnBhiRrqCNtcGxK70Q0c4="; + vendorHash = "sha256-Sr9OECXbRa4SPe3owMto2EbnAIygeIEmZv73hvA6iww="; buildInputs = [ libpcap diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock index 4616241a06..1c9bff41d0 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock @@ -788,7 +788,7 @@ dependencies = [ [[package]] name = "asset-hub-rococo-runtime" -version = "0.22.0" +version = "0.22.1" dependencies = [ "asset-test-utils", "assets-common", @@ -920,7 +920,7 @@ dependencies = [ [[package]] name = "asset-hub-westend-runtime" -version = "0.26.0" +version = "0.26.1" dependencies = [ "asset-test-utils", "assets-common", @@ -1752,7 +1752,7 @@ dependencies = [ [[package]] name = "bp-header-chain" -version = "0.18.0" +version = "0.18.1" dependencies = [ "bp-runtime", "bp-test-utils", @@ -2034,6 +2034,7 @@ dependencies = [ "staging-xcm", "staging-xcm-executor", "testnet-parachains-constants", + "xcm-runtime-apis", ] [[package]] @@ -2227,6 +2228,7 @@ dependencies = [ "staging-xcm", "staging-xcm-executor", "testnet-parachains-constants", + "xcm-runtime-apis", ] [[package]] @@ -3980,7 +3982,7 @@ dependencies = [ [[package]] name = "cumulus-client-service" -version = "0.18.0" +version = "0.19.0" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", @@ -4050,7 +4052,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-parachain-system" -version = "0.17.0" +version = "0.17.1" dependencies = [ "assert_matches", "bytes", @@ -4298,7 +4300,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-inprocess-interface" -version = "0.18.0" +version = "0.19.0" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -4344,7 +4346,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-minimal-node" -version = "0.18.0" +version = "0.19.0" dependencies = [ "array-bytes", "async-trait", @@ -5117,7 +5119,7 @@ dependencies = [ [[package]] name = "emulated-integration-tests-common" -version = "14.0.0" +version = "14.1.0" dependencies = [ "asset-test-utils", "bp-messages", @@ -8766,7 +8768,7 @@ dependencies = [ [[package]] name = "mmr-rpc" -version = "37.0.0" +version = "38.0.0" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -10844,7 +10846,7 @@ dependencies = [ [[package]] name = "pallet-message-queue" -version = "41.0.0" +version = "41.0.1" dependencies = [ "environmental", "frame-benchmarking", @@ -12035,7 +12037,7 @@ dependencies = [ [[package]] name = "pallet-xcm-bridge-hub-router" -version = "0.15.0" +version = "0.15.1" dependencies = [ "bp-xcm-bridge-hub-router", "frame-benchmarking", @@ -12869,7 +12871,7 @@ dependencies = [ [[package]] name = "polkadot" -version = "17.0.0" +version = "18.0.0" dependencies = [ "assert_cmd", "color-eyre", @@ -13021,7 +13023,7 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "18.0.0" +version = "19.0.0" dependencies = [ "cfg-if", "clap 4.5.11", @@ -13695,7 +13697,7 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "18.0.0" +version = "18.0.1" dependencies = [ "async-channel", "async-trait", @@ -13875,7 +13877,7 @@ dependencies = [ [[package]] name = "polkadot-parachain-bin" -version = "6.0.0" +version = "7.0.0" dependencies = [ "asset-hub-rococo-runtime", "asset-hub-westend-runtime", @@ -13913,7 +13915,7 @@ dependencies = [ [[package]] name = "polkadot-parachain-lib" -version = "0.2.0" +version = "0.3.0" dependencies = [ "assert_cmd", "async-trait", @@ -14037,7 +14039,7 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "18.0.0" +version = "19.0.0" dependencies = [ "jsonrpsee", "mmr-rpc", @@ -14137,7 +14139,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" -version = "17.0.0" +version = "17.0.1" dependencies = [ "assert_matches", "bitflags 1.3.2", @@ -14197,7 +14199,7 @@ dependencies = [ [[package]] name = "polkadot-sdk" -version = "0.6.0" +version = "0.7.0" dependencies = [ "asset-test-utils", "assets-common", @@ -14699,7 +14701,7 @@ dependencies = [ [[package]] name = "polkadot-service" -version = "18.0.0" +version = "19.0.0" dependencies = [ "assert_matches", "async-trait", @@ -17311,7 +17313,7 @@ dependencies = [ [[package]] name = "sc-client-db" -version = "0.44.0" +version = "0.44.1" dependencies = [ "array-bytes", "criterion", @@ -17856,7 +17858,7 @@ dependencies = [ [[package]] name = "sc-network" -version = "0.45.0" +version = "0.45.1" dependencies = [ "array-bytes", "assert_matches", @@ -17961,7 +17963,7 @@ dependencies = [ [[package]] name = "sc-network-light" -version = "0.44.0" +version = "0.44.1" dependencies = [ "array-bytes", "async-channel", @@ -18000,7 +18002,7 @@ dependencies = [ [[package]] name = "sc-network-sync" -version = "0.44.0" +version = "0.44.1" dependencies = [ "array-bytes", "async-channel", @@ -18072,7 +18074,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" -version = "0.44.0" +version = "0.44.1" dependencies = [ "array-bytes", "futures", @@ -20992,7 +20994,7 @@ dependencies = [ [[package]] name = "staging-xcm-builder" -version = "17.0.0" +version = "17.0.1" dependencies = [ "assert_matches", "frame-support", diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix index a7ebab1736..89cac46971 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix @@ -1,15 +1,16 @@ -{ fetchFromGitHub -, lib -, openssl -, pkg-config -, protobuf -, rocksdb_8_3 -, rust-jemalloc-sys-unprefixed -, rustPlatform -, rustc -, stdenv -, Security -, SystemConfiguration +{ + fetchFromGitHub, + lib, + openssl, + pkg-config, + protobuf, + rocksdb_8_3, + rust-jemalloc-sys-unprefixed, + rustPlatform, + rustc, + stdenv, + Security, + SystemConfiguration, }: let @@ -17,13 +18,13 @@ let in rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "stable2409"; + version = "stable2409-1"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot-sdk"; rev = "polkadot-${version}"; - hash = "sha256-QNjk2lb04VLYpwbE7hmUVaujijX9nkZxVdseTS1G85E="; + hash = "sha256-SbQaauElMNuCg0q6aN0ckg39huNZyiq8px9iXWFFtyc="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -53,7 +54,10 @@ rustPlatform.buildRustPackage rec { buildType = "production"; - cargoBuildFlags = [ "-p" "polkadot" ]; + cargoBuildFlags = [ + "-p" + "polkadot" + ]; # NOTE: tests currently fail to compile due to an issue with cargo-auditable # and resolution of features flags, potentially related to this: @@ -68,9 +72,13 @@ rustPlatform.buildRustPackage rec { ]; # NOTE: jemalloc is used by default on Linux with unprefixed enabled - buildInputs = [ openssl ] ++ - lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ] ++ - lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Security + SystemConfiguration + ]; # NOTE: disable building `core`/`std` in wasm environment since rust-src isn't # available for `rustc-wasm32` @@ -84,8 +92,15 @@ rustPlatform.buildRustPackage rec { description = "Polkadot Node Implementation"; homepage = "https://polkadot.network"; license = licenses.gpl3Only; - maintainers = with maintainers; [ akru andresilva FlorianFranzen RaghavSood ]; + maintainers = with maintainers; [ + akru + andresilva + FlorianFranzen + RaghavSood + ]; # See Iso::from_arch in src/isa/mod.rs in cranelift-codegen-meta. - platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.s390x ++ platforms.riscv64 ++ platforms.x86); + platforms = intersectLists platforms.unix ( + platforms.aarch64 ++ platforms.s390x ++ platforms.riscv64 ++ platforms.x86 + ); }; } diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/gtkgreet.nix b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/gtkgreet.nix index 10389c2627..652459e971 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/gtkgreet.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/display-managers/greetd/tuigreet.nix b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/tuigreet.nix index 11ca43c614..39e6d482f2 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/tuigreet.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix index b69423e583..7cb806b283 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/jetbrains/bin/versions.json b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/bin/versions.json index 4c89a63a41..c66396c986 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/bin/versions.json +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json index 6d13dfb586..1bdc7ff5e7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/leafpad/default.nix b/third_party/nixpkgs/pkgs/applications/editors/leafpad/default.nix deleted file mode 100644 index b5beb0d74d..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/libresprite/default.nix b/third_party/nixpkgs/pkgs/applications/editors/libresprite/default.nix index 5d4031b064..7bd09e5def 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/libresprite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/libresprite/default.nix @@ -99,8 +99,8 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://libresprite.github.io/"; description = "Animated sprite editor & pixel art tool, fork of Aseprite"; license = licenses.gpl2Only; - longDescription = - ''LibreSprite is a program to create animated sprites. Its main features are: + longDescription = '' + LibreSprite is a program to create animated sprites. Its main features are: - Sprites are composed by layers & frames (as separated concepts). - Supported color modes: RGBA, Indexed (palettes up to 256 colors), and Grayscale. diff --git a/third_party/nixpkgs/pkgs/applications/editors/qxw/default.nix b/third_party/nixpkgs/pkgs/applications/editors/qxw/default.nix deleted file mode 100644 index 53cdbcfc27..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/scite/default.nix b/third_party/nixpkgs/pkgs/applications/editors/scite/default.nix deleted file mode 100644 index 9c230a2984..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/scite/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2 }: - -stdenv.mkDerivation { - pname = "scite"; - version = "5.2.2"; - - src = fetchurl { - url = "https://www.scintilla.org/scite522.tgz"; - sha256 = "1q46clclx8r0b8zbq2zi89sygszgqf9ra5l83r2fs0ghvjgh2cxd"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 ]; - sourceRoot = "scintilla/gtk"; - - CXXFLAGS = [ - # GCC 13: error: 'intptr_t' does not name a type - "-include cstdint" - "-include system_error" - ]; - - buildPhase = '' - make - cd ../../lexilla/src - make - cd ../../scite/gtk - make prefix=$out/ - ''; - - installPhase = '' - make install prefix=$out/ - ''; - - meta = with lib; { - homepage = "https://www.scintilla.org/SciTE.html"; - description = "SCIntilla based Text Editor"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.rszibele ]; - mainProgram = "SciTE"; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/texmacs/common.nix b/third_party/nixpkgs/pkgs/applications/editors/texmacs/common.nix index 82dd13920b..06b7290c4b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/texmacs/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/texmacs/common.nix @@ -43,25 +43,25 @@ rec { meta = { description = "WYSIWYW editing platform with special features for scientists"; - longDescription = - '' GNU TeXmacs is a free wysiwyw (what you see is what you want) - editing platform with special features for scientists. The software - aims to provide a unified and user friendly framework for editing - structured documents with different types of content (text, - graphics, mathematics, interactive content, etc.). The rendering - engine uses high-quality typesetting algorithms so as to produce - professionally looking documents, which can either be printed out or - presented from a laptop. + longDescription = '' + GNU TeXmacs is a free wysiwyw (what you see is what you want) + editing platform with special features for scientists. The software + aims to provide a unified and user friendly framework for editing + structured documents with different types of content (text, + graphics, mathematics, interactive content, etc.). The rendering + engine uses high-quality typesetting algorithms so as to produce + professionally looking documents, which can either be printed out or + presented from a laptop. - The software includes a text editor with support for mathematical - formulas, a small technical picture editor and a tool for making - presentations from a laptop. Moreover, TeXmacs can be used as an - interface for many external systems for computer algebra, numerical - analysis, statistics, etc. New presentation styles can be written - by the user and new features can be added to the editor using the - Scheme extension language. A native spreadsheet and tools for - collaborative authoring are planned for later. - ''; + The software includes a text editor with support for mathematical + formulas, a small technical picture editor and a tool for making + presentations from a laptop. Moreover, TeXmacs can be used as an + interface for many external systems for computer algebra, numerical + analysis, statistics, etc. New presentation styles can be written + by the user and new features can be added to the editor using the + Scheme extension language. A native spreadsheet and tools for + collaborative authoring are planned for later. + ''; homepage = "http://texmacs.org/"; license = lib.licenses.gpl2Plus; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix b/third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix index 54f0f154ab..49c58a2f90 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/tijolo/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix b/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix index afa42fc767..dac1dbe0d0 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { bsd2 # libtiled and tmxviewer gpl2Plus # all the rest ]; - maintainers = with maintainers; [ dywedir ]; + maintainers = with maintainers; [ dywedir ryan4yin ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/blink-cmp/Cargo.lock b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/blink-cmp/Cargo.lock index 861af7fc8b..c11157761a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/blink-cmp/Cargo.lock +++ b/third_party/nixpkgs/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" @@ -125,22 +114,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 +182,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 +198,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 +213,51 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +[[package]] +name = "mlua" +version = "0.10.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7928e85ce39d4ea4d11dc850fde2acb503fc114a76f53e8606dd9ed237a491e9" +dependencies = [ + "bstr", + "mlua-sys", + "mlua_derive", + "num-traits", + "parking_lot", + "rustc-hash", +] + +[[package]] +name = "mlua-sys" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebe026d6bd1583a9cf9080e189030ddaea7e6f5f0deb366a8e26f8a26c4135b8" +dependencies = [ + "cc", + "cfg-if", + "pkg-config", +] + +[[package]] +name = "mlua_derive" +version = "0.10.0-rc.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e110f0addea6b8d2f2378717e94f63b36a74274760b4895943b3a5650fa7513e" +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 +275,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 +331,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 +346,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 +384,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 +422,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 +435,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 +485,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 +506,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 +567,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 +599,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/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix index ce685a0c4f..957a8ab96c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix @@ -6,12 +6,12 @@ vimUtils, }: let - version = "0.3.1"; + version = "0.4.1"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.cmp"; rev = "refs/tags/v${version}"; - hash = "sha256-bvhLOM0NMx5S069uX2OecEpzYaR3hV4r8nCIPD0f0XQ="; + hash = "sha256-jWRXrFh83lTRsgm0gSZuRORltqo147BAg1zVcd7rIMg="; }; 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/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/deprecated.json b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/deprecated.json index 05678e6136..3a50da1526 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix index c6a826f386..11f6cce9af 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix +++ b/third_party/nixpkgs/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-04"; + version = "2024-10-24"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "13a4a84e3485a36e64055365665a45dc82b6bf71"; - sha256 = "115z6yc6hn84z3p76p2lzgxw645jy0wab92l4sy3vy5j2ydpnqk4"; + 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-18"; + version = "2024-10-27"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "30eacb81f0202c0d5718fb27e3ec0b03945a03c7"; - sha256 = "0q75ql3fg84nb8vhfxgi1wpmpfz7yk0wqkiw3l7zf1j5xmqskl4y"; + rev = "e8835ae8e941e940ed3418c3a77976a2bacc52e4"; + sha256 = "1zkgx4xypp9wvrg8lsidpxfvl1fk2pdggr5dhghbg74n81vvkmbn"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -401,12 +413,12 @@ final: prev: SpaceVim = buildVimPlugin { pname = "SpaceVim"; - version = "2024-09-17"; + version = "2024-10-23"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "533c40395c2073340a613f9569b4d20ab84d498a"; - sha256 = "0750hgh193avdwlnm4k9sa2rg27vsirrn79dda48hbiss1x8sn69"; + rev = "24ca491c539f19fee4822abeb55a23d68aaf0621"; + sha256 = "1sa11vi0k3cjw4d8r1z9bxkj5s1i41fmjsvqi3ywnb4dqcnfi6x4"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -655,7 +667,7 @@ final: prev: align-nvim = buildVimPlugin { pname = "align.nvim"; - version = "2024-10-20"; + version = "2024-04-10"; src = fetchFromGitHub { owner = "Vonr"; repo = "align.nvim"; @@ -1352,12 +1364,12 @@ final: prev: bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "2024-07-18"; + version = "2024-10-24"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "0b2fd861eee7595015b6561dade52fb060be10c4"; - sha256 = "068gg98w88q0j3c1wrlggsp0986yppa8vlbnzy7wy4g7kn0aqfsn"; + 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/"; }; @@ -1616,12 +1628,12 @@ final: prev: cmake-tools-nvim = buildVimPlugin { pname = "cmake-tools.nvim"; - version = "2024-09-20"; + version = "2024-10-20"; src = fetchFromGitHub { owner = "Civitasv"; repo = "cmake-tools.nvim"; - rev = "f1f917b584127b673c25138233cebf1d61a19f35"; - sha256 = "1f7rg7ya307bpjnj7ymsj9q9m0pqhd3dql269hn1a3klpgh853f8"; + rev = "d8eb4372fff47028c36f6bec6a8318b166092ed0"; + sha256 = "13k9x6arank1760wmi9rz8rjcbc3qlalsb8krzn3xf1g34ikbq1l"; }; meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/"; }; @@ -1652,11 +1664,11 @@ final: prev: cmp-async-path = buildVimPlugin { pname = "cmp-async-path"; - version = "2024-10-11"; + version = "2024-10-21"; src = fetchgit { url = "https://codeberg.org/FelipeLema/cmp-async-path/"; - rev = "e3206e521ce89fe0e97cc8f14e4fc8c131f369e4"; - sha256 = "0r6kb1c25m4wwxdx1mxkakfl2qhmmfivvmxx1wp3c8f16rny5m6i"; + rev = "d6d1ffa2075039632a2d71e8fa139818e15ac757"; + sha256 = "1x10v0kd0i2pdxknzdn3zgqdn4hgbivgnczsj56wc32jzcs6k49i"; }; meta.homepage = "https://codeberg.org/FelipeLema/cmp-async-path/"; }; @@ -1867,12 +1879,12 @@ final: prev: cmp-git = buildVimPlugin { pname = "cmp-git"; - version = "2024-08-20"; + version = "2024-10-27"; src = fetchFromGitHub { owner = "petertriho"; repo = "cmp-git"; - rev = "50d526dff0f6bc441b51fc269d9fdc99a50c76af"; - sha256 = "084mka6ar0bz7sqd8iv9nhz1y552fab6imjxzb4ak3aagzlml5r7"; + 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-16"; + version = "2024-10-27"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "f5bd8419f8a29451e20bdb1061a54fe13d5c8de3"; - sha256 = "0s8q34ibc48dx2mavz4m04gjyjh0z4al7xhbb6c9m620gmgpxvsz"; + rev = "6a28c90082a67f62a323ab90d988e000a718a8c7"; + sha256 = "0f6mn95xd1z2czvjzy3mdhkbinjb6ljp2yyz0v3sqnggk6q9x8vs"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2792,24 +2804,24 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2024-10-17"; + version = "2024-10-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "a23759c0d6f48f5b6b5b1504f24d2021fb87f374"; - sha256 = "0cx46c93bzss1rdxncy6ypscmanj5ywzdmzgn01cby05z44188q0"; + rev = "db12581bea4e83b8d8142c15daa9632d796636cf"; + sha256 = "0gr52xnb8574qk3rbi1jzlsmiqa4nifkc7sy43xjfd0q9px9zln4"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; 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/"; }; @@ -2924,12 +2936,12 @@ final: prev: ctrlp-vim = buildVimPlugin { pname = "ctrlp.vim"; - version = "2024-09-22"; + version = "2024-10-21"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "31be4c36b713a9637c7b530ee52127000a05ea39"; - sha256 = "19jz2vbj4m95w4zdgbmx2c5prmflz3wpg3rf9glcfwi2j5zz1ynx"; + rev = "475a864e7f01dfc5c93965778417cc66e77f3dcc"; + sha256 = "1xakj4yqra10hws4jh0h3x68x74qs2khk1318ckfq11zgz6d877s"; }; meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; @@ -2948,12 +2960,12 @@ final: prev: darkearth-nvim = buildVimPlugin { pname = "darkearth-nvim"; - version = "2024-10-15"; + version = "2024-10-23"; src = fetchFromGitHub { owner = "ptdewey"; repo = "darkearth-nvim"; - rev = "37234dfdf8dfa934fedb49b1618f10bacdaf504d"; - sha256 = "08r9l7l9cl05gpijmpkg0787byzmjvk8799lswdvpxkgz7y9jj6a"; + rev = "0d14f2cbd813c4732f01f996658ef67d25c70c51"; + sha256 = "1cn2p0cqx8fr67ylk61aacq4mw06ypfrliw3v3gad18fpyxdfxq9"; }; meta.homepage = "https://github.com/ptdewey/darkearth-nvim/"; }; @@ -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-12"; + version = "2024-10-26"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "954f0b6c1c2e9338a71442a64ccf464a20ee9134"; - sha256 = "09z2f0fv1gfnvkn2z5f5s9a5cgxna09rach6v7cmcia9f5wg2ncf"; + rev = "dcd6bb1368225a9b3f091e5a67229b54c9b065ac"; + sha256 = "0205csmf9ndzszpp7bm6mbp5khyszr0jgwhsw5rmwlmap1yrjia3"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; }; @@ -3176,12 +3188,12 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2024-10-06"; + version = "2024-10-21"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "ce5d290493b29968fd3afa4c1190ea27a876861d"; - sha256 = "01z91hnf98mjjqkm3idwvfihpahxrxxlaz0b8ffjcmvikk6x1dsw"; + rev = "3a38e081f922e0134671236edd3e6dcbb251d10c"; + sha256 = "1ddxvgcsayirs4my3agakxm98z6qv7z9nryayfqv26g7k2k3znh9"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; @@ -3586,12 +3598,12 @@ final: prev: dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2024-10-08"; + version = "2024-10-26"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "35988affc74c0cebb1484bcdfccfed523c0e7267"; - sha256 = "0ap101wxi1y3f2dx6x9b0ag0gbibifhqj2ybn13z5kab8pindc2r"; + rev = "9d8cad9548804a33c9a1968fe305e46e95c911ae"; + sha256 = "1cj5rqww6dq0jkvd6k9dhwxj6zv1373r5w72dccwwxwx2k55ximp"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -4069,19 +4081,19 @@ final: prev: flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2024-10-11"; + version = "2024-10-22"; src = fetchFromGitHub { owner = "nvim-flutter"; repo = "flutter-tools.nvim"; - rev = "6bf887bb9442b80a67f36e7465a66de4202d8a3f"; - sha256 = "1y4fksq8lrz2v15vinvvgj3bbqavyx8nsajmf5r81bgmkpqa8bhr"; + rev = "3d6979b900c8787906427fece1344a25c8e17eba"; + sha256 = "1w1brizgrwb3726bcfrybgcckl6mnic5l3qkyir61h5xcz7zw721"; }; meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/"; }; focus-nvim = buildVimPlugin { pname = "focus.nvim"; - version = "2024-10-20"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "nvim-focus"; repo = "focus.nvim"; @@ -4105,12 +4117,12 @@ final: prev: formatter-nvim = buildVimPlugin { pname = "formatter.nvim"; - version = "2024-10-17"; + version = "2024-10-22"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "04547bdfe89035731a2815a3875b87f77d43e36d"; - sha256 = "1ih28z1y6g8r20si698zispkwra5mll0g8b1lc6778cjfd4dy32j"; + rev = "db71fdb31cee8ae33573b5cf1910e477360678b2"; + sha256 = "13p4ksy1jqbj322y0qb21rbjrrrsg8zm2nmyh1ahlxlif49ch5vb"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -4249,12 +4261,12 @@ final: prev: fzf-lua = buildNeovimPlugin { pname = "fzf-lua"; - version = "2024-10-13"; + version = "2024-10-27"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "5dec364c9dedec00dcd6d06e323d7bc7f8d6b596"; - sha256 = "1fr43zyqbxmnzvynjwsiivlj76wblwrvrx5860sg0a675kbkmi83"; + rev = "ce1e24f2a48089b65deefcb0a71a9856839002b5"; + sha256 = "0nfihl95bxrjmkin8wj6d8sznch695fk2wxkwk6wd92v5dlapypx"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -4429,12 +4441,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2024-09-27"; + version = "2024-10-20"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "863903631e676b33e8be2acb17512fdc1b80b4fb"; - sha256 = "15mp1yh989njsj6fmklr4vxgzkbj4lmwzrgjqayqdf687vpkjrm3"; + rev = "ee7634ab4f0a6606438fe13e16cbf2065589a5ed"; + sha256 = "134xgywyjcg731iya93w14p48dq4cp21q36fb4jf7c4vgnnzy7ld"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4489,12 +4501,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2024-10-19"; + version = "2024-10-21"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "51676b430fc9288073769319ba0ccb2a3bcd79c9"; - sha256 = "03aj4fx8s54wihqa2q025kkwvavxivnska1jv73qz0shcbzhbg4s"; + rev = "12ab6ac0fdd03b1ec9ee4e5378dd204f744a55bf"; + sha256 = "0ckmvsqwms66h50xrh27rhn7f58ziqcrdzr08vf07k13ljnlsqkh"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -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/"; }; @@ -4921,12 +4933,12 @@ final: prev: highlight-undo-nvim = buildVimPlugin { pname = "highlight-undo.nvim"; - version = "2024-10-07"; + version = "2024-10-20"; src = fetchFromGitHub { owner = "tzachar"; repo = "highlight-undo.nvim"; - rev = "ee2f6355e08719fea902e7c478aa7351934f2bb6"; - sha256 = "0p97grvp0dkp475napzdhjx7yxjl77d4iag207j5zcvgkyyk9rb0"; + rev = "c87a6ec1ded241ef223269077cbd5f97a6f0d5bf"; + sha256 = "0rxsqa5i37sgf1n67xy11qsfzc0x78bkw7jsp8lwn98nvsddbp6c"; }; meta.homepage = "https://github.com/tzachar/highlight-undo.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/"; }; @@ -5536,12 +5548,12 @@ final: prev: knap = buildVimPlugin { pname = "knap"; - version = "2024-06-13"; + version = "2024-10-22"; src = fetchFromGitHub { owner = "frabjous"; repo = "knap"; - rev = "0040760bb504a713ea5988c7c490a15faf477c57"; - sha256 = "1l09cc3mi9w9y6g23cylxd5jsrwh451bbmi7w7amymwz17419wsf"; + rev = "7db44d0bb760120142cc1e8f43e44976de59c2f6"; + sha256 = "10vp6m9b0q6ivsb50z284pfzvf1i5dnb3v5hxbysh3hwn7bg4zq5"; }; meta.homepage = "https://github.com/frabjous/knap/"; }; @@ -5572,12 +5584,12 @@ final: prev: kulala-nvim = buildVimPlugin { pname = "kulala.nvim"; - version = "2024-10-19"; + version = "2024-10-23"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala.nvim"; - rev = "af1de146bf661306789a9f7c546a08ae5b7ff9c8"; - sha256 = "1x5hv1npwd04bfmivkn4m2bri1nngrhlfx8imqqbph7frqhpnv9c"; + rev = "9bfa4e9ac82ca3429bd2edcc70e15623545c8d3f"; + sha256 = "1hxqhna4jby2xds11l95ygg6ifs0g5lin8yq696gv5wsl0c571vl"; }; meta.homepage = "https://github.com/mistweaverco/kulala.nvim/"; }; @@ -5596,12 +5608,12 @@ final: prev: langmapper-nvim = buildVimPlugin { pname = "langmapper.nvim"; - version = "2024-09-19"; + version = "2024-10-22"; src = fetchFromGitHub { owner = "Wansmer"; repo = "langmapper.nvim"; - rev = "ac74a80cb86e8b51e4a13ccb2ee540d544fe1c62"; - sha256 = "1b2sjsi81r7m1pxxkisl4b2w2cag3v2i4andhn89gv6afzakvzka"; + rev = "95d99504e823a7ae7e5f68567a86d76f8d24c082"; + sha256 = "0zs9yg9iknr2klvkq92fhd5z8w31k1nz0bc5h2rjhcvhis3mq1fm"; }; meta.homepage = "https://github.com/Wansmer/langmapper.nvim/"; }; @@ -5644,12 +5656,12 @@ final: prev: lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2024-10-02"; + version = "2024-10-22"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "1159bdccd8910a0fd0914b24d6c3d186689023d9"; - sha256 = "1rf17rh54y862x984372qkrh5mn4dpwxdiyzriwqypvf2zavi3aq"; + rev = "cf8ecc2c5e4332760431a33534240b0cbc6680ab"; + sha256 = "1zly0l298xai6a88m9vbxrqrf6cx1pvs735s51gdxnkvmn63p0ac"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -5680,12 +5692,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2024-10-19"; + version = "2024-10-27"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "5acde1275e0d278bfe7373243b1f29165f6b213e"; - sha256 = "0ramsr7f7sh8f1q80zi13v0l9qc3jw7iz8xrna0c9swzdc28vrs5"; + 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/"; }; @@ -6052,12 +6064,12 @@ final: prev: lsp-overloads-nvim = buildVimPlugin { pname = "lsp-overloads.nvim"; - version = "2024-06-27"; + version = "2024-10-21"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "lsp-overloads.nvim"; - rev = "93e11c9a01f81daa4a5644e772a7a77f53dc270f"; - sha256 = "1765fwsqxa8w6rznrhhrmxbxk8mhwxh540sllj9rfkx1nh5lszg9"; + rev = "7d766bfccbff2ab0be8089ea4d1493089f67a408"; + sha256 = "0mrd87qpw3c71z90hbifdf3wxqh8xwgqs5d7zlvifrjfvir1494d"; }; meta.homepage = "https://github.com/Issafalcon/lsp-overloads.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-09-12"; + version = "2024-10-28"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "e808bee352d1a6fcf902ca1a71cee76e60e24071"; - sha256 = "1yf50bwcg94bprbczcki7c1n318m6ar99m8h1yrmn6m0w4cbvf8r"; + 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 { @@ -6353,12 +6365,12 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2024-09-08"; + version = "2024-10-22"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "25c11854aa25558ee6c03432edfa0df0217324be"; - sha256 = "0wqbb6a6p5iq7h47snbcbrh1x7nqf9v959a2zq08pw5b9f7qclal"; + rev = "7446f47b3dfb7df801f31a6f6783c2ad119a6935"; + sha256 = "0v7fmnmm9rc63gfw3s3gy6ggi7jilkvhichivfm6wpc0i4sy36jv"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -6557,12 +6569,12 @@ final: prev: mini-base16 = buildVimPlugin { pname = "mini.base16"; - version = "2024-09-10"; + version = "2024-10-21"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.base16"; - rev = "aaa564b9c6d34466d542494393ab51efc99b9d0b"; - sha256 = "1sj97196vi3qkfkxpdr4ajd3li42pvzmd1zpcr0ggab05rnpawrq"; + rev = "ddf5076aad744bc5f393f8103ad798adf4ed241b"; + sha256 = "1kjka663skxvv424c10m0sz5sv2y3359hcc0gpazi3gs0sma6d4y"; }; meta.homepage = "https://github.com/echasnovski/mini.base16/"; }; @@ -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/"; }; @@ -6749,12 +6761,12 @@ final: prev: mini-hues = buildVimPlugin { pname = "mini.hues"; - version = "2024-10-08"; + version = "2024-10-21"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.hues"; - rev = "40d515229a7ed19c423bcfea8646f6e4354dcfc6"; - sha256 = "1v94yljlpwzbqa4g44n1wvc3hi5wyj6w7mvjx4qg954ak81yfv1j"; + rev = "98ab5fa84d67ff59d895139e331c43fa9a80a044"; + sha256 = "1jzffgvlq2d3nxmilxbcr63j30iscschah4jx5s88lgj2d2d4gbm"; }; meta.homepage = "https://github.com/echasnovski/mini.hues/"; }; @@ -6857,24 +6869,24 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-10-18"; + version = "2024-10-26"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "9618cf56e76cc0caab54ad60116a8d72f99d7b3b"; - sha256 = "0vqyspxincyhck5fmx4b35y0k5m33d76c6v7n9cq1a2c970grlij"; + 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/"; }; @@ -6893,12 +6905,12 @@ final: prev: mini-pick = buildVimPlugin { pname = "mini.pick"; - version = "2024-09-28"; + version = "2024-10-22"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.pick"; - rev = "6d66ae9eb0b75261f1842788dda611285b6f065f"; - sha256 = "0j60nbyk9nrgfmjg6p7chnhc5vmpg997kkn6rkjkpyrrz8ybi181"; + rev = "b7ee06ca0b692023d87a17ba855012047c6bec6f"; + sha256 = "1f2r6qzzwg3fpmwih5n07m3zq0b8pi629m24dgc1mp8sdpkd1sa3"; }; meta.homepage = "https://github.com/echasnovski/mini.pick/"; }; @@ -6977,12 +6989,12 @@ final: prev: mini-test = buildVimPlugin { pname = "mini.test"; - version = "2024-10-07"; + version = "2024-10-21"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.test"; - rev = "958508a7d4fc11292e88c8a8103fe95e33050c8e"; - sha256 = "19qxwszjnaqfbyr232prax3pbrll2p51ci4r0404hnnyy5i94s6w"; + rev = "86a64d5a4bf9d73ebf5875edaae0d878f64f5e48"; + sha256 = "02zslska1g4ixy51slbvlxbjzcys0spc4wh200q8mwv4ipiignrn"; }; meta.homepage = "https://github.com/echasnovski/mini.test/"; }; @@ -7001,12 +7013,12 @@ final: prev: mini-visits = buildVimPlugin { pname = "mini.visits"; - version = "2024-09-06"; + version = "2024-10-20"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.visits"; - rev = "ef2f388158f3651e4b45faac2897d1bacbb0c398"; - sha256 = "1rizwl2dyvj1iz7sqn5sfdaalcjpmhg4zklhjijvpmkylw3da4nh"; + rev = "1367fc23527a4bba8d5e9bf6ba004bc25963722b"; + sha256 = "0a9xjrvm6y8ln8qbm9ypgdynsfghpvsvdagm37qpsqxg04xvb77l"; }; meta.homepage = "https://github.com/echasnovski/mini.visits/"; }; @@ -7061,24 +7073,24 @@ final: prev: modicator-nvim = buildVimPlugin { pname = "modicator.nvim"; - version = "2024-06-19"; + version = "2024-10-21"; src = fetchFromGitHub { owner = "mawkler"; repo = "modicator.nvim"; - rev = "d1d327fd4bdfc3af4cfdf83b85c2eaefa71de7a8"; - sha256 = "1w1rybbh6dhzc0qvw5mr0kv0qcpqxasdhwzghl5g1k9rq520q42y"; + rev = "e349636d905e03305f1eda9c081e63560598f118"; + sha256 = "011zrs2ydfw5y582f2l3f7xim45vzbsd04v7kcbxdnmlhwhv8qws"; }; meta.homepage = "https://github.com/mawkler/modicator.nvim/"; }; modus-themes-nvim = buildVimPlugin { pname = "modus-themes.nvim"; - version = "2024-10-15"; + version = "2024-10-23"; src = fetchFromGitHub { owner = "miikanissi"; repo = "modus-themes.nvim"; - rev = "54647ef5282e7166c1878ab1527a2c0de54c085d"; - sha256 = "0mrnm422j85pxjjq4l7ghjkpm50b1fs7ii89frpnivz4ppfljz11"; + rev = "566af300a3dfdefa64cbe7a0b205ad5bfcb4c337"; + sha256 = "1717880na8awnamdrp19bnqkibxyy0hy86l49c23ixm7s6aq99hk"; }; meta.homepage = "https://github.com/miikanissi/modus-themes.nvim/"; }; @@ -7433,12 +7445,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-10-19"; + version = "2024-10-28"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "a5af8418318f2bcc7513d52b001d68d551bf3b55"; - sha256 = "1vfa38spyl5x5l2p2vaqxiqidrx6lg2sgmwjz95zyv39sjxsal8y"; + 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-19"; + version = "2024-10-28"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "c41a654d6148e1858d98e37cea371993eac0b126"; - sha256 = "0nja882dpdaipvfzpqx8l8jxjpx5nrgqn6rxp54gph73cx8ipqr7"; + rev = "b81f37ec3169153394084cd564d7dc5871f0729a"; + sha256 = "14j6qvzrfy4f4hi5isjxmckscscf898hqa8lmhkgnfhmvqjian8z"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -7735,12 +7747,12 @@ final: prev: neotest-golang = buildVimPlugin { pname = "neotest-golang"; - version = "2024-10-14"; + version = "2024-10-21"; src = fetchFromGitHub { owner = "fredrikaverpil"; repo = "neotest-golang"; - rev = "ea1c3a77f147e29583cd756b44ee69d9007bebba"; - sha256 = "0mjd5ngdkk65f5xj31wriv6zsq2gg99ljplv3b9jih5h5b637yry"; + rev = "11db9a2c571df5d55b4b9a890159a1d15f5cb287"; + sha256 = "10hmcpvqzd7krdbrcwyhwqgxnf3wz3c4dfq9z6yj7kz4ar6s7q69"; }; meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/"; }; @@ -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/"; }; @@ -8000,12 +8012,12 @@ final: prev: nerdcommenter = buildVimPlugin { pname = "nerdcommenter"; - version = "2024-08-08"; + version = "2024-10-22"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "3f860f2d981547c18f2c9599e3c358ea488c3be4"; - sha256 = "0z5fbzyfplljjbzsj84xp323b0hgiz5asizgsny9kjzx0b4m96ns"; + rev = "66c07e4083ab02ed2540ac289cc602c70b858c13"; + sha256 = "1ghfcdz1k3wmi4xbk0ac5zc5karscj85xkb6s2by9h06hd712vi1"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -8168,12 +8180,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2024-10-18"; + version = "2024-10-24"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "522c89562e3ca1eeb8f29435db2d4e9e4995c55e"; - sha256 = "1zpdrw9hslybsjkqrgfqw5lvn5zszb1k4wvqb11gnaxd1xbvm426"; + 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/"; }; @@ -8396,12 +8408,12 @@ final: prev: nvim-bacon = buildVimPlugin { pname = "nvim-bacon"; - version = "2024-05-09"; + version = "2024-10-21"; src = fetchFromGitHub { owner = "Canop"; repo = "nvim-bacon"; - rev = "ad7b522ae85b7aab4981bcd34e9b513ce5849eda"; - sha256 = "1baki6dfiahilkcgfdspbfj2mv3pf06nj7yamvranzpj04jadlx3"; + rev = "61169ad66eceb59ef01808a5f1b6aeb0b00c6a9a"; + sha256 = "0ynl38agz9v32qx6wcy2znhbc8pm5c3zd8gyslkl34jbnca8ijmk"; }; meta.homepage = "https://github.com/Canop/nvim-bacon/"; }; @@ -8456,12 +8468,12 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2024-10-20"; + version = "2024-10-21"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "82bd4b59432d44cf5e2a5ce3a40a037a575a6623"; - sha256 = "0x2n004m0ar8bv4x20qpirld7ih235pm1q39im6cff8rffxf4qwm"; + rev = "29fb4854573355792df9e156cb779f0d31308796"; + sha256 = "17jlw4am9mr4cffxlq30lklqmrx8n4fssl1fsqf07djizp31f2vl"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -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/"; }; @@ -8696,12 +8708,12 @@ final: prev: nvim-fzf = buildVimPlugin { pname = "nvim-fzf"; - version = "2024-10-04"; + version = "2024-10-21"; src = fetchFromGitHub { owner = "vijaymarupudi"; repo = "nvim-fzf"; - rev = "8bdbafa84c52662ec1a861a2cb67ed8ac45e37eb"; - sha256 = "0dwy9lj5rg6m6i2jhs8y8riww41if9rh2ddx952h4wk65hdmx8cj"; + rev = "305aa90aeb8409b4bd2af1812a4b6e157ee93953"; + sha256 = "1r9k54f82gjy0wiy52fnaiwj8bkazhyhawyxmjg4za46rjdijmvj"; }; meta.homepage = "https://github.com/vijaymarupudi/nvim-fzf/"; }; @@ -8732,19 +8744,19 @@ final: prev: nvim-genghis = buildVimPlugin { pname = "nvim-genghis"; - version = "2024-09-14"; + version = "2024-10-26"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-genghis"; - rev = "ca258b1e466d131e17eacf0c632abe932bce20ab"; - sha256 = "0l8qpj143s3csav39ixzhag6pyk6jfajvf469m9hg19m6wfbfg1v"; + rev = "e04857f2905c07e70d366f30beb0e2765dbe9413"; + sha256 = "1nn9w0bfi6vjg316a1ag1mwxd12gd459xcpdk694qs210qbfy59f"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/"; }; nvim-gomove = buildVimPlugin { pname = "nvim-gomove"; - version = "2024-10-20"; + version = "2022-07-19"; src = fetchFromGitHub { owner = "booperlv"; repo = "nvim-gomove"; @@ -8780,12 +8792,12 @@ final: prev: nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2024-10-15"; + version = "2024-10-25"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "eb4ed4979fcea945b0da879754d91930663bbf8a"; - sha256 = "1aazg7xdxp6ac13rgiiwzxwy88qwqfxi3jzg8vrzrphav4ibx6sx"; + 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-19"; + version = "2024-10-28"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "fd49d5863e873891be37afac79b1f56fb34bb5d3"; - sha256 = "0sf9v5dj7hgxrp3d96hqwr8j3my8hmjxz9k0mqipysz0rhl926nb"; + rev = "59a6766cbf32c7e4cf3ed685ccad7ffe1dde8c40"; + sha256 = "0w04mply303j4mq6myygwgr54bxv7cirnj3qrq4il798bxs71vix"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -9091,12 +9103,12 @@ final: prev: nvim-nu = buildVimPlugin { pname = "nvim-nu"; - version = "2024-08-23"; + version = "2024-10-20"; src = fetchFromGitHub { owner = "LhKipp"; repo = "nvim-nu"; - rev = "ca92d6defc08dbfa3b27ab36bfc99d97a259c3de"; - sha256 = "03nybdgdx7yswn5ybyhwdvjckdv4qz7pi8whgcqdlnqrpmh51sdm"; + rev = "daa2385a5620c5634230fc90416d16ff4bd4e82d"; + sha256 = "1m95y6lh8ln4vvx3jryrzjnc9a8vn5p7835i5dixh8dscxbm26gk"; }; meta.homepage = "https://github.com/LhKipp/nvim-nu/"; }; @@ -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-20"; + version = "2024-10-28"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "9a94cc23cb5499222923bf6119f6199edf84f381"; - sha256 = "1kda4nai5r4xj12v5hg8am6lbg8r0niksij0p62r2jjj9bj4bs63"; + 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/"; }; @@ -9403,7 +9415,7 @@ final: prev: nvim-treesitter-pairs = buildVimPlugin { pname = "nvim-treesitter-pairs"; - version = "2024-10-20"; + version = "2023-07-23"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-treesitter-pairs"; @@ -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/"; }; @@ -9499,12 +9511,12 @@ final: prev: nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2024-09-08"; + version = "2024-10-23"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "203c9f434feec57909ab4b1e028abeb3349b7847"; - sha256 = "1w4d7h53p4xpx8pz2shn253900xhqgw5r7y103y60ywf53cr2k03"; + rev = "c96bb3bb853ff6253fe74f057df03e61fafd2403"; + sha256 = "090f9ivv57sz18pkgnciybgas8kjnvsfwpw8ipml7rs8hvng2gz7"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; @@ -9655,24 +9667,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2024-10-17"; + version = "2024-10-26"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "a83ca8bcee6cf4a9288bbfd1b97a51ba32068c21"; - sha256 = "03pwwkb06b7dfd0m5w98b05dfggn1vnpcxk531p0vsmiy263qyyh"; + 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/"; @@ -9764,12 +9776,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2024-10-17"; + version = "2024-10-22"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "035d63a2fd13885d526f1b90b0aa16a949310ec1"; - sha256 = "1wpyy0kax9v7177njpc3l3sz77zd39ysglppgmgb8sjs9a4qh6bs"; + rev = "b50de0e605081486bd5b9ab2d42832bacfc167e7"; + sha256 = "1kk20ia8nzzrlz7anqh62c85f4p0kpdpwi447fvf51m8n884f3b2"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -9848,12 +9860,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-10-17"; + version = "2024-10-28"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "05d69831e57996d09d9c6d9b135d141d6c051035"; - sha256 = "05scr3vhdhq11sk4fbqbndska8nfsw63mqpx7kllalzvkcdw31pi"; + 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-19"; + version = "2024-10-27"; src = fetchFromGitHub { owner = "MeanderingProgrammer"; repo = "render-markdown.nvim"; - rev = "e1a2289106a9ce5ea1b20b78c90aef4d890950b7"; - sha256 = "15xf4d6fsl68fqv31y6dk3kr2818z4jlc236gdg4kn7mxgyj3azm"; + rev = "fc05fb7c56795f191b6800799a2ec6ea325ba715"; + sha256 = "1604id1b0m4cj36fy8r1fnkbaxs4h388970b790mg525zz8ch6j0"; }; meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; }; @@ -10797,6 +10809,18 @@ final: prev: meta.homepage = "https://github.com/tiagovla/scope.nvim/"; }; + scretch-nvim = buildVimPlugin { + pname = "scretch.nvim"; + version = "2024-06-12"; + src = fetchFromGitHub { + owner = "0xJohnnyboy"; + repo = "scretch.nvim"; + rev = "0b2fbd0ed285f74baab7396a4a08c7bb7a3653c1"; + sha256 = "sha256-BqCVe7dY6WNJZS2XTNcnvB9d+HoM0wUItmmVskEaVHQ="; + }; + meta.homepage = "https://github.com/0xJohnnyboy/scretch.nvim/"; + }; + scrollbar-nvim = buildVimPlugin { pname = "scrollbar.nvim"; version = "2024-08-18"; @@ -10980,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/"; }; @@ -11715,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/"; @@ -11776,12 +11800,12 @@ final: prev: telescope-file-browser-nvim = buildVimPlugin { pname = "telescope-file-browser.nvim"; - version = "2024-09-21"; + version = "2024-10-24"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "3b8a1e17187cfeedb31decbd625da62398a8ff34"; - sha256 = "1vll5da8k1a0wqs44f7kcn6i0iwrzisiyja2z44x48b3maqkr2p3"; + rev = "626998e5c1b71c130d8bc6cf7abb6709b98287bb"; + sha256 = "066b5mhn35ia6v4fi61zgyswqplfip74qch6j4afqk2kvn5x35jl"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -11885,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/"; }; @@ -12042,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/"; }; @@ -12282,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/"; }; @@ -12343,12 +12367,12 @@ final: prev: tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2024-10-04"; + version = "2024-10-24"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "2c85fad417170d4572ead7bf9fdd706057bd73d7"; - sha256 = "1rqycwyk98fb9ris55wvicsg0mywfsv0j2z7ccn94zigzm9jhhh1"; + rev = "2e1daa1d164ad8cc3e99b44ca68e990888a66038"; + sha256 = "118cj0bbv069m1ry9s97c929sbk46d44x9w4ww2l9xq1x5hv9jh1"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -12427,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/"; @@ -12440,12 +12464,12 @@ final: prev: trouble-nvim = buildVimPlugin { pname = "trouble.nvim"; - version = "2024-10-02"; + version = "2024-10-23"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "254145ffd528b98eb20be894338e2d5c93fa02c2"; - sha256 = "0bn9bxybczjk537dyfnawbkd23i3zb2mwb6bbmrl3354053z678d"; + rev = "2f3b537f2207ce32f4459f9d56746ee013b5e01b"; + sha256 = "0why49ss11pgsjafblcwyz0k446m10pn03zy9yxafck1kfpshh97"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -12476,12 +12500,12 @@ final: prev: ts-comments-nvim = buildVimPlugin { pname = "ts-comments.nvim"; - version = "2024-07-24"; + version = "2024-10-22"; src = fetchFromGitHub { owner = "folke"; repo = "ts-comments.nvim"; - rev = "98d7d4dec0af1312d38e288f800bbf6ff562b6ab"; - sha256 = "12g6rwrj67wk4fxxl31rsras5jw6a73xngrazlw095xhz6sd9l71"; + rev = "2002692ad1d3f6518d016550c20c2a890f0cbf0e"; + sha256 = "1fwscqdqcza46zhbm76bfhfmz5x92cpl1hl5myfm8zkqax9kxk3l"; }; meta.homepage = "https://github.com/folke/ts-comments.nvim/"; }; @@ -12630,14 +12654,26 @@ final: prev: meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; + unimpaired-nvim = buildVimPlugin { + pname = "unimpaired.nvim"; + version = "2024-04-09"; + src = fetchFromGitHub { + owner = "tummetott"; + repo = "unimpaired.nvim"; + rev = "8e504ba95dd10a687f4e4dacd5e19db221b88534"; + sha256 = "sha256-CNU4cigMjbvOdUzUXze9ZDmTZRuYtj4dCuuLVZkMTQg="; + }; + meta.homepage = "https://github.com/tummetott/unimpaired.nvim/"; + }; + unison = buildVimPlugin { pname = "unison"; - version = "2024-10-17"; + version = "2024-10-23"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "b1ac7ba1b984dc5bbabee7e136fea5674218e791"; - sha256 = "05df053ddczcv243kd5bcyz1h2p2kwivqqk8rmangs3h66dzvp98"; + rev = "5f3f532ce25266a0d14b89e9cae9bb5c9ea03a6d"; + sha256 = "1mwbas56d1q3rgin2wl7w61r6l73dla8106pa9z6268714ldc4ds"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -12740,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/"; }; @@ -13100,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/"; }; @@ -13676,12 +13712,12 @@ final: prev: vim-commentary = buildVimPlugin { pname = "vim-commentary"; - version = "2024-04-08"; + version = "2024-10-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-commentary"; - rev = "c4b8f52cbb7142ec239494e5a2c4a512f92c4d07"; - sha256 = "1v16mnjm8gr540w6smvwbpn1zmjimzwi74a8d165a1yacnmdm6pf"; + rev = "64a654ef4a20db1727938338310209b6a63f60c9"; + sha256 = "0jniidmrr1iddb7s5qxac30l30f4cmyia4b56xqcqv00ysk3kbni"; }; meta.homepage = "https://github.com/tpope/vim-commentary/"; }; @@ -14336,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/"; }; @@ -14588,12 +14624,12 @@ final: prev: vim-graphql = buildVimPlugin { pname = "vim-graphql"; - version = "2024-08-06"; + version = "2024-10-23"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "9caa247f88991ebfa45df21cbe1c8bec50039f6b"; - sha256 = "0903may6c1yna3nqjib9x9zapd3qpq7p9inaxkb9173a5laksgfv"; + rev = "f2e77545b4ed1f8104a0014e9b75cff257c3cc27"; + sha256 = "13974aikzkdiji8z8hr2dzjmfjxbh9kfsxss9nbbcczz7a1yq005"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -15069,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/"; }; @@ -15358,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/"; }; @@ -15442,12 +15478,12 @@ final: prev: vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2024-09-27"; + version = "2024-10-21"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "02cd145c223ddf1dfb3069303400946d1907ccec"; - sha256 = "1853ngvr86366dr38c3b9rv0246ybvw6gg16025rrfvlbi2wbcxl"; + rev = "e608a9da13d9601e05c64c554db20519f41205fc"; + sha256 = "09c21x5rh30kr635syg0flp2dvhxd37xmf7ywvmzmcwqgybyms3d"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; }; @@ -15563,24 +15599,24 @@ final: prev: vim-matchtag = buildVimPlugin { pname = "vim-matchtag"; - version = "2024-10-10"; + version = "2024-10-21"; src = fetchFromGitHub { owner = "leafOfTree"; repo = "vim-matchtag"; - rev = "008aee75e4003cb11cf7eea800c849182693275b"; - sha256 = "0a17nw3f3jl599d6i6jbga11mmlayqbm65dr2gjw4a88z2djkvsj"; + rev = "1bd1d36d49c8d0448eca51fa3c4304ab83928ef5"; + sha256 = "0hj7g7jqz1iidch4cpm15f6czlaw1z10z053mqz9m5kd5syzxvbl"; }; meta.homepage = "https://github.com/leafOfTree/vim-matchtag/"; }; vim-matchup = buildVimPlugin { pname = "vim-matchup"; - version = "2024-10-18"; + version = "2024-10-28"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "57d3a4bbf4c9a0ab73f2cb90c4a9c93fef4c420f"; - sha256 = "1b0qvf0kd69b4y5r0c32ajy8gyj63c8bmknc43hycicij3dh3bsz"; + rev = "5fb083de1e06fdd134c6ad8d007d4b5576b25ba7"; + sha256 = "1913gqqhza5nhcmxh0bdrn0bzsizk6ymlrv303dd5s1mp8k44mzn"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -15887,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/"; }; @@ -16247,12 +16283,12 @@ final: prev: vim-polyglot = buildVimPlugin { pname = "vim-polyglot"; - version = "2022-10-14"; + version = "2024-10-22"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "bc8a81d3592dab86334f27d1d43c080ebf680d42"; - sha256 = "061md5vjkqb4n9cbjg5dypq1y3p8gr106v4yqvrwwsdjwzsafzn3"; + rev = "692e359ad9344d6e69626131f5c96743560e4d53"; + sha256 = "17cvnndxisridnhzanrswnapzdcmsb6ki95snn9krpcsibh2q5g2"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -16955,12 +16991,12 @@ final: prev: vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "2024-10-10"; + version = "2024-10-24"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "11f7c6d26baf79a29ac8d2321810a5e3f7a45397"; - sha256 = "10wkfiqg4ccl671j8wc1kghck0jah7b74l4i648ybjly00ikybbh"; + rev = "3c3f0763af38e32580c92815f696966e522da68c"; + sha256 = "0dqv3zq248pv5xpcjy3ssr324l47zdwf9bdrrq94m69l98j7whkh"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; }; @@ -17099,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/"; }; @@ -17832,12 +17868,12 @@ final: prev: vimade = buildVimPlugin { pname = "vimade"; - version = "2024-10-14"; + version = "2024-10-26"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "0330c53f4541908317c33582692d518b2bf5cce1"; - sha256 = "1gfkpnymvwqi91nskp8g2cld8v6dz72pn59ac4y6d5fafq83y5gn"; + rev = "919562da13222cb9d3b08a176528aa2e3a6b767f"; + sha256 = "1dq8rvrq4rj24c0jilc3i46mxfl7psb6q6nax3hw79bs25gcn983"; }; meta.homepage = "https://github.com/TaDaa/vimade/"; }; @@ -17953,12 +17989,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-10-17"; + version = "2024-10-26"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "4dd3be5cc4e8f6ee7401e303a8211efb4d91bcf6"; - sha256 = "11a84xcm0rm4mv8521pi5a9dgiv8lys11nrda5kwh5vlrzxdwdwx"; + rev = "0785fd98af20f308ce6856f75a70a4ece9abab29"; + sha256 = "1g040n5lh1b6cxvwk6admmz2sgr6m0qbc31r63dhcsgaqnvzg2bz"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -18133,12 +18169,12 @@ final: prev: wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2024-09-16"; + version = "2024-10-26"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "8188ff7b62b7695eae44257bd6202d8494fee655"; - sha256 = "0w7h0xdhdxn7lniyx4qrxhfnq892z4p4p2pf2jgbsnhzj3dhhv87"; + rev = "854b1472e2867035bd15d55a0b4d523f5662e242"; + sha256 = "1sqkzjnq0hg4y6xrn0w6ks2klrwq5yivk0pl5jn4bs8h968ij5h0"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -18326,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/"; }; @@ -18470,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/"; }; @@ -18506,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/"; }; @@ -18602,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/"; }; @@ -18626,12 +18662,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2024-10-19"; + version = "2024-10-28"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "3839b74f58602bec36db8150333c8b09966e42ed"; - sha256 = "1jxc2jr0vg1yca5md124zcvj6ncmqydmz8fhbzmaak5h8fgqy3qi"; + rev = "ba40afccc8a27236eb735cd55e2c33ced912b8b0"; + sha256 = "1ng0gvpb4yzljmxfvgv51mgizfnqx469r0rbqhypvzh56p2iwmhc"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -18674,12 +18710,12 @@ final: prev: rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2024-10-08"; + version = "2024-10-23"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "d396005db5bbd1d4ec7772a7c96c96f4c4802328"; - sha256 = "1ahcvljrk073mwr2ipmlf3gd2k7gp1n6g921q2s2v4i0136v2lyr"; + rev = "07a887a7bef4aacea8c7caebaf8cbf808cdc7a8e"; + sha256 = "00gyn9s5c76fk1sqyg48aldbq2d8m33xia48vik8grj9wp12kbpx"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; @@ -18696,18 +18732,6 @@ final: prev: meta.homepage = "https://github.com/samodostal/image.nvim/"; }; - scretch-nvim = buildVimPlugin { - pname = "scretch.nvim"; - version = "2024-10-20"; - src = fetchFromGitHub { - owner = "0xJohnnyboy"; - repo = "scretch.nvim"; - rev = "0b2fbd0ed285f74baab7396a4a08c7bb7a3653c1"; - sha256 = "sha256-BqCVe7dY6WNJZS2XTNcnvB9d+HoM0wUItmmVskEaVHQ="; - }; - meta.homepage = "https://github.com/0xJohnnyboy/scretch.nvim/"; - }; - tinykeymap = buildVimPlugin { pname = "tinykeymap"; version = "2024-02-17"; @@ -18720,18 +18744,6 @@ final: prev: meta.homepage = "https://github.com/tomtom/tinykeymap_vim/"; }; - unimpaired-nvim = buildVimPlugin { - pname = "unimpaired.nvim"; - version = "2024-10-17"; - src = fetchFromGitHub { - owner = "tummetott"; - repo = "unimpaired.nvim"; - rev = "8e504ba95dd10a687f4e4dacd5e19db221b88534"; - sha256 = "sha256-CNU4cigMjbvOdUzUXze9ZDmTZRuYtj4dCuuLVZkMTQg="; - }; - meta.homepage = "https://github.com/tummetott/unimpaired.nvim/"; - }; - vim-advanced-sorters = buildVimPlugin { pname = "vim-advanced-sorters"; version = "2024-08-16"; @@ -18755,6 +18767,4 @@ final: prev: }; meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; - - } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 097a866271..1785c57284 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/third_party/nixpkgs/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"; @@ -491,12 +502,12 @@ }; dtd = buildGrammar { language = "dtd"; - version = "0.0.0+rev=809266e"; + version = "0.0.0+rev=cd1316e"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "809266ed1694d64dedc168a18893cc254e3edf7e"; - hash = "sha256-Kxmk9v2oTTYtoLQ2n0LyNziouG56ZSgcirS8JukUmZE="; + rev = "cd1316e476ec40da6ce1fb5749c9d7e6b4f1090c"; + hash = "sha256-RTWvOUAs3Uql9DKsP1jf9FZZHaZORE40GXd+6g6RQZw="; }; location = "dtd"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; @@ -526,12 +537,12 @@ }; editorconfig = buildGrammar { language = "editorconfig"; - version = "0.0.0+rev=f5b5ac3"; + version = "0.0.0+rev=38cf8d0"; src = fetchFromGitHub { owner = "ValdezFOmar"; repo = "tree-sitter-editorconfig"; - rev = "f5b5ac3f718523fe9d5ee926f64eb177306afdb6"; - hash = "sha256-l5ryC0wINO/oN8FNrngR7QnDAhiX65y0Hw5AExvAfBo="; + 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"; }; @@ -614,12 +625,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=f1919a3"; + version = "0.0.0+rev=4095e99"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "f1919a34af3a9c79402c4a3d6c52986e9c2ea949"; - hash = "sha256-0e01hr/QDZI+NSRoiTSQZftvpdCHKc6ZkEyxxbKIQyA="; + rev = "4095e9993acc89cb311ab1be8614c21b1cf768a4"; + hash = "sha256-+mp0h7qaJN30eqNIDJem5iOnnWATR1X4D6dB4gyGlfM="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -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"; }; @@ -846,12 +857,12 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "0.0.0+rev=67ab180"; + version = "0.0.0+rev=db0e0c4"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "67ab180883ba5ce3f5b0a5f4288cc6d9f9d83a5d"; - hash = "sha256-5ieeIuUcaky3gWcrCrPXEGzfqom3Kv6rR8CEaWk797k="; + rev = "db0e0c4fb9095fdc42a7af34019c0616c071e9eb"; + hash = "sha256-rMLYEU4WdCInfNNAOuESCceavgWTy9NS8kgkTRaK1OE="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; @@ -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"; }; @@ -1574,12 +1585,12 @@ }; lua = buildGrammar { language = "lua"; - version = "0.0.0+rev=99fc677"; + version = "0.0.0+rev=34e60e7"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "tree-sitter-lua"; - rev = "99fc677e6971c425e8d407f59c77ab897e585c92"; - hash = "sha256-Q2LtrifoKf16N1dRBf2xLi12kpMkcFncZL4jaVbtK3M="; + rev = "34e60e7f45fc313463c68090d88d742a55d1bd7a"; + hash = "sha256-v+fFcIOv+bu+2IGI/Lh/Xbqd5BzbBjaa51ECd0hG7Ow="; }; meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua"; }; @@ -1640,24 +1651,24 @@ }; markdown = buildGrammar { language = "markdown"; - version = "0.0.0+rev=be81c59"; + version = "0.0.0+rev=5cdc549"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "be81c59efc552bd875650fe078bf6b78d57330ca"; - hash = "sha256-gqZYUJWijD0UQAQeElx/VxAILI2WZtvC/+Eno3AiCTU="; + rev = "5cdc549ab8f461aff876c5be9741027189299cec"; + hash = "sha256-dLj233xHPCJbawUVqkxxhHXbu/CrJIHcCyLXTgsWMFo="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "0.0.0+rev=be81c59"; + version = "0.0.0+rev=5cdc549"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "be81c59efc552bd875650fe078bf6b78d57330ca"; - hash = "sha256-gqZYUJWijD0UQAQeElx/VxAILI2WZtvC/+Eno3AiCTU="; + rev = "5cdc549ab8f461aff876c5be9741027189299cec"; + hash = "sha256-dLj233xHPCJbawUVqkxxhHXbu/CrJIHcCyLXTgsWMFo="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; @@ -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"; @@ -2634,12 +2645,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=a8b10c7"; + version = "0.0.0+rev=f551a8f"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "a8b10c76759a372d0f92bb070b4f5c993e0ce5f9"; - hash = "sha256-wfoov9KfIadouF3HTJ9hOpnIouCHvDffgSrXow8zQ5I="; + rev = "f551a8fa69dc9aea479b93fae34c3ea7be15f931"; + hash = "sha256-U+PnjYITbHOT+EtoF0lI8LNhcc811ZEqFjRTsSMtprA="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -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=a6ec57a"; + version = "0.0.0+rev=5098007"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "a6ec57ad4d12c68d952ba1f869bd373a7ac95832"; - hash = "sha256-mdBrUgq8uux7p/DEm4jBNtB5a4UFDTrNRXX4hexKN7s="; + 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=da9cf97"; + version = "0.0.0+rev=ffb6c4b"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "da9cf9793686e236327aadfbad449414c895bf84"; - hash = "sha256-VlYgKg9K/veFqxHWqF3nEYsrRGub2xK9txFK71Kn9JA="; + 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=2249c44"; + version = "0.0.0+rev=d2e4b5c"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "2249c44ecd3f5cf22da3dcccfb74f816ddb29245"; - hash = "sha256-v+XSWGm2Wdn9/rxNFMqXYACkGn6AvxZdxkClLuKnWGU="; + rev = "d2e4b5c172a109966c2ce0378f73df6cede39400"; + hash = "sha256-Vrl4/cZL+TWlUMEeWZoHCAWhvlefcl3ajGcwyTNKOhI="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; @@ -3248,16 +3259,27 @@ }; xml = buildGrammar { language = "xml"; - version = "0.0.0+rev=809266e"; + version = "0.0.0+rev=cd1316e"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "809266ed1694d64dedc168a18893cc254e3edf7e"; - hash = "sha256-Kxmk9v2oTTYtoLQ2n0LyNziouG56ZSgcirS8JukUmZE="; + rev = "cd1316e476ec40da6ce1fb5749c9d7e6b4f1090c"; + hash = "sha256-RTWvOUAs3Uql9DKsP1jf9FZZHaZORE40GXd+6g6RQZw="; }; location = "xml"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; }; + xresources = buildGrammar { + language = "xresources"; + version = "0.0.0+rev=630af80"; + src = fetchFromGitHub { + owner = "ValdezFOmar"; + repo = "tree-sitter-xresources"; + rev = "630af80f563ede09a652a808277950c36306e3a3"; + hash = "sha256-kQmswwZgevQFayhU0Q+UnLh+lnjgvr+m48FtYWUv3Bw="; + }; + meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources"; + }; yaml = buildGrammar { language = "yaml"; version = "0.0.0+rev=7b03fee"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix index d977d0ac9d..0e3f1d17c4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix @@ -149,8 +149,7 @@ in vim-fugitive vim-rhubarb ]; - # TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged - # nvimRequireCheck = "advanced_git_search.utils"; + nvimRequireCheck = "advanced_git_search.utils"; }; animation-nvim = super.animation-nvim.overrideAttrs { @@ -201,19 +200,6 @@ in blink-cmp = callPackage ./blink-cmp { }; - # The GitHub repository returns 404, which breaks the update script - vim-pony = buildVimPlugin { - pname = "vim-pony"; - version = "2018-07-27"; - src = fetchFromGitHub { - owner = "jakwings"; - repo = "vim-pony"; - rev = "b26f01a869000b73b80dceabd725d91bfe175b75"; - sha256 = "0if8g94m3xmpda80byfxs649w2is9ah1k8v3028nblan73zlc8x8"; - }; - meta.homepage = "https://github.com/jakwings/vim-pony/"; - }; - chadtree = super.chadtree.overrideAttrs { buildInputs = [ python3 @@ -236,8 +222,7 @@ in plenary-nvim telescope-nvim ]; - # TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged - # nvimRequireCheck = "chatgpt"; + nvimRequireCheck = "chatgpt"; }; clang_complete = super.clang_complete.overrideAttrs { @@ -1242,6 +1227,19 @@ in nvimRequireCheck = "lean"; }; + LeaderF = super.LeaderF.overrideAttrs { + nativeBuildInputs = [ python3.pkgs.setuptools ]; + buildInputs = [ python3 ]; + # rm */build/ to prevent dependencies on gcc + # strip the *.so to keep files small + buildPhase = '' + patchShebangs . + ./install.sh + rm autoload/leaderf/fuzzyMatch_C/build/ -r + ''; + stripDebugList = [ "autoload/leaderf/python" ]; + }; + leap-ast-nvim = super.leap-ast-nvim.overrideAttrs { dependencies = with self; [ leap-nvim @@ -1250,6 +1248,17 @@ in nvimRequireCheck = "leap-ast"; }; + leetcode-nvim = super.leetcode-nvim.overrideAttrs { + dependencies = with self; [ + nui-nvim + plenary-nvim + telescope-nvim + ]; + + doInstallCheck = true; + nvimRequireCheck = "leetcode"; + }; + lens-vim = super.lens-vim.overrideAttrs { # remove duplicate g:lens#animate in doc/lens.txt # https://github.com/NixOS/nixpkgs/pull/105810#issuecomment-740007985 @@ -1296,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 @@ -1317,7 +1318,6 @@ in pyperclip pnglatex ]; - meta.homepage = "https://github.com/WhiteBlackGoose/magma-nvim-goose/"; }; markdown-preview-nvim = @@ -1529,6 +1529,10 @@ in nvimRequireCheck = "null-ls"; }; + NotebookNavigator-nvim = super.NotebookNavigator-nvim.overrideAttrs { + nvimRequireCheck = "notebook-navigator"; + }; + null-ls-nvim = super.null-ls-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim ]; nvimRequireCheck = "null-ls"; @@ -1588,8 +1592,7 @@ in nvim-lspconfig nvim-navic ]; - # TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged - # nvimRequireCheck = "nvim-navbuddy"; + nvimRequireCheck = "nvim-navbuddy"; }; vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs { @@ -1641,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/ @@ -1996,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 ]; @@ -2509,6 +2515,19 @@ in dependencies = with self; [ denops-vim ]; }; + # The GitHub repository returns 404, which breaks the update script + vim-pony = buildVimPlugin { + pname = "vim-pony"; + version = "2018-07-27"; + src = fetchFromGitHub { + owner = "jakwings"; + repo = "vim-pony"; + rev = "b26f01a869000b73b80dceabd725d91bfe175b75"; + sha256 = "0if8g94m3xmpda80byfxs649w2is9ah1k8v3028nblan73zlc8x8"; + }; + meta.homepage = "https://github.com/jakwings/vim-pony/"; + }; + vim-sensible = super.vim-sensible.overrideAttrs { patches = [ ./patches/vim-sensible/fix-nix-store-path-regex.patch ]; }; @@ -2539,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 { @@ -2674,17 +2689,6 @@ in nvimRequireCheck = "yazi"; }; - leetcode-nvim = super.leetcode-nvim.overrideAttrs { - dependencies = with self; [ - nui-nvim - plenary-nvim - telescope-nvim - ]; - - doInstallCheck = true; - nvimRequireCheck = "leetcode"; - }; - YouCompleteMe = super.YouCompleteMe.overrideAttrs { buildPhase = '' substituteInPlace plugin/youcompleteme.vim \ @@ -2715,18 +2719,6 @@ in --replace "'zoxide_executable', 'zoxide'" "'zoxide_executable', '${zoxide}/bin/zoxide'" ''; }; - LeaderF = super.LeaderF.overrideAttrs { - nativeBuildInputs = [ python3.pkgs.setuptools ]; - buildInputs = [ python3 ]; - # rm */build/ to prevent dependencies on gcc - # strip the *.so to keep files small - buildPhase = '' - patchShebangs . - ./install.sh - rm autoload/leaderf/fuzzyMatch_C/build/ -r - ''; - stripDebugList = [ "autoload/leaderf/python" ]; - }; } // ( let diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names index 07f334bdaa..ad4f66f1b6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -19,6 +19,7 @@ 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, @@ -399,8 +400,8 @@ 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/,master, 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/,, @@ -524,7 +525,7 @@ 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/WhiteBlackGoose/magma-nvim-goose/,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, @@ -1072,10 +1073,10 @@ 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/nordtheme/vim/,,nord-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/catppuccin/vim/,HEAD,catppuccin-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/,, diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix index 33bc3153b7..02d48e6e70 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix @@ -697,8 +697,8 @@ let mktplcRef = { name = "biome"; publisher = "biomejs"; - version = "2024.5.251958"; - hash = "sha256-Pxbvj6e3nRwuLKmPEtE02JdHmZbyuXNh4T+FZKjBkWo="; + version = "2024.10.131712"; + hash = "sha256-wslaPz0YwavLgP/gLXDIKsk2dvVmFgkSDCI9OfpKwwI="; }; meta = { changelog = "https://github.com/biomejs/biome-vscode/blob/main/CHANGELOG.md"; @@ -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"; @@ -5194,8 +5194,8 @@ let mktplcRef = { name = "vscode-icons"; publisher = "vscode-icons-team"; - version = "12.8.0"; - hash = "sha256-2+Wf0AL9C5xOQCjA9maMt/W/kviNuiyMfaOFDU82KxM="; + version = "12.9.0"; + hash = "sha256-ULjZlbGcVbPiokfnx7d4z7cmVVEfy2d+SUch80rZRA4="; }; meta = { description = "Bring real icons to your Visual Studio Code"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index e15cfdd5be..d30107a1fb 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -3,32 +3,31 @@ stdenv, vscode-utils, fetchurl, - ... }: let - version = "0.11.8"; + version = "0.12.1"; sources = { "x86_64-linux" = { arch = "linux-x64"; url = "https://download.visualjj.com/visualjj-linux-x64-${version}.vsix"; - hash = "sha256-L46ORW4iZnZ1GNQSU4opp1bTIh036j9JNmkATjTt/qM="; + hash = "sha256-Tf26s4YDyjYUrVdKu9aYMMntirZyNRgnETMzO/EfFCA="; }; "x86_64-darwin" = { arch = "darwin-x64"; url = "https://download.visualjj.com/visualjj-darwin-x64-${version}.vsix"; - hash = "sha256-h15HMZiV/bCVgoajEBe8XLSmFD7EsU2JVlpqiN6ntjQ="; + hash = "sha256-2u92qFaRIirCrvtuxeqVqt6zWEobS1f5SX26SGZF4xE="; }; "aarch64-linux" = { arch = "linux-arm64"; url = "https://download.visualjj.com/visualjj-linux-arm64-${version}.vsix"; - hash = "sha256-1h/xBMFXtHn/QA0FpZcuUFKxU65AMvaqds6Q9aNaW3s="; + hash = "sha256-+NUdF/KIWhLXOGtUgmNI9JF+L+f/4o064gznpLiORVM="; }; "aarch64-darwin" = { arch = "darwin-arm64"; url = "https://download.visualjj.com/visualjj-darwin-arm64-${version}.vsix"; - hash = "sha256-9SagMPdkB8d2GeGR/R1EmH5y6VNZtYydst9S82kAQlA="; + hash = "sha256-GVEOTgfSKc0YXZUF4WGl/56Jd4ucaeDm9nB+267BQoM="; }; }; in diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix index 581315d933..378f514c95 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix index 006715d87f..54da7fd960 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "9.19"; + version = "9.20"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-LBOgw/MfJaVNQV2GeFoa1G74oHrpc7a2mTRaRSBqwBU="; + hash = "sha256-lfK0WxRYElvn2fzMlMpfjM4KXkrhHQ0ZPPt93bNeeoY="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-TKW8y8kPsI0af/nEr3rU9nH49I77u+/6CHE64JgdkOU="; + hash = "sha256-ewozuCtYPaV9d4XD9sdRGMfJcBIE13TC5vNEWdbcGCs="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/default.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/default.nix index c90a372681..d7a65bb7b7 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/default.nix @@ -7,12 +7,14 @@ , libsForQt5 # unwrapped package parameters -, withGrass ? true +, 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/third_party/nixpkgs/pkgs/applications/gis/qgis/ltr.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/ltr.nix index 56a15dbd7d..596347a97e 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/ltr.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/ltr.nix @@ -7,12 +7,14 @@ , libsForQt5 # unwrapped package parameters -, withGrass ? true +, 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/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 98caf348ae..bc807b7e10 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index 49d0fd5b36..577dfdf5e1 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/minidjvu/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/minidjvu/default.nix index a8d3db4d0a..c656eb84f7 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/minidjvu/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/ocrad/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ocrad/default.nix index 8eae4fda5f..c1efa72ad1 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ocrad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ocrad/default.nix @@ -16,18 +16,18 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Optical character recognition (OCR) program & library"; - longDescription = - '' GNU Ocrad is an OCR (Optical Character Recognition) program based on - a feature extraction method. It reads images in pbm (bitmap), pgm - (greyscale) or ppm (color) formats and produces text in byte (8-bit) - or UTF-8 formats. + longDescription = '' + GNU Ocrad is an OCR (Optical Character Recognition) program based on + a feature extraction method. It reads images in pbm (bitmap), pgm + (greyscale) or ppm (color) formats and produces text in byte (8-bit) + or UTF-8 formats. - Also includes a layout analyser able to separate the columns or - blocks of text normally found on printed pages. + Also includes a layout analyser able to separate the columns or + blocks of text normally found on printed pages. - Ocrad can be used as a stand-alone console application, or as a - backend to other programs. - ''; + Ocrad can be used as a stand-alone console application, or as a + backend to other programs. + ''; license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix index 5d3e2d6abc..5552502216 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.8.1"; + version = "0.9.1"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - hash = "sha256-NrR7qjVlac4on3pUde6Au8xlnU0wxWrRRh4QdviNPt4="; + hash = "sha256-PJTEaWU/erqVJakvxfB0aYRsi/tcGxYYZjCdEvThmzM="; # Apparently upstream requires that the compiled executable will know the # commit hash and the date of the commit. This information is also presented # in the output of `pdfcpu version` which we use as a sanity check in the @@ -31,7 +31,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-EGQd2hMf3eWswQ6a2GMqbkf7bE8HVMEqjY6fmWNHmBo="; + vendorHash = "sha256-x5EXv2LkJg2LAdml+1I4MzgTvNo6Gl+6e6UHVQ+Z9rU="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix index 9c465c32c3..423ceaadc0 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/viewnior/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/viewnior/default.nix index a38c247e7f..166f5c785d 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/viewnior/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/viewnior/default.nix @@ -55,13 +55,13 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast and simple image viewer"; - longDescription = - '' Viewnior is insipred by big projects like Eye of Gnome, because of it's - usability and richness,and by GPicView, because of it's lightweight design and - minimal interface. So here comes Viewnior - small and light, with no compromise - with the quality of it's functions. The program is made with better integration - in mind (follows Gnome HIG2). - ''; + longDescription = '' + Viewnior is insipred by big projects like Eye of Gnome, because of it's + usability and richness,and by GPicView, because of it's lightweight design and + minimal interface. So here comes Viewnior - small and light, with no compromise + with the quality of it's functions. The program is made with better integration + in mind (follows Gnome HIG2). + ''; license = licenses.gpl3; homepage = "https://siyanpanayotov.com/project/viewnior/"; maintainers = with maintainers; [ smironov artturin ]; diff --git a/third_party/nixpkgs/pkgs/applications/kde/picmi.nix b/third_party/nixpkgs/pkgs/applications/kde/picmi.nix index 3f5e368868..52a1245610 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/picmi.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/picmi.nix @@ -9,9 +9,10 @@ mkDerivation { homepage = "https://apps.kde.org/picmi/"; description = "Nonogram game"; mainProgram = "picmi"; - longDescription = ''The goal is to reveal the hidden pattern in the board by coloring or + longDescription = '' + The goal is to reveal the hidden pattern in the board by coloring or leaving blank the cells in a grid according to numbers given at the side of the grid. - ''; + ''; maintainers = with maintainers; [ freezeboy ]; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix index d91f48f82d..d0d18bdd16 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix +++ b/third_party/nixpkgs/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="; }; }; }; @@ -67,6 +67,7 @@ let sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ + khaneliman timstott savannidgerinel sebtm diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix index efeb82110c..372131d9f8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix index d33bed6722..58f17050c6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 8231e831b4..16e25dcefd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix index 1a9ea4fd5e..7d89339da1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/camunda-modeler/default.nix b/third_party/nixpkgs/pkgs/applications/misc/camunda-modeler/default.nix index 3dce538aa0..0972247271 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/camunda-modeler/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/chatblade/default.nix b/third_party/nixpkgs/pkgs/applications/misc/chatblade/default.nix index 696cf52ba4..3927c57950 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/chatblade/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/dmenu-rs/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dmenu-rs/default.nix deleted file mode 100644 index 4b15eae9e6..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/doctave/cargo-lock.patch b/third_party/nixpkgs/pkgs/applications/misc/doctave/cargo-lock.patch deleted file mode 100644 index b9b7797bc3..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/doctave/default.nix b/third_party/nixpkgs/pkgs/applications/misc/doctave/default.nix deleted file mode 100644 index 8ddbe3a126..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix index 50c6c9ac94..6078c17f4c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/epdfview/default.nix b/third_party/nixpkgs/pkgs/applications/misc/epdfview/default.nix deleted file mode 100644 index ec43e5a18c..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock index 302c0b1772..90fe537926 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/gollum/gemset.nix b/third_party/nixpkgs/pkgs/applications/misc/gollum/gemset.nix index e9948188e1..c45f4c3672 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gollum/gemset.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/gtk2fontsel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gtk2fontsel/default.nix deleted file mode 100644 index f55e32baeb..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/insulator2/Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/insulator2/Cargo.lock index e119d57c4d..571bd845a5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/insulator2/Cargo.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/insulator2/default.nix b/third_party/nixpkgs/pkgs/applications/misc/insulator2/default.nix index 423a773026..bf26c7c8ba 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/insulator2/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/insulator2/fix-rust-1.80.0.patch b/third_party/nixpkgs/pkgs/applications/misc/insulator2/fix-rust-1.80.0.patch new file mode 100644 index 0000000000..c9a8fa0701 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/keepassxc/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keepassxc/default.nix index 914884a9aa..b5b2465260 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keepassxc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keepassxc/default.nix @@ -146,6 +146,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://keepassxc.org/"; license = licenses.gpl2Plus; + mainProgram = "keepassxc"; maintainers = with maintainers; [ blankparticle ]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix b/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix index 6af515865d..b4e30c49fa 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/kuro/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kuro/default.nix index e0240b38af..95126d1ba1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kuro/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/leetcode-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/leetcode-cli/default.nix index 24d7faf407..dbad8d6512 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/leetcode-cli/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/makehuman/default.nix b/third_party/nixpkgs/pkgs/applications/misc/makehuman/default.nix index 005a97c1e5..b9394aacb6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/makehuman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/makehuman/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation rec { pname = "makehuman"; - version = "1.2.0"; + version = "1.3.0"; source = fetchFromGitHub { owner = "makehumancommunity"; repo = "makehuman"; rev = "v${version}"; - hash = "sha256-mCv6H0B7b4uxozpNHkKsG+Is2H0QYEJnnzKCHixhBpY="; + hash = "sha256-x0v/SkwtOl1lkVi2TRuIgx2Xgz4JcWD3He7NhU44Js4="; name = "${pname}-source"; }; @@ -36,39 +36,6 @@ stdenv.mkDerivation rec { name = "${pname}-assets-source"; }; - patches = [ - # work with numpy>=1.24 - (fetchpatch { - name = "fix-compile_targets.py-when-using-numpy-1.24.0-or-newer"; - url = "https://patch-diff.githubusercontent.com/raw/makehumancommunity/makehuman/pull/220.patch"; - hash = "sha256-ip7U83cCBrl+4gM1GZ2QQIER5Qur6HRu3a/TnHqk//g="; - }) - # crash related to collections.Callable -> collections.abc.Callable - (fetchpatch { - name = "remove-unnecessary-compatibility-test"; - url = "https://patch-diff.githubusercontent.com/raw/makehumancommunity/makehuman/pull/188.patch"; - hash = "sha256-HGrk3n7rhV4YgK8mNUdfHwQl8dFT8yuzjxorvwfMmJw="; - }) - # some OpenGL issue causing blank windows on recent Qt - (fetchpatch { - name = "qt-opengl-update-from-qglwidget-to-qopenglwidget-to-fix-blank"; - url = "https://patch-diff.githubusercontent.com/raw/makehumancommunity/makehuman/pull/197.patch"; - hash = "sha256-fEqBwg1Jd36nKWIT9XPr6Buj1N3AmTQg2LBaoX3eTxw="; - }) - # multisampling issue - (fetchpatch { - name = "switch-default-for-multisampling-and-disable-sample-buffers"; - url = "https://github.com/makehumancommunity/makehuman/commit/c47b884028a24eb190d097e7523a3059e439cb6f.patch"; - hash = "sha256-tknQHX9qQYH15gyOLNhxfO3bsFVIv3Z1F7ZXD1IT1h4="; - }) - # PyQt >= 5.12 - (fetchpatch { - name = "fix-scrolling-issue-on-pyqt5>=5.12"; - url = "https://github.com/makehumancommunity/makehuman/commit/02c4269a2d4c57f68159fe8f437a8b1978b99099.patch"; - hash = "sha256-yR5tZcELX0N83PW/vS6yB5xKoZcHhVp48invlu7quWM="; - }) - ]; - srcs = [ source assets diff --git a/third_party/nixpkgs/pkgs/applications/misc/ola/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ola/default.nix index 669ced198c..26f9845dcf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ola/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ola/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "ola"; - version = "unstable-2020-07-17"; + version = "0.10.9"; src = fetchFromGitHub { owner = "OpenLightingProject"; repo = "ola"; - rev = "e2cd699c7792570500578fd092fb6bfb3d511023"; # HEAD of "0.10" branch - sha256 = "17a3z3zhx00rjk58icd3zlqfw3753f3y8bwy2sza0frdim09lqr4"; + rev = "refs/tags/${version}"; + hash = "sha256-8w8ZT3D/+8Pxl9z2KTXeydVxE5xiPjxZevgmMFgrblU="; }; nativeBuildInputs = [ autoreconfHook bison flex pkg-config perl ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/opentrack/default.nix b/third_party/nixpkgs/pkgs/applications/misc/opentrack/default.nix index d28a9e52a9..13466240ff 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/opentrack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/opentrack/default.nix @@ -1,4 +1,5 @@ { + pkgs, mkDerivation, lib, callPackage, @@ -17,15 +18,17 @@ libevdev, makeDesktopItem, fetchurl, + fetchpatch, + wineWowPackages, }: let - version = "2022.3.0"; + version = "2023.3.0"; aruco = callPackage ./aruco.nix {}; # license.txt inside the zip file is MIT xplaneSdk = fetchzip { - url = "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK303.zip"; - sha256 = "11wqjsr996c5qhiv2djsd55gc373a9qcq30dvc6rhzm0fys42zba"; + url = "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sdk_zip_files/XPSDK401.zip"; + hash = "sha256-tUT9yV1949QVr5VebU/7esg7wwWkyak2TSA/kQSrbeo="; }; in mkDerivation { @@ -36,19 +39,30 @@ in owner = "opentrack"; repo = "opentrack"; rev = "opentrack-${version}"; - sha256 = "sha256-8gpNORTJclYUYp57Vw/0YO3XC9Idurt0a79fhqx0+mo="; + hash = "sha256-C0jLS55DcLJh/e5yM8kLG7fhhKvBNllv5HkfCWRIfc4="; }; + patches = [ + # https://github.com/opentrack/opentrack/pull/1754 + (fetchpatch { + url = "https://github.com/opentrack/opentrack/commit/d501d7e0b237ed0c305525788b423d842ffa356d.patch"; + hash = "sha256-XMGHV78vt/Xn3hS+4V//pqtsdBQCfJPjIXxfwtdXX+Q="; + }) + ]; + nativeBuildInputs = [cmake pkg-config ninja copyDesktopItems]; - buildInputs = [qtbase qttools opencv4 procps eigen libXdmcp libevdev aruco]; + buildInputs = [qtbase qttools opencv4 procps eigen libXdmcp libevdev aruco] + ++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 [ wineWowPackages.stable ]; env.NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3"; dontWrapQtApps = true; cmakeFlags = [ + "-GNinja" + "-DCMAKE_BUILD_TYPE=Release" "-DSDK_ARUCO_LIBPATH=${aruco}/lib/libaruco.a" "-DSDK_XPLANE=${xplaneSdk}" - ]; + ] ++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 [ "-DSDK_WINE=ON" ]; postInstall = '' wrapQtApp $out/bin/opentrack @@ -60,7 +74,7 @@ in exec = "opentrack"; icon = fetchurl { url = "https://github.com/opentrack/opentrack/raw/opentrack-${version}/gui/images/opentrack.png"; - sha256 = "0d114zk78f7nnrk89mz4gqn7yk3k71riikdn29w6sx99h57f6kgn"; + hash = "sha256-9k3jToEpdW14ErbNGHM4c0x/LH7k14RmtvY4dOYnITQ="; }; desktopName = name; genericName = "Head tracking software"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix index ca2b0c033e..fba55f73ca 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.7.2"; + version = "0.8.0"; src = fetchCrate { inherit pname version; - hash = "sha256-Qh/mUEfCvrOrUHJ1kEWb3BLBmMyP/MzUyfFoB+eYj9w="; + hash = "sha256-5FZDHKYv3/ZEzb0tsI7wxydDU0p7zwfhSG2i4UScf6s="; }; - cargoHash = "sha256-VYA5Y6CjhKx3MgQ0pyOO7vw44cKykRjlgUZopgR9pYo="; + cargoHash = "sha256-7SMIN6Nu9W6t27+YoCbJt0HCkNhw/ZU6pn6qRYvrgT8="; meta = with lib; { description = "Simple tui to view & control docker containers"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pyditz/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pyditz/default.nix deleted file mode 100644 index 9fda9dee09..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/therion/default.nix b/third_party/nixpkgs/pkgs/applications/misc/therion/default.nix index fbe734ddc1..3dd72b9f68 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/therion/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix b/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix index 2e74f2fe3e..b706ff58ca 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix index 4790d43364..7cb59e2c8c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix @@ -116,7 +116,7 @@ buildPythonApplication rec { ]; # check phase uses the output bin, which is not possible when cross-compiling - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/applications/misc/wordnet/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wordnet/default.nix index 5ed42ab1fc..6789c33ce2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wordnet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wordnet/default.nix @@ -34,16 +34,16 @@ stdenv.mkDerivation rec { meta = { description = "Lexical database for the English language"; - longDescription = - '' WordNet® is a large lexical database of English. Nouns, verbs, - adjectives and adverbs are grouped into sets of cognitive synonyms - (synsets), each expressing a distinct concept. Synsets are - interlinked by means of conceptual-semantic and lexical relations. - The resulting network of meaningfully related words and concepts can - be navigated with the browser. WordNet is also freely and publicly - available for download. WordNet's structure makes it a useful tool - for computational linguistics and natural language processing. - ''; + longDescription = '' + WordNet® is a large lexical database of English. Nouns, verbs, + adjectives and adverbs are grouped into sets of cognitive synonyms + (synsets), each expressing a distinct concept. Synsets are + interlinked by means of conceptual-semantic and lexical relations. + The resulting network of meaningfully related words and concepts can + be navigated with the browser. WordNet is also freely and publicly + available for download. WordNet's structure makes it a useful tool + for computational linguistics and natural language processing. + ''; homepage = "https://wordnet.princeton.edu/"; license = { diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix index 34629c9fef..dac636ddbd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix @@ -5,13 +5,13 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.22.0-mo3"; + version = "6.22.1-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - hash = "sha256-3KFyCs9Kf0i7IkG1piP/DRj1jTj1VmXbAk/U3Wt4jh0="; + hash = "sha256-CwGHSrnxzKCLKJC7MmqWATqTUNehhRECcX4g/e9oGSI="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix b/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix index 2392feb8a4..23fa019d75 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix index ed77e32e00..bd0b9283c5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix @@ -86,11 +86,11 @@ let in stdenv.mkDerivation rec { pname = "appgate-sdp"; - version = "6.3.2"; + version = "6.4.0"; src = fetchurl { url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "sha256-7W2iUilSK4awrtgZc/c40oivzlyz3RN5U5TUicqavsc="; + sha256 = "sha256-0h6Mz3B7fADGL5tGbrKNYpVIAvRu7Xx0n9OvjOeVCds="; }; # just patch interpreter diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index 11bf657d24..9e2a0d173f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,7 +1,6 @@ { stdenv, lib, fetchpatch , recompressTarball , buildPackages -, buildPlatform , pkgsBuildBuild # Channel data: , channel, upstream-info diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 448a504324..202375b486 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix index 7e0b79cea6..6e311c3b65 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix index b8d17500db..0fb67d46bc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cloudflare-dyndns/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cloudflare-dyndns/default.nix index 087b3c66f0..cf013c5d69 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cloudflare-dyndns/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cloudflare-dyndns/default.nix @@ -1,52 +1,39 @@ -{ lib -, python3 -, fetchFromGitHub -, fetchpatch +{ + lib, + python3, + fetchFromGitHub, }: python3.pkgs.buildPythonApplication rec { pname = "cloudflare-dyndns"; - version = "4.1"; - format = "pyproject"; + version = "5.0"; + pyproject = true; src = fetchFromGitHub { owner = "kissgyorgy"; - repo = pname; + repo = "cloudflare-dyndns"; rev = "v${version}"; - hash = "sha256-6Q5fpJ+HuQ+hc3xTtB5tR43pn9WZ0nZZR723iLAkpis="; + hash = "sha256-tI6qdNxIMEuAR+BcqsRi2EBXTQnfdDLKW7Y+fbcmlao="; }; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ attrs click cloudflare - pydantic_1 + pydantic requests + httpx + truststore ]; nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; - patches = [ - # Switch to poetry-core, https://github.com/kissgyorgy/cloudflare-dyndns/pull/22 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/kissgyorgy/cloudflare-dyndns/commit/741ed1ccb3373071ce15683a3b8ddc78d64866f8.patch"; - sha256 = "sha256-mjSah0DWptZB6cjhP6dJg10BpJylPSQ2K4TKda7VmHw="; - }) - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'click = "^7.0"' 'click = "*"' \ - --replace 'attrs = "^21.1.0"' 'attrs = "*"' - ''; - disabledTests = [ "test_get_ipv4" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index b927703748..54764ec305 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix index f699a53552..2aea823dd4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.34"; + version = "0.6.35"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - hash = "sha256-rbZySF7DrBN37YIetFXZE/aPSRex5cQnV8FZ0KDQ71k="; + hash = "sha256-ohT4h9w6gaOk6C3O8eUBcmXHRSzL2mcRO8RnNY8htso="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix index c5f161db09..5182bb5469 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix index 9e43739831..7c7fdbf248 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "k0sctl"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "k0sproject"; repo = "k0sctl"; rev = "refs/tags/v${version}"; - hash = "sha256-86MLQdXc10bvDFeq3ImD19ytjVPVD19eJzicIo6oJZc="; + hash = "sha256-6mvSVbSTPFiAIDxNQUmgFmS+3v3RUh10Y552u9bHOn0="; }; - vendorHash = "sha256-eKim5F8bKC1UOY+lOo0NSHOzXuMOcnBjkjm3/vDkGEM="; + vendorHash = "sha256-Hl/eSFbwFiuSaaPh5blWFfz6m4VNrS5mYL8ehQlb90I="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k8sgpt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k8sgpt/default.nix deleted file mode 100644 index 46fe219868..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/kaniko/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kaniko/default.nix index 2d9136484e..24779b6035 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kaniko/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kaniko/default.nix @@ -29,7 +29,7 @@ buildGoModule rec { doCheck = false; # requires docker, container-diff (unpackaged yet) - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' for shell in bash fish zsh; do $out/bin/executor completion $shell > executor.$shell installShellCompletion executor.$shell diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix index 157ff1358c..4356788418 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix index 8fbeda219a..f7bd569520 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix index 27eb93f118..e8156c872c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -29,7 +29,7 @@ buildGoModule rec { ''; doCheck = true; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd kubeshark \ --bash <($out/bin/kubeshark completion bash) \ --fish <($out/bin/kubeshark completion fish) \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevela/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevela/default.nix index 75e68b3c19..b61535492b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevela/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevela/default.nix @@ -40,7 +40,7 @@ buildGoModule rec { ''; nativeBuildInputs = [ installShellFiles ]; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd vela \ --bash <($out/bin/vela completion bash) \ --zsh <($out/bin/vela completion zsh) diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix index 32aaffc073..18ae3d8256 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix index 8c145ef639..158c8ff824 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/nova/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nova/default.nix index 1a91767ae1..b8a5f1d9e3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nova/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/default.nix index 3619742d8a..29a0082d23 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/default.nix @@ -14,13 +14,13 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; rev = "v${version}"; - hash = "sha256-+1ctvUz1Prhon+w5fGO+IQCYl7uEMZwAYMfQut7fmO4="; + hash = "sha256-YUN+JBYn8Bq4glZNBdlr++WJgGpGSKK1PjWqaduF8bg="; }; vendorHash = "sha256-cM2DSP2ss3vleUhPBIdyxKeWJxtHpdjL5b5HVS/iC6o="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix index 583aa3bf06..801a4cfbc5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-Ezie6RQsigmJgdvnSVk6awuUu2kODSio9DNg4bow76M="; + hash = "sha256-6WHeiVH/vZHiM4bqq3T5lC0ARldJyZtIErPeDgrZgxc="; }; - vendorHash = "sha256-9qkealjjdBO659fdWdgFii3ThPRwKpYasB03L3Bktqs="; + vendorHash = "sha256-aTtvVpL979BUvSBwBqRqCWSWIBBmmty9vBD97Q5P4+E="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index 74cf9083d7..6b346f768f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/third_party/nixpkgs/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=", @@ -162,11 +162,11 @@ "vendorHash": null }, "bigip": { - "hash": "sha256-ny/FjAStb4qUzVeAkkqgKDb5lzmR6e0J1RaG6CWBrYg=", + "hash": "sha256-7Km+FqUyCCFzVmSpg4m7FuWs3MF+mKqPxEQApQqe35M=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.22.4", + "rev": "v1.22.5", "spdx": "MPL-2.0", "vendorHash": null }, @@ -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=", @@ -994,13 +994,13 @@ "vendorHash": "sha256-pbJk35O8EowCa2dgLCrPDgakR0EJVaAnEvePGnrl/YQ=" }, "postgresql": { - "hash": "sha256-v/88uUvILQT0uHRgfwMuLQWw0ma2ELT691kQ9GVjr/A=", + "hash": "sha256-ldiMHcA0uJa7z5qx8ATuu7wn6W7HTLXEw3CG9rGnU/4=", "homepage": "https://registry.terraform.io/providers/cyrilgdn/postgresql", "owner": "cyrilgdn", "repo": "terraform-provider-postgresql", - "rev": "v1.23.0", + "rev": "v1.24.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-fHNXJGyOWGF7Dwfk14GWmLXSIENsshIHbxkF7iQJNuI=" + "vendorHash": "sha256-2DWYW/NoNqchnfxEPBCFstzGuFKwXAXVmS9RqRWViWo=" }, "powerdns": { "hash": "sha256-NtJs2oNJbjUYNFsbrfo2RYhqOlKA15GJt9gi1HuTIw0=", @@ -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/third_party/nixpkgs/pkgs/applications/networking/discordo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/discordo/default.nix index b7b7f0ad53..0116680f01 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/discordo/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/flent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/flent/default.nix deleted file mode 100644 index f2d796b213..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix index 706904a8dd..259735919c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "-DENABLE_TESTS=${if doCheck then "ON" else "OFF"}" ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; nativeCheckInputs = [ check ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/lieer/default.nix b/third_party/nixpkgs/pkgs/applications/networking/lieer/default.nix index 8c8932c911..32f8d66639 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/lieer/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix index 01ced9fc86..8c09422a11 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix index aeb6ec21fb..fb363bc802 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { version = "0.12.1"; src = fetchFromGitea { - domain = "maxwell.ydns.eu/git"; + domain = "maxwell.eurofusion.eu/git"; owner = "rnhmjoj"; repo = "magnetico"; rev = "v${version}"; @@ -31,7 +31,7 @@ buildGoModule rec { meta = with lib; { description = "Autonomous (self-hosted) BitTorrent DHT search engine suite"; - homepage = "https://maxwell.ydns.eu/git/rnhmjoj/magnetico"; + homepage = "https://maxwell.eurofusion.eu/git/rnhmjoj/magnetico"; license = licenses.agpl3Only; badPlatforms = platforms.darwin; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/3.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/3.nix index 49b412bf76..3071928503 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/3.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix index 0ee03ab5bb..fe8bc2e322 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/rrsync.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/rrsync.nix index 67cec6eeee..7bbdbf3adc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/office/abiword/default.nix b/third_party/nixpkgs/pkgs/applications/office/abiword/default.nix index d03b60da6e..87918b9e85 100644 --- a/third_party/nixpkgs/pkgs/applications/office/abiword/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/abiword/default.nix @@ -1,7 +1,9 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab , fetchpatch +, autoreconfHook269 +, autoconf-archive , pkg-config , gtk3 , fribidi @@ -24,9 +26,12 @@ stdenv.mkDerivation rec { pname = "abiword"; version = "3.0.5"; - src = fetchurl { - url = "https://www.abisource.com/downloads/abiword/${version}/source/${pname}-${version}.tar.gz"; - hash = "sha256-ElckfplwUI1tFFbT4zDNGQnEtCsl4PChvDJSbW86IbQ="; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "AbiWord"; + rev = "refs/tags/release-${version}"; + hash = "sha256-Z55qPm4MYwbG8bvXpX2TH8bxQaJjvb3Em1ymM1XwGqo="; }; patches = [ @@ -38,6 +43,8 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + autoreconfHook269 + autoconf-archive pkg-config wrapGAppsHook3 perl @@ -62,10 +69,18 @@ stdenv.mkDerivation rec { strictDeps = true; enableParallelBuilding = true; + postPatch = '' + patchShebangs ./tools/cdump/xp/cdump.pl ./po/ui-backport.pl + ''; + + preAutoreconf = '' + ./autogen-common.sh + ''; + meta = with lib; { description = "Word processing program, similar to Microsoft Word"; mainProgram = "abiword"; - homepage = "https://www.abisource.com/"; + homepage = "https://gitlab.gnome.org/World/AbiWord/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ pSub ylwghst sna ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/activitywatch/Cargo.lock b/third_party/nixpkgs/pkgs/applications/office/activitywatch/Cargo.lock deleted file mode 100644 index f7069e5455..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/office/activitywatch/commit-hash.patch b/third_party/nixpkgs/pkgs/applications/office/activitywatch/commit-hash.patch index 7f0b32bec6..083d333230 100644 --- a/third_party/nixpkgs/pkgs/applications/office/activitywatch/commit-hash.patch +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/office/activitywatch/default.nix b/third_party/nixpkgs/pkgs/applications/office/activitywatch/default.nix index 54105e7c71..df7b955737 100644 --- a/third_party/nixpkgs/pkgs/applications/office/activitywatch/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/office/activitywatch/wrapper.nix b/third_party/nixpkgs/pkgs/applications/office/activitywatch/wrapper.nix index 56588e0b74..5ae59a16df 100644 --- a/third_party/nixpkgs/pkgs/applications/office/activitywatch/wrapper.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/office/kmymoney/default.nix b/third_party/nixpkgs/pkgs/applications/office/kmymoney/default.nix index a910d76b29..86547c638d 100644 --- a/third_party/nixpkgs/pkgs/applications/office/kmymoney/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/kmymoney/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { "kmymoney/plugins/woob/interface/kmymoneywoob.py" ''; - doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; nativeInstallCheckInputs = [ xvfb-run ]; installCheckPhase = lib.optionalString doInstallCheck '' diff --git a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix b/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix index 5c4cb5dee3..01d6fe74c5 100644 --- a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "7.0.7"; + version = "7.0.8"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - hash = "sha256-ERL+zKjNOz+j/Q5dyTXVczLnwaTl/SzgSaKVkA9uyJ4="; + hash = "sha256-utiqS4/PvlkQesqTOyEvj8uwW1sDxlqjnhv6GFfY5uk="; }; dontPatchELF = true; diff --git a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix index e22bef1541..9b9d6f29bc 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/radio/xlog/default.nix b/third_party/nixpkgs/pkgs/applications/radio/xlog/default.nix index e591c98f30..7c7d5f574a 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/xlog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/xlog/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Amateur radio logging program"; - longDescription = - '' Xlog is an amateur radio logging program. - It supports cabrillo, ADIF, trlog (format also used by tlf), - and EDI (ARRL VHF/UHF contest format) and can import twlog, editest and OH1AA logbook files. - Xlog is able to do DXCC lookups and will display country information, CQ and ITU zone, - location in latitude and longitude and distance and heading in kilometers or miles, - both for short and long path. - ''; + longDescription = '' + Xlog is an amateur radio logging program. + It supports cabrillo, ADIF, trlog (format also used by tlf), + and EDI (ARRL VHF/UHF contest format) and can import twlog, editest and OH1AA logbook files. + Xlog is able to do DXCC lookups and will display country information, CQ and ITU zone, + location in latitude and longitude and distance and heading in kilometers or miles, + both for short and long path. + ''; homepage = "https://www.nongnu.org/xlog"; maintainers = [ maintainers.mafo ]; license = licenses.gpl3; diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/xearth/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/xearth/default.nix index 6123f277fd..206f7110ff 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/xearth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/xearth/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { description = "sets the X root window to an image of the Earth"; mainProgram = "xearth"; homepage = "https://xearth.org"; - longDescription = - '' Xearth sets the X root window to an image of the Earth, as seen from your favorite vantage point in space, - correctly shaded for the current position of the Sun. - By default, xearth updates the displayed image every five minutes. - ''; + longDescription = '' + Xearth sets the X root window to an image of the Earth, as seen from your favorite vantage point in space, + correctly shaded for the current position of the Sun. + By default, xearth updates the displayed image every five minutes. + ''; maintainers = [ maintainers.mafo ]; license = { fullName = "xearth license"; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/blast/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/blast/default.nix index 791d6049ad..9dc5fcb1fe 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/blast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/blast/default.nix @@ -96,8 +96,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = with lib; { - description = ''Basic Local Alignment Search Tool (BLAST) finds regions of - similarity between biological sequences''; + description = ''Basic Local Alignment Search Tool (BLAST) finds regions of similarity between biological sequences''; homepage = "https://blast.ncbi.nlm.nih.gov/Blast.cgi"; license = licenses.publicDomain; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bwa-mem2/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bwa-mem2/default.nix index 0a2d2c8d20..eb6b01b147 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/bwa-mem2/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/biology/cmtk/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/cmtk/default.nix index 531f9047ba..f454bfc4f4 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/cmtk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/cmtk/default.nix @@ -43,9 +43,11 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Computational Morphometry Toolkit"; mainProgram = "cmtk"; - longDescription = ''A software toolkit for computational morphometry of + longDescription = '' + A software toolkit for computational morphometry of biomedical images, CMTK comprises a set of command line tools and a - back-end general-purpose library for processing and I/O''; + back-end general-purpose library for processing and I/O + ''; maintainers = with maintainers; [ tbenst ]; platforms = platforms.all; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix index 531d025dd5..9f5c25b04c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/biology/emboss/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/emboss/default.nix index 90fe611209..ef501c12f6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/emboss/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/emboss/default.nix @@ -19,11 +19,13 @@ stdenv.mkDerivation rec { meta = { description = "European Molecular Biology Open Software Suite"; - longDescription = ''EMBOSS is a free Open Source software analysis package - specially developed for the needs of the molecular biology (e.g. EMBnet) - user community, including libraries. The software automatically copes with - data in a variety of formats and even allows transparent retrieval of - sequence data from the web.''; + longDescription = '' + EMBOSS is a free Open Source software analysis package + specially developed for the needs of the molecular biology (e.g. EMBnet) + user community, including libraries. The software automatically copes with + data in a variety of formats and even allows transparent retrieval of + sequence data from the web. + ''; license = lib.licenses.gpl2; homepage = "https://emboss.sourceforge.net/"; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix index a48019febb..80704698c0 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "16.2.21"; + version = "16.3.1"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - hash = "sha256-9gIOrHoy0JyoPXaHOfBDHCL+ykmmHNam+Um12sHqZsE="; + hash = "sha256-mjID6o+2yhzKd1g3MO4as1dA11nhessjzCDHSUyUQBw="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix index d500e78b24..76192e4d4d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -15,6 +15,7 @@ , gsl , boost180 , autoPatchelfHook +, enableQcmaquis ? false # Note that the CASPT2 module is broken with MPI # See https://gitlab.com/Molcas/OpenMolcas/-/issues/169 , enableMpi ? false @@ -24,14 +25,15 @@ assert blas-ilp64.isILP64; 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 ]); 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 +45,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 = [ @@ -104,8 +106,8 @@ stdenv.mkDerivation rec { "-DHDF5=ON" "-DFDE=ON" "-DEXTERNAL_LIBXC=${lib.getDev libxc}" - "-DDMRG=ON" - "-DNEVPT2=ON" + (lib.strings.cmakeBool "DMRG" enableQcmaquis) + (lib.strings.cmakeBool "NEVPT2" enableQcmaquis) "-DCMAKE_SKIP_BUILD_RPATH=ON" ] ++ lib.optionals (blas-ilp64.passthru.implementation == "openblas") [ "-DOPENBLASROOT=${blas-ilp64.passthru.provider.dev}" diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/qcmaquis.patch b/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/qcmaquis.patch index ca276bb3fb..c388f699a1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/qcmaquis.patch +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix index 0c557fbeca..0ec5dcb683 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/electronics/openroad/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/openroad/default.nix index 65bf094c2a..cae21d7bba 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/openroad/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/logic/bitwuzla/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/bitwuzla/default.nix index f5a5296de9..6499b48d95 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/bitwuzla/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/logic/cadical/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cadical/default.nix index 8e5408d12f..8f324f077d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/cadical/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/cadical/default.nix @@ -1,14 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, copyPkgconfigItems, makePkgconfigItem }: +{ lib, stdenv, fetchFromGitHub, copyPkgconfigItems, makePkgconfigItem +, version ? "2.1.0" +}: stdenv.mkDerivation rec { pname = "cadical"; - version = "2.1.0"; + inherit version; src = fetchFromGitHub { owner = "arminbiere"; repo = "cadical"; rev = "rel-${version}"; - sha256 = "sha256-sSvJgHxsRaJ/xHEK32fox0MFI7u+pj5ERLfNn2s8kC8="; + hash = { + "2.1.0" = "sha256-sSvJgHxsRaJ/xHEK32fox0MFI7u+pj5ERLfNn2s8kC8="; + "2.0.0" = "sha256-qoeEM9SdpuFuBPeQlCzuhPLcJ+bMQkTUTGiT8QdU8rc="; + }.${version}; }; outputs = [ "out" "dev" "lib" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/eigenmath/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/eigenmath/default.nix index e183454852..6e716fa77a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/eigenmath/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix index 1503d3a899..2dffa14c66 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-env.nix @@ -49,7 +49,7 @@ , zlib , gsl , ntl -, jdk +, jre8 , less }: @@ -96,7 +96,7 @@ let ecm lcalc rubiks - jdk # only needed for `jmol` which may be replaced in the future + jre8 # only needed for `jmol` (https://sourceforge.net/p/jmol/mailman/message/58818762/), which will be optional in sage 10.5 less # needed to prevent transient test errors until https://github.com/ipython/ipython/pull/11864 is resolved ] )); diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix index 392a529f0d..4396fe135d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix index 32de529c55..b3fc3e1525 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/misc/tulip/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/tulip/default.nix index 590b429e73..713238cc3f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/tulip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/tulip/default.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { meta = { description = "Visualization framework for the analysis and visualization of relational data"; - longDescription = - '' Tulip is an information visualization framework dedicated to the - analysis and visualization of relational data. Tulip aims to - provide the developer with a complete library, supporting the design - of interactive information visualization applications for relational - data that can be tailored to the problems he or she is addressing. - ''; + longDescription = '' + Tulip is an information visualization framework dedicated to the + analysis and visualization of relational data. Tulip aims to + provide the developer with a complete library, supporting the design + of interactive information visualization applications for relational + data that can be tailored to the problems he or she is addressing. + ''; homepage = "http://tulip.labri.fr/"; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix index 33691aaef4..2dfee198c0 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -49,16 +49,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MrlzAZWLgfwIoTdxY+fjWbrv7tygAjnxXebiEgwOM9A="; + hash = "sha256-ZhkuuxTx2y8vOfxfpDpJAyNyDdRWab0pqyDdbOCQ2XE="; }; - cargoHash = "sha256-7HPTELRlmyjj7CXNbgqrzxW548BgbxybWi+tT3rOCX0="; + cargoHash = "sha256-T+/G2z7H/egJ/IlP3KA31jydg1CmFdLW8bLYSf/yWck="; nativeBuildInputs = [ cmake diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix index e7eb39e8a7..d84858ad07 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix @@ -26,7 +26,7 @@ }: let - version = "1.18.1"; + version = "1.19.0"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -98,7 +98,7 @@ stdenv.mkDerivation { owner = "dnkl"; repo = "foot"; rev = version; - hash = "sha256:15s7fbkibvq53flf5yy9ad37y53pl83rcnjwlnfh96a4s5mj6v5d"; + hash = "sha256-EY6VNrAxqA20RHLqfusbdxJPfEE7Fchi1W0noHfbxws="; }; separateDebugInfo = true; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/iterm2/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/iterm2/default.nix index 1ce3fbf94c..dc9542be00 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/iterm2/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix index 9443c1e9cd..77658b58f2 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix +++ b/third_party/nixpkgs/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 @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; configureFlags = lib.optional (!withInternalSqlite) "--disable-internal-sqlite" diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix index 746c8d40a3..83781ea1cf 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/ghq/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/ghq/default.nix index 546aeb19f3..10f923aca1 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/ghq/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/git-mit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-mit/default.nix index 2dc3ab74a0..e334ef8c9f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-mit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.13.29"; + version = "5.13.30"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-8XUpUpsd2q/1N28ZAPt7rW0pJu0WzE6oVSOwdJxhSBk="; + hash = "sha256-HBY9YJk7LvhCGAuXsWpugD5uSitLc1f/F4Ms4PxhZUo="; }; - cargoHash = "sha256-KtdbYzXHpdg0Rf4ENrWpP0+vG3+HlLVi7MLeXp9HoVw="; + cargoHash = "sha256-XMlVGr88RWwfJ2gHTSxdOxgUDlf51ra/opL66Dkd1p4="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix index f9c59ad18e..7a95582ee0 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/git-town/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-town/default.nix index 00d2722bcd..226afe3103 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-town/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix index e6dec35a4a..2ebe3c4d23 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix @@ -57,24 +57,24 @@ let pname = "gitkraken"; - version = "10.4.0"; + version = "10.4.1"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - hash = "sha256-JGWDOAkJEnhvUyQOFsmoeW9Izj0IuHNpYGlYAMiWPj0="; + hash = "sha256-ZvLDGhBnWjjWqzwqJOz91X8hr94jkXtMA8CL2hh9mlI="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - hash = "sha256-yCDE6QJMgU2Mgr/kUDnbKwQ3MpgVcdjAK7fnTAjSL54="; + hash = "sha256-21VwDFw2dyySoc4NC/RR3k/VtksqaZ5vkdx0z5MKqLc="; }; aarch64-darwin = fetchzip { url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; - hash = "sha256-nh+tO++QvPx9jyZuxNrH7rHFXZqVnu5jyiki3oWdw7E="; + hash = "sha256-N8WMbJFC74tIeJ6Yyk58nT+sIBYN/7PNLdYNxGSB2yM="; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json index 033870a4e4..42f2c2dc47 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index 45f5914852..a826ba55b0 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/git.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/git.nix index a6d272b2fb..2610c39ca7 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/git.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index 202944412c..5cd236a468 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 7fb6746892..f0fb34deeb 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index eaaba0d4bd..53614d3a39 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 235ddbf54a..7386a93981 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 2bb3d4092e..56051fbe48 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 681d70b508..034a7d66fe 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 741336ca72..d032f8bf0b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/gitnr/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitnr/default.nix index 3e4e1c07f8..5d28138509 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitnr/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix index f89e80c2da..f78401a522 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/rcs/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/rcs/default.nix index b838eb6f74..7cfeb20e8d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/rcs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/rcs/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.gnu.org/software/rcs/"; description = "Revision control system"; - longDescription = - '' The GNU Revision Control System (RCS) manages multiple revisions of - files. RCS automates the storing, retrieval, logging, - identification, and merging of revisions. RCS is useful for text - that is revised frequently, including source code, programs, - documentation, graphics, papers, and form letters. - ''; + longDescription = '' + The GNU Revision Control System (RCS) manages multiple revisions of + files. RCS automates the storing, retrieval, logging, + identification, and merging of revisions. RCS is useful for text + that is revised frequently, including source code, programs, + documentation, graphics, papers, and form letters. + ''; license = lib.licenses.gpl3Plus; maintainers = [ ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/freetube/default.nix b/third_party/nixpkgs/pkgs/applications/video/freetube/default.nix index ffe9beea5c..77959f42af 100644 --- a/third_party/nixpkgs/pkgs/applications/video/freetube/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/gpu-screen-recorder/default.nix b/third_party/nixpkgs/pkgs/applications/video/gpu-screen-recorder/default.nix index 3df7380579..93603de2d8 100644 --- a/third_party/nixpkgs/pkgs/applications/video/gpu-screen-recorder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/gpu-screen-recorder/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpu-screen-recorder"; - version = "4.2.1"; + version = "4.2.3"; src = fetchurl { url = "https://dec05eba.com/snapshot/gpu-screen-recorder.git.${finalAttrs.version}.tar.gz"; - hash = "sha256-eCjAlPEg8lkL8T0lgxr0F8ouFGwqfsRxDSQuG6RbpZE="; + hash = "sha256-M2bk1WwLlbwspEoPIRMix17ihi72UuRWwiKBdPfim2M="; }; sourceRoot = "."; @@ -59,11 +59,12 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ + # Install the upstream systemd unit + (lib.mesonBool "systemd" true) # Enable Wayland support (lib.mesonBool "portal" true) # Handle by the module (lib.mesonBool "capabilities" false) - (lib.mesonBool "systemd" false) (lib.mesonBool "nvidia_suspend_fix" false) ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix b/third_party/nixpkgs/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix index d84527dcae..92863147be 100644 --- a/third_party/nixpkgs/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix +++ b/third_party/nixpkgs/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpu-screen-recorder-gtk"; - version = "4.2.1"; + version = "4.2.3"; src = fetchurl { url = "https://dec05eba.com/snapshot/gpu-screen-recorder-gtk.git.${finalAttrs.version}.tar.gz"; - hash = "sha256-qk5bI23fypvv0yN9Ql7TOerBhoRzj65EcoAy3lMGMqc="; + hash = "sha256-pMUjglgRM51hjPbt6VP0aqM0oo7IiyPXTY/kLwwdR/k="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix index 4d36bdc4a8..96436449e6 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix @@ -7,14 +7,14 @@ }: buildLua (finalAttrs: { pname = "modernx-zydezu"; - version = "0.3.7"; + version = "0.3.8"; scriptPath = "modernx.lua"; src = fetchFromGitHub { owner = "zydezu"; repo = "ModernX"; rev = finalAttrs.version; - hash = "sha256-slJYbhjNrzwq5rl83HV0Uy7BUK/bbltWSyH0198kSqw="; + hash = "sha256-dHjEmE/m5lAF3XyyebO/23BLmoS5sfSoNZuTtJv/JEA="; }; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/arion/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/arion/default.nix index e5ab20cf19..1f4c717acc 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/arion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/arion/default.nix @@ -49,7 +49,7 @@ let # feature, but rather to make the program more robustly self- # contained. - postInstall = ''${o.postInstall or ""} + postInstall = o.postInstall or "" + '' mkdir -p $out/libexec mv $out/bin/arion $out/libexec makeWrapper $out/libexec/arion $out/bin/arion \ diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock b/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock index dbb3ee5a6b..19095505c6 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 9af9b96482..2735c7f9e8 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix index 5dca484e5e..815330b136 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/virtualization/ddev/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/ddev/default.nix index 95aacbeb63..e4f8f1352e 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/ddev/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix index 193776fa5e..baa95b13c9 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix @@ -1,11 +1,11 @@ { lib , fetchFromGitHub -, hostPlatform +, stdenv , lld }: let - arch = hostPlatform.qemuArch; + arch = stdenv.hostPlatform.qemuArch; target = ./. + "/${arch}-unknown-none.json"; @@ -15,7 +15,7 @@ assert lib.assertMsg (builtins.pathExists target) "Target spec not found"; let cross = import ../../../.. { - system = hostPlatform.system; + system = stdenv.hostPlatform.system; crossSystem = lib.systems.examples."${arch}-embedded" // { rust.rustcTarget = "${arch}-unknown-none"; rust.platform = lib.importJSON target; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix index 13d254699f..23e93e8fdf 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix @@ -78,8 +78,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="; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix index 524077cd02..dfb0bd9814 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix index 9eda8a64da..0aed33ced1 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix index f2571d11fe..e94206070d 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix index 771b3b1841..db4af50f49 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix @@ -86,7 +86,11 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs.src.meta) homepage; description = "Blazing fast wayland wallpaper utility"; license = licenses.bsd3; - maintainers = with maintainers; [ wozeparrot fufexan ]; + maintainers = with maintainers; [ + fufexan + khaneliman + wozeparrot + ]; inherit (wayland.meta) platforms; broken = stdenv.hostPlatform.isDarwin; mainProgram = "hyprpaper"; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix index 7d54fa1610..ecf77813b2 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix @@ -61,7 +61,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Wlroots-compatible Wayland color picker that does not suck"; homepage = "https://github.com/hyprwm/hyprpicker"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fufexan ]; + maintainers = with lib.maintainers; [ + fufexan + khaneliman + ]; platforms = wayland.meta.platforms; mainProgram = "hyprpicker"; }; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index ef479589d5..e46b2e677a 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -91,7 +91,10 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/hyprwm/xdg-desktop-portal-hyprland/releases/tag/v${finalAttrs.version}"; mainProgram = "hyprland-share-picker"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fufexan ]; + maintainers = with lib.maintainers; [ + fufexan + khaneliman + ]; platforms = lib.platforms.linux; }; }) diff --git a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix index b4736bc960..6d8b9a0a75 100644 --- a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix @@ -134,6 +134,7 @@ let else if targetPlatform.isLoongArch64 then "${sharedLibraryLoader}/lib/ld-linux-loongarch*.so.1" else if targetPlatform.isDarwin then "/usr/lib/dyld" else if targetPlatform.isFreeBSD then "${sharedLibraryLoader}/libexec/ld-elf.so.1" + else if targetPlatform.isOpenBSD then "${sharedLibraryLoader}/libexec/ld.so" else if hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else ""; diff --git a/third_party/nixpkgs/pkgs/build-support/build-graalvm-native-image/default.nix b/third_party/nixpkgs/pkgs/build-support/build-graalvm-native-image/default.nix index 0ac84b0005..d2f3aef886 100644 --- a/third_party/nixpkgs/pkgs/build-support/build-graalvm-native-image/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/nim/build-nim-package.nix b/third_party/nixpkgs/pkgs/build-support/build-nim-package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/nim/build-nim-package.nix rename to third_party/nixpkgs/pkgs/build-support/build-nim-package.nix diff --git a/third_party/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git b/third_party/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git index b921f161f0..1e8ac0ec66 100755 --- a/third_party/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/third_party/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git @@ -412,6 +412,7 @@ remove_tmpPath() { } remove_tmpHomePath() { + chmod -R u+w "$tmpHomePath" rm -rf "$tmpHomePath" } diff --git a/third_party/nixpkgs/pkgs/build-support/go/package.nix b/third_party/nixpkgs/pkgs/build-support/go/package.nix index 754736dfbe..f0b98d155e 100644 --- a/third_party/nixpkgs/pkgs/build-support/go/package.nix +++ b/third_party/nixpkgs/pkgs/build-support/go/package.nix @@ -289,6 +289,7 @@ lib.warnIf (buildFlags != "" || buildFlagsArray != "") "`buildFlags`/`buildFlagsArray` are deprecated and will be removed in the 24.11 release. Use the `ldflags` and/or `tags` attributes instead" lib.warnIf (builtins.elem "-buildid=" ldflags) "`-buildid=` is set by default as ldflag by buildGoModule" lib.warnIf (builtins.elem "-trimpath" GOFLAGS) "`-trimpath` is added by default to GOFLAGS by buildGoModule when allowGoReference isn't set to true" -lib.warn '''buildGoPackage' is deprecated and will be removed for the 25.05 release. -Please use 'buildGoModule' instead. Tips for migration can be found in the Go section of the nixpkgs manual.'' +lib.warn '' + 'buildGoPackage' is deprecated and will be removed for the 25.05 release. + Please use 'buildGoModule' instead. Tips for migration can be found in the Go section of the nixpkgs manual.'' package diff --git a/third_party/nixpkgs/pkgs/build-support/make-pkgconfigitem/default.nix b/third_party/nixpkgs/pkgs/build-support/make-pkgconfigitem/default.nix index e459184b8d..52c1fd3af9 100644 --- a/third_party/nixpkgs/pkgs/build-support/make-pkgconfigitem/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/make-pkgconfigitem/default.nix @@ -51,9 +51,7 @@ let lib.pipe attrs [ (lib.mapAttrsToList renderFunc) (builtins.filter (v: v != "")) - (builtins.concatStringsSep "\n") - (section: ''${section} - '') + (lib.concatLines) ]; variablesSectionRendered = renderSomething renderVariable variables; diff --git a/third_party/nixpkgs/pkgs/build-support/release/nix-build.nix b/third_party/nixpkgs/pkgs/build-support/release/nix-build.nix index 348cd5b834..8d59809174 100644 --- a/third_party/nixpkgs/pkgs/build-support/release/nix-build.nix +++ b/third_party/nixpkgs/pkgs/build-support/release/nix-build.nix @@ -160,7 +160,8 @@ stdenv.mkDerivation ( # Build out of source tree and make the source tree read-only. This # helps catch violations of the GNU Coding Standards (info # "(standards) Configuration"), like `make distcheck' does. - '' mkdir "../build" + '' + mkdir "../build" cd "../build" configureScript="../$sourceRoot/configure" chmod -R a-w "../$sourceRoot" diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix index 2dc130e55d..b0c9f93649 100644 --- a/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix @@ -469,7 +469,11 @@ rec { as a easy way to build multiple derivations at once. */ symlinkJoin = - args_@{ name + args_@{ + name ? + assert lib.assertMsg (args_ ? pname && args_ ? version) + "symlinkJoin requires either a `name` OR `pname` and `version`"; + "${args_.pname}-${args_.version}" , paths , preferLocalBuild ? true , allowSubstitutes ? false diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix b/third_party/nixpkgs/pkgs/by-name/_1/_1password-cli/package.nix similarity index 60% rename from third_party/nixpkgs/pkgs/applications/misc/1password/default.nix rename to third_party/nixpkgs/pkgs/by-name/_1/_1password-cli/package.nix index cbc05d27b8..0850136676 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix +++ b/third_party/nixpkgs/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,21 +78,21 @@ 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; { description = "1Password command-line tool"; homepage = "https://developer.1password.com/docs/cli/"; downloadPage = "https://app-updates.agilebits.com/product_history/CLI2"; - maintainers = with maintainers; [ joelburget ]; + maintainers = with maintainers; [ + joelburget + khaneliman + ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; inherit mainProgram platforms; diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password/update.sh b/third_party/nixpkgs/pkgs/by-name/_1/_1password-cli/update.sh similarity index 97% rename from third_party/nixpkgs/pkgs/applications/misc/1password/update.sh rename to third_party/nixpkgs/pkgs/by-name/_1/_1password-cli/update.sh index 562c1af31a..4f04279fce 100755 --- a/third_party/nixpkgs/pkgs/applications/misc/1password/update.sh +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ac/act/package.nix b/third_party/nixpkgs/pkgs/by-name/ac/act/package.nix index 621a392fe2..b81967bec1 100644 --- a/third_party/nixpkgs/pkgs/by-name/ac/act/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ad/ad-miner/package.nix b/third_party/nixpkgs/pkgs/by-name/ad/ad-miner/package.nix index 3a7b3b6853..b1aaf615c6 100644 --- a/third_party/nixpkgs/pkgs/by-name/ad/ad-miner/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ae/aerospace/package.nix b/third_party/nixpkgs/pkgs/by-name/ae/aerospace/package.nix index f62116273a..d7ca4c89b1 100644 --- a/third_party/nixpkgs/pkgs/by-name/ae/aerospace/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ae/aerospace/package.nix @@ -9,7 +9,7 @@ let appName = "AeroSpace.app"; - version = "0.14.2-Beta"; + version = "0.15.2-Beta"; in stdenv.mkDerivation { pname = "aerospace"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/nikitabobko/AeroSpace/releases/download/v${version}/AeroSpace-v${version}.zip"; - hash = "sha256-v2D/IV9Va0zbGHEwSGt6jvDqQYqha290Lm6u+nZTS3A="; + sha256 = "sha256-jOSUtVSiy/S4nsgvfZZqZjxsppqNi90edn8rcTa+pFQ="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ai/aider-chat/package.nix b/third_party/nixpkgs/pkgs/by-name/ai/aider-chat/package.nix index d8d42d73c4..2b2e9cc9db 100644 --- a/third_party/nixpkgs/pkgs/by-name/ai/aider-chat/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ai/aider-chat/package.nix @@ -12,7 +12,7 @@ let self = python3; packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; }; }; - version = "0.59.0"; + version = "0.60.0"; in python3.pkgs.buildPythonApplication { pname = "aider-chat"; @@ -20,60 +20,100 @@ python3.pkgs.buildPythonApplication { pyproject = true; src = fetchFromGitHub { - owner = "paul-gauthier"; + owner = "Aider-AI"; repo = "aider"; rev = "refs/tags/v${version}"; - hash = "sha256-20LicYj1j5gGzhF+SxPUKu858nHZgwDF1JxXeHRtYe0="; + hash = "sha256-0jAdUcGGJzxvTKY/56an0oLEghZHz6fdNLg8cPer1Qc="; }; pythonRelaxDeps = true; build-system = with python3.pkgs; [ setuptools-scm ]; - dependencies = - with python3.pkgs; - [ - aiohappyeyeballs - backoff - beautifulsoup4 - configargparse - diff-match-patch - diskcache - flake8 - gitpython - grep-ast - importlib-resources - json5 - jsonschema - jiter - litellm - networkx - numpy - packaging - pathspec - pexpect - pillow - playwright - prompt-toolkit - ptyprocess - pypager - pypandoc - pyperclip - pyyaml - psutil - rich - scipy - sounddevice - soundfile - streamlit - tokenizers - watchdog - pydub - ] - ++ lib.optionals (!tensorflow.meta.broken) [ - llama-index-core - llama-index-embeddings-huggingface - ]; + dependencies = with python3.pkgs; [ + aiohappyeyeballs + aiohttp + aiosignal + annotated-types + anyio + attrs + backoff + beautifulsoup4 + certifi + cffi + charset-normalizer + click + configargparse + diff-match-patch + diskcache + distro + filelock + flake8 + frozenlist + fsspec + gitdb + gitpython + grep-ast + h11 + httpcore + httpx + huggingface-hub + idna + importlib-resources + jinja2 + jiter + json5 + jsonschema + jsonschema-specifications + litellm + markdown-it-py + markupsafe + mccabe + mdurl + multidict + networkx + numpy + openai + packaging + pathspec + pexpect + pillow + prompt-toolkit + psutil + ptyprocess + pycodestyle + pycparser + pydantic + pydantic-core + pydub + pyflakes + pygments + pypandoc + pyperclip + python-dotenv + pyyaml + referencing + regex + requests + rich + rpds-py + scipy + smmap + sniffio + sounddevice + soundfile + soupsieve + tiktoken + tokenizers + tqdm + tree-sitter + tree-sitter-languages + typing-extensions + urllib3 + wcwidth + yarl + zipp + ]; buildInputs = [ portaudio ]; diff --git a/third_party/nixpkgs/pkgs/by-name/al/albert/package.nix b/third_party/nixpkgs/pkgs/by-name/al/albert/package.nix index 3e9196aa8d..45de3b8dcd 100644 --- a/third_party/nixpkgs/pkgs/by-name/al/albert/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/al/alephone-eternal/package.nix b/third_party/nixpkgs/pkgs/by-name/al/alephone-eternal/package.nix index 83a5cb7a5e..d3c7c8333f 100644 --- a/third_party/nixpkgs/pkgs/by-name/al/alephone-eternal/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/am/amberol/package.nix b/third_party/nixpkgs/pkgs/by-name/am/amberol/package.nix index ba530618be..3218d96249 100644 --- a/third_party/nixpkgs/pkgs/by-name/am/amberol/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/third_party/nixpkgs/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index c282aff0c4..c3573c4d30 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/an/antares/package.nix b/third_party/nixpkgs/pkgs/by-name/an/antares/package.nix index e5cc1e500a..5c23c18588 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/antares/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/an/anyrun/package.nix b/third_party/nixpkgs/pkgs/by-name/an/anyrun/package.nix index d7712ea43e..50d02d6a96 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/anyrun/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/an/anyrun/package.nix @@ -68,7 +68,10 @@ rustPlatform.buildRustPackage rec { description = "Wayland-native, highly customizable runner"; homepage = "https://github.com/kirottu/anyrun"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ NotAShelf ]; + maintainers = with lib.maintainers; [ + khaneliman + NotAShelf + ]; mainProgram = "anyrun"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/an/anytype/package.nix b/third_party/nixpkgs/pkgs/by-name/an/anytype/package.nix index af5ee3c727..cd9f7d1543 100644 --- a/third_party/nixpkgs/pkgs/by-name/an/anytype/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ap/api-linter/package.nix b/third_party/nixpkgs/pkgs/by-name/ap/api-linter/package.nix index 0e82446e66..526137ae42 100644 --- a/third_party/nixpkgs/pkgs/by-name/ap/api-linter/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ap/api-linter/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "api-linter"; - version = "1.67.3"; + version = "1.67.4"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; rev = "v${version}"; - hash = "sha256-uyupDoLLF1lqYaufBsSNDjKVGF0JsRnephkq4Hk3aMU="; + hash = "sha256-zHJE3sau2KAbPNafUw2+OPFI5RRomqzr1QMEB1vfq3I="; }; - vendorHash = "sha256-+dyoWK5iXH480c+akg26BCF/J8lKQoATVqZUfqMa080="; + vendorHash = "sha256-rZn3SYcuFay2pjGad+NhEf8dmzonsvO7M4OQovT8otg="; subPackages = [ "cmd/api-linter" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/ar/arc-browser/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/arc-browser/package.nix index 39e8d88255..8a45049cbf 100644 --- a/third_party/nixpkgs/pkgs/by-name/ar/arc-browser/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ar/arc-browser/package.nix @@ -1,19 +1,20 @@ -{ lib -, stdenvNoCC -, fetchurl -, undmg -, writeShellApplication -, curl -, common-updater-scripts +{ + lib, + stdenvNoCC, + fetchurl, + undmg, + writeShellApplication, + curl, + common-updater-scripts, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.63.1-54714"; + version = "1.66.0-55166"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-jL8iAh+e8Z72VG9XQbswjyTPtjO2Pm8ealRte8xr1PQ="; + hash = "sha256-up+ScCjFgxlATUbCeWZcVF2jZGfCw018MfT6kAqAHO4="; }; nativeBuildInputs = [ undmg ]; @@ -23,8 +24,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/Applications/Arc.app - cp -R . $out/Applications/Arc.app + mkdir -p "$out/Applications/Arc.app" + cp -R . "$out/Applications/Arc.app" runHook postInstall ''; @@ -33,9 +34,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { passthru.updateScript = lib.getExe (writeShellApplication { name = "arc-browser-update-script"; - runtimeInputs = [ curl common-updater-scripts ]; + runtimeInputs = [ + curl + common-updater-scripts + ]; text = '' - set -euo pipefail redirect_url="$(curl -s -L -f "https://releases.arc.net/release/Arc-latest.dmg" -o /dev/null -w '%{url_effective}')" # The url scheme is: https://releases.arc.net/release/Arc-1.23.4-56789.dmg # We strip everything before 'Arc-' and after '.dmg' @@ -50,7 +53,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://arc.net/"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ donteatoreo ]; - platforms = [ "aarch64-darwin" "x86_64-darwin" ]; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/ar/artalk/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/artalk/package.nix index c56c066e2a..96de91650e 100644 --- a/third_party/nixpkgs/pkgs/by-name/ar/artalk/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/as/ast-grep/package.nix b/third_party/nixpkgs/pkgs/by-name/as/ast-grep/package.nix index 0c13cc8cf5..01bcfd5dd9 100644 --- a/third_party/nixpkgs/pkgs/by-name/as/ast-grep/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/as/astro-language-server/package.nix b/third_party/nixpkgs/pkgs/by-name/as/astro-language-server/package.nix index a979dafd8a..4efdc6e547 100644 --- a/third_party/nixpkgs/pkgs/by-name/as/astro-language-server/package.nix +++ b/third_party/nixpkgs/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 { @@ -22,10 +22,10 @@ stdenv.mkDerivation (finalAttrs: { pname version src - pnpmWorkspace + pnpmWorkspaces prePnpmInstall ; - hash = "sha256-/X8ZoWK5kBPm/8clBDP+B9A5ofXnH2svmy4kMc2t5iA="; + hash = "sha256-tlpk+wbLjJqt37lu67p2A2RZAR1ZfnZFiYoqIQwvWPQ="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { # Must specify to download "@astrojs/yaml2ts" depencendies # https://pnpm.io/filtering#--filter-package_name-1 - pnpmWorkspace = "@astrojs/language-server..."; + pnpmWorkspaces = [ "@astrojs/language-server..." ]; prePnpmInstall = '' # Warning section for "pnpm@v8" # https://pnpm.io/cli/install#--filter-package_selector diff --git a/third_party/nixpkgs/pkgs/by-name/at/athens/package.nix b/third_party/nixpkgs/pkgs/by-name/at/athens/package.nix index 2cdd671c75..4b4958c643 100644 --- a/third_party/nixpkgs/pkgs/by-name/at/athens/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/at/athens/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "athens"; - version = "0.15.2"; + version = "0.15.3"; src = fetchFromGitHub { owner = "gomods"; repo = "athens"; rev = "v${version}"; - hash = "sha256-Ikm9nznJhd5ZrkJyh3ny1SZeuWVs5xgT4fpWKhVbuDA="; + hash = "sha256-iRuy3z5GCsuTnIQuPkzyTvMSMlYTqf3Do7uqgERTXn0="; }; vendorHash = "sha256-cK23BIGh/BK1OHHrI++PD1h7lCN7NZfV1Yfirs8vC5A="; diff --git a/third_party/nixpkgs/pkgs/by-name/au/audiobookshelf/source.json b/third_party/nixpkgs/pkgs/by-name/au/audiobookshelf/source.json index 0699cd2dde..c478742a98 100644 --- a/third_party/nixpkgs/pkgs/by-name/au/audiobookshelf/source.json +++ b/third_party/nixpkgs/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": "fba9cce82ec1a94e002d34a6b012eadf34c759a0", + "hash": "sha256-BoNveMooYfRPKUJK5aqzeKVmY4MNyH9FwO0/EON2cZY=", + "version": "2.16.0", + "depsHash": "sha256-yr5k151jGGT3O2CfDfdKfN7s2e8tUdrS8PWA5tX1BMA=", + "clientDepsHash": "sha256-LJk+cbW3JTzUl6M0PqWj3tLWx29bGYgG+HohCiFoaME=" } diff --git a/third_party/nixpkgs/pkgs/by-name/au/auto-cpufreq/package.nix b/third_party/nixpkgs/pkgs/by-name/au/auto-cpufreq/package.nix index 3a87f2ac0c..15db7faa40 100644 --- a/third_party/nixpkgs/pkgs/by-name/au/auto-cpufreq/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/au/autoraise/package.nix b/third_party/nixpkgs/pkgs/by-name/au/autoraise/package.nix new file mode 100644 index 0000000000..4a1b0623cb --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ax/axis2/package.nix b/third_party/nixpkgs/pkgs/by-name/ax/axis2/package.nix index adb305f310..378656e036 100644 --- a/third_party/nixpkgs/pkgs/by-name/ax/axis2/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ba/bant/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/bant/package.nix index 3fc5138912..c0f181dd41 100644 --- a/third_party/nixpkgs/pkgs/by-name/ba/bant/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ba/baresip/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/baresip/package.nix index ea92f9c39f..e607b56d94 100644 --- a/third_party/nixpkgs/pkgs/by-name/ba/baresip/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ba/baresip/package.nix @@ -86,9 +86,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - env.NIX_CFLAGS_COMPILE = '' -I${librem}/include/rem -I${gsm}/include/gsm + env.NIX_CFLAGS_COMPILE = '' + -I${librem}/include/rem -I${gsm}/include/gsm -DHAVE_INTTYPES_H -D__GLIBC__ - -D__need_timeval -D__need_timespec -D__need_time_t ''; + -D__need_timeval -D__need_timespec -D__need_time_t + ''; doInstallCheck = true; # CMake feature detection is prone to breakage between upgrades: diff --git a/third_party/nixpkgs/pkgs/by-name/ba/bark-server/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/bark-server/package.nix new file mode 100644 index 0000000000..daf2843178 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ba/basedpyright/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/basedpyright/package.nix index e899d7dbf1..0c058fa737 100644 --- a/third_party/nixpkgs/pkgs/by-name/ba/basedpyright/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ba/bash-language-server/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/bash-language-server/package.nix index 2778d255ce..a5853aeb9e 100644 --- a/third_party/nixpkgs/pkgs/by-name/ba/bash-language-server/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ba/bash-language-server/package.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-yJ81oGd9aNsWQMLvDSgMVVH1//Mw/SVFYFIPsJTQYzE="; }; - pnpmWorkspace = "bash-language-server"; + pnpmWorkspaces = [ "bash-language-server" ]; pnpmDeps = pnpm_8.fetchDeps { - inherit (finalAttrs) pname version src pnpmWorkspace; + inherit (finalAttrs) pname version src pnpmWorkspaces; hash = "sha256-W25xehcxncBs9QgQBt17F5YHK0b+GDEmt27XzTkyYWg="; }; diff --git a/third_party/nixpkgs/pkgs/by-name/bc/bcc/package.nix b/third_party/nixpkgs/pkgs/by-name/bc/bcc/package.nix index 6cc3c1ce33..287effe902 100644 --- a/third_party/nixpkgs/pkgs/by-name/bc/bcc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bc/bcc/package.nix @@ -117,7 +117,7 @@ python3Packages.buildPythonApplication rec { description = "Dynamic Tracing Tools for Linux"; homepage = "https://iovisor.github.io/bcc/"; license = licenses.asl20; - maintainers = with maintainers; [ ragge mic92 thoughtpolice martinetd ]; + maintainers = with maintainers; [ ragge mic92 thoughtpolice martinetd ryan4yin ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/be/beekeeper-studio/package.nix b/third_party/nixpkgs/pkgs/by-name/be/beekeeper-studio/package.nix index 274bf24136..437d3b7e7e 100644 --- a/third_party/nixpkgs/pkgs/by-name/be/beekeeper-studio/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/be/beekeeper-studio/package.nix @@ -7,7 +7,7 @@ let pname = "beekeeper-studio"; - version = "4.6.2"; + version = "4.6.8"; plat = { aarch64-linux = "-arm64"; @@ -15,8 +15,8 @@ let }.${stdenv.hostPlatform.system}; hash = { - aarch64-linux = "sha256-ZxqwxCON21S+RPG0/M2TtcI2Ave7ZT05lKQdyysQFUk="; - x86_64-linux = "sha256-8sGFNoAsX+X3IJDXpwlYRt78nokauPYz88yDEYy6NP8="; + aarch64-linux = "sha256-EKGL+aeuCcBuSh+VtkdgFhI1LccuvO8WHoqbZ/JdX7c="; + x86_64-linux = "sha256-LyO9xCqZG5gNAvCIX9wacSb59wiLjXPDta+Fipu24fk="; }.${stdenv.hostPlatform.system}; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/by-name/bi/biome/package.nix b/third_party/nixpkgs/pkgs/by-name/bi/biome/package.nix index a1250b34e9..6fe531b2df 100644 --- a/third_party/nixpkgs/pkgs/by-name/bi/biome/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/bi/bitwarden-desktop/package.nix b/third_party/nixpkgs/pkgs/by-name/bi/bitwarden-desktop/package.nix index 6531632cc1..bd023bcb76 100644 --- a/third_party/nixpkgs/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/third_party/nixpkgs/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 @@ -189,6 +196,7 @@ in buildNpmPackage rec { comment = description; desktopName = "Bitwarden"; categories = [ "Utility" ]; + mimeTypes = [ "x-scheme-handler/bitwarden" ]; }) ]; @@ -204,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/third_party/nixpkgs/pkgs/by-name/bl/blobdrop/package.nix b/third_party/nixpkgs/pkgs/by-name/bl/blobdrop/package.nix new file mode 100644 index 0000000000..4725edc5f3 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/bo/bombsquad/package.nix b/third_party/nixpkgs/pkgs/by-name/bo/bombsquad/package.nix index 08b80d8b37..078d12df8d 100644 --- a/third_party/nixpkgs/pkgs/by-name/bo/bombsquad/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bo/bombsquad/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - targetPlatform, fetchurl, python312, SDL2, @@ -30,7 +29,7 @@ let hash = "sha256-o1Yg0C5k07NZzc9jQrHXR+kkQl8HZ55U9/fqcpe3Iyw="; }; } - .${targetPlatform.system} or (throw "${targetPlatform.system} is unsupported."); + .${stdenv.targetPlatform.system} or (throw "${stdenv.targetPlatform.system} is unsupported."); in stdenv.mkDerivation (finalAttrs: { pname = "bombsquad"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/make-brave.nix b/third_party/nixpkgs/pkgs/by-name/br/brave/make-brave.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/browsers/brave/make-brave.nix rename to third_party/nixpkgs/pkgs/by-name/br/brave/make-brave.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/third_party/nixpkgs/pkgs/by-name/br/brave/package.nix similarity index 77% rename from third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix rename to third_party/nixpkgs/pkgs/by-name/br/brave/package.nix index 65d064459e..50a33da098 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/update.sh b/third_party/nixpkgs/pkgs/by-name/br/brave/update.sh similarity index 97% rename from third_party/nixpkgs/pkgs/applications/networking/browsers/brave/update.sh rename to third_party/nixpkgs/pkgs/by-name/br/brave/update.sh index d08c1559d0..aff0dd5521 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/update.sh +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/br/bruno/package.nix b/third_party/nixpkgs/pkgs/by-name/br/bruno/package.nix index c9eec26b15..5fab6f71d4 100644 --- a/third_party/nixpkgs/pkgs/by-name/br/bruno/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/buildpack/package.nix similarity index 70% rename from third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix rename to third_party/nixpkgs/pkgs/by-name/bu/buildpack/package.nix index 31a4c70bd6..5485501643 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/bu/buildpack/package.nix @@ -1,13 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, +}: -buildGoModule rec { +let pname = "pack"; version = "0.35.1"; +in +buildGoModule { + inherit pname version; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-iQkYtnobhAt73JMRrejk0DkOH1ZW2bqfZx05ZrDG5bA="; }; @@ -17,7 +25,11 @@ buildGoModule rec { subPackages = [ "cmd/pack" ]; - ldflags = [ "-s" "-w" "-X github.com/buildpacks/pack.Version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/buildpacks/pack.Version=${version}" + ]; postInstall = '' installShellCompletion --cmd pack \ @@ -26,12 +38,12 @@ buildGoModule rec { --fish $(PACK_HOME=$PWD $out/bin/pack completion --shell fish) ''; - meta = with lib; { + meta = { homepage = "https://buildpacks.io/"; changelog = "https://github.com/buildpacks/pack/releases/tag/v${version}"; description = "CLI for building apps using Cloud Native Buildpacks"; mainProgram = "pack"; - license = licenses.asl20; - maintainers = [ ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ momeemt ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/bu/bundletool/package.nix b/third_party/nixpkgs/pkgs/by-name/bu/bundletool/package.nix index da40101e55..58bdfaa70c 100644 --- a/third_party/nixpkgs/pkgs/by-name/bu/bundletool/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/bu/bundletool/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "bundletool"; - version = "1.17.1"; + version = "1.17.2"; src = fetchurl { url = "https://github.com/google/bundletool/releases/download/${finalAttrs.version}/bundletool-all-${finalAttrs.version}.jar"; - sha256 = "sha256-RYgerRM4iHLYLEJVsZVIi3/DPyysWpqXewr8XpI2dZI="; + sha256 = "sha256-LUrZCPrqZAR8HMnLdH5qpmfGqxkuCWB70WtnJGqM1q4="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/candy-icons/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/candy-icons/package.nix index fb926197fa..ab9bbd8a92 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/candy-icons/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ca/caprine/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/caprine/package.nix index f164af42b5..fc75d8588c 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/caprine/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/caprine/package.nix @@ -84,7 +84,10 @@ buildNpmPackage rec { description = "Elegant Facebook Messenger desktop app"; homepage = "https://github.com/sindresorhus/caprine"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ astronaut0212 ]; + maintainers = with lib.maintainers; [ + astronaut0212 + khaneliman + ]; inherit (electron.meta) platforms; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-features-manager/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-features-manager/package.nix index 6fd31c30b0..4ca4ebf16a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-features-manager/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ca/cargo-pio/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-pio/package.nix new file mode 100644 index 0000000000..5942627f4a --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ca/cargo-rdme/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-rdme/package.nix index 105104e9b4..15a2d58146 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-rdme/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-rdme/package.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "cargo-rdme"; - version = "1.4.4"; + version = "1.4.5"; src = fetchCrate { inherit pname version; - hash = "sha256-AARkXr6qOq9u/nmcmCnA4P+Q+MPPChCXoRaYiLwCNPs="; + hash = "sha256-IB+n9abFeWLgJLdo3NjffcGrIxXhNdZ2moyfIG+gMoc="; }; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - cargoHash = "sha256-myTh+zOtAt9h/irld7OHSXKMv0V+LAR4h/afYKvXeXg="; + cargoHash = "sha256-mD95+Q6xaL0LFk5841LBrQqzFU7KFJbUgHB96zXy2KU="; meta = with lib; { description = "Cargo command to create the README.md from your crate's documentation"; diff --git a/third_party/nixpkgs/pkgs/by-name/ca/casadi/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/casadi/package.nix index 0f1f3e3d7a..5cd35b0643 100644 --- a/third_party/nixpkgs/pkgs/by-name/ca/casadi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ca/casadi/package.nix @@ -10,7 +10,6 @@ cplex, fatrop, fetchFromGitHub, - fetchpatch, gurobi, highs, hpipm, @@ -37,40 +36,27 @@ 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="; - }) - ]; - 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 \ - " version + ''; + + meta = with lib; { + description = "Console-based Audio Visualizer for Alsa"; + homepage = "https://github.com/karlstav/cava"; + license = licenses.mit; + maintainers = with maintainers; [ + offline + mirrexagon + ]; + platforms = platforms.unix; + mainProgram = "cava"; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/cc/ccid/package.nix b/third_party/nixpkgs/pkgs/by-name/cc/ccid/package.nix index d2ae6be01f..9da29d3b9c 100644 --- a/third_party/nixpkgs/pkgs/by-name/cc/ccid/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cc/ccid/package.nix @@ -5,6 +5,8 @@ flex, gitUpdater, libusb1, + meson, + ninja, pcsclite, perl, pkg-config, @@ -22,14 +24,13 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . - substituteInPlace src/Makefile.am --replace-fail /bin/echo echo + substituteInPlace meson.build --replace-fail \ + "pcsc_dep.get_variable('usbdropdir')" \ + "'$out/pcsc/drivers'" ''; - configureFlags = [ - "--enable-twinserial" - "--enable-serialconfdir=${placeholder "out"}/etc/reader.conf.d" - "--enable-ccidtwindir=${placeholder "out"}/pcsc/drivers/serial" - "--enable-usbdropdir=${placeholder "out"}/pcsc/drivers" + mesonFlags = [ + (lib.mesonBool "serial" true) ]; # error: call to undeclared function 'InterruptRead'; @@ -42,6 +43,8 @@ stdenv.mkDerivation rec { flex perl pkg-config + meson + ninja ]; buildInputs = [ @@ -51,7 +54,7 @@ stdenv.mkDerivation rec { ]; postInstall = '' - install -Dm 0444 -t $out/lib/udev/rules.d src/92_pcscd_ccid.rules + install -Dm 0444 -t $out/lib/udev/rules.d ../src/92_pcscd_ccid.rules substituteInPlace $out/lib/udev/rules.d/92_pcscd_ccid.rules \ --replace-fail "/usr/sbin/pcscd" "${pcsclite}/bin/pcscd" ''; @@ -64,6 +67,14 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/rousseau/CCID.git"; }; + installCheckPhase = '' + [ -f $out/etc/reader.conf.d/libccidtwin ] + [ -f $out/lib/udev/rules.d/92_pcscd_ccid.rules ] + [ -f $out/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist ] + [ -f $out/pcsc/drivers/ifd-ccid.bundle/Contents/Linux/libccid.so ] + [ -f $out/pcsc/drivers/serial/libccidtwin.so ] + ''; + meta = with lib; { description = "PC/SC driver for USB CCID smart card readers"; homepage = "https://ccid.apdu.fr/"; diff --git a/third_party/nixpkgs/pkgs/by-name/ce/certinfo-go/package.nix b/third_party/nixpkgs/pkgs/by-name/ce/certinfo-go/package.nix new file mode 100644 index 0000000000..d95f0f6838 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ce/certinfo-go/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "certinfo-go"; + version = "0.1.36"; + + src = fetchFromGitHub { + owner = "paepckehh"; + repo = "certinfo"; + rev = "refs/tags/v${version}"; + hash = "sha256-ySXp5dPdGhBEbo9uvCsINCufhm9j/dIX0Jn+Ou73NjM="; + }; + + vendorHash = "sha256-wrz33FSBz4Kg9aYCj7/Pq07bP73MV9iSQKc3X39OkHc="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + changelog = "https://github.com/paepckehh/certinfo/releases/tag/v${version}"; + homepage = "https://paepcke.de/certinfo"; + description = "Tool to analyze and troubleshoot x.509 & ssh certificates, encoded keys, ..."; + license = lib.licenses.bsd3; + mainProgram = "certinfo"; + maintainers = with lib.maintainers; [ paepcke ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/charge-lnd/default.nix b/third_party/nixpkgs/pkgs/by-name/ch/charge-lnd/package.nix similarity index 58% rename from third_party/nixpkgs/pkgs/applications/blockchains/charge-lnd/default.nix rename to third_party/nixpkgs/pkgs/by-name/ch/charge-lnd/package.nix index 1ea8912a75..88817c6e4b 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/charge-lnd/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/ciano/default.nix b/third_party/nixpkgs/pkgs/by-name/ci/ciano/package.nix similarity index 57% rename from third_party/nixpkgs/pkgs/applications/graphics/ciano/default.nix rename to third_party/nixpkgs/pkgs/by-name/ci/ciano/package.nix index 1106bd9581..b223970625 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ciano/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ci/cirrus-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/ci/cirrus-cli/package.nix index a77ea92b65..5c97b1d826 100644 --- a/third_party/nixpkgs/pkgs/by-name/ci/cirrus-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ci/cirrus-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.126.1"; + version = "0.130.2"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - hash = "sha256-A894AUmsJjCCvN6cI2qoTPyOeQx6h2uukzxtlvWZVn8="; + hash = "sha256-OnB7e0KYXxHGcG8ilTZ3/Na/g9Ai8/QM8x6wAOa6glE="; }; - vendorHash = "sha256-PecNBlSoo8WN2FKXN/UpkqpqbsJkOPHKILy76YWgNlw="; + vendorHash = "sha256-rYg0cmW63IolYQ79R9pFiFXD6UfESv4jq9kn1EGJmgw="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clang-uml/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clang-uml/package.nix index adc180a4c1..24d865922a 100644 --- a/third_party/nixpkgs/pkgs/by-name/cl/clang-uml/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/clang-uml/package.nix @@ -11,6 +11,7 @@ yaml-cpp, elfutils, libunwind, + versionCheckHook, enableLibcxx ? false, debug ? false, }: @@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DCUSTOM_COMPILE_OPTIONS=-Wno-error=sign-compare" + "-DGIT_VERSION=${finalAttrs.version}" ]; buildInputs = [ @@ -72,6 +74,10 @@ stdenv.mkDerivation (finalAttrs: { dontFixup = debug; dontStrip = debug; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgramArg = "--version"; + meta = { description = "Customizable automatic UML diagram generator for C++ based on Clang"; longDescription = '' @@ -84,5 +90,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://clang-uml.github.io/"; license = lib.licenses.asl20; platforms = lib.platforms.all; + mainProgram = "clang-uml"; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clipcat/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clipcat/package.nix index b5d22c8b50..1630253966 100644 --- a/third_party/nixpkgs/pkgs/by-name/cl/clipcat/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cl/clipcat/package.nix @@ -1,24 +1,25 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, protobuf -, installShellFiles -, darwin +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + protobuf, + installShellFiles, + darwin, }: rustPlatform.buildRustPackage rec { pname = "clipcat"; - version = "0.18.3"; + version = "0.19.0"; src = fetchFromGitHub { owner = "xrelkd"; - repo = pname; - rev = "v${version}"; - hash = "sha256-95y/HiLmhqt1DFmAxLg/W7lr/9dfVtce4+tx+vG2Nuw="; + repo = "clipcat"; + rev = "refs/tags/v${version}"; + 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 @@ -28,7 +29,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ protobuf - installShellFiles ]; @@ -47,12 +47,12 @@ rustPlatform.buildRustPackage rec { done ''; - meta = with lib; { + meta = { description = "Clipboard Manager written in Rust Programming Language"; homepage = "https://github.com/xrelkd/clipcat"; - license = licenses.gpl3Only; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ xrelkd ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ xrelkd bot-wxt1221 ]; mainProgram = "clipcatd"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/cl/cliqr/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/cliqr/package.nix new file mode 100644 index 0000000000..5f2ad0596f --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/cl/cliqr/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "cliqr"; + version = "0.1.25"; + + src = fetchFromGitHub { + owner = "paepckehh"; + repo = "cliqr"; + rev = "refs/tags/v${version}"; + hash = "sha256-iPNI92kCNFXRiV5NV7Yj0gznwNeFoW02yh6QLrkBYO0="; + }; + + vendorHash = null; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + changelog = "https://github.com/paepckehh/cliqr/releases/tag/v${version}"; + homepage = "https://paepcke.de/cliqr"; + description = "Transfer, share data & secrets via console qr codes"; + license = lib.licenses.bsd3; + mainProgram = "cliqr"; + maintainers = with lib.maintainers; [ paepcke ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/cl/clouddrive2/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clouddrive2/package.nix new file mode 100644 index 0000000000..c15a390b2a --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/cl/clouddrive2/update.sh b/third_party/nixpkgs/pkgs/by-name/cl/clouddrive2/update.sh new file mode 100755 index 0000000000..200bb47700 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/co/code-cursor/package.nix b/third_party/nixpkgs/pkgs/by-name/co/code-cursor/package.nix index 41cb3aaec1..c3e879be8e 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/code-cursor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/co/code-cursor/package.nix @@ -8,11 +8,11 @@ }: let pname = "cursor"; - version = "0.41.3"; + version = "0.42.3"; appKey = "230313mzl4w4u92"; src = fetchurl { - url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.41.3-build-240925fkhcqg263-x86_64.AppImage"; - hash = "sha256-WtfyiNGnUn8g1HR0TQPyn3SMJmjqe+otAYeyokMIO+w="; + url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.42.3-build-241016kxu9umuir-x86_64.AppImage"; + hash = "sha256-GWkilBlpXube//jbxRjmKJjYcmB42nhMY8K0OgkvtwA="; }; appimageContents = appimageTools.extractType2 { inherit version pname src; }; in diff --git a/third_party/nixpkgs/pkgs/by-name/co/codeberg-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/co/codeberg-cli/package.nix index 2d89eaed91..ccf0d49d0c 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/codeberg-cli/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/co/collada2gltf/package.nix b/third_party/nixpkgs/pkgs/by-name/co/collada2gltf/package.nix new file mode 100644 index 0000000000..7b32f6781c --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/co/commitlint-rs/package.nix b/third_party/nixpkgs/pkgs/by-name/co/commitlint-rs/package.nix index 9b31e6cfd3..c69ace68ee 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/commitlint-rs/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/co/composer-require-checker/package.nix b/third_party/nixpkgs/pkgs/by-name/co/composer-require-checker/package.nix index 1a42cbd200..4e83f0fc8d 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/composer-require-checker/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/co/convco/package.nix b/third_party/nixpkgs/pkgs/by-name/co/convco/package.nix index 0f08aba98a..c0f780b5bb 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/convco/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/co/copycat/package.nix b/third_party/nixpkgs/pkgs/by-name/co/copycat/package.nix index 125a49f428..2fc4fb8fd3 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/copycat/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/co/coyim/package.nix b/third_party/nixpkgs/pkgs/by-name/co/coyim/package.nix index b455220068..182aef00b9 100644 --- a/third_party/nixpkgs/pkgs/by-name/co/coyim/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/cp/cppcheck/package.nix b/third_party/nixpkgs/pkgs/by-name/cp/cppcheck/package.nix index d7ed4fb99c..fa4c923041 100644 --- a/third_party/nixpkgs/pkgs/by-name/cp/cppcheck/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix b/third_party/nixpkgs/pkgs/by-name/cr/crow-translate/package.nix similarity index 81% rename from third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix rename to third_party/nixpkgs/pkgs/by-name/cr/crow-translate/package.nix index 84263380f1..304a4dbac5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/cr/crystal-dock/package.nix b/third_party/nixpkgs/pkgs/by-name/cr/crystal-dock/package.nix index fe1f4eaf11..dfd059d6d7 100644 --- a/third_party/nixpkgs/pkgs/by-name/cr/crystal-dock/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/cu/cue/package.nix b/third_party/nixpkgs/pkgs/by-name/cu/cue/package.nix index d10db99f55..7e69d57af8 100644 --- a/third_party/nixpkgs/pkgs/by-name/cu/cue/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/cu/cue/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "cue"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "cue-lang"; repo = "cue"; rev = "v${version}"; - hash = "sha256-GvReoBP8QCdrKxox8yPLZEk5YvTvwr7kflpS/jN8GTg="; + hash = "sha256-CwPD+JUoKcs0HqWuZYH2c8AdwK6X0SS3aNGpkcPZ4C4="; }; vendorHash = "sha256-sLTpra7JwgF4l1UCrUtzQA4xrP4OqxBcZ1qEssBdFtk="; diff --git a/third_party/nixpkgs/pkgs/by-name/da/daed/package.nix b/third_party/nixpkgs/pkgs/by-name/da/daed/package.nix new file mode 100644 index 0000000000..8618a3212f --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/db/dbeaver-bin/package.nix b/third_party/nixpkgs/pkgs/by-name/db/dbeaver-bin/package.nix index ef29c8a675..8e62a026ba 100644 --- a/third_party/nixpkgs/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/de/dependency-track/package.nix b/third_party/nixpkgs/pkgs/by-name/de/dependency-track/package.nix index ae33be7833..02d143803b 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/dependency-track/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/de/desed/package.nix b/third_party/nixpkgs/pkgs/by-name/de/desed/package.nix index 03afc5e200..e7d0716462 100644 --- a/third_party/nixpkgs/pkgs/by-name/de/desed/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/di/disko/package.nix b/third_party/nixpkgs/pkgs/by-name/di/disko/package.nix index 2a3818f45e..8e580594ef 100644 --- a/third_party/nixpkgs/pkgs/by-name/di/disko/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/dmenu-rs/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/dm/dmenu-rs/Cargo.lock similarity index 100% rename from third_party/nixpkgs/pkgs/applications/misc/dmenu-rs/Cargo.lock rename to third_party/nixpkgs/pkgs/by-name/dm/dmenu-rs/Cargo.lock diff --git a/third_party/nixpkgs/pkgs/by-name/dm/dmenu-rs/enablePlugins.Cargo.lock b/third_party/nixpkgs/pkgs/by-name/dm/dmenu-rs/enablePlugins.Cargo.lock new file mode 100644 index 0000000000..afc8157a99 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/dm/dmenu-rs/package.nix b/third_party/nixpkgs/pkgs/by-name/dm/dmenu-rs/package.nix new file mode 100644 index 0000000000..d64f5a0cc8 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/dm/dms/package.nix b/third_party/nixpkgs/pkgs/by-name/dm/dms/package.nix index 52150cf741..eed1e01eb8 100644 --- a/third_party/nixpkgs/pkgs/by-name/dm/dms/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/do/doctave/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/do/doctave/Cargo.lock new file mode 100644 index 0000000000..f0c27d972e --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/do/doctave/package.nix b/third_party/nixpkgs/pkgs/by-name/do/doctave/package.nix new file mode 100644 index 0000000000..854a56de07 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/do/dopamine/package.nix b/third_party/nixpkgs/pkgs/by-name/do/dopamine/package.nix index 10a45cbb2b..260f00b262 100644 --- a/third_party/nixpkgs/pkgs/by-name/do/dopamine/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/do/dotnet-repl/package.nix b/third_party/nixpkgs/pkgs/by-name/do/dotnet-repl/package.nix new file mode 100644 index 0000000000..be17901598 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/dp/dpp/package.nix b/third_party/nixpkgs/pkgs/by-name/dp/dpp/package.nix index bd93b48262..49f72d65b7 100644 --- a/third_party/nixpkgs/pkgs/by-name/dp/dpp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/dp/dpp/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "dpp"; - version = "10.0.31"; + version = "10.0.32"; src = fetchFromGitHub { owner = "brainboxdotcc"; repo = "DPP"; rev = "v${finalAttrs.version}"; - hash = "sha256-IsgYGfPcqiJBQ1MM97jI7ksvc49ZcCn3i6/yMe8zLjY="; + hash = "sha256-pr7u4x4xdyydEQcNROjfkoV/ODqixugcTuCWMGeixC8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/dr/drone-scp/package.nix b/third_party/nixpkgs/pkgs/by-name/dr/drone-scp/package.nix index 21ce45013e..976d5f6f12 100644 --- a/third_party/nixpkgs/pkgs/by-name/dr/drone-scp/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/dr/dry/package.nix b/third_party/nixpkgs/pkgs/by-name/dr/dry/package.nix new file mode 100644 index 0000000000..d92189012d --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/du/dune3d/package.nix b/third_party/nixpkgs/pkgs/by-name/du/dune3d/package.nix index b1e1863581..01d3d45a78 100644 --- a/third_party/nixpkgs/pkgs/by-name/du/dune3d/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/du/dune3d/package.nix @@ -29,13 +29,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "dune3d"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "dune3d"; repo = "dune3d"; rev = "v${finalAttrs.version}"; - hash = "sha256-Z/kdOc/MbnnEyRsel3aZGndTAy1eCdAK0Wdta0HxaE4="; + hash = "sha256-oS10xek4IyRrjZTBvDsjqCA9NE93vzB0W9iQEm2IMf4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/dw/dwlb/package.nix b/third_party/nixpkgs/pkgs/by-name/dw/dwlb/package.nix index c01e1f5dad..1c3354d54f 100644 --- a/third_party/nixpkgs/pkgs/by-name/dw/dwlb/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ec/ecapture/package.nix b/third_party/nixpkgs/pkgs/by-name/ec/ecapture/package.nix index 25150c2e43..c2a10feb55 100644 --- a/third_party/nixpkgs/pkgs/by-name/ec/ecapture/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ed/edopro/deps.nix b/third_party/nixpkgs/pkgs/by-name/ed/edopro/deps.nix new file mode 100644 index 0000000000..6ca795ffab --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ed/edopro/deps.nix @@ -0,0 +1,14 @@ +# This is automatically generated by the update script. +# DO NOT MANUALLY EDIT. +{ + assets-hash = "sha256-vZhkWJ1ZoNEwdc5kM1S0hyXnWmupiTOanCi9DCuqw/k="; + edopro-version = "40.1.4"; + edopro-rev = "c713e23491a1e55c9d8e91257e5f2b5873696b9b"; + edopro-hash = "sha256-2E1cjG0FONu/fbr67/3qRCKQ1W/wPznClEWsMa1FAzo="; + irrlicht-version = "1.9.0-unstable-2023-02-18"; + irrlicht-rev = "7edde28d4f8c0c3589934c398a3a441286bb7c22"; + irrlicht-hash = "sha256-Q2tNiYE/enZPqA5YhUe+Tkvmqtmmz2E0OqTRUDnt+UA="; + ocgcore-version = "0-unstable-2022-09-15"; + ocgcore-rev = "4a872ad7686e0d00ee4c1c051e90fc07c40613d4"; + ocgcore-hash = "sha256-s3DOHrZilRUy6fbXObNiLRinxpdHY99vDOmS/ZfOI78="; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch b/third_party/nixpkgs/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch new file mode 100644 index 0000000000..253051ebf0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch @@ -0,0 +1,29 @@ +From 41e750142b44465f3af197b7e2f0d6f54fc48c2d Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Mon, 21 Oct 2024 17:42:24 +0200 +Subject: [PATCH] Mark Lua symbols as C symbols + +Otherwise linking against our Lua built by a C-compiler fails due to the symbols being resolved as C++ symbols. +--- + interpreter.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/interpreter.h b/interpreter.h +index 6c405a1..c471ecb 100644 +--- a/interpreter.h ++++ b/interpreter.h +@@ -9,9 +9,11 @@ + #define INTERPRETER_H_ + + // Due to longjmp behaviour, we must build Lua as C++ to avoid UB ++extern "C" { + #include + #include + #include ++} + + #include "common.h" + #include +-- +2.44.1 + diff --git a/third_party/nixpkgs/pkgs/by-name/ed/edopro/package.nix b/third_party/nixpkgs/pkgs/by-name/ed/edopro/package.nix new file mode 100644 index 0000000000..89dd0acf3d --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ed/edopro/package.nix @@ -0,0 +1,318 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchzip, + makeWrapper, + premake5, + writeShellScriptBin, + runCommandLocal, + symlinkJoin, + imagemagick, + bzip2, + curl, + flac, + # Use fmt 10+ after release 40.1.4+ + fmt_9, + freetype, + libevent, + libgit2, + libGL, + libGLU, + libjpeg, + libpng, + libvorbis, + libX11, + libxkbcommon, + libXxf86vm, + lua5_3, + mono, + nlohmann_json, + openal, + SDL2, + sqlite, + wayland, + egl-wayland, + covers_url ? "https://pics.projectignis.org:2096/pics/cover/{}.jpg", + fields_url ? "https://pics.projectignis.org:2096/pics/field/{}.png", + # While ygoprodeck has higher quality images, "spamming" of their api results in a ban. + # Thats why this link can change since it's compiled into the program, However it will + # download assets when needed so it is unlikely to get banned. Unless you search the + # card list with no filters of any kind. When testing use ProjectIgnis' website instead. + pics_url ? "https://images.ygoprodeck.com/images/cards/{}.jpg", +}: +let + archLabel = + { + "x86_64-linux" = "x64"; + "aarch64-linux" = "arm64"; + } + .${stdenv.hostPlatform.system} + or (throw "${stdenv.hostPlatform.system} is an unsupported arch label for edopro"); + + deps = import ./deps.nix; +in +let + assets = fetchzip { + url = "https://github.com/ProjectIgnis/edopro-assets/releases/download/${deps.edopro-version}/ProjectIgnis-EDOPro-${deps.edopro-version}-linux.tar.gz"; + hash = deps.assets-hash; + }; + + irrlicht-edopro = stdenv.mkDerivation { + pname = "irrlicht-edopro"; + version = deps.irrlicht-version; + + src = fetchFromGitHub { + owner = "edo9300"; + repo = "irrlicht1-8-4"; + rev = deps.irrlicht-rev; + hash = deps.irrlicht-hash; + }; + + buildInputs = [ + libGLU + libX11 + libxkbcommon + libXxf86vm + wayland + ]; + + enableParallelBuilding = true; + buildFlags = [ + "NDEBUG=1" + ]; + makeFlags = [ + "-C" + "source/Irrlicht" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,include} + cp lib/Linux/libIrrlicht.a $out/bin + cp -r include/* $out/include + + runHook postInstall + ''; + }; + + ocgcore = stdenv.mkDerivation { + pname = "ygopro-core"; + version = deps.ocgcore-version; + + src = fetchFromGitHub { + owner = "edo9300"; + repo = "ygopro-core"; + rev = deps.ocgcore-rev; + hash = deps.ocgcore-hash; + fetchSubmodules = true; + }; + + patches = [ + ./ocgcore-lua-symbols.patch + ]; + + nativeBuildInputs = [ premake5 ]; + + buildInputs = [ lua5_3 ]; + + preBuild = '' + premake5 gmake2 \ + --lua-path="${lua5_3}" + ''; + + enableParallelBuilding = true; + buildFlags = [ + "verbose=true" + "config=release" + "ocgcoreshared" + ]; + makeFlags = [ + "-C" + "build" + ]; + + installPhase = '' + runHook preInstall + + install -Dm644 -t $out/lib bin/release/libocgcore${stdenv.hostPlatform.extensions.sharedLibrary} + + runHook postInstall + ''; + }; + + edopro = stdenv.mkDerivation { + pname = "edopro"; + version = deps.edopro-version; + + src = fetchFromGitHub { + owner = "edo9300"; + repo = "edopro"; + rev = deps.edopro-rev; + hash = deps.edopro-hash; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + makeWrapper + premake5 + ]; + + buildInputs = [ + bzip2 + curl + flac + fmt_9 + freetype + irrlicht-edopro + libevent + libgit2 + libjpeg + libpng + libvorbis + lua5_3 + nlohmann_json + ocgcore + openal + SDL2 + sqlite + ]; + + # nixpkgs' gcc stack currently appears to not support LTO + postPatch = '' + substituteInPlace premake5.lua \ + --replace-fail 'flags "LinkTimeOptimization"' 'removeflags "LinkTimeOptimization"' + ''; + + preBuild = '' + premake5 gmake2 \ + --architecture=${archLabel} \ + --covers=\"${covers_url}\" \ + --fields=\"${fields_url}\" \ + --pics=\"${pics_url}\" \ + --prebuilt-core="${lib.getLib ocgcore}/lib" \ + --sound=sfml + ''; + + enableParallelBuilding = true; + env = { + # remove after release 40.1.4+ + # https://discord.com/channels/170601678658076672/792223685112889344/1286043823293599785 + CXXFLAGS = "-include cstdint"; + LDFLAGS = "-I ${irrlicht-edopro}/include -L ${irrlicht-edopro}/bin"; + }; + buildFlags = [ + "verbose=true" + "config=release_${archLabel}" + "ygopro" + ]; + makeFlags = [ + "-C" + "build" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp bin/${archLabel}/release/ygopro $out/bin + wrapProgram $out/bin/ygopro \ + --prefix PATH : ${lib.makeBinPath [ mono ]} \ + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + libGL + libX11 + libxkbcommon + libXxf86vm + sqlite + wayland + egl-wayland + ] + } + + runHook postInstall + ''; + }; + + edopro-script = + let + assetsToCopy = lib.concatStringsSep "," [ + # Needed if we download files from ProjectIgnis' website or any https only website. + "cacert.pem" + "config" + "deck" + "COPYING.txt" + "expansions" + "lflists" + "notices" + "puzzles" + "fonts" + "script" + "skin" + "sound" + "textures" + "WindBot" + ]; + in + writeShellScriptBin "edopro" '' + set -eu + EDOPRO_DIR="''${XDG_DATA_HOME:-$HOME/.local/share}/edopro" + + if [ ! -d $EDOPRO_DIR ]; then + mkdir -p $EDOPRO_DIR + cp -r --no-preserve=all ${assets}/{${assetsToCopy}} $EDOPRO_DIR + chmod -R go-rwx $EDOPRO_DIR + + rm $EDOPRO_DIR/config/io.github.edo9300.EDOPro.desktop.in + fi + + exec ${edopro}/bin/ygopro -C $EDOPRO_DIR $@ + ''; + + edopro-desktop = runCommandLocal "io.github.edo9300.EDOPro.desktop" { } '' + cp ${assets}/config/io.github.edo9300.EDOPro.desktop.in desktop-template + + sed '/Path=/d' -i desktop-template + sed 's/Exec=.*/Exec=EDOPro/' -i desktop-template + sed 's/Icon=.*/Icon=EDOPro/' -i desktop-template + + install -D desktop-template $out/share/applications/io.github.edo9300.EDOPro.desktop + ''; +in +symlinkJoin { + name = "edopro-application-${deps.edopro-version}"; + version = deps.edopro-version; + paths = [ + edopro-script + edopro-desktop + ]; + + postBuild = '' + mkdir -p $out/share/icons/hicolor/256x256/apps/ + ${imagemagick}/bin/magick \ + ${assets}/textures/AppIcon.png \ + -resize 256x256 \ + $out/share/icons/hicolor/256x256/apps/EDOPro.png + ''; + + passthru.updateScript = ./update.py; + + meta = { + description = "Bleeding-edge automatic duel simulator, a fork of the YGOPro client"; + homepage = "https://projectignis.github.io"; + changelog = "https://github.com/edo9300/edopro/releases"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ + OPNA2608 + redhawk + ]; + mainProgram = "edopro"; + # This is likely a very easy app to port if you're interested. + # We just have no way to test on other platforms. + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ed/edopro/update.py b/third_party/nixpkgs/pkgs/by-name/ed/edopro/update.py new file mode 100755 index 0000000000..0597697677 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ed/edopro/update.py @@ -0,0 +1,119 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i python -p nix-prefetch-github python3Packages.githubkit +import json +import subprocess + +from githubkit import GitHub, UnauthAuthStrategy +from githubkit.versions.latest.models import ( + Commit, + ContentSubmodule, + Tag, +) + +DEPS_PATH: str = "./pkgs/by-name/ed/edopro/deps.nix" + +with GitHub(UnauthAuthStrategy()) as github: + edopro: Tag = github.rest.repos.list_tags("edo9300", "edopro").parsed_data[0] + + ocgcore_submodule: ContentSubmodule = github.rest.repos.get_content( + "edo9300", "edopro", "ocgcore" + ).parsed_data + + ocgcore: Commit = github.rest.repos.get_commit( + "edo9300", "ygopro-core", ocgcore_submodule.sha + ).parsed_data + + # This dep is not versioned in anyway and is why we check below to see if this is a new version. + irrlicht: Commit = github.rest.repos.list_commits( + "edo9300", "irrlicht1-8-4" + ).parsed_data[0] + + irrlicht: Commit = github.rest.repos.get_commit( + "edo9300", "irrlicht1-8-4", "7edde28d4f8c0c3589934c398a3a441286bb7c22" + ).parsed_data + + +edopro_working_version: str = "" +try: + with open(DEPS_PATH, "r") as file: + for line in file.readlines(): + if "edopro-version" in line: + edopro_working_version = line.split('"')[1] +except FileNotFoundError: + print("Error: Dep file not found.") + exit(2) + +if edopro_working_version == "": + print("Working version is unbound") + exit(5) + +if edopro_working_version == edopro.name: + print("Version is updated") + exit(0) + + +def get_hash(owner: str, repo: str, rev: str, submodule: bool = False) -> str: + args: list[str] = ["nix-prefetch-github", owner, repo, "--rev", rev] + + if submodule: + args.append("--fetch-submodules") + + out: subprocess.CompletedProcess = subprocess.run(args, capture_output=True) + out_json = json.loads(out.stdout.decode()) + + return out_json["hash"] + + +edopro_hash = get_hash("edo9300", "edopro", edopro.commit.sha, submodule=True) +ocgcore_hash = get_hash("edo9300", "ygopro-core", ocgcore.sha) +irrlicht_hash = get_hash("edo9300", "irrlicht1-8-4", irrlicht.sha) + +asset_legacy_hash: str = ( + subprocess.run( + [ + "nix-prefetch-url", + f"https://github.com/ProjectIgnis/edopro-assets/releases/download/{edopro.name}/ProjectIgnis-EDOPro-{edopro.name}-linux.tar.gz", + "--unpack", + ], + capture_output=True, + ) + .stdout.decode() + .strip() +) +asset_hash: str = ( + subprocess.run( + [ + "nix", + "--extra-experimental-features", + "nix-command", + "hash", + "to-sri", + "--type", + "sha256", + asset_legacy_hash, + ], + capture_output=True, + ) + .stdout.decode() + .strip() +) + + +with open(DEPS_PATH, "w") as file: + contents = f"""# This is automatically generated by the update script. +# DO NOT MANUALLY EDIT. +{{ + assets-hash = "{asset_hash}"; + edopro-version = "{edopro.name}"; + edopro-rev = "{edopro.commit.sha}"; + edopro-hash = "{edopro_hash}"; + irrlicht-version = "{"1.9.0-unstable-" + irrlicht.commit.committer.date.split("T")[0]}"; + irrlicht-rev = "{irrlicht.sha}"; + irrlicht-hash = "{irrlicht_hash}"; + ocgcore-version = "{"0-unstable-" + ocgcore.commit.committer.date.split("T")[0]}"; + ocgcore-rev = "{ocgcore.sha}"; + ocgcore-hash = "{ocgcore_hash}"; +}} +""" + + file.write(contents) diff --git a/third_party/nixpkgs/pkgs/by-name/ei/eigenlayer/package.nix b/third_party/nixpkgs/pkgs/by-name/ei/eigenlayer/package.nix index 7f7a2e1bad..1af3e0be6b 100644 --- a/third_party/nixpkgs/pkgs/by-name/ei/eigenlayer/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ei/eiwd/package.nix b/third_party/nixpkgs/pkgs/by-name/ei/eiwd/package.nix index c2d54101db..281837fd4b 100644 --- a/third_party/nixpkgs/pkgs/by-name/ei/eiwd/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ei/eiwd/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; # override this to false if you don't want to build python3 - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; # prevent the `install-data-local` Makefile rule from running; # all it does is attempt to `mkdir` the `localstatedir`. diff --git a/third_party/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix b/third_party/nixpkgs/pkgs/by-name/ej/ejabberd/package.nix similarity index 67% rename from third_party/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix rename to third_party/nixpkgs/pkgs/by-name/ej/ejabberd/package.nix index d6dab1fef4..cee3ef9d13 100644 --- a/third_party/nixpkgs/pkgs/servers/xmpp/ejabberd/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/xmpp/ejabberd/rebar-deps.nix b/third_party/nixpkgs/pkgs/by-name/ej/ejabberd/rebar-deps.nix similarity index 93% rename from third_party/nixpkgs/pkgs/servers/xmpp/ejabberd/rebar-deps.nix rename to third_party/nixpkgs/pkgs/by-name/ej/ejabberd/rebar-deps.nix index db5899e271..423dd55926 100644 --- a/third_party/nixpkgs/pkgs/servers/xmpp/ejabberd/rebar-deps.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/em/emacspeak/package.nix b/third_party/nixpkgs/pkgs/by-name/em/emacspeak/package.nix index 6c18af7807..3e9b753be9 100644 --- a/third_party/nixpkgs/pkgs/by-name/em/emacspeak/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ep/epic5/package.nix b/third_party/nixpkgs/pkgs/by-name/ep/epic5/package.nix index a73b64043b..f4f2ca6b2a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ep/epic5/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/er/eris-go/package.nix b/third_party/nixpkgs/pkgs/by-name/er/eris-go/package.nix index 3e05cc65d3..496572f9d7 100644 --- a/third_party/nixpkgs/pkgs/by-name/er/eris-go/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix b/third_party/nixpkgs/pkgs/by-name/ex/exodus/package.nix similarity index 82% rename from third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix rename to third_party/nixpkgs/pkgs/by-name/ex/exodus/package.nix index 5e13ece9a5..b301e4e26c 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix b/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix index d94f62a634..61034c59f6 100644 --- a/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.20.4"; + version = "0.20.5"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-0wkFVExa8HCe3UBDMWjq2UAtrW1zmUQHAcVgWgmPPWM="; + hash = "sha256-cxgEeYazhWO1V2Tf+70u6wlc9oME5ws3Da+OYf7UprQ="; }; - cargoHash = "sha256-GWrhW9+bX0pc78Seb6WHvWjCSe8XWKiHYUXRMFq+LbY="; + cargoHash = "sha256-trO/NGNC5Kz76ua1RxBqfjNoXaQqikgPNyGnD7f/FXM="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/third_party/nixpkgs/pkgs/by-name/fa/fanbox-dl/package.nix b/third_party/nixpkgs/pkgs/by-name/fa/fanbox-dl/package.nix index a1989988b4..d47bff2b72 100644 --- a/third_party/nixpkgs/pkgs/by-name/fa/fanbox-dl/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fa/fanbox-dl/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fanbox-dl"; - version = "0.23.1"; + version = "0.23.2"; src = fetchFromGitHub { owner = "hareku"; repo = "fanbox-dl"; rev = "v${version}"; - hash = "sha256-EO1J90uH2J8EI51qGzIQyl4BbSwijkEi5ZQENgSMEm8="; + hash = "sha256-JARIY6z912XDvZ6JviLMP8OZLOIzUPLuJtWGpKcqwvY="; }; - vendorHash = "sha256-GD5uxa5XWhlHHBztTpDKCTSym2pdkr/or6aGl9qF29U="; + vendorHash = "sha256-l/mgjCqRzidJ1QxH8bKGa7ZnRZVOqkuNifgEyFVU7fA="; # pings websites during testing doCheck = false; diff --git a/third_party/nixpkgs/pkgs/by-name/fa/fastfetch/package.nix b/third_party/nixpkgs/pkgs/by-name/fa/fastfetch/package.nix index 5d1f54b826..e5ec0ed52a 100644 --- a/third_party/nixpkgs/pkgs/by-name/fa/fastfetch/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/fa/fastfetch/package.nix @@ -47,13 +47,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.27.1"; + version = "2.28.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-N/C6vGNebOFQ5RRpHD2hTqvHbX5mwICqIeFsdSCjaR4="; + hash = "sha256-fkAtBO9POd3JKNNt0jV1ufIN1s8HaFW7P2+32cRycWs="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/fa/fatrop/package.nix b/third_party/nixpkgs/pkgs/by-name/fa/fatrop/package.nix index 87d66c6780..f575b763d0 100644 --- a/third_party/nixpkgs/pkgs/by-name/fa/fatrop/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix b/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix new file mode 100644 index 0000000000..dbd9866f58 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-mozc-ut/package.nix b/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-mozc-ut/package.nix new file mode 100644 index 0000000000..7580b0181e --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-mozc/package.nix b/third_party/nixpkgs/pkgs/by-name/fc/fcitx5-mozc/package.nix new file mode 100644 index 0000000000..43535fd935 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/fe/fedimint/package.nix b/third_party/nixpkgs/pkgs/by-name/fe/fedimint/package.nix index ca91966bbe..f55bbbf147 100644 --- a/third_party/nixpkgs/pkgs/by-name/fe/fedimint/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ff/fflogs/package.nix b/third_party/nixpkgs/pkgs/by-name/ff/fflogs/package.nix index 2a398506b3..b4c94e54e3 100644 --- a/third_party/nixpkgs/pkgs/by-name/ff/fflogs/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/fi/fido2-manage/package.nix b/third_party/nixpkgs/pkgs/by-name/fi/fido2-manage/package.nix new file mode 100644 index 0000000000..19038a03d3 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/fi/figma-agent/0001-update-time.patch b/third_party/nixpkgs/pkgs/by-name/fi/figma-agent/0001-update-time.patch new file mode 100644 index 0000000000..b136a02d49 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/figma-agent/default.nix b/third_party/nixpkgs/pkgs/by-name/fi/figma-agent/package.nix similarity index 54% rename from third_party/nixpkgs/pkgs/applications/graphics/figma-agent/default.nix rename to third_party/nixpkgs/pkgs/by-name/fi/figma-agent/package.nix index a6bf008e82..3d01590f72 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/figma-agent/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/fi/finamp/package.nix b/third_party/nixpkgs/pkgs/by-name/fi/finamp/package.nix index 8795f6c066..b4b3668633 100644 --- a/third_party/nixpkgs/pkgs/by-name/fi/finamp/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/fl/flarectl/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flarectl/package.nix index 8acf4040b4..7a9c347c8d 100644 --- a/third_party/nixpkgs/pkgs/by-name/fl/flarectl/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/fl/flatpak/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flatpak/package.nix index 231b682cc2..4eec7288bf 100644 --- a/third_party/nixpkgs/pkgs/by-name/fl/flatpak/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/fl/flawz/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flawz/package.nix index fb40c65dc2..317005c141 100644 --- a/third_party/nixpkgs/pkgs/by-name/fl/flawz/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/fl/flclash/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flclash/package.nix new file mode 100644 index 0000000000..d72a16afc6 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/fl/flclash/pubspec.lock.json b/third_party/nixpkgs/pkgs/by-name/fl/flclash/pubspec.lock.json new file mode 100644 index 0000000000..ddbc944fe6 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/fl/flent/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flent/package.nix new file mode 100644 index 0000000000..5e78f6923f --- /dev/null +++ b/third_party/nixpkgs/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 < goreleaser.1 installManPage ./goreleaser.1 installShellCompletion --cmd goreleaser \ diff --git a/third_party/nixpkgs/pkgs/by-name/go/got/package.nix b/third_party/nixpkgs/pkgs/by-name/go/got/package.nix index d872cd7960..1cb5cfa9ef 100644 --- a/third_party/nixpkgs/pkgs/by-name/go/got/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/go/got/package.nix @@ -27,11 +27,11 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "got"; - version = "0.103"; + version = "0.104"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz"; - hash = "sha256-MkBek/NTpU+rylSS5abFQl8Vm3phRFCQkpnI3INJKHg="; + hash = "sha256-sy14eSC8SXUhOVoGvrB9f0+StpN5WGMiS2BJ09ZpyMk="; }; nativeBuildInputs = [ pkg-config bison ] diff --git a/third_party/nixpkgs/pkgs/by-name/go/gotestdox/package.nix b/third_party/nixpkgs/pkgs/by-name/go/gotestdox/package.nix new file mode 100644 index 0000000000..c9a0c55ccf --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/gr/grafana-alloy/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/grafana-alloy/package.nix index e465a4f66e..9c8da64480 100644 --- a/third_party/nixpkgs/pkgs/by-name/gr/grafana-alloy/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gr/grafana-alloy/package.nix @@ -16,17 +16,17 @@ buildGoModule rec { pname = "grafana-alloy"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "alloy"; - hash = "sha256-/LCp4PUt85HR+ig0/v7KlS1cFcFGpI8TXHk3IlcEkvk="; + hash = "sha256-ISSmTdX/LgbreoGJry33xdOO9J98nh8SZBJwEFsFyvY="; }; proxyVendor = true; - vendorHash = "sha256-fhUoQGNRoWNbU5U21X45s+eJ8XjCkvYULTRShyq0f3E="; + vendorHash = "sha256-O7x71Ghd8zI2Ns8Jj/Z5FWXKjyeHaPD8gyNmpwpIems="; nativeBuildInputs = [ fixup-yarn-lock yarn nodejs installShellFiles ]; @@ -62,7 +62,7 @@ buildGoModule rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/internal/web/ui/yarn.lock"; - hash = "sha256-Y0WcmjFtiNXue2kcJGlvHVBGmMLewGICISoRHnBPHGw="; + hash = "sha256-Q4IrOfCUlXM/5577Wk8UCIs76+XbuoHz7sIEJJTMKc4="; }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/by-name/gr/grafana-kiosk/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/grafana-kiosk/package.nix index 3f81fe7ca5..39a26d9505 100644 --- a/third_party/nixpkgs/pkgs/by-name/gr/grafana-kiosk/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/gr/granian/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/granian/package.nix index ce2b033f27..2462ba964c 100644 --- a/third_party/nixpkgs/pkgs/by-name/gr/granian/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/gr/granted/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/granted/package.nix index 43a32eb4d1..307c245eb5 100644 --- a/third_party/nixpkgs/pkgs/by-name/gr/granted/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/gr/grap/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/grap/package.nix new file mode 100644 index 0000000000..5568571500 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/gr/grimblast/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/grimblast/package.nix index bd6c6301a1..dce239d1cb 100644 --- a/third_party/nixpkgs/pkgs/by-name/gr/grimblast/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gr/grimblast/package.nix @@ -11,6 +11,7 @@ , libnotify , slurp , wl-clipboard +, bash }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -31,6 +32,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { scdoc ]; + buildInputs = [ bash ]; + makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/by-name/gr/gromit-mpx/package.nix b/third_party/nixpkgs/pkgs/by-name/gr/gromit-mpx/package.nix new file mode 100644 index 0000000000..48c2e0aead --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/gu/guile-goblins/package.nix b/third_party/nixpkgs/pkgs/by-name/gu/guile-goblins/package.nix index 4175b9c5d7..f34d5878f8 100644 --- a/third_party/nixpkgs/pkgs/by-name/gu/guile-goblins/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/gu/guile-goblins/package.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { pname = "guile-goblins"; - version = "0.13.0"; + version = "0.14.0"; src = fetchurl { url = "https://spritely.institute/files/releases/guile-goblins/guile-goblins-${version}.tar.gz"; - hash = "sha256-efmyOtPAz1ZPdMCuVaGALR6e0lg7gcjt81BUMBVUKug="; + hash = "sha256-jR+pWk7NXvOF0CvDwa1rYg0yu5ktyq440qyRgivqHr8="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/by-name/gu/guile-ssh/package.nix b/third_party/nixpkgs/pkgs/by-name/gu/guile-ssh/package.nix index ad3a8c5474..5fca74a794 100644 --- a/third_party/nixpkgs/pkgs/by-name/gu/guile-ssh/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/gu/guix/guix-build-user-takeover-fix.patch b/third_party/nixpkgs/pkgs/by-name/gu/guix/guix-build-user-takeover-fix.patch new file mode 100644 index 0000000000..0e22f0f350 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/gu/guix/package.nix b/third_party/nixpkgs/pkgs/by-name/gu/guix/package.nix index 90eb4dfefe..5752a45ae6 100644 --- a/third_party/nixpkgs/pkgs/by-name/gu/guix/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/gummy/default.nix b/third_party/nixpkgs/pkgs/by-name/gu/gummy/package.nix similarity index 82% rename from third_party/nixpkgs/pkgs/tools/misc/gummy/default.nix rename to third_party/nixpkgs/pkgs/by-name/gu/gummy/package.nix index 628d5e9e7d..2b34d02d5b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gummy/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/gu/gummy/package.nix @@ -14,18 +14,19 @@ , fmt , nlohmann_json , spdlog +, nix-update-script }: stdenv.mkDerivation (finalAttrs: { pname = "gummy"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "fusco"; repo = "gummy"; rev = finalAttrs.version; - hash = "sha256-kATieFf+dEpcYgSEPoETacP7R+u2dOrg7rOhIkNQ1uE="; + hash = "sha256-ic+kTBoirMX6g79NdNoeFbNNo1LYg/z+nlt/GAB6UyQ="; }; nativeBuildInputs = [ @@ -46,8 +47,10 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DUDEV_DIR=${placeholder "out"}/lib/udev" - "-DUDEV_RULES_DIR=${placeholder "out"}/lib/udev/rules.d" + (lib.mapAttrsToList lib.cmakeFeature { + "UDEV_DIR" = "${placeholder "out"}/lib/udev"; + "UDEV_RULES_DIR" = "${placeholder "out"}/lib/udev/rules.d"; + }) ]; # Fixes the "gummy start" command, without this it cannot find the binary. @@ -65,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://codeberg.org/fusco/gummy"; diff --git a/third_party/nixpkgs/pkgs/by-name/he/hello/package.nix b/third_party/nixpkgs/pkgs/by-name/he/hello/package.nix index 659899bd5f..2463ce5ad6 100644 --- a/third_party/nixpkgs/pkgs/by-name/he/hello/package.nix +++ b/third_party/nixpkgs/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: { @@ -35,7 +36,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. @@ -43,9 +44,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/third_party/nixpkgs/pkgs/applications/audio/helm/default.nix b/third_party/nixpkgs/pkgs/by-name/he/helm/package.nix similarity index 54% rename from third_party/nixpkgs/pkgs/applications/audio/helm/default.nix rename to third_party/nixpkgs/pkgs/by-name/he/helm/package.nix index b6331fd213..c5b4dd4ce5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/helm/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/he/helm/package.nix @@ -1,54 +1,73 @@ -{ lib, stdenv -, fetchFromGitHub -, fetchpatch -, xorg -, freetype -, alsa-lib -, curl -, libjack2 -, lv2 -, pkg-config -, libGLU -, libGL +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + xorg, + freetype, + alsa-lib, + curl, + libjack2, + lv2, + pkg-config, + libGLU, + libGL, }: - stdenv.mkDerivation { - version = "0.9.0"; +stdenv.mkDerivation (finalAttrs: { pname = "helm"; + version = "0.9.0"; src = fetchFromGitHub { owner = "mtytel"; repo = "helm"; - rev = "927d2ed27f71a735c3ff2a1226ce3129d1544e7e"; - sha256 = "17ys2vvhncx9i3ydg3xwgz1d3gqv4yr5mqi7vr0i0ca6nad6x3d4"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-pI1umrJGMRBB3ifiWrInG7/Rwn+8j9f8iKkzC/cW2p8="; }; buildInputs = [ - xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext - xorg.libXinerama xorg.libXrender xorg.libXrandr - freetype alsa-lib curl libjack2 libGLU libGL lv2 + xorg.libX11 + xorg.libXcomposite + xorg.libXcursor + xorg.libXext + xorg.libXinerama + xorg.libXrender + xorg.libXrandr + freetype + alsa-lib + curl + libjack2 + libGLU + libGL + lv2 ]; nativeBuildInputs = [ pkg-config ]; - CXXFLAGS = "-DHAVE_LROUND"; + CXXFLAGS = [ + "-DHAVE_LROUND" + "-fpermissive" + ]; enableParallelBuilding = true; - makeFlags = [ "DESTDIR=$(out)" ]; + makeFlags = [ "DESTDIR=${placeholder "out"}" ]; patches = [ # gcc9 compatibility https://github.com/mtytel/helm/pull/233 (fetchpatch { url = "https://github.com/mtytel/helm/commit/cb611a80bd5a36d31bfc31212ebbf79aa86c6f08.patch"; - sha256 = "1i2289srcfz17c3zzab6f51aznzdj62kk53l4afr32bkjh9s4ixk"; + hash = "sha256-s0eiE5RziZGdInSUOYWR7duvQnFmqf8HO+E7lnVCQsQ="; }) ]; - prePatch = '' - sed -i 's|usr/||g' Makefile - sed -i "s|/usr/share/|$out/share/|" src/common/load_save.cpp + postPatch = '' + substituteInPlace Makefile \ + --replace-fail "usr/" "" + + substituteInPlace src/common/load_save.cpp \ + --replace-fail "/usr/share/" "$out/share/" ''; - meta = with lib; { - homepage = "http://tytel.org/helm"; + meta = { + homepage = "https://tytel.org/helm"; description = "Free, cross-platform, polyphonic synthesizer"; longDescription = '' A free, cross-platform, polyphonic synthesizer. @@ -68,8 +87,11 @@ Effects: Formant filter, stutter, delay ''; license = lib.licenses.gpl3Plus; - maintainers = [ maintainers.magnetophon ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ + magnetophon + bot-wxt1221 + ]; + platforms = lib.platforms.linux; mainProgram = "helm"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ho/host-spawn/package.nix b/third_party/nixpkgs/pkgs/by-name/ho/host-spawn/package.nix new file mode 100644 index 0000000000..6fd12d0968 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/flent/http-getter.nix b/third_party/nixpkgs/pkgs/by-name/ht/http-getter/package.nix similarity index 81% rename from third_party/nixpkgs/pkgs/applications/networking/flent/http-getter.nix rename to third_party/nixpkgs/pkgs/by-name/ht/http-getter/package.nix index 5ea07cfe4f..72fb7f5f52 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/flent/http-getter.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ht/httpdirfs/package.nix b/third_party/nixpkgs/pkgs/by-name/ht/httpdirfs/package.nix index 6b6ed108fd..d74535bfda 100644 --- a/third_party/nixpkgs/pkgs/by-name/ht/httpdirfs/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/hu/hugo/package.nix b/third_party/nixpkgs/pkgs/by-name/hu/hugo/package.nix index ffc2266509..7a8f3f8bd2 100644 --- a/third_party/nixpkgs/pkgs/by-name/hu/hugo/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/hw/hwinfo/package.nix b/third_party/nixpkgs/pkgs/by-name/hw/hwinfo/package.nix index 14e922df15..cfb940d66c 100644 --- a/third_party/nixpkgs/pkgs/by-name/hw/hwinfo/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/hyfetch/default.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyfetch/package.nix similarity index 66% rename from third_party/nixpkgs/pkgs/tools/misc/hyfetch/default.nix rename to third_party/nixpkgs/pkgs/by-name/hy/hyfetch/package.nix index 2e906541bd..e88178b788 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hyfetch/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/hy/hyfetch/package.nix @@ -1,23 +1,26 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3Packages, }: - -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "hyfetch"; - version = "1.4.11"; - format = "setuptools"; + version = "1.99.0"; + pyproject = true; src = fetchFromGitHub { owner = "hykilpikonna"; repo = "hyfetch"; rev = "refs/tags/${version}"; - hash = "sha256-xzN/tbS5BUvpKeozesE99gNp3NRDjvf4Qx7BHLc4svo="; + hash = "sha256-GL1/V+LgSXJ4b28PfinScDrJhU9VDa4pVi24zWEzbAk="; }; - propagatedBuildInputs = with python3.pkgs; [ - typing-extensions - setuptools + build-system = [ + python3Packages.setuptools + ]; + + dependencies = [ + python3Packages.typing-extensions ]; # No test available @@ -27,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { "hyfetch" ]; - meta = with lib; { + meta = { description = "neofetch with pride flags <3"; longDescription = '' HyFetch is a command-line system information tool fork of neofetch. @@ -39,8 +42,11 @@ python3.pkgs.buildPythonApplication rec { icon set you are using, etc. ''; homepage = "https://github.com/hykilpikonna/HyFetch"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "hyfetch"; - maintainers = with maintainers; [ yisuidenghua ]; + maintainers = with lib.maintainers; [ + yisuidenghua + isabelroses + ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyperlink/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyperlink/package.nix index 8f89a00810..0edd68e6a8 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hyperlink/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/hy/hyprcursor/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprcursor/package.nix index 5b8480dc20..9ef6b761f7 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hyprcursor/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/hy/hypridle/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hypridle/package.nix index 1c0a2225ef..05ce061e19 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hypridle/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hy/hypridle/package.nix @@ -43,7 +43,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Hyprland's idle daemon"; homepage = "https://github.com/hyprwm/hypridle"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ iogamaster ]; + maintainers = with lib.maintainers; [ + iogamaster + khaneliman + ]; mainProgram = "hypridle"; platforms = [ "aarch64-linux" diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyprland/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprland/package.nix index 36219143a9..3364348a1d 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hyprland/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hy/hyprland/package.nix @@ -207,6 +207,7 @@ customStdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ fufexan johnrtitor + khaneliman wozeparrot ]; mainProgram = "Hyprland"; diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyprpolkitagent/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprpolkitagent/package.nix new file mode 100644 index 0000000000..13baecb89f --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/hy/hyprshot/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprshot/package.nix index 98f94ea5d8..17be2088c7 100644 --- a/third_party/nixpkgs/pkgs/by-name/hy/hyprshot/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/hy/hyprshot/package.nix @@ -7,6 +7,8 @@ , slurp , wl-clipboard , libnotify +, withFreeze ? true +, hyprpicker , makeWrapper }: @@ -28,9 +30,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { install -Dm755 hyprshot -t "$out/bin" wrapProgram "$out/bin/hyprshot" \ - --prefix PATH ":" ${lib.makeBinPath [ + --prefix PATH ":" ${lib.makeBinPath ([ hyprland jq grim slurp wl-clipboard libnotify - ]} + ] ++ lib.optionals withFreeze [ hyprpicker ])} runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/by-name/hy/hyprsunset/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprsunset/package.nix new file mode 100644 index 0000000000..a1b70a67bf --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/i2/i2p/package.nix b/third_party/nixpkgs/pkgs/by-name/i2/i2p/package.nix index a4f9c53daf..d8b2e8ca72 100644 --- a/third_party/nixpkgs/pkgs/by-name/i2/i2p/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/i2/i2p/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "i2p"; - version = "2.6.1"; + version = "2.7.0"; src = fetchzip { urls = [ @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { "https://files.i2p-projekt.de/" "https://download.i2p2.no/releases/" ]); - hash = "sha256-ntjTXdpgcTReEVxzDEoq9r3NAqS7q4m+rlJXp7is1k0="; + hash = "sha256-gw1i6jrmTfz9CZlCjtOUdH5R4vD57ysDeQxyyWifieg="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/by-name/ic/icloudpd/package.nix b/third_party/nixpkgs/pkgs/by-name/ic/icloudpd/package.nix index b67ef56b80..868355dea3 100644 --- a/third_party/nixpkgs/pkgs/by-name/ic/icloudpd/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/im/imhex/package.nix b/third_party/nixpkgs/pkgs/by-name/im/imhex/package.nix index 2e4ad286a1..e8d0a11330 100644 --- a/third_party/nixpkgs/pkgs/by-name/im/imhex/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/im/imhex/package.nix @@ -19,7 +19,7 @@ python3, jansson, curl, - fmt_8, + fmt, nlohmann_json, yara, rsync, @@ -97,7 +97,7 @@ stdenv'.mkDerivation (finalAttrs: { curl dbus file - fmt_8 + fmt glfw3 gtk3 jansson diff --git a/third_party/nixpkgs/pkgs/by-name/im/immersed/linux.nix b/third_party/nixpkgs/pkgs/by-name/im/immersed/linux.nix index 60d19900af..fb989ef291 100644 --- a/third_party/nixpkgs/pkgs/by-name/im/immersed/linux.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/im/immich-machine-learning/package.nix b/third_party/nixpkgs/pkgs/by-name/im/immich-machine-learning/package.nix index 1029055a3b..e9f74898a7 100644 --- a/third_party/nixpkgs/pkgs/by-name/im/immich-machine-learning/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/im/immich-machine-learning/package.nix @@ -25,9 +25,12 @@ python.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "pydantic-settings" + ]; + + pythonRemoveDeps = [ + # https://github.com/immich-app/immich/pull/13762 "setuptools" ]; - pythonRemoveDeps = [ "opencv-python-headless" ]; build-system = with python.pkgs; [ poetry-core @@ -38,7 +41,7 @@ python.pkgs.buildPythonApplication rec { with python.pkgs; [ insightface - opencv4 + opencv-python-headless pillow fastapi uvicorn @@ -47,7 +50,6 @@ python.pkgs.buildPythonApplication rec { aiocache rich ftfy - setuptools python-multipart orjson gunicorn @@ -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/third_party/nixpkgs/pkgs/by-name/im/immich/package.nix b/third_party/nixpkgs/pkgs/by-name/im/immich/package.nix index fcbfb2607f..66213718fd 100644 --- a/third_party/nixpkgs/pkgs/by-name/im/immich/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/im/immich/sources.json b/third_party/nixpkgs/pkgs/by-name/im/immich/sources.json index b39c08613c..27044f2a25 100644 --- a/third_party/nixpkgs/pkgs/by-name/im/immich/sources.json +++ b/third_party/nixpkgs/pkgs/by-name/im/immich/sources.json @@ -1,22 +1,22 @@ { - "version": "1.118.2", - "hash": "sha256-u2/Xs1SdAzmQ02pyXD9+ncamIKFcq8qMijnx7KFtrmU=", + "version": "1.119.0", + "hash": "sha256-mflVxz+Pxv7xS4onsjRQ1lMZ43U/rkuqO6vPRon7Gms=", "components": { "cli": { - "npmDepsHash": "sha256-RwfGq0fDPYo+ZP2xv+sMKmr3Tf8szbB8506c1PqiMM0=", - "version": "2.2.26" + "npmDepsHash": "sha256-QClG/WQK2MbVKuR0Wk9+TdSTAbemtFeg7GkKjvEjC4c=", + "version": "2.2.27" }, "server": { - "npmDepsHash": "sha256-4jPvLCsI2gz+maBU3ZtrWZzJ6Zp2PTQwaCuCKr1hK/o=", - "version": "1.118.2" + "npmDepsHash": "sha256-9mMnOiKsTTO4PJUKYN668yjIELeFUgdqSx6Gf87UYVU=", + "version": "1.119.0" }, "web": { - "npmDepsHash": "sha256-j6+EkcfwpaCP048v/kZv1xthp0DSylraJTeU4+LcDbw=", - "version": "1.118.2" + "npmDepsHash": "sha256-ieTGMywR26msYqmQOK/q/l3O6/Vkmu0TLFn956kK/xE=", + "version": "1.119.0" }, "open-api/typescript-sdk": { - "npmDepsHash": "sha256-e+7BEFc46scLZDqCJNRhrczOEydSoiK9m7vSj/2ECaE=", - "version": "1.118.2" + "npmDepsHash": "sha256-NLvuHTVWuzv5G0ONu3S3K8AgyliTZowYQN0fzYhWtUQ=", + "version": "1.119.0" } } } diff --git a/third_party/nixpkgs/pkgs/by-name/in/ineffassign/0001-fix-build.patch b/third_party/nixpkgs/pkgs/by-name/in/ineffassign/0001-fix-build.patch new file mode 100644 index 0000000000..3b953539d8 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/in/ineffassign/package.nix b/third_party/nixpkgs/pkgs/by-name/in/ineffassign/package.nix new file mode 100644 index 0000000000..f88b72527c --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/in/intiface-central/package.nix b/third_party/nixpkgs/pkgs/by-name/in/intiface-central/package.nix index 7353a8ed6a..fad8b190b1 100644 --- a/third_party/nixpkgs/pkgs/by-name/in/intiface-central/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/in/intiface-central/pubspec.lock.json b/third_party/nixpkgs/pkgs/by-name/in/intiface-central/pubspec.lock.json index d3f088c662..7e4a916a87 100644 --- a/third_party/nixpkgs/pkgs/by-name/in/intiface-central/pubspec.lock.json +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/in/inv-sig-helper/package.nix b/third_party/nixpkgs/pkgs/by-name/in/inv-sig-helper/package.nix index 31f78a23b5..a6b295a0fb 100644 --- a/third_party/nixpkgs/pkgs/by-name/in/inv-sig-helper/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/in/inv-sig-helper/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage { pname = "inv-sig-helper"; - version = "0-unstable-2024-08-17"; + version = "0-unstable-2024-09-24"; src = fetchFromGitHub { owner = "iv-org"; repo = "inv_sig_helper"; - rev = "215d32c76e5e9e598de6e4f8542316f80dd92f57"; - hash = "sha256-Ge0XoWrscyZSrkmtDPkAnv96IVylKZTcgGgonbFV43I="; + rev = "5025e49e6106f93ec06d0e3fd542a51e1c44c25a"; + hash = "sha256-fMRjkZRMvcro3pOO20l5zRDOwn/E5KTVBOiDmcGROz4="; }; - cargoHash = "sha256-JVpLUhNJ7/4WZwLn/zOurpP8kF5WblF3nphJh6keHG8="; + cargoHash = "sha256-AisolMo++xMDesdfafeGx37r7sGbk0P0vMsHq0YTUL4="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/by-name/iv/ivyterm/package.nix b/third_party/nixpkgs/pkgs/by-name/iv/ivyterm/package.nix new file mode 100644 index 0000000000..7fe42f201b --- /dev/null +++ b/third_party/nixpkgs/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-vxDJwA+ZM3ROX9d1+o3cXj4LbaO9Wy5jFAVuAPOzCCI="; + }; + + 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/third_party/nixpkgs/pkgs/by-name/ja/jalv/package.nix b/third_party/nixpkgs/pkgs/by-name/ja/jalv/package.nix new file mode 100644 index 0000000000..f801039fb0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ja/jalv/package.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libsForQt5, + libjack2, + lilv, + lv2, + meson, + ninja, + pkg-config, + portaudio, + serd, + sord, + sratom, + suil, + wrapGAppsHook3, + useJack ? true, + useQt ? false, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "jalv"; + version = "1.6.8"; + + src = fetchFromGitHub { + owner = "drobilla"; + repo = "jalv"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-MAQoc+WcuoG6Psa44VRaZ2TWB2LBpvf6EmqbUZPUf38="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ] ++ lib.optionals (!useQt) [ wrapGAppsHook3 ] ++ lib.optionals useQt [ libsForQt5.wrapQtAppsHook ]; + + buildInputs = + [ + lilv + lv2 + portaudio + serd + sord + sratom + suil + ] + ++ lib.optionals (!useJack) [ portaudio ] + ++ lib.optionals useJack [ libjack2 ] + ++ lib.optionals useQt [ libsForQt5.qtbase ]; + + mesonFlags = [ + (lib.mesonEnable "portaudio" (!useJack)) + (lib.mesonEnable "jack" useJack) + (lib.mesonEnable "gtk2" false) + (lib.mesonEnable "gtk3" (!useQt)) + (lib.mesonEnable "qt5" useQt) + ]; + + meta = { + description = "Simple but fully featured LV2 host for Jack"; + homepage = "http://drobilla.net/software/jalv"; + license = lib.licenses.isc; + mainProgram = if useQt then "jalv.qt5" else "jalv.gtk3"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/servers/janus-gateway/default.nix b/third_party/nixpkgs/pkgs/by-name/ja/janus-gateway/package.nix similarity index 55% rename from third_party/nixpkgs/pkgs/servers/janus-gateway/default.nix rename to third_party/nixpkgs/pkgs/by-name/ja/janus-gateway/package.nix index 9a0ecad23d..dadd67e735 100644 --- a/third_party/nixpkgs/pkgs/servers/janus-gateway/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ja/janus-gateway/package.nix @@ -1,7 +1,26 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gengetopt -, glib, libconfig, libnice, jansson, boringssl, zlib, srtp, libuv -, libmicrohttpd, curl, libwebsockets, sofia_sip, libogg, libopus -, usrsctp, ffmpeg +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + gengetopt, + glib, + libconfig, + libnice, + jansson, + boringssl, + zlib, + srtp, + libuv, + libmicrohttpd, + curl, + libwebsockets, + sofia_sip, + libogg, + libopus, + usrsctp, + ffmpeg, }: let @@ -15,20 +34,38 @@ in stdenv.mkDerivation rec { pname = "janus-gateway"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "meetecho"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3o9XxxTlWppq1mFgIUjstUFz6bT44mvBJa4FBgcc4Pc="; + sha256 = "sha256-oUX9PxiNdmrC03p+DAGkxD+mbi2jzuCgwlgd2JZ4Gwo="; }; - nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + gengetopt + ]; buildInputs = [ - glib libconfig libnice jansson boringssl zlib srtp libuv libmicrohttpd - curl libwebsockets_janus sofia_sip libogg libopus usrsctp ffmpeg + glib + libconfig + libnice + jansson + boringssl + zlib + srtp + libuv + libmicrohttpd + curl + libwebsockets_janus + sofia_sip + libogg + libopus + usrsctp + ffmpeg ]; enableParallelBuilding = true; @@ -44,9 +81,17 @@ stdenv.mkDerivation rec { makeFlags = [ "BORINGSSL_LIBS=-L${lib.getLib boringssl}/lib" + # Linking with CXX because boringssl static libraries depend on C++ stdlib. + # Upstream issue: https://www.github.com/meetecho/janus-gateway/issues/3456 + "CCLD=${stdenv.cc.targetPrefix}c++" ]; - outputs = [ "out" "dev" "doc" "man" ]; + outputs = [ + "out" + "dev" + "doc" + "man" + ]; postInstall = '' moveToOutput share/janus "$doc" diff --git a/third_party/nixpkgs/pkgs/by-name/ja/jasp-desktop/package.nix b/third_party/nixpkgs/pkgs/by-name/ja/jasp-desktop/package.nix index a444b36112..08fd1425fc 100644 --- a/third_party/nixpkgs/pkgs/by-name/ja/jasp-desktop/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ja/jazz2/package.nix b/third_party/nixpkgs/pkgs/by-name/ja/jazz2/package.nix index eac0fc29d1..72eb7786ac 100644 --- a/third_party/nixpkgs/pkgs/by-name/ja/jazz2/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/jo/journalist/package.nix b/third_party/nixpkgs/pkgs/by-name/jo/journalist/package.nix index 6e43151092..9c5e9a9fc4 100644 --- a/third_party/nixpkgs/pkgs/by-name/jo/journalist/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/jt/jtbl/package.nix b/third_party/nixpkgs/pkgs/by-name/jt/jtbl/package.nix new file mode 100644 index 0000000000..ff5d4e1d4a --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/k8/k8sgpt/package.nix b/third_party/nixpkgs/pkgs/by-name/k8/k8sgpt/package.nix new file mode 100644 index 0000000000..ba4707ff77 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ka/kakoune-lsp/package.nix b/third_party/nixpkgs/pkgs/by-name/ka/kakoune-lsp/package.nix index 4217613437..3eb4cce16f 100644 --- a/third_party/nixpkgs/pkgs/by-name/ka/kakoune-lsp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ka/kakoune-lsp/package.nix @@ -12,18 +12,18 @@ rustPlatform.buildRustPackage rec { pname = "kakoune-lsp"; - version = "17.1.2"; + version = "18.0.2"; src = fetchFromGitHub { owner = "kakoune-lsp"; repo = "kakoune-lsp"; rev = "v${version}"; - hash = "sha256-NZDp98Ne6z7DlJ2vZiqGzw5ukusOkEjb+eyvmxB+IKI="; + hash = "sha256-nfPc0ccEk+szaTJby56iMmydcDKDq/t1o8tw24c7MfY="; }; patches = [ (replaceVars ./Hardcode-perl.patch { inherit perl; }) ]; - cargoHash = "sha256-QonOqdcdp1vbxzLnF46X0DLVay2Up1LvHZ/ZZ04LqlE="; + cargoHash = "sha256-nISlApNLitwLhRovjPDep6ObOfZ1bk5QWJ/j2xjJxuU="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices diff --git a/third_party/nixpkgs/pkgs/by-name/ka/kando/package.nix b/third_party/nixpkgs/pkgs/by-name/ka/kando/package.nix new file mode 100644 index 0000000000..5456a4bd8b --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/kd/kdlfmt/package.nix b/third_party/nixpkgs/pkgs/by-name/kd/kdlfmt/package.nix new file mode 100644 index 0000000000..a5b5d37107 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ke/keep-sorted/package.nix b/third_party/nixpkgs/pkgs/by-name/ke/keep-sorted/package.nix index 6b2f9760e2..610cd33429 100644 --- a/third_party/nixpkgs/pkgs/by-name/ke/keep-sorted/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ke/keydb/package.nix b/third_party/nixpkgs/pkgs/by-name/ke/keydb/package.nix index 265f8a884f..ed6ba8bd51 100644 --- a/third_party/nixpkgs/pkgs/by-name/ke/keydb/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ke/keyguard/deps.json b/third_party/nixpkgs/pkgs/by-name/ke/keyguard/deps.json index e453731341..d1b62fc29a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ke/keyguard/deps.json +++ b/third_party/nixpkgs/pkgs/by-name/ke/keyguard/deps.json @@ -1045,8 +1045,8 @@ "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" }, - "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.7.0-rc01": { - "pom": "sha256-DhiM4cMSP5VblKXKW1jG4GXihQT0aApwC+ZdUQfrFGc=" + "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.7.0": { + "pom": "sha256-+aUsGbpqYxZ/gnuysLo8caiIRbUNYy7CFO8j09D+NAE=" }, "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", @@ -1707,13 +1707,13 @@ "module": "sha256-X8dNSe1IImBLtiMbgqZoSnycSi5TAsB5SFbcnqL/4PA=", "pom": "sha256-WjUR8QbYW0UjQSY4346LURnS6EQCbRG1hzpqlenq8xA=" }, - "com/microsoft/signalr#signalr/8.0.8": { - "jar": "sha256-5pQWQ7AtKPuEGNQfsa9FftAZq9NpM2EIjZ/h1hzWXjs=", - "pom": "sha256-9G8bpHX16l3sHtG4mkV8yYGskuVleum0pUx5bwaQNQI=" + "com/microsoft/signalr#signalr/8.0.10": { + "jar": "sha256-mI7x2yzYbu4935tvt6Tj2PH0e6K+lKOYIzteCTpjuF8=", + "pom": "sha256-C+qG0/ymoU3odX9NWp6CVTOj4J+pxATItLJ866v8aKA=" }, - "com/microsoft/signalr/messagepack#signalr-messagepack/8.0.8": { - "jar": "sha256-zlrZy8K6EcgkkfXs3k2BNa4i2qTB3o507ThUakTGKN8=", - "pom": "sha256-BCJCMKiI6uFFcmsd5dHeHmxx0H6Ew2Ol5eKFQuDXPzE=" + "com/microsoft/signalr/messagepack#signalr-messagepack/8.0.10": { + "jar": "sha256-n+Snsmlp783g7D9Pr6WsNzNrYUl8e/zMqebbnhUHV50=", + "pom": "sha256-dRkpAi42IS1Ys6CcI7MND69ltlElqUxOz9Sgw0R8q4E=" }, "com/nulab-inc#zxcvbn/1.9.0": { "jar": "sha256-OO+uurCRROsfTUyf9lDnnfh1qNbEU5wQWweaYGu32zQ=", @@ -2610,267 +2610,267 @@ "jar": "sha256-ew8ZckCCy/y8ZuWr6iubySzwih6hHhkZM+1DgB6zzQU=", "pom": "sha256-yUkPZVEyMo3yz7z990P1P8ORbWwdEENxdabKbjpndxw=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-common/2.8.3-rc01": { + "org/jetbrains/androidx/lifecycle#lifecycle-common/2.8.3": { "jar": "sha256-lzcRGdyeJgTqeMVDMwf/DxRy6IYt19/vXK3ob0IW7co=", - "module": "sha256-s1NkHzy88bsIMGsECZzVXdjLCEbeph/VfHZKPcHPagY=", - "pom": "sha256-aw2RW/tuu1gsmq33twU+W68zvMcwxFr6cCaaz6sv5AA=" + "module": "sha256-5JuLch7lfaXG+S0aivzDvCcuJblDHcJWwSrrawMhurE=", + "pom": "sha256-52FqxzlaU7v36UnOhS7Rr0Bzk5+NwhxY9O/1meAWkMY=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose-desktop/2.8.3-rc01": { + "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose-desktop/2.8.3": { "jar": "sha256-weUaJG5p4jfofSib4Ivr2NQG/+n/YKEl6PIHLbYRmWY=", - "module": "sha256-jB8h9qz1Duyh0bJEubt8E0XpoL/iZ8lTj9xnRr6DaME=", - "pom": "sha256-oi/mutH7OYytvY5RoJPUu4mvICT4KBo32xWGdpnuS3s=" + "module": "sha256-ftq2glUQ+28CDc0pDS5Z5EZpYM55g9j+0arRwcwlOgU=", + "pom": "sha256-3oQAyt0q08lXhEGdyH+sNu8E2tFIGCQmKtuTB0ksmGk=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose/2.8.3-rc01": { + "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose/2.8.3": { "jar": "sha256-vKChLI38r39zQPaueEeHVboKrLX9Amzaqu0ETR6i0dM=", - "module": "sha256-4g+/7uNPpLogIgjFh1r+BZsFEWPgPJtC6A/mWSxJzhM=", - "pom": "sha256-AZ0y7f4f6NMsxLBZFWJc+IUdP0CahY08FX9/KsP4Ae0=" + "module": "sha256-G5XG+23rwAEIPjOJRd5yxUe2ZSDxEY5G3XsuarqZhqE=", + "pom": "sha256-6rBzZerUBu/WAlH50jaJfSkFOjnQZ3OvkdjAdMGTBJY=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-runtime/2.8.3-rc01": { + "org/jetbrains/androidx/lifecycle#lifecycle-runtime/2.8.3": { "jar": "sha256-oFTwYuKeqeEbC/wOcjyMMmHxM61wv9e2SYvLVqakFxE=", - "module": "sha256-O45TsaRsz2Ugsf+jF9xRaLgmgFoNCi+wUfmNmlfC+iE=", - "pom": "sha256-RhCbjUL5LbukHLxCbP6XPPFmZ89ljPE8P/8xn/nBAtY=" + "module": "sha256-0GDrglEvHdCEbcJabjvoR5y7uI7XbuW4KOldzTXH6R8=", + "pom": "sha256-afzhSdyS2GswVk4ZAdZDNQWi/9ATIDxEj7FNQUBQJlE=" }, - "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel/2.8.3-rc01": { + "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel/2.8.3": { "jar": "sha256-aFRIUvdm0yJNbF4MfGG4Pg1xUGOvM6JtVu5iaIco37w=", - "module": "sha256-IlPYvswJR77h3Bk5IA7qN9/Vb1rKy1lgUH9MQgzXOG8=", - "pom": "sha256-pMbbdwNPwAzb1D00BkOAlluIFbLR2uuGgHo/Om9B6n8=" + "module": "sha256-C97hP9XDeEeYwpHraD2vz6sWQEA0nn6t2SOLo9XTKIE=", + "pom": "sha256-+LCPTAjUufxBcNjR+aIDEpGk0K9yzodSLPwsl5LMANo=" }, - "org/jetbrains/compose#compose-gradle-plugin/1.7.0-rc01": { - "jar": "sha256-bvxr0H9YF4MAEnxcv0COfkn//9WrDwSjRvIP7bfiNJs=", - "module": "sha256-ED6ebSTwIXal5ECkHea+Yst5Sa8ZRMJZMxnNLWW3PoM=", - "pom": "sha256-DNBQFbYoWKmAMKbcvoE29PNr9SiJKt1Qj5lg9yIg+DQ=" + "org/jetbrains/compose#compose-gradle-plugin/1.7.0": { + "jar": "sha256-F7ch4W8bXBAaduFvbz0rw//+rit5zD759BhW7Y7B85I=", + "module": "sha256-BgNU2R7hwMVPCgs8GjzutD7Uv8qjm7O9JgbbhYaragg=", + "pom": "sha256-o+Zmvd7k+urvSEO7TZET2yxjKpeX3TjuHUYa8lk1H2g=" }, - "org/jetbrains/compose#gradle-plugin-internal-jdk-version-probe/1.7.0-rc01": { - "jar": "sha256-hwY7ymKmu3QYPx6lTUquicbq85uNmRXWhbP13KQ9w8M=", - "module": "sha256-UIF0Jv7rrPUqYtOiABDiBgNcHxtWnv6dyddm7JuLcxI=", - "pom": "sha256-mVJyA8/us/F3Ducx+Mt/7Lghu3vvTuGQJHNokw6QPI4=" + "org/jetbrains/compose#gradle-plugin-internal-jdk-version-probe/1.7.0": { + "jar": "sha256-IV3fOk357eYF4cgjSA6zkOZK47RCh9MGyYvUD/iaYuQ=", + "module": "sha256-j86qapHAzzYaZkd/j1+SVfEMbglErzABHeJYSuoohz4=", + "pom": "sha256-JuhmPnnXa/BIj8w/JeFK/poQlJlAPu4vKrlvu+z0WnM=" }, - "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.7.0-rc01": { - "pom": "sha256-yH0dLbJbKFf7k8/J3UlEjiinHuVcBQF66r7e/l4Sz0Q=" + "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.7.0": { + "pom": "sha256-9vpXaz9lXUXmgnqrC0sOaMOXr4hr/axkcd9jacqecu8=" }, - "org/jetbrains/compose/animation#animation-core-desktop/1.7.0-rc01": { + "org/jetbrains/compose/animation#animation-core-desktop/1.7.0": { "jar": "sha256-SbWk6POl6EcCRQMlwBdWiNVcShKXPPwaGjbmTxj9+NU=", - "module": "sha256-RYbeapNWeBBUb4zo4ffgAwPyc3CFBYPWoI6izwiTAoo=", - "pom": "sha256-XJi0WxWJ4gYJiTJwXexx4NqqN4SqrrAvKPTEN6lt8+k=" + "module": "sha256-dUjThL4ILmK3T835lfj78lJcrMtGEU17H/zkIAO5Glw=", + "pom": "sha256-up2FWwjkrEa8OaiVih2ummFqQwTiyoVwiVsileelCAU=" }, - "org/jetbrains/compose/animation#animation-core/1.7.0-rc01": { + "org/jetbrains/compose/animation#animation-core/1.7.0": { "jar": "sha256-ln8031R8dRUQ4aeez1B/KpkP4soFTJ7IVhEI1rzvS58=", - "module": "sha256-vp3LogRf1hTHeaQiYiIMTJWHxTD/HRHlsX2DIUch9xk=", - "pom": "sha256-Q6JVlvPmaASXAHUBsXTNL26sXi3Hd5Dn5fZvUXD/8D0=" + "module": "sha256-NP5zUz8vp9by6JeWNiLDdvWYLrpGkvW+1zNK1K+HcQc=", + "pom": "sha256-0PJC/klRLsOP3UEzWbLdy9PIQ/+LMKhV8zO9Op+wPLQ=" }, - "org/jetbrains/compose/animation#animation-desktop/1.7.0-rc01": { + "org/jetbrains/compose/animation#animation-desktop/1.7.0": { "jar": "sha256-XkDy/HvIy0IkPPp9c8YxoXs9mHSvaIQa0+93j3BmO+M=", - "module": "sha256-PJNWJ1GJcHceBH3Th2cb85ARdiv14BUDBiaveSXUPkA=", - "pom": "sha256-o3tmzL73XZYymilLLN8iulU8tDWh31wPnUnai9+x/mg=" + "module": "sha256-vkvwxfvDqIynp6tHVOhCk07URUlh8m3S+0mqF7ZhnrI=", + "pom": "sha256-FSFz0u3LvcFx4sZkYuXqlT7IkwpykPyQF5cUHoXFiTA=" }, - "org/jetbrains/compose/animation#animation/1.7.0-rc01": { + "org/jetbrains/compose/animation#animation/1.7.0": { "jar": "sha256-uyegrYK2UqtzRMhFUDi2HKwUwx6CFovdgfz59apL3tI=", - "module": "sha256-nnUikVPJFi7KhzbL/sOhEJWG+7NcSppCTnly9KwmlBo=", - "pom": "sha256-F5uPmPkeUR0E8F/7KdNn/rYHEELgkXjKEw5gls0SoSA=" + "module": "sha256-kTPWeIulfh1cAk09qH+euuIvoatcwIsDD5HS4uFZdmE=", + "pom": "sha256-L//BVM1KS/txnyNExZYS7x+gCdi1DKcTfJqLGFyiru4=" }, - "org/jetbrains/compose/annotation-internal#annotation/1.7.0-rc01": { + "org/jetbrains/compose/annotation-internal#annotation/1.7.0": { "jar": "sha256-sqg9fABDcJ5TdcAeILKOvuRG87gq7EiLa6zvMFOW02E=", - "module": "sha256-IiVtV1K8/YyU8Qelizb6u6jhvjhzzstaZaPCI2Tvims=", - "pom": "sha256-Ta9/eHj/I3dZMq4sZbjFBiIcjR4p6dczxDKDczQl/r0=" + "module": "sha256-qUleTa2IlUVTYZnS6T7DUvZZkwUKVPdPRiMv2f3ymKs=", + "pom": "sha256-0oFVMe34ol4GEsYsuwZ5PTHekRdAyi8R3Lzgl6n1WYQ=" }, - "org/jetbrains/compose/collection-internal#collection/1.7.0-rc01": { + "org/jetbrains/compose/collection-internal#collection/1.7.0": { "jar": "sha256-4+BM9dHyfZujbGhkg11TUcY3ONPQL2FXmd28XB0L/AM=", - "module": "sha256-jpPZCcGPNIZ9n9L65s9IQIuDI8MVtD6gsMXANjTk5ac=", - "pom": "sha256-5u7v4NewO9uDYDhkP2QwoBuTZBkoAA1RcuIGr1kU6bA=" + "module": "sha256-PS/V3z5VZdnA4cA8XdIjYizyiRVXIIYjJKME1SL3gEc=", + "pom": "sha256-YSpPsvay2ouT3ew6D21esxF2NhE+/aOt3/tV1iUJnv8=" }, - "org/jetbrains/compose/components#components-resources-android/1.7.0-rc01": { - "module": "sha256-EQ2buHW+eOfn0WBDwEdcttYDOdMml0c3vl6sx38y4/o=", - "pom": "sha256-c4OoehM2u1yLejJIP9zVELqS5jq8u9SW3yh/GDkyJH8=" + "org/jetbrains/compose/components#components-resources-android/1.7.0": { + "module": "sha256-1w7u1mCwPnCWFQwj6EPdZXWby7w2EwD0/ooyhT6CcSQ=", + "pom": "sha256-pIG3PAFB7EJjfzbXyesFyrJSUR6mhEFafpm7Oo7QTbM=" }, - "org/jetbrains/compose/components#components-resources-desktop/1.7.0-rc01": { + "org/jetbrains/compose/components#components-resources-desktop/1.7.0": { "jar": "sha256-FYS3Oejxhp5PNAUZ3JhNSkRYKoDvMj5lWZndsY3ZVMI=", - "module": "sha256-vqnjWi83+RW2BNJUanZwcNbq7Uf3ttIyhsQWKuz0jXw=", - "pom": "sha256-3jPhAW6Rn/sihFLkYVCrBjHU9EuUlrLEFALhYGrp5m8=" + "module": "sha256-EzcdzRsTOPruGm88RmUXgHfMpKQV4tI0dkmDqKzJkxg=", + "pom": "sha256-vUT3nsuxa8W9OQmbXGsMZ80C0aa+UJFDhBeUxWIxXRM=" }, - "org/jetbrains/compose/components#components-resources/1.7.0-rc01": { + "org/jetbrains/compose/components#components-resources/1.7.0": { "jar": "sha256-ArSt70Ju6JvXt9YaMmO09jW/eDbEjMuvJo25Ay+OAdI=", - "module": "sha256-cbuIM07Qg6ipU5WkFIuhe7qsNpMEWuYnpuEYRJzpoBA=", - "pom": "sha256-ThIGyeMgztgz2PeJoWcddYuD0kcj04UfUC4C+b/N/tc=" + "module": "sha256-SwnDQyZRdrenG7ChlMQpwhfOxF+Ncy9oZLtVuiJlJ8Q=", + "pom": "sha256-k40+o5fKQkmfjPSMySntJf2Zwp4E3tgWiT6ct8yN46w=" }, - "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.7.0-rc01": { - "pom": "sha256-oeRfB7rF+Y34Cm6WYQpYZQOEJHRLg/ke13S2hCOZkIk=" + "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.7.0": { + "pom": "sha256-2/9VPqXxybksnQwdoeEr983HeciyDY+m/CotdzXJpnY=" }, - "org/jetbrains/compose/desktop#desktop-jvm/1.7.0-rc01": { + "org/jetbrains/compose/desktop#desktop-jvm/1.7.0": { "jar": "sha256-YsgWBzGVzAEZ3B1msXhUS9t3Lvi+5IeZVFKMZ5ixfr4=", - "module": "sha256-CqUZiGcmcUdTPbrHXg68EZXDG3ERbEWeSo7yqVqgb1Q=", - "pom": "sha256-kYpR7OweckYnsGA2rHE6bnGpSLaUrY/jnIZkZUefn/w=" + "module": "sha256-Fl1IccnE3fepQGDfGDhdfsuzzefe543VqcfoC50GzZY=", + "pom": "sha256-Yh0NwEq1O74WPK6jTcSTGtMLjdSGLaJiqcacwBwnRPI=" }, - "org/jetbrains/compose/desktop#desktop/1.7.0-rc01": { - "module": "sha256-T+nDnbGj/OtkSyr78WPdVrfNHSGk4tY8ZjPPZI71Db4=", - "pom": "sha256-lqgkWE0NhMRi4FzAe5LJkuwNmAAkMonblgm+wBnlemI=" + "org/jetbrains/compose/desktop#desktop/1.7.0": { + "module": "sha256-MoK+qppv1rF8cjwisP+buHTi+Pvyu6B05D06P0FA8zc=", + "pom": "sha256-DidG/5FAzfY6or6Fzp40ciEZpGqfjaxzmrfmd++PRB8=" }, - "org/jetbrains/compose/foundation#foundation-desktop/1.7.0-rc01": { + "org/jetbrains/compose/foundation#foundation-desktop/1.7.0": { "jar": "sha256-nHUjEw15XuzenL87rqBNMOVnzRG3nnPT2ozgMdiyVug=", - "module": "sha256-LSNstwbX4aMzmBiC86z5YU6lqzxRXS4Ue+rViF4AGNk=", - "pom": "sha256-kbOPkdy5tLAroxFOja4HkmJLqovlvmj7C+sP4FN6ab0=" + "module": "sha256-KAvYX2tc6qK0ZjsNCQW+BBBuene86+Levy9YUOyhXaM=", + "pom": "sha256-eIJ76xavjp63Q9mdsGwvNFdPchxM5wiZZk+1gqFJfgI=" }, - "org/jetbrains/compose/foundation#foundation-layout-desktop/1.7.0-rc01": { + "org/jetbrains/compose/foundation#foundation-layout-desktop/1.7.0": { "jar": "sha256-0shnwT/2Yy+YgOZ9q6sukwAHsAi5silQ/CzAdQCOzrY=", - "module": "sha256-ArK7GVO7OP7fULNoQZv7o1gYaBed7qRZ9ElQ2QuDYv0=", - "pom": "sha256-soxkTIbRU5XYGXNdRLXJ9R4UOetqHtVua0mw7OPYcC4=" + "module": "sha256-+L/EbEm87ysEcgDQVrb1+ypMxnK75yq6xEdgxw+ITHc=", + "pom": "sha256-5LnUN0tJ2iugyII9LxZT52zNwrNgMvgBlIO2GDwGQFo=" }, - "org/jetbrains/compose/foundation#foundation-layout/1.7.0-rc01": { + "org/jetbrains/compose/foundation#foundation-layout/1.7.0": { "jar": "sha256-QrUOJHLNXuGTKbS+FTDOc3/YT5S23mOKiXJypeK9Quk=", - "module": "sha256-4W/xyoXEZLss3kaRRGxJptukpkUWhqDXiY8fOdN0tD0=", - "pom": "sha256-n/KPOk6um1kIjeLiagUSWt8FSjUOpN2I5wD87DOT7Ws=" + "module": "sha256-v5mKtVotRpq9vDtM/FsjC6cXO6XX683caFiIHTlv9X4=", + "pom": "sha256-01z1/2PMSisctkVO8XxyOqvUdmZbiiNU4eK8vHuqCYI=" }, - "org/jetbrains/compose/foundation#foundation/1.7.0-rc01": { + "org/jetbrains/compose/foundation#foundation/1.7.0": { "jar": "sha256-ELOhv9YPC28MgEeiN9M1YMvx/AIeCU1z8GxPPyhldCQ=", - "module": "sha256-On4CXwkWuAsUzqUQ9KGT1/AuH1qCsVL9nAYeXjZfHXk=", - "pom": "sha256-eebzRpd/b9orQCZ3A2VwvERZGzAMrpC9Yd3W1tDdyOY=" + "module": "sha256-dBAoLbTrKC401OCdYUGEXmnYMzyZz53EK7Zdcy6oK+g=", + "pom": "sha256-TZE4B6HjVXgvg7UKR8pfJRMSJh9sTmXO2dXlLuXPEKg=" }, - "org/jetbrains/compose/material#material-desktop/1.7.0-rc01": { + "org/jetbrains/compose/material#material-desktop/1.7.0": { "jar": "sha256-JCX2UAVWD2XtcyGy+CCQeeTFMIWv/INj6G6CNilE9EI=", - "module": "sha256-jU2kUQbZwzchFz/eWkDBAKGohgLUmEOldYIIkgyODEI=", - "pom": "sha256-iWncacdjxR76YmYWwdldLFR4ZK8ULcR6X8SG3A8HUcM=" + "module": "sha256-z0mlF+Gh3u9XPp2oDp8pAfqGAPFCaUcWgt8UCL3QeM4=", + "pom": "sha256-CzPMG/qial+9yYnPjOqH9FyYEg2GxQzd2sylEy6tl98=" }, - "org/jetbrains/compose/material#material-icons-core-desktop/1.7.0-rc01": { + "org/jetbrains/compose/material#material-icons-core-desktop/1.7.0": { "jar": "sha256-vPbIU7bbL/FI0tOq07en6lTZP8e0Lgr9hA622vGhxoE=", - "module": "sha256-yAV+ZSYDvUMajK4Lva6v/pi3mYWezeTrz6rWmD9TKMY=", - "pom": "sha256-A6sRbuVGTxfrOp9Ccxb1h0H+QuHOMZQ3/zCpZQIq6d0=" + "module": "sha256-JnGO9Uo/fB6pwaxLXsH/oGqsnhpv8/F7L5pbNmdtg14=", + "pom": "sha256-ngyYssNFfv3xRGpgILVsROKKdX7gXMFszf0P0d8kG6w=" }, - "org/jetbrains/compose/material#material-icons-core/1.7.0-rc01": { + "org/jetbrains/compose/material#material-icons-core/1.7.0": { "jar": "sha256-3loMJ34VmMEh0sRgbMA73/69BZ4ys0lN37hMCNUdpwE=", - "module": "sha256-oGYnQ0OpNDaCC4vsc0DC7cBMtek21Th/3cmg0cxMv+I=", - "pom": "sha256-u0eiA3nxX+jrStlHCyD03RykYQ23Kq8jaZdoIqA6cpI=" + "module": "sha256-rMLAqyILaqDk4sIEqZBy6xDmMQBHKP4iOHJmDBSmEmQ=", + "pom": "sha256-C+Mv5zjA4Zh1w3VbFwTR/MtVGEda0EjvwhgE4Or3J/M=" }, - "org/jetbrains/compose/material#material-icons-extended-desktop/1.7.0-rc01": { + "org/jetbrains/compose/material#material-icons-extended-desktop/1.7.0": { "jar": "sha256-3FXTg9yoJ541ORflxak9GSqV58pPkm7lXuC0Yn+Z2GA=", - "module": "sha256-fJUkFx1HLSEYZqpx1J4CDEJiFQO2qp+O8IDUyoorsHA=", - "pom": "sha256-vQWIz5QZmd2pxW99KdhWMRVZfFKcyFdWi/sWaH8XqmE=" + "module": "sha256-PCQq3pH6pwW5STITE/wOR1zWPDnfwQpSM4icS/IbIco=", + "pom": "sha256-Cb230io3hD8ya1SVbY9yV4rNG76qgcODLXZ7V0Y7R7Y=" }, - "org/jetbrains/compose/material#material-icons-extended/1.7.0-rc01": { + "org/jetbrains/compose/material#material-icons-extended/1.7.0": { "jar": "sha256-nnUXmWRicyD/GxtzAmklR01GX+t6idYpX40vZNxNQ6Y=", - "module": "sha256-kyKTZ4AVNk+C9/eMii+GFdkrFRqKdUG/6yCtaggKkhM=", - "pom": "sha256-NsT2Q6Ixc0xUuzCwvUj16lUZpq/KyRheLr0hj2160yU=" + "module": "sha256-t/96BSTuY06QLWhcDik95fvfT/cpwa+zAebWcdcV3V4=", + "pom": "sha256-pp8HAfEwGjtwKeIuvWsIeyrsai53MCVuy6DC6KeAy9E=" }, - "org/jetbrains/compose/material#material-ripple-desktop/1.7.0-rc01": { + "org/jetbrains/compose/material#material-ripple-desktop/1.7.0": { "jar": "sha256-xfa9+yKaF5SoOO0fMfcpmjtRYAS+/+GovMp1OqJovgk=", - "module": "sha256-CvZsjtNuO5pQNguAu8UwMXB2CcAJcmCWExA+Gjom7vs=", - "pom": "sha256-Vvnsc/psxp8lXdrjdBEu/pbdmrgGuQaxMxrtxGDaxbo=" + "module": "sha256-B7kC5jjctznI+4cth4H32ggofar8YFtqQzjeCb9x2fI=", + "pom": "sha256-vSRBYXCH26PSjg6Q7r6hxafI/Ihzq4HfgC7fA1/blag=" }, - "org/jetbrains/compose/material#material-ripple/1.7.0-rc01": { + "org/jetbrains/compose/material#material-ripple/1.7.0": { "jar": "sha256-k4lak+wU/hmING03mgx3S3qk0usrFPIKfTp2vVDkgbg=", - "module": "sha256-nc5BoF//ShcXCzLrFDUq4R7gEukvlIBcs4fwdgIMSf8=", - "pom": "sha256-Ep+lXHsomu7XWTbS5Z9OXfga+ojGTo/BUzeiSZJc2Rk=" + "module": "sha256-3+f+laqzsdT/a4UqAVYeW7cAHnYI2A82bBGKLwf4VcA=", + "pom": "sha256-2fXtFA8I/nzleLHGPpsbDmiQY96bsiXzd3lqSRivPVg=" }, - "org/jetbrains/compose/material#material/1.7.0-rc01": { + "org/jetbrains/compose/material#material/1.7.0": { "jar": "sha256-lp++L0SKCBxkQOiNKP8Kn8aTEYd8+FhTxfntc7jTUhs=", - "module": "sha256-u7DqOnaUTH9VWOWyLlHcBYth//4OH8Cs9cd+xFRfhuo=", - "pom": "sha256-okxn6wenYZfuCpNG7WhNzkKznsZg2TkMSpVCYfEw+5U=" + "module": "sha256-YPeQ2HDp+mhWiW756079/xM3wg0A+eyxGMKO2I3bQA8=", + "pom": "sha256-/PuHxleHr+0Z+kRiPX49FTKDsHPLpRXojeVR96G7wIs=" }, - "org/jetbrains/compose/material3#material3-desktop/1.7.0-rc01": { + "org/jetbrains/compose/material3#material3-desktop/1.7.0": { "jar": "sha256-k+/2Ln8fmEHoqoGS6JJwO+th/QtiUBG7xbtBcIKkUSU=", - "module": "sha256-Sg/XXF1WOlaanyEMe4Q8AXPqq+Z5GSbKFlfJOtGwrlM=", - "pom": "sha256-RGUG3Xfa7woLZm1YLErWxp+OwFsHcMOq9RRruiDOtoo=" + "module": "sha256-HAWjsEfXmxXlL2sLPaxRjdx48PZh3Aay8BHoLGXN9q0=", + "pom": "sha256-PPKkVpDzATxXojGcHZ5cpRIQmPOSDABr7J9Ths6389s=" }, - "org/jetbrains/compose/material3#material3/1.7.0-rc01": { + "org/jetbrains/compose/material3#material3/1.7.0": { "jar": "sha256-Mk531GpPg+IzZBT0AfjwWss9wXAItC36HqwAmSyFI5M=", - "module": "sha256-PrvGvAuFAoFuOD/xI8FxBZeNd9oPhOU6qo+OKkKCc7Q=", - "pom": "sha256-Gk2DiWXlGt3ahDiOvDcHMXKJaDxj+XQuc4sPz4MUxUs=" + "module": "sha256-lRdR4h5adj2J3tqHe2uwVH2xCn2d/CI8fxJI5x67y0Y=", + "pom": "sha256-U5TAiRfK3SgZ5LjvSVM9JXZgATW8PLtRF4qHxJ0s8Io=" }, - "org/jetbrains/compose/runtime#runtime-desktop/1.7.0-rc01": { + "org/jetbrains/compose/runtime#runtime-desktop/1.7.0": { "jar": "sha256-duMlBUe5yjyxpJwnKTOyXLO8y8m6Endd1hYaY9mqfPE=", - "module": "sha256-1+RmZ/vY8kGpYVcYN+EPkhOWTa/b7sjykyJQbMzehtc=", - "pom": "sha256-y9CfKxQp8BKN5ANhqD9UVLFi9IDGxfyebCfY99XCthQ=" + "module": "sha256-ZiqUSgPejSp9CbfiWeWtnsuwtXVLlTT96Bmu8JMtyqE=", + "pom": "sha256-7Uf+L55XEcEsa80nuhngjnRo4YwEtsKzJvvu39O/5/c=" }, - "org/jetbrains/compose/runtime#runtime-saveable-desktop/1.7.0-rc01": { + "org/jetbrains/compose/runtime#runtime-saveable-desktop/1.7.0": { "jar": "sha256-QwY2O+kOqr50uQDbTDLtHxXHVI5bMKcJPE7kDENrm4w=", - "module": "sha256-cr/7j+sIlkzTVjFqx50Dd6z9VAcJqyzl8OCbi2rsm9o=", - "pom": "sha256-vWVnP8T2lDeM80XTHPxKbBwntpJH+kWaF253Cg5lMAo=" + "module": "sha256-i+IsKSWAu1xT1OvKUmSgp1wyhuHnHjfiu9K7BjOFMyc=", + "pom": "sha256-kUeE0ejiOF053MYSE2t28DGUVJCt8RH74f3A63JPO8o=" }, - "org/jetbrains/compose/runtime#runtime-saveable/1.7.0-rc01": { + "org/jetbrains/compose/runtime#runtime-saveable/1.7.0": { "jar": "sha256-mDxRgBZ4q5xRf0n5h1ld/VLveJaN5tqE5veXYqVWtn4=", - "module": "sha256-WDzBZ1wzQNiNP6MSkvFevhLhuIrzrSgV7t1id4saMc8=", - "pom": "sha256-Wx/s4MuYYCuQfbpJc3CVxXUTLC8UsEtRb/3BW3yFyT0=" + "module": "sha256-830dEuwBLS/VOcZ+iu+6NxIfRnYoUGS30ZEcbLRGdbI=", + "pom": "sha256-MPe7+pWMvZEZSt9vYnx1K5tssUAzRJIk+KLKnryZXF4=" }, - "org/jetbrains/compose/runtime#runtime/1.7.0-rc01": { + "org/jetbrains/compose/runtime#runtime/1.7.0": { "jar": "sha256-XITDuxwbY2rjYDCg+Y1GKa+inhkqnHj1fyLOLI/2vJY=", - "module": "sha256-dyFNkMwOWKAxAgouIj2pGxtkKdOeM4uE64DAtg9tSVs=", - "pom": "sha256-V2Zsw9hnmsfZ8uQFye8XEc9VzzzBg7zaiCTfg/H0//Y=" + "module": "sha256-zUi/uatY5vDly8/o5Axn4ntnd2zbmWjN4IWnlhPFWe4=", + "pom": "sha256-tX39Qom2JiHOJHc4nx+BVWewBJxOmIGD9MgkO2XUTjo=" }, - "org/jetbrains/compose/ui#ui-desktop/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-desktop/1.7.0": { "jar": "sha256-suyv6mByBEYkxLZt4B1Ikf2cgLJohbA87QNszOrMDic=", - "module": "sha256-v/ZSTdddb6iuLLz8XH/GInpsNwGW6DKf7JkerXQGATI=", - "pom": "sha256-snL9R2+VvGpehXDX7e4bE8Dz9D2BTY/LvQrb06IQaX0=" + "module": "sha256-TV6orRcBQeQUghzsZ0xUR+gBIkSnj+OF61Aa36KxTHA=", + "pom": "sha256-gNOSOqqiGJwOKWqL0auC+sazT3ZusrFp7zT7VRVzVTE=" }, - "org/jetbrains/compose/ui#ui-geometry-desktop/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-geometry-desktop/1.7.0": { "jar": "sha256-S4bJYcC0vOeZUyn9V9Qznt4Ry3XX7JC8G5kTOWrdsw8=", - "module": "sha256-1pRVpNXjdJVGFbF1XYr8EhmErhndiUgMlp3M42y2Ghg=", - "pom": "sha256-qk/nLiiYYqNX1MilAyc01SoZWDR6ggI5EE5JiJvJ+2M=" + "module": "sha256-bNyw2SFZYEUO3WyuUWFI7MwiRqO2CFNiomCBbSJJWzk=", + "pom": "sha256-fsSL7vLrhj/TFEfA5slWtNmnq3vGdOA3Mw9oBQtZRz8=" }, - "org/jetbrains/compose/ui#ui-geometry/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-geometry/1.7.0": { "jar": "sha256-UPK8AERD9Pnvdfc4MOel6O8PB+VM9cR4p6q5xUAiVbM=", - "module": "sha256-274k9tBmxfeK+Z3+06wmnZuEbo2q56srCAU35q9h+j0=", - "pom": "sha256-hY6EBF7fboMxaEuUWXMt/nhgTwgdebwfATMoeoiykXc=" + "module": "sha256-FMOoC5/cUWvQMDAASGT7twMe/WVHYqtkF20LBj+cqUw=", + "pom": "sha256-QZsfystvNZCc+3voBwlNVjSQVri3Y9fN7W53EFGJ2NE=" }, - "org/jetbrains/compose/ui#ui-graphics-desktop/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-graphics-desktop/1.7.0": { "jar": "sha256-T7cOhyevDG4NRNj0v/ZduTQqlceZahgImP7XFxZ4fbg=", - "module": "sha256-FhhaeZVW5gWEEQdiLHs6vhLrk9GYv95/fCyQMxD+j5M=", - "pom": "sha256-/vboXilQor+eGL+TYv2FrePxDn3CB1/1z6bWph5GMZA=" + "module": "sha256-iWWfOKlCpyNVehbNgtn4ctWFAiAblV8x3pWfTQeiau0=", + "pom": "sha256-f6b2IRLSDeHL3q7VDpCR78eb+BmB6RAWuZmIVs6VtKw=" }, - "org/jetbrains/compose/ui#ui-graphics/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-graphics/1.7.0": { "jar": "sha256-2KtnsO/p8bbsBSup42sNgqKKA7CYedT8C+g7ntNdenw=", - "module": "sha256-vzleESVEpZLbbxYC06+q/Zt776Tv83vsq1G6RwfCu40=", - "pom": "sha256-a9pT7eJznGrFZu+S1lFFjGyQpP560CliKPhjW40l2w4=" + "module": "sha256-NSg3gfVnVU8VJmAJFFYA09nVwW762HNFjwNV9MAmnAs=", + "pom": "sha256-4cNg3cpYhZFuZ/VvCvA/s++/ZQDxVXq+h3+5C78QHKk=" }, - "org/jetbrains/compose/ui#ui-text-desktop/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-text-desktop/1.7.0": { "jar": "sha256-gOB+TKc597YSL2PpoX5oU7lHIg7LEYD43K9BnQ5GiZY=", - "module": "sha256-YlJfMGOUP0GZ8CsD2DXBSMQaU7u6KdjmSnfkM307Byc=", - "pom": "sha256-VkQNuzYlcgr3He0kYg1xAjp306sFr0nKCHuaGctCrzc=" + "module": "sha256-9PZVvGr1y4ru+J2OiL61CRJzlbVkuRgVp80Z0/2zfQk=", + "pom": "sha256-rb2Ei969/SWsriJ297EtIza/QGdarCnDzTZIHqIA7eQ=" }, - "org/jetbrains/compose/ui#ui-text/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-text/1.7.0": { "jar": "sha256-j/miuMk7AofY+oN9WwkXkjFoy5feoa2hqNSqe7F8nxU=", - "module": "sha256-J8hk90eS75BmAVO+HSpnY3opns5AyCqFl1WZb3LyUYE=", - "pom": "sha256-+OK7AD0uDDfEVLsyLoIUyfXOskBcRWcwFVQPDlhy6Xo=" + "module": "sha256-ImJh7g6SCP5Igat+pR2e5vbz1RnBWx1rFUJb98FtWTo=", + "pom": "sha256-JNbJDk5Hb1IDxkD2sxZl7BiwIPAfLxZNz3dnVa1wYhM=" }, - "org/jetbrains/compose/ui#ui-tooling-preview-desktop/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-tooling-preview-desktop/1.7.0": { "jar": "sha256-xc+tCxJel42RX4tMOGMLxdVI5Z/ooOg4wMyEKDxgWUM=", - "module": "sha256-3stx7FZXMW21YmrSgZwqUUmu68t6B3pCax1Ea2ZrWd4=", - "pom": "sha256-ZZg7EuCBIJOqpn0V4apd15UxagBIpBXLQu9d37w4Yb4=" + "module": "sha256-v5EB4n48dWgCKkjaGOF7LdiIe4LN6dHQMjFummDH948=", + "pom": "sha256-lKYRZropAXUomq3Xtu5RSZ3l/gO/xuSCCeD9tagfHm0=" }, - "org/jetbrains/compose/ui#ui-tooling-preview/1.7.0-rc01": { - "module": "sha256-rU2dfmzOklGPa+78Q00OV72CbkP82cTr9esy0dFLRR0=", - "pom": "sha256-jlVF/i8dHW7MiMqmZGwTfcWb0Ug7Xl80SIEmU8Kxblg=" + "org/jetbrains/compose/ui#ui-tooling-preview/1.7.0": { + "module": "sha256-vxGYhRsMn71B1NrnhLB9W8GJ10mpeeeTPZlJ7pRDca8=", + "pom": "sha256-InPHq9mcpAqDjqEBFrZh3ETnMHv97VkeJj0UMWnvUi4=" }, - "org/jetbrains/compose/ui#ui-uikit/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-uikit/1.7.0": { "jar": "sha256-GhOzmt860nZ/ln92S6Cg0u0qLQnu8xDyLSwDBNe9pss=", - "module": "sha256-CoF+c2gCKMmt4blbqqwuFb5PtHHldun/Sh5U4OK4D2Q=", - "pom": "sha256-n3fVs6X93gCO0Y4LrJHxtWoXa1d0oWdSY9VvnW85uSE=" + "module": "sha256-VxLoIbC5bdlwAcQY7Kn//A6kabpF7ng7uJfRgBiPPyA=", + "pom": "sha256-Nreuwus6pSUI+00PJFLFTWhQUzCBQt4/VuQxeC/eXAM=" }, - "org/jetbrains/compose/ui#ui-unit-desktop/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-unit-desktop/1.7.0": { "jar": "sha256-WYtS4lftZ0FFaUuXkKc4OpD+0uxxVLoJrOSqmDxlsaI=", - "module": "sha256-SMkO45UYCnBQUkPZXBF00RBd7aMu0LdvAYH6JSpP46s=", - "pom": "sha256-ZnvHUoW6szo4GP1SdDxEOlSRYaUzKp6FCHX1MGoLcqI=" + "module": "sha256-OcvNe7cG50of60dPMyN3Yp2++MXhOXEu4UmbaPigL0Y=", + "pom": "sha256-H2Xl5/BcnA16opnEaxRn6hCZfWGjzxlpSisxMv9xQKo=" }, - "org/jetbrains/compose/ui#ui-unit/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-unit/1.7.0": { "jar": "sha256-QdpdYcVod7W10B4qK8uWfL+vTUXBoaoSTAYBx6PedOc=", - "module": "sha256-r21Xb5itOKii83kpdZVfcMp7TDwUIxL8CYGFI/qwyqM=", - "pom": "sha256-ufLkqP7L2gzGW3zT87uoOuiRFSLFZxRjEz+R54GDskc=" + "module": "sha256-gHp2IZXLdkSswLTc4hNI7S/d1BY/Sj0BqcTtHPyPdpo=", + "pom": "sha256-kHISejq/Lk2t0bxv/2fur35nvk1i7MqZmxF71+ciOaM=" }, - "org/jetbrains/compose/ui#ui-util-desktop/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-util-desktop/1.7.0": { "jar": "sha256-Fh3Mc7kp2mHO5QBF6W+wLxYzw28You84tcLETDhga1I=", - "module": "sha256-ISnvDx+9M55KCFLZZoXtIRPT6svC7N2O8cSa6IMTeUU=", - "pom": "sha256-FQFMK1TjTPCEqOHTFQHkXaDV6IsYuPTRi7XHkHub49s=" + "module": "sha256-cbDYKrQiAZ/AbpsSDyTqmSTFm8D1tc6W/iDUye8Zdmg=", + "pom": "sha256-DlkctYsmNXdtlnpyrb6aOvb8Q8db2SCodxVlE3kE+uQ=" }, - "org/jetbrains/compose/ui#ui-util/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui-util/1.7.0": { "jar": "sha256-cMKLKyQxS0t3mMq2qy+v53tHyS3qIvD8Il/lx5rHn3Y=", - "module": "sha256-3MuHSqbfBu18tQh9AvXkRTZzrVIvQWPcduCg0MgkIyU=", - "pom": "sha256-+qWMzWnZ3+lY8DNRqjOFNt2VSbo8rCgF4cRyv9T0VOw=" + "module": "sha256-dnIxUWYxsugkOSHP2cFIhifjjLIEidOXNFHyagkGLtY=", + "pom": "sha256-Y4m+v3a9SXezAteFEOukGIGipqplqyP0eYJCSUDtS2M=" }, "org/jetbrains/compose/ui#ui/1.6.11": { "module": "sha256-Z5lkk+C/fOHwl4SUz9hM8kKEUQfktYcxHpO72XMLJFI=", "pom": "sha256-TfLxK8+p2L2aVwxn6OT7UlIcDmhFHAVGHFc6SUXuST0=" }, - "org/jetbrains/compose/ui#ui/1.7.0-rc01": { + "org/jetbrains/compose/ui#ui/1.7.0": { "jar": "sha256-nyVs9/d8fUtm+Muexe4JWSAKuQvQwJ1vXtEsmQKlhPg=", - "module": "sha256-yT2jcwfka12NtpMPqB1qj7pF3qUt8DxG/OcHk0DvkOo=", - "pom": "sha256-j5PTiO+cIkJ+SJKXulobQjhc9NU9bsz92LUrbX4Dfdg=" + "module": "sha256-xb2CXBAf7xnylq2gc7yfRJidpOgoMM/03NPBfEGtfJc=", + "pom": "sha256-zXIIZEtdLIv8p5ThqA+n6Kwp3/WLidKeoDDYPxB1EOA=" }, "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", diff --git a/third_party/nixpkgs/pkgs/by-name/ke/keyguard/package.nix b/third_party/nixpkgs/pkgs/by-name/ke/keyguard/package.nix index 75e7e43834..5929e48efb 100644 --- a/third_party/nixpkgs/pkgs/by-name/ke/keyguard/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ke/keyguard/package.nix @@ -34,13 +34,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "keyguard"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "AChep"; repo = "keyguard-app"; - rev = "eb36b853a7ac67a0f72d5684e6751d41969b07dd"; - hash = "sha256-tMNc8OlYsiYmVtac2jngvrFZjgI7eNFVIxXUfIJUdK4="; + rev = "8f6d527a42f13c6bdcee2ca3f133dd19751fc37a"; + hash = "sha256-llr+792hzifV5vP0e7AKWhW3OtYcyAhzXPR45Do62ug="; }; inherit gradleBuildTask gradleUpdateTask desktopItems; diff --git a/third_party/nixpkgs/pkgs/by-name/ke/keyspersecond/deps.json b/third_party/nixpkgs/pkgs/by-name/ke/keyspersecond/deps.json new file mode 100644 index 0000000000..bfd3cf539c --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ke/keyspersecond/package.nix b/third_party/nixpkgs/pkgs/by-name/ke/keyspersecond/package.nix new file mode 100644 index 0000000000..c88dfa9846 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ki/kin-openapi/package.nix b/third_party/nixpkgs/pkgs/by-name/ki/kin-openapi/package.nix new file mode 100644 index 0000000000..6515189f95 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/kl/klog-rs/package.nix b/third_party/nixpkgs/pkgs/by-name/kl/klog-rs/package.nix new file mode 100644 index 0000000000..110c4a111a --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/kl/klog-rs/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + stdenv, +}: + +rustPlatform.buildRustPackage rec { + pname = "klog-rs"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "tobifroe"; + repo = "klog"; + rev = version; + hash = "sha256-HEGxg277483ZZpXKFIBTAITKie/iBfbz9KmtqzlGC3E="; + }; + cargoHash = "sha256-mOFzlq5AEks9vwjk2FxTGLyw6RkI44kml2t8r1UsdOk="; + 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/third_party/nixpkgs/pkgs/by-name/ko/koboldcpp/package.nix b/third_party/nixpkgs/pkgs/by-name/ko/koboldcpp/package.nix index 5d9e6f1b21..df10f0a4fd 100644 --- a/third_party/nixpkgs/pkgs/by-name/ko/koboldcpp/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ko/koboldcpp/package.nix @@ -141,6 +141,10 @@ effectiveStdenv.mkDerivation (finalAttrs: { cp *.so "$out/bin" cp *.embd "$out/bin" + ${lib.optionalString metalSupport '' + cp *.metal "$out/bin" + ''} + ${lib.optionalString (!koboldLiteSupport) '' rm "$out/bin/kcpp_docs.embd" rm "$out/bin/klite.embd" diff --git a/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix b/third_party/nixpkgs/pkgs/by-name/ko/komikku/package.nix similarity index 59% rename from third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix rename to third_party/nixpkgs/pkgs/by-name/ko/komikku/package.nix index 53fa2a6435..ab59d052d4 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/ko/komikku/package.nix @@ -1,25 +1,29 @@ -{ lib -, fetchFromGitea -, desktop-file-utils -, gettext -, glib -, gobject-introspection -, blueprint-compiler -, gtk4 -, libadwaita -, libnotify -, webkitgtk_6_0 -, meson -, ninja -, pkg-config -, python3 -, wrapGAppsHook4 -, nix-update-script +{ + lib, + fetchFromGitea, + desktop-file-utils, + gettext, + glib, + gobject-introspection, + blueprint-compiler, + gtk4, + libadwaita, + libnotify, + webkitgtk_6_0, + meson, + ninja, + pkg-config, + python3, + wrapGAppsHook4, + librsvg, + gnome, + webp-pixbuf-loader, + nix-update-script, }: python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.57.0"; + version = "1.58.0"; format = "other"; @@ -28,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-b2XoywPnrYnuehR6xHH8BvhbMZFB1AeBN0khFfaLGn0="; + hash = "sha256-21ZtzWjyUC+/iPv+R1DUzCHITR8GVhN+6iepcTIRy0Y="; }; nativeBuildInputs = [ @@ -74,6 +78,19 @@ python3.pkgs.buildPythonApplication rec { # Tests require network doCheck = false; + # Pull in WebP support for manga pics of some servers. + # In postInstall to run before gappsWrapperArgsHook. + postInstall = '' + export GDK_PIXBUF_MODULE_FILE="${ + gnome._gdkPixbufCacheBuilder_DO_NOT_USE { + extraLoaders = [ + librsvg + webp-pixbuf-loader + ]; + } + }" + ''; + # Prevent double wrapping. dontWrapGApps = true; @@ -87,12 +104,15 @@ python3.pkgs.buildPythonApplication rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Manga reader for GNOME"; mainProgram = "komikku"; homepage = "https://apps.gnome.org/Komikku/"; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; changelog = "https://codeberg.org/valos/Komikku/releases/tag/v${version}"; - maintainers = with maintainers; [ chuangzhu infinitivewitch ]; + maintainers = with lib.maintainers; [ + chuangzhu + infinitivewitch + ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ko/kor/package.nix b/third_party/nixpkgs/pkgs/by-name/ko/kor/package.nix index 0891bb9845..b93d479d3c 100644 --- a/third_party/nixpkgs/pkgs/by-name/ko/kor/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/la/lazygit/package.nix b/third_party/nixpkgs/pkgs/by-name/la/lazygit/package.nix index c9ccf34d2e..d1fcbdcc7b 100644 --- a/third_party/nixpkgs/pkgs/by-name/la/lazygit/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/la/lazygit/package.nix @@ -34,6 +34,7 @@ buildGoModule rec { maintainers = with maintainers; [ Br1ght0ne equirosa + khaneliman paveloom starsep ]; diff --git a/third_party/nixpkgs/pkgs/by-name/le/lefthook/package.nix b/third_party/nixpkgs/pkgs/by-name/le/lefthook/package.nix index fef662e3c2..9f40d09ab3 100644 --- a/third_party/nixpkgs/pkgs/by-name/le/lefthook/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/le/legcord/package.nix b/third_party/nixpkgs/pkgs/by-name/le/legcord/package.nix index b980a418cb..3f2bb86fd9 100644 --- a/third_party/nixpkgs/pkgs/by-name/le/legcord/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/le/legcord/package.nix @@ -7,23 +7,24 @@ , makeWrapper , copyDesktopItems , makeDesktopItem +, nix-update-script }: stdenv.mkDerivation rec { pname = "legcord"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "Legcord"; repo = "Legcord"; rev = "v${version}"; - hash = "sha256-R2mtE3L2cJgmbWT0aMoDbnM5tiyPk+dnPBedq8ro1lY="; + hash = "sha256-YmNRkNN7lWHMbUiGOxPa9b+TaLybj1XE7AonCnB88KY="; }; nativeBuildInputs = [ pnpm.configHook nodejs makeWrapper copyDesktopItems ]; pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-73v8xkidY9IBUFz/M0BYEVGnoVsr3uh3jP0p6T8QBbA="; + hash = "sha256-ZPTp6l7qtvgsYPY6FZvhuYxD8TdkBkaQO2SG1fQzU7s="; }; ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -72,6 +73,8 @@ stdenv.mkDerivation rec { }) ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Lightweight, alternative desktop client for Discord"; homepage = "https://legcord.app"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/lenmus/default.nix b/third_party/nixpkgs/pkgs/by-name/le/lenmus/package.nix similarity index 59% rename from third_party/nixpkgs/pkgs/applications/misc/lenmus/default.nix rename to third_party/nixpkgs/pkgs/by-name/le/lenmus/package.nix index c7a1ce9f5d..4a7fbb5409 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lenmus/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/le/less/package.nix b/third_party/nixpkgs/pkgs/by-name/le/less/package.nix index 7a06851b01..ba57f5460c 100644 --- a/third_party/nixpkgs/pkgs/by-name/le/less/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/le/less/package.nix @@ -1,20 +1,25 @@ -{ lib -, stdenv -, fetchurl -, ncurses -, pcre2 -, withSecure ? false +{ + lib, + fetchurl, + ncurses, + pcre2, + stdenv, + # Boolean options + withSecure ? false, }: stdenv.mkDerivation (finalAttrs: { pname = "less"; - version = "661"; + 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-K18BZyFuPvD/ywwxw3Tih+sDXk4iPV2uMVwng7bnOO0="; + hash = "sha256-KBn1VWTYbVQqu+yv2C/2HoGaPuyWf6o2zT5o8VlqRLg="; }; buildInputs = [ @@ -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/third_party/nixpkgs/pkgs/by-name/li/lib60870/package.nix b/third_party/nixpkgs/pkgs/by-name/li/lib60870/package.nix index 4669042b7b..5e3c0da7c4 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/lib60870/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/li/libconfig/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libconfig/package.nix new file mode 100644 index 0000000000..f0cc941715 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libhv/default.nix b/third_party/nixpkgs/pkgs/by-name/li/libhv/package.nix similarity index 52% rename from third_party/nixpkgs/pkgs/development/libraries/libhv/default.nix rename to third_party/nixpkgs/pkgs/by-name/li/libhv/package.nix index 93524afabe..4eb104dbce 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libhv/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/li/libhv/package.nix @@ -1,29 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, curl, openssl, Security }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + curl, + openssl, + darwin, +}: stdenv.mkDerivation (finalAttrs: { pname = "libhv"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "ithewei"; repo = "libhv"; rev = "v${finalAttrs.version}"; - hash = "sha256-tVuQwj2HvAhp51urGCuNPjBEIaTu9yR031Ih/5or9Pk="; + hash = "sha256-N2YD84eORA5nDpeeqy9jCvRx86PkRaKLzI6LF1AnHtU="; }; - patches = [ - # Fix build failure on gcc-13: - # https://github.com/ithewei/libhv/pull/490 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/ithewei/libhv/commit/b3e61519fbdbbb956fed275c0a849ba5d4d6e45c.patch"; - hash = "sha256-fuYI+B3qZkSAbLZc0p6/0fnqaHx6w9N9vhTEE2t6UUs="; - }) - ]; - nativeBuildInputs = [ cmake ]; - buildInputs = [ curl openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = [ + curl + openssl + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security; cmakeFlags = [ "-DENABLE_UDS=ON" diff --git a/third_party/nixpkgs/pkgs/by-name/li/libiec61850/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libiec61850/package.nix index 03c8037d6b..94261d06df 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libiec61850/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/li/liblsl/package.nix b/third_party/nixpkgs/pkgs/by-name/li/liblsl/package.nix new file mode 100644 index 0000000000..36519bd2b4 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/li/libpkgconf/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libpkgconf/package.nix index 43373e43bb..34d718762c 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libpkgconf/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/li/libscfg/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libscfg/package.nix index 333433d8c4..adf08d291a 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/libscfg/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/li/lime3ds/package.nix b/third_party/nixpkgs/pkgs/by-name/li/lime3ds/package.nix index 8dae667a6b..a9a0a4c9b7 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/lime3ds/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/li/livekit/package.nix b/third_party/nixpkgs/pkgs/by-name/li/livekit/package.nix index 31b4f2f656..a477069c6e 100644 --- a/third_party/nixpkgs/pkgs/by-name/li/livekit/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/lo/localsend/package.nix b/third_party/nixpkgs/pkgs/by-name/lo/localsend/package.nix index 2c282b62b6..d84aee2698 100644 --- a/third_party/nixpkgs/pkgs/by-name/lo/localsend/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/lo/localsend/pubspec.lock.json b/third_party/nixpkgs/pkgs/by-name/lo/localsend/pubspec.lock.json index 4cc7a7fd5b..4d8c28b858 100644 --- a/third_party/nixpkgs/pkgs/by-name/lo/localsend/pubspec.lock.json +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/lo/lora/package.nix b/third_party/nixpkgs/pkgs/by-name/lo/lora/package.nix new file mode 100644 index 0000000000..a062c11e04 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/lr/lrcget/package.nix b/third_party/nixpkgs/pkgs/by-name/lr/lrcget/package.nix index 8ec4bfc21e..8b293a59dd 100644 --- a/third_party/nixpkgs/pkgs/by-name/lr/lrcget/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/lu/luminous-ttv/package.nix b/third_party/nixpkgs/pkgs/by-name/lu/luminous-ttv/package.nix new file mode 100644 index 0000000000..0dd3d97c0a --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/lu/lunar-client/package.nix b/third_party/nixpkgs/pkgs/by-name/lu/lunar-client/package.nix index 0b5a93a1f5..9e41b311d5 100644 --- a/third_party/nixpkgs/pkgs/by-name/lu/lunar-client/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/lx/lxgw-wenkai/package.nix b/third_party/nixpkgs/pkgs/by-name/lx/lxgw-wenkai/package.nix index 38fea5286a..adf23d18e9 100644 --- a/third_party/nixpkgs/pkgs/by-name/lx/lxgw-wenkai/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ma/mangal/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/mangal/package.nix index c1d7c15405..332c1d33ec 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/mangal/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ma/mangal/package.nix @@ -26,7 +26,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' # Mangal creates a config file in the folder ~/.config/mangal and fails if not possible export HOME=$(mktemp -d) installShellCompletion --cmd mangal \ diff --git a/third_party/nixpkgs/pkgs/by-name/ma/mattermost/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/mattermost/package.nix index d1d1a278ff..04c53fd8a1 100644 --- a/third_party/nixpkgs/pkgs/by-name/ma/mattermost/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/mi/minijinja/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/minijinja/package.nix index f88c314b69..7ebd357594 100644 --- a/third_party/nixpkgs/pkgs/by-name/mi/minijinja/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/mi/miracle-wm/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/miracle-wm/package.nix index 2a6ff5f5c5..5b2e897ae7 100644 --- a/third_party/nixpkgs/pkgs/by-name/mi/miracle-wm/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mi/miracle-wm/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miracle-wm"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "mattkae"; repo = "miracle-wm"; rev = "v${finalAttrs.version}"; - hash = "sha256-fK/g6DhcxJMvxujZDZXs1yXRu2FGZQKmhxw7/czAQiY="; + hash = "sha256-31S7Mfz3LIOAmDUl6jbr3kSP2BdLaM0M4xMZ8FHhLH0="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/mise/default.nix b/third_party/nixpkgs/pkgs/by-name/mi/mise/package.nix similarity index 61% rename from third_party/nixpkgs/pkgs/tools/misc/mise/default.nix rename to third_party/nixpkgs/pkgs/by-name/mi/mise/package.nix index 6964083e63..8adb9516b0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mise/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/mm/mmdbctl/package.nix b/third_party/nixpkgs/pkgs/by-name/mm/mmdbctl/package.nix new file mode 100644 index 0000000000..ecd79f02e9 --- /dev/null +++ b/third_party/nixpkgs/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}/share/dbip/dbip-country-lite.mmdb | grep valid + ${lib.getExe mmdbctl} metadata ${dbip-country-lite}/share/dbip/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/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app-unwrapped/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app-unwrapped/Cargo.lock index beb4423be9..03dd9b0d5f 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app-unwrapped/Cargo.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index 3d43797b9b..e93e99ea61 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app/package.nix index c92b6319d5..8f17cd3c9e 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/mo/mollysocket/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mollysocket/package.nix index 6c9e18cc8f..c282bbba26 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mollysocket/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/mo/mozc-ut/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozc-ut/package.nix new file mode 100644 index 0000000000..a758f1e8d6 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/mo/mozc/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozc/package.nix index b374329d23..a1b0e804f4 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mozc/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/mo/mozillavpn/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mozillavpn/package.nix index 9bd0b16966..dbb920db34 100644 --- a/third_party/nixpkgs/pkgs/by-name/mo/mozillavpn/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ms/msedgedriver/package.nix b/third_party/nixpkgs/pkgs/by-name/ms/msedgedriver/package.nix new file mode 100644 index 0000000000..d576d98ece --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ms/msedgedriver/package.nix @@ -0,0 +1,84 @@ +{ + autoPatchelfHook, + fetchzip, + glib, + lib, + libxcb, + nspr, + nss, + stdenvNoCC, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "msedgedriver"; + # finding a version that has all 4 builds is a pain + # https://msedgewebdriverstorage.z22.web.core.windows.net/?form=MA13LH + version = "130.0.2849.1"; + + src = + let + inherit (stdenvNoCC.hostPlatform) system; + selectSystem = attrs: attrs.${system} or (throw "Unsupported system: ${system}"); + suffix = selectSystem { + x86_64-linux = "linux64"; + aarch64-linux = "arm64"; + x86_64-darwin = "mac64"; + aarch64-darwin = "mac64_m1"; + }; + + hash = selectSystem { + x86_64-linux = "sha256-U6YGD2PAhVUa7f+R5pmKLazGLOBbf3bRqzlwIJewA+w="; + aarch64-linux = "sha256-QJ1jRw8kkWbT8US5qI8DMZI/7Q8yJWpFXrfzGdxDWKE="; + x86_64-darwin = "sha256-Ejcv1DtuEiLJvTsv48AwoCQlFO3xM9PkM3HvZG65AC4="; + aarch64-darwin = "sha256-ykn4bYREE6xmJY02WiCRGsGnyWjnmnZM8FemK4XZqhc="; + }; + in + fetchzip { + url = "https://msedgedriver.azureedge.net/${finalAttrs.version}/edgedriver_${suffix}.zip"; + inherit hash; + stripRoot = false; + }; + + buildInputs = [ + glib + libxcb + nspr + nss + ]; + + nativeBuildInputs = lib.optionals (!stdenvNoCC.hostPlatform.isDarwin) [ autoPatchelfHook ]; + + installPhase = + if stdenvNoCC.hostPlatform.isDarwin then + '' + runHook preInstall + + mkdir -p $out/{Applications/msedgedriver,bin} + cp -R . $out/Applications/msedgedriver + + runHook postInstall + '' + else + '' + runHook preInstall + + install -m777 -D "msedgedriver" $out/bin/msedgedriver + + runHook postInstall + ''; + + meta = { + homepage = "https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver"; + description = "WebDriver implementation that controls an Edge browser running on the local machine"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ cholli ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + mainProgram = "msedgedriver"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/mt/mtdutils/package.nix b/third_party/nixpkgs/pkgs/by-name/mt/mtdutils/package.nix index 15359970cf..3347739d81 100644 --- a/third_party/nixpkgs/pkgs/by-name/mt/mtdutils/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/mt/mtdutils/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { makeFlags = [ "AR:=$(AR)" ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; outputs = [ "out" diff --git a/third_party/nixpkgs/pkgs/by-name/na/namespace-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/na/namespace-cli/package.nix index 58c4872b2c..36cc397f85 100644 --- a/third_party/nixpkgs/pkgs/by-name/na/namespace-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/na/namespace-cli/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.392"; + version = "0.0.394"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-o0/kAat8vEhVE9ut179yBpvLuMFw6bNha2qT1ddvs7E="; + hash = "sha256-ktXpFhE/+DmlqIaH8R6zu4Y1I7sr8NYeZP8lWeNN0bA="; }; - vendorHash = "sha256-XO/Fj66w17zLJIQHv6F6czReqtqyCORAgCRtjwRaTbo="; + vendorHash = "sha256-E9RhELIGOjFa+gDinl4xDR3ckTtdFLqVoAT0HQoI38I="; subPackages = ["cmd/nsc" "cmd/ns" "cmd/docker-credential-nsc"]; diff --git a/third_party/nixpkgs/pkgs/by-name/na/narsil/package.nix b/third_party/nixpkgs/pkgs/by-name/na/narsil/package.nix index ff46f58ad2..98c05142a2 100644 --- a/third_party/nixpkgs/pkgs/by-name/na/narsil/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/na/narsil/package.nix @@ -14,16 +14,16 @@ }: stdenv.mkDerivation rec { pname = "narsil"; - version = "1.3.0-234-g228c4f0cb"; + version = "1.3.0-350-ga51756908"; src = fetchFromGitHub { owner = "NickMcConnell"; repo = "NarSil"; rev = version; - hash = "sha256-82ph8LTtaruaV97gdnqSQI8IfqO9wzYbR7WTGx086pQ="; + hash = "sha256-kpfgM+FpvSZLrgu6Smbjlr8QfI400+85wqUR+l0AJkA="; }; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = diff --git a/third_party/nixpkgs/pkgs/by-name/ne/netbox_4_0/custom-static-root.patch b/third_party/nixpkgs/pkgs/by-name/ne/netbox_4_0/custom-static-root.patch new file mode 100644 index 0000000000..c9219fa2b8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ne/netbox_4_0/custom-static-root.patch @@ -0,0 +1,13 @@ +diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py +index 2de06dd10..00406af48 100644 +--- a/netbox/netbox/settings.py ++++ b/netbox/netbox/settings.py +@@ -410,7 +412,7 @@ USE_X_FORWARDED_HOST = True + X_FRAME_OPTIONS = 'SAMEORIGIN' + + # Static files (CSS, JavaScript, Images) +-STATIC_ROOT = BASE_DIR + '/static' ++STATIC_ROOT = getattr(configuration, 'STATIC_ROOT', os.path.join(BASE_DIR, 'static')).rstrip('/') + STATIC_URL = f'/{BASE_PATH}static/' + STATICFILES_DIRS = ( + os.path.join(BASE_DIR, 'project-static', 'dist'), diff --git a/third_party/nixpkgs/pkgs/by-name/ne/netbox_4_0/django-5.1.patch b/third_party/nixpkgs/pkgs/by-name/ne/netbox_4_0/django-5.1.patch new file mode 100644 index 0000000000..3976e79067 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ne/netbox_4_0/django-5.1.patch @@ -0,0 +1,81 @@ +diff --git a/netbox/extras/forms/bulk_import.py b/netbox/extras/forms/bulk_import.py +index f2cf0b721..a17b6712d 100644 +--- a/netbox/extras/forms/bulk_import.py ++++ b/netbox/extras/forms/bulk_import.py +@@ -194,7 +194,7 @@ class Meta: + model = EventRule + fields = ( + 'name', 'description', 'enabled', 'conditions', 'object_types', 'type_create', 'type_update', +- 'type_delete', 'type_job_start', 'type_job_end', 'action_type', 'action_object', 'comments', 'tags' ++ 'type_delete', 'type_job_start', 'type_job_end', 'action_type', 'comments', 'tags' + ) + + def clean(self): +diff --git a/netbox/extras/migrations/0002_squashed_0059.py b/netbox/extras/migrations/0002_squashed_0059.py +index 98bed255a..a403a0e19 100644 +--- a/netbox/extras/migrations/0002_squashed_0059.py ++++ b/netbox/extras/migrations/0002_squashed_0059.py +@@ -131,10 +131,6 @@ class Migration(migrations.Migration): + name='webhook', + unique_together={('payload_url', 'type_create', 'type_update', 'type_delete')}, + ), +- migrations.AlterIndexTogether( +- name='taggeditem', +- index_together={('content_type', 'object_id')}, +- ), + migrations.AlterUniqueTogether( + name='exporttemplate', + unique_together={('content_type', 'name')}, +diff --git a/netbox/extras/migrations/0087_squashed_0098.py b/netbox/extras/migrations/0087_squashed_0098.py +index 55f276ecd..bbe7f79f5 100644 +--- a/netbox/extras/migrations/0087_squashed_0098.py ++++ b/netbox/extras/migrations/0087_squashed_0098.py +@@ -98,10 +98,9 @@ class Migration(migrations.Migration): + name='object_types', + field=models.ManyToManyField(blank=True, related_name='+', to='contenttypes.contenttype'), + ), +- migrations.RenameIndex( ++ migrations.AddIndex( + model_name='taggeditem', +- new_name='extras_tagg_content_717743_idx', +- old_fields=('content_type', 'object_id'), ++ index=models.Index(fields=['content_type', 'object_id'], name='extras_tagg_content_717743_idx'), + ), + migrations.CreateModel( + name='Bookmark', +diff --git a/netbox/ipam/forms/model_forms.py b/netbox/ipam/forms/model_forms.py +index f5e3bca30..4f96bac71 100644 +--- a/netbox/ipam/forms/model_forms.py ++++ b/netbox/ipam/forms/model_forms.py +@@ -588,7 +588,7 @@ class VLANGroupForm(NetBoxModelForm): + class Meta: + model = VLANGroup + fields = [ +- 'name', 'slug', 'description', 'min_vid', 'max_vid', 'scope_type', 'scope', 'tags', ++ 'name', 'slug', 'description', 'min_vid', 'max_vid', 'scope_type', 'tags', + ] + + def __init__(self, *args, **kwargs): +diff --git a/netbox/vpn/forms/model_forms.py b/netbox/vpn/forms/model_forms.py +index a17ca9a5e..dee98afd3 100644 +--- a/netbox/vpn/forms/model_forms.py ++++ b/netbox/vpn/forms/model_forms.py +@@ -258,7 +258,7 @@ class TunnelTerminationForm(NetBoxModelForm): + class Meta: + model = TunnelTermination + fields = [ +- 'tunnel', 'role', 'termination', 'outside_ip', 'tags', ++ 'tunnel', 'role', 'outside_ip', 'tags', + ] + + def __init__(self, *args, initial=None, **kwargs): +diff --git a/requirements.txt b/requirements.txt +index 09f23871c..57f167dae 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,4 +1,4 @@ +-Django==5.0.9 ++Django==5.1.2 + django-cors-headers==4.4.0 + django-debug-toolbar==4.4.6 + django-filter==24.2 diff --git a/third_party/nixpkgs/pkgs/by-name/ne/netbox_4_0/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/netbox_4_0/package.nix new file mode 100644 index 0000000000..81b05c2679 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ne/netbox_4_0/package.nix @@ -0,0 +1,132 @@ +{ + lib, + fetchFromGitHub, + python3, + plugins ? _ps: [ ], + nixosTests, +}: +let + py = python3.override { + packageOverrides = _final: prev: { django = prev.django_5; }; + }; + + extraBuildInputs = plugins py.pkgs; +in +py.pkgs.buildPythonApplication rec { + pname = "netbox"; + version = "4.0.11"; + + format = "other"; + + src = fetchFromGitHub { + owner = "netbox-community"; + repo = "netbox"; + rev = "refs/tags/v${version}"; + hash = "sha256-0yEz7v5RL1+cqbGDyuyEsywFonJQfPdVIQdL0qLyc04="; + }; + + patches = [ + ./custom-static-root.patch + # From https://github.com/netbox-community/netbox/pull/17620 + ./django-5.1.patch + ]; + + propagatedBuildInputs = + ( + with py.pkgs; + [ + django + django-cors-headers + django-debug-toolbar + django-filter + django-graphiql-debug-toolbar + django-htmx + django-mptt + django-pglocks + django-prometheus + django-redis + django-rq + django-tables2 + django-taggit + django-timezone-field + djangorestframework + drf-spectacular + drf-spectacular-sidecar + feedparser + jinja2 + markdown + netaddr + nh3 + pillow + psycopg + psycopg.optional-dependencies.c + psycopg.optional-dependencies.pool + pyyaml + requests + social-auth-core + social-auth-app-django + strawberry-graphql + strawberry-django + svgwrite + tablib + + # Optional dependencies, kept here for backward compatibility + + # for the S3 data source backend + boto3 + # for Git data source backend + dulwich + # for error reporting + sentry-sdk + ] + ++ social-auth-core.passthru.optional-dependencies.openidconnect + ) + ++ extraBuildInputs; + + buildInputs = with py.pkgs; [ + mkdocs-material + mkdocs-material-extensions + mkdocstrings + mkdocstrings-python + ]; + + nativeBuildInputs = [ py.pkgs.mkdocs ]; + + postBuild = '' + PYTHONPATH=$PYTHONPATH:netbox/ + python -m mkdocs build + ''; + + installPhase = '' + mkdir -p $out/opt/netbox + cp -r . $out/opt/netbox + chmod +x $out/opt/netbox/netbox/manage.py + makeWrapper $out/opt/netbox/netbox/manage.py $out/bin/netbox \ + --prefix PYTHONPATH : "$PYTHONPATH" + ''; + + passthru = { + python = python3; + # PYTHONPATH of all dependencies used by the package + pythonPath = py.pkgs.makePythonPath propagatedBuildInputs; + inherit (py.pkgs) gunicorn; + tests = { + netbox = nixosTests.netbox_4_0; + }; + }; + + meta = { + homepage = "https://github.com/netbox-community/netbox"; + description = "IP address management (IPAM) and data center infrastructure management (DCIM) tool"; + mainProgram = "netbox"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + minijackson + n0emis + raitobezarius + ]; + knownVulnerabilities = [ + "Netbox version ${version} is EOL; please upgrade by following the current release notes instructions." + ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ne/netbox_4_1/custom-static-root.patch b/third_party/nixpkgs/pkgs/by-name/ne/netbox_4_1/custom-static-root.patch new file mode 100644 index 0000000000..c9219fa2b8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ne/netbox_4_1/custom-static-root.patch @@ -0,0 +1,13 @@ +diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py +index 2de06dd10..00406af48 100644 +--- a/netbox/netbox/settings.py ++++ b/netbox/netbox/settings.py +@@ -410,7 +412,7 @@ USE_X_FORWARDED_HOST = True + X_FRAME_OPTIONS = 'SAMEORIGIN' + + # Static files (CSS, JavaScript, Images) +-STATIC_ROOT = BASE_DIR + '/static' ++STATIC_ROOT = getattr(configuration, 'STATIC_ROOT', os.path.join(BASE_DIR, 'static')).rstrip('/') + STATIC_URL = f'/{BASE_PATH}static/' + STATICFILES_DIRS = ( + os.path.join(BASE_DIR, 'project-static', 'dist'), diff --git a/third_party/nixpkgs/pkgs/by-name/ne/netbox_4_1/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/netbox_4_1/package.nix new file mode 100644 index 0000000000..be5b530427 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ne/netbox_4_1/package.nix @@ -0,0 +1,133 @@ +{ + lib, + fetchFromGitHub, + fetchpatch, + python3, + plugins ? _ps: [ ], + nixosTests, +}: +let + py = python3.override { + packageOverrides = _final: prev: { django = prev.django_5; }; + }; + + extraBuildInputs = plugins py.pkgs; +in +py.pkgs.buildPythonApplication rec { + pname = "netbox"; + version = "4.1.3"; + + format = "other"; + + src = fetchFromGitHub { + owner = "netbox-community"; + repo = "netbox"; + rev = "refs/tags/v${version}"; + hash = "sha256-SRzkmRkniVDu6vYGa9Kd9exob/LHpGBPd+lRA/pbCFo="; + }; + + patches = [ + ./custom-static-root.patch + (fetchpatch { + url = "https://github.com/netbox-community/netbox/pull/17620.patch"; + hash = "sha256-zN2zke4qlNJUbxI8mSV+zGmEv0Qtd0zSCbCXWyE1L2k="; + }) + ]; + + propagatedBuildInputs = + ( + with py.pkgs; + [ + django + django-cors-headers + django-debug-toolbar + django-filter + django-graphiql-debug-toolbar + django-htmx + django-mptt + django-pglocks + django-prometheus + django-redis + django-rq + django-tables2 + django-taggit + django-timezone-field + djangorestframework + drf-spectacular + drf-spectacular-sidecar + feedparser + jinja2 + markdown + netaddr + nh3 + pillow + psycopg + psycopg.optional-dependencies.c + psycopg.optional-dependencies.pool + pyyaml + requests + social-auth-core + social-auth-app-django + strawberry-graphql + strawberry-django + svgwrite + tablib + + # Optional dependencies, kept here for backward compatibility + + # for the S3 data source backend + boto3 + # for Git data source backend + dulwich + # for error reporting + sentry-sdk + ] + ++ social-auth-core.passthru.optional-dependencies.openidconnect + ) + ++ extraBuildInputs; + + buildInputs = with py.pkgs; [ + mkdocs-material + mkdocs-material-extensions + mkdocstrings + mkdocstrings-python + ]; + + nativeBuildInputs = [ py.pkgs.mkdocs ]; + + postBuild = '' + PYTHONPATH=$PYTHONPATH:netbox/ + python -m mkdocs build + ''; + + installPhase = '' + mkdir -p $out/opt/netbox + cp -r . $out/opt/netbox + chmod +x $out/opt/netbox/netbox/manage.py + makeWrapper $out/opt/netbox/netbox/manage.py $out/bin/netbox \ + --prefix PYTHONPATH : "$PYTHONPATH" + ''; + + passthru = { + python = python3; + # PYTHONPATH of all dependencies used by the package + pythonPath = py.pkgs.makePythonPath propagatedBuildInputs; + inherit (py.pkgs) gunicorn; + tests = { + netbox = nixosTests.netbox_4_1; + inherit (nixosTests) netbox-upgrade; + }; + }; + + meta = { + homepage = "https://github.com/netbox-community/netbox"; + description = "IP address management (IPAM) and data center infrastructure management (DCIM) tool"; + mainProgram = "netbox"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + minijackson + n0emis + raitobezarius + ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ne/newlisp/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/newlisp/package.nix new file mode 100644 index 0000000000..c38df75a3e --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ne/newlisp/package.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchurl, + stdenv, + libffi, + readline, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "newlisp"; + version = "10.7.5"; + + src = fetchurl { + url = "https://www.newlisp.org/downloads/newlisp-${finalAttrs.version}.tgz"; + hash = "sha256-3C0P9lHCsnW8SvOvi6WYUab7bh6t3CCudftgsekBJuw="; + }; + + buildInputs = [ + libffi + readline + ]; + + configureScript = "./configure-alt"; + + doCheck = true; + checkTarget = "testall"; + + meta = { + description = "Lisp-like, general-purpose scripting language"; + longDescription = '' + newLISP is a Lisp-like, general-purpose scripting language. It is + especially well-suited for applications in AI, simulation, natural + language processing, big data, machine learning and statistics. Because + of its small resource requirements, newLISP is excellent for embedded + systems applications. Most of the functions you will ever need are + already built in. This includes networking functions, support for + distributed and multicore processing, and Bayesian statistics. + ''; + homepage = "https://www.newlisp.org/"; + downloadPage = "https://www.newlisp.org/downloads/"; + changelog = "https://www.newlisp.org/downloads/newlisp-${finalAttrs.version}/doc/CHANGES"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ rc-zb ]; + mainProgram = "newlisp"; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ne/nezha-agent/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/nezha-agent/package.nix index 629b906d82..750e1ecdaf 100644 --- a/third_party/nixpkgs/pkgs/by-name/ne/nezha-agent/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ne/nezha-agent/package.nix @@ -1,45 +1,64 @@ { lib, buildGoModule, + stdenv, fetchFromGitHub, - nezha-agent, - testers, + versionCheckHook, }: buildGoModule rec { pname = "nezha-agent"; - version = "0.18.5"; + version = "0.20.3"; src = fetchFromGitHub { owner = "nezhahq"; repo = "agent"; rev = "refs/tags/v${version}"; - hash = "sha256-LmWfs3aL+1lsX4ix2FjDP5g+A0wgcfziXdw5SaKlAdk="; + hash = "sha256-cLLiJbAr7TxVUNV31Y9TG8ZL4uqBCOnrOr1FM4+1U5c="; }; - vendorHash = "sha256-frPAhiexFSt+KobMbf32h8xv7HMcPl5koEgSs8Nz3cs="; + vendorHash = "sha256-q6/265vVg6jCnDvs825nni8QFHkJpQz4xxC9MlJH2do="; ldflags = [ "-s" "-w" "-X main.version=${version}" + "-X main.arch=${stdenv.hostPlatform.system}" ]; - # The test failed due to a geoip request in the sandbox. Remove it to avoid network requirement - preCheck = '' - rm ./pkg/monitor/myip_test.go + checkFlags = + let + # Skip tests that require network access + skippedTests = [ + "TestLookupIP" + "TestGeoIPApi" + "TestFetchGeoIP" + "TestCloudflareDetection" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + postInstall = '' + pushd $out/bin + mv agent nezha-agent + + # for compatibility + ln -sr nezha-agent agent + popd ''; - passthru.tests = { - version = testers.testVersion { - package = nezha-agent; - command = "${nezha-agent}/bin/agent -v"; - }; - }; + doInstallCheck = true; + + versionCheckProgramArg = "-v"; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; meta = { description = "Agent of Nezha Monitoring"; homepage = "https://github.com/nezhahq/agent"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ moraxyc ]; + mainProgram = "nezha-agent"; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/nf/nf-test/package.nix b/third_party/nixpkgs/pkgs/by-name/nf/nf-test/package.nix index ceea014962..b04c4c08e3 100644 --- a/third_party/nixpkgs/pkgs/by-name/nf/nf-test/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nf/nf-test/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "nf-test"; - version = "0.9.0"; + version = "0.9.1"; src = fetchurl { url = "https://github.com/askimed/nf-test/releases/download/v${version}/nf-test-${version}.tar.gz"; - hash = "sha256-PhI866NrbokMsSrU6YeSv03S1+VcNqVJsocI3xPfDcc="; + hash = "sha256-NjmB6bL9j6p4CWeVWU9q+aAe+dgH6lwUNZYARm41p8M="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/by-name/ng/ngrok/package.nix b/third_party/nixpkgs/pkgs/by-name/ng/ngrok/package.nix index bb47cd4d73..a2f5fc51df 100644 --- a/third_party/nixpkgs/pkgs/by-name/ng/ngrok/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ng/ngrok/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + testers, }: let @@ -28,7 +29,7 @@ let inherit (versionInfo) version sha256 url; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "ngrok"; inherit version; @@ -55,7 +56,10 @@ stdenv.mkDerivation { runHook postInstall ''; - passthru.updateScript = ./update.sh; + passthru = { + updateScript = ./update.sh; + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + }; # Stripping causes SEGFAULT on darwin dontStrip = stdenv.hostPlatform.isDarwin; @@ -74,4 +78,4 @@ stdenv.mkDerivation { ]; mainProgram = "ngrok"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/by-name/ng/ngrok/versions.json b/third_party/nixpkgs/pkgs/by-name/ng/ngrok/versions.json index 8f45214d41..453116873b 100644 --- a/third_party/nixpkgs/pkgs/by-name/ng/ngrok/versions.json +++ b/third_party/nixpkgs/pkgs/by-name/ng/ngrok/versions.json @@ -1,38 +1,38 @@ { "linux-386": { "sys": "linux-386", - "url": "https://bin.equinox.io/a/2pDJvg1WeN6/ngrok-v3-3.16.0-linux-386", - "sha256": "225ea2210a068f977a608352dd22fd20be619473cf3501df271c39c63905a521", - "version": "3.16.0" + "url": "https://bin.equinox.io/a/cPMgrL2ncCb/ngrok-v3-3.18.1-linux-386", + "sha256": "f0b85d6a2f7ab3bd48186100e0f619acd18d4bdf56df2cd7044e6b35745c17a4", + "version": "3.18.1" }, "linux-amd64": { "sys": "linux-amd64", - "url": "https://bin.equinox.io/a/kxzmCLDbo6M/ngrok-v3-3.16.0-linux-amd64", - "sha256": "fc1973917b056ac11d74687b0ba513a0fbab41f923e648875b8882d3e6cf07e0", - "version": "3.16.0" + "url": "https://bin.equinox.io/a/gnpHP5YLEsK/ngrok-v3-3.18.1-linux-amd64", + "sha256": "7d0a1f40bfb10fd7304081dcc27d7b8d2bed86f39cd46825c07679d8c888975f", + "version": "3.18.1" }, "linux-arm": { "sys": "linux-arm", - "url": "https://bin.equinox.io/a/iE6KPEx6SuX/ngrok-v3-3.16.0-linux-arm", - "sha256": "3cb21e33be918ad4e547db5f0401d0c6fea61876ae46c14daf39f1038f80a1af", - "version": "3.16.0" + "url": "https://bin.equinox.io/a/mke1muTU2zp/ngrok-v3-3.18.1-linux-arm", + "sha256": "6e7b4723a3a2c936157e4ec7be0bcbf95b49c672223ba0621d54165e8009fd78", + "version": "3.18.1" }, "linux-arm64": { "sys": "linux-arm64", - "url": "https://bin.equinox.io/a/3gbE6TuMrs4/ngrok-v3-3.16.0-linux-arm64", - "sha256": "e9cb9a3e65f92fa095101884291f9e5ed0989633cff480353a65877cf710399e", - "version": "3.16.0" + "url": "https://bin.equinox.io/a/jYPr353ESuj/ngrok-v3-3.18.1-linux-arm64", + "sha256": "0dbdfdf94b3acb777741e9eeeb27a256cb1975b7d366d1ba404804b863b8fcbb", + "version": "3.18.1" }, "darwin-amd64": { "sys": "darwin-amd64", - "url": "https://bin.equinox.io/a/aWAe4Kvgqei/ngrok-v3-3.16.0-darwin-amd64", - "sha256": "5c2fb13ab825876f183bcff82f98b0979f9f5250638a8cb88e5f987f2b109b6c", - "version": "3.16.0" + "url": "https://bin.equinox.io/a/iTdNrZisjJj/ngrok-v3-3.18.1-darwin-amd64", + "sha256": "9a1319caf566ee7f85c1a9b2982ee95c08bd549e90d56ac99ef863d5da92b4a4", + "version": "3.18.1" }, "darwin-arm64": { "sys": "darwin-arm64", - "url": "https://bin.equinox.io/a/4wpGQDJrfrm/ngrok-v3-3.16.0-darwin-arm64", - "sha256": "3fe7cc8f0d6b1978487c502cd6b832a1963287ad0f7c171904ac2c27d81bf9be", - "version": "3.16.0" + "url": "https://bin.equinox.io/a/6wGwyzYTbRX/ngrok-v3-3.18.1-darwin-arm64", + "sha256": "9cc3fee7d81157e6bc645f160f6aa5562577c4b9f72db8675143e16d07703816", + "version": "3.18.1" } } diff --git a/third_party/nixpkgs/pkgs/by-name/nh/nhost-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/nh/nhost-cli/package.nix index 6d6dbbd295..8e36a02cb2 100644 --- a/third_party/nixpkgs/pkgs/by-name/nh/nhost-cli/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/nh/nhost-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "nhost-cli"; - version = "1.24.0"; + version = "1.24.5"; src = fetchFromGitHub { owner = "nhost"; repo = "cli"; rev = "v${version}"; - hash = "sha256-8kul3tiwEJF6Pu1os29MteeYP+85X9hH12MojMpW9bY="; + hash = "sha256-/NkegGp+JoJWPIkO3YKp/aZ6Yp5tcjnRCONY0GHe+HI="; }; vendorHash = null; @@ -27,9 +27,12 @@ buildGoModule rec { mv $out/bin/cli $out/bin/nhost ''; + checkFlags = [ "-skip=^TestMakeJSONRequest$" ]; + meta = { - description = "A tool for setting up a local development environment for Nhost"; + description = "Tool for setting up a local development environment for Nhost"; homepage = "https://github.com/nhost/cli"; + changelog = "https://github.com/nhost/cli/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ moraxyc ]; mainProgram = "nhost"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/nim/nim.cfg.patch b/third_party/nixpkgs/pkgs/by-name/ni/nim-1_0/nim.cfg.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/nim/nim.cfg.patch rename to third_party/nixpkgs/pkgs/by-name/ni/nim-1_0/nim.cfg.patch diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nim-1_0/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nim-1_0/package.nix new file mode 100644 index 0000000000..48b067ef46 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ni/nim-1_0/package.nix @@ -0,0 +1,12 @@ +{ + lib, + stdenv, + fetchurl, + nim-unwrapped-1, + nim, +}: + +nim.passthru.wrapNim { + nimUnwrapped = nim-unwrapped-1; + patches = [ ./nim.cfg.patch ]; +} diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nim-2_0/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nim-2_0/package.nix new file mode 100644 index 0000000000..c039535275 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ni/nim-2_0/package.nix @@ -0,0 +1,12 @@ +{ + lib, + stdenv, + fetchurl, + nim-unwrapped-2_0, + nim-2_2, +}: + +nim-2_2.passthru.wrapNim { + nimUnwrapped = nim-unwrapped-2_0; + inherit (nim-2_2) patches; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/nim/nim2.cfg.patch b/third_party/nixpkgs/pkgs/by-name/ni/nim-2_2/nim2.cfg.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/nim/nim2.cfg.patch rename to third_party/nixpkgs/pkgs/by-name/ni/nim-2_2/nim2.cfg.patch diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nim-2_2/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nim-2_2/package.nix new file mode 100644 index 0000000000..f97506eb62 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ni/nim-2_2/package.nix @@ -0,0 +1,156 @@ +# When updating this package please check that all other versions of Nim +# evaluate because they reuse definitions from the latest compiler. +{ + lib, + stdenv, + buildPackages, + darwin, + makeWrapper, + openssl, + pcre, + nim-unwrapped-2_2 ? buildPackages.nim-unwrapped-2_2, + Security ? darwin.Security, +}: + +let + wrapNim = + { nimUnwrapped, patches }: + let + targetPlatformConfig = stdenv.targetPlatform.config; + in + stdenv.mkDerivation (finalAttrs: { + name = "${targetPlatformConfig}-nim-wrapper-${nimUnwrapped.version}"; + inherit (nimUnwrapped) 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 ${nimUnwrapped.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", "${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/third_party/nixpkgs/pkgs/development/compilers/nim/extra-mangling.patch b/third_party/nixpkgs/pkgs/by-name/ni/nim-unwrapped-1_0/extra-mangling.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/nim/extra-mangling.patch rename to third_party/nixpkgs/pkgs/by-name/ni/nim-unwrapped-1_0/extra-mangling.patch diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nim-unwrapped-1_0/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nim-unwrapped-1_0/package.nix new file mode 100644 index 0000000000..09b50753bc --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/nim/toLocation.patch b/third_party/nixpkgs/pkgs/by-name/ni/nim-unwrapped-1_0/toLocation.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/nim/toLocation.patch rename to third_party/nixpkgs/pkgs/by-name/ni/nim-unwrapped-1_0/toLocation.patch diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix new file mode 100644 index 0000000000..232d4dcbfa --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/nim/NIM_CONFIG_DIR.patch b/third_party/nixpkgs/pkgs/by-name/ni/nim-unwrapped-2_2/NIM_CONFIG_DIR.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/nim/NIM_CONFIG_DIR.patch rename to third_party/nixpkgs/pkgs/by-name/ni/nim-unwrapped-2_2/NIM_CONFIG_DIR.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/nim/extra-mangling-2.patch b/third_party/nixpkgs/pkgs/by-name/ni/nim-unwrapped-2_2/extra-mangling-2.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/nim/extra-mangling-2.patch rename to third_party/nixpkgs/pkgs/by-name/ni/nim-unwrapped-2_2/extra-mangling-2.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/nim/nixbuild.patch b/third_party/nixpkgs/pkgs/by-name/ni/nim-unwrapped-2_2/nixbuild.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/nim/nixbuild.patch rename to third_party/nixpkgs/pkgs/by-name/ni/nim-unwrapped-2_2/nixbuild.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/nim/openssl.patch b/third_party/nixpkgs/pkgs/by-name/ni/nim-unwrapped-2_2/openssl.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/nim/openssl.patch rename to third_party/nixpkgs/pkgs/by-name/ni/nim-unwrapped-2_2/openssl.patch diff --git a/third_party/nixpkgs/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix new file mode 100644 index 0000000000..311c0f5b9d --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ni/nimlsp/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nimlsp/package.nix index 36b9b3d3af..d9eaa838f7 100644 --- a/third_party/nixpkgs/pkgs/by-name/ni/nimlsp/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-pack/default.nix b/third_party/nixpkgs/pkgs/by-name/no/nomad-pack/package.nix similarity index 75% rename from third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-pack/default.nix rename to third_party/nixpkgs/pkgs/by-name/no/nomad-pack/package.nix index c5c7cdb08e..0e5e0c6154 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-pack/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/no/novops/package.nix b/third_party/nixpkgs/pkgs/by-name/no/novops/package.nix index 44edb7f329..23b705e59d 100644 --- a/third_party/nixpkgs/pkgs/by-name/no/novops/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/nu/nufmt/package.nix b/third_party/nixpkgs/pkgs/by-name/nu/nufmt/package.nix index 28f16ade66..792935e080 100644 --- a/third_party/nixpkgs/pkgs/by-name/nu/nufmt/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/nu/numbat/package.nix b/third_party/nixpkgs/pkgs/by-name/nu/numbat/package.nix index 075701e298..ccddeeb94e 100644 --- a/third_party/nixpkgs/pkgs/by-name/nu/numbat/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/nw/nwg-panel/package.nix b/third_party/nixpkgs/pkgs/by-name/nw/nwg-panel/package.nix index fba077d5c5..11e886a482 100644 --- a/third_party/nixpkgs/pkgs/by-name/nw/nwg-panel/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix b/third_party/nixpkgs/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix index c4b85cac55..58a608a33d 100644 --- a/third_party/nixpkgs/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ob/objfw/package.nix b/third_party/nixpkgs/pkgs/by-name/ob/objfw/package.nix new file mode 100644 index 0000000000..4a02e49898 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/oc/octoscan/package.nix b/third_party/nixpkgs/pkgs/by-name/oc/octoscan/package.nix index b6ca64b5a9..1190e8831e 100644 --- a/third_party/nixpkgs/pkgs/by-name/oc/octoscan/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/od/odoo/package.nix b/third_party/nixpkgs/pkgs/by-name/od/odoo/package.nix index fd3768bcd7..8c7477c074 100644 --- a/third_party/nixpkgs/pkgs/by-name/od/odoo/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/od/odoo/update.sh b/third_party/nixpkgs/pkgs/by-name/od/odoo/update.sh index e9c50ccb50..2265f9048c 100755 --- a/third_party/nixpkgs/pkgs/by-name/od/odoo/update.sh +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/od/odoo15/package.nix b/third_party/nixpkgs/pkgs/by-name/od/odoo15/package.nix index ca2a1444a0..be0f9a6906 100644 --- a/third_party/nixpkgs/pkgs/by-name/od/odoo15/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/od/odoo15/update.sh b/third_party/nixpkgs/pkgs/by-name/od/odoo15/update.sh new file mode 100755 index 0000000000..2265f9048c --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/od/odoo16/package.nix b/third_party/nixpkgs/pkgs/by-name/od/odoo16/package.nix index 91e634a13b..b2acd426cf 100644 --- a/third_party/nixpkgs/pkgs/by-name/od/odoo16/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/od/odoo16/update.sh b/third_party/nixpkgs/pkgs/by-name/od/odoo16/update.sh new file mode 100755 index 0000000000..2265f9048c --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/od/odoo17/package.nix b/third_party/nixpkgs/pkgs/by-name/od/odoo17/package.nix new file mode 100644 index 0000000000..698afb37d1 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/od/odoo17/update.sh b/third_party/nixpkgs/pkgs/by-name/od/odoo17/update.sh new file mode 100755 index 0000000000..2265f9048c --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/of/offat/package.nix b/third_party/nixpkgs/pkgs/by-name/of/offat/package.nix index 46bbba00f7..83bb81df0f 100644 --- a/third_party/nixpkgs/pkgs/by-name/of/offat/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/oi/oil/package.nix b/third_party/nixpkgs/pkgs/by-name/oi/oil/package.nix deleted file mode 100644 index 3cce7d592f..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/oi/oil/package.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv, lib, fetchurl, symlinkJoin, withReadline ? true, readline }: - -let - readline-all = symlinkJoin { - name = "readline-all"; paths = [ readline readline.dev ]; - }; -in -stdenv.mkDerivation rec { - pname = "oil"; - version = "0.22.0"; - - src = fetchurl { - url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - hash = "sha256-RS5/1Ci2hqp1LP65viuU+fz3upqyLgrlcKh83PeCJC4="; - }; - - postPatch = '' - patchShebangs build - ''; - - preInstall = '' - mkdir -p $out/bin - ''; - - strictDeps = true; - buildInputs = lib.optional withReadline readline; - # As of 0.20.0 the build generates an error on MacOS (using clang version 16.0.6 in the builder), - # whereas running it outside of Nix with clang version 15.0.0 generates just a warning. The shell seems to - # work just fine though, so we disable the error here. - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; - configureFlags = [ - "--datarootdir=${placeholder "out"}" - ] ++ lib.optionals withReadline [ - "--with-readline" - "--readline=${readline-all}" - ]; - - # Stripping breaks the bundles by removing the zip file from the end. - dontStrip = true; - - meta = { - description = "New unix shell - Python version"; - homepage = "https://www.oilshell.org/"; - - license = with lib.licenses; [ - psfl # Includes a portion of the python interpreter and standard library - asl20 # Licence for Oil itself - ]; - - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ melkor333 ]; - changelog = "https://www.oilshell.org/release/${version}/changelog.html"; - }; - - passthru = { - shellPath = "/bin/osh"; - }; -} diff --git a/third_party/nixpkgs/pkgs/by-name/oi/oils-for-unix/package.nix b/third_party/nixpkgs/pkgs/by-name/oi/oils-for-unix/package.nix index 67dbc80e8a..b33c93ac6d 100644 --- a/third_party/nixpkgs/pkgs/by-name/oi/oils-for-unix/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/oi/oils-for-unix/package.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "oils-for-unix"; - version = "0.22.0"; + version = "0.23.0"; src = fetchurl { url = "https://www.oilshell.org/download/oils-for-unix-${version}.tar.gz"; - hash = "sha256-etZK2VH6qbj9MQ/BffCpMpHgQat1MRrKG8hcu/p61F8="; + hash = "sha256-ydNcp4tKCO6vrIvGQ54rtAvM0zcNsiJkh/rtY0ihdSE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/by-name/op/open-webui/package.nix b/third_party/nixpkgs/pkgs/by-name/op/open-webui/package.nix index e401e72d0f..b2b92282dc 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/open-webui/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/open-webui/package.nix @@ -55,10 +55,6 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = true; pythonRemoveDeps = [ - # using `opencv4` - "opencv-python-headless" - # using `psycopg2` instead - "psycopg2-binary" "docker" "pytest" "pytest-docker" @@ -97,14 +93,14 @@ python3.pkgs.buildPythonApplication rec { markdown nltk openai - opencv4 + opencv-python-headless openpyxl pandas passlib peewee peewee-migrate psutil - psycopg2 + psycopg2-binary pydub pyjwt pymilvus diff --git a/third_party/nixpkgs/pkgs/by-name/op/openapi-python-client/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openapi-python-client/package.nix index a4445a6a56..171434d7a3 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openapi-python-client/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/op/openctm/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openctm/package.nix index d89640ca82..bb6bd763ea 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openctm/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/op/opengfw/package.nix b/third_party/nixpkgs/pkgs/by-name/op/opengfw/package.nix index ad1b57dcad..0d09f94cc8 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/opengfw/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/op/opengothic/package.nix b/third_party/nixpkgs/pkgs/by-name/op/opengothic/package.nix new file mode 100644 index 0000000000..3c61f32a95 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/op/opengv/package.nix b/third_party/nixpkgs/pkgs/by-name/op/opengv/package.nix index 23b1b7e1d8..3b63873066 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/opengv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/opengv/package.nix @@ -27,14 +27,16 @@ stdenv.mkDerivation (finalAttrs: { description = "Collection of computer vision methods for solving geometric vision problems"; homepage = "https://github.com/laurentkneip/opengv"; license = lib.licenses.bsd2; - longDescription = ''OpenGV is a collection of computer vision methods for solving + longDescription = '' + OpenGV is a collection of computer vision methods for solving geometric vision problems. It contains absolute-pose, relative-pose, triangulation, and point-cloud alignment methods for the calibrated case. All problems can be solved with central or non-central cameras, and embedded into a random sample consensus or nonlinear optimization context. Matlab and Python interfaces are implemented as well. The link to the above pages also shows links to precompiled Matlab mex-libraries. - Please consult the documentation for more information.''; + Please consult the documentation for more information. + ''; maintainers = [ lib.maintainers.locochoco ]; platforms = lib.platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/by-name/op/openjump/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openjump/package.nix index f527bdd11a..56172ace98 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openjump/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/op/openjump/package.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "openjump"; - version = "2.2.1"; - revision = "r5222%5B94156e5%5D"; + version = "2.3.0"; + revision = "r5279%5Bd24616e%5D"; src = fetchurl { url = "mirror://sourceforge/jump-pilot/OpenJUMP/${finalAttrs.version}/OpenJUMP-Portable-${finalAttrs.version}-${finalAttrs.revision}-PLUS.zip"; - hash = "sha256-+/AMmD6NDPy+2Gq1Ji5i/QWGU7FOsU+kKsWoNXcx/VI="; + hash = "sha256-IO44iGnFQt/ir1WlvBrEHjdC+0DZTfJIVAJgRcxrFMI="; }; # TODO: build from source diff --git a/third_party/nixpkgs/pkgs/by-name/op/openpgp-card-tools/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openpgp-card-tools/package.nix index 5ed445a55e..8bd0e1fb5c 100644 --- a/third_party/nixpkgs/pkgs/by-name/op/openpgp-card-tools/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/op/opnborg/package.nix b/third_party/nixpkgs/pkgs/by-name/op/opnborg/package.nix new file mode 100644 index 0000000000..ab5e289280 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/op/opnborg/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "opnborg"; + version = "0.1.24"; + + src = fetchFromGitHub { + owner = "paepckehh"; + repo = "opnborg"; + rev = "v${version}"; + hash = "sha256-lJPu1Ixx1BUWrZ+h6AuxLyVMScKAmcp+sK2duOxC9e0="; + }; + + vendorHash = "sha256-REXJryUcu+/AdVx1aK0nJ98Wq/EdhrZqL24kC1wK6mc="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + changelog = "https://github.com/paepckehh/opnborg/releases/tag/v${version}"; + homepage = "https://paepcke.de/opnborg"; + description = "Sefhosted OPNSense Appliance Backup & Configuration Management Portal"; + license = lib.licenses.bsd3; + mainProgram = "opnborg"; + maintainers = with lib.maintainers; [ paepcke ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/or/orchard/package.nix b/third_party/nixpkgs/pkgs/by-name/or/orchard/package.nix index bf6f04f6a4..e1d7f2564e 100644 --- a/third_party/nixpkgs/pkgs/by-name/or/orchard/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/or/orchard/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = version; - hash = "sha256-N54wkqe05Hm9o+kQmWTJREoU+0GnivaVTJngtBDL8+U="; + hash = "sha256-6w/UcifseoajAOKZnn0GJiUzXAmLNGKLDCZkeZLK8NI="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/third_party/nixpkgs/pkgs/by-name/os/oscar/package.nix b/third_party/nixpkgs/pkgs/by-name/os/oscar/package.nix index cdc9c26732..b32e7e33db 100644 --- a/third_party/nixpkgs/pkgs/by-name/os/oscar/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/os/oscar/package.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "oscar"; - version = "1.5.1"; + version = "1.5.3"; src = fetchFromGitLab { owner = "pholy"; repo = "OSCAR-code"; - rev = "v${version}"; - hash = "sha256-FBHbPtMZeIgcR1pQflfEWK2FS8bquctXaeY/yaZofHg="; + rev = "${version}"; + hash = "sha256-ukd2pni4qEwWxG4lr8KUliZO/R2eziTTuSvDo8uigxQ="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/by-name/ov/overlayed/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ov/overlayed/Cargo.lock index ff8b531c03..44e60ad4e3 100644 --- a/third_party/nixpkgs/pkgs/by-name/ov/overlayed/Cargo.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ov/overlayed/package.nix b/third_party/nixpkgs/pkgs/by-name/ov/overlayed/package.nix index 215b205d78..05cf017825 100644 --- a/third_party/nixpkgs/pkgs/by-name/ov/overlayed/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ov/overlayed/webui.nix b/third_party/nixpkgs/pkgs/by-name/ov/overlayed/webui.nix index 80263ab640..085b3436a9 100644 --- a/third_party/nixpkgs/pkgs/by-name/ov/overlayed/webui.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pa/paratest/composer.lock b/third_party/nixpkgs/pkgs/by-name/pa/paratest/composer.lock index 23177e4e5d..a018f09c24 100644 --- a/third_party/nixpkgs/pkgs/by-name/pa/paratest/composer.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pa/paratest/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/paratest/package.nix index 855db7c079..c4eca0346a 100644 --- a/third_party/nixpkgs/pkgs/by-name/pa/paratest/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pa/parpd/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/parpd/package.nix new file mode 100644 index 0000000000..777c5e72fe --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/radio/pat/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/pat/package.nix similarity index 53% rename from third_party/nixpkgs/pkgs/applications/radio/pat/default.nix rename to third_party/nixpkgs/pkgs/by-name/pa/pat/package.nix index 1f1140e5fd..0352ef2c6c 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/pat/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pa/patch-package/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/patch-package/package.nix new file mode 100644 index 0000000000..7260ca50f8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pa/patch-package/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + nodejs, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "patch-package"; + version = "8.0.0"; + + src = fetchFromGitHub { + owner = "ds300"; + repo = "patch-package"; + rev = "v${finalAttrs.version}"; + hash = "sha256-QuCgdQGqy27wyLUI6w6p8EWLn1XA7QbkjpLJwFXSex8="; + }; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${finalAttrs.src}/yarn.lock"; + hash = "sha256-WF9gJkj4wyrBeGPIzTOw3nG6Se7tFb0YLcAM8Uv9YNI="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Fix broken node modules instantly"; + mainProgram = "patch-package"; + homepage = "https://github.com/ds300/patch-package"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/pd/pdfarranger/package.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdfarranger/package.nix index 8050e5af67..ed832c2be8 100644 --- a/third_party/nixpkgs/pkgs/by-name/pd/pdfarranger/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pe/perf_data_converter/package.nix b/third_party/nixpkgs/pkgs/by-name/pe/perf_data_converter/package.nix index 827be3d7d2..be0943a2f1 100644 --- a/third_party/nixpkgs/pkgs/by-name/pe/perf_data_converter/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pe/perf_data_converter/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildBazelPackage, fetchFromGitHub, bazel_6, @@ -8,25 +9,39 @@ libcap, }: +let + system = stdenv.hostPlatform.system; + registry = fetchFromGitHub { + owner = "bazelbuild"; + repo = "bazel-central-registry"; + rev = "ef34e6bfad5a6ab54080ddcc83a4d65849855e3a"; + hash = "sha256-PhacBegQDwWZqZeoZjoLR4akhVV3QrSPr1KflCuied0="; + }; +in buildBazelPackage rec { pname = "perf_data_converter"; - version = "0-unstable-2024-07-25"; + version = "0-unstable-2024-10-14"; src = fetchFromGitHub { owner = "google"; repo = "perf_data_converter"; - rev = "571052793d8c49fd3e93121af548cc8ebd8920f0"; - hash = "sha256-yoWOCSYAfnDVDQ6uwZ30P4p3pgvfmjVQiN9gu5auusY="; + rev = "f76cd4dd1e85bb54d60ea3fe69f92168fdf94edb"; + hash = "sha256-AScXL74K0Eiajdib56+7ay3K/MMWbmeUWkRWMaEJRC8="; }; bazel = bazel_6; bazelFlags = [ - "--java_runtime_version=local_jdk" - "--tool_java_runtime_version=local_jdk" + "--registry" + "file://${registry}" ]; fetchAttrs = { - hash = "sha256-Qm6Ng9cXvKx043P7qyNHyyMvdGK9aNarX1ZKeCp3mgY="; + hash = + { + aarch64-linux = "sha256-gSRSkLGZhHe8o3byZVFsUxXPM+xzetOPhfzkAVTGAUs="; + x86_64-linux = "sha256-ZYjFpdH0oYrJguw16DSJWiXjhfJusG+inShbx/BOrcY="; + } + .${system} or (throw "No hash for system: ${system}"); }; nativeBuildInputs = [ jdk ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pi/pipeline/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/pi/pipeline/Cargo.lock new file mode 100644 index 0000000000..10492b6110 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pi/pipeline/Cargo.lock @@ -0,0 +1,2646 @@ +# 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 = "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 = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.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 = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytes" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[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.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +dependencies = [ + "shlex", +] + +[[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 = "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", + "serde", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[package]] +name = "clapper" +version = "0.1.0" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#530b6fd53a60563d8038f7a1d9d735d6dc496adb" +dependencies = [ + "bitflags 2.6.0", + "clapper-sys", + "gio", + "glib", + "gstreamer", + "libc", +] + +[[package]] +name = "clapper-gtk" +version = "0.1.0" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#530b6fd53a60563d8038f7a1d9d735d6dc496adb" +dependencies = [ + "bitflags 2.6.0", + "clapper", + "clapper-gtk-sys", + "gdk4", + "gio", + "glib", + "gtk4", + "libc", +] + +[[package]] +name = "clapper-gtk-sys" +version = "0.0.1" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#530b6fd53a60563d8038f7a1d9d735d6dc496adb" +dependencies = [ + "clapper-sys", + "gio-sys", + "glib-sys", + "gtk4-sys", + "libc", + "system-deps 7.0.2", +] + +[[package]] +name = "clapper-sys" +version = "0.0.1" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#530b6fd53a60563d8038f7a1d9d735d6dc496adb" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "gstreamer-sys", + "libc", + "system-deps 6.2.2", +] + +[[package]] +name = "colorchoice" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" + +[[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 = "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 = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[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 = "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 = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[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 = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "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", + "libc", + "wasi", +] + +[[package]] +name = "gettext-rs" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a6716b8a0db461a2720b850ba1623e5b69e4b1aa0224cf5e1fb23a0fe49e65c" +dependencies = [ + "gettext-sys", + "locale_config", +] + +[[package]] +name = "gettext-sys" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7b8797f28f2dabfbe2caadb6db4f7fd739e251b5ede0a2ba49e506071edcf67" +dependencies = [ + "cc", + "temp-dir", +] + +[[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", +] + +[[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 = "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 = "gstreamer" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683e15f8cc3a1a2646d9fe2181a58b7abb4c166256d8d15cce368e420c741140" +dependencies = [ + "cfg-if", + "futures-channel", + "futures-core", + "futures-util", + "glib", + "gstreamer-sys", + "itertools", + "libc", + "muldiv", + "num-integer", + "num-rational", + "once_cell", + "option-operations", + "paste", + "pin-project-lite", + "smallvec", + "thiserror", +] + +[[package]] +name = "gstreamer-sys" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c9005b55dd2b1784645963c1ec409f9d420a56f6348d0ae69c2eaff584bcc3" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "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", +] + +[[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 = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 2.5.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[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" +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 0.14.5", +] + +[[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 = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +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 = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +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.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 = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[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 = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[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.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.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 = "libadwaita" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ff9c222b5c783729de45185f07b2fec2d43a7f9c63961e777d3667e20443878" +dependencies = [ + "gdk4", + "gio", + "glib", + "gtk4", + "libadwaita-sys", + "libc", + "pango", +] + +[[package]] +name = "libadwaita-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c44d8bdbad31d6639e1f20cc9c1424f1a8e02d751fc28d44659bf743fb9eca6" +dependencies = [ + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "pango-sys", + "system-deps 7.0.2", +] + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libsqlite3-sys" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" +dependencies = [ + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + +[[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 = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[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 = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +dependencies = [ + "adler", +] + +[[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 = "muldiv" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" + +[[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 = "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.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "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 = "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 = "openssl" +version = "0.10.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "foreign-types", + "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", +] + +[[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.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-operations" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0" +dependencies = [ + "paste", +] + +[[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 = "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 = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[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.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 = "piped-openapi-sdk" +version = "1.0.0" +source = "git+https://gitlab.com/schmiddi-on-mobile/piped-rs#47e962fae9563e9a4b5a97756a448146b2b02413" +dependencies = [ + "reqwest", + "serde", + "serde_derive", + "serde_json", + "serde_with", + "url", + "uuid", +] + +[[package]] +name = "pipeline-api" +version = "0.1.0" +source = "git+https://gitlab.com/schmiddi-on-mobile/pipeline-backend?rev=1b0071771bfb40abf7b462ceae65f804ef4f884d#1b0071771bfb40abf7b462ceae65f804ef4f884d" +dependencies = [ + "futures", + "log", + "pipeline-core", +] + +[[package]] +name = "pipeline-core" +version = "0.1.0" +source = "git+https://gitlab.com/schmiddi-on-mobile/pipeline-backend?rev=1b0071771bfb40abf7b462ceae65f804ef4f884d#1b0071771bfb40abf7b462ceae65f804ef4f884d" +dependencies = [ + "async-stream", + "chrono", + "futures", + "url", +] + +[[package]] +name = "pipeline-provider-peertube" +version = "0.1.0" +source = "git+https://gitlab.com/schmiddi-on-mobile/pipeline-backend?rev=1b0071771bfb40abf7b462ceae65f804ef4f884d#1b0071771bfb40abf7b462ceae65f804ef4f884d" +dependencies = [ + "async-stream", + "chrono", + "futures", + "pipeline-core", + "reqwest", + "serde", + "serde_json", + "url", +] + +[[package]] +name = "pipeline-provider-piped" +version = "0.1.0" +source = "git+https://gitlab.com/schmiddi-on-mobile/pipeline-backend?rev=1b0071771bfb40abf7b462ceae65f804ef4f884d#1b0071771bfb40abf7b462ceae65f804ef4f884d" +dependencies = [ + "async-stream", + "chrono", + "futures", + "log", + "piped-openapi-sdk", + "pipeline-core", + "reqwest", + "tokio", + "url", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[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 = "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 = "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 = "reqwest" +version = "0.11.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "rusqlite" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" +dependencies = [ + "bitflags 2.6.0", + "chrono", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", + "url", +] + +[[package]] +name = "rusqlite_migration" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55709bc01054c69e2f1cefdc886642b5e6376a8db3c86f761be0c423eebf178b" +dependencies = [ + "log", + "rusqlite", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[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 = "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 = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "schannel" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[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" +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 = "serde_spanned" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +dependencies = [ + "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 = "serde_with" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +dependencies = [ + "base64 0.13.1", + "chrono", + "hex", + "indexmap 1.9.3", + "serde", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[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 = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[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 = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[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]] +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 = "temp-dir" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" + +[[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 = "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", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[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.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +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", +] + +[[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", +] + +[[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 = "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.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +dependencies = [ + "indexmap 2.5.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[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 = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "tubefeeder" +version = "2.0.2" +dependencies = [ + "chrono", + "clapper", + "clapper-gtk", + "csv", + "env_logger", + "futures", + "gdk4", + "gettext-rs", + "glib", + "gtk4", + "libadwaita", + "log", + "once_cell", + "pipeline-api", + "pipeline-core", + "pipeline-provider-peertube", + "pipeline-provider-piped", + "reqwest", + "rusqlite", + "rusqlite_migration", + "serde", + "serde_json", + "tokio", + "url", +] + +[[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-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[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 = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.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", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[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", + "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-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +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-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 = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +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 = "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/third_party/nixpkgs/pkgs/by-name/pi/pipeline/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/pipeline/package.nix new file mode 100644 index 0000000000..4aef16227c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pi/pipeline/package.nix @@ -0,0 +1,103 @@ +{ + lib, + stdenv, + rustPlatform, + cargo, + rustc, + fetchFromGitLab, + gtk4, + libadwaita, + openssl, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + glib, + appstream-glib, + desktop-file-utils, + blueprint-compiler, + sqlite, + clapper, + gst_all_1, + gtuber, + glib-networking, + gnome, + webp-pixbuf-loader, + librsvg, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pipeline"; + version = "2.0.2"; + + src = fetchFromGitLab { + owner = "schmiddi-on-mobile"; + repo = "pipeline"; + rev = "v${finalAttrs.version}"; + hash = "sha256-8LKd7zZuwo/HtxFo8x8UpO1Y8/DnTZmaOYrc9NmnIrc="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "clapper-0.1.0" = "sha256-IFFqfSq2OpzfopQXSYfnJ68HGLY+rvcLqk7NTdDd+28="; + "piped-openapi-sdk-1.0.0" = "sha256-UFzMYYqCzO6KyJvjvK/hBJtz3FOuSC2gWjKp72WFEGk="; + "pipeline-api-0.1.0" = "sha256-h094ZAJOqX9QC1EUAtzIVztudhndXglkYLcFbH/mpqQ="; + }; + }; + + nativeBuildInputs = [ + meson + ninja + cargo + rustPlatform.cargoSetupHook + rustc + pkg-config + wrapGAppsHook4 + glib + appstream-glib + desktop-file-utils + blueprint-compiler + ]; + + buildInputs = [ + gtk4 + libadwaita + openssl + sqlite + clapper + + gst_all_1.gstreamer + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) + gst_all_1.gst-plugins-bad + gtuber + glib-networking # For GIO_EXTRA_MODULES. Fixes "TLS support is not available" + ]; + + # Pull in WebP support for YouTube avatars. + # In postInstall to run before gappsWrapperArgsHook. + postInstall = '' + export GDK_PIXBUF_MODULE_FILE="${ + gnome._gdkPixbufCacheBuilder_DO_NOT_USE { + extraLoaders = [ + webp-pixbuf-loader + librsvg + ]; + } + }" + ''; + + passthru.updateScript = nix-update-script { attrPath = finalAttrs.pname; }; + + meta = { + description = "Watch YouTube and PeerTube videos in one place"; + homepage = "https://mobile.schmidhuberj.de/pipeline"; + mainProgram = "tubefeeder"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ chuangzhu ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/pi/pixi/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/pi/pixi/Cargo.lock index 13031bdfe9..a67d68e188 100644 --- a/third_party/nixpkgs/pkgs/by-name/pi/pixi/Cargo.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pi/pixi/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/pixi/package.nix index 70651e5085..b82ae5bb76 100644 --- a/third_party/nixpkgs/pkgs/by-name/pi/pixi/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pl/plasmusic-toolbar/package.nix b/third_party/nixpkgs/pkgs/by-name/pl/plasmusic-toolbar/package.nix index 28c991a763..151527ff3c 100644 --- a/third_party/nixpkgs/pkgs/by-name/pl/plasmusic-toolbar/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pm/pmtiles/package.nix b/third_party/nixpkgs/pkgs/by-name/pm/pmtiles/package.nix index 47afc221df..964386dfbb 100644 --- a/third_party/nixpkgs/pkgs/by-name/pm/pmtiles/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/po/podlet/package.nix b/third_party/nixpkgs/pkgs/by-name/po/podlet/package.nix new file mode 100644 index 0000000000..c759da0321 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/po/polybar-pulseaudio-control/package.nix b/third_party/nixpkgs/pkgs/by-name/po/polybar-pulseaudio-control/package.nix index a4063dd34f..44067422bf 100644 --- a/third_party/nixpkgs/pkgs/by-name/po/polybar-pulseaudio-control/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/po/pop-launcher/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/po/pop-launcher/Cargo.lock new file mode 100644 index 0000000000..1a2305c7e6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/po/pop-launcher/Cargo.lock @@ -0,0 +1,3297 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[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 = "anyhow" +version = "1.0.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" + +[[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-strategy", + "futures-core", + "pin-project-lite", +] + +[[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.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", + "slab", +] + +[[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", + "blocking", + "futures-lite 2.3.0", +] + +[[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", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.3", + "rustix 0.38.37", + "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-oneshot" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae47de2a02d543205f3f5457a90b6ecbc9494db70557bd29590ec8f1ddff5463" +dependencies = [ + "futures-micro", +] + +[[package]] +name = "async-pidfd" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12177058299bb8e3507695941b6d0d7dc0e4e6515b8bc1bf4609d9e32ef51799" +dependencies = [ + "async-io 1.13.0", + "libc", +] + +[[package]] +name = "async-process" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" +dependencies = [ + "async-channel", + "async-io 2.3.4", + "async-lock 3.4.0", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener 5.3.1", + "futures-lite 2.3.0", + "rustix 0.38.37", + "tracing", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[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.37", + "signal-hook-registry", + "slab", + "windows-sys 0.59.0", +] + +[[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.79", +] + +[[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.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[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 = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[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 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 = "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.79", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + +[[package]] +name = "bytes" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" + +[[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 3.7.3", + "rustix 0.38.37", + "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 0.38.37", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "cc" +version = "1.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfb" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" +dependencies = [ + "byteorder", + "fnv", + "uuid", +] + +[[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", + "serde", + "wasm-bindgen", + "windows-targets 0.52.6", +] + +[[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 = "const_format" +version = "0.2.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b" +dependencies = [ + "const_format_proc_macros", +] + +[[package]] +name = "const_format_proc_macros" +version = "0.2.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "cosmic-client-toolkit" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-protocols#91aeb55052a8e6e15a7ddd53e039a9350f16fa69" +dependencies = [ + "cosmic-protocols", + "libc", + "smithay-client-toolkit", + "wayland-client", +] + +[[package]] +name = "cosmic-protocols" +version = "0.1.0" +source = "git+https://github.com/pop-os/cosmic-protocols#91aeb55052a8e6e15a7ddd53e039a9350f16fa69" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "wayland-server", +] + +[[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 = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.79", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs" +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 = "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 = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "enumflags2" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[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 = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[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 = "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[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 = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "fork" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60e74d3423998a57e9d906e49252fb79eb4a04d5cdfe188fb1b7ff9fc076a8ed" +dependencies = [ + "libc", +] + +[[package]] +name = "fork" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05dc8b302e04a1c27f4fe694439ef0f29779ca4edc205b7b58f00db04e29656d" +dependencies = [ + "libc", +] + +[[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 = "freedesktop-desktop-entry" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e33809936d2fa9ac78750c5c04696a7aabdb09f928454957c77a2c8247f5ff98" +dependencies = [ + "dirs", + "gettext-rs", + "log", + "memchr", + "strsim", + "textdistance", + "thiserror", + "xdg", +] + +[[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 = "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.1", + "futures-core", + "futures-io", + "parking", + "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.79", +] + +[[package]] +name = "futures-micro" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b460264b3593d68b16a7bc35f7bc226ddfebdf9a1c8db1ed95d5cc6b7168c826" +dependencies = [ + "pin-project-lite", +] + +[[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 = "futures_codec" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce54d63f8b0c75023ed920d46fd71d0cbbb830b0ee012726b5b4f506fb6dea5b" +dependencies = [ + "bytes 0.5.6", + "futures", + "memchr", + "pin-project", +] + +[[package]] +name = "gen-z" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e87038e64f38cb7fcd57f54c8d6654ad65712babbf70f38d1834d3150ad2415" +dependencies = [ + "futures", +] + +[[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", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gettext-rs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" +dependencies = [ + "gettext-sys", + "locale_config", +] + +[[package]] +name = "gettext-sys" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" +dependencies = [ + "cc", + "temp-dir", +] + +[[package]] +name = "gimli" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + +[[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 = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes 1.7.2", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes 1.7.2", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes 1.7.2", + "futures-util", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" + +[[package]] +name = "human-sort" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140a09c9305e6d5e557e2ed7cbc68e05765a7d4213975b87cb04920689cc6219" + +[[package]] +name = "human_format" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c3b1f728c459d27b12448862017b96ad4767b1ec2ec5e6434e99f1577f085b8" + +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes 1.7.2", + "futures-channel", + "futures-util", + "http", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +dependencies = [ + "bytes 1.7.2", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower-service", + "tracing", +] + +[[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 = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[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 = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[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", + "serde", +] + +[[package]] +name = "infer" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc150e5ce2330295b8616ce0e3f53250e53af31759a9dbedad1621ba29151847" +dependencies = [ + "cfb", +] + +[[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 = "io-lifetimes" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c" + +[[package]] +name = "ipnet" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" + +[[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.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[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.161" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" + +[[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.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 = "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 = "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 = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] + +[[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 = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[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 = "mimalloc" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633" +dependencies = [ + "libmimalloc-sys", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + +[[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 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] +name = "new_mime_guess" +version = "4.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02a2dfb3559d53e90b709376af1c379462f7fb3085a0177deb73e6ea0d99eff4" +dependencies = [ + "mime", + "unicase", +] + +[[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", + "memoffset", +] + +[[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 0.3.9", + "libc", +] + +[[package]] +name = "numtoa" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aa2c4e539b869820a2b82e1aef6ff40aa85e65decdd5185e83fb4b1249cd00f" + +[[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 = "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.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + +[[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 = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ef0f924a5ee7ea9cbcea77529dba45f8a9ba9f622419fe3386ca581a3ae9d5a" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "851c8d0ce9bebe43790dedfc86614c23494ac9f423dd618d3a61fc693eafe61e" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[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.1", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +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", +] + +[[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.37", + "tracing", + "windows-sys 0.59.0", +] + +[[package]] +name = "pop-launcher" +version = "1.2.4" +dependencies = [ + "const_format", + "dirs", + "futures", + "serde", + "serde_json", + "serde_with", + "tokio", + "tokio-stream", +] + +[[package]] +name = "pop-launcher-bin" +version = "1.2.4" +dependencies = [ + "dirs", + "mimalloc", + "pop-launcher-toolkit", + "tokio", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "pop-launcher-plugins" +version = "1.2.4" +dependencies = [ + "anyhow", + "async-pidfd", + "bytes 1.7.2", + "cosmic-client-toolkit", + "dirs", + "flume", + "fork 0.2.0", + "freedesktop-desktop-entry", + "futures", + "human-sort", + "human_format", + "new_mime_guess", + "pop-launcher", + "recently-used-xbel", + "regex", + "reqwest", + "ron", + "serde", + "serde_json", + "slab", + "smithay-client-toolkit", + "strsim", + "switcheroo-control", + "sysfs-class", + "tokio", + "tracing", + "url", + "urlencoding", + "zbus", + "zvariant", +] + +[[package]] +name = "pop-launcher-service" +version = "1.2.4" +dependencies = [ + "anyhow", + "async-oneshot", + "async-trait", + "dirs", + "flume", + "futures", + "futures_codec", + "gen-z", + "num_cpus", + "pop-launcher", + "regex", + "ron", + "serde", + "serde_json", + "serde_with", + "slab", + "strsim", + "tokio", + "tokio-stream", + "toml", + "tracing", +] + +[[package]] +name = "pop-launcher-toolkit" +version = "1.2.4" +dependencies = [ + "async-trait", + "dirs", + "fork 0.1.23", + "futures", + "pop-launcher", + "pop-launcher-plugins", + "pop-launcher-service", + "tokio", + "tracing", + "tracing-subscriber", +] + +[[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.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.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.36.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "quinn" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +dependencies = [ + "bytes 1.7.2", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "socket2 0.5.7", + "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 1.7.2", + "rand", + "ring", + "rustc-hash", + "rustls", + "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 0.5.7", + "tracing", + "windows-sys 0.59.0", +] + +[[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 = "recently-used-xbel" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "079a81183e41e5cf17fd9ec55db30d6be6cddfad7fd619862efac27f1be28c9b" +dependencies = [ + "chrono", + "dirs", + "infer", + "mime_guess", + "quick-xml 0.36.2", + "serde", + "thiserror", + "url", +] + +[[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.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", +] + +[[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.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 = "reqwest" +version = "0.12.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" +dependencies = [ + "base64 0.22.1", + "bytes 1.7.2", + "futures-core", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls", + "rustls-pemfile", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-rustls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "windows-registry", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64 0.21.7", + "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 = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + +[[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 1.0.11", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[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 0.4.14", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.23.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +dependencies = [ + "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.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[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 = "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 2.0.79", +] + +[[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 = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "serde_spanned" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +dependencies = [ + "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 = "serde_with" +version = "3.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" +dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.6.0", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "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 = "smithay-client-toolkit" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" +dependencies = [ + "bitflags 2.6.0", + "bytemuck", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "libc", + "log", + "memmap2 0.9.4", + "pkg-config", + "rustix 0.38.37", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "xkbcommon", + "xkeysym", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +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 = "strsim" +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 = "switcheroo-control" +version = "0.1.0" +source = "git+https://github.com/pop-os/dbus-settings-bindings#931f5db558bf3fcb572ff4e18f7f1618a7430046" +dependencies = [ + "zbus", +] + +[[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.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] + +[[package]] +name = "sysfs-class" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e1bbcf869732c45a77898f7f61ed6d411dfc37613517e444842f58d428856d1" +dependencies = [ + "numtoa", +] + +[[package]] +name = "temp-dir" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" + +[[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", + "once_cell", + "rustix 0.38.37", + "windows-sys 0.59.0", +] + +[[package]] +name = "textdistance" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d321c8576c2b47e43953e9cce236550d4cd6af0a6ce518fe084340082ca6037b" + +[[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 2.0.79", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[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.40.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +dependencies = [ + "backtrace", + "bytes 1.7.2", + "libc", + "mio", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.7", + "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.79", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[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 2.6.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[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.79", +] + +[[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 = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "chrono", + "matchers", + "once_cell", + "regex", + "sharded-slab", + "thread_local", + "tracing", + "tracing-core", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset", + "tempfile", + "winapi", +] + +[[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-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 = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "uuid" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "waker-fn" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.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.79", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[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.79", + "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 = "wayland-backend" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07" +dependencies = [ + "cc", + "downcast-rs", + "rustix 0.38.37", + "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.6.0", + "rustix 0.38.37", + "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.6.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 0.38.37", + "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.6.0", + "wayland-backend", + "wayland-client", + "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.6.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 0.31.0", + "quote", +] + +[[package]] +name = "wayland-server" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63e89118bd072ba6ce0f9c2c92fa41f72d1d78a138d2abc497a80a8264565559" +dependencies = [ + "bitflags 2.6.0", + "downcast-rs", + "io-lifetimes 2.0.3", + "rustix 0.38.37", + "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.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.26.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + +[[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]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "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 = "winnow" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +dependencies = [ + "memchr", +] + +[[package]] +name = "xcursor" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" + +[[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + +[[package]] +name = "xdg-home" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + +[[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 = "zbus" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io 2.3.4", + "async-lock 3.4.0", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "enumflags2", + "event-listener 5.3.1", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.79", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "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.79", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zvariant" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.79", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.79", +] diff --git a/third_party/nixpkgs/pkgs/by-name/po/pop-launcher/package.nix b/third_party/nixpkgs/pkgs/by-name/po/pop-launcher/package.nix index 4d3c9a31cc..4e98ec2d33 100644 --- a/third_party/nixpkgs/pkgs/by-name/po/pop-launcher/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/po/pop-launcher/package.nix @@ -1,22 +1,64 @@ -{ rustPlatform -, fetchFromGitHub -, lib -, fd -, libqalculate +{ + stdenv, + rustPlatform, + fetchFromGitHub, + lib, + just, + pkg-config, + fd, + libqalculate, + libxkbcommon, }: rustPlatform.buildRustPackage rec { pname = "pop-launcher"; - version = "1.2.1"; + version = "1.2.4"; src = fetchFromGitHub { owner = "pop-os"; repo = "launcher"; rev = version; - hash = "sha256-BQAO9IodZxGgV8iBmUaOF0yDbAMVDFslKCqlh3pBnb0="; + hash = "sha256-CLpquNgdtnGMlMpGLv72WZmizalvYPfMWlE/qLprVrs="; }; + nativeBuildInputs = [ + just + pkg-config + ]; + buildInputs = [ + libxkbcommon + ]; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "cosmic-client-toolkit-0.1.0" = "sha256-6XM6kcM2CEGAziCkal4uO0EL1nEWOKb3rFs7hFh6r7Y="; + "switcheroo-control-0.1.0" = "sha256-mklNPKVMO6iFrxki2DwiL5K78KiWpGxksisYldaASIE="; + }; + }; + cargoBuildFlags = [ + "--package" + "pop-launcher-bin" + ]; + cargoTestFlags = [ + "--package" + "pop-launcher-bin" + ]; + + dontUseJustBuild = true; + dontUseJustCheck = true; + justFlags = [ + "--set" + "base-dir" + (placeholder "out") + "--set" + "target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release" + ]; + postPatch = '' + substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)" + substituteInPlace src/lib.rs \ --replace-fail '/usr/lib/pop-launcher' "$out/share/pop-launcher" substituteInPlace plugins/src/scripts/mod.rs \ @@ -29,28 +71,6 @@ rustPlatform.buildRustPackage rec { --replace-fail '/usr/bin/gnome-terminal' 'gnome-terminal' ''; - cargoHash = "sha256-cTvrq0fH057UIx/O9u8zHMsg+psMGg1q9klV5OMxtok="; - - cargoBuildFlags = [ "--package" "pop-launcher-bin" ]; - - postInstall = '' - mv $out/bin/pop-launcher{-bin,} - - plugins_dir=$out/share/pop-launcher/plugins - scripts_dir=$out/share/pop-launcher/scripts - mkdir -p $plugins_dir $scripts_dir - - for plugin in $(find plugins/src -mindepth 1 -maxdepth 1 -type d -printf '%f\n'); do - mkdir $plugins_dir/$plugin - cp plugins/src/$plugin/*.ron $plugins_dir/$plugin - ln -sf $out/bin/pop-launcher $plugins_dir/$plugin/$(echo $plugin | sed 's/_/-/') - done - - for script in scripts/*; do - cp -r $script $scripts_dir - done - ''; - meta = with lib; { description = "Modular IPC-based desktop launcher service"; homepage = "https://github.com/pop-os/launcher"; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/preserves-tools/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/preserves-tools/package.nix index 170184efe7..9ea3dfb2de 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/preserves-tools/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/preserves-tools/package.nix @@ -1,19 +1,32 @@ -{ lib, rustPlatform, fetchCrate }: +{ + lib, + stdenv, + rustPlatform, + fetchCrate, + installShellFiles, +}: rustPlatform.buildRustPackage rec { pname = "preserves-tools"; - version = "4.994.0"; + version = "4.996.1"; src = fetchCrate { inherit pname version; - hash = "sha256-+I2uxdAe4SHg8ZLRvkIUr862FH6GvCwnyhxcCPD3JBA="; + hash = "sha256-Uyh5mXCypX3TDxxJtnTe6lBoVI8aqdG56ywn7htDGUY="; }; - cargoHash = "sha256-09uxXD9EZzzk42tBYbuqaLRFyGmOUuvC7G0XMDjsK6E="; + cargoHash = "sha256-rDo/jA4b+GV90SKM82JcGTX1pcAQUeBrLvGwU/geGOw="; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd preserves-tool \ + --bash <($out/bin/preserves-tool completions bash) \ + --fish <($out/bin/preserves-tool completions fish) \ + --zsh <($out/bin/preserves-tool completions zsh) + ''; meta = { - description = - "Command-line utilities for working with Preserves documents"; + description = "Command-line utilities for working with Preserves documents"; homepage = "https://preserves.dev/doc/preserves-tool.html"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ehmry ]; diff --git a/third_party/nixpkgs/pkgs/by-name/pr/pretalx/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/pretalx/package.nix index c0b5c56fbc..78fdd3f34b 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/pretalx/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix index b09f342e20..19dc354aee 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix @@ -35,13 +35,13 @@ assert lib.assertMsg ( stdenv.mkDerivation (finalAttrs: { pname = "prismlauncher-unwrapped"; - version = "9.0"; + version = "9.1"; src = fetchFromGitHub { owner = "PrismLauncher"; repo = "PrismLauncher"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-EFpZ3V8wm7q7iwUJg0kKdZzOviWKsCji0jgYrrrKSI0="; + hash = "sha256-LVrWFBsI4+BOY5hlevfzqfRXQM6AFd5bMnXbBqTrxzA="; }; postUnpack = '' diff --git a/third_party/nixpkgs/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix new file mode 100644 index 0000000000..4b8d9c16c9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/pr/prometheus-klipper-exporter/package.nix @@ -0,0 +1,34 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nixosTests, +}: + +buildGoModule rec { + pname = "prometheus-klipper-exporter"; + version = "0.11.2"; + + src = fetchFromGitHub { + owner = "scross01"; + repo = "prometheus-klipper-exporter"; + rev = "v${version}"; + sha256 = "sha256-ow7bzgaY4pYccslITlkNBKfZBJv9uwPk25I1Y3bnjbU="; + }; + + vendorHash = "sha256-0nbLHZ2WMLMK0zKZuUYz355K01Xspn9svmlFCtQjed0="; + + doCheck = true; + + passthru.tests = { + inherit (nixosTests.prometheus-exporters) process; + }; + + meta = with lib; { + description = " Prometheus Exporter for Klipper "; + homepage = "https://github.com/scross01/prometheus-klipper-exporter"; + license = licenses.mit; + maintainers = with maintainers; [ wulfsta ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix b/third_party/nixpkgs/pkgs/by-name/pr/prometheus-pushgateway/package.nix similarity index 87% rename from third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix rename to third_party/nixpkgs/pkgs/by-name/pr/prometheus-pushgateway/package.nix index cc8e11ade6..fde0bab369 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix b/third_party/nixpkgs/pkgs/by-name/pr/prometheus/package.nix similarity index 95% rename from third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix rename to third_party/nixpkgs/pkgs/by-name/pr/prometheus/package.nix index 6d3e32640f..d3145ad707 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-elixir/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-elixir/package.nix index 8e38f33176..0bc5b5032b 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-elixir/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pr/proton-ge-bin/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/proton-ge-bin/package.nix index 81262e2cf0..fa152d3aeb 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pr/prowler/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/prowler/package.nix index de0cfe6a26..b24b00a534 100644 --- a/third_party/nixpkgs/pkgs/by-name/pr/prowler/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pu/puffin/package.nix b/third_party/nixpkgs/pkgs/by-name/pu/puffin/package.nix new file mode 100644 index 0000000000..ac3959e111 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pu/pulumi-esc/package.nix b/third_party/nixpkgs/pkgs/by-name/pu/pulumi-esc/package.nix index b9fc15444e..a0417b5c2f 100644 --- a/third_party/nixpkgs/pkgs/by-name/pu/pulumi-esc/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pu/pulumi-esc/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "pulumi-esc"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "pulumi"; repo = "esc"; rev = "v${version}"; - hash = "sha256-SeHO8N8NwAF4f6Eo46V2mBElVgJc5ijVrjsBHWtUMc0="; + hash = "sha256-/H2HFjq/CpY5/xj9tqr+1Qo1nD06joahvbIiu16DLrs="; }; subPackages = "cmd/esc"; - vendorHash = "sha256-xJtlTyhGyoxefE2pFcLGHMapn9L2F/PKuNt49J41viE="; + vendorHash = "sha256-T9DUgfYpu1xXekMxzlr2VwmPSkD/sPml+G0KaFeeAWA="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/by-name/pu/pupdate/package.nix b/third_party/nixpkgs/pkgs/by-name/pu/pupdate/package.nix index decad3e4f7..2c3121a39b 100644 --- a/third_party/nixpkgs/pkgs/by-name/pu/pupdate/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/pu/pupdate/package.nix @@ -5,7 +5,6 @@ , dotnetCorePackages , openssl , zlib -, hostPlatform , nix-update-script }: @@ -30,7 +29,7 @@ buildDotnetModule rec { patches = [ ./add-runtime-identifier.patch ]; postPatch = '' substituteInPlace pupdate.csproj \ - --replace @RuntimeIdentifier@ "${dotnetCorePackages.systemToDotnetRid hostPlatform.system}" + --replace @RuntimeIdentifier@ "${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}" ''; projectFile = "pupdate.csproj"; diff --git a/third_party/nixpkgs/pkgs/tools/security/pwncat/default.nix b/third_party/nixpkgs/pkgs/by-name/pw/pwncat/package.nix similarity index 50% rename from third_party/nixpkgs/pkgs/tools/security/pwncat/default.nix rename to third_party/nixpkgs/pkgs/by-name/pw/pwncat/package.nix index 98b782bf19..12b54f3a47 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pwncat/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/py/pychess/package.nix b/third_party/nixpkgs/pkgs/by-name/py/pychess/package.nix new file mode 100644 index 0000000000..fdf109bb15 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/py/pychess/package.nix @@ -0,0 +1,74 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + pkg-config, + gobject-introspection, + wrapGAppsHook3, + gtk3, + gst_all_1, + gtksourceview, +}: + +python3Packages.buildPythonApplication rec { + pname = "pychess"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "pychess"; + repo = "pychess"; + rev = "${version}"; + hash = "sha256-hxc+vYvCeiM0+oOu1peI9qkZg5PeIsDMCiydJQAuzOk="; + }; + + nativeBuildInputs = [ + pkg-config + gobject-introspection + wrapGAppsHook3 + ]; + + buildInputs = [ + gtk3 + gst_all_1.gst-plugins-base + gtksourceview + ]; + + propagatedBuildInputs = with python3Packages; [ + pygobject3 + pycairo + sqlalchemy + pexpect + psutil + websockets + ptyprocess + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + preBuild = '' + export HOME=$(mktemp -d) + export PYTHONPATH=./lib:$PYTHONPATH + python pgn2ecodb.py + python create_theme_preview.py + ''; + + postInstall = '' + cp -r $out/share/pychess/* $out/lib/python*/ + ''; + + # No tests available. + doCheck = false; + + meta = { + description = "Advanced GTK chess client written in Python"; + homepage = "https://pychess.github.io/"; + mainProgram = "pychess"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ lgbishop ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/by-name/py/pyditz/package.nix b/third_party/nixpkgs/pkgs/by-name/py/pyditz/package.nix new file mode 100644 index 0000000000..4e8da8bb29 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/py/pyradio/package.nix b/third_party/nixpkgs/pkgs/by-name/py/pyradio/package.nix index 4c1077dd75..85ccaedd97 100644 --- a/third_party/nixpkgs/pkgs/by-name/py/pyradio/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/py/pytr/package.nix b/third_party/nixpkgs/pkgs/by-name/py/pytr/package.nix index 4e6d13cd71..6c1e92a941 100644 --- a/third_party/nixpkgs/pkgs/by-name/py/pytr/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/q2/q2pro/package.nix b/third_party/nixpkgs/pkgs/by-name/q2/q2pro/package.nix new file mode 100644 index 0000000000..de838ef82f --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/qq/qq/package.nix b/third_party/nixpkgs/pkgs/by-name/qq/qq/package.nix index 6615c4133f..66321e3b4d 100644 --- a/third_party/nixpkgs/pkgs/by-name/qq/qq/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/qq/qq/sources.nix b/third_party/nixpkgs/pkgs/by-name/qq/qq/sources.nix index f3783a8ba5..3ff5e1afb0 100644 --- a/third_party/nixpkgs/pkgs/by-name/qq/qq/sources.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ra/railway/package.nix b/third_party/nixpkgs/pkgs/by-name/ra/railway/package.nix index 18a0246cfa..a31b2ae9ec 100644 --- a/third_party/nixpkgs/pkgs/by-name/ra/railway/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ra/rainfrog/package.nix b/third_party/nixpkgs/pkgs/by-name/ra/rainfrog/package.nix index ffc47f38de..4f9b3b5623 100644 --- a/third_party/nixpkgs/pkgs/by-name/ra/rainfrog/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/readarr/default.nix b/third_party/nixpkgs/pkgs/by-name/re/readarr/package.nix similarity index 79% rename from third_party/nixpkgs/pkgs/servers/readarr/default.nix rename to third_party/nixpkgs/pkgs/by-name/re/readarr/package.nix index 3a67b592fc..dc1ebb8c7a 100644 --- a/third_party/nixpkgs/pkgs/servers/readarr/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/readarr/update.sh b/third_party/nixpkgs/pkgs/by-name/re/readarr/update.sh similarity index 89% rename from third_party/nixpkgs/pkgs/servers/readarr/update.sh rename to third_party/nixpkgs/pkgs/by-name/re/readarr/update.sh index 0372ac9fa1..4334c3aa85 100755 --- a/third_party/nixpkgs/pkgs/servers/readarr/update.sh +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/re/rectangle/package.nix b/third_party/nixpkgs/pkgs/by-name/re/rectangle/package.nix index 4b0ccc0109..8690439df1 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/rectangle/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/re/redocly/package.nix b/third_party/nixpkgs/pkgs/by-name/re/redocly/package.nix index fe53529c18..7eb4b8d063 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/redocly/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/re/remctl/package.nix b/third_party/nixpkgs/pkgs/by-name/re/remctl/package.nix new file mode 100644 index 0000000000..b354440de8 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/re/remind/package.nix b/third_party/nixpkgs/pkgs/by-name/re/remind/package.nix index bbeadc7773..eb01ac3c88 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/remind/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/re/repak/package.nix b/third_party/nixpkgs/pkgs/by-name/re/repak/package.nix new file mode 100644 index 0000000000..dd52b9858f --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/re/revpfw3/package.nix b/third_party/nixpkgs/pkgs/by-name/re/revpfw3/package.nix index d7ae4ac43f..6858f84354 100644 --- a/third_party/nixpkgs/pkgs/by-name/re/revpfw3/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ro/rockcraft/package.nix b/third_party/nixpkgs/pkgs/by-name/ro/rockcraft/package.nix index 5d54a81b5f..aff67bc264 100644 --- a/third_party/nixpkgs/pkgs/by-name/ro/rockcraft/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ro/rockcraft/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "rockcraft"; - version = "1.5.3"; + version = "1.6.0"; src = fetchFromGitHub { owner = "canonical"; diff --git a/third_party/nixpkgs/pkgs/by-name/ro/rofi-games/fix-justfile.patch b/third_party/nixpkgs/pkgs/by-name/ro/rofi-games/fix-justfile.patch new file mode 100644 index 0000000000..05d0ab946c --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ro/rofi-games/package.nix b/third_party/nixpkgs/pkgs/by-name/ro/rofi-games/package.nix new file mode 100644 index 0000000000..4f85dbfc15 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/misc/rpiboot/default.nix b/third_party/nixpkgs/pkgs/by-name/rp/rpiboot/package.nix similarity index 53% rename from third_party/nixpkgs/pkgs/development/misc/rpiboot/default.nix rename to third_party/nixpkgs/pkgs/by-name/rp/rpiboot/package.nix index 53b8c0326b..424132d636 100644 --- a/third_party/nixpkgs/pkgs/development/misc/rpiboot/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/rp/rpiboot/package.nix @@ -1,14 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, libusb1, pkg-config }: +{ + lib, + stdenv, + fetchFromGitHub, + libusb1, + pkg-config, +}: stdenv.mkDerivation rec { pname = "rpiboot"; - version = "20221215-105525"; + version = "20240926-102326"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "usbboot"; rev = version; - hash = "sha256-Y77IrDblXmnpZleJ3zTyiGDYLZ7gNxASXpqUzwS1NCU="; + hash = "sha256-9m7PAw1WNQlfqOr5hDXrCsZlZLBmvoGUT58NN2cVolw="; }; buildInputs = [ libusb1 ]; @@ -22,16 +28,27 @@ stdenv.mkDerivation rec { mkdir -p $out/bin mkdir -p $out/share/rpiboot cp rpiboot $out/bin - cp -r msd $out/share/rpiboot + cp -r msd firmware eeprom-erase mass-storage-gadget* recovery* secure-boot* rpi-imager-embedded $out/share/rpiboot ''; - meta = with lib; { + meta = { homepage = "https://github.com/raspberrypi/usbboot"; changelog = "https://github.com/raspberrypi/usbboot/blob/${version}/debian/changelog"; description = "Utility to boot a Raspberry Pi CM/CM3/CM4/Zero over USB"; mainProgram = "rpiboot"; - license = licenses.asl20; - maintainers = with maintainers; [ cartr flokli ]; - platforms = [ "aarch64-linux" "aarch64-darwin" "armv7l-linux" "armv6l-linux" "x86_64-linux" "x86_64-darwin" ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + cartr + flokli + stv0g + ]; + platforms = [ + "aarch64-linux" + "aarch64-darwin" + "armv7l-linux" + "armv6l-linux" + "x86_64-linux" + "x86_64-darwin" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/rs/rsop/package.nix b/third_party/nixpkgs/pkgs/by-name/rs/rsop/package.nix new file mode 100644 index 0000000000..080063968f --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ru/ruff-lsp/package.nix b/third_party/nixpkgs/pkgs/by-name/ru/ruff-lsp/package.nix index b2a3a9285a..e924e8b95e 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/ruff-lsp/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ru/ruff/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ru/ruff/Cargo.lock index 9fd3cb9b62..0e488abec5 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/ruff/Cargo.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ru/ruff/package.nix b/third_party/nixpkgs/pkgs/by-name/ru/ruff/package.nix index 4e31b05110..25678f65f8 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/ruff/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ru/rustdesk/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ru/rustdesk/Cargo.lock index 6ebeb42015..406c1525a8 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/rustdesk/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ru/rustdesk/Cargo.lock @@ -17,12 +17,6 @@ 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 = "aes" version = "0.8.4" @@ -54,7 +48,7 @@ dependencies = [ "cfg-if 1.0.0", "once_cell", "version_check", - "zerocopy 0.7.35", + "zerocopy 0.7.34", ] [[package]] @@ -101,13 +95,12 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "alsa" -version = "0.9.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43" +checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce" dependencies = [ "alsa-sys", "bitflags 2.6.0", - "cfg-if 1.0.0", "libc", ] @@ -175,9 +168,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", @@ -190,33 +183,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -231,17 +224,17 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arboard" version = "3.4.0" -source = "git+https://github.com/rustdesk-org/arboard#a04bdb1b368a99691822c33bf0f7ed497d6a7a35" +source = "git+https://github.com/rustdesk-org/arboard#747ab2d9b40a5c9c5102051cf3b0bb38b4845e60" dependencies = [ "clipboard-win", "core-graphics 0.23.2", - "image 0.25.2", + "image 0.25.1", "log", "objc2 0.5.2", "objc2-app-kit", "objc2-foundation", "parking_lot", - "serde 1.0.209", + "serde 1.0.203", "serde_derive", "windows-sys 0.48.0", "wl-clipboard-rs", @@ -272,9 +265,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.12" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5" dependencies = [ "flate2", "futures-core", @@ -285,13 +278,13 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.13.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.1.1", + "fastrand 2.1.0", "futures-lite 2.3.0", "slab", ] @@ -330,9 +323,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.4" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ "async-lock 3.4.0", "cfg-if 1.0.0", @@ -340,11 +333,11 @@ dependencies = [ "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.3", + "polling 3.7.2", "rustix 0.38.34", "slab", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -391,17 +384,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] name = "async-signal" -version = "0.2.10" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" dependencies = [ - "async-io 2.3.4", + "async-io 2.3.3", "async-lock 3.4.0", "atomic-waker", "cfg-if 1.0.0", @@ -410,7 +403,7 @@ dependencies = [ "rustix 0.38.34", "signal-hook-registry", "slab", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -421,13 +414,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -501,7 +494,7 @@ dependencies = [ "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide 0.7.4", + "miniz_oxide", "object", "rustc-demangle", ] @@ -546,7 +539,7 @@ dependencies = [ "log", "peeking_take_while", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "regex", "rustc-hash", "shlex", @@ -568,11 +561,11 @@ dependencies = [ "peeking_take_while", "prettyplease", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "regex", "rustc-hash", "shlex", - "syn 2.0.76", + "syn 2.0.68", "which", ] @@ -589,11 +582,11 @@ dependencies = [ "lazy_static", "lazycell", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "regex", "rustc-hash", "shlex", - "syn 2.0.76", + "syn 2.0.68", ] [[package]] @@ -614,7 +607,7 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -623,8 +616,8 @@ version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afb15541e888071f64592c0b4364fdff21b7cb0a247f984296699351963a8721" dependencies = [ - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -730,9 +723,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.17.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" [[package]] name = "byteorder" @@ -740,19 +733,13 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" -[[package]] -name = "byteorder-lite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" - [[package]] name = "bytes" -version = "1.7.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -821,13 +808,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.14" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932" +checksum = "779e6b7d17797c0b42023d417228c02889300190e700cb074c3438d9c541d332" dependencies = [ "jobserver", "libc", - "shlex", + "once_cell", ] [[package]] @@ -890,7 +877,7 @@ dependencies = [ "js-sys", "num-traits 0.2.19", "wasm-bindgen", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -924,7 +911,7 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", - "libloading 0.8.5", + "libloading 0.8.4", ] [[package]] @@ -944,18 +931,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.16" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" dependencies = [ "anstream", "anstyle", @@ -965,9 +952,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] name = "clipboard" @@ -984,7 +971,7 @@ dependencies = [ "parking_lot", "percent-encoding", "rand 0.8.5", - "serde 1.0.209", + "serde 1.0.203", "serde_derive", "thiserror", "utf16string", @@ -1029,9 +1016,9 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.51" +version = "0.1.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" dependencies = [ "cc", ] @@ -1044,7 +1031,7 @@ checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" dependencies = [ "bitflags 1.3.2", "block", - "cocoa-foundation 0.1.2", + "cocoa-foundation", "core-foundation 0.9.4", "core-graphics 0.22.3", "foreign-types 0.3.2", @@ -1060,7 +1047,7 @@ checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" dependencies = [ "bitflags 1.3.2", "block", - "cocoa-foundation 0.1.2", + "cocoa-foundation", "core-foundation 0.9.4", "core-graphics 0.23.2", "foreign-types 0.5.0", @@ -1068,22 +1055,6 @@ dependencies = [ "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 0.5.0", - "libc", - "objc", -] - [[package]] name = "cocoa-foundation" version = "0.1.2" @@ -1098,20 +1069,6 @@ dependencies = [ "objc", ] -[[package]] -name = "cocoa-foundation" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" -dependencies = [ - "bitflags 2.6.0", - "block", - "core-foundation 0.10.0", - "core-graphics-types 0.2.0", - "libc", - "objc", -] - [[package]] name = "color_quant" version = "1.1.0" @@ -1120,9 +1077,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "combine" @@ -1149,7 +1106,7 @@ version = "0.4.0-2" source = "git+https://github.com/rustdesk-org/confy#83db9ec19a2f97e9718aef69e4fc5611bb382479" dependencies = [ "directories-next", - "serde 1.0.209", + "serde 1.0.203", "thiserror", "toml 0.5.11", ] @@ -1186,8 +1143,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "unicode-xid 0.2.5", + "quote 1.0.36", + "unicode-xid 0.2.4", ] [[package]] @@ -1207,7 +1164,7 @@ name = "core-foundation" version = "0.9.3" source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" dependencies = [ - "core-foundation-sys 0.8.6", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc", ] @@ -1217,33 +1174,15 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ - "core-foundation-sys 0.8.7", - "libc", -] - -[[package]] -name = "core-foundation" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" -dependencies = [ - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc", ] [[package]] name = "core-foundation-sys" version = "0.8.6" -source = "git+https://github.com/madsmtm/core-foundation-rs.git?rev=7d593d016175755e492a92ef89edca68ac3bd5cd#7d593d016175755e492a92ef89edca68ac3bd5cd" -dependencies = [ - "objc2-encode 2.0.0-pre.2", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" @@ -1284,19 +1223,6 @@ dependencies = [ "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 0.5.0", - "libc", -] - [[package]] name = "core-graphics-types" version = "0.1.2" @@ -1319,17 +1245,6 @@ dependencies = [ "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 = "coreaudio-rs" version = "0.11.3" @@ -1337,7 +1252,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" dependencies = [ "bitflags 1.3.2", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "coreaudio-sys", ] @@ -1357,7 +1272,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" dependencies = [ "alsa", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "coreaudio-rs", "dasp_sample", "jni 0.21.1", @@ -1375,9 +1290,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -1452,12 +1367,12 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.5" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" +checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" dependencies = [ - "nix 0.29.0", - "windows-sys 0.59.0", + "nix 0.28.0", + "windows-sys 0.52.0", ] [[package]] @@ -1660,7 +1575,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -1760,7 +1675,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.5", + "libloading 0.8.4", ] [[package]] @@ -1794,7 +1709,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a09ac8bb8c16a282264c379dffba707b9c998afc7506009137f3c6136888078" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -1823,7 +1738,7 @@ checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" dependencies = [ "lazy_static", "regex", - "serde 1.0.209", + "serde 1.0.203", "strsim 0.10.0", ] @@ -1852,7 +1767,7 @@ dependencies = [ "cc", "hbb_common", "lazy_static", - "serde 1.0.209", + "serde 1.0.203", "serde_derive", "thiserror", ] @@ -1891,7 +1806,7 @@ dependencies = [ "objc", "pkg-config", "rdev", - "serde 1.0.209", + "serde 1.0.203", "serde_derive", "tfc", "unicode-segmentation", @@ -1923,8 +1838,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -1934,7 +1849,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -1944,8 +1859,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -2064,7 +1979,7 @@ dependencies = [ "flume", "half", "lebe", - "miniz_oxide 0.7.4", + "miniz_oxide", "rayon-core", "smallvec", "zune-inflate", @@ -2081,9 +1996,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -2106,14 +2021,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.24" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if 1.0.0", "libc", - "libredox", - "windows-sys 0.59.0", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", ] [[package]] @@ -2124,12 +2039,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", - "miniz_oxide 0.8.0", + "miniz_oxide", ] [[package]] @@ -2232,8 +2147,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -2366,7 +2281,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.1.1", + "fastrand 2.1.0", "futures-core", "futures-io", "parking", @@ -2380,8 +2295,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -2655,7 +2570,7 @@ dependencies = [ "proc-macro-crate 0.1.5", "proc-macro-error", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -2669,8 +2584,8 @@ dependencies = [ "proc-macro-crate 2.0.2", "proc-macro-error", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -2902,8 +2817,8 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -2985,9 +2900,9 @@ dependencies = [ "regex", "rustls-pki-types", "rustls-platform-verifier", - "serde 1.0.209", + "serde 1.0.203", "serde_derive", - "serde_json 1.0.127", + "serde_json 1.0.118", "socket2 0.3.19", "sodiumoxide", "sysinfo", @@ -3001,7 +2916,7 @@ dependencies = [ "url", "uuid", "winapi 0.3.9", - "zstd 0.13.2", + "zstd 0.13.1", ] [[package]] @@ -3128,21 +3043,21 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hwcodec" version = "0.7.0" -source = "git+https://github.com/rustdesk-org/hwcodec#6abd1898f3a03481ed0c038507b5218d6ea94267" +source = "git+https://github.com/rustdesk-org/hwcodec#f74410edec91435252b8394c38f8eeca87ad2a26" dependencies = [ "bindgen 0.59.2", "cc", "log", - "serde 1.0.209", + "serde 1.0.203", "serde_derive", - "serde_json 1.0.127", + "serde_json 1.0.118", ] [[package]] name = "hyper" -version = "0.14.30" +version = "0.14.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" dependencies = [ "bytes", "futures-channel", @@ -3196,7 +3111,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", @@ -3242,12 +3157,12 @@ dependencies = [ [[package]] name = "image" -version = "0.25.2" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" dependencies = [ "bytemuck", - "byteorder-lite", + "byteorder", "num-traits 0.2.19", "png", "tiff", @@ -3277,14 +3192,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", ] [[package]] name = "indexmap" -version = "2.4.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -3347,11 +3262,11 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.13" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi 0.4.0", + "hermit-abi 0.3.9", "libc", "windows-sys 0.52.0", ] @@ -3364,9 +3279,9 @@ checksum = "06d198e9919d9822d5f7083ba8530e04de87841eaf21ead9af8f2304efd57c89" [[package]] name = "is_terminal_polyfill" -version = "1.70.1" +version = "1.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "itertools" @@ -3436,9 +3351,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.32" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -3454,9 +3369,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -3492,7 +3407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" dependencies = [ "bitflags 2.6.0", - "serde 1.0.209", + "serde 1.0.203", "unicode-segmentation", ] @@ -3540,9 +3455,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.158" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libdbus-sys" @@ -3577,12 +3492,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if 1.0.0", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -3647,7 +3562,6 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.3", ] [[package]] @@ -3692,9 +3606,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.20" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" dependencies = [ "cc", "libc", @@ -3702,6 +3616,12 @@ dependencies = [ "vcpkg", ] +[[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" @@ -3845,15 +3765,6 @@ dependencies = [ "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" @@ -3866,25 +3777,13 @@ 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 0.3.9", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.52.0", -] - [[package]] name = "muda" -version = "0.14.1" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba8ac4080fb1e097c2c22acae467e46e4da72d941f02e82b67a87a2a89fa38b1" +checksum = "86b959f97c97044e4c96e32e1db292a7d594449546a3c6b77ae613dc3a5b5145" dependencies = [ - "cocoa 0.26.0", + "cocoa 0.25.0", "crossbeam-channel", "dpi", "gtk", @@ -3894,7 +3793,7 @@ dependencies = [ "once_cell", "png", "thiserror", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -3956,7 +3855,7 @@ dependencies = [ "jni-sys", "log", "ndk-sys 0.5.0+25.2.9519653", - "num_enum 0.7.3", + "num_enum 0.7.2", "thiserror", ] @@ -4143,7 +4042,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -4154,8 +4053,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -4217,11 +4116,11 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "num_enum_derive 0.7.3", + "num_enum_derive 0.7.2", ] [[package]] @@ -4232,20 +4131,20 @@ checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] [[package]] name = "num_enum_derive" -version = "0.7.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ "proc-macro-crate 2.0.2", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -4423,9 +4322,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.3" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -4461,9 +4360,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ "bitflags 2.6.0", "cfg-if 1.0.0", @@ -4481,8 +4380,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -4493,9 +4392,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -4548,18 +4447,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" dependencies = [ "log", - "serde 1.0.209", + "serde 1.0.203", "windows-sys 0.52.0", ] [[package]] name = "os_pipe" -version = "1.2.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982" +checksum = "29d73ba8daf8fac13b0501d1abeddcfe21ba7401ada61a819144b6c2a4f32209" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -4568,9 +4467,9 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38731fa859ef679f1aec66ca9562165926b442f298467f76f5990f431efe87dc" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", "serde_derive", - "serde_json 1.0.127", + "serde_json 1.0.118", ] [[package]] @@ -4601,7 +4500,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c94f3b9b97df3c6d4e51a14916639b24e02c7d15d1dba686ce9b1118277cb811" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -4676,9 +4575,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.5.3", + "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -4786,8 +4685,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -4804,12 +4703,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.4" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", - "fastrand 2.1.1", + "fastrand 2.1.0", "futures-io", ] @@ -4821,14 +4720,15 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.7.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" +checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" dependencies = [ - "base64 0.22.1", + "base64 0.21.7", "indexmap", - "quick-xml 0.32.0", - "serde 1.0.209", + "line-wrap", + "quick-xml 0.31.0", + "serde 1.0.203", "time 0.3.36", ] @@ -4842,7 +4742,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.4", + "miniz_oxide", ] [[package]] @@ -4863,9 +4763,9 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.3" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if 1.0.0", "concurrent-queue", @@ -4873,7 +4773,7 @@ dependencies = [ "pin-project-lite", "rustix 0.38.34", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -4884,12 +4784,9 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.20" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" -dependencies = [ - "zerocopy 0.7.35", -] +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pretty-hex" @@ -4899,12 +4796,12 @@ checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131" [[package]] name = "prettyplease" -version = "0.2.22" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2 1.0.86", - "syn 2.0.76", + "syn 2.0.68", ] [[package]] @@ -4953,7 +4850,7 @@ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", "version_check", ] @@ -4965,7 +4862,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "version_check", ] @@ -4989,9 +4886,9 @@ dependencies = [ [[package]] name = "protobuf" -version = "3.5.1" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bcc343da15609eaecd65f8aa76df8dc4209d325131d8219358c0aaaebab0bf6" +checksum = "df67496db1a89596beaced1579212e9b7c53c22dca1d9745de00ead76573d514" dependencies = [ "bytes", "once_cell", @@ -5001,9 +4898,9 @@ dependencies = [ [[package]] name = "protobuf-codegen" -version = "3.5.1" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d0cde5642ea4df842b13eb9f59ea6fafa26dcb43e3e1ee49120e9757556189" +checksum = "eab09155fad2d39333d3796f67845d43e29b266eea74f7bc93f153f707f126dc" dependencies = [ "anyhow", "once_cell", @@ -5016,9 +4913,9 @@ dependencies = [ [[package]] name = "protobuf-parse" -version = "3.5.1" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b0e9b447d099ae2c4993c0cbb03c7a9d6c937b17f2d56cfc0b1550e6fcfdb76" +checksum = "1a16027030d4ec33e423385f73bb559821827e9ec18c50e7874e4d6de5a4e96f" dependencies = [ "anyhow", "indexmap", @@ -5032,9 +4929,9 @@ dependencies = [ [[package]] name = "protobuf-support" -version = "3.5.1" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0766e3675a627c327e4b3964582594b0e8741305d628a98a5de75a1d15f99b9" +checksum = "70e2d30ab1878b2e72d1e2fc23ff5517799c9929e2cf81a8516f9f4dcf2b9cf3" dependencies = [ "thiserror", ] @@ -5089,9 +4986,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.32.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] @@ -5116,9 +5013,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2 1.0.86", ] @@ -5300,11 +5197,11 @@ dependencies = [ [[package]] name = "rdev" version = "0.5.0-2" -source = "git+https://github.com/rustdesk-org/rdev#b3434caee84c92412b45a2f655a15ac5dad33488" +source = "git+https://github.com/rustdesk-org/rdev#d4c1759926d693ba269e2cb8cf9f87b13e424e4e" dependencies = [ "cocoa 0.24.1", "core-foundation 0.9.4", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.22.3", "dispatch", "enum-map", @@ -5313,7 +5210,7 @@ dependencies = [ "lazy_static", "libc", "log", - "mio 0.8.11", + "mio", "strum 0.24.1", "strum_macros 0.24.3", "widestring", @@ -5350,18 +5247,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.6" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", "libredox", @@ -5370,9 +5267,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -5435,15 +5332,15 @@ dependencies = [ "rustls 0.21.12", "rustls-native-certs 0.6.3", "rustls-pemfile 1.0.4", - "serde 1.0.209", - "serde_json 1.0.127", + "serde 1.0.203", + "serde_json 1.0.118", "serde_urlencoded", "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls 0.24.1", - "tokio-socks 0.5.2", + "tokio-socks 0.5.1", "tokio-util", "tower-service", "url", @@ -5575,7 +5472,7 @@ dependencies = [ [[package]] name = "rustdesk" -version = "1.3.0" +version = "1.3.1" dependencies = [ "android-wakelock", "android_logger", @@ -5587,7 +5484,7 @@ dependencies = [ "cfg-if 1.0.0", "chrono", "cidr-utils", - "clap 4.5.16", + "clap 4.5.8", "clipboard", "clipboard-master", "cocoa 0.24.1", @@ -5607,6 +5504,7 @@ dependencies = [ "flutter_rust_bridge", "fon", "fruitbasket", + "gtk", "hbb_common", "hex", "hound", @@ -5616,11 +5514,12 @@ dependencies = [ "jni 0.21.1", "keepawake", "lazy_static", - "libloading 0.8.5", + "libloading 0.8.4", "libpulse-binding", "libpulse-simple-binding", "mac_address", "magnum-opus", + "nix 0.29.0", "num_cpus", "objc", "objc_id", @@ -5641,9 +5540,9 @@ dependencies = [ "samplerate", "sciter-rs", "scrap", - "serde 1.0.209", + "serde 1.0.203", "serde_derive", - "serde_json 1.0.127", + "serde_json 1.0.118", "serde_repr", "sha2", "shared_memory", @@ -5652,6 +5551,7 @@ dependencies = [ "system_shutdown", "tao", "tauri-winrt-notification", + "termios", "totp-rs", "tray-icon", "url", @@ -5672,7 +5572,7 @@ dependencies = [ [[package]] name = "rustdesk-portable-packer" -version = "1.3.0" +version = "1.3.1" dependencies = [ "brotli", "dirs 5.0.1", @@ -5738,15 +5638,15 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" dependencies = [ "log", "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.102.6", + "rustls-webpki 0.102.4", "subtle", "zeroize", ] @@ -5765,12 +5665,12 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.3", + "rustls-pemfile 2.1.2", "rustls-pki-types", "schannel", "security-framework", @@ -5787,9 +5687,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.3" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ "base64 0.22.1", "rustls-pki-types", @@ -5797,25 +5697,25 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-platform-verifier" -version = "0.3.4" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" +checksum = "3e3beb939bcd33c269f4bf946cc829fcd336370267c4a927ac0399c84a3151a1" dependencies = [ "core-foundation 0.9.4", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "jni 0.19.0", "log", "once_cell", - "rustls 0.23.12", - "rustls-native-certs 0.7.2", + "rustls 0.23.10", + "rustls-native-certs 0.7.0", "rustls-platform-verifier-android", - "rustls-webpki 0.102.6", + "rustls-webpki 0.102.4", "security-framework", "security-framework-sys", "webpki-roots 0.26.3", @@ -5824,9 +5724,9 @@ dependencies = [ [[package]] name = "rustls-platform-verifier-android" -version = "0.1.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" +checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" [[package]] name = "rustls-webpki" @@ -5840,9 +5740,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ "ring", "rustls-pki-types", @@ -5935,8 +5835,8 @@ dependencies = [ "pkg-config", "quest", "repng", - "serde 1.0.209", - "serde_json 1.0.127", + "serde 1.0.203", + "serde_json 1.0.118", "target_build_utils", "tracing", "webm", @@ -5955,13 +5855,13 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.11.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" dependencies = [ - "bitflags 2.6.0", + "bitflags 1.3.2", "core-foundation 0.9.4", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc", "num-bigint", "security-framework-sys", @@ -5969,11 +5869,11 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc", ] @@ -5991,22 +5891,22 @@ checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" [[package]] name = "serde" -version = "1.0.209" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -6023,14 +5923,13 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" dependencies = [ "itoa 1.0.11", - "memchr", "ryu", - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -6040,17 +5939,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -6062,7 +5961,7 @@ dependencies = [ "form_urlencoded", "itoa 1.0.11", "ryu", - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -6207,7 +6106,7 @@ dependencies = [ "ed25519", "libc", "libsodium-sys", - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -6269,7 +6168,7 @@ checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" dependencies = [ "heck 0.3.3", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -6281,7 +6180,7 @@ checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck 0.4.1", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "rustversion", "syn 1.0.109", ] @@ -6310,18 +6209,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.76" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "unicode-ident", ] @@ -6346,7 +6245,7 @@ version = "0.29.10" source = "git+https://github.com/rustdesk-org/sysinfo?branch=rlim_max#90b1705d909a4902dbbbdea37ee64db17841077d" dependencies = [ "cfg-if 1.0.0", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc", "ntapi", "once_cell", @@ -6371,7 +6270,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" dependencies = [ - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc", ] @@ -6459,7 +6358,7 @@ version = "0.1.2" source = "git+https://github.com/rustdesk-org/tao?branch=dev#288c219cb0527e509590c2b2d8e7072aa9feb2d3" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -6471,9 +6370,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.16" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "target_build_utils" @@ -6498,15 +6397,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.12.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.1.1", - "once_cell", + "fastrand 2.1.0", "rustix 0.38.34", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -6539,7 +6437,7 @@ dependencies = [ [[package]] name = "tfc" version = "0.7.0" -source = "git+https://github.com/rustdesk-org/The-Fat-Controller?branch=history/rebase_upstream_20240722#87a6450f17659edba0cad669d9b57e8775479917" +source = "git+https://github.com/rustdesk-org/The-Fat-Controller?branch=history/rebase_upstream_20240722#de9c8ba480f166a9fc90aaa47bb0e84b443ea9c6" dependencies = [ "anyhow", "core-graphics 0.23.2", @@ -6550,22 +6448,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -6611,7 +6509,7 @@ dependencies = [ "num-conv", "num_threads", "powerfmt", - "serde 1.0.209", + "serde 1.0.203", "time-core", "time-macros", ] @@ -6634,9 +6532,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.8.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" dependencies = [ "tinyvec_macros", ] @@ -6649,31 +6547,32 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.3" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", "libc", - "mio 1.0.2", + "mio", + "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2 0.5.7", "tokio-macros", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -6702,11 +6601,23 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.12", + "rustls 0.23.10", "rustls-pki-types", "tokio", ] +[[package]] +name = "tokio-socks" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" +dependencies = [ + "either", + "futures-util", + "thiserror", + "tokio", +] + [[package]] name = "tokio-socks" version = "0.5.2-1" @@ -6723,18 +6634,6 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "tokio-socks" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" -dependencies = [ - "either", - "futures-util", - "thiserror", - "tokio", -] - [[package]] name = "tokio-util" version = "0.7.11" @@ -6758,7 +6657,7 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -6767,7 +6666,7 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", "serde_spanned", "toml_datetime", "toml_edit 0.19.15", @@ -6779,7 +6678,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", "serde_spanned", "toml_datetime", "toml_edit 0.20.2", @@ -6791,7 +6690,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -6801,7 +6700,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap", - "serde 1.0.209", + "serde 1.0.203", "serde_spanned", "toml_datetime", "winnow", @@ -6814,7 +6713,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ "indexmap", - "serde 1.0.209", + "serde 1.0.203", "serde_spanned", "toml_datetime", "winnow", @@ -6822,9 +6721,9 @@ dependencies = [ [[package]] name = "totp-rs" -version = "5.6.0" +version = "5.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b2f27dad992486c26b4e7455f38aa487e838d6d61b57e72906ee2b8c287a90" +checksum = "6c4ae9724c5888c0417d2396037ed3b60665925624766416e3e342b6ba5dbd3f" dependencies = [ "base32", "constant_time_eq 0.2.6", @@ -6838,9 +6737,9 @@ dependencies = [ [[package]] name = "tower-service" -version = "0.3.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" @@ -6860,8 +6759,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -6885,10 +6784,10 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.15.1" -source = "git+https://github.com/tauri-apps/tray-icon#759f6a74fdcbcd979d3d39a2c9c2bc6a54e5e739" +version = "0.14.3" +source = "git+https://github.com/tauri-apps/tray-icon#d4078696edba67b0ab42cef67e6a421a0332c96f" dependencies = [ - "core-graphics 0.24.0", + "core-graphics 0.23.2", "crossbeam-channel", "dirs 5.0.1", "libappindicator", @@ -6899,7 +6798,7 @@ dependencies = [ "once_cell", "png", "thiserror", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -7029,9 +6928,9 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" [[package]] name = "unicode-xid" -version = "0.2.5" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "untrusted" @@ -7048,7 +6947,7 @@ dependencies = [ "form_urlencoded", "idna", "percent-encoding", - "serde 1.0.209", + "serde 1.0.203", ] [[package]] @@ -7100,9 +6999,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" dependencies = [ "getrandom", ] @@ -7133,9 +7032,9 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" -version = "0.9.5" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "virtual_display" @@ -7203,35 +7102,34 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if 1.0.0", - "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -7241,32 +7139,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ - "quote 1.0.37", + "quote 1.0.36", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wayland-backend" @@ -7327,7 +7225,7 @@ checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" dependencies = [ "proc-macro2 1.0.86", "quick-xml 0.34.0", - "quote 1.0.37", + "quote 1.0.36", ] [[package]] @@ -7343,9 +7241,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -7456,11 +7354,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.9" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -7541,7 +7439,7 @@ dependencies = [ "windows-core 0.52.0", "windows-implement", "windows-interface", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -7551,7 +7449,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" dependencies = [ "windows-core 0.54.0", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -7569,7 +7467,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -7579,7 +7477,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" dependencies = [ "windows-result", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -7589,8 +7487,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -7600,8 +7498,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -7610,7 +7508,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -7648,16 +7546,7 @@ 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", + "windows-targets 0.52.5", ] [[package]] @@ -7692,18 +7581,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", + "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.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", + "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]] @@ -7712,7 +7601,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -7738,9 +7627,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -7768,9 +7657,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -7798,15 +7687,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" [[package]] name = "windows_i686_gnullvm" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -7834,9 +7723,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -7864,9 +7753,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -7882,9 +7771,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -7912,9 +7801,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -8077,12 +7966,12 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xdg-home" -version = "1.3.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -8113,7 +8002,7 @@ dependencies = [ "once_cell", "ordered-stream", "rand 0.8.5", - "serde 1.0.209", + "serde 1.0.203", "serde_repr", "sha1", "static_assertions", @@ -8134,7 +8023,7 @@ checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "regex", "syn 1.0.109", "zvariant_utils", @@ -8146,7 +8035,7 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" dependencies = [ - "serde 1.0.209", + "serde 1.0.203", "static_assertions", "zvariant", ] @@ -8163,12 +8052,11 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ - "byteorder", - "zerocopy-derive 0.7.35", + "zerocopy-derive 0.7.34", ] [[package]] @@ -8178,19 +8066,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.76", + "quote 1.0.36", + "syn 2.0.68", ] [[package]] @@ -8230,11 +8118,11 @@ dependencies = [ [[package]] name = "zstd" -version = "0.13.2" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" dependencies = [ - "zstd-safe 7.2.1", + "zstd-safe 7.1.0", ] [[package]] @@ -8249,18 +8137,18 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "7.2.1" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.13+zstd.1.5.6" +version = "2.0.11+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" dependencies = [ "cc", "pkg-config", @@ -8284,7 +8172,7 @@ dependencies = [ "byteorder", "enumflags2", "libc", - "serde 1.0.209", + "serde 1.0.203", "static_assertions", "zvariant_derive", ] @@ -8297,7 +8185,7 @@ checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", "zvariant_utils", ] @@ -8309,6 +8197,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] diff --git a/third_party/nixpkgs/pkgs/by-name/ru/rustdesk/package.nix b/third_party/nixpkgs/pkgs/by-name/ru/rustdesk/package.nix index b038c6c383..a1f5b24910 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/rustdesk/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ru/rustdesk/package.nix @@ -37,26 +37,26 @@ rustPlatform.buildRustPackage rec { pname = "rustdesk"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk"; rev = version; - hash = "sha256-pDGURsF0eft2BkuXOzaMtNCHp9VFgZZh4bbNRa5NDII="; + hash = "sha256-PioaSdvgJ9oXC5DAbl+em7rxcGx1om9+sjCMdrvox90="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "android-wakelock-0.1.0" = "sha256-09EH/U1BBs3l4galQOrTKmPUYBgryUjfc/rqPZhdYc4="; - "arboard-3.4.0" = "sha256-lZIG5z115ExR6DcUut1rk9MrYFzSyCYH9kNGIikOPJM="; + "arboard-3.4.0" = "sha256-xuMfMakHVj/zjiUr6PVFy+aNQxwsXtAAFlTYxUt12fU="; "cacao-0.4.0-beta2" = "sha256-U5tCLeVxjmZCm7ti1u71+i116xmozPaR69pCsA4pxrM="; "clipboard-master-4.0.0-beta.6" = "sha256-GZyzGMQOZ0iwGNZa/ZzFp8gU2tQVWZBpAbim8yb6yZA="; "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-pfzcaD7h/U5ou+P7qRLR56iXOkm043rF74y+Q0FsVLo="; + "hwcodec-0.7.0" = "sha256-SswZI2BJ4pRXT379cziJlisPsc5sOiOiDqJ5WaPETnA="; "impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI="; "keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4="; "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE="; @@ -64,15 +64,15 @@ rustPlatform.buildRustPackage 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-KrzNa4sKyuVw3EV/Ec9VBNRyJy7QFR2Gu4c2WkltwUw="; + "rdev-0.5.0-2" = "sha256-G+PvnA5mZyN080uoI5CGj/dQ9B1J4h5iYd7214MKBR8="; "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc="; "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM="; "sciter-rs-0.5.57" = "sha256-5Nd9npdx8yQJEczHv7WmSmrE1lBfvp5z7BubTbYBg3E="; "sysinfo-0.29.10" = "sha256-/UsFAvlWs/F7X1xT+97Fx+pnpCguoPHU3hTynqYMEs4="; "tao-0.25.0" = "sha256-kLmx1z9Ybn/hDt2OcszEjtZytQIE+NKTIn9zNr9oEQk="; - "tfc-0.7.0" = "sha256-VAoOadgGajWjW7q1RCwmQ5gMmaA1oeZBSiL1tYSuIEI="; + "tfc-0.7.0" = "sha256-4plK8ttbHsBPat3/rS+4RhGzirq2Ked2wrU8cQEU1zo="; "tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI="; - "tray-icon-0.15.1" = "sha256-DvTVAsE3dB+o89SFk3RPRt5JzaWjPl4nlvC77zsVN/s="; + "tray-icon-0.14.3" = "sha256-dSX7LucZaLplRrh6zLwmFzyZN4ZtwIXzAEdZzlu3gQg="; "wallpaper-3.2.0" = "sha256-p9NRmusdA0wvF6onp1UTL0/4t7XnEAc19sqyGDnfg/Q="; "webm-1.1.0" = "sha256-p4BMej7yvb8c/dJynRWZmwo2hxAAY96Qx6Qx2DbT8hE="; "x11-2.19.0" = "sha256-GDCeKzUtvaLeBDmPQdyr499EjEfT6y4diBMzZVEptzc="; @@ -83,7 +83,7 @@ rustPlatform.buildRustPackage rec { postPatch = '' # Overwrite cargo.lock because the one in the upstream repo has duplicates entries. # It should probably be removed in the next rustdesk update (if they fix their cargoLock) - ln -fs ${./Cargo.lock} Cargo.lock + cp ${./Cargo.lock} Cargo.lock ''; desktopItems = [ @@ -189,5 +189,6 @@ rustPlatform.buildRustPackage rec { leixb ]; mainProgram = "rustdesk"; + badPlatforms = lib.platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/ru/rustic/package.nix b/third_party/nixpkgs/pkgs/by-name/ru/rustic/package.nix index 9dc2238231..23121c5ffe 100644 --- a/third_party/nixpkgs/pkgs/by-name/ru/rustic/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ru/rusty-bash/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ru/rusty-bash/Cargo.lock new file mode 100644 index 0000000000..c8e77afd52 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ru/rusty-bash/package.nix b/third_party/nixpkgs/pkgs/by-name/ru/rusty-bash/package.nix new file mode 100644 index 0000000000..7db90b1fa4 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sc/scite/package.nix b/third_party/nixpkgs/pkgs/by-name/sc/scite/package.nix new file mode 100644 index 0000000000..e8b2c0ba9b --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/sc/scite/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + wrapGAppsHook3, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "scite"; + version = "5.5.3"; + + src = fetchurl { + url = "https://www.scintilla.org/scite${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}.tgz"; + hash = "sha256-MtXy8a4MzdJP8Rf6otc+Zu+KfYSJnmmXfBS8RVBBbOY="; + }; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + ]; + + sourceRoot = "scite/gtk"; + + makeFlags = [ + "GTK3=1" + "prefix=${placeholder "out"}" + ]; + + CXXFLAGS = [ + # GCC 13: error: 'intptr_t' does not name a type + "-include cstdint" + "-include system_error" + ]; + + preBuild = '' + pushd ../../scintilla/gtk + make ''${makeFlags[@]} + popd + + pushd ../../lexilla/src + make ''${makeFlags[@]} + popd + ''; + + enableParallelBuilding = true; + + meta = { + homepage = "https://www.scintilla.org/SciTE.html"; + description = "SCIntilla based Text Editor"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + rszibele + aleksana + ]; + mainProgram = "SciTE"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/by-name/sc/screentest/package.nix b/third_party/nixpkgs/pkgs/by-name/sc/screentest/package.nix index 6d671f6089..df4922afb9 100644 --- a/third_party/nixpkgs/pkgs/by-name/sc/screentest/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sc/screentest/package.nix @@ -1,43 +1,40 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, intltool -, pkg-config -, gtk2 +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + wrapGAppsHook3, }: stdenv.mkDerivation (finalAttrs: { pname = "screentest"; - version = "unstable-2021-05-10"; + version = "3.0"; src = fetchFromGitHub { owner = "TobiX"; repo = "screentest"; - rev = "780e6cbbbbd6ba93e246e7747fe593b40c4e2747"; - hash = "sha256-TJ47c77vQ/aRBJ2uEiFLuAR4dd4CMEo+iAAx0HCFbmA="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-dbag1EAD+6+srfu/eqSl3CWlZtSopioQjyBQRJcUggA="; }; strictDeps = true; nativeBuildInputs = [ - autoreconfHook - intltool + meson + ninja pkg-config - gtk2 # for autoconf macros + wrapGAppsHook3 ]; - buildInputs = [ - gtk2 - ]; - - meta = with lib; { + meta = { description = "Simple screen testing tool"; mainProgram = "screentest"; homepage = "https://github.com/TobiX/screentest"; - changelog = "https://github.com/TobiX/screentest/blob/${finalAttrs.src.rev}/NEWS"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ evils ]; - platforms = platforms.unix; + changelog = "https://github.com/TobiX/screentest/blob/${finalAttrs.version}/NEWS"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ evils ]; + platforms = lib.platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/se/send/package.nix b/third_party/nixpkgs/pkgs/by-name/se/send/package.nix new file mode 100644 index 0000000000..4c92e5642f --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/se/sendme/package.nix b/third_party/nixpkgs/pkgs/by-name/se/sendme/package.nix index f277c2a007..376de9713c 100644 --- a/third_party/nixpkgs/pkgs/by-name/se/sendme/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/se/sendme/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "sendme"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-YnabQ8YHDsFYu5RX3E2NvPARsl+qn4688q9KxZ5Fegc="; + hash = "sha256-gPuzwJtQdQDFVuWYoH/TGSf+Fp++UvK9D7mL41p9eOk="; }; - cargoHash = "sha256-yD40QKceLjtq80K6I98bT27sCAkCnkRkfE3m4eGjueU="; + cargoHash = "sha256-ML+USTwdMLyLcc3Fzu/eD7J7s7Sa1lEOZm/txjZv31E="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ diff --git a/third_party/nixpkgs/pkgs/by-name/si/simdutf/package.nix b/third_party/nixpkgs/pkgs/by-name/si/simdutf/package.nix index 8e841ac446..4aba0ae8d7 100644 --- a/third_party/nixpkgs/pkgs/by-name/si/simdutf/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/si/simplex-chat-desktop/package.nix b/third_party/nixpkgs/pkgs/by-name/si/simplex-chat-desktop/package.nix index 38df48bb17..4c9c443ee8 100644 --- a/third_party/nixpkgs/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sk/skeditor/nuget-deps.nix b/third_party/nixpkgs/pkgs/by-name/sk/skeditor/nuget-deps.nix new file mode 100644 index 0000000000..3cfb79ed59 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sk/skeditor/package.nix b/third_party/nixpkgs/pkgs/by-name/sk/skeditor/package.nix new file mode 100644 index 0000000000..57ffd6d6b0 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sk/skeditor/update.sh b/third_party/nixpkgs/pkgs/by-name/sk/skeditor/update.sh new file mode 100644 index 0000000000..3ffc5a7570 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sk/skypeforlinux/package.nix b/third_party/nixpkgs/pkgs/by-name/sk/skypeforlinux/package.nix index f0d6784bf8..fa58fd8626 100644 --- a/third_party/nixpkgs/pkgs/by-name/sk/skypeforlinux/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/slint-lsp/default.nix b/third_party/nixpkgs/pkgs/by-name/sl/slint-lsp/package.nix similarity index 83% rename from third_party/nixpkgs/pkgs/development/tools/misc/slint-lsp/default.nix rename to third_party/nixpkgs/pkgs/by-name/sl/slint-lsp/package.nix index f51b848a62..969457481d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/slint-lsp/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sm/smartcat/package.nix b/third_party/nixpkgs/pkgs/by-name/sm/smartcat/package.nix index fb7195bfea..e68ce11857 100644 --- a/third_party/nixpkgs/pkgs/by-name/sm/smartcat/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sn/snoop/package.nix b/third_party/nixpkgs/pkgs/by-name/sn/snoop/package.nix index 3736427ef9..4cc1d0bb33 100644 --- a/third_party/nixpkgs/pkgs/by-name/sn/snoop/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/so/softether/package.nix b/third_party/nixpkgs/pkgs/by-name/so/softether/package.nix index 2f7cba3428..e1d8d575f9 100644 --- a/third_party/nixpkgs/pkgs/by-name/so/softether/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/so/sonusmix/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/so/sonusmix/Cargo.lock new file mode 100644 index 0000000000..50426acc2c --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/so/sonusmix/package.nix b/third_party/nixpkgs/pkgs/by-name/so/sonusmix/package.nix new file mode 100644 index 0000000000..ea9b7de495 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/so/sopwith/package.nix b/third_party/nixpkgs/pkgs/by-name/so/sopwith/package.nix index fe6fb0c147..0c006b405f 100644 --- a/third_party/nixpkgs/pkgs/by-name/so/sopwith/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sp/sphinxygen/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/sphinxygen/package.nix new file mode 100644 index 0000000000..4ef1ad7d62 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sp/spread/local-script-path.patch b/third_party/nixpkgs/pkgs/by-name/sp/spread/local-script-path.patch new file mode 100644 index 0000000000..f720cf1f67 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sp/spread/package.nix b/third_party/nixpkgs/pkgs/by-name/sp/spread/package.nix new file mode 100644 index 0000000000..4fb6a143e0 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sq/sql-studio/package.nix b/third_party/nixpkgs/pkgs/by-name/sq/sql-studio/package.nix new file mode 100644 index 0000000000..b3ef7d0317 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sq/sqlc/package.nix b/third_party/nixpkgs/pkgs/by-name/sq/sqlc/package.nix new file mode 100644 index 0000000000..c605faf433 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ss/ssh-import-id/package.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssh-import-id/package.nix new file mode 100644 index 0000000000..5f2c253177 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ss/sshified/package.nix b/third_party/nixpkgs/pkgs/by-name/ss/sshified/package.nix new file mode 100644 index 0000000000..56498841a3 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/st/stalwart-mail/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stalwart-mail/package.nix index 28a2d452c9..5c97acbb0f 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/stalwart-mail/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/st/stats/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stats/package.nix index 46a148ea56..c1d048866c 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/stats/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix b/third_party/nixpkgs/pkgs/by-name/st/step-ca/package.nix similarity index 82% rename from third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix rename to third_party/nixpkgs/pkgs/by-name/st/step-ca/package.nix index f37c05f93f..911c479c71 100644 --- a/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/st/storcli/package.nix b/third_party/nixpkgs/pkgs/by-name/st/storcli/package.nix index bb1e922476..7c78a2fefd 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/storcli/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/st/streamcontroller/package.nix b/third_party/nixpkgs/pkgs/by-name/st/streamcontroller/package.nix index 830bc12290..71e2a2ee65 100644 --- a/third_party/nixpkgs/pkgs/by-name/st/streamcontroller/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/su/surfer/package.nix b/third_party/nixpkgs/pkgs/by-name/su/surfer/package.nix index 52fc985cf0..08fba6bdb0 100644 --- a/third_party/nixpkgs/pkgs/by-name/su/surfer/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs b/third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs index 802b5e64f1..61932cb555 100644 --- a/third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs +++ b/third_party/nixpkgs/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs @@ -937,8 +937,21 @@ fn do_user_switch(parent_exe: String) -> anyhow::Result<()> { Ok(()) } +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 +"#, + argv0 + ); + std::process::exit(1); +} + /// Performs switch-to-configuration functionality for the entire system -fn do_system_switch() -> anyhow::Result<()> { +fn do_system_switch(action: Action) -> anyhow::Result<()> { let out = PathBuf::from(required_env("OUT")?); let toplevel = PathBuf::from(required_env("TOPLEVEL")?); let distro_id = required_env("DISTRO_ID")?; @@ -946,25 +959,6 @@ fn do_system_switch() -> anyhow::Result<()> { let locale_archive = required_env("LOCALE_ARCHIVE")?; let new_systemd = PathBuf::from(required_env("SYSTEMD")?); - let mut args = std::env::args(); - let argv0 = args.next().ok_or(anyhow!("no argv[0]"))?; - - let Some(Ok(action)) = args.next().map(|a| Action::from_str(&a)) else { - 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 -"#, - argv0 - .split(std::path::MAIN_SEPARATOR_STR) - .last() - .unwrap_or("switch-to-configuration") - ); - std::process::exit(1); - }; - let action = ACTION.get_or_init(|| action); // The action that is to be performed (like switch, boot, test, dry-activate) Also exposed via @@ -1082,22 +1076,6 @@ won't take effect until you reboot the system. .subscribe() .context("Failed to subscribe to systemd dbus messages")?; - // Wait for the system to have finished booting. - loop { - let system_state: String = systemd - .get("org.freedesktop.systemd1.Manager", "SystemState") - .context("Failed to get system state")?; - - match system_state.as_str() { - "running" | "degraded" | "maintenance" => break, - _ => { - _ = dbus_conn - .process(Duration::from_millis(500)) - .context("Failed to process dbus messages")? - } - } - } - let _systemd_reload_status = systemd_reload_status.clone(); let reloading_token = systemd .match_signal( @@ -1939,13 +1917,26 @@ won't take effect until you reboot the system. } fn main() -> anyhow::Result<()> { - match ( - unsafe { nix::libc::geteuid() }, - std::env::var("__NIXOS_SWITCH_TO_CONFIGURATION_PARENT_EXE").ok(), - ) { - (0, None) => do_system_switch(), - (1..=u32::MAX, None) => bail!("This program does not support being ran outside of the switch-to-configuration environment"), - (_, Some(parent_exe)) => do_user_switch(parent_exe), + match std::env::var("__NIXOS_SWITCH_TO_CONFIGURATION_PARENT_EXE").ok() { + Some(parent_exe) => do_user_switch(parent_exe), + None => { + let mut args = std::env::args(); + let argv0 = args.next().ok_or(anyhow!("no argv[0]"))?; + let argv0 = argv0 + .split(std::path::MAIN_SEPARATOR_STR) + .last() + .unwrap_or("switch-to-configuration"); + + let Some(Ok(action)) = args.next().map(|a| Action::from_str(&a)) else { + usage(&argv0); + }; + + if unsafe { nix::libc::geteuid() } == 0 { + do_system_switch(action) + } else { + bail!("{} must be run as the root user", argv0); + } + } } } diff --git a/third_party/nixpkgs/pkgs/by-name/sy/symfony-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/symfony-cli/package.nix index 47ae24c608..62fe10210b 100644 --- a/third_party/nixpkgs/pkgs/by-name/sy/symfony-cli/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sy/syncyomi/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/syncyomi/package.nix index 103bc58319..96bb04803e 100644 --- a/third_party/nixpkgs/pkgs/by-name/sy/syncyomi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/sy/syncyomi/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "syncyomi"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "SyncYomi"; repo = "SyncYomi"; rev = "refs/tags/v${version}"; - hash = "sha256-90MA62Zm9ouaf+CnYsbOm/njrUui21vW/VrwKYfsCZs="; + hash = "sha256-PPE6UXHo2ZlN0A0VkUH+8pkdfm6WEvpofusk6c3RBHk="; }; vendorHash = "sha256-/rpT6SatIZ+GVzmVg6b8Zy32pGybprObotyvEgvdL2w="; diff --git a/third_party/nixpkgs/pkgs/by-name/sy/system76-power/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/sy/system76-power/Cargo.lock index 82292ac66c..04db447b43 100644 --- a/third_party/nixpkgs/pkgs/by-name/sy/system76-power/Cargo.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sy/system76-power/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/system76-power/package.nix index 5220534d87..600459921c 100644 --- a/third_party/nixpkgs/pkgs/by-name/sy/system76-power/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ta/tabby-agent/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/tabby-agent/package.nix new file mode 100644 index 0000000000..77f3a5908c --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/te/teams-for-linux/package.nix b/third_party/nixpkgs/pkgs/by-name/te/teams-for-linux/package.nix index 547af6be14..77f8cf6e5f 100644 --- a/third_party/nixpkgs/pkgs/by-name/te/teams-for-linux/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/te/teams-for-linux/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, alsa-utils, copyDesktopItems, - electron_30, + electron_32, makeDesktopItem, makeWrapper, nix-update-script, @@ -15,16 +15,16 @@ buildNpmPackage rec { pname = "teams-for-linux"; - version = "1.11.0"; + version = "1.11.2"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; rev = "refs/tags/v${version}"; - hash = "sha256-UNe4stYEOTcQc+ap1/v9EXjHTwKvLYd4t8EPuojDyqw="; + hash = "sha256-fSZ94Px0NuxUZqc9cHE6czG/VzNsWp+UXllq7kEQvtI="; }; - npmDepsHash = "sha256-OpoPXcSiHnK4UYFimY+yOM6M3dAOcvZ82DdGc++oNLM="; + npmDepsHash = "sha256-MfPdOqxiMDsvxsS3yWukRokDitqWQpTpK407xVX461o="; nativeBuildInputs = [ makeWrapper @@ -42,7 +42,7 @@ buildNpmPackage rec { buildPhase = '' runHook preBuild - cp -r ${electron_30.dist} electron-dist + cp -r ${electron_32.dist} electron-dist chmod -R u+w electron-dist npm exec electron-builder -- \ @@ -50,7 +50,7 @@ buildNpmPackage rec { -c.npmRebuild=true \ -c.asarUnpack="**/*.node" \ -c.electronDist=electron-dist \ - -c.electronVersion=${electron_30.version} + -c.electronVersion=${electron_32.version} runHook postBuild ''; @@ -72,7 +72,7 @@ buildNpmPackage rec { popd # Linux needs 'aplay' for notification sounds - makeWrapper '${lib.getExe electron_30}' "$out/bin/teams-for-linux" \ + makeWrapper '${lib.getExe electron_32}' "$out/bin/teams-for-linux" \ --prefix PATH : ${ lib.makeBinPath [ alsa-utils @@ -109,6 +109,8 @@ buildNpmPackage rec { passthru.updateScript = nix-update-script { }; + versionCheckProgramArg = [ "--version" ]; + meta = { description = "Unofficial Microsoft Teams client for Linux"; mainProgram = "teams-for-linux"; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/third_party/nixpkgs/pkgs/by-name/tf/tflint/package.nix similarity index 62% rename from third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix rename to third_party/nixpkgs/pkgs/by-name/tf/tflint/package.nix index c3a7b65b05..5ec4650a11 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/third_party/nixpkgs/pkgs/by-name/tf/tflint/package.nix @@ -1,21 +1,25 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, runCommand -, makeWrapper -, tflint -, tflint-plugins -, symlinkJoin +{ + lib, + buildGoModule, + fetchFromGitHub, + runCommand, + makeWrapper, + tflint, + tflint-plugins, + symlinkJoin, }: -buildGoModule rec { +let pname = "tflint"; version = "0.52.0"; +in +buildGoModule { + inherit pname version; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-H27krznCX00F0EZ4ahdsMVh+wcAAUC/ErQac9Y4QaJs="; }; @@ -25,9 +29,13 @@ buildGoModule rec { subPackages = [ "." ]; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + ]; - passthru.withPlugins = plugins: + passthru.withPlugins = + plugins: let actualPlugins = plugins tflint-plugins; pluginDir = symlinkJoin { @@ -38,17 +46,18 @@ buildGoModule rec { runCommand "tflint-with-plugins" { nativeBuildInputs = [ makeWrapper ]; - } '' - makeWrapper ${tflint}/bin/tflint $out/bin/tflint \ - --set TFLINT_PLUGIN_DIR "${pluginDir}" - ''; + } + '' + makeWrapper ${tflint}/bin/tflint $out/bin/tflint \ + --set TFLINT_PLUGIN_DIR "${pluginDir}" + ''; - meta = with lib; { + meta = { description = "Terraform linter focused on possible errors, best practices, and so on"; mainProgram = "tflint"; homepage = "https://github.com/terraform-linters/tflint"; changelog = "https://github.com/terraform-linters/tflint/blob/v${version}/CHANGELOG.md"; - license = licenses.mpl20; - maintainers = [ ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ momeemt ]; }; } diff --git a/third_party/nixpkgs/pkgs/by-name/th/theattyr/package.nix b/third_party/nixpkgs/pkgs/by-name/th/theattyr/package.nix new file mode 100644 index 0000000000..d23a00943e --- /dev/null +++ b/third_party/nixpkgs/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 = "A 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/third_party/nixpkgs/pkgs/by-name/to/tomboy-ng/package.nix b/third_party/nixpkgs/pkgs/by-name/to/tomboy-ng/package.nix new file mode 100644 index 0000000000..4341d4ac83 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/to/tomboy-ng/simplify-build-script.patch b/third_party/nixpkgs/pkgs/by-name/to/tomboy-ng/simplify-build-script.patch new file mode 100644 index 0000000000..d2b08ca2a0 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/to/tomlplusplus/package.nix b/third_party/nixpkgs/pkgs/by-name/to/tomlplusplus/package.nix new file mode 100644 index 0000000000..7d95a15503 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/to/tor-browser/package.nix b/third_party/nixpkgs/pkgs/by-name/to/tor-browser/package.nix index f84198772e..e0d96106f7 100644 --- a/third_party/nixpkgs/pkgs/by-name/to/tor-browser/package.nix +++ b/third_party/nixpkgs/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"; 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-RNsTj8/HP10ElIjutYCqp50gN7W7Kz+DA94rkkU/VaI="; }; 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-rHInikR2UvsB8A0cC7gqj09CWajJtR9ZhS3WFrv2z94="; }; }; @@ -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/third_party/nixpkgs/pkgs/by-name/tp/tpi/package.nix b/third_party/nixpkgs/pkgs/by-name/tp/tpi/package.nix new file mode 100644 index 0000000000..bd9965029e --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/tu/tuifimanager/package.nix b/third_party/nixpkgs/pkgs/by-name/tu/tuifimanager/package.nix index 26b30a477d..7d2a68badb 100644 --- a/third_party/nixpkgs/pkgs/by-name/tu/tuifimanager/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/tu/tun2proxy/Cargo.lock.patch b/third_party/nixpkgs/pkgs/by-name/tu/tun2proxy/Cargo.lock.patch new file mode 100644 index 0000000000..15dfcdb265 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/tu/tun2proxy/package.nix b/third_party/nixpkgs/pkgs/by-name/tu/tun2proxy/package.nix new file mode 100644 index 0000000000..984cafc2d9 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/tu/turbo/package.nix b/third_party/nixpkgs/pkgs/by-name/tu/turbo/package.nix index c1966e9821..bfc1255eb0 100644 --- a/third_party/nixpkgs/pkgs/by-name/tu/turbo/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/tu/turbo/package.nix @@ -10,10 +10,9 @@ disableUpdateNotifier ? true, }: -symlinkJoin rec { +symlinkJoin { pname = "turbo"; inherit (turbo-unwrapped) version; - name = "${pname}-${version}"; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/third_party/nixpkgs/pkgs/by-name/tu/turbocase/package.nix b/third_party/nixpkgs/pkgs/by-name/tu/turbocase/package.nix new file mode 100644 index 0000000000..cfc46e3c5a --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ui/uiua/package.nix b/third_party/nixpkgs/pkgs/by-name/ui/uiua/package.nix index 19dbe22d98..9c3de766bc 100644 --- a/third_party/nixpkgs/pkgs/by-name/ui/uiua/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ui/uiua386/package.nix b/third_party/nixpkgs/pkgs/by-name/ui/uiua386/package.nix index 6b37680ba2..198d0a8cea 100644 --- a/third_party/nixpkgs/pkgs/by-name/ui/uiua386/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/un/universal-android-debloater/package.nix b/third_party/nixpkgs/pkgs/by-name/un/universal-android-debloater/package.nix index 30803b31de..8fc5e35f5f 100644 --- a/third_party/nixpkgs/pkgs/by-name/un/universal-android-debloater/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/up/uplosi/package.nix b/third_party/nixpkgs/pkgs/by-name/up/uplosi/package.nix index 074bf872f9..b1283ee263 100644 --- a/third_party/nixpkgs/pkgs/by-name/up/uplosi/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/up/uplosi/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "uplosi"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "edgelesssys"; repo = pname; rev = "v${version}"; - hash = "sha256-AtsFZ92WkVkH8fd0Xa0D6/PR84/dtOH6gpM4mtn32Hk="; + hash = "sha256-MsZ4Bl8sW1dZUB9cYPsaLtc8P8RRx4hafSbNB4vXqi4="; }; vendorHash = "sha256-o7PPgW3JL47G6Na5n9h3RasRMfU25FD1U/wCMaydRmc="; diff --git a/third_party/nixpkgs/pkgs/by-name/uv/uv/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/uv/uv/Cargo.lock index 066981fdff..28a28b4206 100644 --- a/third_party/nixpkgs/pkgs/by-name/uv/uv/Cargo.lock +++ b/third_party/nixpkgs/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,9 +2468,9 @@ 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", ] @@ -2667,9 +2686,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", @@ -2937,9 +2956,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 +2978,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 +3162,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 +3181,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 +3201,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 +3280,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 +3465,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", @@ -3586,18 +3629,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 +3734,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", @@ -4096,7 +4139,7 @@ checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" [[package]] name = "uv" -version = "0.4.25" +version = "0.4.28" dependencies = [ "anstream", "anyhow", @@ -4304,8 +4347,6 @@ name = "uv-cache" version = "0.0.1" dependencies = [ "clap", - "directories", - "etcetera", "fs-err", "nanoid", "rmp-serde", @@ -4316,6 +4357,7 @@ dependencies = [ "url", "uv-cache-info", "uv-cache-key", + "uv-dirs", "uv-distribution-types", "uv-fs", "uv-normalize", @@ -4502,6 +4544,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" @@ -5136,9 +5188,11 @@ dependencies = [ name = "uv-settings" version = "0.0.1" dependencies = [ + "assert_fs", "clap", "dirs-sys", "fs-err", + "indoc", "schemars", "serde", "textwrap", @@ -5179,10 +5233,9 @@ dependencies = [ name = "uv-state" version = "0.0.1" dependencies = [ - "directories", - "etcetera", "fs-err", "tempfile", + "uv-dirs", ] [[package]] @@ -5193,7 +5246,6 @@ version = "0.0.1" name = "uv-tool" version = "0.0.1" dependencies = [ - "dirs-sys", "fs-err", "pathdiff", "serde", @@ -5202,6 +5254,7 @@ dependencies = [ "toml_edit", "tracing", "uv-cache", + "uv-dirs", "uv-fs", "uv-install-wheel", "uv-installer", @@ -5237,7 +5290,7 @@ dependencies = [ [[package]] name = "uv-version" -version = "0.4.25" +version = "0.4.28" [[package]] name = "uv-virtualenv" @@ -5288,6 +5341,7 @@ dependencies = [ "toml_edit", "tracing", "url", + "uv-cache-key", "uv-distribution-types", "uv-fs", "uv-git", diff --git a/third_party/nixpkgs/pkgs/by-name/uv/uv/package.nix b/third_party/nixpkgs/pkgs/by-name/uv/uv/package.nix index 90da34f6d6..c2b4691e9c 100644 --- a/third_party/nixpkgs/pkgs/by-name/uv/uv/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/uv/uv/package.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "uv"; - version = "0.4.25"; + version = "0.4.28"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = "refs/tags/${version}"; - hash = "sha256-qAfM9I2NboYkUukWnOjuGcdjp8IONAI6Qwwg1r9kCGg="; + hash = "sha256-QoEgwMhoqabwbtjOVOW+hgOUuDVZQQ5x+cF6kdWgFvc="; }; cargoDeps = rustPlatform.importCargoLock { @@ -31,7 +31,6 @@ python3Packages.buildPythonApplication rec { "async_zip-0.0.17" = "sha256-3k9rc4yHWhqsCUJ17K55F8aQoCKdVamrWAn6IDWo3Ss="; "pubgrub-0.2.1" = "sha256-mSpRBdQJWtKKD1zHkV7vuyfKTDY6Ejgjll5q5ryCfmY="; "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/third_party/nixpkgs/pkgs/by-name/uw/uwsm/package.nix b/third_party/nixpkgs/pkgs/by-name/uw/uwsm/package.nix index 578cb2cbb7..8beb49c7e4 100644 --- a/third_party/nixpkgs/pkgs/by-name/uw/uwsm/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/va/vacuum-go/package.nix b/third_party/nixpkgs/pkgs/by-name/va/vacuum-go/package.nix index b1ca9c285f..095c395c71 100644 --- a/third_party/nixpkgs/pkgs/by-name/va/vacuum-go/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/va/vacuum-go/package.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "vacuum-go"; - version = "0.12.1"; + version = "0.14.1"; src = fetchFromGitHub { owner = "daveshanley"; repo = "vacuum"; # using refs/tags because simple version gives: 'the given path has multiple possibilities' error rev = "refs/tags/v${version}"; - hash = "sha256-uNmjb1fj9bMawvNgITxu/RIZeLEn8JzIpFbSMrsmFIQ="; + hash = "sha256-t/KbwyxInMvxsICdh0kix27+MKre480+I/KkbwxLg1M="; }; - vendorHash = "sha256-Yxzj3IAYp6C7qLbV2RV4lWZRDSheauZXvd+p5B5Y3qA="; + vendorHash = "sha256-6ay7aGFf50txrRZbjOuG2rVeetVo0SWgpURLmFyhszA="; CGO_ENABLED = 0; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/by-name/va/vale/package.nix b/third_party/nixpkgs/pkgs/by-name/va/vale/package.nix index 3027258e7b..4ece69a6f1 100644 --- a/third_party/nixpkgs/pkgs/by-name/va/vale/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/va/vapoursynth/nix-plugin-loader.patch b/third_party/nixpkgs/pkgs/by-name/va/vapoursynth/nix-plugin-loader.patch deleted file mode 100644 index e06c9a6cf6..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/va/vapoursynth/nix-plugin-loader.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/core/vscore.cpp b/src/core/vscore.cpp -index 73e2eafc..66a01326 100644 ---- a/src/core/vscore.cpp -+++ b/src/core/vscore.cpp -@@ -1779,6 +1779,12 @@ void VSCore::isPortableInit() { - } - #endif - -+void __attribute__((weak)) VSLoadPluginsNix(void (*load)(VSCore *core, const std::filesystem::path &), VSCore *); -+ -+static void VSLoadPluginsNixCallback(VSCore *core, const std::filesystem::path &path) { -+ core->loadAllPluginsInPath(path); -+} -+ - VSCore::VSCore(int flags) : - numFilterInstances(1), - numFunctionInstances(0), -@@ -1890,6 +1896,10 @@ VSCore::VSCore(int flags) : - #endif - } - -+ if (VSLoadPluginsNix != nullptr) { -+ VSLoadPluginsNix(VSLoadPluginsNixCallback, this); -+ }; -+ - VSMap *settings = readSettings(configFile); - const char *error = vs_internal_vsapi.mapGetError(settings); - if (error) { diff --git a/third_party/nixpkgs/pkgs/by-name/va/vapoursynth/package.nix b/third_party/nixpkgs/pkgs/by-name/va/vapoursynth/package.nix index 7a40f1eba1..3fdbfd1cc4 100644 --- a/third_party/nixpkgs/pkgs/by-name/va/vapoursynth/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/va/vapoursynth/package.nix @@ -8,7 +8,6 @@ runCommandCC, runCommand, vapoursynth, - writeText, buildEnv, zimg, libass, @@ -29,8 +28,6 @@ stdenv.mkDerivation rec { hash = "sha256-T2bCVNH0dLM9lFYChXzvD6AJM3xEtOVCb2tI10tIXJs="; }; - patches = [ ./nix-plugin-loader.patch ]; - nativeBuildInputs = [ pkg-config autoreconfHook @@ -53,6 +50,7 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; + doInstallCheck = true; passthru = rec { # If vapoursynth is added to the build inputs of mpv and then @@ -66,7 +64,6 @@ stdenv.mkDerivation rec { lib python3 buildEnv - writeText runCommandCC stdenv runCommand @@ -83,6 +80,14 @@ stdenv.mkDerivation rec { }; }; + postPatch = '' + # Export weak symbol nixPluginDir to permit override of default plugin path + sed -E -i \ + -e 's/(VS_PATH_PLUGINDIR)/(nixPluginDir ? nixPluginDir : \1)/g' \ + -e '1i\extern char const __attribute__((weak)) nixPluginDir[];' \ + src/core/vscore.cpp + ''; + postInstall = '' wrapProgram $out/bin/vspipe \ --prefix PYTHONPATH : $out/${python3.sitePackages} @@ -92,6 +97,18 @@ stdenv.mkDerivation rec { mkdir $out/lib/vapoursynth ''; + installCheckPhase = '' + runHook preInstallCheck + + libv="$out/lib/libvapoursynth${stdenv.hostPlatform.extensions.sharedLibrary}" + if ! $NM -g -P "$libv" | grep -q '^nixPluginDir w'; then + echo "Weak symbol nixPluginDir is missing from $libv." >&2 + exit 1 + fi + + runHook postInstallCheck + ''; + meta = with lib; { broken = stdenv.hostPlatform.isDarwin; # see https://github.com/NixOS/nixpkgs/pull/189446 for partial fix description = "Video processing framework with the future in mind"; diff --git a/third_party/nixpkgs/pkgs/by-name/va/vapoursynth/plugin-interface.nix b/third_party/nixpkgs/pkgs/by-name/va/vapoursynth/plugin-interface.nix index c240b205ac..2716c27225 100644 --- a/third_party/nixpkgs/pkgs/by-name/va/vapoursynth/plugin-interface.nix +++ b/third_party/nixpkgs/pkgs/by-name/va/vapoursynth/plugin-interface.nix @@ -2,7 +2,6 @@ lib, python3, buildEnv, - writeText, runCommandCC, stdenv, runCommand, @@ -35,29 +34,19 @@ let paths = deepPlugins; }; - pluginLoader = - let - source = writeText "vapoursynth-nix-plugins.cpp" '' - #include - - struct VSCore; - - void VSLoadPluginsNix(void (*load)(VSCore *, const std::filesystem::path &), VSCore *core) { - ${lib.concatMapStrings ( - path: ''load(core, std::filesystem::u8path("${path}/lib/vapoursynth"));'' - ) deepPlugins} - } - ''; - in - runCommandCC "vapoursynth-plugin-loader" + # Override default plugin path through nixPluginDir symbol + nixPlugins = + runCommandCC "libvapoursynth-nix-plugins${ext}" { executable = true; preferLocalBuild = true; allowSubstitutes = false; + src = '' + char const nixPluginDir[] = "${pluginsEnv}/lib/vapoursynth"; + ''; } '' - mkdir -p $out/lib - $CXX -std=c++17 -shared -fPIC ${source} -o "$out/lib/libvapoursynth-nix-plugins${ext}" + $CC -x c -shared -fPIC - -o "$out" <<<"$src" ''; ext = stdenv.hostPlatform.extensions.sharedLibrary; @@ -123,9 +112,7 @@ runCommand "${vapoursynth.name}-with-plugins" ${vapoursynth}/$binaryFile done - ln -s \ - ${pluginLoader}/lib/libvapoursynth-nix-plugins${ext} \ - $out/lib/libvapoursynth-nix-plugins${ext} + ln -s ${nixPlugins} $out/lib/libvapoursynth-nix-plugins${ext} ln -s ${vapoursynth}/include $out/include ln -s ${vapoursynth}/lib/vapoursynth/* $out/lib/vapoursynth ln -s \ diff --git a/third_party/nixpkgs/pkgs/by-name/ve/velero/package.nix b/third_party/nixpkgs/pkgs/by-name/ve/velero/package.nix index 65934fb56b..357c68d3c8 100644 --- a/third_party/nixpkgs/pkgs/by-name/ve/velero/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ve/velero/package.nix @@ -31,7 +31,7 @@ buildGoModule rec { ''; nativeBuildInputs = [ installShellFiles ]; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' $out/bin/velero completion bash > velero.bash $out/bin/velero completion zsh > velero.zsh installShellCompletion velero.{bash,zsh} diff --git a/third_party/nixpkgs/pkgs/by-name/ve/vencord/package.nix b/third_party/nixpkgs/pkgs/by-name/ve/vencord/package.nix index 58b5d8da8a..981e5d08a4 100644 --- a/third_party/nixpkgs/pkgs/by-name/ve/vencord/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ve/vencord/package.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vencord"; - version = "1.10.4"; + version = "1.10.5"; src = fetchFromGitHub { owner = "Vendicated"; repo = "Vencord"; rev = "v${finalAttrs.version}"; - hash = "sha256-lAMcvJzKFpIvA4QzCnhJddu8EL2SE4iYNvkqesHzsb8="; + hash = "sha256-pzb2x5tTDT6yUNURbAok5eQWZHaxP/RUo8T0JECKHJ4="; }; pnpmDeps = pnpm.fetchDeps { @@ -98,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: { FlafyDev NotAShelf Scrumplex + donteatoreo ]; }; }) diff --git a/third_party/nixpkgs/pkgs/by-name/ve/vep/package.nix b/third_party/nixpkgs/pkgs/by-name/ve/vep/package.nix new file mode 100644 index 0000000000..576b4c9b35 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ve/verible/package.nix b/third_party/nixpkgs/pkgs/by-name/ve/verible/package.nix index 4bfc1a1ca2..3ca60e332c 100644 --- a/third_party/nixpkgs/pkgs/by-name/ve/verible/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ve/versatiles/package.nix b/third_party/nixpkgs/pkgs/by-name/ve/versatiles/package.nix new file mode 100644 index 0000000000..7f960aa06c --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/ve/versatiles/package.nix @@ -0,0 +1,51 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "versatiles"; + version = "0.12.10"; # 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-LKUpxsAy39dX8hESlUEVs4rkOpYsd7kbATfnU1QYd9Q="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed. + }; + + cargoHash = "sha256-dkFnoQY1+VNNrjS+o5Y0cvhWKoHt38KJKyNhCQ0dGaY="; # 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/third_party/nixpkgs/pkgs/by-name/vi/victoriametrics/package.nix b/third_party/nixpkgs/pkgs/by-name/vi/victoriametrics/package.nix index 25cb8a79de..8f265415b3 100644 --- a/third_party/nixpkgs/pkgs/by-name/vi/victoriametrics/package.nix +++ b/third_party/nixpkgs/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; @@ -91,6 +91,7 @@ buildGoModule rec { ivan leona shawn8901 + ryan4yin ]; changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v${version}"; mainProgram = "victoria-metrics"; diff --git a/third_party/nixpkgs/pkgs/by-name/wa/warp-plus/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/warp-plus/package.nix new file mode 100644 index 0000000000..ec80044aae --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/versions.json b/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/versions.json index bc420f89b3..365b4a1787 100644 --- a/third_party/nixpkgs/pkgs/by-name/wa/warp-terminal/versions.json +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/wa/wasm-bindgen-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/wasm-bindgen-cli/package.nix index d9b9978054..e705a77dd1 100644 --- a/third_party/nixpkgs/pkgs/by-name/wa/wasm-bindgen-cli/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/wa/watchyourlan/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/watchyourlan/package.nix new file mode 100644 index 0000000000..f7ab4f9022 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/wa/waybar-mpris/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/waybar-mpris/package.nix index adbe513b9b..93f957db33 100644 --- a/third_party/nixpkgs/pkgs/by-name/wa/waybar-mpris/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/wa/waycheck/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/waycheck/package.nix index b8dd02dabd..3480c61ad2 100644 --- a/third_party/nixpkgs/pkgs/by-name/wa/waycheck/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/wa/wayfreeze/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/wayfreeze/package.nix index b679bc6f1f..0f0997888d 100644 --- a/third_party/nixpkgs/pkgs/by-name/wa/wayfreeze/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/wa/wayfreeze/package.nix @@ -2,20 +2,23 @@ lib, fetchFromGitHub, rustPlatform, - libxkbcommon + libxkbcommon, + nix-update-script, }: rustPlatform.buildRustPackage { pname = "wayfreeze"; - version = "0-unstable-2024-05-23"; + version = "0-unstable-2024-09-20"; src = fetchFromGitHub { owner = "Jappie3"; repo = "wayfreeze"; - rev = "069dea0b832bd5b7a7872a57bd53f51cd377f206"; - hash = "sha256-3btFzZbkHT6kBBA3M7OwFsD710VpMiHSXIpHmvCD/es="; + rev = "dcbe2690ce41a286ef1eed54747bac47cee6dc2c"; + hash = "sha256-XlZSVN/kTSA5X/kTpD/Hr5YBXdfh8gJPq5Da4tL0Gpk="; }; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + cargoHash = "sha256-3OjZhWAgfmMZ0OGeRawk3KZpPqz1QCVkwsyGM+E7o88="; buildInputs = [ @@ -26,7 +29,10 @@ rustPlatform.buildRustPackage { description = "Tool to freeze the screen of a Wayland compositor"; homepage = "https://github.com/Jappie3/wayfreeze"; license = licenses.agpl3Only; - maintainers = with lib.maintainers; [ purrpurrn ]; + maintainers = with lib.maintainers; [ + purrpurrn + jappie3 /* upstream dev */ + ]; mainProgram = "wayfreeze"; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/by-name/we/wealthfolio/package.nix b/third_party/nixpkgs/pkgs/by-name/we/wealthfolio/package.nix new file mode 100644 index 0000000000..6c9b993480 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/wh/whatsie/package.nix b/third_party/nixpkgs/pkgs/by-name/wh/whatsie/package.nix index dde65d9f9f..1a54a4f142 100644 --- a/third_party/nixpkgs/pkgs/by-name/wh/whatsie/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/wi/wired/package.nix b/third_party/nixpkgs/pkgs/by-name/wi/wired/package.nix new file mode 100644 index 0000000000..c18c4462b1 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/wi/wiremock/package.nix b/third_party/nixpkgs/pkgs/by-name/wi/wiremock/package.nix index 75e4c30f64..615da7a453 100644 --- a/third_party/nixpkgs/pkgs/by-name/wi/wiremock/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/wp/wprs/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/wp/wprs/Cargo.lock new file mode 100644 index 0000000000..aa282b11ba --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/wp/wprs/package.nix b/third_party/nixpkgs/pkgs/by-name/wp/wprs/package.nix new file mode 100644 index 0000000000..9adb934731 --- /dev/null +++ b/third_party/nixpkgs/pkgs/by-name/wp/wprs/package.nix @@ -0,0 +1,54 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + libxkbcommon, + python3, + python3Packages, +}: +rustPlatform.buildRustPackage rec { + 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 + python3Packages.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" + ''; + + 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/third_party/nixpkgs/pkgs/by-name/ws/wstunnel/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ws/wstunnel/Cargo.lock index 23168aeace..7339e0e993 100644 --- a/third_party/nixpkgs/pkgs/by-name/ws/wstunnel/Cargo.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ws/wstunnel/package.nix b/third_party/nixpkgs/pkgs/by-name/ws/wstunnel/package.nix index 1ea48259eb..b2b5e42062 100644 --- a/third_party/nixpkgs/pkgs/by-name/ws/wstunnel/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/x4/x4/package.nix b/third_party/nixpkgs/pkgs/by-name/x4/x4/package.nix new file mode 100644 index 0000000000..d0c153b4c5 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/xf/xfs-undelete/package.nix b/third_party/nixpkgs/pkgs/by-name/xf/xfs-undelete/package.nix index 390a19d1f0..030f3324fc 100644 --- a/third_party/nixpkgs/pkgs/by-name/xf/xfs-undelete/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/xo/xortool/package.nix b/third_party/nixpkgs/pkgs/by-name/xo/xortool/package.nix new file mode 100644 index 0000000000..a59eb77d8c --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/xrgears/default.nix b/third_party/nixpkgs/pkgs/by-name/xr/xrgears/package.nix similarity index 50% rename from third_party/nixpkgs/pkgs/applications/graphics/xrgears/default.nix rename to third_party/nixpkgs/pkgs/by-name/xr/xrgears/package.nix index cdb0977b4e..82a801a54b 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/xrgears/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/xrootd/fetchxrd.nix b/third_party/nixpkgs/pkgs/by-name/xr/xrootd/fetchxrd.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/networking/xrootd/fetchxrd.nix rename to third_party/nixpkgs/pkgs/by-name/xr/xrootd/fetchxrd.nix diff --git a/third_party/nixpkgs/pkgs/by-name/xr/xrootd/package.nix b/third_party/nixpkgs/pkgs/by-name/xr/xrootd/package.nix new file mode 100644 index 0000000000..2860c11985 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/electronics/xschem/default.nix b/third_party/nixpkgs/pkgs/by-name/xs/xschem/package.nix similarity index 92% rename from third_party/nixpkgs/pkgs/applications/science/electronics/xschem/default.nix rename to third_party/nixpkgs/pkgs/by-name/xs/xschem/package.nix index 72f4687f5c..c5146b6101 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/xschem/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ya/yabai/package.nix b/third_party/nixpkgs/pkgs/by-name/ya/yabai/package.nix index 22f21c1910..53834f3cd7 100644 --- a/third_party/nixpkgs/pkgs/by-name/ya/yabai/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ya/yandex-music/info.json b/third_party/nixpkgs/pkgs/by-name/ya/yandex-music/info.json deleted file mode 100644 index 0223a0ae3a..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ya/yandex-music/package.nix b/third_party/nixpkgs/pkgs/by-name/ya/yandex-music/package.nix index 6ee96d54fd..3e9e70770c 100644 --- a/third_party/nixpkgs/pkgs/by-name/ya/yandex-music/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ya/yandex-music/update.sh b/third_party/nixpkgs/pkgs/by-name/ya/yandex-music/update.sh index 92ebdb8d8a..c60b8cdf9a 100755 --- a/third_party/nixpkgs/pkgs/by-name/ya/yandex-music/update.sh +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ya/yandex-music/ym_info.json b/third_party/nixpkgs/pkgs/by-name/ya/yandex-music/ym_info.json index cba72691ed..dd5ec74368 100644 --- a/third_party/nixpkgs/pkgs/by-name/ya/yandex-music/ym_info.json +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ya/yazi-unwrapped/package.nix b/third_party/nixpkgs/pkgs/by-name/ya/yazi-unwrapped/package.nix index 561eea7fdb..8c260b3dd7 100644 --- a/third_party/nixpkgs/pkgs/by-name/ya/yazi-unwrapped/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -46,11 +46,12 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/sxyazi/yazi"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - xyenon - matthiasbeyer - linsui eljamm + khaneliman + linsui + matthiasbeyer uncenter + xyenon ]; mainProgram = "yazi"; }; diff --git a/third_party/nixpkgs/pkgs/by-name/yo/your_spotify/package.nix b/third_party/nixpkgs/pkgs/by-name/yo/your_spotify/package.nix index 77864788fa..78c1b96700 100644 --- a/third_party/nixpkgs/pkgs/by-name/yo/your_spotify/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/yo/youtrack_2022_3/package.nix b/third_party/nixpkgs/pkgs/by-name/yo/youtrack_2022_3/package.nix deleted file mode 100644 index 5e1ab1a754..0000000000 --- a/third_party/nixpkgs/pkgs/by-name/yo/youtrack_2022_3/package.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, jdk17, gawk }: - -stdenv.mkDerivation (finalAttrs: { - pname = "youtrack"; - version = "2022.3.65371"; - - jar = fetchurl { - url = "https://download.jetbrains.com/charisma/youtrack-${finalAttrs.version}.jar"; - hash = "sha256-NQKWmKEq5ljUXd64zY27Nj8TU+uLdA37chbFVdmwjNs="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - makeWrapper ${jdk17}/bin/java $out/bin/youtrack \ - --add-flags "\$YOUTRACK_JVM_OPTS -jar $jar" \ - --prefix PATH : "${lib.makeBinPath [ gawk ]}" \ - --set JRE_HOME ${jdk17} - runHook postInstall - ''; - - meta = { - description = "Issue tracking and project management tool for developers"; - maintainers = lib.teams.serokell.members ++ [ lib.maintainers.leona ]; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - # https://www.jetbrains.com/youtrack/buy/license.html - license = lib.licenses.unfree; - }; -}) diff --git a/third_party/nixpkgs/pkgs/by-name/yt/ytdl-sub/package.nix b/third_party/nixpkgs/pkgs/by-name/yt/ytdl-sub/package.nix new file mode 100644 index 0000000000..5e43a05480 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/yt/ytmdesktop/package.nix b/third_party/nixpkgs/pkgs/by-name/yt/ytmdesktop/package.nix index 21d32541bc..f6e04c930b 100644 --- a/third_party/nixpkgs/pkgs/by-name/yt/ytmdesktop/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/za/zabbix-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/za/zabbix-cli/package.nix index 16fd8c84b6..2cb3a0a976 100644 --- a/third_party/nixpkgs/pkgs/by-name/za/zabbix-cli/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/Cargo.lock index 9a7a5be0dc..ed5ad77c28 100644 --- a/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/Cargo.lock +++ b/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/Cargo.lock @@ -250,7 +250,6 @@ dependencies = [ "serde_json", "strum 0.25.0", "thiserror", - "tokio", "util", ] @@ -341,9 +340,9 @@ dependencies = [ [[package]] name = "ashpd" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" +checksum = "4d43c03d9e36dd40cab48435be0b09646da362c278223ca535493877b2c1dee9" dependencies = [ "async-fs 2.1.2", "async-net 2.0.0", @@ -395,7 +394,7 @@ dependencies = [ "gpui", "handlebars 4.5.0", "heed", - "html_to_markdown 0.1.0", + "html_to_markdown", "http_client", "indexed_docs", "indoc", @@ -535,9 +534,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429" dependencies = [ "deflate64", "flate2", @@ -839,15 +838,14 @@ dependencies = [ [[package]] name = "async-stripe" -version = "0.39.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58d670cf4d47a1b8ffef54286a5625382e360a34ee76902fd93ad8c7032a0c30" +version = "0.40.0" +source = "git+https://github.com/zed-industries/async-stripe?rev=3672dd4efb7181aa597bf580bf5a2f5d23db6735#3672dd4efb7181aa597bf580bf5a2f5d23db6735" dependencies = [ "chrono", "futures-util", "http-types", - "hyper", - "hyper-rustls", + "hyper 0.14.30", + "hyper-rustls 0.24.2", "serde", "serde_json", "serde_path_to_error", @@ -905,9 +903,9 @@ dependencies = [ [[package]] name = "async-tungstenite" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc" +checksum = "3609af4bbf701ddaf1f6bb4e6257dff4ff8932327d0e685d3f653724c258b1ac" dependencies = [ "async-std", "async-tls", @@ -915,7 +913,7 @@ dependencies = [ "futures-util", "log", "pin-project-lite", - "tungstenite 0.20.1", + "tungstenite 0.21.0", ] [[package]] @@ -946,7 +944,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a860072022177f903e59730004fb5dc13db9275b79bb2aef7ba8ce831956c233" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-sink", "futures-util", "memchr", @@ -1060,7 +1058,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "fastrand 2.1.1", "hex", "http 0.2.12", @@ -1099,7 +1097,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "fastrand 2.1.1", "http 0.2.12", "http-body 0.4.6", @@ -1130,7 +1128,7 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "fastrand 2.1.1", "hex", "hmac", @@ -1160,7 +1158,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.12", "once_cell", "regex-lite", @@ -1182,7 +1180,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.12", "once_cell", "regex-lite", @@ -1223,7 +1221,7 @@ dependencies = [ "aws-smithy-http", "aws-smithy-runtime-api", "aws-smithy-types", - "bytes 1.7.1", + "bytes 1.7.2", "crypto-bigint 0.5.5", "form_urlencoded", "hex", @@ -1260,7 +1258,7 @@ checksum = "598b1689d001c4d4dc3cb386adb07d37786783aee3ac4b324bcadac116bf3d23" dependencies = [ "aws-smithy-http", "aws-smithy-types", - "bytes 1.7.1", + "bytes 1.7.2", "crc32c", "crc32fast", "hex", @@ -1280,7 +1278,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6363078f927f612b970edf9d1903ef5cef9a64d1e8423525ebb1f0a1633c858" dependencies = [ "aws-smithy-types", - "bytes 1.7.1", + "bytes 1.7.2", "crc32fast", ] @@ -1293,7 +1291,7 @@ dependencies = [ "aws-smithy-eventstream", "aws-smithy-runtime-api", "aws-smithy-types", - "bytes 1.7.1", + "bytes 1.7.2", "bytes-utils", "futures-core", "http 0.2.12", @@ -1334,15 +1332,15 @@ dependencies = [ "aws-smithy-http", "aws-smithy-runtime-api", "aws-smithy-types", - "bytes 1.7.1", + "bytes 1.7.2", "fastrand 2.1.1", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "http-body 1.0.1", "httparse", - "hyper", - "hyper-rustls", + "hyper 0.14.30", + "hyper-rustls 0.24.2", "once_cell", "pin-project-lite", "pin-utils", @@ -1359,7 +1357,7 @@ checksum = "e086682a53d3aa241192aa110fa8dfce98f2f5ac2ead0de84d41582c7e8fdb96" dependencies = [ "aws-smithy-async", "aws-smithy-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.12", "http 1.1.0", "pin-project-lite", @@ -1375,7 +1373,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "273dcdfd762fae3e1650b8024624e7cd50e484e37abdab73a7a706188ad34543" dependencies = [ "base64-simd", - "bytes 1.7.1", + "bytes 1.7.2", "bytes-utils", "futures-core", "http 0.2.12", @@ -1427,12 +1425,12 @@ dependencies = [ "axum-core", "base64 0.21.7", "bitflags 1.3.2", - "bytes 1.7.1", + "bytes 1.7.2", "futures-util", "headers", "http 0.2.12", "http-body 0.4.6", - "hyper", + "hyper 0.14.30", "itoa", "matchit", "memchr", @@ -1445,7 +1443,7 @@ dependencies = [ "serde_path_to_error", "serde_urlencoded", "sha1", - "sync_wrapper", + "sync_wrapper 0.1.2", "tokio", "tokio-tungstenite 0.20.1", "tower", @@ -1460,7 +1458,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" dependencies = [ "async-trait", - "bytes 1.7.1", + "bytes 1.7.2", "futures-util", "http 0.2.12", "http-body 0.4.6", @@ -1477,7 +1475,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9a320103719de37b7b4da4c8eb629d4573f6bcfd3dfe80d3208806895ccf81d" dependencies = [ "axum", - "bytes 1.7.1", + "bytes 1.7.2", "futures-util", "http 0.2.12", "mime", @@ -1584,7 +1582,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", "syn 2.0.76", ] @@ -1604,7 +1602,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", "syn 2.0.76", ] @@ -1911,9 +1909,9 @@ dependencies = [ [[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 = "bytes-utils" @@ -1921,7 +1919,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "either", ] @@ -2100,12 +2098,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" -[[package]] -name = "castaway" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" - [[package]] name = "cbc" version = "0.1.2" @@ -2282,9 +2274,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", @@ -2292,9 +2284,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", @@ -2359,11 +2351,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0875e527e299fc5f4faba42870bf199a39ab0bb2dbba1b8aef0a2151451130f" dependencies = [ "bstr", - "bytes 1.7.1", + "bytes 1.7.2", "clickhouse-derive", "clickhouse-rs-cityhash-sys", "futures 0.3.30", - "hyper", + "hyper 0.14.30", "hyper-tls", "lz4", "sealed", @@ -2553,6 +2545,7 @@ dependencies = [ "collections", "ctor", "dashmap 6.0.1", + "derive_more", "dev_server_projects", "editor", "env_logger", @@ -2567,9 +2560,8 @@ dependencies = [ "headless", "hex", "http_client", - "hyper", + "hyper 0.14.30", "indoc", - "isahc_http_client", "jsonwebtoken", "language", "language_model", @@ -2593,7 +2585,8 @@ dependencies = [ "release_channel", "remote", "remote_server", - "reqwest", + "reqwest 0.11.27", + "reqwest_client", "rpc", "rustc-demangle", "scrypt", @@ -2677,7 +2670,7 @@ dependencies = [ name = "collections" version = "0.1.0" dependencies = [ - "rustc-hash", + "rustc-hash 1.1.0", ] [[package]] @@ -2698,7 +2691,7 @@ version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "memchr", ] @@ -2995,7 +2988,7 @@ dependencies = [ "log", "rangemap", "rayon", - "rustc-hash", + "rustc-hash 1.1.0", "rustybuzz", "self_cell", "swash", @@ -3050,18 +3043,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.111.0" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b80c3a50b9c4c7e5b5f73c0ed746687774fc9e36ef652b110da8daebf0c6e0e6" +checksum = "32d69b774780246008783a75edfb943eccc2487b6a43808503a07cd563f2ffde" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-bitset" -version = "0.111.0" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38778758c2ca918b05acb2199134e0c561fb577c50574259b26190b6c2d95ded" +checksum = "a7d8d71c6b32c1a7cff254c5e5d7359872c1e5e610fbe963472afcddbd9cf303" dependencies = [ "serde", "serde_derive", @@ -3069,9 +3062,9 @@ dependencies = [ [[package]] name = "cranelift-codegen" -version = "0.111.0" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58258667ad10e468bfc13a8d620f50dfcd4bb35d668123e97defa2549b9ad397" +checksum = "3ad3a906f2a3f3590ad9798d59a46959a8593258eb985af722f634723c063a2c" dependencies = [ "bumpalo", "cranelift-bforest", @@ -3085,40 +3078,40 @@ dependencies = [ "hashbrown 0.14.5", "log", "regalloc2", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "target-lexicon", ] [[package]] name = "cranelift-codegen-meta" -version = "0.111.0" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043f0b702e529dcb07ff92bd7d40e7d5317b5493595172c5eb0983343751ee06" +checksum = "cd5e4ee12262a135efbef3ced4ab2153adafe4adc55f36af94f9d73be0f7505d" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.111.0" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7763578888ab53eca5ce7da141953f828e82c2bfadcffc106d10d1866094ffbb" +checksum = "5b9374a2a5f060f72e3080fe1c87c9ff4bef2cbe798faae60daf276fb1a13968" [[package]] name = "cranelift-control" -version = "0.111.0" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32db15f08c05df570f11e8ab33cb1ec449a64b37c8a3498377b77650bef33d8b" +checksum = "fba3ca2f344bb22d265a928e7c3f5f46e1a2eb41f1393bd53538d07b6ffb5293" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.111.0" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5289cdb399381a27e7bbfa1b42185916007c3d49aeef70b1d01cb4caa8010130" +checksum = "a6aef77dfb018eed09d92d4244abe3c1c060cbbd900c24f75ddde7d75d0e781e" dependencies = [ "cranelift-bitset", "serde", @@ -3127,9 +3120,9 @@ dependencies = [ [[package]] name = "cranelift-frontend" -version = "0.111.0" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31ba8ab24eb9470477e98ddfa3c799a649ac5a0d9a2042868c4c952133c234e8" +checksum = "7b1d6954f03d63df1cb95d66153c97df0201862220861349bbd5f583754b1917" dependencies = [ "cranelift-codegen", "log", @@ -3139,15 +3132,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.111.0" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b72a3c5c166a70426dcb209bdd0bb71a787c1ea76023dc0974fbabca770e8f9" +checksum = "f8b9b7e088b784796ea8aa5947c1cc12034c1b076a077ec2a5a287da717fa746" [[package]] name = "cranelift-native" -version = "0.111.0" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a42424c956bbc31fc5c2706073df896156c5420ae8fa2a5d48dbc7b295d71b" +checksum = "4cab7424083d070669ff3fdeea7c5b4b5013a055aa1ee0532703f17a5f62af64" dependencies = [ "cranelift-codegen", "libc", @@ -3156,9 +3149,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.111.0" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49778df4289933d735b93c30a345513e030cf83101de0036e19b760f8aa09f68" +checksum = "81a9f6d0495984eef1d753ec8748de0b216b37ade16d219f1c0f27d8188d7f77" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -3341,36 +3334,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "curl" -version = "0.4.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2 0.5.7", - "windows-sys 0.52.0", -] - -[[package]] -name = "curl-sys" -version = "0.4.74+curl-8.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8af10b986114528fcdc4b63b6f5f021b7057618411046a4de2ba0f0149a097bf" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "windows-sys 0.52.0", -] - [[package]] name = "cursor-icon" version = "1.1.0" @@ -3839,9 +3802,9 @@ checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" [[package]] name = "emojis" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e72f23d65b46527e461b161ab9a126c378aa2249d8a8d15718d23ab1fb4d8786" +checksum = "99e1f1df1f181f2539bac8bf027d31ca5ffbf9e559e3f2d09413b9107b5c02f4" dependencies = [ "phf", ] @@ -4032,12 +3995,12 @@ dependencies = [ "git", "gpui", "http_client", - "isahc_http_client", "language", "languages", "node_runtime", "open_ai", "project", + "reqwest_client", "semantic_index", "serde", "serde_json", @@ -4127,7 +4090,6 @@ dependencies = [ "gpui", "http_client", "indexed_docs", - "isahc_http_client", "language", "log", "lsp", @@ -4136,6 +4098,7 @@ dependencies = [ "paths", "project", "release_channel", + "reqwest_client", "schemars", "semantic_version", "serde", @@ -4145,7 +4108,6 @@ dependencies = [ "snippet_provider", "task", "theme", - "tokio", "toml 0.8.19", "ui", "url", @@ -4167,9 +4129,9 @@ dependencies = [ "env_logger", "extension", "fs", - "isahc_http_client", "language", "log", + "reqwest_client", "rpc", "serde", "serde_json", @@ -5148,9 +5110,9 @@ dependencies = [ [[package]] name = "grid" -version = "0.14.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be136d9dacc2a13cc70bb6c8f902b414fb2641f8db1314637c6b7933411a8f82" +checksum = "d196ffc1627db18a531359249b2bf8416178d84b729f3cebeb278f285fb9b58c" [[package]] name = "group" @@ -5169,7 +5131,7 @@ version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "fnv", "futures-core", "futures-sink", @@ -5182,6 +5144,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes 1.7.2", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.4.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "half" version = "2.4.1" @@ -5265,7 +5246,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ "base64 0.21.7", - "bytes 1.7.1", + "bytes 1.7.2", "headers-core", "http 0.2.12", "httpdate", @@ -5297,7 +5278,7 @@ dependencies = [ "node_runtime", "postage", "project", - "rpc", + "proto", "settings", "shellexpand 2.1.2", "signal-hook", @@ -5460,25 +5441,13 @@ dependencies = [ "regex", ] -[[package]] -name = "html_to_markdown" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e608e8dd0939bfb6b516d96a5919751b835297a02230aecb88d2fc84ebebaa8a" -dependencies = [ - "anyhow", - "html5ever", - "markup5ever_rcdom", - "regex", -] - [[package]] name = "http" version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "fnv", "itoa", ] @@ -5489,7 +5458,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "fnv", "itoa", ] @@ -5500,7 +5469,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.12", "pin-project-lite", ] @@ -5511,7 +5480,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "http 1.1.0", ] @@ -5521,7 +5490,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-util", "http 1.1.0", "http-body 1.0.1", @@ -5560,13 +5529,13 @@ name = "http_client" version = "0.1.0" dependencies = [ "anyhow", + "bytes 1.7.2", "derive_more", "futures 0.3.30", - "http 0.2.12", + "http 1.1.0", "log", "serde", "serde_json", - "smol", "url", ] @@ -5600,11 +5569,11 @@ version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -5618,6 +5587,26 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes 1.7.2", + "futures-channel", + "futures-util", + "h2 0.4.6", + "http 1.1.0", + "http-body 1.0.1", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -5626,12 +5615,30 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper", + "hyper 0.14.30", "log", "rustls 0.21.12", "rustls-native-certs 0.6.3", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.4.1", + "hyper-util", + "rustls 0.23.13", + "rustls-native-certs 0.8.0", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", ] [[package]] @@ -5640,13 +5647,32 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.7.1", - "hyper", + "bytes 1.7.2", + "hyper 0.14.30", "native-tls", "tokio", "tokio-native-tls", ] +[[package]] +name = "hyper-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +dependencies = [ + "bytes 1.7.2", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.4.1", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower-service", + "tracing", +] + [[package]] name = "iana-time-zone" version = "0.1.60" @@ -5775,7 +5801,7 @@ dependencies = [ "fuzzy", "gpui", "heed", - "html_to_markdown 0.1.0", + "html_to_markdown", "http_client", "indexmap 1.9.3", "indoc", @@ -5955,9 +5981,9 @@ dependencies = [ [[package]] name = "ipc-channel" -version = "0.18.2" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e46231d1db8ea8f874012b1b87efb9e968f763c577220372a9c7caadce1448da" +checksum = "c7f4c80f2df4fc64fb7fc2cff69fc034af26e6e6617ea9f1313131af464b9ca0" dependencies = [ "bincode", "crossbeam-channel", @@ -5969,7 +5995,7 @@ dependencies = [ "serde", "tempfile", "uuid", - "windows 0.48.0", + "windows 0.58.0", ] [[package]] @@ -6014,44 +6040,6 @@ version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" -[[package]] -name = "isahc" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9" -dependencies = [ - "async-channel 1.9.0", - "castaway", - "crossbeam-utils", - "curl", - "curl-sys", - "encoding_rs", - "event-listener 2.5.3", - "futures-lite 1.13.0", - "http 0.2.12", - "log", - "mime", - "once_cell", - "polling 2.8.0", - "slab", - "sluice", - "tracing", - "tracing-futures", - "url", - "waker-fn", -] - -[[package]] -name = "isahc_http_client" -version = "0.1.0" -dependencies = [ - "anyhow", - "futures 0.3.30", - "http_client", - "isahc", - "util", -] - [[package]] name = "itertools" version = "0.10.5" @@ -6385,6 +6373,7 @@ dependencies = [ "tree-sitter-c", "tree-sitter-cpp", "tree-sitter-css", + "tree-sitter-diff", "tree-sitter-go", "tree-sitter-gomod", "tree-sitter-gowork", @@ -6602,7 +6591,7 @@ dependencies = [ "prost", "prost-build", "prost-types", - "reqwest", + "reqwest 0.12.8", "serde", ] @@ -7086,7 +7075,7 @@ dependencies = [ "hexf-parse", "indexmap 2.4.0", "log", - "rustc-hash", + "rustc-hash 1.1.0", "spirv", "termcolor", "thiserror", @@ -8405,9 +8394,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", ] @@ -8562,7 +8551,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "prost-derive", ] @@ -8572,7 +8561,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "heck 0.3.3", "itertools 0.10.5", "lazy_static", @@ -8605,7 +8594,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "prost", ] @@ -8734,6 +8723,54 @@ dependencies = [ "zed_actions", ] +[[package]] +name = "quinn" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +dependencies = [ + "bytes 1.7.2", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 2.0.0", + "rustls 0.23.13", + "socket2 0.5.7", + "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 1.7.2", + "rand 0.8.5", + "ring 0.17.8", + "rustc-hash 2.0.0", + "rustls 0.23.13", + "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 0.5.7", + "tracing", + "windows-sys 0.59.0", +] + [[package]] name = "quote" version = "1.0.37" @@ -8932,6 +8969,7 @@ dependencies = [ "client", "dev_server_projects", "editor", + "file_finder", "futures 0.3.30", "fuzzy", "gpui", @@ -8939,6 +8977,7 @@ dependencies = [ "log", "menu", "ordered-float 2.10.1", + "paths", "picker", "project", "release_channel", @@ -8952,7 +8991,6 @@ dependencies = [ "task", "terminal_view", "ui", - "ui_input", "util", "workspace", ] @@ -9010,7 +9048,7 @@ checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" dependencies = [ "hashbrown 0.13.2", "log", - "rustc-hash", + "rustc-hash 1.1.0", "slice-group-by", "smallvec", ] @@ -9099,6 +9137,7 @@ name = "remote_server" version = "0.1.0" dependencies = [ "anyhow", + "async-watch", "backtrace", "cargo_toml", "clap", @@ -9114,9 +9153,12 @@ dependencies = [ "log", "lsp", "node_runtime", + "paths", "project", "remote", + "reqwest_client", "rpc", + "rust-embed", "serde", "serde_json", "settings", @@ -9186,14 +9228,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "base64 0.21.7", - "bytes 1.7.1", + "bytes 1.7.2", "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", - "hyper", + "hyper 0.14.30", "hyper-tls", "ipnet", "js-sys", @@ -9207,8 +9249,8 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", - "system-configuration", + "sync_wrapper 0.1.2", + "system-configuration 0.5.1", "tokio", "tokio-native-tls", "tower-service", @@ -9219,6 +9261,68 @@ dependencies = [ "winreg 0.50.0", ] +[[package]] +name = "reqwest" +version = "0.12.8" +source = "git+https://github.com/zed-industries/reqwest.git?rev=fd110f6998da16bbca97b6dddda9be7827c50e29#fd110f6998da16bbca97b6dddda9be7827c50e29" +dependencies = [ + "base64 0.22.1", + "bytes 1.7.2", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.4.6", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", + "hyper-rustls 0.27.3", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls 0.23.13", + "rustls-native-certs 0.8.0", + "rustls-pemfile 2.1.3", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "system-configuration 0.6.1", + "tokio", + "tokio-rustls 0.26.0", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "windows-registry", +] + +[[package]] +name = "reqwest_client" +version = "0.1.0" +dependencies = [ + "anyhow", + "bytes 1.7.2", + "futures 0.3.30", + "gpui", + "http_client", + "log", + "reqwest 0.12.8", + "serde", + "smol", + "tokio", +] + [[package]] name = "resvg" version = "0.41.0" @@ -9305,7 +9409,7 @@ checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" dependencies = [ "bitvec", "bytecheck", - "bytes 1.7.1", + "bytes 1.7.2", "hashbrown 0.12.3", "ptr_meta", "rend", @@ -9442,7 +9546,7 @@ dependencies = [ "async-dispatcher", "async-std", "base64 0.22.1", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "data-encoding", "dirs 5.0.1", @@ -9501,7 +9605,7 @@ checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" dependencies = [ "arrayvec", "borsh", - "bytes 1.7.1", + "bytes 1.7.2", "num-traits", "rand 0.8.5", "rkyv", @@ -9521,6 +9625,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[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.1" @@ -9590,10 +9700,24 @@ checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring 0.17.8", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.23.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +dependencies = [ + "once_cell", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki 0.102.8", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -9654,6 +9778,17 @@ dependencies = [ "untrusted 0.9.0", ] +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "ring 0.17.8", + "rustls-pki-types", + "untrusted 0.9.0", +] + [[package]] name = "rustversion" version = "1.0.17" @@ -9962,7 +10097,6 @@ dependencies = [ "gpui", "heed", "http_client", - "isahc_http_client", "language", "language_model", "languages", @@ -9970,6 +10104,7 @@ dependencies = [ "open_ai", "parking_lot", "project", + "reqwest_client", "serde", "serde_json", "settings", @@ -10412,17 +10547,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "sluice" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" -dependencies = [ - "async-channel 1.9.0", - "futures-core", - "futures-io", -] - [[package]] name = "smallvec" version = "1.13.2" @@ -10645,7 +10769,7 @@ dependencies = [ "atoi", "bigdecimal", "byteorder", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "crc", "crossbeam-queue", @@ -10733,7 +10857,7 @@ dependencies = [ "bigdecimal", "bitflags 2.6.0", "byteorder", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "crc", "digest", @@ -10873,12 +10997,12 @@ dependencies = [ "fuzzy", "gpui", "indoc", - "isahc_http_client", "language", "log", "menu", "picker", "project", + "reqwest_client", "rust-embed", "settings", "simplelog", @@ -11174,6 +11298,15 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] + [[package]] name = "synchronoise" version = "1.0.1" @@ -11214,7 +11347,18 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", "core-foundation 0.9.4", - "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 0.9.4", + "system-configuration-sys 0.6.0", ] [[package]] @@ -11227,6 +11371,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 = "system-deps" version = "6.2.2" @@ -11281,9 +11435,9 @@ dependencies = [ [[package]] name = "taffy" -version = "0.5.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cb893bff0f80ae17d3a57e030622a967b8dbc90e38284d9b4b1442e23873c94" +checksum = "9ec17858c2d465b2f734b798b920818a974faf0babb15d7fef81818a4b2d16f1" dependencies = [ "arrayvec", "grid", @@ -11357,7 +11511,6 @@ dependencies = [ name = "telemetry_events" version = "0.1.0" dependencies = [ - "language", "semantic_version", "serde", ] @@ -11407,6 +11560,7 @@ dependencies = [ "gpui", "libc", "rand 0.8.5", + "regex", "release_channel", "schemars", "serde", @@ -11604,7 +11758,7 @@ dependencies = [ "fancy-regex", "lazy_static", "parking_lot", - "rustc-hash", + "rustc-hash 1.1.0", ] [[package]] @@ -11767,7 +11921,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", - "bytes 1.7.1", + "bytes 1.7.2", "libc", "mio 1.0.2", "parking_lot", @@ -11820,6 +11974,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.13", + "rustls-pki-types", + "tokio", +] + [[package]] name = "tokio-socks" version = "0.5.2" @@ -11869,11 +12034,11 @@ 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 1.7.1", + "bytes 1.7.2", "futures-core", "futures-io", "futures-sink", @@ -11978,7 +12143,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" dependencies = [ "bitflags 1.3.2", - "bytes 1.7.1", + "bytes 1.7.2", "futures-core", "futures-util", "http 0.2.12", @@ -11996,7 +12161,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ "bitflags 2.6.0", - "bytes 1.7.1", + "bytes 1.7.2", "futures-core", "futures-util", "http 0.2.12", @@ -12053,16 +12218,6 @@ dependencies = [ "valuable", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - [[package]] name = "tracing-log" version = "0.2.0" @@ -12158,6 +12313,16 @@ dependencies = [ "tree-sitter-language", ] +[[package]] +name = "tree-sitter-diff" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfe1e5ca280a65dfe5ba4205c1bcc84edf486464fed315db53dee6da9a335889" +dependencies = [ + "cc", + "tree-sitter-language", +] + [[package]] name = "tree-sitter-elixir" version = "0.3.0" @@ -12338,7 +12503,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ "byteorder", - "bytes 1.7.1", + "bytes 1.7.2", "data-encoding", "http 0.2.12", "httparse", @@ -12357,7 +12522,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" dependencies = [ "byteorder", - "bytes 1.7.1", + "bytes 1.7.2", "data-encoding", "http 1.1.0", "httparse", @@ -12837,12 +13002,12 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-channel", "futures-util", "headers", "http 0.2.12", - "hyper", + "hyper 0.14.30", "log", "mime", "mime_guess", @@ -12978,6 +13143,19 @@ dependencies = [ "wasmparser 0.201.0", ] +[[package]] +name = "wasm-streams" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "wasmparser" version = "0.201.0" @@ -13016,9 +13194,9 @@ dependencies = [ [[package]] name = "wasmtime" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a5883d64dfc8423c56e3d8df27cffc44db25336aa468e8e0724fddf30a333d7" +checksum = "7e4a5b05e9f1797e557e79f0cf04348eaa7a232596939ef4762838ddf7a6127a" dependencies = [ "anyhow", "async-trait", @@ -13062,9 +13240,9 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4dc7e2a379c0dd6be5b55857d14c4b277f43a9c429a9e14403eb61776ae3be" +checksum = "64414227e19556d4372f9688458c5673606de83473eb66cd0514d36ea8808cab" dependencies = [ "cfg-if", ] @@ -13095,9 +13273,9 @@ dependencies = [ [[package]] name = "wasmtime-component-macro" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b07773d1c3dab5f014ec61316ee317aa424033e17e70a63abdf7c3a47e58fcf" +checksum = "d3ead31b73689602225742920adbcd881f5656702c1a3b4830862c0c66731727" dependencies = [ "anyhow", "proc-macro2", @@ -13110,15 +13288,15 @@ dependencies = [ [[package]] name = "wasmtime-component-util" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e38d735320f4e83478369ce649ad8fe87c6b893220902e798547a225fc0c5874" +checksum = "ab2c778661800e1dcd8ba3e15ff042299709e0a4c512525d9cbb604a04c0421b" [[package]] name = "wasmtime-cranelift" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e570d831d0785d93d7d8c722b1eb9a34e0d0c1534317666f65892818358a2da9" +checksum = "9f7ee1f436bcf7d213ef7c2e9d44caffcd57e540ccf997d013384c2ae9b82db7" dependencies = [ "anyhow", "cfg-if", @@ -13140,9 +13318,9 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5fe80dfbd81687431a7d4f25929fae1ae96894786d5c96b14ae41164ee97377" +checksum = "fa8c33adfb3b9f8d6ef716bc55aea5e6b2275cd5a6721ec8c837d1cb0c471516" dependencies = [ "anyhow", "cpp_demangle", @@ -13167,9 +13345,9 @@ dependencies = [ [[package]] name = "wasmtime-fiber" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f39043d13c7b58db69dc9a0feb191a961e75a9ec2402aebf42de183c022bb8a" +checksum = "9f3227ed807c2dda9dd770c241023fcd6e48e6722c1c26ff79fc3604d412e884" dependencies = [ "anyhow", "cc", @@ -13182,9 +13360,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d15de8429db996f0d17a4163a35eccc3f874cbfb50f29c379951ea1bbb39452e" +checksum = "fa89fc440f0edca882ba6d1890608898e6f0193afdc504c0a64478ec53622bd6" dependencies = [ "anyhow", "cfg-if", @@ -13194,15 +13372,15 @@ dependencies = [ [[package]] name = "wasmtime-slab" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f68d38fa6b30c5e1fc7d608263062997306f79e577ebd197ddcd6b0f55d87d1" +checksum = "682b7a5b6772c4e4de8c696fc619ec97930b5e89098db9bee22c1136e002438b" [[package]] name = "wasmtime-types" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6634e7079d9c5cfc81af8610ed59b488cc5b7f9777a2f4c1667a2565c2e45249" +checksum = "4a95ea5572f8c3ffe777af21aa00a92097ded291a342fecad9f2c6a972ecea99" dependencies = [ "anyhow", "cranelift-entity", @@ -13214,9 +13392,9 @@ dependencies = [ [[package]] name = "wasmtime-versioned-export-macros" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3850e3511d6c7f11a72d571890b0ed5f6204681f7f050b9de2690e7f13123fed" +checksum = "ac3621bfccd4e4336ae141d62b96e96316c0f23c47d64e9700594ebe3c4d9a10" dependencies = [ "proc-macro2", "quote", @@ -13232,7 +13410,7 @@ dependencies = [ "anyhow", "async-trait", "bitflags 2.6.0", - "bytes 1.7.1", + "bytes 1.7.2", "cap-fs-ext", "cap-net-ext", "cap-rand", @@ -13256,9 +13434,9 @@ dependencies = [ [[package]] name = "wasmtime-winch" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a25199625effa4c13dd790d64bd56884b014c69829431bfe43991c740bd5bc1" +checksum = "d1d3e99f6bba37864487c9356398667699935b9cfa3655ed2b153b9428b3dd21" dependencies = [ "anyhow", "cranelift-codegen", @@ -13273,9 +13451,9 @@ dependencies = [ [[package]] name = "wasmtime-wit-bindgen" -version = "24.0.0" +version = "24.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb331ac7ed1d5ba49cddcdb6b11973752a857148858bb308777d2fc5584121f" +checksum = "ee0f4524da226d2cb503d794c8928de6bc24878758cebd4e383c946e9fdb8b3a" dependencies = [ "anyhow", "heck 0.4.1", @@ -13553,9 +13731,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winch-codegen" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "073efe897d9ead7fc609874f94580afc831114af5149b6a90ee0a3a39b497fe0" +checksum = "c139fb9298d9651b6869afd544e567ca2448cd5f5ddcb24e4bb86a1ee187c8b3" dependencies = [ "anyhow", "cranelift-codegen", @@ -13568,15 +13746,6 @@ dependencies = [ "wasmtime-environ", ] -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows" version = "0.54.0" @@ -13651,6 +13820,17 @@ dependencies = [ "syn 2.0.76", ] +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result 0.2.0", + "windows-strings", + "windows-targets 0.52.6", +] + [[package]] name = "windows-result" version = "0.1.2" @@ -14397,7 +14577,7 @@ dependencies = [ [[package]] name = "zed" -version = "0.157.5" +version = "0.158.2" dependencies = [ "activity_indicator", "anyhow", @@ -14442,7 +14622,6 @@ dependencies = [ "image_viewer", "inline_completion_button", "install_cli", - "isahc_http_client", "journal", "language", "language_model", @@ -14470,6 +14649,7 @@ dependencies = [ "release_channel", "remote", "repl", + "reqwest_client", "rope", "search", "serde", @@ -14505,6 +14685,7 @@ dependencies = [ "winresource", "workspace", "zed_actions", + "zstd", ] [[package]] @@ -14517,7 +14698,7 @@ dependencies = [ [[package]] name = "zed_astro" -version = "0.1.0" +version = "0.1.1" dependencies = [ "serde", "zed_extension_api 0.1.0", @@ -14553,7 +14734,7 @@ dependencies = [ [[package]] name = "zed_elixir" -version = "0.0.9" +version = "0.1.0" dependencies = [ "zed_extension_api 0.1.0", ] @@ -14599,14 +14780,6 @@ dependencies = [ "wit-bindgen", ] -[[package]] -name = "zed_gleam" -version = "0.2.0" -dependencies = [ - "html_to_markdown 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "zed_extension_api 0.1.0", -] - [[package]] name = "zed_glsl" version = "0.1.0" @@ -14623,7 +14796,7 @@ dependencies = [ [[package]] name = "zed_html" -version = "0.1.2" +version = "0.1.3" dependencies = [ "zed_extension_api 0.1.0", ] @@ -14670,13 +14843,6 @@ dependencies = [ "zed_extension_api 0.1.0", ] -[[package]] -name = "zed_ruby" -version = "0.2.0" -dependencies = [ - "zed_extension_api 0.1.0", -] - [[package]] name = "zed_ruff" version = "0.1.0" @@ -14737,7 +14903,7 @@ dependencies = [ [[package]] name = "zed_zig" -version = "0.3.0" +version = "0.3.1" dependencies = [ "zed_extension_api 0.1.0", ] @@ -14799,7 +14965,7 @@ dependencies = [ "async-std", "async-trait", "asynchronous-codec", - "bytes 1.7.1", + "bytes 1.7.2", "crossbeam-queue", "dashmap 5.5.3", "futures-channel", diff --git a/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix b/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix index d0845a4a70..cda48aac2a 100644 --- a/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix @@ -86,14 +86,13 @@ let in rustPlatform.buildRustPackage rec { pname = "zed-editor"; - version = "0.157.5"; + version = "0.158.2"; src = fetchFromGitHub { owner = "zed-industries"; repo = "zed"; rev = "refs/tags/v${version}"; - hash = "sha256-xtSdlzj1AxhJN4aXLJ+Oy51LX4QduLwcuCfK42kthvE="; - fetchSubmodules = true; + hash = "sha256-1mNJ3uL5/Sxwiiq2fO+yE9SHiM/5FQWmnNgOEMWpU9s="; }; patches = [ @@ -107,11 +106,13 @@ rustPlatform.buildRustPackage rec { outputHashes = { "alacritty_terminal-0.24.1-dev" = "sha256-b4oSDhsAAYjpYGfFgA1Q1642JoJQ9k5RTsPgFUpAFmc="; "async-pipe-0.1.3" = "sha256-g120X88HGT8P6GNCrzpS5SutALx5H+45Sf4iSSxzctE="; + "async-stripe-0.40.0" = "sha256-kVdYCmlM8DilSrcOGxI1tvSiUjSrXdnmKqBA9WUJgMw="; "blade-graphics-0.5.0" = "sha256-j/JI34ZPD7RAHNHu3krgDLnIq4QmmZaZaU1FwD7f2FM="; "cosmic-text-0.11.2" = "sha256-TLPDnqixuW+aPAhiBhSvuZIa69vgV3xLcw32OlkdCcM="; "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="; + "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="; diff --git a/third_party/nixpkgs/pkgs/by-name/ze/zenity/package.nix b/third_party/nixpkgs/pkgs/by-name/ze/zenity/package.nix index aa23342eeb..2e907a48eb 100644 --- a/third_party/nixpkgs/pkgs/by-name/ze/zenity/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ze/zerotierone/package.nix b/third_party/nixpkgs/pkgs/by-name/ze/zerotierone/package.nix index 728ec4ee3c..3252cce49d 100644 --- a/third_party/nixpkgs/pkgs/by-name/ze/zerotierone/package.nix +++ b/third_party/nixpkgs/pkgs/by-name/ze/zerotierone/package.nix @@ -115,7 +115,7 @@ in stdenv.mkDerivation { buildFlags = [ "all" "selftest" ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; checkPhase = '' runHook preCheck ./zerotier-selftest diff --git a/third_party/nixpkgs/pkgs/servers/search/zincsearch/default.nix b/third_party/nixpkgs/pkgs/by-name/zi/zincsearch/package.nix similarity index 71% rename from third_party/nixpkgs/pkgs/servers/search/zincsearch/default.nix rename to third_party/nixpkgs/pkgs/by-name/zi/zincsearch/package.nix index 2a1d3fc6fa..8a4c4928bd 100644 --- a/third_party/nixpkgs/pkgs/servers/search/zincsearch/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/zi/zip2hashcat/package.nix b/third_party/nixpkgs/pkgs/by-name/zi/zip2hashcat/package.nix new file mode 100644 index 0000000000..1c18f21a99 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/zp/zpaqfranz/package.nix b/third_party/nixpkgs/pkgs/by-name/zp/zpaqfranz/package.nix index 1ade403a11..9bc55d0ffc 100644 --- a/third_party/nixpkgs/pkgs/by-name/zp/zpaqfranz/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index b4b0eb5f17..487599099b 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "31.7.1"; + version = "31.9.1"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix index ad740d88b3..d0cfe77b39 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -1,93 +1,93 @@ # This file was autogenerated. DO NOT EDIT! { - Iosevka = "0xpzsmvcvcf6c57bllg1yxylrvlm31gjpn9ilr7qz8bl7jz3z9rm"; - IosevkaAile = "0ar4wmsjdqh9a52k4vn9krpz7ii3bddnprqjyvpi9f1ybpxj74q1"; - IosevkaCurly = "1q9wqrhyk3636gy2yrkdc9l8wqiza3n5d6slx9h7529x8c6r64gb"; - IosevkaCurlySlab = "03an8nyg1xkv9l1fndk7agwkbg3s1kvwj342h3zj1klwi9bjz28b"; - IosevkaEtoile = "0qi8v8vzqifyxzzwqdx5kyvx11f1x8vgrk9104cb75xmslfa1wrg"; - IosevkaSlab = "0kmz8qywds7jr3wiy02p2c3r2y1bs0ibj7w6wa0kkkm82kk5v4b1"; - IosevkaSS01 = "091i0x9l589iq4f4mnkw26417vck6vhwnf2d68slv7xsss4jqpyw"; - IosevkaSS02 = "0dlsnglcbqpnpycqxq2aqgn80q6lrj50vrmgr71n051ix5mx5czl"; - IosevkaSS03 = "1y1l0rhbn55dd2scaffvk2fa6gap8rh4wb2lvi5a93z278ajcc7q"; - IosevkaSS04 = "01wgjwk77nb7f55zkdb6k897cv5rkx2q3va4r9rhj3z6aragp59c"; - IosevkaSS05 = "1w9wbwwzqf9812kd4q0g3z93f4qy6jn418m79d8s9bh132nm9jl4"; - IosevkaSS06 = "0s1cl8i7nv7yxynspix5mkl0db1vrlik5yiqs47ih8a82rm6zgmj"; - IosevkaSS07 = "0rssrgkfzr2pnycnjx2ny88sgcw4haqh5mmbyjnqm412602v57l1"; - IosevkaSS08 = "11yhnwymkr8m4si9ph2knk44rk7r87sjab0g2w8lhiamlcrps49a"; - IosevkaSS09 = "1mfv68s88zxvjcg90ha7cdhwhhlqv77b4iz7z991gmd34dd2n22l"; - IosevkaSS10 = "14j5mn7ry45f6vyzrq6v1qcssdz7s99d2hmpn3hh4gyn18hzadix"; - IosevkaSS11 = "0q3ksgh8y9mldr85k6l9q3p86yr13mcdvbwrrr2jy17kqjfms6yz"; - IosevkaSS12 = "1lh1vfv4q1ghdnxnk45hdqpp3pp7wr6pcv2b8k2rpjpv0w8wkz7b"; - IosevkaSS13 = "1vpkv053skbib9jgp75002gsisc2fpakwilh97sxnfyz47vqf6vk"; - IosevkaSS14 = "1q73a2wkdzd51s2bpjysh6k5scsqj089vphj68i1r3xzig5zg73d"; - IosevkaSS15 = "08qj500y20l4jzjd8qbdsifavi7hw1l136d2iqal2m18hy7kbvf3"; - IosevkaSS16 = "1ifmk9j4az7g3rlxdswxc2cz1hbn2nxmrh3ysi9gsjzppfayi4wn"; - IosevkaSS17 = "02abk8imd7kz1m4mq7c1sv13pm6d98l53qrh0291f3z5gpq6mdmw"; - IosevkaSS18 = "0ia83ijbq9bishj6gwij7sszp75bqwz1h30bxkavlxk5gfb770q1"; - SGr-Iosevka = "1n6v930a42wbx6bb1cyh6wvy2m885w60hlan9kgps682f8108h57"; - SGr-IosevkaCurly = "19r0swn7wz0h5m2f4vf2sk1lrdvrnv4nlr0hikb3mh6fylglwffv"; - SGr-IosevkaCurlySlab = "1xygrs9x8j9lm2n400i8m0i5vgwiq75vq4hm3712hkx2dx1kjycf"; - SGr-IosevkaFixed = "0nl380k30l4gn327kp51vwzlqh9j39w6frhmrxbmdcblnz1sc5md"; - SGr-IosevkaFixedCurly = "05aagifx30xzb9rmylx8k4jvpr8wgzi2dmc2ili40yk06jw97py1"; - SGr-IosevkaFixedCurlySlab = "1blad2s6kzz64c5fri50fqwivy8qxzkfxjg73wqyjzhmwbf5am1d"; - SGr-IosevkaFixedSlab = "1f0zqrd193w0lpzbl24ldr7wbbag3v6ahkch5jzad2f931fi62vl"; - SGr-IosevkaFixedSS01 = "1nyvwab562a0c5f1gjqw4wwq3lkizz1zi0bpg3dbfk72kzwlx31n"; - SGr-IosevkaFixedSS02 = "1k2lkf5cxxbp2rimv97c6bqq2fqkz4iwhvqh2bp3jw4jsxrqragc"; - SGr-IosevkaFixedSS03 = "0c679d897k6jdwwsrmj57v6q08ns6brrn6pp53m1fs4v8vsy7gq8"; - SGr-IosevkaFixedSS04 = "1zcv64yivzflr106vi9a0nzxl93d68d2pp07dlfc7acd86ps90j1"; - SGr-IosevkaFixedSS05 = "1g45312ly0zr1hsgdv1nhj2slrign6lddnxxalnbpi065qcgxzdb"; - SGr-IosevkaFixedSS06 = "0ahpvw9z573xd437m0vdyh7bh68z7frisjrm4r02a2nd0bc8rfva"; - SGr-IosevkaFixedSS07 = "06a5gfzf2a8ci8qvxfr8m0pj4avg5fggfdfs51lwn5n1rjqv3jms"; - SGr-IosevkaFixedSS08 = "00x0rz0j6l5lnb1bnly3dswazgxpdx5gd3ggihxcwvkjfarbs12y"; - SGr-IosevkaFixedSS09 = "089qlqa9hrfq1dwdnj29kr3r60n95gsnqqcgx1y87nw8xxaj1l8c"; - SGr-IosevkaFixedSS10 = "1g1xic30x6sb5jkg9ws1ymk1530402m60v6bsl9l164hj5wbfsjh"; - SGr-IosevkaFixedSS11 = "0rpbr95k2xzg7gilljhrx2jhwxaqg6v7hfxj3mrjid5jjphrw43v"; - SGr-IosevkaFixedSS12 = "1iz5apwf4700r63gicqcbic77f0dp1fhnqaxigrmhsyxwff8b31m"; - SGr-IosevkaFixedSS13 = "1igwj2ikfamrdd6nbmdy72sdrk7k2v1j32yny9bl5wx13dw7575b"; - SGr-IosevkaFixedSS14 = "00032jy2vls5f0frpnpbiiw8i2v1qj84hy1wcksgy4j357vw4lpf"; - SGr-IosevkaFixedSS15 = "1kpgkvq022gb3j33kr9b97ays0wvc5wl23n9cvq9ij8j3wbs4z3k"; - SGr-IosevkaFixedSS16 = "0bnc7y6ma9mi5xwy7csn9h75ahv3g8ggkfhr02qn34qm2dbmif1n"; - SGr-IosevkaFixedSS17 = "1d62jfwrpvh735jlvk812ymmly2qhkpn38s0gh48m28whgwvrhcw"; - SGr-IosevkaFixedSS18 = "18954hkad2b8pbp9f33f7ml4rzgkxl2hnjdc69zhav76lxd6369x"; - SGr-IosevkaSlab = "0lvx0ghvy17b6jzpc88kj0p1symf4vqahlc6wa2w4jsb2csc9d2l"; - SGr-IosevkaSS01 = "1b54d5g50k8hl3hnhmng4amayh5wmbvvkzq48mld6zwlfr1fadkd"; - SGr-IosevkaSS02 = "0bg9y4fr812ax34kmdz727ib67dghpbsim7a57isc897x0igcbnj"; - SGr-IosevkaSS03 = "01rsg0f8nxzl7i0w0sfp0sdrd1ab7p4qdadan486jaarxbjd6kx7"; - SGr-IosevkaSS04 = "1l36xjs0pm83i1azx0s2y541x6b83b1dw9ghf5ajgll29sz0gnlx"; - SGr-IosevkaSS05 = "0fj2jd65yhbxs9f2sadzpdm05d5api9ffqjx8a9hdc291ykl3sw6"; - SGr-IosevkaSS06 = "105g5p9rvr8cfiqf4wbjsly8616jm49bx088ddgj4jyli1msjh8k"; - SGr-IosevkaSS07 = "0lci5wa9q8bk57d0c99r86nhxh17qw4s0mh8yismnb0hqcknhfly"; - SGr-IosevkaSS08 = "1v56yda5w45mi9hmbdswqa4dmscf728a2bj0lf3ai9zcprfnc8d3"; - SGr-IosevkaSS09 = "0bgn9q6r1a3799nawhgzws9rm7mzibiz4ya2x4qkmawzzi1rdgjs"; - SGr-IosevkaSS10 = "19nqp295cdq7k1zlh8nd42wa3m11ql7112v746vvwq5bpr79dn8c"; - SGr-IosevkaSS11 = "0jr9j8c51fh3dp8mqiimr4lhnvznpn2q3swz2zyc8jlmbyga02ad"; - SGr-IosevkaSS12 = "176mby5agqa7fll9wq16dws98nn7igfx72fni1f509hq5k7xygsp"; - SGr-IosevkaSS13 = "0a53868nnwgql2sf909ybpdibjii8w89bp0kc8xymx7v9i2m4iyf"; - SGr-IosevkaSS14 = "11m4v27sf6qif6069nm71dfnksp7bldkvlx9bbvyn0y6lg9n1pfl"; - SGr-IosevkaSS15 = "00wr61nlf091gkwh5kdx8wp75y0vi2dlra91m89b4w6592vwffk4"; - SGr-IosevkaSS16 = "0b1fqrcx65ajanc433gyscw15ra230z8gs5kh0ahhkwqwz1al0lq"; - SGr-IosevkaSS17 = "1xsvga76x8p87ws386gmz28nghw3ybr1rck722a5wzzlz5z51p3m"; - SGr-IosevkaSS18 = "0w97ayi3jsb3313bw9dr9xb1l5lx6d26rc5yw0y9c9ph180f9afy"; - SGr-IosevkaTerm = "0b5y4gg149271gmf255hr8lp1n2qxafp5k1gi7h7rpnnndaimj1g"; - SGr-IosevkaTermCurly = "1izpf2sb0zv2kfqm1zb1ambicydqbis202n36rxn3b3sfa41hnwy"; - SGr-IosevkaTermCurlySlab = "03dbzgp0g0767aym5rshbjvzbhff8gpg90zl9sqrrfgmwav9yqd6"; - SGr-IosevkaTermSlab = "1amaimpr84q36gf2ma31d5ss57g84d8rw4bzg7058kd801yc1y53"; - SGr-IosevkaTermSS01 = "1pj4bb7q9bjwnss2353ldw599f8sns28vc8h8n33sq9xqrna9fbd"; - SGr-IosevkaTermSS02 = "1rgwyhzzpllprs2rmkrsc8xknsc4gzi3h0cv96qnx9jvd9ixyq67"; - SGr-IosevkaTermSS03 = "1c682qaj6bzyrwq4yc9bxn8y6yza9hn0c3hpj5g62akwk50dvkg9"; - SGr-IosevkaTermSS04 = "02rgpbb2wn3aibkkpfi2sxy751bwmf7azkv44xdalhyb6hz7vfgv"; - SGr-IosevkaTermSS05 = "187kwn9g81rpq71w58hdi27ngl1zby550xx85a2dz00w7j1l1qy3"; - SGr-IosevkaTermSS06 = "13k91ha10yymh5wcnf45sh1d51rgnlrzdg9bdh4r86122mq2pvl9"; - SGr-IosevkaTermSS07 = "16mq7mbcrqvpmwl6zgbs8r4w5b1r0m01i6iiwv20x74ay9pkglmv"; - SGr-IosevkaTermSS08 = "0npiqvw4ai9mq9ix0hfrq86h3y828g284nw2q4dgqpcpvhm8kxq5"; - SGr-IosevkaTermSS09 = "105p6x8chm9lsapb6ccpvhbrhaackdscjqi5j04hadkf4kxp7cn4"; - SGr-IosevkaTermSS10 = "023bgny097p8n58npf7f3y7shxgyfgqh5yy67lc64gwi3bw8lwb6"; - SGr-IosevkaTermSS11 = "1lkkkcqpgcfs3j3vdr3nryaxhycgz67d58zd54mpkxj3hicag1i9"; - SGr-IosevkaTermSS12 = "18d53273x83sq7nm6mi810y74i57nlz46vxxybdjbfp3i74rl14q"; - SGr-IosevkaTermSS13 = "1vi5i12l7pp2ishk8wdn2rpbxhmmvjqla6zcn5grq9i3ki92hbaf"; - SGr-IosevkaTermSS14 = "0p5pzcmhg4wbmr8kp2ydhrprnw7ll9wvvsni05347s3vg7scd7al"; - SGr-IosevkaTermSS15 = "11grinpbmd0qpkqs31qg20bdd1y35570ja8ifx8pfh0j91x97q1f"; - SGr-IosevkaTermSS16 = "1mbqzfaxqi1l406wjjnz34nhlsgxj4jsayybdwv12nv7v8fbyalj"; - SGr-IosevkaTermSS17 = "138jbkicfrqgqg04am8fwvjr5zmjxx22ik1ss4iivgl0grr07ysf"; - SGr-IosevkaTermSS18 = "0glfd94lv7pl52apfxks0ic6w66347c4hxm57phylfmmvd163zd0"; + Iosevka = "1nma01k7v4dhq0w84l5qdxakl6ajhf76g54lm5xb0yggarl9fn3y"; + IosevkaAile = "0lqcwmal97ddfzvi6zdrcxygmi0rszmrmlqpc49fn01yl0gkb4p1"; + IosevkaCurly = "0xncws9cgjjhz120nvkxikc7kqj1vqqwghb1sx7kcfjqh5rkngna"; + IosevkaCurlySlab = "1srfhrr44wp208xw0z4z16jsmh4saaszglgpsxyyhgkdmdzpn0w4"; + IosevkaEtoile = "1aw89ig62wfm80655ib07xwpn17skvqwd4rpwq7xk6ryz6jnlgrr"; + IosevkaSlab = "1dj2blr87jn3cxb2y2mybk359bvgj7kni34adha722mp039z8di8"; + IosevkaSS01 = "18y79gghmkhi26kzv9r28z0wgcc9ybca7jdqwlc5wb0vky5w9wq4"; + IosevkaSS02 = "1lxggf53dmxcsj333ibp3lm6cpzlwldf4irkm5kimxw0z8gph8xq"; + IosevkaSS03 = "0ywfxjdhssdlddgpr48crff3pkpp5rm0kshmkib2gmy5xgyhf7dr"; + IosevkaSS04 = "13970rb1kasn65rjw318zga6q677wj9bx0p7bp6cy31dmg0v6mp7"; + IosevkaSS05 = "0ckfw0kajrmw6nxyjivdkizxbf9fxjdlwczs2lxn2vjbapy4c7kf"; + IosevkaSS06 = "1rx065pwwaf99riz4b8104y1kgsn69bqf03832wicr5809knvsnj"; + IosevkaSS07 = "074nyqi46rls2nxfczq4m48xkx777dnw96zrhy6m01lly07xhpny"; + IosevkaSS08 = "04vapfj8jx6c9799z4fqcabm7y7xbcbnm8x1bamimchbk23xwy1d"; + IosevkaSS09 = "1n56r4c1glwssv4jwgls88x6wnxv9j6k8myzf2fwy4cci5s2d5as"; + IosevkaSS10 = "0ndambz7fz38s7x99lxqjjgkykwrml7wpf2svb9vw2wnyiiwzn69"; + IosevkaSS11 = "1fm5aihz9dvvp5viir1b9wb80zhaxfl3w9w5siniprq46y31cmys"; + IosevkaSS12 = "1fjd73xxdch5rfw2k2330np994pcv2xrzf1l12b585maj3l926p2"; + IosevkaSS13 = "03kyf09gpn5rp0l71gh1680nlh0cc7jlak0kzplv2bfg1wwkh5x8"; + IosevkaSS14 = "0jhyjcq1x28fdbnqij71z8cd3ww7pj0bih4wbs7jmj87xvxn94zm"; + IosevkaSS15 = "16im03mgs6c8nmaxs1p986mzsk78fhxyqcla75hajbj6i5j6j5iz"; + IosevkaSS16 = "1jfcyb0dkwb9dxby4kap1vc5kfzap2fxgjgan5437pxrjlkmmnkd"; + IosevkaSS17 = "11hdwspxlh9wa3jcph9zgcgm8r5w7jrazv1bny3n7d9ikw7i7jh6"; + IosevkaSS18 = "0g6qq8q5hnsv55kkdv3hsdvs6n5plpkyawlhdrm76qlrg7iw1ii3"; + SGr-Iosevka = "1f628x5pchva8c10b5w8x5cl89p28p3ir6c0m5l524kq6b4qxspf"; + SGr-IosevkaCurly = "09hv8pbikmmx17gmb32mbjpak9818qqvknln88ssdra2b7sh88a9"; + SGr-IosevkaCurlySlab = "11kxz7lzm38lg725ws7yh87zh5jnwqw4938l8bxw1pjxj4jyhbi7"; + SGr-IosevkaFixed = "08kd556v0wbsdcz1i83bzv29wsklw0h1jiridh1kjdwn73xdnaj2"; + SGr-IosevkaFixedCurly = "1r6iyxmnr84p44f1jbj8x2w8ki9fxflmv15zvhv3ikbfar9ypp86"; + SGr-IosevkaFixedCurlySlab = "016qfwdv5173c7b11h9df8dz9xywfzcds2sd869bsp5i5g6im76j"; + SGr-IosevkaFixedSlab = "1zwg86v81wwvrgvc4hy96s6rj5i4p67i4waj5c120in7hghlc6rm"; + SGr-IosevkaFixedSS01 = "0ihn36hfrsqbv3r365wy5z5wf5j464683vhdi5nk8vyq5b7x1hps"; + SGr-IosevkaFixedSS02 = "14z624mshjdgxm77h5c1xg44qnwjn9m6bx9ymzia7hxwpl3xsbf9"; + SGr-IosevkaFixedSS03 = "0nbvfqsfcsj26scd5ia2rvnj6qh8pg9wv8q9avidc5f6dsq4sy5z"; + SGr-IosevkaFixedSS04 = "073x2v0cghn3fp6ycfk16wn4vbqrgqwc4h2ky9gx3ndpf6fy5znh"; + SGr-IosevkaFixedSS05 = "0jnzf55jjx04zb33zasxyjshk4zbabnfcdb0pr5q400wj9qnnv6s"; + SGr-IosevkaFixedSS06 = "19gdzg4phs5cc0gj3zrhh9113infq8amwcizfq1mhsb7z1fqg48f"; + SGr-IosevkaFixedSS07 = "1rv2w9h5fwwdk6zq6ra9pmh4f7pdq87ydcwp11hhcjlk0iln1602"; + SGr-IosevkaFixedSS08 = "0lqm6c5b9y2crq694g00ryrq5j197yhlqvqk7ss494xv3vscrmsa"; + SGr-IosevkaFixedSS09 = "0v0w5vwgl3x84sqmw6wjam6inygchx1z9ax6km8hxlwjx4by9m32"; + SGr-IosevkaFixedSS10 = "0mfh0wr9ixgjp32i9hbhp0x8v3afwgplprivwl7qbgn18arr1ff8"; + SGr-IosevkaFixedSS11 = "03d4vwr9d4dw9dk9s0x3jsb9bahy69rz3lqq8zwyny1ipkdbynx6"; + SGr-IosevkaFixedSS12 = "0pvr9m1jdn2m0w1gx9rvyhphg1bd7s3jjibj3nbb8qmsx32rw347"; + SGr-IosevkaFixedSS13 = "1jvy36qqghjnv3grry6cpwhqsj0x0cdi2izqqin0pfa304r56pc6"; + SGr-IosevkaFixedSS14 = "1l0cb9my5xg5f13kyp3v9fs65wj66rx5asirqv339qbhw0hg5sp3"; + SGr-IosevkaFixedSS15 = "0b590zg0mrcv4rf51rcnah654rsicvw0j6v2dqgjvm7x62pkiks5"; + SGr-IosevkaFixedSS16 = "0ij7xv0d1d1s8g7qcchrhbv088zcvr2ircm8dqg7pkwwla31342y"; + SGr-IosevkaFixedSS17 = "1rnvxq37lvwf0y3fd7cq9qk78gh3vbw380a7a82r0qqypynid47m"; + SGr-IosevkaFixedSS18 = "0g24q74z7vrbl21ljmibf9ay4mz5m568fs6nagli4fd5q6nag6p3"; + SGr-IosevkaSlab = "0fzcs3xg36fd6kbq3gzrirc6qw9jakq4gkc480kxa8hvmcyqn30a"; + SGr-IosevkaSS01 = "1w9nmgqcwa8zhmwprbw9wsd9y0q0g8v1nrg54b8hcnhfqj0hqqxg"; + SGr-IosevkaSS02 = "1g30im488cql8nzkqmirpz0sa0w67s2qfjyiz5fcpsdim6dg90vx"; + SGr-IosevkaSS03 = "00yfkypnvgkpvsghwvn19nyjcirk8rpjhly9y1bkmvlz0x6ljhyq"; + SGr-IosevkaSS04 = "0wx2zcq2wrar4bxvv0asqhmh1yvaf0nknpk78bvdrawprylcwmam"; + SGr-IosevkaSS05 = "0p1xibl1aklyyxdfkhp8rb6c49b7832h8k89yqw17y1yw0n8pfl4"; + SGr-IosevkaSS06 = "05zry2qy3q7jkhpj233j2wpc66rr4dm02xly7wsn9vhalx178jgk"; + SGr-IosevkaSS07 = "0an7sp8dh4x8vnnvgvp49iskryh5z4npmn47vi3jxl6vpl70flx0"; + SGr-IosevkaSS08 = "198pywx83ciwfvhcgy7r7zw0hmm1xh4ccjq6h7spg8ca7x87sc0c"; + SGr-IosevkaSS09 = "1vpqzmkyjn1k0rlpq7q2yky3a3l0yczlsvvi8pvfhgpcxsrmvgsr"; + SGr-IosevkaSS10 = "0p75b9w9ljjcz16p4dv5phyhwdhxgb6kkpdpn1xpibbxifrcp400"; + SGr-IosevkaSS11 = "0hdwkn69g4h93l64b5dn6kmqlnrm8pnl5721k25vjac631yzjpig"; + SGr-IosevkaSS12 = "0rlr2wh9h650ax4ngf37ch3l90f641fxq81h31qbcxi1798sd5ds"; + SGr-IosevkaSS13 = "1qf69czsqd52580xwqpr4wvx88wi8csf1cxyjwv6h44gzfx5ka89"; + SGr-IosevkaSS14 = "1jyml7xkbsdi22q3c0l6527q1ii97qyfj3h2dwxcly2v0jx22l0n"; + SGr-IosevkaSS15 = "0yssy3vrmgfqachms20b6gl52lkk0drxrvwnyizc9lc96fx1x4a3"; + SGr-IosevkaSS16 = "1hll0l63d300047jwh7m81djqf7mgg0gdv1gw7dynl8rpp8iqwxw"; + SGr-IosevkaSS17 = "1rf3m48h396ql9m6i8c3gnxy0q7a9l8xk3xrwcnf2pidghgnwj5f"; + SGr-IosevkaSS18 = "15cp4y4221vggd3q6202z1r46fkdrn81j33bskwaq3vqn4ykrpvx"; + SGr-IosevkaTerm = "18kscgr1398zdzqdy7m693lw8gh9r3wrzw9gg62ksdbcbwn16im4"; + SGr-IosevkaTermCurly = "1v8y7km35hmkm8fx08szjwkxpykyd88nfvwi15jiajc4gbsl3hvy"; + SGr-IosevkaTermCurlySlab = "026bg6q5v8n4wfaw0mbrscylxqwfs5m727dvv734km110p5dvx1j"; + SGr-IosevkaTermSlab = "034chas42avxrkw2s5x08bwydarazk9h50blv3vraj66qzw2vngx"; + SGr-IosevkaTermSS01 = "17va6zc2wjn2nm7ixdv11mjmxcnkr5yca8af6prnfdkdmdaxp1zd"; + SGr-IosevkaTermSS02 = "1mvisnjn3gj2zs6g5n856mkixyhc6bspv9zcknb51am2s9n8mv5b"; + SGr-IosevkaTermSS03 = "00pigslzg8fwdg51qs8096w14b8dgycgsm3j4ab6xpp5hshvna5a"; + SGr-IosevkaTermSS04 = "01jjg7hjz0y8nc8cijlfc8zp1b49hby0ihwv1yk7skhs9gvr99rp"; + SGr-IosevkaTermSS05 = "07ykxm73445a7i8693zdsp5d1rjmccq7bysj90y73lky5f1w1bc4"; + SGr-IosevkaTermSS06 = "17rdmamd4p469kw7nwxcdaih8ps7n0jrlwkni4n4vfib28pcym9r"; + SGr-IosevkaTermSS07 = "0vgh7g9xyl52gb63hw09mszmkya7afvizhddni6mff7f5xdzy1mh"; + SGr-IosevkaTermSS08 = "0s524hhg64jfwbgifariasv4cd425alscspkc2d02d0gf4d4czbb"; + SGr-IosevkaTermSS09 = "15w06z0mkph0cpkw5xyzn53dpmc11p7c2nya35m72harwdvpawsv"; + SGr-IosevkaTermSS10 = "0b4z99b2mqa11avkiyamy9kzchp1x09lyhglc9d10qm94phi75iw"; + SGr-IosevkaTermSS11 = "1xnnmpx01i2diz9qvmfb0gc0injdqk9n41c0ci93lpvk3rxjvcs7"; + SGr-IosevkaTermSS12 = "1kbfbdjcnaxh3s6q5b3pwy8bknvz0av5s0h4hvq6qnrvvrdrdr4f"; + SGr-IosevkaTermSS13 = "1rnxy0zbl8pc4ph2zpjcc101vbb2ss2pvxx4h32gvkx5j0sk1cfl"; + SGr-IosevkaTermSS14 = "0k1v9jl52j37fq86p3gwpf31qa1a6alj18hi2bbv5ybzya7m8pp8"; + SGr-IosevkaTermSS15 = "1c6mw04h1zgjdnzlim553za899gc07gnhianw499dv3yi87p012q"; + SGr-IosevkaTermSS16 = "0aggw8hn5g3cvlxcdsyjcxq1ygrmrjq2xjsvwkmvdsfpfhsp1zsa"; + SGr-IosevkaTermSS17 = "191jy9j3bm7xnp7w9mq5kllf96vwhzvyq1nfcdd0ly773a3bjg4a"; + SGr-IosevkaTermSS18 = "10dbr3r4jxb9jq82hxhwqsxd8hrhjw626hv6i6g368g73x68sxk2"; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/national-park/default.nix b/third_party/nixpkgs/pkgs/data/fonts/national-park/default.nix index eab325af54..36b7e6e2ac 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/national-park/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/national-park/default.nix @@ -19,8 +19,7 @@ stdenvNoCC.mkDerivation rec { ''; meta = with lib; { - description = ''Typeface designed to mimic the national park service - signs that are carved using a router bit''; + description = ''Typeface designed to mimic the national park service signs that are carved using a router bit''; homepage = "https://nationalparktypeface.com/"; license = licenses.ofl; maintainers = [ ]; diff --git a/third_party/nixpkgs/pkgs/data/fonts/tamsyn/default.nix b/third_party/nixpkgs/pkgs/data/fonts/tamsyn/default.nix index f99624f4a4..59ddfb5011 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/tamsyn/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/tamsyn/default.nix @@ -36,10 +36,11 @@ in stdenv.mkDerivation { meta = with lib; { description = "Monospace bitmap font aimed at programmers"; - longDescription = ''Tamsyn is a monospace bitmap font, primarily aimed at - programmers. It was derived from Gilles Boccon-Gibod's MonteCarlo. Tamsyn - font was further inspired by Gohufont, Terminus, Dina, Proggy, Fixedsys, and - Consolas. + longDescription = '' + Tamsyn is a monospace bitmap font, primarily aimed at + programmers. It was derived from Gilles Boccon-Gibod's MonteCarlo. Tamsyn + font was further inspired by Gohufont, Terminus, Dina, Proggy, Fixedsys, and + Consolas. ''; homepage = "http://www.fial.com/~scott/tamsyn-font/"; downloadPage = "http://www.fial.com/~scott/tamsyn-font/download"; diff --git a/third_party/nixpkgs/pkgs/data/themes/alacritty-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/alacritty-theme/default.nix index 8b557b504f..cccac4656a 100644 --- a/third_party/nixpkgs/pkgs/data/themes/alacritty-theme/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-shell/default.nix index a27406db98..a998037502 100644 --- a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-shell/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-shell/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./fix-path-for-nixos.diff + ./fix-dock-can-not-show-with-qt6_8.diff ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-shell/fix-dock-can-not-show-with-qt6_8.diff b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-shell/fix-dock-can-not-show-with-qt6_8.diff new file mode 100644 index 0000000000..c372dc1e5c --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/core/dde-shell/fix-dock-can-not-show-with-qt6_8.diff @@ -0,0 +1,20 @@ +diff --git a/panels/dock/OverflowContainer.qml b/panels/dock/OverflowContainer.qml +index 74ca966..312f2a0 100644 +--- a/panels/dock/OverflowContainer.qml ++++ b/panels/dock/OverflowContainer.qml +@@ -52,13 +52,13 @@ Item { + for (let child of listView.contentItem.visibleChildren) { + width = calculateImplicitWidth(width, child.implicitWidth) + } +- return width ++ return Math.max(width, 1) + } + implicitHeight: { + let height = 0 + for (let child of listView.contentItem.visibleChildren) { + height = calculateImplicitHeight(height, child.implicitHeight) + } +- return height ++ return Math.max(height, 1) + } + } diff --git a/third_party/nixpkgs/pkgs/desktops/expidus/calculator/default.nix b/third_party/nixpkgs/pkgs/desktops/expidus/calculator/default.nix index fb2ab18892..98328b8874 100644 --- a/third_party/nixpkgs/pkgs/desktops/expidus/calculator/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/expidus/file-manager/default.nix b/third_party/nixpkgs/pkgs/desktops/expidus/file-manager/default.nix index fa8e50475f..8de6262d86 100644 --- a/third_party/nixpkgs/pkgs/desktops/expidus/file-manager/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix index cd451d7178..5cab3288bd 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "elementary-code"; - version = "7.3.0"; + version = "7.4.0"; src = fetchFromGitHub { owner = "elementary"; repo = "code"; rev = version; - sha256 = "sha256-AizJPWRrCJvck+TFy/BVbzI6k62+tGkVux01Nl0XReg="; + sha256 = "sha256-KoRpGBYen1eOdMBHOTBMopC+mPMOkD+iYWV3JA21mKc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix index d8cda9a6af..fec9fba9be 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "7.0.0"; + version = "7.1.0"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "files"; rev = version; - hash = "sha256-6pEHyrQjqgbpOUEM/zbpuF8GM7JotDYfCnumU3aXIaI="; + hash = "sha256-KGp1qhUhig4h8iQljJTBdwZT3P2prB/pFyfJWXjtPLk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index bfe1dd1586..eaca490740 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 0f90c2af54..68abe51b4c 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index b0ac3670ff..b777bb47d9 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 85b6667990..d4195f246a 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix index e9ec6eb936..02a1b0fd31 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "switchboard"; - version = "8.0.1"; + version = "8.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-PRoaC+h9rlwu7Q5Fh/2lBxdod93h02S5dhUVMTEuKR4="; + sha256 = "sha256-iRxxXAUuSJzhX6uj1YeEzMUihWmrVZ6BFfayfteg/c8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index 8f87562014..c37ad542b7 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index e5000a20ca..de8c8eb3c5 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -10,6 +11,7 @@ , appcenter , elementary-settings-daemon , glib +, gnome-settings-daemon , granite7 , gtk4 , libadwaita @@ -18,15 +20,24 @@ stdenv.mkDerivation rec { pname = "elementary-onboarding"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "onboarding"; rev = version; - sha256 = "sha256-oG6L2t99BWeu8C6kE6IKgyc57Q8D1O9fdEMLnRA6AWY="; + sha256 = "sha256-p9N8Pblt15+BHcvlLjdPRyquM8w7ipieTcmUHpcMd6k="; }; + patches = [ + # WelcomeView: Fix missing handler when a row activated + # https://github.com/elementary/onboarding/pull/243 + (fetchpatch { + url = "https://github.com/elementary/onboarding/commit/391fab7867885578015abbebbe678e8d4f0f331d.patch"; + hash = "sha256-NnnvPQV2GBe8A6TiW5lq3J8hb4ruCSmri5UZ2W0fBIA="; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -39,6 +50,7 @@ stdenv.mkDerivation rec { appcenter # settings schema elementary-settings-daemon # settings schema glib + gnome-settings-daemon # org.gnome.settings-daemon.plugins.color granite7 gtk4 libadwaita diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 74bd1be5f2..7c4e18d7be 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-power"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-RelK4HIyTQ6kXi7/K8U33sKIrDrhA3IFVnnvX4x88UQ="; + sha256 = "sha256-zMvw96uRr9hrgXck+OhMiPku9qu8/zUtusiaJLUcuys="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/ada-modules/gnatprove/0001-fix-install.patch b/third_party/nixpkgs/pkgs/development/ada-modules/gnatprove/0001-fix-install.patch new file mode 100644 index 0000000000..d6911fb9a5 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ada-modules/gnatprove/default.nix b/third_party/nixpkgs/pkgs/development/ada-modules/gnatprove/default.nix index d50baba139..6e0eda57e8 100644 --- a/third_party/nixpkgs/pkgs/development/ada-modules/gnatprove/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ada-modules/gpr2/default.nix b/third_party/nixpkgs/pkgs/development/ada-modules/gpr2/default.nix new file mode 100644 index 0000000000..1ad58b125d --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/bigloo/default.nix b/third_party/nixpkgs/pkgs/development/compilers/bigloo/default.nix index b52d3fa6a3..c3ff5334ca 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/bigloo/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/bigloo/default.nix @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { # For libuv on darwin lib.optionalString stdenv.hostPlatform.isDarwin '' export LIBTOOLIZE=libtoolize - '' + - # Help libgc's configure. - '' export CXXCPP="$CXX -E" + '' + '' + # Help libgc's configure. + export CXXCPP="$CXX -E" ''; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix b/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix index 0907c1c4d6..39745f61fa 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/elm/packages/lamdera/default.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/lamdera/default.nix index 989d2a7732..1ab5497276 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/lamdera/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/fasmg/default.nix b/third_party/nixpkgs/pkgs/development/compilers/fasmg/default.nix index e987157954..67f4720261 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/fasmg/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix index f7412a37ec..e42654c36c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix index ff6c6b3100..ae89d3720b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/package.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/package.nix index d9b2089888..b4ac8c9828 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/package.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/package.nix @@ -3,12 +3,10 @@ callPackage, writeText, symlinkJoin, - targetPlatform, - buildPlatform, darwin, clang, llvm, - tools ? callPackage ./tools.nix { inherit buildPlatform; }, + tools ? callPackage ./tools.nix { }, stdenv, stdenvNoCC, dart, @@ -53,7 +51,7 @@ let expandDeps = deps: lib.flatten (map expandSingleDep deps); - constants = callPackage ./constants.nix { platform = targetPlatform; }; + constants = callPackage ./constants.nix { platform = stdenv.targetPlatform; }; python3 = if lib.versionAtLeast flutterVersion "3.20" then python312 else python39; @@ -64,8 +62,6 @@ let version hashes url - targetPlatform - buildPlatform ; }; @@ -253,7 +249,7 @@ stdenv.mkDerivation (finalAttrs: { "--embedder-for-target" "--no-goma" ] - ++ lib.optionals (targetPlatform.isx86_64 == false) [ + ++ lib.optionals (stdenv.targetPlatform.isx86_64 == false) [ "--linux" "--linux-cpu ${constants.alt-arch}" ] @@ -278,7 +274,7 @@ stdenv.mkDerivation (finalAttrs: { --out-dir $out \ --target-sysroot $toolchain \ --target-dir $outName \ - --target-triple ${targetPlatform.config} \ + --target-triple ${stdenv.targetPlatform.config} \ --enable-fontconfig runHook postConfigure diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/source.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/source.nix index 426e4db4e6..8d38362464 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/source.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/source.nix @@ -1,9 +1,7 @@ { + stdenv, lib, callPackage, - buildPlatform, - targetPlatform, - hostPlatform, fetchgit, tools ? null, curl, @@ -19,13 +17,14 @@ url, }@pkgs: let - target-constants = callPackage ./constants.nix { platform = targetPlatform; }; - build-constants = callPackage ./constants.nix { platform = buildPlatform; }; - tools = pkgs.tools or (callPackage ./tools.nix { inherit hostPlatform buildPlatform; }); + target-constants = callPackage ./constants.nix { platform = stdenv.targetPlatform; }; + build-constants = callPackage ./constants.nix { platform = stdenv.buildPlatform; }; + tools = pkgs.tools or (callPackage ./tools.nix { }); boolOption = value: if value then "True" else "False"; in -runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPlatform.system}" +runCommand + "flutter-engine-source-${version}-${stdenv.buildPlatform.system}-${stdenv.targetPlatform.system}" { pname = "flutter-engine-source"; inherit version; @@ -53,7 +52,7 @@ runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPla "custom_vars": { "download_fuchsia_deps": False, "download_android_deps": False, - "download_linux_deps": ${boolOption targetPlatform.isLinux}, + "download_linux_deps": ${boolOption stdenv.targetPlatform.isLinux}, "setup_githooks": False, "download_esbuild": False, "download_dart_sdk": False, @@ -83,8 +82,8 @@ runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPla outputHashAlgo = "sha256"; outputHashMode = "recursive"; outputHash = - (hashes."${buildPlatform.system}" or { })."${targetPlatform.system}" - or (throw "Hash not set for ${targetPlatform.system} on ${buildPlatform.system}"); + (hashes."${stdenv.buildPlatform.system}" or { })."${stdenv.targetPlatform.system}" + or (throw "Hash not set for ${stdenv.targetPlatform.system} on ${stdenv.buildPlatform.system}"); } '' source ${../../../../build-support/fetchgit/deterministic-git} @@ -101,7 +100,7 @@ runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPla 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/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/tools.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/tools.nix index 42cfd5e6dc..5fa0684805 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/tools.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/engine/tools.nix @@ -5,8 +5,6 @@ fetchurl, writeText, runCommand, - buildPlatform, - hostPlatform, darwin, writeShellScriptBin, depot_toolsCommit ? "7d95eb2eb054447592585c73a8ff7adad97ecba1", @@ -31,8 +29,8 @@ }, }: let - constants = callPackage ./constants.nix { platform = buildPlatform; }; - host-constants = callPackage ./constants.nix { platform = hostPlatform; }; + constants = callPackage ./constants.nix { platform = stdenv.buildPlatform; }; + host-constants = callPackage ./constants.nix { platform = stdenv.hostPlatform; }; stdenv-constants = callPackage ./constants.nix { platform = stdenv.hostPlatform; }; in { @@ -73,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/third_party/nixpkgs/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in b/third_party/nixpkgs/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in index f6746db43a..5af7d7fc77 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_24/data.json b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_24/data.json index 4a64ccd6e0..114e3e8868 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_24/data.json +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_26/data.json b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_26/data.json index 3d1b530a66..8dc7dd1cce 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_26/data.json +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_27/data.json b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_27/data.json new file mode 100644 index 0000000000..04e89fdfdc --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_27/patches/deregister-pub-dependencies-artifact.patch b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_27/patches/deregister-pub-dependencies-artifact.patch new file mode 100644 index 0000000000..01e34c6d29 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_27/patches/disable-auto-update.patch b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_27/patches/disable-auto-update.patch new file mode 100644 index 0000000000..2ad292efd2 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_27/patches/fix-ios-build-xcode-backend-sh.patch b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_27/patches/fix-ios-build-xcode-backend-sh.patch new file mode 100644 index 0000000000..825d40fc61 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_27/patches/gradle-flutter-tools-wrapper.patch b/third_party/nixpkgs/pkgs/development/compilers/flutter/versions/3_27/patches/gradle-flutter-tools-wrapper.patch new file mode 100644 index 0000000000..de6080efbb --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix index d360da5dfa..f5b18d196f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/buildGraalvm.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix index c9fc962e30..9b110b0a8b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix @@ -93,13 +93,13 @@ stdenv.mkDerivation { meta = with lib; { description = "MIT/GNU Scheme, a native code Scheme compiler"; - longDescription = - '' MIT/GNU Scheme is an implementation of the Scheme programming - language, providing an interpreter, compiler, source-code debugger, - integrated Emacs-like editor, and a large runtime library. MIT/GNU - Scheme is best suited to programming large applications with a rapid - development cycle. - ''; + longDescription = '' + MIT/GNU Scheme is an implementation of the Scheme programming + language, providing an interpreter, compiler, source-code debugger, + integrated Emacs-like editor, and a large runtime library. MIT/GNU + Scheme is best suited to programming large applications with a rapid + development cycle. + ''; homepage = "https://www.gnu.org/software/mit-scheme/"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/mkcl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mkcl/default.nix index ae2d11feb7..d5e297ae26 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mkcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mkcl/default.nix @@ -39,14 +39,16 @@ stdenv.mkDerivation rec { ]; # tinycc configure flags copied from the tinycc derivation. - postConfigure = ''( - cd contrib/tinycc - ./configure --cc=cc \ - --elfinterp=$(< $NIX_CC/nix-support/dynamic-linker) \ - --crtprefix=${lib.getLib stdenv.cc.libc}/lib \ - --sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include \ - --libpaths=${lib.getLib stdenv.cc.libc}/lib - )''; + postConfigure = '' + ( + cd contrib/tinycc; + ./configure --cc=cc \ + --elfinterp=$(< $NIX_CC/nix-support/dynamic-linker) \ + --crtprefix=${lib.getLib stdenv.cc.libc}/lib \ + --sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include \ + --libpaths=${lib.getLib stdenv.cc.libc}/lib + ) + ''; postInstall = '' wrapProgram $out/bin/mkcl --prefix PATH : "${gcc}/bin" diff --git a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix deleted file mode 100644 index 88d21c75a9..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/nim/update.sh b/third_party/nixpkgs/pkgs/development/compilers/nim/update.sh deleted file mode 100644 index a611f97b25..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/open-watcom/v2.nix b/third_party/nixpkgs/pkgs/development/compilers/open-watcom/v2.nix index ddd62872d4..8ad74c00ec 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/open-watcom/v2.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/open-watcom/v2.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "${passthru.prettyName}-unwrapped"; # nixpkgs-update: no auto update - version = "0-unstable-2024-05-14"; + version = "0-unstable-2024-10-13"; src = fetchFromGitHub { owner = "open-watcom"; repo = "open-watcom-v2"; - rev = "d3733a7fca1d02ad91b58b377ecb38e1293889db"; - hash = "sha256-gDrmm7hd07lv0KhkP7Bys5qCuCCH+t/XvlftCYlCyI8="; + rev = "f0a6465832643ba08b7f94fb814c552804fb395b"; + hash = "sha256-rT3z0KrkCZ78SbsK2CEHfvJa1TEnRH2kwhzZhi8fZDo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/opensmalltalk-vm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/opensmalltalk-vm/default.nix index ef238ebaf3..3ac761b423 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/opensmalltalk-vm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/opensmalltalk-vm/default.nix @@ -118,10 +118,12 @@ let platformDir = "linux64ARMv8"; vmName = "squeak.cog.spur"; scriptName = "squeak"; - configureFlagsArray = ''( - CFLAGS="-DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -DCOGMTVM=0 -DDUAL_MAPPED_CODE_ZONE=1" - LIBS="-lrt" - )''; + configureFlagsArray = '' + ( + CFLAGS="-DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -DCOGMTVM=0 -DDUAL_MAPPED_CODE_ZONE=1" + LIBS="-lrt" + ) + ''; configureFlags = [ "--with-vmversion=5.0" "--with-src=src/spur64.cog" @@ -134,9 +136,11 @@ let platformDir = "linux64ARMv8"; vmName = "squeak.stack.spur"; scriptName = "squeak"; - configureFlagsArray = ''( - CFLAGS="-DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -D__ARM_ARCH_ISA_A64 -DARM64 -D__arm__ -D__arm64__ -D__aarch64__" - )''; + configureFlagsArray = '' + ( + CFLAGS="-DNDEBUG -DDEBUGVM=0 -DMUSL -D_GNU_SOURCE -DUSEEVDEV -D__ARM_ARCH_ISA_A64 -DARM64 -D__arm__ -D__arm64__ -D__aarch64__" + ) + ''; configureFlags = [ "--with-vmversion=5.0" "--with-src=src/spur64.stack" @@ -151,9 +155,11 @@ let platformDir = "linux64x64"; vmName = "newspeak.cog.spur"; scriptName = "newspeak"; - configureFlagsArray = ''( - CFLAGS="-DNDEBUG -DDEBUGVM=0" - )''; + configureFlagsArray = '' + ( + CFLAGS="-DNDEBUG -DDEBUGVM=0" + ) + ''; configureFlags = [ "--with-vmversion=5.0" "--with-src=src/spur64.cog.newspeak" @@ -166,9 +172,11 @@ let platformDir = "linux64x64"; vmName = "squeak.cog.spur"; scriptName = "squeak"; - configureFlagsArray = ''( - CFLAGS="-DNDEBUG -DDEBUGVM=0 -DCOGMTVM=0" - )''; + configureFlagsArray = '' + ( + CFLAGS="-DNDEBUG -DDEBUGVM=0 -DCOGMTVM=0" + ) + ''; configureFlags = [ "--with-vmversion=5.0" "--with-src=src/spur64.cog" diff --git a/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix index ca23261a98..1b3b24b0ab 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix @@ -92,14 +92,15 @@ stdenv.mkDerivation (rec { # make: *** [Makefile:222: test-full-programs-release] Killed: 9 doCheck = !stdenv.hostPlatform.isDarwin; - installPhase = "make config=release prefix=$out " - + lib.optionalString stdenv.hostPlatform.isDarwin ("bits=64 " + (lib.optionalString (!lto) "lto=no ")) - + '' install + installPhase = '' + make config=release prefix=$out ${ + lib.optionalString stdenv.hostPlatform.isDarwin ("bits=64 " + (lib.optionalString (!lto) "lto=no ")) + } install wrapProgram $out/bin/ponyc \ - --prefix PATH ":" "${stdenv.cc}/bin" \ - --set-default CC "$CC" \ - --prefix PONYPATH : "${lib.makeLibraryPath [ pcre2 openssl (placeholder "out") ]}" - ''; + --prefix PATH ":" "${stdenv.cc}/bin" \ + --set-default CC "$CC" \ + --prefix PONYPATH : "${lib.makeLibraryPath [ pcre2 openssl (placeholder "out") ]}" + ''; # Stripping breaks linking for ponyc dontStrip = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/rgbds/default.nix b/third_party/nixpkgs/pkgs/development/compilers/rgbds/default.nix index 872dcae2e1..3b37e19fa2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rgbds/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rgbds/default.nix @@ -20,16 +20,16 @@ stdenv.mkDerivation rec { homepage = "https://rgbds.gbdev.io/"; description = "Free assembler/linker package for the Game Boy and Game Boy Color"; license = licenses.mit; - longDescription = - ''RGBDS (Rednex Game Boy Development System) is a free assembler/linker package for the Game Boy and Game Boy Color. It consists of: + longDescription = '' + RGBDS (Rednex Game Boy Development System) is a free assembler/linker package for the Game Boy and Game Boy Color. It consists of: - - rgbasm (assembler) - - rgblink (linker) - - rgbfix (checksum/header fixer) - - rgbgfx (PNG‐to‐Game Boy graphics converter) + - rgbasm (assembler) + - rgblink (linker) + - rgbfix (checksum/header fixer) + - rgbgfx (PNG‐to‐Game Boy graphics converter) - This is a fork of the original RGBDS which aims to make the programs more like other UNIX tools. - ''; + This is a fork of the original RGBDS which aims to make the programs more like other UNIX tools. + ''; maintainers = with maintainers; [ matthewbauer NieDzejkob ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/smlnj/default.nix b/third_party/nixpkgs/pkgs/development/compilers/smlnj/default.nix index 000c59d67a..17a43f50f7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/smlnj/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/smlnj/heap2exec.diff b/third_party/nixpkgs/pkgs/development/compilers/smlnj/heap2exec.diff deleted file mode 100644 index ef21a8e7f0..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix index 1e2851149e..9336adb1cd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/swi-prolog/default.nix @@ -71,9 +71,9 @@ let extraLibraries' = if extraLibraries == [] then [] else throw "option 'extraLibraries' removed - use 'with*' options (e.g., 'withJava'), or overrideAttrs to inject extra build dependencies"; - packInstall = swiplPath: pack: - ''${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/extra-pack\"), silent(true), interactive(false), git(false)])." -t "halt." - ''; + packInstall = swiplPath: pack: '' + ${swiplPath}/bin/swipl -g "pack_install(${pack}, [package_directory(\"${swiplPath}/lib/swipl/extra-pack\"), silent(true), interactive(false), git(false)])." -t "halt." + ''; withGui' = withGui && !stdenv.hostPlatform.isDarwin; optionalDependencies = [] ++ (lib.optional withDb db) diff --git a/third_party/nixpkgs/pkgs/development/compilers/zig/cc.nix b/third_party/nixpkgs/pkgs/development/compilers/zig/cc.nix index dc94e91881..115a71ca49 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/zig/cc.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/zig/cc.nix @@ -3,7 +3,7 @@ wrapCCWith, makeWrapper, runCommand, - targetPlatform, + stdenv, targetPackages, zig, }: @@ -34,9 +34,9 @@ wrapCCWith { nixSupport.cc-cflags = [ "-target" - "${targetPlatform.parsed.cpu.name}-${targetPlatform.parsed.kernel.name}-${targetPlatform.parsed.abi.name}" + "${stdenv.targetPlatform.parsed.cpu.name}-${stdenv.targetPlatform.parsed.kernel.name}-${stdenv.targetPlatform.parsed.abi.name}" ] ++ lib.optional ( - targetPlatform.isLinux && !(targetPackages.isStatic or false) + stdenv.targetPlatform.isLinux && !(targetPackages.isStatic or false) ) "-Wl,-dynamic-linker=${targetPackages.stdenv.cc.bintools.dynamicLinker}"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix index f3d4694202..97f2add33a 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/third_party/nixpkgs/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,25 @@ 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 ]; 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 ({ @@ -80,7 +92,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 +105,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/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-infotheo/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-infotheo/default.nix index 028d32c5af..ba42a24720 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-infotheo/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/coq-modules/relation-algebra/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/relation-algebra/default.nix index bd9c78f78a..35c26573a8 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/relation-algebra/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/relation-algebra/default.nix @@ -5,10 +5,12 @@ mkCoqDerivation { owner = "damien-pous"; releaseRev = v: - if lib.versions.isGe "1.7.6" v + if lib.versions.range "1.7.6" "1.7.9" v then "v.${v}" else "v${v}"; + release."1.7.11".sha256 = "sha256-ZOV0lUdduSabW9Qsz70clkO7QK/NK2STaHqBWcXb7nI="; + release."1.7.10".sha256 = "sha256-h738L+dybhmWZwTSLJrhv+sB+cIbj0+62Zcy9BH5sVo="; release."1.7.9".sha256 = "sha256-1WzAZyj6q7s0u/9r7lahzxTl8612EA540l9wpm7TYEg="; release."1.7.8".sha256 = "sha256-RITFd3G5TjY+rFzW073Ao1AGU+u6OGQyQeGHVodAXnA="; release."1.7.7".sha256 = "sha256:1dff3id6nypl2alhk9rcifj3dab0j78dym05blc525lawsmc26l2"; @@ -21,6 +23,8 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = isEq "8.20"; out = "1.7.11"; } + { case = range "8.18" "8.19"; out = "1.7.10"; } { case = isEq "8.17"; out = "1.7.9"; } { case = isEq "8.16"; out = "1.7.8"; } { case = isEq "8.15"; out = "1.7.7"; } diff --git a/third_party/nixpkgs/pkgs/development/embedded/edl/default.nix b/third_party/nixpkgs/pkgs/development/embedded/edl/default.nix index 86f27bf6a2..87b5fd6149 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/edl/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/babashka/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/babashka/default.nix index f4b51b37c4..f413c47b81 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/babashka/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/bqn/cbqn/sources.nix b/third_party/nixpkgs/pkgs/development/interpreters/bqn/cbqn/sources.nix index 3b9ca78533..48470c50e1 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/bqn/cbqn/sources.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/micropython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/micropython/default.nix index df34036a94..e557a0614d 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/micropython/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/php/8.1.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/8.1.nix index 9482ca500e..adf8fbfe59 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/8.1.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/php/8.2.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/8.2.nix index 50f70617fe..e1b8d2201e 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/8.2.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/php/php81-fix-libxml2-2.13-compatibility.patch b/third_party/nixpkgs/pkgs/development/interpreters/php/php81-fix-libxml2-2.13-compatibility.patch deleted file mode 100644 index b4624676ee..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix index abb66b38e3..4d8e03695d 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/third_party/nixpkgs/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 , configd, coreutils @@ -273,8 +273,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/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix index 37764506e2..32f27a2421 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/third_party/nixpkgs/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}" @@ -323,10 +323,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/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix index 3dcbce42cf..4e8199af56 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/wamr/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wamr/default.nix index 36a484b2dd..f8c5814df9 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wamr/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix index e5894476e9..ee0585e591 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix index 1e06af6cf9..6b83d72a97 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/bencodetools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bencodetools/default.nix index 7a826efa7e..b6a9ab68dd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bencodetools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bencodetools/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ]; # installCheck instead of check due to -install_name'd library on Darwin - doInstallCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; installCheckTarget = "check"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix index b126cff5b2..6d287b869f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ctranslate2/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/drogon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/drogon/default.nix index 701e75ff5f..eeda204d61 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/drogon/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix index ec8c996212..2a36329b38 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix @@ -17,25 +17,16 @@ in stdenv.mkDerivation rec { pname = "fcft"; - version = "3.1.8"; + version = "3.1.9"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fcft"; rev = version; - hash = "sha256-Wgm2QdW4rg573soF/8HhDmlyN4S2cA0VWOejow464gU="; + hash = "sha256-D4W62IHuM7ofEeU/3sp038tv2a1+xQd0mdSKXaY7Ikg="; }; - patches = [ - (fetchpatch { - name = "system-nanosvg.patch"; - url = "https://codeberg.org/dnkl/fcft/commit/5cee776e1d7f1bdb0df383c3dd798831a6fe4fa0.patch"; - excludes = [ "CHANGELOG.md" ]; - hash = "sha256-yRBtKCKT/Oih66/OQqt4GPg3GfHmhiLM8mlLEWYYRC0="; - }) - ]; - depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ pkg-config meson ninja scdoc ]; buildInputs = [ freetype fontconfig nanosvg pixman tllist ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index b0ccaeeb45..28a08cb0d2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -840,7 +840,7 @@ stdenv.mkDerivation (finalAttrs: { ]; }; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; # Fails with SIGABRT otherwise FIXME: Why? checkPhase = let diff --git a/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/23.nix b/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/23.nix index 5263694b05..4e30c3dd37 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/23.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/23.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "-DFLATBUFFERS_OSX_BUILD_UNIVERSAL=OFF" ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; checkTarget = "test"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix b/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix index 00bb9cc8d1..58ea13a50b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "-DFLATBUFFERS_OSX_BUILD_UNIVERSAL=OFF" ]; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; checkTarget = "test"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix index 6bddc8c6b5..841e0808d4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix @@ -80,20 +80,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal"; - version = "3.9.2"; + version = "3.9.3"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-BXnpNfi9tUd6nnwYdstuOfGsFVif8kkmkW97X1UAgt8="; + hash = "sha256-8LY63s5vOVK0V37jQ60qFsaW/2D/13Xuy9/2OPLyTso="; }; patches = [ - (fetchpatch { - url = "https://github.com/OSGeo/gdal/commit/91e4f55f8f374a75f8f2ecd05670edcfa4c0af84.patch"; - sha256 = "sha256-C2lkZLsORso7WVxgX79r5swkoVu/APPwQp2C/rmmCAo="; - }) (fetchpatch { url = "https://github.com/OSGeo/gdal/commit/40c3212fe4ba93e5176df4cd8ae5e29e06bb6027.patch"; sha256 = "sha256-D55iT6E/YdpSyfN7KUDTh1gdmIDLHXW4VC5d6D9B7ls="; @@ -268,9 +264,9 @@ stdenv.mkDerivation (finalAttrs: { # failing with PROJ 9.3.1 # https://github.com/OSGeo/gdal/issues/8908 "test_osr_esri_28" - # flakey tests, to remove on next release - "test_vsiaz_write_blockblob_chunk_size_1" - "test_vsiaz_fake_write" + # failing for unknown reason + # https://github.com/OSGeo/gdal/pull/10806#issuecomment-2362054085 + "test_ogr_gmlas_billion_laugh" ] ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [ # likely precision-related expecting x87 behaviour "test_jp2openjpeg_22" diff --git a/third_party/nixpkgs/pkgs/development/libraries/glpk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glpk/default.nix index 9fa8765f05..1f7974476b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glpk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glpk/default.nix @@ -62,8 +62,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GNU Linear Programming Kit"; - longDescription = - '' The GNU Linear Programming Kit is intended for solving large + longDescription = '' + The GNU Linear Programming Kit is intended for solving large scale linear programming problems by means of the revised simplex method. It is a set of routines written in the ANSI C programming language and organized in the form of a library. diff --git a/third_party/nixpkgs/pkgs/development/libraries/gmp/5.1.3-CVE-2021-43618.patch b/third_party/nixpkgs/pkgs/development/libraries/gmp/5.1.3-CVE-2021-43618.patch deleted file mode 100644 index 13b9bc5f58..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gmp/5.1.x.nix deleted file mode 100644 index 43e3ca9759..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix index 128ed788f4..aa449b86e7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/grilo-plugins/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gsasl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gsasl/default.nix index 8b90892730..735a1a58fa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gsasl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gsasl/default.nix @@ -26,12 +26,12 @@ stdenv.mkDerivation (finalAttrs: { description = "GNU SASL, Simple Authentication and Security Layer library"; mainProgram = "gsasl"; - longDescription = - '' GNU SASL is a library that implements the IETF Simple - Authentication and Security Layer (SASL) framework and - some SASL mechanisms. SASL is used in network servers - (e.g. IMAP, SMTP, etc.) to authenticate peers. - ''; + longDescription = '' + GNU SASL is a library that implements the IETF Simple + Authentication and Security Layer (SASL) framework and + some SASL mechanisms. SASL is used in network servers + (e.g. IMAP, SMTP, etc.) to authenticate peers. + ''; homepage = "https://www.gnu.org/software/gsasl/"; license = lib.licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix index 19bcb4ad99..d3a79cf0e9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtkimageview/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { description = "Image viewer widget for GTK"; - longDescription = - '' GtkImageView is a simple image viewer widget for GTK. Similar to - the image viewer panes in gThumb or Eye of Gnome. It makes writing - image viewing and editing applications easy. Among its features - are: mouse and keyboard zooming; scrolling and dragging; adjustable - interpolation; GIF animation support. - ''; + longDescription = '' + GtkImageView is a simple image viewer widget for GTK. Similar to + the image viewer panes in gThumb or Eye of Gnome. It makes writing + image viewing and editing applications easy. Among its features + are: mouse and keyboard zooming; scrolling and dragging; adjustable + interpolation; GIF animation support. + ''; license = lib.licenses.lgpl2Plus; diff --git a/third_party/nixpkgs/pkgs/development/libraries/icu/default.nix b/third_party/nixpkgs/pkgs/development/libraries/icu/default.nix index e7ad912dc3..e5fc14bb9c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/icu/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/icu/make-icu.nix b/third_party/nixpkgs/pkgs/development/libraries/icu/make-icu.nix index 7e137003b0..d7fe460416 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/icu/make-icu.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index 4803f6ecf3..ded8e57cf1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/isa-l/default.nix b/third_party/nixpkgs/pkgs/development/libraries/isa-l/default.nix index 6ae04b0b26..6a53990b78 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/isa-l/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/java/rhino/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/rhino/default.nix index 6fb5f8a14c..7d51386c58 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/java/rhino/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/java/rhino/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Implementation of JavaScript written in Java"; - longDescription = - '' Rhino is an open-source implementation of JavaScript written - entirely in Java. It is typically embedded into Java applications - to provide scripting to end users. - ''; + longDescription = '' + Rhino is an open-source implementation of JavaScript written + entirely in Java. It is typically embedded into Java applications + to provide scripting to end users. + ''; homepage = "http://www.mozilla.org/rhino/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libchop/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libchop/default.nix index aa9f50917b..996c92ef20 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libchop/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libchop/default.nix @@ -36,20 +36,20 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools & library for data backup and distributed storage"; - longDescription = - '' Libchop is a set of utilities and library for data backup and - distributed storage. Its main application is chop-backup, an - encrypted backup program that supports data integrity checks, - versioning at little cost, distribution among several sites, - selective sharing of stored data, adaptive compression, and more. - The library itself, which chop-backup builds upon, implements - storage techniques such as content-based addressing, content hash - keys, Merkle trees, similarity detection, and lossless compression. - It makes it easy to combine them in different ways. The - ‘chop-archiver’ and ‘chop-block-server’ tools, illustrated in the - manual, provide direct access to these facilities from the command - line. It is written in C and has Guile (Scheme) bindings. - ''; + longDescription = '' + Libchop is a set of utilities and library for data backup and + distributed storage. Its main application is chop-backup, an + encrypted backup program that supports data integrity checks, + versioning at little cost, distribution among several sites, + selective sharing of stored data, adaptive compression, and more. + The library itself, which chop-backup builds upon, implements + storage techniques such as content-based addressing, content hash + keys, Merkle trees, similarity detection, and lossless compression. + It makes it easy to combine them in different ways. The + ‘chop-archiver’ and ‘chop-block-server’ tools, illustrated in the + manual, provide direct access to these facilities from the command + line. It is written in C and has Guile (Scheme) bindings. + ''; homepage = "https://www.nongnu.org/libchop/"; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcifpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcifpp/default.nix index 564c7690b3..ce9787c879 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcifpp/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libconfig/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libconfig/default.nix deleted file mode 100644 index 049b0c8f4f..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix index 85dbf3a72b..81a129587d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix index e154eebc48..ac64cbc180 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libextractor/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { }) ]; - preConfigure = - '' echo "patching installation directory in \`extractor.c'..." - sed -i "src/main/extractor.c" \ - -e "s|pexe[[:blank:]]*=.*$|pexe = strdup(\"$out/lib/\");|g" - ''; + preConfigure = '' + echo "patching installation directory in \`extractor.c'..." + sed -i "src/main/extractor.c" \ + -e "s|pexe[[:blank:]]*=.*$|pexe = strdup(\"$out/lib/\");|g" + ''; nativeBuildInputs = [ pkg-config ]; @@ -71,26 +71,26 @@ stdenv.mkDerivation rec { description = "Simple library for keyword extraction"; mainProgram = "extract"; - longDescription = - '' GNU libextractor is a library used to extract meta-data from files - of arbitrary type. It is designed to use helper-libraries to perform - the actual extraction, and to be trivially extendable by linking - against external extractors for additional file types. + longDescription = '' + GNU libextractor is a library used to extract meta-data from files + of arbitrary type. It is designed to use helper-libraries to perform + the actual extraction, and to be trivially extendable by linking + against external extractors for additional file types. - The goal is to provide developers of file-sharing networks or - WWW-indexing bots with a universal library to obtain simple keywords - to match against queries. libextractor contains a shell-command - extract that, similar to the well-known file command, can extract - meta-data from a file an print the results to stdout. + The goal is to provide developers of file-sharing networks or + WWW-indexing bots with a universal library to obtain simple keywords + to match against queries. libextractor contains a shell-command + extract that, similar to the well-known file command, can extract + meta-data from a file an print the results to stdout. - Currently, libextractor supports the following formats: HTML, PDF, - PS, OLE2 (DOC, XLS, PPT), OpenOffice (sxw), StarOffice (sdw), DVI, - MAN, FLAC, MP3 (ID3v1 and ID3v2), NSF(E) (NES music), SID (C64 - music), OGG, WAV, EXIV2, JPEG, GIF, PNG, TIFF, DEB, RPM, TAR(.GZ), - ZIP, ELF, S3M (Scream Tracker 3), XM (eXtended Module), IT (Impulse - Tracker), FLV, REAL, RIFF (AVI), MPEG, QT and ASF. Also, various - additional MIME types are detected. - ''; + Currently, libextractor supports the following formats: HTML, PDF, + PS, OLE2 (DOC, XLS, PPT), OpenOffice (sxw), StarOffice (sdw), DVI, + MAN, FLAC, MP3 (ID3v1 and ID3v2), NSF(E) (NES music), SID (C64 + music), OGG, WAV, EXIV2, JPEG, GIF, PNG, TIFF, DEB, RPM, TAR(.GZ), + ZIP, ELF, S3M (Scream Tracker 3), XM (eXtended Module), IT (Impulse + Tracker), FLV, REAL, RIFF (AVI), MPEG, QT and ASF. Also, various + additional MIME types are detected. + ''; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfishsound/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfishsound/default.nix index e8ceb261a4..2105f2cc0f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfishsound/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfishsound/default.nix @@ -16,11 +16,13 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://xiph.org/fishsound/"; description = "Simple programming interface for decoding and encoding audio data using Xiph.org codecs (FLAC, Speex and Vorbis)"; - longDescription = ''libfishsound by itself is designed to handle raw codec streams from a lower level layer such as UDP datagrams. When these codecs are used in files, they are commonly encapsulated in Ogg to produce Ogg FLAC, Speex and Ogg Vorbis files. + longDescription = '' + libfishsound by itself is designed to handle raw codec streams from a lower level layer such as UDP datagrams. When these codecs are used in files, they are commonly encapsulated in Ogg to produce Ogg FLAC, Speex and Ogg Vorbis files. -libfishsound is a wrapper around the existing codec libraries and provides a consistent, higher-level programming interface. It has been designed for use in a wide variety of applications; it has no direct dependencies on Ogg encapsulation, though it is most commonly used in conjunction with liboggz to decode or encode FLAC, Speex or Vorbis audio tracks in Ogg files, including Ogg Theora and Annodex. + libfishsound is a wrapper around the existing codec libraries and provides a consistent, higher-level programming interface. It has been designed for use in a wide variety of applications; it has no direct dependencies on Ogg encapsulation, though it is most commonly used in conjunction with liboggz to decode or encode FLAC, Speex or Vorbis audio tracks in Ogg files, including Ogg Theora and Annodex. -FishSound has been developed and tested on GNU/Linux, Darwin/MacOSX and Win32. It probably also works on other Unix-like systems via GNU autoconf. For Win32: nmake Makefiles, Visual Studio .NET 2003 solution files and Visual C++ 6.0 workspace files are all provided in the source distribution.''; + FishSound has been developed and tested on GNU/Linux, Darwin/MacOSX and Win32. It probably also works on other Unix-like systems via GNU autoconf. For Win32: nmake Makefiles, Visual Studio .NET 2003 solution files and Visual C++ 6.0 workspace files are all provided in the source distribution. + ''; platforms = platforms.unix; license = licenses.bsd3; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libieee1284/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libieee1284/default.nix index c49e425231..377d569571 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libieee1284/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix index 4ae2657de9..0c1a6f3437 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix @@ -18,7 +18,7 @@ , doxygen , python3 , lcms2 -, enablePlugins ? stdenv.buildPlatform.canExecute stdenv.hostPlatform +, enablePlugins ? true }: let @@ -127,6 +127,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/third_party/nixpkgs/pkgs/development/libraries/libkrunfw/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libkrunfw/default.nix index e56cf67073..6369dd56f4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libkrunfw/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libkrunfw/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libkrunfw"; - version = "4.4.1"; + version = "4.4.2"; src = fetchFromGitHub { owner = "containers"; repo = "libkrunfw"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-rxMklV/pu/muz/7m1clEs+BItXid/jMt6j/R/yHBKHI="; + hash = "sha256-o1bFz3INtJRm9gdm2b9+sHW6r+l/RNCZr62ucI73N9w="; }; kernelSrc = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmx/default.nix index cdc4b4f077..643c671f77 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmx/default.nix @@ -50,12 +50,13 @@ stdenv.mkDerivation rec { homepage = "http://www.clutter-project.org/"; description = "Clutter-based toolkit"; mainProgram = "mx-create-image-cache"; - longDescription = - ''Mx is a widget toolkit using Clutter that provides a set of standard - interface elements, including buttons, progress bars, scroll bars and - others. It also implements some standard managers. One other interesting - feature is the possibility setting style properties from a CSS format - file.''; + longDescription = '' + Mx is a widget toolkit using Clutter that provides a set of standard + interface elements, including buttons, progress bars, scroll bars and + others. It also implements some standard managers. One other interesting + feature is the possibility setting style properties from a CSS format + file. + ''; license = licenses.lgpl21; maintainers = [ ]; platforms = with platforms; linux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpsl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpsl/default.nix index 1659a55cb4..15a8cef8b4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpsl/default.nix +++ b/third_party/nixpkgs/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"; @@ -41,7 +47,7 @@ stdenv.mkDerivation rec { libidn2 libunistring libxslt - ] ++ lib.optional (!stdenv.hostPlatform.isStatic) python3; + ] ++ lib.optional (!stdenv.hostPlatform.isStatic && !stdenv.hostPlatform.isWindows) python3; propagatedBuildInputs = [ publicsuffix-list diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpwquality/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpwquality/default.nix index 08454fe94d..dd61098961 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpwquality/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix index 5dc620fd5c..ef311bdd02 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libstroke/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libstroke/default.nix index 13b117b5e0..2231adbf80 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libstroke/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libstroke/default.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { homepage = "https://web.archive.org/web/20161204100704/http://etla.net/libstroke/"; license = lib.licenses.gpl2; - longDescription = - '' libstroke, last updated in 2001, still successfully provides a basic - gesture recognition engine based around a 3x3 grid. It's simple and - easy to work with, and notably used by FVWM. - ''; + longDescription = '' + libstroke, last updated in 2001, still successfully provides a basic + gesture recognition engine based around a 3x3 grid. It's simple and + easy to work with, and notably used by FVWM. + ''; platforms = lib.platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvgm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvgm/default.nix index 895a382c96..09d7ac0236 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvgm/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix index af028888b2..8cdcd9d195 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix b/third_party/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix index b15997cb43..ffc6665af4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { fi ''; - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; nativeCheckInputs = [ gtest ]; enableParallelChecking = false; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix index 339db2bb08..d690cc45b2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation (finalAttrs: { "-DJSON_MultipleHeaders=ON" ] ++ lib.optional finalAttrs.finalPackage.doCheck "-DJSON_TestDataDirectory=${testData}"; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; # skip tests that require git or modify “installed files” preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix index 9ac43cc4b1..a1bfe9dced 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix index c961dfd069..a8e125cc43 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openexrid-unstable/default.nix @@ -20,10 +20,11 @@ stdenv.mkDerivation { --replace g++ c++ ''; - env.NIX_CFLAGS_COMPILE = ''-I${ilmbase.dev}/include/OpenEXR - -I${openexr.dev}/include/OpenEXR - -I${openfx.dev}/include/OpenFX - ''; + env.NIX_CFLAGS_COMPILE = '' + -I${ilmbase.dev}/include/OpenEXR + -I${openexr.dev}/include/OpenEXR + -I${openfx.dev}/include/OpenFX + ''; buildInputs = [ re2 openfx zlib ilmbase libGLU libGL openexr ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openjpeg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openjpeg/default.nix index 4af80702b5..0bfa1067a7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openjpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openjpeg/default.nix @@ -3,7 +3,18 @@ , jpipLibSupport ? false # JPIP library & executables , jpipServerSupport ? false, curl, fcgi # JPIP Server , jdk + +# for passthru.tests +, ffmpeg +, gdal +, gdcm +, ghostscript +, imagemagick +, leptonica +, mupdf , poppler +, python3 +, vips }: let @@ -52,7 +63,19 @@ stdenv.mkDerivation rec { passthru = { incDir = "openjpeg-${lib.versions.majorMinor version}"; tests = { - inherit poppler; + ffmpeg = ffmpeg.override { withOpenjpeg = true; }; + imagemagick = imagemagick.override { openjpegSupport = true; }; + pillow = python3.pkgs.pillow; + + inherit + gdal + gdcm + ghostscript + leptonica + mupdf + poppler + vips + ; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openslide/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openslide/default.nix index cc0b5ed98c..799896f50f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openslide/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix b/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix index 615d2590c0..217399deb1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "proj"; - version = "9.4.1"; + version = "9.5.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = finalAttrs.version; - hash = "sha256-sLlG9NNHST9d0G5hV1tOGpTSv4rbUxERW3kwGC+t1iU="; + hash = "sha256-j7Bvv8F9wxrcQlquRa7Pdj5HTUJhwo8Wc1/JbULkUhM="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/qxmpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qxmpp/default.nix index 98b4c0a2b7..20730810d9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qxmpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qxmpp/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "qxmpp"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "qxmpp-project"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Tp3SDOoUAnAvwkID6U63TkeLy6Is+sWn7Oy0nT1f/LQ="; + sha256 = "sha256-fxTlxlnqttZZWRkt+vo4MJJz7DR/FMXcOqUv+/nlV18="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix index f8e0dcff2b..ee24908eb5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix index dd8104ad5f..4f6350d931 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/prefetch.sh b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/prefetch.sh index 2682fe6779..d8680d3a60 100755 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/prefetch.sh +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/tokyo-cabinet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tokyo-cabinet/default.nix index 4b3c8a363e..b3b50ae29b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tokyo-cabinet/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tokyo-cabinet/default.nix @@ -11,30 +11,30 @@ stdenv.mkDerivation rec { buildInputs = [ zlib bzip2 ]; - postInstall = - '' sed -i "$out/lib/pkgconfig/tokyocabinet.pc" \ - -e 's|-lz|-L${zlib.out}/lib -lz|g; - s|-lbz2|-L${bzip2.out}/lib -lbz2|g' - ''; + postInstall = '' + sed -i "$out/lib/pkgconfig/tokyocabinet.pc" \ + -e 's|-lz|-L${zlib.out}/lib -lz|g; + s|-lbz2|-L${bzip2.out}/lib -lbz2|g' + ''; meta = { description = "Tokyo Cabinet: a modern implementation of DBM"; - longDescription = - '' Tokyo Cabinet is a library of routines for managing a database. The - database is a simple data file containing records, each is a pair of - a key and a value. Every key and value is serial bytes with - variable length. Both binary data and character string can be used - as a key and a value. There is neither concept of data tables nor - data types. Records are organized in hash table, B+ tree, or - fixed-length array. + longDescription = '' + Tokyo Cabinet is a library of routines for managing a database. The + database is a simple data file containing records, each is a pair of + a key and a value. Every key and value is serial bytes with + variable length. Both binary data and character string can be used + as a key and a value. There is neither concept of data tables nor + data types. Records are organized in hash table, B+ tree, or + fixed-length array. - Tokyo Cabinet is developed as the successor of GDBM and QDBM on the - following purposes. They are achieved and Tokyo Cabinet replaces - conventional DBM products: improves space efficiency, improves time - efficiency, improves parallelism, improves usability, improves - robustness, supports 64-bit architecture. - ''; + Tokyo Cabinet is developed as the successor of GDBM and QDBM on the + following purposes. They are achieved and Tokyo Cabinet replaces + conventional DBM products: improves space efficiency, improves time + efficiency, improves parallelism, improves usability, improves + robustness, supports 64-bit architecture. + ''; license = lib.licenses.lgpl2Plus; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tokyo-tyrant/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tokyo-tyrant/default.nix index 6407840c44..2c78c15d87 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tokyo-tyrant/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tokyo-tyrant/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { meta = { description = "Network interface of the Tokyo Cabinet DBM"; - longDescription = - '' Tokyo Tyrant is a package of network interface to the DBM called + longDescription = '' + Tokyo Tyrant is a package of network interface to the DBM called Tokyo Cabinet. Though the DBM has high performance, you might bother in case that multiple processes share the same database, or remote processes access the database. Thus, Tokyo Tyrant is diff --git a/third_party/nixpkgs/pkgs/development/libraries/tomlplusplus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tomlplusplus/default.nix deleted file mode 100644 index dda352d076..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix index 79abe0f827..c1f3aeb7a3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { ''; doCheck = false; - doInstallCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; # Since we rewrote the load path in the dynamic loader for the TCTI # The various tcti implementation should be placed in their target directory # before we could run tests, so we make turn checkPhase into installCheckPhase diff --git a/third_party/nixpkgs/pkgs/development/libraries/uriparser/default.nix b/third_party/nixpkgs/pkgs/development/libraries/uriparser/default.nix index dd93f49f59..370a1dfe4e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/uriparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/uriparser/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional (!doCheck) "-DURIPARSER_BUILD_TESTS=OFF"; nativeCheckInputs = [ gtest ]; - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; meta = with lib; { changelog = "https://github.com/uriparser/uriparser/blob/uriparser-${version}/ChangeLog"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vmmlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vmmlib/default.nix index d2840ba33a..71b540b01c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vmmlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vmmlib/default.nix @@ -29,12 +29,14 @@ stdenv.mkDerivation rec { broken = stdenv.hostPlatform.isDarwin; description = "Vector and matrix math library implemented using C++ templates"; - longDescription = ''vmmlib is a vector and matrix math library implemented - using C++ templates. Its basic functionality includes a vector - and a matrix class, with additional functionality for the - often-used 3d and 4d vectors and 3x3 and 4x4 matrices. - More advanced functionality include solvers, frustum - computations and frustum culling classes, and spatial data structures''; + longDescription = '' + vmmlib is a vector and matrix math library implemented + using C++ templates. Its basic functionality includes a vector + and a matrix class, with additional functionality for the + often-used 3d and 4d vectors and 3x3 and 4x4 matrices. + More advanced functionality include solvers, frustum + computations and frustum culling classes, and spatial data structures + ''; license = licenses.bsd2; homepage = "https://github.com/VMML/vmmlib/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix index 7ad997e6d6..f06af1417d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.9.11"; + version = "4.9.12"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - hash = "sha256-aX1YU35ATL+f18tGIba6cgNYZvYm3TshHsN7RFD+vI4="; + hash = "sha256-WiOAF1yg18W4Vyyy+rzRe87GQTemvn32bexit4M/HjE="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/nix-cl.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/nix-cl.nix index eb51c992dc..a1441d2e57 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/nix-cl.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix index b44528cdc6..a7cded6a97 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix +++ b/third_party/nixpkgs/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.1473-1"; + version = "0.0.1479-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fzf-lua-0.0.1473-1.rockspec"; - sha256 = "091wlqar9gqrpkall49l2b2nrg8i6r3nldkx2rx7bgfj23zk74fk"; + url = "mirror://luarocks/fzf-lua-0.0.1479-1.rockspec"; + sha256 = "1xj0vw2y9y0ff88gcsh1q8vg9lsrsak435pzx8bizpcxkpaqizc4"; }).outPath; src = fetchzip { - url = "https://github.com/ibhagwan/fzf-lua/archive/1e03541de4d8a169defe83bb4d7abfba450c63a1.zip"; - sha256 = "1by9092fvfk1v06idfqhnx5bsisj28hk981ngylkzq806j7lbj09"; + url = "https://github.com/ibhagwan/fzf-lua/archive/ce1e24f2a48089b65deefcb0a71a9856839002b5.zip"; + sha256 = "0nfihl95bxrjmkin8wj6d8sznch695fk2wxkwk6wd92v5dlapypx"; }; disabled = luaOlder "5.1"; @@ -606,8 +606,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "863903631e676b33e8be2acb17512fdc1b80b4fb"; - hash = "sha256-o2Y57z7IuIa9wvLlzyslcs3/+iaZzuqM1NImlKAPt5Y="; + rev = "ee7634ab4f0a6606438fe13e16cbf2065589a5ed"; + hash = "sha256-jR7/rX2bsOMkWc4MHMRlBDdELgl8JOVjGOcx6bl/nYw="; }; disabled = lua.luaversion != "5.1"; @@ -622,14 +622,14 @@ buildLuarocksPackage { haskell-tools-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "haskell-tools.nvim"; - version = "4.2.0-1"; + version = "4.3.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/haskell-tools.nvim-4.2.0-1.rockspec"; - sha256 = "1a30qy1k0cknj0r9anghdbmlmngkhbk90mcyrwrf8pzi5l3465x5"; + url = "mirror://luarocks/haskell-tools.nvim-4.3.1-1.rockspec"; + sha256 = "1aw8rs6b384qp33j615ixp2iz8qpfs9nwv5psgknb38pswh9ldly"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v4.2.0.zip"; - sha256 = "1zfnjyadamvf4if15gn7g6q35p1zvzgmsbbjwwy1vgh4mc0vmfav"; + url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/v4.3.1.zip"; + sha256 = "1ssgwms4jipl7j3v51wzmhllg1bm4k1nd3j5i8rwmjcv704izik9"; }; 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"; @@ -1534,16 +1534,16 @@ buildLuarocksPackage { lua-yajl = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: buildLuarocksPackage { pname = "lua-yajl"; - version = "2.0-1"; + version = "2.1-0"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-yajl-2.0-1.rockspec"; - sha256 = "0h600zgq5qc9z3cid1kr35q3qb98alg0m3qf0a3mfj33hya6pcxp"; + url = "mirror://luarocks/lua-yajl-2.1-0.rockspec"; + sha256 = "02jlgd4583p3q4w6hjgmdfkasxhamaj58byyrbmnch0qii61in9r"; }).outPath; src = fetchFromGitHub { owner = "brimworks"; repo = "lua-yajl"; - rev = "v2.0"; - hash = "sha256-/UhdjTUzd5ZsQG3CaS6i0cYOgkLR4TJCUAcw5yYhYEI="; + rev = "v2.1"; + hash = "sha256-zHBNedJkGEm47HpbeJvcm6JNUUfA1OunLHPJulR8rF8="; }; 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.8.1-1"; + version = "2.9.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lz.n-2.8.1-1.rockspec"; - sha256 = "0i3iwzzsm66fgy9cak8b6hq36cfhywqdngwzxdyj9k03bpzhdiyc"; + 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.8.1.zip"; - sha256 = "1qwzxl8lzf6gh66zhfbi7q6wav00vnvai0sz8w7aiix7q1jrsl1q"; + 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"; @@ -2821,8 +2821,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "ae644feb7b67bf1ce4260c231d1d4300b19c6f30"; - hash = "sha256-NcodgUp8obTsjgc+5j2dKr0f3FelYikQTJngfZXRZzo="; + rev = "29fb4854573355792df9e156cb779f0d31308796"; + hash = "sha256-dAsXxv1RtgMc1i5QrR2xqOeK6aRgYNqdYyTXVBXhVJ4="; }; disabled = luaOlder "5.1" || luaAtLeast "5.4"; @@ -2976,14 +2976,14 @@ buildLuarocksPackage { rest-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, luaOlder, mimetypes, nvim-nio, xml2lua }: buildLuarocksPackage { pname = "rest.nvim"; - version = "3.8.2-1"; + version = "3.8.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rest.nvim-3.8.2-1.rockspec"; - sha256 = "0im28m714isfqdjgdmc2rpknpi45d5m3qil2lnz633zc6g32ddr0"; + url = "mirror://luarocks/rest.nvim-3.8.3-1.rockspec"; + sha256 = "0xz2h3z1ifydhlyrv2h13s26y2amx1x5xqppd6sq4bcg4zk82qv3"; }).outPath; src = fetchzip { - url = "https://github.com/rest-nvim/rest.nvim/archive/v3.8.2.zip"; - sha256 = "0y9ikzillz14dn16lp3vjhgck89v6kj6fdd2hdz6i6g98hvijxbn"; + url = "https://github.com/rest-nvim/rest.nvim/archive/v3.8.3.zip"; + sha256 = "0cjck6c2qpa13rll3n1i0a97kpzlzpmk93nl2c4lvgplc3xp6zkf"; }; disabled = luaOlder "5.1"; @@ -3048,14 +3048,14 @@ buildLuarocksPackage { rocks-git-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, rocks-nvim }: buildLuarocksPackage { pname = "rocks-git.nvim"; - version = "2.3.1-1"; + version = "2.5.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks-git.nvim-2.3.1-1.rockspec"; - sha256 = "06psladknqjqqg7gb17550iy40bfk6m5pcwr2156xk136dil4bpz"; + url = "mirror://luarocks/rocks-git.nvim-2.5.0-1.rockspec"; + sha256 = "1qxmwl7b21d9cxbai24pg1pymd8pii4bgikkc017qi3dafk7baqk"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v2.3.1.zip"; - sha256 = "1y8zs4dcr8npqjicbi8xjgnfb5fhqv0j6mwzpfl2bzm979s6hz4b"; + url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v2.5.0.zip"; + sha256 = "1nvq3yhmnab2frfkf5yh6ffq7rqw3rmxsbj0hbm28vg3rr9c2zjw"; }; 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.2-1"; + version = "2.41.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rocks.nvim-2.40.2-1.rockspec"; - sha256 = "1vblf19kqddn0fs94ra6a58h19qid6591svh7n5kjvk8l3lnk4kv"; + 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.2.zip"; - sha256 = "12b6gfbnv0aw10rk36c8hqf3mjbm9izjf1dpf3r9i4fwimvbp4dd"; + url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.41.0.zip"; + sha256 = "0j44chcziimqn6jm2ckbwmn97nin0dwhnnrdpm87j754kbqsj21a"; }; disabled = luaOlder "5.1"; @@ -3119,14 +3119,14 @@ buildLuarocksPackage { rustaceanvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "rustaceanvim"; - version = "5.11.0-1"; + version = "5.13.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rustaceanvim-5.11.0-1.rockspec"; - sha256 = "19ml95sqc1ia3fg1mgja61frwn2zbks4pw4c4as62k3pz5dxrwag"; + url = "mirror://luarocks/rustaceanvim-5.13.0-1.rockspec"; + sha256 = "1r0b3haiix45ngl570dld84h1y36lpw2lc1vsf5z08xms45c5fay"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/rustaceanvim/archive/v5.11.0.zip"; - sha256 = "1x9jdf60yc63n5m555rrg33g5anzcmxpiy04vb8vgmsn543kv7wd"; + url = "https://github.com/mrcjkb/rustaceanvim/archive/v5.13.0.zip"; + sha256 = "1prlsh1fl1a3r8fcshmzwbjk3imbxg2z43xl8fwbsginpizl8g09"; }; disabled = luaOlder "5.1"; @@ -3338,8 +3338,8 @@ buildLuarocksPackage { src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "dc6fc321a5ba076697cca89c9d7ea43153276d81"; - hash = "sha256-bhGlFAJIWJw/jrNWTJs2ywJkX/W+0EP5L4CX6M78dko="; + 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/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix b/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix index dd8e975d32..4f99dec11a 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix b/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix index 74da4320de..5de9127f4e 100644 --- a/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/mobile/xcodeenv/build-app.nix b/third_party/nixpkgs/pkgs/development/mobile/xcodeenv/build-app.nix index 6120025d5e..2d9a295b86 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/xcodeenv/build-app.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation ({ # Do the building export LD=/usr/bin/clang # To avoid problem with -isysroot parameter that is unrecognized by the stock ld. Comparison with an impure build shows that it uses clang instead. Ugly, but it works - xcodebuild -target ${_target} -configuration ${_configuration} ${lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${lib.optionalString (generateIPA || generateXCArchive) "-archivePath \"${name}.xcarchive\" archive"} ${lib.optionalString release '' PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"''} ${xcodeFlags} + xcodebuild -target ${_target} -configuration ${_configuration} ${lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} TARGETED_DEVICE_FAMILY="1, 2" ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${lib.optionalString (generateIPA || generateXCArchive) "-archivePath \"${name}.xcarchive\" archive"} ${lib.optionalString release ''PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName-db"''} ${xcodeFlags} ${lib.optionalString release '' ${lib.optionalString generateIPA '' diff --git a/third_party/nixpkgs/pkgs/development/node-packages/aliases.nix b/third_party/nixpkgs/pkgs/development/node-packages/aliases.nix index 566a3ff658..9690d08633 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/aliases.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/aliases.nix @@ -144,6 +144,7 @@ mapAliases { inherit (pkgs) npm-check-updates; # added 2023-08-22 ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04 parcel-bundler = self.parcel; # added 2023-09-04 + inherit (pkgs) patch-package; # added 2024-06-29 pkg = pkgs.vercel-pkg; # added 2023-10-04 inherit (pkgs) pm2; # added 2024-01-22 inherit (pkgs) pnpm; # added 2024-06-26 diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-env.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-env.nix index eb94495aeb..4123ca0296 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-env.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/php-packages/castor/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/castor/default.nix index b9831c854a..0cdb680def 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/castor/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/castor/default.nix @@ -9,16 +9,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "castor"; - version = "0.17.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "jolicode"; repo = "castor"; rev = "v${finalAttrs.version}"; - hash = "sha256-ng32vuGlGffpkzf3hXu0sNbj0PCDu4DpZnMnbDV9pZk="; + hash = "sha256-f+vz3SFXnZS67dyHQyycONBtfydMVh2XjB/4r9QIak8="; }; - vendorHash = "sha256-0aDT0hPhoPl0U/QbstiGmUHaqDdQb1ReY2hy9FEnzwM="; + vendorHash = "sha256-U/L+iJ/DKCiUEbSUc/BgYeKakv0BdK6Eq5BJjtwb1Yk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/parallel/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/parallel/default.nix new file mode 100644 index 0000000000..abb5da0bb8 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/php-packages/phing/composer.lock b/third_party/nixpkgs/pkgs/development/php-packages/phing/composer.lock deleted file mode 100644 index 6192f6283f..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/php-packages/phing/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phing/default.nix index dfda99220f..de9de209f1 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phing/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/composer.lock b/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/composer.lock index d33ffb2e20..8efc933a55 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/composer.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix index ffb58ccacc..782d1744ca 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix index f5d0bcedae..04c11fd603 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.122"; + version = "9.2.125"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; rev = "refs/tags/v${version}"; - hash = "sha256-e+SDgi0bhiE0MdhRxxFlkKU0N5ExfehbEOOyO4+wAzQ="; + hash = "sha256-ytwhCSlkp38Fff+bB/ep/FvY63vy/Gqxt+wMMziK0eY="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiocoap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiocoap/default.nix index 00592ed895..4cc00dd93d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiocoap/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix index 576ea16a39..255294df0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix index c44bf8e444..131f0c0413 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix index fff4745000..963ddc56ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aiooui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiooui/default.nix index bc087915bf..ec2dfb2f03 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiooui/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix index 378d17562c..f9c952ac6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.9.17"; + version = "0.9.21"; 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-jRsriLdSLrX8TzU4DgUKGmazN9hYbWPjE383VCulNgU="; }; pythonRelaxDeps = [ "typer" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioslimproto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioslimproto/default.nix index 0f6d21d3ae..037c74bc9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioslimproto/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aiostreammagic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiostreammagic/default.nix index 112e84f2d4..cc8f71f1a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiostreammagic/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix index 766e321f45..854ab37120 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/albucore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/albucore/default.nix index 07f2e3f4ce..285c643038 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/albucore/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/albumentations/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/albumentations/default.nix index 65a26d13ba..a613b63407 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/albumentations/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/albumentations/dont-check-for-updates.patch b/third_party/nixpkgs/pkgs/development/python-modules/albumentations/dont-check-for-updates.patch new file mode 100644 index 0000000000..617ce259ca --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix index d382cc49c9..5d59445244 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.119"; + version = "9.2.125"; pyproject = true; disabled = pythonOlder "3.11"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-GwfQj8KU6M5ylgJPN1Blz8Chz2zEDTZayFdvjXXWoHY="; + hash = "sha256-srQhZ5eDTelqN2JEoXKpFT2MOy+6v0HhwSRBOU+0qUk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix index d822f66800..02cb4798f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.2.10"; + version = "9.2.11"; pyproject = true; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angrop"; rev = "refs/tags/v${version}"; - hash = "sha256-+epX+tCSv5Kit4lncDNtjokehCSl+tO7rbi3L+RrI+E="; + hash = "sha256-wL6H4UqBqOHMQU91q0uJrgeS/wVvIbinpF9IBtli3Ig="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anitopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anitopy/default.nix index 95f3af2b7c..d7d3f2a0e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anitopy/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/apple-weatherkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apple-weatherkit/default.nix index 60cfd6d9e7..d7d21ad746 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apple-weatherkit/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 01ed99cb62..aa9fd60a8a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index dfa5d06746..a236696763 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.122"; + version = "9.2.125"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-WmwKpd1c53o/wanvyVPIkXwdwEmKtXvaCa2YIcIsGIU="; + hash = "sha256-e1ndjrr62wpTkhPAYnfbObdx0YO8jMp09ymgszsivO4="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asteroid-filterbanks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asteroid-filterbanks/default.nix index 9c41816421..e7dc0cba97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asteroid-filterbanks/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/bambi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bambi/default.nix index f2447b2c9d..e85ae6b888 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bambi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bambi/default.nix @@ -1,36 +1,36 @@ { lib, - buildPythonPackage, - pythonOlder, - fetchFromGitHub, - setuptools, arviz, + blackjax, + buildPythonPackage, + fetchFromGitHub, formulae, graphviz, + numpyro, pandas, pymc, - blackjax, - numpyro, pytestCheckHook, + pythonOlder, + setuptools-scm, }: buildPythonPackage rec { pname = "bambi"; - version = "0.13.0"; + version = "0.14.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "bambinos"; repo = "bambi"; rev = "refs/tags/${version}"; - hash = "sha256-9+uTyV3mQlHOKAjXohwkhTzNe/+I5XR/LuH1ZYvhc8I="; + 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/third_party/nixpkgs/pkgs/development/python-modules/base58/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/base58/default.nix index f3eaa3b3e8..c3a615af3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/base58/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/base58/default.nix @@ -5,19 +5,23 @@ pyhamcrest, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "base58"; version = "2.1.1"; - format = "setuptools"; - disabled = pythonOlder "3.5"; + pyproject = true; + + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - sha256 = "c5d0cb3f5b6e81e8e35da5754388ddcc6d0d14b6c6a132cb93d69ed580a7278c"; + hash = "sha256-xdDLP1tugejjXaV1Q4jdzG0NFLbGoTLLk9ae1YCnJ4w="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pyhamcrest pytestCheckHook @@ -33,9 +37,10 @@ buildPythonPackage rec { meta = with lib; { description = "Base58 and Base58Check implementation"; - mainProgram = "base58"; homepage = "https://github.com/keis/base58"; + changelog = "https://github.com/keis/base58/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ nyanloutre ]; + mainProgram = "base58"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/basemap-data-hires/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/basemap-data-hires/default.nix new file mode 100644 index 0000000000..44d352a882 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix index 582a6d507e..c5a7bcfd0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix @@ -1,38 +1,41 @@ { - stdenv, lib, + stdenv, buildPythonPackage, fetchFromGitHub, + + # build-system poetry-core, + + # dependencies scikit-learn, numpy, scipy, colorama, + + # tests jupyter, matplotlib, nbconvert, nbformat, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { pname = "bayesian-optimization"; - version = "1.5.1"; + version = "2.0.0"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "bayesian-optimization"; repo = "BayesianOptimization"; rev = "refs/tags/v${version}"; - hash = "sha256-pDgvdQhlJ5aMRGdi2qXRXVCdJRvrOP/Nr0SSZyHH1WM="; + hash = "sha256-XAO+UeHsOFAmUXqzMY/Iws1E738ZnU4Wz7E4YNIeGKY="; }; build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ scikit-learn numpy scipy @@ -49,14 +52,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "bayes_opt" ]; - meta = with lib; { - broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; - description = '' - A Python implementation of global optimization with gaussian processes - ''; + __darwinAllowLocalNetworking = true; + + meta = { + description = "Python implementation of global optimization with gaussian processes"; homepage = "https://github.com/bayesian-optimization/BayesianOptimization"; changelog = "https://github.com/bayesian-optimization/BayesianOptimization/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ maintainers.juliendehos ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.juliendehos ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beziers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beziers/default.nix index 2af89a69c9..e0fdaaca9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beziers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beziers/default.nix @@ -24,7 +24,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyclipper ]; - doCheck = true; nativeCheckInputs = [ dotmap matplotlib diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bite-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bite-parser/default.nix index 76abaebf63..1b00a055a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bite-parser/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/bokeh-sampledata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bokeh-sampledata/default.nix new file mode 100644 index 0000000000..e4bba2b69f --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix index dd609be90c..cb883efaa2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix @@ -5,22 +5,25 @@ fetchPypi, flask, pythonOlder, + setuptools, webob, }: buildPythonPackage rec { pname = "bugsnag"; version = "4.7.1"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; hash = "sha256-mECP4X1KfzAKVlNUB6ZEi5hE2bUoxEUnkIho/DZG6HM="; }; - propagatedBuildInputs = [ webob ]; + build-system = [ setuptools ]; + + dependencies = [ webob ]; optional-dependencies = { flask = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bytecode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bytecode/default.nix index 7c7a86baca..80fbbd0ced 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bytecode/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cachier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cachier/default.nix index 313b367811..fc1bad68f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cachier/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix index 8b15979cb2..7a3ba89b80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cf-xarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cf-xarray/default.nix index a60f3f0e4a..3cee465537 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cf-xarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cf-xarray/default.nix @@ -16,7 +16,7 @@ rich, shapely, - # checks + # tests dask, pytestCheckHook, scipy, @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "cf-xarray"; - version = "0.9.5"; + version = "0.10.0"; pyproject = true; src = fetchFromGitHub { owner = "xarray-contrib"; repo = "cf-xarray"; rev = "refs/tags/v${version}"; - hash = "sha256-Rz0E7GBaN/7zb0dqAxo0SJ4Bd+eQuOOv6x1WubIUh6A="; + hash = "sha256-lAVH2QGdMyU5A6QTLKujeAh8n1AkCsAtdyKQEqLahTk="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix index 0f72b21889..7f3bba21a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.122"; + version = "9.2.125"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-UxWPOyrV8Yzzi9TKFlCenP8ZXXjf6sd92naALkqgmkA="; + hash = "sha256-UYB7QnrUtVGeWv0SiEOuOhb53AbcijghIh+DIWwLsE4="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix index 52ccdb08a9..cba5e356d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -18,14 +18,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.122"; + version = "9.2.125"; # 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-/TGedNB6JNYjIy0a8yyyZtuUyLEYFJ2CBmvWS/PS1jA="; + hash = "sha256-22srtaY8CWT+XqnSZpMndBEVe20rDL+2LpJr9MByyLU="; }; in buildPythonPackage rec { @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-G/5KYB6np4Y5RTA65WyGvT1I5LyQ2WXJmu5OtXdKmLg="; + hash = "sha256-Xe9tOt94kSKsP0Xc8K0OaeyiUKFUkujZt9AsamgKwBw="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/codecov/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/codecov/default.nix deleted file mode 100644 index 8bac2ebf31..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix index bf8f0adbb4..cff80702d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/collidoscope/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/collidoscope/default.nix index a8bec5c5cd..2ad63e83c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/collidoscope/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/collidoscope/default.nix @@ -30,7 +30,6 @@ buildPythonPackage rec { uharfbuzz ]; - doCheck = true; nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/commandlines/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/commandlines/default.nix index b216858a58..aa5da9c0d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/commandlines/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/commitizen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/commitizen/default.nix index bdcb00d589..039880f363 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/commitizen/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/conda/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/conda/default.nix index a02e75987d..523110cf03 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/conda/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/conda/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - hostPlatform, + stdenv, fetchFromGitHub, # build dependencies hatchling, @@ -72,7 +72,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "conda" ]; # menuinst is currently not packaged - pythonRemoveDeps = lib.optionals (!hostPlatform.isWindows) [ "menuinst" ]; + pythonRemoveDeps = lib.optionals (!stdenv.hostPlatform.isWindows) [ "menuinst" ]; meta = { description = "OS-agnostic, system-level binary package manager"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/craft-platforms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/craft-platforms/default.nix index 6a1a493609..8b5e5cc5b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/craft-platforms/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cryptg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptg/default.nix index 11492f912a..73d5258efb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cryptg/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ctap-keyring-device/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ctap-keyring-device/default.nix index 07cf1b6160..ce81bfa36b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ctap-keyring-device/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cypari2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cypari2/default.nix index f987ee07a6..384d8d07c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cypari2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cypari2/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, python, - fetchpatch, fetchPypi, pari, gmp, @@ -16,24 +15,14 @@ buildPythonPackage rec { pname = "cypari2"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.1.5"; + version = "2.2.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-GiWGXDTyCx3JWDB5jjSrZDbieLjgyA3HvwqzTF2wOrg="; + hash = "sha256-gXYGv2YbcdM+HQEkIZB6T4+wndgbfT464Xmzl4Agu/E="; }; - patches = [ - # patch to avoid some segfaults in sage's totallyreal.pyx test. - # (https://trac.sagemath.org/ticket/27267). - (fetchpatch { - name = "use-trashcan-for-gen.patch"; - url = "https://raw.githubusercontent.com/sagemath/sage/b6ea17ef8e4d652de0a85047bac8d41e90b25555/build/pkgs/cypari/patches/trashcan.patch"; - hash = "sha256-w4kktWb9/aR9z4CjrUvAMOxEwRN2WkubaKzQttN8rU8="; - }) - ]; - preBuild = '' # generate cythonized extensions (auto_paridecl.pxd is crucial) ${python.pythonOnBuildForHost.interpreter} setup.py build_ext --inplace diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-expr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-expr/default.nix index 4e9de770a1..4598356713 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-expr/default.nix +++ b/third_party/nixpkgs/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-7c0P+UTdjyOPdj0AM38TysNdbegT6N1iKKg6Kdgu8jI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix index e47ced4264..014f8947d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/databricks-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-sdk/default.nix index 93292f7eec..57bf484460 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databricks-sdk/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dbt-common/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-common/default.nix index b97f071343..9b037341b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbt-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbt-common/default.nix @@ -1,44 +1,58 @@ { 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.8.0"; + version = "1.11.0"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - pname = "dbt_common"; - inherit version; - hash = "sha256-ehZ+a3zznnWMY9NJx9LfRtkV1vHiIH0HEhsYWfMbmb4="; + 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 ]; + build-system = [ + hatchling + ]; pythonRelaxDeps = [ "protobuf" "agate" + "deepdiff" ]; dependencies = [ @@ -56,15 +70,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/third_party/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix index 79a5350754..1174274e3a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbt-core/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "dbt-core"; - version = "1.8.7"; + version = "1.8.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-core"; rev = "refs/tags/v${version}"; - hash = "sha256-1NvdRAr8T2dDgtyj5tUIqhjHIu4sZYS+oj7hOMEqs0A="; + hash = "sha256-M9O9jLjIr9kolkye5RwaS2jK6dpncEOo1rtxY7WXS7U="; }; sourceRoot = "${src.name}/core"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deepdiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deepdiff/default.nix index ff583a5720..3b46cf4aac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deepdiff/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dehinter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dehinter/default.nix index e621b2979b..55dc1c503f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dehinter/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix index 5980eaff54..57280fd954 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/diffenator2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diffenator2/default.nix index 1b4837de4e..5dc3bbd355 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/diffenator2/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/diffsync/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diffsync/default.nix index 28ea4eb3a9..fbfb03ca68 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/diffsync/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/diffsync/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "diffsync"; - version = "2.0.0"; + version = "2.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "networktocode"; repo = "diffsync"; rev = "refs/tags/v${version}"; - hash = "sha256-4LS18FPrnGE1tM0pFzAw0+ajDaw9g7MCgIwS2ptrX9c="; + hash = "sha256-T3kcZcRm28WeXZTXBBCpaMxjgB0KmqvWO4gdILH5hCA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-jffs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-jffs/default.nix index a8c9fed87a..aad4272858 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-jffs/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/distrax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/distrax/default.nix index 83a4a16d65..bae7ef5ffb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/distrax/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix index 063d30ca40..e652d82760 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix index 0abd5d344e..2e688abdfb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-choices-field/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-choices-field/default.nix new file mode 100644 index 0000000000..ea115e5c62 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-crossdomainmedia/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-crossdomainmedia/default.nix new file mode 100644 index 0000000000..3f2134e422 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-htmx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-htmx/default.nix new file mode 100644 index 0000000000..0e60a5ae5a --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-modelcluster/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-modelcluster/default.nix index acb7fd3704..ed4f3a05a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-modelcluster/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-mptt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-mptt/default.nix index 419bb9c8ee..404b6df1bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-mptt/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix index b313276bbf..86bc344fd0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-stubs-ext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-stubs-ext/default.nix index e899451185..d0caecd457 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-stubs-ext/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-tinymce/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-tinymce/default.nix new file mode 100644 index 0000000000..a0eb660c1d --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-jsonp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-jsonp/default.nix new file mode 100644 index 0000000000..af0b28037d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-jsonp/default.nix @@ -0,0 +1,56 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + django, + python, + pytest-django, + pytestCheckHook, + djangorestframework, + setuptools, +}: + +buildPythonPackage rec { + pname = "djangorestframework-jsonp"; + version = "1.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jpadilla"; + repo = "django-rest-framework-jsonp"; + rev = "refs/tags/${version}"; + hash = "sha256-4mIO69GhtvbQBtztHVQYIDDDSZpKg0g7BFNHEupiYTs="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + django + djangorestframework + ]; + + checkInputs = [ + pytestCheckHook + pytest-django + ]; + + # Test fail with Django >=4 + # https://github.com/jpadilla/django-rest-framework-jsonp/issues/14 + doCheck = false; + + checkPhase = '' + runHook preCheck + rm tests/test_renderers.py + ${python.interpreter} runtests.py + runHook postCheck + ''; + + pythonImportsCheck = [ "rest_framework_jsonp" ]; + + meta = { + description = "JSONP support for Django REST Framework"; + homepage = "https://jpadilla.github.io/django-rest-framework-jsonp/"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dm-control/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dm-control/default.nix index 9e32447429..383a0ba798 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dm-control/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dm-control/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "dm-control"; - version = "1.0.23"; + version = "1.0.24"; pyproject = true; src = fetchFromGitHub { owner = "google-deepmind"; repo = "dm_control"; rev = "refs/tags/${version}"; - hash = "sha256-eSvER3lceAEZZ+DhCjvjNW3YpdzCeP/lly5AP3eDnbA="; + hash = "sha256-DnU3u7h/sPCjKLTFppAuPcY8CC0PNdFIlmeGd4xgy3M="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dmgbuild/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dmgbuild/default.nix new file mode 100644 index 0000000000..e0a8f3ef11 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dmt-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dmt-core/default.nix new file mode 100644 index 0000000000..1a3532ec36 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dmt-core/default.nix @@ -0,0 +1,84 @@ +{ + buildPythonPackage, + colormath, + cycler, + fetchPypi, + h5py, + joblib, + lib, + more-itertools, + numpy, + pandas, + pint, + pyarrow, + pytest, + pyyaml, + reprint, + requests, + scikit-rf, + scipy, + semver, + setuptools, + verilogae, +}: + +buildPythonPackage rec { + pname = "dmt-core"; + version = "2.1.0"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "DMT_core"; + hash = "sha256-489E+uNn4NgyCwxsUMEPH/1ZuM+5uNq4zx8F88rkHMU="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + colormath + cycler + h5py + joblib + more-itertools + pandas + pint + pyarrow + pytest + pyyaml + requests + scikit-rf + scipy + setuptools + numpy + semver + ]; + + nativeBuildInputs = [ + reprint + verilogae + ]; + + preConfigure = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ + "DMT.core" + "reprint" + "verilogae" + ]; + + meta = { + changelog = "https://gitlab.com/dmt-development/dmt-core/-/blob/Version_${version}/CHANGELOG?ref_type=tags"; + description = "Tool to help modeling engineers extract model parameters, run circuit and TCAD simulations and automate infrastructure"; + homepage = "https://gitlab.com/dmt-development/dmt-core"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + jasonodoom + jleightcap + ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docker-pycreds/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docker-pycreds/default.nix index 16b8a420f4..6002ccf769 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docker-pycreds/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docker-pycreds/default.nix @@ -1,28 +1,44 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, six, + pythonAtLeast, + distutils, }: buildPythonPackage rec { pname = "docker-pycreds"; version = "0.4.0"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "6ce3270bcaf404cc4c3e27e4b6c70d3521deae82fb508767870fdbf772d584d4"; + src = fetchFromGitHub { + owner = "shin-"; + repo = "dockerpy-creds"; + rev = "refs/tags/${version}"; + hash = "sha256-yYsMsRW6Bb8vmwT0mPjs0pRqBbznGtHnGb3JNHjLjys="; }; + build-system = [ + setuptools + ]; + + dependencies = + [ six ] + ++ lib.optionals (pythonAtLeast "3.12") [ + distutils + ]; + + pythonImportsCheck = [ "dockerpycreds" ]; + # require docker-credential-helpers binaries doCheck = false; - propagatedBuildInputs = [ six ]; - - meta = with lib; { + meta = { description = "Python bindings for the docker credentials store API"; homepage = "https://github.com/shin-/dockerpy-creds"; - license = licenses.asl20; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/doorbirdpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/doorbirdpy/default.nix index acb4fab9c3..b0ae8cfcea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/doorbirdpy/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/drf-writable-nested/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-writable-nested/default.nix index 2211073b32..1f62492ee4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/drf-writable-nested/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix index 73a551a5c2..05ffb2f6c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ducc0/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ducc0/default.nix index d42085999e..1b8e6e733c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ducc0/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/easyocr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/easyocr/default.nix index a1ff17f2b3..a75434c018 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/easyocr/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix index d1844d34ba..307e5da468 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix @@ -50,7 +50,6 @@ buildPythonPackage rec { numpy ]; - doCheck = true; pythonImportsCheck = [ "eigenpy" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/etils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/etils/default.nix index 0f925eadb2..6b853fd9d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/etils/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/folium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/folium/default.nix index 8be25eafc6..d8e2e317db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/folium/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/font-v/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/font-v/default.nix index 4f1a22a640..945f77698e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/font-v/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/font-v/default.nix @@ -26,7 +26,6 @@ buildPythonPackage rec { gitpython ]; - doCheck = true; nativeCheckInputs = [ git pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fontfeatures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fontfeatures/default.nix index b6a4482b4b..11943c36e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fontfeatures/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/fyta-cli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fyta-cli/default.nix index b5199a74ca..ad3a255e58 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fyta-cli/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/gardena-bluetooth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gardena-bluetooth/default.nix index 45cbdea0d5..b80c83d774 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gardena-bluetooth/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/git-filter-repo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/git-filter-repo/default.nix index 5591d87dd5..af9b80ad38 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/git-filter-repo/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix index 5f6c9c54f2..f692306f62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix index 83e861edd5..e78652373f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix index 25b517fef0..218d0fe52c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 74cce02511..ac8e29c311 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix index cd8eab7184..3a2bdd3b85 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix index eaa3d4e435..e36b0cc2fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix index ab2af5b45c..a7ab5c1aec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix index 7944da13d9..a3f45ce57f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index d1dd18cd34..5ae9acb7e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index c89f4d0576..86f2378b09 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index fb6365ec61..c70c830aaa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-shell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-shell/default.nix index 1e9bbb918f..21a97ef659 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-shell/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix index 38e430bca5..443d3ebb48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix index a5388a85cf..22e3c2454a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix index c1c89e1008..354a822af1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vpc-access/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vpc-access/default.nix index 8bdcc432a8..20ce956e2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vpc-access/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-webrisk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-webrisk/default.nix index 0a11573eb6..97f5ced692 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-webrisk/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 880802fdbd..63ae6795e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-workflows/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-workflows/default.nix index 9d77226951..8ce558e29d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-workflows/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-workstations/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-workstations/default.nix index 7fb70589b7..ffcfcb48ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-workstations/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/gpapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gpapi/default.nix index cd6ce736d2..9399e547a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gpapi/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/graph-tool/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graph-tool/default.nix index 4d639639e3..ff0ab4f627 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graph-tool/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix index e0b270c95c..28c9a5aa3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/gst-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gst-python/default.nix index ab476729c6..5c0b7f3146 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gst-python/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix index d7642559e5..b730ef5c5a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gymnasium/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix index 68de99e265..b9f8513459 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix index 62ccb7ef91..deefc97b31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.81.1"; + version = "0.82.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "nabucasa"; repo = "hass-nabucasa"; rev = "refs/tags/${version}"; - hash = "sha256-/sY/JijBCcGcbMjoX0yuhFIWvU+TFVN8sRxBx+CDVVs="; + hash = "sha256-hRhRXpiIPrI3umOhsVWLwkSwtEfwevC3fNvJElhKy+I="; }; pythonRelaxDeps = [ "acme" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix index eb17dd0534..5f1963bcdc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/hvplot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hvplot/default.nix index 7884f61cbc..4831f14335 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hvplot/default.nix +++ b/third_party/nixpkgs/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.10.0"; + version = "0.11.1"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-6HSGqVv+FRq1LvFjpek9nL0EOZLPC3Vcyt0r82/t03Y="; + 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/third_party/nixpkgs/pkgs/development/python-modules/hydrus-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hydrus-api/default.nix index 9d62af64ce..ac833579a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hydrus-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hydrus-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "hydrus-api"; - version = "5.0.1"; + version = "5.1.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "hydrus_api"; inherit version; - hash = "sha256-3Roeab9/woGF/aZYm9nbqrcyYN8CKA1k66cTRxx6jM4="; + hash = "sha256-oA3DbdX+MRZiInCKXurBdKlUFQ4jeU+jHr9NxMEHQmI="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix index 9feccf8461..80acaeb1f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ihm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ihm/default.nix index bf7b81b05d..1d07533f53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ihm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ihm/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ihm"; - version = "1.6"; + version = "1.7"; pyproject = true; src = fetchFromGitHub { owner = "ihmwg"; repo = "python-ihm"; rev = "refs/tags/${version}"; - hash = "sha256-G6u1z0bPC6EDVMLL9oCWi2B7AEj4UikGnSDQ8AOpuMA="; + hash = "sha256-jQm8Xl2yyR+y1Leyz8naT1rFJpgK5XdUd7YgnhDuBWo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix index 7ee914aca7..1422752b32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/intbitset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intbitset/default.nix index 4c3d1d477c..3e275c3c13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/intbitset/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/itemloaders/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/itemloaders/default.nix index bd6e8b884a..de2b1e9027 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/itemloaders/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/iwlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iwlib/default.nix index 01f83b80a0..08348a6de3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iwlib/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/kinparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kinparse/default.nix index a925347da3..8ddde08f68 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kinparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kinparse/default.nix @@ -19,7 +19,6 @@ buildPythonPackage { sha256 = "1nrjnybwzy93c79yylcwmb4lvkx7hixavnjwffslz0zwn32l0kx3"; }; - doCheck = true; pythonImportsCheck = [ "kinparse" ]; nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/knocki/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/knocki/default.nix index c5c5442fdf..bcdc986033 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/knocki/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/kubernetes-asyncio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kubernetes-asyncio/default.nix new file mode 100644 index 0000000000..56d3e58b7a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/kubernetes-asyncio/default.nix @@ -0,0 +1,69 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + coreutils, + + # build-system + setuptools, + + # dependencies + aiohttp, + certifi, + python-dateutil, + pyyaml, + six, + urllib3, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "kubernetes-asyncio"; + version = "31.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tomplus"; + repo = "kubernetes_asyncio"; + rev = "refs/tags/${version}"; + hash = "sha256-YKBqhUeLqLiQ6bK235zTm4salnSLUxl4DUiFLQSjWqw="; + }; + + postPatch = '' + substituteInPlace kubernetes_asyncio/config/google_auth_test.py \ + --replace-fail "/bin/echo" "${lib.getExe' coreutils "echo"}" + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ + aiohttp + certifi + python-dateutil + pyyaml + six + urllib3 + ]; + + pythonImportsCheck = [ + "kubernetes_asyncio" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + __darwinAllowLocalNetworking = true; + + meta = { + description = "Python asynchronous client library for Kubernetes http://kubernetes.io"; + homepage = "https://github.com/tomplus/kubernetes_asyncio"; + changelog = "https://github.com/tomplus/kubernetes_asyncio/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kurbopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kurbopy/default.nix index 3542fb60b2..3ced53fcde 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kurbopy/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix index 060b8d9444..b81962cd7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/langchain-aws/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langchain-aws/default.nix index 767f2262c2..7e65e82eef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langchain-aws/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/langchain-community/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langchain-community/default.nix index 6d29c6e12f..c27c61afe9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langchain-community/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langchain-community/default.nix @@ -38,14 +38,14 @@ buildPythonPackage rec { pname = "langchain-community"; - version = "0.3.1"; + version = "0.3.3"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-community==${version}"; - hash = "sha256-h7+89w8PkSpFxGGQKFC6FuB6Q2B27EYgLk0aiPqwp4s="; + hash = "sha256-xWr4v+4gL8LAegqerQc1SdAynPk5X8qLlPF211+OBvY="; }; sourceRoot = "${src.name}/libs/community"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langchain-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langchain-core/default.nix index 3ba1fcb50f..49ad6cf3c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langchain-core/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/langchain-openai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langchain-openai/default.nix index 7b0e88098b..29c16ce6ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langchain-openai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langchain-openai/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "langchain-openai"; - version = "0.2.1"; + version = "0.2.3"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-openai==${version}"; - hash = "sha256-M1gyw0Nmh+aLU9scbuqmK2kPyfwtaFaCfue+T8PLguQ="; + hash = "sha256-ENQOKvp9XJTTC34UoNO4LLvcBwfFRcbOAvX/qtzln6k="; }; sourceRoot = "${src.name}/libs/partners/openai"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langchain/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langchain/default.nix index 49b268e97a..3d0ae4b72f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langchain/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix index b209101908..0161609fdd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/langgraph-checkpoint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langgraph-checkpoint/default.nix index b25b03b420..b895ab501e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langgraph-checkpoint/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/langgraph-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langgraph-sdk/default.nix index 1ce25fc35a..2a48821899 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langgraph-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langgraph-sdk/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "langgraph-sdk"; - version = "0.1.32"; + version = "0.1.33"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/sdk==${version}"; - hash = "sha256-qOxtrRbdK0M4aFWJX0SFn7U27rvAyqu53iCbYZX3s8A="; + hash = "sha256-oSkF82AvIycGaw0Pb2tldtvjyG9HkXPlSE6onRbDDPE="; }; sourceRoot = "${src.name}/libs/sdk-py"; @@ -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/third_party/nixpkgs/pkgs/development/python-modules/langgraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langgraph/default.nix index 20e8b24103..6ddb731aab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langgraph/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/lcov-cobertura/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lcov-cobertura/default.nix index f17dfec590..d04302c6a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lcov-cobertura/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/libarchive-c/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libarchive-c/default.nix index 5338d892df..6859fa0857 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libarchive-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libarchive-c/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch, libarchive, glibcLocales, mock, @@ -21,6 +22,14 @@ buildPythonPackage rec { sha256 = "sha256-CO9llPIbVTuE74AeohrMAu5ICkuT/MorRlYEEFne6Uk="; }; + patches = [ + (fetchpatch { + name = "fix-tests-with-recent-libarchive.patch"; + url = "https://github.com/Changaco/python-libarchive-c/commit/a56e9402c76c2fb9631651de7bae07b5fbb0b624.patch"; + hash = "sha256-OLwJQurEFAmwZJbQfhkibrR7Rcnc9vpWwBuhKxgmT7g="; + }) + ]; + LC_ALL = "en_US.UTF-8"; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libretranslate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libretranslate/default.nix index 39a2b99ddf..dc02429a68 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libretranslate/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/linear-garage-door/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/linear-garage-door/default.nix index 1a8bfb7964..f3ea213b03 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/linear-garage-door/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/llm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llm/default.nix index bd5a3e34a4..7f3f07250a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llm/default.nix @@ -1,13 +1,9 @@ { lib, - buildPythonApplication, buildPythonPackage, fetchFromGitHub, - makeWrapper, pytestCheckHook, - python, pythonOlder, - ruff, setuptools, click-default-group, numpy, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meep/default.nix index d034595d03..1608a5e67e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meep/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix index 42455ed84c..c71d16a7b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-rss-plugin/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix index 36863323f9..bc00f65505 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix index 1aba824408..dd6781fbfa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3/default.nix index 8beba0e475..0704af8156 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/third_party/nixpkgs/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" @@ -114,8 +114,8 @@ rec { "sha256-JsQYZqlzCM64Uxk3btQZm8dX/oSHsy1l29dUG7n025s="; mypy-boto3-application-insights = - buildMypyBoto3Package "application-insights" "1.35.0" - "sha256-PQcqaUxzDx91mwL55prFG2EFdQQw278ugQUAVhgzLX8="; + buildMypyBoto3Package "application-insights" "1.35.45" + "sha256-rXdCTd/cv1F+VWlWnT0VBPdE0JZzXnI5QJu7Tk1rq4Y="; mypy-boto3-applicationcostprofiler = buildMypyBoto3Package "applicationcostprofiler" "1.35.0" @@ -142,16 +142,16 @@ rec { "sha256-l5hKmbwel2Z5BvQbuKXRsfusKU28laF5mVDDPW+Ij0g="; mypy-boto3-athena = - buildMypyBoto3Package "athena" "1.35.25" - "sha256-XcD23pDz3oaNwME+iqmDQr9Lbz8z7NVduFEiTnxV55c="; + buildMypyBoto3Package "athena" "1.35.44" + "sha256-2eDPfyD3gm+kOyVUOn83aAAEPO+IzTahq3CPkaICqJI="; mypy-boto3-auditmanager = buildMypyBoto3Package "auditmanager" "1.35.0" "sha256-nr00I/1oqR16ZIw3+iA2BrS0C0Wr7UlJ48VnuOFIcb0="; mypy-boto3-autoscaling = - buildMypyBoto3Package "autoscaling" "1.35.4" - "sha256-XRAj8UYVmjQ0GjAevPGs1/g2XRsoCElCNaj1kPrWyCo="; + buildMypyBoto3Package "autoscaling" "1.35.45" + "sha256-HQLkmsxLESKVXzNW+60XFLhYTT6oDeNFsm6WGNP1cgk="; mypy-boto3-autoscaling-plans = buildMypyBoto3Package "autoscaling-plans" "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" @@ -414,8 +414,8 @@ rec { "sha256-yJ3ApQy6xeEdxNcRQG5mekfK1aP7FPdR79TfbRZkESo="; mypy-boto3-dms = - buildMypyBoto3Package "dms" "1.35.38" - "sha256-b9AA9n1WWgk4HV1U/3L/eVl4eualNyhYCjbFw+QvHV4="; + buildMypyBoto3Package "dms" "1.35.45" + "sha256-+15k+ChWuPK+fBeSbYtraNugtJOI1mcjDU45ohDLauM="; mypy-boto3-docdb = buildMypyBoto3Package "docdb" "1.35.0" @@ -446,8 +446,8 @@ rec { "sha256-wBJ7PnAlsi88AZIRPoNgbzOhPwUAJBegtwk+tw1lOwU="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.35.38" - "sha256-AwY1//39/3P8l+zEsunb7Mun//B1wiR8ae+ZxGulzRo="; + buildMypyBoto3Package "ec2" "1.35.48" + "sha256-c/tutPhvyGNt2Fv666k9f7mprhInCwyAU2L6p7Rg6Nc="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.35.0" @@ -462,16 +462,16 @@ rec { "sha256-KXtN44KAIDXjMgv3ICG8rXYfEjcZ85pQ+qdvN2Yiq3g="; mypy-boto3-ecs = - buildMypyBoto3Package "ecs" "1.35.43" - "sha256-KG94nsbTrwpvoitQ3gdcJPDAWp6MIWDMAmupjB8xwtg="; + buildMypyBoto3Package "ecs" "1.35.48" + "sha256-DtA+mCac6gbO17U2XuFm+QMDbGh9sbTRIIKh/GeAkCM="; mypy-boto3-efs = buildMypyBoto3Package "efs" "1.35.0" "sha256-6o825Pz7Vbg/xuFXR7mTLv3zWcLoRIqbFqjRcQtZOJ8="; mypy-boto3-eks = - buildMypyBoto3Package "eks" "1.35.0" - "sha256-w+uJ5Jqfbnj3ykj59C8sbhitp5MyTIE+PnZXrlIkOag="; + buildMypyBoto3Package "eks" "1.35.45" + "sha256-Dl9pCZc5WX6HC0LbXznGrpSc32KtPvHNMFD9Ru8Ay6k="; mypy-boto3-elastic-inference = buildMypyBoto3Package "elastic-inference" "1.35.38" @@ -542,8 +542,8 @@ rec { "sha256-rm0PB0oie7q+8pl+efohmHe8StLZVvSWYgLIajxd3Fo="; mypy-boto3-fms = - buildMypyBoto3Package "fms" "1.35.0" - "sha256-Y+FKtBDxQ2SyN8uHLkt7KKylo8uOa6mCHUwf98TsBRg="; + buildMypyBoto3Package "fms" "1.35.45" + "sha256-tcegJLaem1b74dGFSatTjmQzt59L8Nu0thNnqes1TC8="; mypy-boto3-forecast = buildMypyBoto3Package "forecast" "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" @@ -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.49" + "sha256-P5uX/Vi4vQb5UweIVkoHt2J7r4fkBnnLHldaRHmya58="; 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" @@ -1006,8 +1006,8 @@ rec { "sha256-b9gTTuQxsXE4CjZgRgbZn4xGSC7N/4v3eF4fF9fFSow="; mypy-boto3-payment-cryptography-data = - buildMypyBoto3Package "payment-cryptography-data" "1.35.0" - "sha256-tHHuRkz2nA550ldsMbiUS7XJGMHgx3rRt5scFV7tFNM="; + buildMypyBoto3Package "payment-cryptography-data" "1.35.45" + "sha256-9FxAmPtuL14Y18X05pMj3uPoJqAyHJAJLDmGgoU79uY="; mypy-boto3-pca-connector-ad = buildMypyBoto3Package "pca-connector-ad" "1.35.0" @@ -1086,8 +1086,8 @@ rec { "sha256-85yUjKQ8oiECUYHhmmYrDssyFSQb6itfIRY2iuwCZdo="; mypy-boto3-rds = - buildMypyBoto3Package "rds" "1.35.43" - "sha256-TxyamNf02uzH31iZzcSZJbGe0g+oVtq1vo+QE4KO/so="; + buildMypyBoto3Package "rds" "1.35.46" + "sha256-A8cp4wbpd3E91PdxYV5F0V76YN5TEJKw4OVBMXKJZNI="; mypy-boto3-rds-data = buildMypyBoto3Package "rds-data" "1.35.28" @@ -1162,8 +1162,8 @@ rec { "sha256-RwPNNFntNChLqbr86wd1bwp6OqWvs3oj3V+4X71J3Hw="; mypy-boto3-s3 = - buildMypyBoto3Package "s3" "1.35.42" - "sha256-LQQMBdaKFh2RxLcpJhJwNNooremNSA3vapVpq3ZVzd0="; + buildMypyBoto3Package "s3" "1.35.46" + "sha256-8Ah6N2XRA7LbVlzYBl68Kw9w8t1OksEy9kuJRd2GmUA="; mypy-boto3-s3control = buildMypyBoto3Package "s3control" "1.35.12" @@ -1322,8 +1322,8 @@ 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" @@ -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" @@ -1398,8 +1398,8 @@ rec { "sha256-rqjBKxMMg/gkt9PJyFyE3g2msAiTtiMZWF4TY3/grcs="; mypy-boto3-wafv2 = - buildMypyBoto3Package "wafv2" "1.35.9" - "sha256-snz65w4vU7DMSVJmhWHvQay38q17RYkmbk3986HlXT8="; + buildMypyBoto3Package "wafv2" "1.35.45" + "sha256-Soz9RxhGf4ss41NLcVT0UUjRcPv0sKzjcx1bo5MLC44="; mypy-boto3-wellarchitected = buildMypyBoto3Package "wellarchitected" "1.35.0" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netbox-bgp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netbox-bgp/default.nix new file mode 100644 index 0000000000..0cc1d41fcc --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/netbox-reorder-rack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netbox-reorder-rack/default.nix index bb079f2eda..4d127053d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netbox-reorder-rack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netbox-reorder-rack/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "netbox-reorder-rack"; - version = "1.0.0"; + version = "1.1.2"; pyproject = true; src = fetchFromGitHub { owner = "netbox-community"; repo = "netbox-reorder-rack"; rev = "v${version}"; - hash = "sha256-UbTq3DHxSczDxQIUyAHCVJG3SZdqgyS9ULNvuDKQvEY="; + hash = "sha256-0572pj1OA08Zxl4vhMmFHvQA/K24hG/GhKEbo+hbW5Q="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nexusformat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nexusformat/default.nix index 7a9ea2e698..ae685948c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nexusformat/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix index 6169a0f69d..a6a7a45ede 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/nitrokey/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nitrokey/default.nix index 7be8de7830..b39d6d3440 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nitrokey/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/nutpie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nutpie/default.nix new file mode 100644 index 0000000000..6c31d823c6 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix index c971467d17..95d9a58258 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/okonomiyaki/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/okonomiyaki/default.nix index d8b909b9a5..bdcddc59c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/okonomiyaki/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/okta/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/okta/default.nix index 42d459d562..dc75dfd84b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/okta/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/open-clip-torch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/open-clip-torch/default.nix index fd90c13e6c..3299a57730 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/open-clip-torch/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix index 3a58661778..3777a84bdb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.51.0"; + version = "1.52.1"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-VwsW7wVNSVlZg+RJoQ3C9AuqHL5dFO+f9pyfUbRbrSM="; + hash = "sha256-TTbwhs7rXWIJWOU5bC0wGjXZkBpfBAXb4ycOR9xjTpw="; }; build-system = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opencv-python-headless/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opencv-python-headless/default.nix new file mode 100644 index 0000000000..7a379d39b8 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/openstackdocstheme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openstackdocstheme/default.nix index b316a7aaee..7391fb37ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openstackdocstheme/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/opentypespec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentypespec/default.nix index ea4f2ca353..81fc60e5dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentypespec/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/orderly-set/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orderly-set/default.nix new file mode 100644 index 0000000000..93f164a5b6 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/oslo-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-utils/default.nix index dab2af567b..578e2dfdbf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-utils/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/osxphotos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/osxphotos/default.nix index 0af996f622..f22e7e34d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/osxphotos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/osxphotos/default.nix @@ -77,6 +77,7 @@ buildPythonPackage rec { "more-itertools" "objexplore" "textx" + "tenacity" ]; pythonImportsCheck = [ "osxphotos" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ots-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ots-python/default.nix index 7aba8368fd..9c0ae3625c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ots-python/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix index 03ffee785c..c3d4e4e792 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/peft/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/peft/default.nix index 60f91eb724..bd9fffeffc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/peft/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pepit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pepit/default.nix new file mode 100644 index 0000000000..37017f445e --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pid/default.nix index b0bb834a30..0add8799be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pid/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix index 51ef03ffc7..1339b39505 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix index 29a5c749ab..a1ecf82c63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix index 9a5c0cf60f..f196ef52a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix index b2f284b4f2..136e9e8006 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20241019"; + version = "1.0.2.20241023"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OvnRc+PV0rJxTgN4nPf9znsJtMTVU16nKTwdDA140Wc="; + hash = "sha256-WQs4DJygcyOTzDZHlbjW+uZAna5oswDDk4NwgS/Vr1c="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pwlf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pwlf/default.nix index 95dbc3ac83..c5341cd1cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pwlf/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/py-aosmith/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-aosmith/default.nix index 5b504e647e..199011b934 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-aosmith/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/py-madvr2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-madvr2/default.nix index 05799d4322..32eb2a7c66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-madvr2/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/py-opensonic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-opensonic/default.nix index 22f3ebe7ec..114c181400 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-opensonic/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/py3dns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py3dns/default.nix index 14ad167716..a036ba2707 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py3dns/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix index e22429f071..ba171e372c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pycangjie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycangjie/default.nix index caca2f9f3d..65768bdc80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycangjie/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix index 7b499f82d0..dba7ba7783 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/Cargo.lock index 8acdc7ca21..efdd3eec91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/default.nix index 37730c78fb..a7704735a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycrdt/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyct/default.nix index 5509173bd9..96aad66336 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyct/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix index 1cd06c0d2b..6bb1c8386b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyduotecno/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyduotecno/default.nix index 53b034dd80..283cb30f8a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyduotecno/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyduotecno/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyduotecno"; - version = "2024.10.0"; + version = "2024.10.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = "pyDuotecno"; rev = "refs/tags/${version}"; - hash = "sha256-F2f3c6jy3oWPGBOlS0/U0iaHj5jYn2WiK+HoWO8vYaY="; + hash = "sha256-I/ZA2ooa6nunUr/4K+FWAGMOdcJDfGzE99jJ8zTe2Po="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyeclib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyeclib/default.nix index d1fec77647..9cad362d22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyeclib/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyevtk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyevtk/default.nix index 16081d1cc6..2164ffb9e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyevtk/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyexploitdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyexploitdb/default.nix index a23a0ce879..fa555cff88 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.40"; + version = "0.2.41"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-3o4KnWau2Sxkj18ZoY6EsSszm0Z0Z1Gz/KWr1ZH7FTs="; + hash = "sha256-QwMD7V1BSmFBZ7mazo7TnuZijm8MC/M/oKMV4nh1v5A="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykcs11/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykcs11/default.nix index b4fdeb9381..fe3cd809bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykcs11/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pylint-venv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint-venv/default.nix index 47d294f153..de5daa466f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylint-venv/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pylsl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylsl/default.nix new file mode 100644 index 0000000000..f58a67956e --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pymilter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymilter/default.nix index 6f0c4291d4..634f437b81 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymilter/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pymoo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymoo/default.nix index fc044a9358..50bccf006a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymoo/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pymumble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymumble/default.nix index bc15652d70..e6214b6a90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymumble/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix index 14ce4a0de9..e7ff03c15a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyproj/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyproj/default.nix index 4b3a6fedd0..56cbbf37bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyproj/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyproj/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pyproj"; - version = "3.6.1"; + version = "3.7.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyproj4"; repo = "pyproj"; rev = "refs/tags/${version}"; - hash = "sha256-ynAhu89VpvtQJRkIeVyffQHhd+OvWSiZzaI/7nd6fXA="; + hash = "sha256-uCoWmJ0xtbJ/DHts5+9KR6d6p8vmZqDrI4RFjXQn2fM="; }; # force pyproj to use ${proj} @@ -37,12 +37,6 @@ buildPythonPackage rec { proj = proj; projdev = proj.dev; }) - - # fix test failure caused by update of EPSG DB - (fetchpatch { - url = "https://github.com/pyproj4/pyproj/commit/3f7c7e5bcec33d9b2f37ceb03c484ea318dff3ce.patch"; - hash = "sha256-0J8AlInuhFDAYIBJAJ00XbqIanJY/D8xPVwlOapmLDE="; - }) ]; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/6.x.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/6.x.nix index 6356eeb963..b1bf34abd4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/6.x.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyqt6-webengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqt6-webengine/default.nix index 5ea0b8b194..59a2a1eeab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqt6-webengine/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pysc2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysc2/default.nix index 667ba03903..54a79bff39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysc2/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix index f80113fa1b..3e61476c97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix @@ -42,6 +42,8 @@ buildPythonPackage rec { disabledTests = [ # Tests requires network access "test_connect_lucene" + # AssertionError + "correlation_rule_stats" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix index 0cb08550f8..3fd051e53b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-sqlite/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma-backend-sqlite"; - version = "0.1.2"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-sqlite"; rev = "refs/tags/v${version}"; - hash = "sha256-wbFSgtsiP5k1aGJx8PWDl0N28r0dgn6Fduk0PuM8x3w="; + hash = "sha256-PQByKARf0OOMC9LRTz3XVrFZp6ODSggMJeA6PNK/AuA="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysigma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysigma/default.nix index 8987f9820e..4267384019 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.11.14"; + version = "0.11.17"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-jxVTXw3WZcOL5IDUHs+DRGoXDRFn99UWOz5j5mCEf8A="; + hash = "sha256-2+iLUuGZV+6sdeLvRE6lORQYVKVn53n2NQaGamkxspU="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyspf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyspf/default.nix index 8e69a94266..cdedf35b93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyspf/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-ruff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-ruff/default.nix new file mode 100644 index 0000000000..0d9239e711 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-barbicanclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-barbicanclient/default.nix index 7188c83816..9c65649a23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-barbicanclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-barbicanclient/default.nix @@ -60,8 +60,6 @@ buildPythonPackage rec { requests ]; - doCheck = true; - nativeCheckInputs = [ requests-mock stestr diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-glanceclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-glanceclient/default.nix index ad872d465f..dc456f383e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-glanceclient/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-linkplay/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-linkplay/default.nix index 7a0cc917a6..3efb6a31b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-linkplay/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-musicpd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-musicpd/default.nix index 72ba24cc0a..f0a0277eb4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-musicpd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-musicpd/default.nix @@ -19,8 +19,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/third_party/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix index 3fa1de5b4e..2933fa619b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-troveclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-troveclient/default.nix index 891a907e55..05d5ce033c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-troveclient/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-watcherclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-watcherclient/default.nix index b3cc4267f3..05b2d315d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-watcherclient/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-zaqarclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-zaqarclient/default.nix index ee8c99b6b6..84c70240cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-zaqarclient/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-zunclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-zunclient/default.nix index f538cdbac6..a9f6245709 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-zunclient/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytibber/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytibber/default.nix index 94810bfac0..1b7af821ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytibber/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index a63c65ffef..26f0e096cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.123"; + version = "9.2.125"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-uojU1x4VfiYFM3ZSwSy5qPpWBSEq9CKwByk2HFAXvXA="; + hash = "sha256-BgMOPR1Uat/IBCeY16A6kuSEPqs0vjP9Ili7cqqU5Qg="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvo/default.nix index f5f7927199..fbab097658 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvo/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyytlounge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyytlounge/default.nix index 2ec7c32555..bbb3ba2316 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyytlounge/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix index 34984ec575..9d903f4fe0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/qtile-extras/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qtile-extras/default.nix index 90f4393178..6157a058de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qtile-extras/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qtile-extras/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "qtile-extras"; - version = "0.28.1"; + version = "0.29.0"; pyproject = true; src = fetchFromGitHub { owner = "elParaguayo"; repo = "qtile-extras"; rev = "refs/tags/v${version}"; - hash = "sha256-rF9tRzOdMiISN8vupBt9+1d3pWJqbNS83odtm5SzXZI="; + hash = "sha256-QkcLts2cqhA49/L9nuekf0n+ZRBxKdGL9Ql1sgtyTiw="; }; build-system = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qtile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qtile/default.nix index 6baaa6c47d..dc437906d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qtile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qtile/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "qtile"; - version = "0.28.1"; + version = "0.29.0"; pyproject = true; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; rev = "refs/tags/v${version}"; - hash = "sha256-r8cAht40r1/6rG1xrfx34YEPuPeyBCuSvX7MarLTTCc="; + hash = "sha256-EqrvBXigMjevPERTcz3EXSRaZP2xSEsOxjuiJ/5QOz0="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/quadprog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/quadprog/default.nix index d592c443e1..17faac7d13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/quadprog/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/quart/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/quart/default.nix index 0388b58a34..17c7a65ec3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/quart/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/radios/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/radios/default.nix index 241e95a189..ee5d925335 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/radios/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix index 40033924bf..ce6bb19ef5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix @@ -88,8 +88,6 @@ buildPythonPackage rec { shapely ]; - doCheck = true; - preCheck = '' rm -r rasterio # prevent importing local rasterio ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ray/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/ray/binary-hashes.nix index 4ce40625e3..bab6c0695e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ray/binary-hashes.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ray/binary-hashes.nix @@ -1,11 +1,11 @@ { cp310 = { - hash = "sha256-KZMkQeaKt9rTWydsdjZwv0Lr9yHN3E9N6CAL2SrAXFg="; + hash = "sha256-On1vcVm85BF7/o+cPQtl/yclf+LdjXN9rQ84aWZkQNo="; }; cp311 = { - hash = "sha256-tCAnnKFPAswn/Fkv8fKNqaoIuWIxa/Zd3zcNuHcILpE="; + hash = "sha256-7OgCzzocECtT9juLyQ2UeXHEs4feryM8Ik7Y7zSh88s="; }; cp312 = { - hash = "sha256-AmjHvC6Ltu+buJaSmd61hXv2cr/LWdqV23SVqKUC+Lo="; + hash = "sha256-B1B9L5lh6NU5DA62Bt8kkhbvWvsf+BhVgfPpIEHWYpM="; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ray/default.nix index 6a9532f953..41bfd53c9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ray/default.nix @@ -56,7 +56,7 @@ let pname = "ray"; - version = "2.37.0"; + version = "2.38.0"; in buildPythonPackage rec { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rdkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rdkit/default.nix index 248f212f0a..ec98f19c27 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rdkit/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/remctl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/remctl/default.nix new file mode 100644 index 0000000000..3e672e9e56 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/reprint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reprint/default.nix new file mode 100644 index 0000000000..5981e3abb4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/reprint/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + colorama, + six, +}: + +buildPythonPackage rec { + pname = "reprint"; + version = "0.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Yinzo"; + repo = "reprint"; + rev = "${version}"; + hash = "sha256-99FC12LcvvRRwNAxDSvWo9vRYmieL0JHSaCJqO/UGEs="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "'backports.shutil_get_terminal_size', " "" + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ + colorama + six + ]; + + pythonImportsCheck = [ + "reprint" + ]; + + meta = { + description = "Module for binding variables and refreshing multi-line output in terminal"; + homepage = "https://github.com/Yinzo/reprint"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + jasonodoom + jleightcap + ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/retry2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/retry2/default.nix new file mode 100644 index 0000000000..f0724f472a --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix index 684c06255d..9373a7d4ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rns/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.8.4"; + version = "0.8.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-uonOifCGvSKJhxTAqD49BOHDdN69pRexcb2ny1GwqjA="; + hash = "sha256-3Eif3AVpjNH803XXkPGQ5ZgSpVwV1W4DDm9rYBj6AEo="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rouge-score/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rouge-score/default.nix index adc543b1d9..59d0501672 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rouge-score/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/rstr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rstr/default.nix index 7bf0eb244f..cf2a5ef422 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rstr/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ruff-api/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/ruff-api/Cargo.lock index e6be1c5b10..e6aabc5969 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ruff-api/Cargo.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ruff-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ruff-api/default.nix index a363c4c7d3..eb4e1234a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ruff-api/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/rzpipe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rzpipe/default.nix index 76a29b256f..3238a06298 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rzpipe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rzpipe/default.nix @@ -3,20 +3,23 @@ buildPythonPackage, fetchPypi, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "rzpipe"; version = "0.6.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; hash = "sha256-py4oiNp+WUcOGHn2AdHyIpgV8BsI8A1gtJi2joi1Wxc="; }; + build-system = [ setuptools ]; + # No native rz_core library doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/safety/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/safety/default.nix index 4c9a40d06d..911ddc0d89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/safety/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix index f5ddb753ff..f969570160 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/securityreporter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/securityreporter/default.nix index 3826f8397f..087d0f7190 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/securityreporter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/securityreporter/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "securityreporter"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "dongit-org"; repo = "python-reporter"; rev = "refs/tags/v${version}"; - hash = "sha256-Ddq1qjaQemawK+u3ArlsChrkzRbcuaj5LrswyTGwTrg="; + hash = "sha256-fpsvjbPE6iaOmLxykGSkCjkhFTmb8xhXa8pDrWN66KM="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/segyio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/segyio/default.nix index 9e221db8cf..574354ea44 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/segyio/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/shimmy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shimmy/default.nix index b50135e517..eb19b4e163 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shimmy/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/simplesat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplesat/default.nix index 3f81b311c8..35359c2939 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simplesat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simplesat/default.nix @@ -1,42 +1,34 @@ { - buildPythonPackage, - fetchFromGitHub, - writeText, lib, attrs, + buildPythonPackage, + fetchFromGitHub, mock, okonomiyaki, pytestCheckHook, + pythonOlder, pyyaml, setuptools, six, }: -let - version = "0.9.0"; - 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"; rev = "refs/tags/v${version}"; - hash = "sha256-8sUOV42MLM3otG3EKvVzKKGAUpSlaTj850QZxZa62bE="; + 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/third_party/nixpkgs/pkgs/development/python-modules/sip/4.x.nix b/third_party/nixpkgs/pkgs/development/python-modules/sip/4.x.nix index e9305188ca..8dc26ddfdc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sip/4.x.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/skyfield/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skyfield/default.nix index 8fe675eb5b..b917cf2148 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skyfield/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skyfield/default.nix @@ -49,8 +49,6 @@ buildPythonPackage rec { assay ]; - doCheck = true; - checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix index 2f4c2d0f00..9a6bafea9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix index 0dd9835e61..f20779b9b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix index a4140a8a7f..f90e2f7a30 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix +++ b/third_party/nixpkgs/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.4.7"; - format = "setuptools"; + version = "0.5.1"; + pyproject = true; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-abOGgY1QotUYYH1LlzRC6NUkdgx81si4vgPYyY/EvOc="; + 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/third_party/nixpkgs/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch index a5761764fd..6ec399e25d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix index d6d1094447..3205238b74 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/spacy/annotation-test/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/annotation-test/default.nix index cb8a97aa56..5f5f8f3ca0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/annotation-test/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/spotifyaio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spotifyaio/default.nix index 80a6398960..777c134ce1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spotifyaio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spotifyaio/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "spotifyaio"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "joostlek"; repo = "python-spotify"; rev = "refs/tags/v${version}"; - hash = "sha256-SWI2lXJ+JeoYsVaripSuL9pz5m9nRj+1986s3cEgVjE="; + hash = "sha256-L5S7adnOOJQ0b+yUcL8rw9XkZS0meN2gN1Bi2WYOJks="; }; build-system = [ poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sre-yield/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sre-yield/default.nix index 04cc121840..fdd8cc8b4b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sre-yield/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/stravaweblib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stravaweblib/default.nix new file mode 100644 index 0000000000..210b62755a --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/strawberry-django/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/strawberry-django/default.nix new file mode 100644 index 0000000000..ea6326714e --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix index 95fd2c9161..f104df7af0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/streamlit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/streamlit/default.nix index 71ce1b81aa..d386277630 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/streamlit/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/stringzilla/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stringzilla/default.nix new file mode 100644 index 0000000000..7fc432e3ea --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/telegraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/telegraph/default.nix index 80a4d12c7b..3dd1ce594e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/telegraph/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/tempest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tempest/default.nix index 63ed58fca0..976b9e0a20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tempest/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/tenacity/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tenacity/default.nix index 5ac8b3e2c9..0def5a0322 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tenacity/default.nix +++ b/third_party/nixpkgs/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.4.1"; - format = "pyproject"; + version = "9.0.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-VLFBK4eN334fFXfNSVJ7rYze8yQhvVmb6sDGw/EFgv0="; + 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/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 0631b8fc6d..a168fba1ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1253"; + version = "3.0.1257"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-UQeh2VTIIuTvvJ3+GfY0pfSFLyc2KCg0i5qlglhBAJY="; + hash = "sha256-HjOU8gn1T6TXnAd0fM8dgc3tz8hUgyHzsQjgISYD1qE="; }; build-system = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/binary-hashes.nix index 2a6a31b540..d3813066c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/binary-hashes.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/prefetcher.sh b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/prefetcher.sh index 912977ecc4..594e4d82ec 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/prefetcher.sh +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/throttler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/throttler/default.nix index 4dc15bffed..629ec37845 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/throttler/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/tinygrad/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tinygrad/default.nix index bb0c6065f0..ae55395b2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tinygrad/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/toptica-lasersdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/toptica-lasersdk/default.nix new file mode 100644 index 0000000000..6c7ccb9c25 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/torchrl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchrl/default.nix index 3023380920..990e4df76b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchrl/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix index 44e1b68a25..cf5f7f3440 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -81,8 +81,6 @@ buildPythonPackage rec { pyyaml ]; - doCheck = true; - nativeCheckInputs = [ pytestCheckHook tpm2-tools diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix index 49cc0f8c50..944ccabe16 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix @@ -58,14 +58,14 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.45.2"; + version = "4.46.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-5Ric+pEbBf6HswsPb8cdVLdqTRgicFjzcrk0oO2PtC0="; + hash = "sha256-R+uHo98K+uOXbxE4Axam/FONZgeFyyPfe0IZiOCpFF4="; }; build-system = [ setuptools ]; @@ -173,7 +173,6 @@ buildPythonPackage rec { # natten = [ natten ]; # codecarbon = [ codecarbon ]; video = [ - # decord av ]; sentencepiece = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/truststore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/truststore/default.nix index 820d823f81..a4a6830d83 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/truststore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/truststore/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "truststore"; - version = "0.9.1"; + version = "0.9.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = "truststore"; rev = "refs/tags/v${version}"; - hash = "sha256-BP88oQ363XFuRMKZqW8wSm1wl5upU+yEgmwktv65JOU="; + hash = "sha256-BSJneLxwgnD8IJ8IJM43WhmlII5N3qic96SBquMdMnc="; }; build-system = [ flit-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ttp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ttp/default.nix index 700f97a68b..653ba4ad71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ttp/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/turnt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/turnt/default.nix index abed46cc76..8d9af77402 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/turnt/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix index 894fb118e0..7faf26909e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-aiobotocore-packages/default.nix index 230615d276..e7272708fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-aiobotocore-packages/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/types-aiobotocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-aiobotocore/default.nix index 29fffba265..75215f8a8e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/types-aiobotocore/update.sh b/third_party/nixpkgs/pkgs/development/python-modules/types-aiobotocore/update.sh index ea5b05fdaa..a3449d2b43 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-aiobotocore/update.sh +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ufolint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ufolint/default.nix index 95db33a7bf..714a5cac45 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ufolint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ufolint/default.nix @@ -27,7 +27,6 @@ buildPythonPackage rec { fonttools ]; - doCheck = true; nativeBuildInputs = [ pytestCheckHook ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix index f11af5836c..49402d76d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix @@ -68,6 +68,11 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests" ]; + disabledTests = [ + # Flaky tests + "TwistedEventLoopTest" + ]; + disabledTestPaths = [ # expect call hangs "tests/test_vterm.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix index f5d0e08cbb..15c35549bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/validator-collection/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/validator-collection/default.nix index fbec2841fc..818471e62d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/validator-collection/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/velbus-aio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/velbus-aio/default.nix index 2536e44bd9..72803dfd60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/velbus-aio/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/verilogae/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/verilogae/Cargo.lock new file mode 100644 index 0000000000..9f8d248604 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/verilogae/Cargo.lock @@ -0,0 +1,1769 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +dependencies = [ + "memchr", +] + +[[package]] +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] +name = "anyhow" +version = "1.0.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" + +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + +[[package]] +name = "arena" +version = "0.0.0" +dependencies = [ + "typed-index-collections", +] + +[[package]] +name = "arrayvec" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "backtrace-ext" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50" +dependencies = [ + "backtrace", +] + +[[package]] +name = "base_n" +version = "1.0.0" + +[[package]] +name = "basedb" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "arena", + "codespan-reporting", + "expect-test", + "indexmap", + "mini_harness", + "parking_lot", + "salsa", + "stdx", + "syntax", + "text-size", + "typed-index-collections", + "vfs", +] + +[[package]] +name = "bforest" +version = "0.0.0" +dependencies = [ + "stdx", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24a6904aef64d73cf10ab17ebace7befb918b82164785cb89907993be7f83813" + +[[package]] +name = "bitset" +version = "0.0.0" +dependencies = [ + "arrayvec", + "stdx", +] + +[[package]] +name = "camino" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chardetng" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14b8f0b65b7b08ae3c8187e8d77174de20cb6777864c6b832d8ad365999cf1ea" +dependencies = [ + "cfg-if", + "encoding_rs", + "memchr", +] + +[[package]] +name = "clap" +version = "4.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" +dependencies = [ + "anstream", + "anstyle", + "bitflags 1.3.2", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_lex" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" + +[[package]] +name = "cli-table" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adfbb116d9e2c4be7011360d0c0bee565712c11e969c9609b25b619366dc379d" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[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 = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "countme" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "dashmap" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" +dependencies = [ + "cfg-if", + "num_cpus", +] + +[[package]] +name = "directories-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" +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 = "dissimilar" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "210ec60ae7d710bed8683e333e9d2855a8a56a3e9892b38bad3bb0d4d29b0d5e" + +[[package]] +name = "dot" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a74b6c4d4a1cff5f454164363c16b72fa12463ca6b31f4b5f2035a65fa3d5906" + +[[package]] +name = "drop_bomb" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" + +[[package]] +name = "encoding_rs" +version = "0.8.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "expect-test" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30d9eafeadd538e68fb28016364c9732d78e420b9ff8853fa5e4058861e9f8d3" +dependencies = [ + "dissimilar", + "once_cell", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "getrandom" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" + +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +dependencies = [ + "ahash 0.7.6", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.3", +] + +[[package]] +name = "hashlink" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" +dependencies = [ + "hashbrown 0.11.2", +] + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[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" + +[[package]] +name = "hir_def" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "arena", + "basedb", + "expect-test", + "indexmap", + "mini_harness", + "once_cell", + "parking_lot", + "salsa", + "stdx", + "syntax", + "typed-index-collections", +] + +[[package]] +name = "hir_lower" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "basedb", + "bitset", + "expect-test", + "hir_def", + "hir_ty", + "indexmap", + "lasso", + "mini_harness", + "mir", + "mir_build", + "parking_lot", + "salsa", + "stdx", + "syntax", + "typed-index-collections", + "typed_indexmap", +] + +[[package]] +name = "hir_ty" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "arena", + "basedb", + "expect-test", + "hir_def", + "mini_harness", + "parking_lot", + "salsa", + "smol_str", + "stdx", + "syntax", + "typed-index-collections", +] + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "klu-rs" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0326c3bebaae9e354d82d0425b8abeebe41e9df313063ac3845ae93aa43181" +dependencies = [ + "klu_sys", + "num-complex", +] + +[[package]] +name = "klu_sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc7f729c295c52f9ad3058f5e61db78bde2b8c6f1e30abf4ccf09d2df4f3a689" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "lasso" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badc7a606a3096e40b886fb2f63803cacf11cd79796ae04e3f4b7e35a38cfc2" +dependencies = [ + "ahash 0.8.3", + "hashbrown 0.13.2", +] + +[[package]] +name = "lexer" +version = "0.0.0" +dependencies = [ + "expect-test", + "text-size", + "tokens", +] + +[[package]] +name = "libc" +version = "0.2.144" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" + +[[package]] +name = "libloading" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "libmimalloc-sys" +version = "0.1.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "linker" +version = "0.0.0" +dependencies = [ + "anyhow", + "camino", + "cc", + "target", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" + +[[package]] +name = "list_pool" +version = "0.0.0" +dependencies = [ + "stdx", +] + +[[package]] +name = "llvm" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "cc", + "libc", +] + +[[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", +] + +[[package]] +name = "md5" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" + +[[package]] +name = "melange-core" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "anyhow", + "bitflags 2.2.1", + "camino", + "cli-table", + "directories-next", + "indexmap", + "klu-rs", + "lasso", + "libc", + "libloading", + "log", + "num-complex", + "openvaf", + "pretty_dtoa", + "stdx", + "typed-index-collections", + "typed_indexmap", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mimalloc" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" +dependencies = [ + "libmimalloc-sys", +] + +[[package]] +name = "mini_harness" +version = "0.0.1" +dependencies = [ + "xflags", +] + +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] + +[[package]] +name = "mir" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "bforest", + "bitset", + "dot", + "expect-test", + "lasso", + "list_pool", + "stdx", + "typed-index-collections", + "typed_indexmap", +] + +[[package]] +name = "mir_autodiff" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "arena", + "bitset", + "expect-test", + "float-cmp", + "indexmap", + "mir", + "mir_interpret", + "mir_reader", + "stdx", + "typed-index-collections", + "typed_indexmap", + "workqueue", +] + +[[package]] +name = "mir_build" +version = "0.0.0" +dependencies = [ + "bforest", + "bitset", + "expect-test", + "lasso", + "mir", + "mir_reader", + "smallvec", + "stdx", + "typed-index-collections", +] + +[[package]] +name = "mir_interpret" +version = "0.0.0" +dependencies = [ + "lasso", + "mir", + "typed-index-collections", +] + +[[package]] +name = "mir_llvm" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "arrayvec", + "base_n", + "lasso", + "libc", + "llvm", + "log", + "mir", + "target", + "typed-index-collections", +] + +[[package]] +name = "mir_opt" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "bitset", + "expect-test", + "hashbrown 0.13.2", + "indexmap", + "mir", + "mir_reader", + "stdx", + "typed-index-collections", + "workqueue", +] + +[[package]] +name = "mir_reader" +version = "0.0.0" +dependencies = [ + "bforest", + "expect-test", + "lasso", + "mir", +] + +[[package]] +name = "num-complex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +dependencies = [ + "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 = "object" +version = "0.30.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +[[package]] +name = "openvaf" +version = "0.1.2" +dependencies = [ + "anyhow", + "base_n", + "basedb", + "camino", + "linker", + "llvm", + "md5", + "mir_llvm", + "osdi", + "paths", + "sim_back", + "target", + "termcolor", +] + +[[package]] +name = "openvaf-driver" +version = "23.5.0" +dependencies = [ + "anyhow", + "backtrace", + "backtrace-ext", + "camino", + "clap", + "directories-next", + "env_logger", + "log", + "mimalloc", + "openvaf", + "path-absolutize", + "termcolor", +] + +[[package]] +name = "osdi" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "base_n", + "camino", + "expect-test", + "float-cmp", + "hir_def", + "hir_lower", + "hir_ty", + "indexmap", + "lasso", + "llvm", + "log", + "mini_harness", + "mir", + "mir_interpret", + "mir_llvm", + "paths", + "rayon-core", + "salsa", + "sim_back", + "smol_str", + "stdx", + "target", + "typed-index-collections", + "typed_indexmap", + "xshell", +] + +[[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.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys 0.45.0", +] + +[[package]] +name = "parser" +version = "0.0.0" +dependencies = [ + "drop_bomb", + "stdx", + "tokens", +] + +[[package]] +name = "path-absolutize" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43eb3595c63a214e1b37b44f44b0a84900ef7ae0b4c5efce59e123d246d7a0de" +dependencies = [ + "path-dedot", +] + +[[package]] +name = "path-dedot" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d55e486337acb9973cdea3ec5638c1b3bcb22e573b2b7b41969e0c744d5a15e" +dependencies = [ + "once_cell", +] + +[[package]] +name = "paths" +version = "0.0.0" + +[[package]] +name = "preprocessor" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "expect-test", + "lexer", + "stdx", + "text-size", + "tokens", + "typed-index-collections", + "vfs", +] + +[[package]] +name = "pretty_dtoa" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a239bcdfda2c685fda1add3b4695c06225f50075e3cfb5b954e91545587edff2" +dependencies = [ + "ryu_floating_decimal", +] + +[[package]] +name = "proc-macro2" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pyo3-build-config" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cb946f5ac61bb61a5014924910d936ebd2b23b705f7a4a3c40b05c720b079a3" +dependencies = [ + "once_cell", + "python3-dll-a", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd4d7c5337821916ea2a1d21d1092e8443cf34879e53a0ac653fbb98f44ff65c" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "python3-dll-a" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a915bd72824962bf190bbd3e8a044cccb695d1409f73ff5493712eda5136c7a8" +dependencies = [ + "cc", +] + +[[package]] +name = "quote" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" + +[[package]] +name = "rowan" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64449cfef9483a475ed56ae30e2da5ee96448789fb2aa240a04beb6a055078bf" +dependencies = [ + "countme", + "hashbrown 0.12.3", + "memoffset", + "rustc-hash", + "text-size", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[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.37.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "ryu_floating_decimal" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "700de91d5fd6091442d00fdd9ee790af6d4f0f480562b0f5a1e8f59e90aafe73" + +[[package]] +name = "salsa" +version = "0.17.0-pre.2" +source = "git+https://github.com/DSPOM2/salsa#73532d7d4d8b5b27f2c9f189a76e012d1fc4de09" +dependencies = [ + "arc-swap", + "crossbeam-utils", + "dashmap", + "hashlink", + "indexmap", + "lock_api", + "log", + "oorandom", + "parking_lot", + "rustc-hash", + "salsa-macros", + "smallvec", +] + +[[package]] +name = "salsa-macros" +version = "0.17.0-pre.2" +source = "git+https://github.com/DSPOM2/salsa#73532d7d4d8b5b27f2c9f189a76e012d1fc4de09" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "sim_back" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "anyhow", + "basedb", + "bitset", + "expect-test", + "float-cmp", + "hir_def", + "hir_lower", + "hir_ty", + "indexmap", + "lasso", + "mir", + "mir_autodiff", + "mir_interpret", + "mir_opt", + "parking_lot", + "paths", + "salsa", + "smol_str", + "stdx", + "syntax", + "typed-index-collections", + "typed_indexmap", + "workqueue", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "smol_str" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" + +[[package]] +name = "sourcegen" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "indexmap", + "proc-macro2", + "quote", + "stdx", + "target", + "ungrammar", + "xshell", +] + +[[package]] +name = "stdx" +version = "0.0.0" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[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.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syntax" +version = "0.0.0" +dependencies = [ + "parser", + "preprocessor", + "rowan", + "smol_str", + "stdx", + "text-size", + "tokens", + "vfs", +] + +[[package]] +name = "target" +version = "0.0.0" +dependencies = [ + "stdx", + "xshell", +] + +[[package]] +name = "target-lexicon" +version = "0.12.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "text-size" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "288cb548dbe72b652243ea797201f3d481a0609a967980fcc5b2315ea811560a" + +[[package]] +name = "thiserror" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + +[[package]] +name = "tokens" +version = "0.0.0" +dependencies = [ + "text-size", +] + +[[package]] +name = "typed-index-collections" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "183496e014253d15abbe6235677b1392dba2d40524c88938991226baa38ac7c4" + +[[package]] +name = "typed_indexmap" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "indexmap", +] + +[[package]] +name = "ungrammar" +version = "1.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e5df347f0bf3ec1d670aad6ca5c6a1859cd9ea61d2113125794654ccced68f" + +[[package]] +name = "unicode-ident" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" + +[[package]] +name = "unicode-segmentation" +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 = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "verilogae" +version = "1.0.0" +dependencies = [ + "ahash 0.8.3", + "anyhow", + "base_n", + "basedb", + "bitset", + "camino", + "directories-next", + "hir_def", + "hir_lower", + "hir_ty", + "indexmap", + "lasso", + "libloading", + "linker", + "llvm", + "md5", + "mir", + "mir_autodiff", + "mir_llvm", + "mir_opt", + "parking_lot", + "paths", + "rayon-core", + "salsa", + "smol_str", + "stdx", + "syntax", + "target", + "termcolor", + "typed-index-collections", + "typed_indexmap", +] + +[[package]] +name = "verilogae_ffi" +version = "1.0.0" +dependencies = [ + "verilogae", +] + +[[package]] +name = "verilogae_py" +version = "1.0.0" +dependencies = [ + "libc", + "pyo3-build-config", + "pyo3-ffi", + "verilogae_ffi", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vfs" +version = "0.0.0" +dependencies = [ + "ahash 0.8.3", + "chardetng", + "encoding_rs", + "indexmap", + "paths", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[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.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.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.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.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "workqueue" +version = "0.0.0" +dependencies = [ + "bitset", +] + +[[package]] +name = "xflags" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4554b580522d0ca238369c16b8f6ce34524d61dafe7244993754bbd05f2c2ea" +dependencies = [ + "xflags-macros", +] + +[[package]] +name = "xflags-macros" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f58e7b3ca8977093aae6b87b6a7730216fc4c53a6530bab5c43a783cd810c1a8" + +[[package]] +name = "xshell" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "962c039b3a7b16cf4e9a4248397c6585c07547412e7d6a6e035389a802dcfe90" +dependencies = [ + "xshell-macros", +] + +[[package]] +name = "xshell-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dbabb1cbd15a1d6d12d9ed6b35cc6777d4af87ab3ba155ea37215f20beab80c" + +[[package]] +name = "xtask" +version = "0.1.0" +dependencies = [ + "anyhow", + "base_n", + "md5", + "xflags", + "xshell", +] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/verilogae/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/verilogae/default.nix new file mode 100644 index 0000000000..ab6bd93632 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/verilogae/default.nix @@ -0,0 +1,79 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools-rust, + rustPlatform, + cargo, + rustc, + autoPatchelfHook, + pkg-config, + llvmPackages_15, + libxml2, + ncurses, + zlib, +}: + +buildPythonPackage rec { + pname = "verilogae"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pascalkuthe"; + repo = "OpenVAF"; + rev = "VerilogAE-v${version}"; + hash = "sha256-TILKKmgSyhyxp88sdflDXAoH++iP6CMpdoXN1/1fsjU="; + }; + + postPatch = '' + substituteInPlace openvaf/llvm/src/initialization.rs \ + --replace-fail "i8" "libc::c_char" + substituteInPlace openvaf/osdi/build.rs \ + --replace-fail "-fPIC" "" + ''; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "salsa-0.17.0-pre.2" = "sha256-6GssvV76lFr5OzAUekz2h6f82Tn7usz5E8MSZ5DmgJw="; + }; + }; + + nativeBuildInputs = [ + setuptools-rust + rustPlatform.cargoSetupHook + rustPlatform.bindgenHook + cargo + rustc + autoPatchelfHook + pkg-config + llvmPackages_15.clang + llvmPackages_15.llvm + ]; + + buildInputs = [ + libxml2.dev + llvmPackages_15.libclang + ncurses + zlib + ]; + + cargoBuildType = "release"; + + pythonImportsCheck = [ "verilogae" ]; + + hardeningDisable = [ "pic" ]; + + meta = { + description = "Verilog-A tool useful for compact model parameter extraction"; + homepage = "https://man.sr.ht/~dspom/openvaf_doc/verilogae/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + jasonodoom + jleightcap + ]; + platforms = lib.platforms.linux; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wagtail-modeladmin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wagtail-modeladmin/default.nix index 6b46643985..2f3988e0af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wagtail-modeladmin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wagtail-modeladmin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "wagtail-modeladmin"; - version = "2.0.0"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { repo = pname; owner = "wagtail-nest"; rev = "refs/tags/v${version}"; - hash = "sha256-J6ViGf7lqUvl5EV4/LbADVDp15foY9bUZygs1dSDlKw="; + hash = "sha256-IG7e7YomMM7K2IlJ1Dr1zo+blDPHnu/JeS5csos8ncc="; }; nativeBuildInputs = [ flit-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix index 59dc57777e..6967bfca9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix @@ -1,322 +1,324 @@ { lib, stdenv, - appdirs, - azure-containerregistry, + fetchFromGitHub, + + ## wandb-core + buildGoModule, + git, + versionCheckHook, + + ## gpu-stats + rustPlatform, + darwin, + + ## wandb + buildPythonPackage, + substituteAll, + + # build-system + hatchling, + + # dependencies + click, + docker-pycreds, + gitpython, + platformdirs, + protobuf, + psutil, + pyyaml, + requests, + sentry-sdk_2, + setproctitle, + setuptools, + pythonOlder, + typing-extensions, + + # tests + pytestCheckHook, azure-core, + azure-containerregistry, azure-identity, azure-storage-blob, bokeh, boto3, - buildPythonPackage, - click, - docker-pycreds, - fetchFromGitHub, + coverage, flask, - git, - gitpython, google-cloud-artifact-registry, google-cloud-compute, google-cloud-storage, hypothesis, - imageio, - jsonref, jsonschema, - keras, kubernetes, + kubernetes-asyncio, matplotlib, - mlflow, moviepy, - nbclient, - nbformat, pandas, parameterized, - protobuf, - psutil, + pillow, + plotly, pydantic, pyfakefs, + pyte, + pytest-asyncio, + pytest-cov-stub, pytest-mock, + pytest-timeout, pytest-xdist, - pytestCheckHook, - pythonOlder, - pyyaml, - requests, + rdkit, responses, scikit-learn, - sentry-sdk, - setproctitle, - setuptools, soundfile, - substituteAll, + tenacity, torch, tqdm, }: +let + version = "0.18.5"; + src = fetchFromGitHub { + owner = "wandb"; + repo = "wandb"; + rev = "refs/tags/v${version}"; + hash = "sha256-nx50baneYSSIWPAIOkUk4cGCNpWAhv7IwFDQJ4vUMiw="; + }; + + gpu-stats = rustPlatform.buildRustPackage rec { + pname = "gpu-stats"; + version = "0.2.0"; + inherit src; + + sourceRoot = "${src.name}/gpu_stats"; + + cargoHash = "sha256-4udGG4I2Hr8r84c4WX6QGG/+bcHK4csXqwddvIiKmkw="; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.IOKit + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/gpu_stats"; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + meta = { + mainProgram = "gpu_stats"; + # ld: library not found for -lIOReport + # TODO: succeeds on https://github.com/NixOS/nixpkgs/pull/348827, so try again once it lands on master + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; + }; + }; + + wandb-core = buildGoModule rec { + pname = "wandb-core"; + inherit src version; + + sourceRoot = "${src.name}/core"; + + # hardcode the `gpu_stats` binary path. + postPatch = '' + substituteInPlace pkg/monitor/gpu.go \ + --replace-fail \ + 'cmdPath, err := getGPUStatsCmdPath()' \ + 'cmdPath, err := "${lib.getExe gpu-stats}", error(nil)' + ''; + + vendorHash = null; + + nativeBuildInputs = [ + git + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + __darwinAllowLocalNetworking = true; + + meta.mainProgram = "wandb-core"; + }; +in + buildPythonPackage rec { pname = "wandb"; - version = "0.16.0"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-XXs9KjiAPzZ932r4UJ87RpM+qhg/bNDWEYsq2Ua6SRw="; - }; + inherit src version; patches = [ # Replace git paths (substituteAll { src = ./hardcode-git-path.patch; - git = "${lib.getBin git}/bin/git"; + git = lib.getExe git; }) ]; - nativeBuildInputs = [ - setuptools + # Hard-code the path to the `wandb-core` binary in the code. + postPatch = '' + substituteInPlace wandb/util.py \ + --replace-fail \ + 'bin_path = pathlib.Path(__file__).parent / "bin" / "wandb-core"' \ + 'bin_path = pathlib.Path("${lib.getExe wandb-core}")' + ''; + + env = { + # Prevent the install script to try building and embedding the `gpu_stats` and `wandb-core` + # binaries in the wheel. + # Their path have been patched accordingly in the `wandb-core` and `wanbd` source codes. + # https://github.com/wandb/wandb/blob/v0.18.5/hatch_build.py#L37-L47 + WANDB_BUILD_SKIP_GPU_STATS = true; + WANDB_BUILD_UNIVERSAL = true; + }; + + build-system = [ + hatchling ]; - # setuptools is necessary since pkg_resources is required at runtime. - propagatedBuildInputs = [ - appdirs - click - docker-pycreds - gitpython - protobuf - psutil - pyyaml - requests - sentry-sdk - setproctitle - setuptools - ]; + dependencies = + [ + click + docker-pycreds + gitpython + platformdirs + protobuf + psutil + pyyaml + requests + sentry-sdk_2 + setproctitle + # setuptools is necessary since pkg_resources is required at runtime. + setuptools + ] + ++ lib.optionals (pythonOlder "3.12") [ + typing-extensions + ]; __darwinAllowLocalNetworking = true; nativeCheckInputs = [ - azure-containerregistry + pytestCheckHook azure-core + azure-containerregistry azure-identity azure-storage-blob - bokeh boto3 + bokeh + coverage flask google-cloud-artifact-registry google-cloud-compute google-cloud-storage hypothesis - imageio - jsonref jsonschema - keras kubernetes + kubernetes-asyncio matplotlib - mlflow moviepy - nbclient - nbformat pandas parameterized + pillow + plotly pydantic pyfakefs + pyte + pytest-asyncio + pytest-cov-stub pytest-mock + pytest-timeout pytest-xdist - pytestCheckHook + rdkit responses scikit-learn soundfile + tenacity torch tqdm ]; - # Set BOKEH_CDN_VERSION to stop bokeh throwing an exception in tests preCheck = '' export HOME=$(mktemp -d) - export BOKEH_CDN_VERSION=${bokeh.version} ''; - pythonRelaxDeps = [ "protobuf" ]; - - pytestFlagsArray = [ - # We want to run only unit tests - "tests/pytest_tests" + disabledTestPaths = [ + # Require docker access + "tests/release_tests/test_launch" + "tests/system_tests" ]; - disabledTestPaths = - [ - # Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment. - "tests/pytest_tests/system_tests/test_notebooks/test_notebooks.py" - "tests/pytest_tests/unit_tests_old/test_cli.py" - "tests/pytest_tests/unit_tests_old/test_data_types.py" - "tests/pytest_tests/unit_tests_old/test_file_stream.py" - "tests/pytest_tests/unit_tests_old/test_file_upload.py" - "tests/pytest_tests/unit_tests_old/test_footer.py" - "tests/pytest_tests/unit_tests_old/test_internal_api.py" - "tests/pytest_tests/unit_tests_old/test_metric_internal.py" - "tests/pytest_tests/unit_tests_old/test_public_api.py" - "tests/pytest_tests/unit_tests_old/test_runtime.py" - "tests/pytest_tests/unit_tests_old/test_sender.py" - "tests/pytest_tests/unit_tests_old/test_summary.py" - "tests/pytest_tests/unit_tests_old/test_tb_watcher.py" - "tests/pytest_tests/unit_tests_old/test_time_resolution.py" - "tests/pytest_tests/unit_tests_old/test_wandb_agent.py" - "tests/pytest_tests/unit_tests_old/test_wandb_integration.py" - "tests/pytest_tests/unit_tests_old/test_wandb_run.py" - "tests/pytest_tests/unit_tests_old/test_wandb.py" - "tests/pytest_tests/unit_tests_old/tests_launch/test_launch_aws.py" - "tests/pytest_tests/unit_tests_old/tests_launch/test_launch_cli.py" - "tests/pytest_tests/unit_tests_old/tests_launch/test_launch_docker.py" - "tests/pytest_tests/unit_tests_old/tests_launch/test_launch.py" - "tests/pytest_tests/unit_tests/test_cli.py" - "tests/pytest_tests/unit_tests/test_data_types.py" - "tests/pytest_tests/unit_tests/test_internal_api.py" - "tests/pytest_tests/unit_tests/test_mode_disabled.py" - "tests/pytest_tests/unit_tests/test_model_workflows.py" - "tests/pytest_tests/unit_tests/test_plots.py" - "tests/pytest_tests/unit_tests/test_public_api.py" - "tests/pytest_tests/unit_tests/test_sender.py" - "tests/pytest_tests/unit_tests/test_util.py" - "tests/pytest_tests/unit_tests/test_wandb_verify.py" - - # Requires docker access - "tests/pytest_tests/system_tests/test_artifacts/test_artifact_saver.py" - "tests/pytest_tests/system_tests/test_artifacts/test_misc.py" - "tests/pytest_tests/system_tests/test_artifacts/test_misc2.py" - "tests/pytest_tests/system_tests/test_artifacts/test_object_references.py" - "tests/pytest_tests/system_tests/test_artifacts/test_wandb_artifacts_full.py" - "tests/pytest_tests/system_tests/test_artifacts/test_wandb_artifacts.py" - "tests/pytest_tests/system_tests/test_core/test_cli_full.py" - "tests/pytest_tests/system_tests/test_core/test_data_types_full.py" - "tests/pytest_tests/system_tests/test_core/test_file_stream_internal.py" - "tests/pytest_tests/system_tests/test_core/test_file_upload.py" - "tests/pytest_tests/system_tests/test_core/test_footer.py" - "tests/pytest_tests/system_tests/test_core/test_keras_full.py" - "tests/pytest_tests/system_tests/test_core/test_label_full.py" - "tests/pytest_tests/system_tests/test_core/test_metric_full.py" - "tests/pytest_tests/system_tests/test_core/test_metric_internal.py" - "tests/pytest_tests/system_tests/test_core/test_mode_disabled_full.py" - "tests/pytest_tests/system_tests/test_core/test_model_workflow.py" - "tests/pytest_tests/system_tests/test_core/test_mp_full.py" - "tests/pytest_tests/system_tests/test_core/test_public_api.py" - "tests/pytest_tests/system_tests/test_core/test_redir_full.py" - "tests/pytest_tests/system_tests/test_core/test_report_api.py" - "tests/pytest_tests/system_tests/test_core/test_save_policies.py" - "tests/pytest_tests/system_tests/test_core/test_sender.py" - "tests/pytest_tests/system_tests/test_core/test_start_method.py" - "tests/pytest_tests/system_tests/test_core/test_system_info.py" - "tests/pytest_tests/system_tests/test_core/test_tb_watcher.py" - "tests/pytest_tests/system_tests/test_core/test_telemetry_full.py" - "tests/pytest_tests/system_tests/test_core/test_time_resolution.py" - "tests/pytest_tests/system_tests/test_core/test_torch_full.py" - "tests/pytest_tests/system_tests/test_core/test_validation_data_logger.py" - "tests/pytest_tests/system_tests/test_core/test_wandb_init.py" - "tests/pytest_tests/system_tests/test_core/test_wandb_integration.py" - "tests/pytest_tests/system_tests/test_core/test_wandb_run.py" - "tests/pytest_tests/system_tests/test_core/test_wandb_settings.py" - "tests/pytest_tests/system_tests/test_core/test_wandb_tensorflow.py" - "tests/pytest_tests/system_tests/test_core/test_wandb_verify.py" - "tests/pytest_tests/system_tests/test_core/test_wandb.py" - "tests/pytest_tests/system_tests/test_importers/test_import_mlflow.py" - "tests/pytest_tests/system_tests/test_launch/test_github_reference.py" - "tests/pytest_tests/system_tests/test_launch/test_job_status_tracker.py" - "tests/pytest_tests/system_tests/test_launch/test_job.py" - "tests/pytest_tests/system_tests/test_launch/test_launch_add.py" - "tests/pytest_tests/system_tests/test_launch/test_launch_cli.py" - "tests/pytest_tests/system_tests/test_launch/test_launch_kubernetes.py" - "tests/pytest_tests/system_tests/test_launch/test_launch_local_container.py" - "tests/pytest_tests/system_tests/test_launch/test_launch_run.py" - "tests/pytest_tests/system_tests/test_launch/test_launch_sagemaker.py" - "tests/pytest_tests/system_tests/test_launch/test_launch_sweep_cli.py" - "tests/pytest_tests/system_tests/test_launch/test_launch_sweep.py" - "tests/pytest_tests/system_tests/test_launch/test_launch_vertex.py" - "tests/pytest_tests/system_tests/test_launch/test_launch.py" - "tests/pytest_tests/system_tests/test_launch/test_wandb_reference.py" - "tests/pytest_tests/system_tests/test_nexus/test_nexus.py" - "tests/pytest_tests/system_tests/test_sweep/test_public_api.py" - "tests/pytest_tests/system_tests/test_sweep/test_sweep_scheduler.py" - "tests/pytest_tests/system_tests/test_sweep/test_sweep_utils.py" - "tests/pytest_tests/system_tests/test_sweep/test_wandb_agent_full.py" - "tests/pytest_tests/system_tests/test_sweep/test_wandb_agent.py" - "tests/pytest_tests/system_tests/test_sweep/test_wandb_sweep.py" - "tests/pytest_tests/system_tests/test_system_metrics/test_open_metrics.py" - "tests/pytest_tests/system_tests/test_system_metrics/test_system_monitor.py" - - # Tries to access /homeless-shelter - "tests/pytest_tests/unit_tests/test_tables.py" - - # E AssertionError: assert 'Cannot use both --async and --queue with wandb launch' in 'wandb: ERROR Find detailed error logs at: /build/source/wandb/debug-cli.nixbld.log\nError: The wandb service process exited with 1. Ensure that `sys.executable` is a valid python interpreter. You can override it with the `_executable` setting or with the `WANDB__EXECUTABLE` environment variable.\n' - # E + where 'wandb: ERROR Find detailed error logs at: /build/source/wandb/debug-cli.nixbld.log\nError: The wandb service process exited with 1. Ensure that `sys.executable` is a valid python interpreter. You can override it with the `_executable` setting or with the `WANDB__EXECUTABLE` environment variable.\n' = .output - "tests/pytest_tests/unit_tests_old/tests_launch/test_launch_jobs.py" - - # Requires google-cloud-aiplatform which is not packaged as of 2023-04-25. - "tests/pytest_tests/unit_tests/test_launch/test_runner/test_vertex.py" - - # Requires google-cloud-artifact-registry which is not packaged as of 2023-04-25. - "tests/pytest_tests/unit_tests/test_launch/test_registry/test_gcp_artifact_registry.py" - - # Requires kfp which is not packaged as of 2023-04-25. - "tests/pytest_tests/system_tests/test_core/test_kfp.py" - - # Requires kubernetes_asyncio which is not packaged as of 2024-01-14. - "tests/pytest_tests/unit_tests/test_launch/test_builder/test_kaniko.py" - "tests/pytest_tests/unit_tests/test_launch/test_runner/test_kubernetes.py" - "tests/pytest_tests/unit_tests/test_launch/test_runner/test_safe_watch.py" - - # Requires metaflow which is not packaged as of 2023-04-25. - "tests/pytest_tests/unit_tests/test_metaflow.py" - - # Requires tensorflow which is broken as of 2023-09-03 - "tests/pytest_tests/unit_tests/test_keras.py" - - # Try to get hardware information, not possible in the nix build environment - "tests/pytest_tests/unit_tests/test_system_metrics/test_disk.py" - - # See https://github.com/wandb/wandb/issues/5423 - "tests/pytest_tests/unit_tests/test_docker.py" - "tests/pytest_tests/unit_tests/test_library_public.py" - - # See https://github.com/wandb/wandb/issues/6836 - "tests/pytest_tests/unit_tests_old/test_logging.py" - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - # Same as above - "tests/pytest_tests/unit_tests/test_artifacts/test_storage.py" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Same as above - "tests/pytest_tests/unit_tests/test_lib/test_filesystem.py" - ]; - disabledTests = [ - # Timing sensitive - "test_login_timeout" + # Probably failing because of lack of internet access + # AttributeError: module 'wandb.sdk.launch.registry' has no attribute 'azure_container_registry'. Did you mean: 'elastic_container_registry'? + "test_registry_from_uri" - # Tensorflow 2.13 is too old for the current version of keras - # ModuleNotFoundError: No module named 'keras.api._v2' - "test_saved_model_keras" - "test_sklearn_saved_model" - "test_pytorch_saved_model" - "test_tensorflow_keras_saved_model" + # Require docker + "test_get_requirements_section_pyproject" + "test_local_custom_env" + "test_local_custom_port" + "test_local_default" + + # Expects python binary to be named `python3` but nix provides `python3.12` + # AssertionError: assert ['python3.12', 'main.py'] == ['python3', 'main.py'] + "test_get_entrypoint" + + # Require internet access + "test_audio_refs" + "test_bind_image" + "test_check_cors_configuration" + "test_check_wandb_version" + "test_from_path_project_type" + "test_image_accepts_bounding_boxes" + "test_image_accepts_bounding_boxes_optional_args" + "test_image_accepts_masks" + "test_image_accepts_masks_without_class_labels" + "test_image_seq_to_json" + "test_max_images" + "test_media_keys_escaped_as_glob_for_publish" + "test_parse_path" + "test_parse_project_path" + "test_translates_azure_err_to_normal_err" + + # Tries to access a storage disk but there are none in the sandbox + # psutil.test_disk_out() returns None + "test_disk_in" + "test_disk_out" + + # AssertionError: assert is_available('http://localhost:9400/metrics') + "test_dcgm" + + # Error in the moviepy package: + # TypeError: must be real number, not NoneType + "test_video_numpy_mp4" ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # Disable test that fails on darwin due to issue with python3Packages.psutil: - # https://github.com/giampaolo/psutil/issues/1219 - "test_tpu_system_stats" + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # AssertionError: assert not copy2_mock.called + "test_copy_or_overwrite_changed_no_copy" + + # Fatal Python error: Aborted + "test_convert_plots" + "test_gpu_apple" + "test_image_from_matplotlib_with_image" + "test_make_plot_media_from_matplotlib_with_image" + "test_make_plot_media_from_matplotlib_without_image" + "test_matplotlib_contains_images" + "test_matplotlib_image" + "test_matplotlib_plotly_with_multiple_axes" + "test_matplotlib_to_plotly" + "test_plotly_from_matplotlib_with_image" ]; pythonImportsCheck = [ "wandb" ]; - # unmaintainable list of disabled tests - passthru.skipBulkUpdate = true; - - meta = with lib; { + meta = { description = "CLI and library for interacting with the Weights and Biases API"; homepage = "https://github.com/wandb/wandb"; changelog = "https://github.com/wandb/wandb/raw/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ samuela ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ samuela ]; + broken = gpu-stats.meta.broken || wandb-core.meta.broken; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wandb/hardcode-git-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/wandb/hardcode-git-path.patch index a0f45c04b2..bb9a5fb6ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wandb/hardcode-git-path.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/wandb/hardcode-git-path.patch @@ -1,7 +1,7 @@ -diff --git a/tests/functional_tests/t0_main/kfp/wandb_probe.py b/tests/functional_tests/t0_main/kfp/wandb_probe.py -index 82fadfe1..25c1454c 100644 ---- a/tests/functional_tests/t0_main/kfp/wandb_probe.py -+++ b/tests/functional_tests/t0_main/kfp/wandb_probe.py +diff --git a/landfill/functional_tests/kfp/wandb_probe.py b/landfill/functional_tests/kfp/wandb_probe.py +index 86b18a438..23e237e3b 100644 +--- a/landfill/functional_tests/kfp/wandb_probe.py ++++ b/landfill/functional_tests/kfp/wandb_probe.py @@ -5,7 +5,7 @@ import subprocess def wandb_probe_package(): if not os.environ.get("WB_PROBE_PACKAGE"): @@ -12,20 +12,20 @@ index 82fadfe1..25c1454c 100644 return wandb_local = f"git+https://github.com/wandb/wandb.git@{o}#egg=wandb" diff --git a/wandb/cli/cli.py b/wandb/cli/cli.py -index 5767e61c..56009fec 100644 +index 1453100cc..9dc468201 100644 --- a/wandb/cli/cli.py +++ b/wandb/cli/cli.py -@@ -1919,7 +1919,7 @@ def restore(ctx, run, no_git, branch, project, entity): +@@ -2531,7 +2531,7 @@ def restore(ctx, run, no_git, branch, project, entity): commit, json_config, patch_content, metadata = api.run_config( project, run=run, entity=entity ) - repo = metadata.get("git", {}).get("repo") + repo = metadata.get("@git@", {}).get("repo") image = metadata.get("docker") - restore_message = ( - """`wandb restore` needs to be run from the same git repository as the original run. -@@ -1938,7 +1938,7 @@ Run `git clone %s` and restore from there or pass the --no-git flag.""" - + restore_message = """`wandb restore` needs to be run from the same git repository as the original run. + Run `git clone {}` and restore from there or pass the --no-git flag.""".format(repo) +@@ -2547,7 +2547,7 @@ Run `git clone {}` and restore from there or pass the --no-git flag.""".format(r + if commit and api.git.enabled: wandb.termlog(f"Fetching origin and finding commit: {commit}") - subprocess.check_call(["git", "fetch", "--all"]) @@ -33,7 +33,7 @@ index 5767e61c..56009fec 100644 try: api.git.repo.commit(commit) except ValueError: -@@ -1992,7 +1992,7 @@ Run `git clone %s` and restore from there or pass the --no-git flag.""" +@@ -2604,7 +2604,7 @@ Run `git clone {}` and restore from there or pass the --no-git flag.""".format(r # --reject is necessary or else this fails any time a binary file # occurs in the diff exit_code = subprocess.call( @@ -42,16 +42,16 @@ index 5767e61c..56009fec 100644 ) if exit_code == 0: wandb.termlog("Applied patch") -diff --git a/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py b/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py -index 614df9f5..38db460b 100644 ---- a/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py -+++ b/wandb/vendor/graphql-core-1.1/wandb_graphql/pyutils/version.py -@@ -67,7 +67,7 @@ def get_git_changeset(): +diff --git a/wandb/vendor/promise-2.3.0/wandb_promise/pyutils/version.py b/wandb/vendor/promise-2.3.0/wandb_promise/pyutils/version.py +index 47d439145..16118feb0 100644 +--- a/wandb/vendor/promise-2.3.0/wandb_promise/pyutils/version.py ++++ b/wandb/vendor/promise-2.3.0/wandb_promise/pyutils/version.py +@@ -69,7 +69,7 @@ def get_git_changeset(): repo_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) try: git_log = subprocess.Popen( -- 'git log --pretty=format:%ct --quiet -1 HEAD', -+ '@git@ log --pretty=format:%ct --quiet -1 HEAD', - stdout=subprocess.PIPE, stderr=subprocess.PIPE, - shell=True, cwd=repo_dir, universal_newlines=True, - ) +- "git log --pretty=format:%ct --quiet -1 HEAD", ++ "@git@ log --pretty=format:%ct --quiet -1 HEAD", + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + shell=True, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weasel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weasel/default.nix index bf01bbf033..ab2f3c730e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/weasel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/weasel/default.nix @@ -1,33 +1,36 @@ { lib, buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies cloudpathlib, confection, - fetchFromGitHub, packaging, pydantic, - pytestCheckHook, - pythonOlder, requests, - setuptools, smart-open, srsly, typer, wasabi, + + # tests + pytestCheckHook, }: buildPythonPackage rec { pname = "weasel"; - version = "0.3.4"; + version = "0.4.1"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "explosion"; repo = "weasel"; rev = "refs/tags/v${version}"; - hash = "sha256-6Ck8R10/YW2Nc6acNk2bzgyqSg+OPqwyJjhUgXP/umw="; + hash = "sha256-gXPHEoEY0qKcpAtqHlUw5c43/6hKseCx+vBNzEXFF2A="; }; pythonRelaxDeps = [ @@ -36,11 +39,11 @@ buildPythonPackage rec { "typer" ]; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cloudpathlib confection packaging @@ -54,19 +57,23 @@ buildPythonPackage rec { pythonImportsCheck = [ "weasel" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; disabledTests = [ # This test requires internet access "test_project_assets" + "test_project_git_dir_asset" + "test_project_git_file_asset" ]; - meta = with lib; { + meta = { description = "Small and easy workflow system"; mainProgram = "weasel"; homepage = "https://github.com/explosion/weasel/"; changelog = "https://github.com/explosion/weasel/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/websockets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/websockets/default.nix index 907024735a..918cb54ae5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/websockets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/websockets/default.nix @@ -24,26 +24,31 @@ buildPythonPackage rec { nativeBuildInputs = [ 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/third_party/nixpkgs/pkgs/development/python-modules/willow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/willow/default.nix index 83b4469476..367a615f9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/willow/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/world-bank-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/world-bank-data/default.nix new file mode 100644 index 0000000000..b5d02b034b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/world-bank-data/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + cachetools, + pandas, + requests, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "world-bank-data"; + version = "0.1.4"; + pyproject = true; + + src = fetchPypi { + pname = "world_bank_data"; + inherit version; + hash = "sha256-UidtJovurzrZKWeI7n1bV0vluc5pSg92zKFELvZE9fw="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + cachetools + pandas + requests + ]; + + # Tests require a HTTP connection + doCheck = false; + + pythonImportsCheck = [ + "world_bank_data" + ]; + + meta = { + description = "World Bank Data API in Python"; + homepage = "https://github.com/mwouts/world_bank_data"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ itepastra ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wxpython/0001-add-missing-bool-c.patch b/third_party/nixpkgs/pkgs/development/python-modules/wxpython/0001-add-missing-bool-c.patch new file mode 100644 index 0000000000..3a12611b5b --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/wxpython/4.2.nix b/third_party/nixpkgs/pkgs/development/python-modules/wxpython/4.2.nix index 6f313206c4..09cf9684c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wxpython/4.2.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/xapian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xapian/default.nix index 382b672932..fea907243d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xapian/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/xdis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xdis/default.nix index 9a17ffa465..ce66720f17 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xdis/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/xdot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xdot/default.nix index 8cd817ea1c..944b9f4619 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xdot/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/xrootd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xrootd/default.nix index 33b42f9f0f..65d874d73c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xrootd/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/yaramod/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yaramod/default.nix index 78589108f7..3bf6ba1b75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yaramod/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix index b49e0e4cbd..36a3815518 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/youseedee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/youseedee/default.nix index a5f45c10cb..afecf5a932 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/youseedee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/youseedee/default.nix @@ -32,7 +32,6 @@ buildPythonPackage rec { requests ]; - doCheck = true; # Package has no unit tests, but we can check an example as per README.rst: checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeversolar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeversolar/default.nix new file mode 100644 index 0000000000..5a28927a3e --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/zipfile2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zipfile2/default.nix index 2d611e912c..68b1af2e79 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zipfile2/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/r-modules/default.nix b/third_party/nixpkgs/pkgs/development/r-modules/default.nix index d17cf99414..708192d930 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/default.nix +++ b/third_party/nixpkgs/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 ]; @@ -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: { diff --git a/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/README.md b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/README.md new file mode 100644 index 0000000000..c65310524c --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/bwidget/default.nix b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/bw/bwidget/package.nix similarity index 91% rename from third_party/nixpkgs/pkgs/development/libraries/bwidget/default.nix rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/bw/bwidget/package.nix index 8a408864c5..161324f9e6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bwidget/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/expect/0004-enable-cross-compilation.patch b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/ex/expect/0004-enable-cross-compilation.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/misc/expect/0004-enable-cross-compilation.patch rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/ex/expect/0004-enable-cross-compilation.patch diff --git a/third_party/nixpkgs/pkgs/tools/misc/expect/fix-build-time-run-tcl.patch b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/ex/expect/fix-build-time-run-tcl.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/misc/expect/fix-build-time-run-tcl.patch rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/ex/expect/fix-build-time-run-tcl.patch diff --git a/third_party/nixpkgs/pkgs/tools/misc/expect/fix-darwin-bsd-clang16.patch b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/ex/expect/fix-darwin-bsd-clang16.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/misc/expect/fix-darwin-bsd-clang16.patch rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/ex/expect/fix-darwin-bsd-clang16.patch diff --git a/third_party/nixpkgs/pkgs/tools/misc/expect/freebsd-unversioned.patch b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/ex/expect/freebsd-unversioned.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/misc/expect/freebsd-unversioned.patch rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/ex/expect/freebsd-unversioned.patch diff --git a/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/ex/expect/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/tools/misc/expect/default.nix rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/ex/expect/package.nix diff --git a/third_party/nixpkgs/pkgs/development/libraries/incrtcl/default.nix b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/in/incrtcl/package.nix similarity index 92% rename from third_party/nixpkgs/pkgs/development/libraries/incrtcl/default.nix rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/in/incrtcl/package.nix index 4558ebbd0d..7b1397ac1b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/incrtcl/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/itktcl/default.nix b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/it/itktcl/package.nix similarity index 92% rename from third_party/nixpkgs/pkgs/development/libraries/itktcl/default.nix rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/it/itktcl/package.nix index b6a4788075..aefefa8c3c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/itktcl/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/mustache-tcl/default.nix b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/mu/mustache-tcl/package.nix similarity index 90% rename from third_party/nixpkgs/pkgs/development/libraries/mustache-tcl/default.nix rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/mu/mustache-tcl/package.nix index 063c8ea36f..5281f40a78 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mustache-tcl/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pd/pdf4tcl/package.nix b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/pd/pdf4tcl/package.nix similarity index 93% rename from third_party/nixpkgs/pkgs/by-name/pd/pdf4tcl/package.nix rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/pd/pdf4tcl/package.nix index 94ba20ebd7..07d059c042 100644 --- a/third_party/nixpkgs/pkgs/by-name/pd/pdf4tcl/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/tcl-fcgi/default.nix b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/tc/tcl-fcgi/package.nix similarity index 90% rename from third_party/nixpkgs/pkgs/development/libraries/tcl-fcgi/default.nix rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/tc/tcl-fcgi/package.nix index 5451c5186a..49d23ddd9a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tcl-fcgi/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/tc/tclcurl/package.nix b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/tc/tclcurl/package.nix similarity index 94% rename from third_party/nixpkgs/pkgs/by-name/tc/tclcurl/package.nix rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/tc/tclcurl/package.nix index 2bcfef25a3..9e967de825 100644 --- a/third_party/nixpkgs/pkgs/by-name/tc/tclcurl/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/tcllib/default.nix b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/tc/tcllib/package.nix similarity index 93% rename from third_party/nixpkgs/pkgs/development/libraries/tcllib/default.nix rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/tc/tcllib/package.nix index a5bfba8b05..8ec83df8b6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tcllib/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/tc/tclmagick/package.nix b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/tc/tclmagick/package.nix similarity index 94% rename from third_party/nixpkgs/pkgs/by-name/tc/tclmagick/package.nix rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/tc/tclmagick/package.nix index f5d0bc4b15..ad688ec56d 100644 --- a/third_party/nixpkgs/pkgs/by-name/tc/tclmagick/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/tclreadline/default.nix b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/tc/tclreadline/package.nix similarity index 91% rename from third_party/nixpkgs/pkgs/development/interpreters/tclreadline/default.nix rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/tc/tclreadline/package.nix index de5f317450..62880ee532 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/tclreadline/default.nix +++ b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/tc/tclreadline/package.nix @@ -4,19 +4,19 @@ , autoconf , libtool , readline -, tcl +, mkTclDerivation , tk }: -tcl.mkTclDerivation rec { +mkTclDerivation rec { pname = "tclreadline"; - version = "2.3.8"; + version = "2.4.0"; src = fetchFromGitHub { owner = "flightaware"; repo = "tclreadline"; rev = "v${version}"; - sha256 = "18jl56p0hwgynxpvr0v7b5mvvzc1m64fn61c0957bgb45mc250yq"; + sha256 = "sha256-rB2bR0yu/ZFf/WOgo1LeLmciaQA42/LulnqSczmzea8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/tcltls/default.nix b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/tc/tcltls/package.nix similarity index 89% rename from third_party/nixpkgs/pkgs/development/libraries/tcltls/default.nix rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/tc/tcltls/package.nix index dbc095b64e..cb32bf4a7b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tcltls/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/tc/tcludp/package.nix b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/tc/tcludp/package.nix similarity index 95% rename from third_party/nixpkgs/pkgs/by-name/tc/tcludp/package.nix rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/tc/tcludp/package.nix index 890b0d4366..073a93432f 100644 --- a/third_party/nixpkgs/pkgs/by-name/tc/tcludp/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/tc/tclvfs/package.nix b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/tc/tclvfs/package.nix similarity index 95% rename from third_party/nixpkgs/pkgs/by-name/tc/tclvfs/package.nix rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/tc/tclvfs/package.nix index 9ac69b5bb1..0fde102cc2 100644 --- a/third_party/nixpkgs/pkgs/by-name/tc/tclvfs/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/tclx/default.nix b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/tc/tclx/package.nix similarity index 94% rename from third_party/nixpkgs/pkgs/development/libraries/tclx/default.nix rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/tc/tclx/package.nix index 5e3a73febe..8ed3bb6f59 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tclx/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/td/tdom/package.nix b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/td/tdom/package.nix similarity index 94% rename from third_party/nixpkgs/pkgs/by-name/td/tdom/package.nix rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/td/tdom/package.nix index a9b96c8d94..38ac7acfbc 100644 --- a/third_party/nixpkgs/pkgs/by-name/td/tdom/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/tix/duplicated-xlowerwindow.patch b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/ti/tix/duplicated-xlowerwindow.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/tix/duplicated-xlowerwindow.patch rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/ti/tix/duplicated-xlowerwindow.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/tix/fix-clang16.patch b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/ti/tix/fix-clang16.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/tix/fix-clang16.patch rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/ti/tix/fix-clang16.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/tix/default.nix b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/ti/tix/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/tix/default.nix rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/ti/tix/package.nix diff --git a/third_party/nixpkgs/pkgs/development/libraries/tkimg/default.nix b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/libraries/tkimg/default.nix rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/tk/tkimg/package.nix diff --git a/third_party/nixpkgs/pkgs/development/libraries/wapp/default.nix b/third_party/nixpkgs/pkgs/development/tcl-modules/by-name/wa/wapp/package.nix similarity index 93% rename from third_party/nixpkgs/pkgs/development/libraries/wapp/default.nix rename to third_party/nixpkgs/pkgs/development/tcl-modules/by-name/wa/wapp/package.nix index 9543b49af3..fc7e14205f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wapp/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/critcl/default.nix b/third_party/nixpkgs/pkgs/development/tcl-modules/critcl/default.nix similarity index 95% rename from third_party/nixpkgs/pkgs/development/compilers/critcl/default.nix rename to third_party/nixpkgs/pkgs/development/tcl-modules/critcl/default.nix index 5caf63d9db..4dda4292eb 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/critcl/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix index f769ac1b28..7aa3f922e2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/hotspot/default.nix @@ -7,7 +7,6 @@ , wrapQtAppsHook , elfutils , fetchFromGitHub -, fetchpatch , kconfigwidgets , kddockwidgets , ki18n @@ -28,25 +27,16 @@ stdenv.mkDerivation rec { pname = "hotspot"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "KDAB"; repo = "hotspot"; rev = "refs/tags/v${version}"; - hash = "sha256-FJkDPWqNwoWg/15tvMnwke7PVtWVuqT0gtJBFQE0qZ4="; + hash = "sha256-O2wp19scyHIwIY2AzKmPmorGXDH249/OhSg+KtzOYhI="; fetchSubmodules = true; }; - patches = [ - # Backport stuck UI bug fix - # FIXME: remove in next update - (fetchpatch { - url = "https://github.com/KDAB/hotspot/commit/7639dee8617dba9b88182c7ff4887e8d3714ac98.patch"; - hash = "sha256-aAo9uEy+MBztMhnC5jB08moZBeRCENU22R39pqSBXOY="; - }) - ]; - nativeBuildInputs = [ cmake extra-cmake-modules diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix index 61510384e3..52800a8694 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix @@ -180,8 +180,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; }; @@ -198,9 +198,10 @@ rec { }; 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 +227,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/third_party/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix index 3576b67208..b500d7d9cc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gup/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix index 4ca4dcd04f..c7b602ccda 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/default.nix index ebf6b0fcea..07b18f6923 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/default.nix @@ -5,15 +5,7 @@ }: # Take packages from self first, then python.pkgs (and secondarily pkgs) lib.makeScope (self: newScope (self.python.pkgs // self)) (self: { - python = python3.override { - self = self.python; - packageOverrides = self: super: { - moto = super.moto.overridePythonAttrs (oldAttrs: { - # a lot of tests -> very slow, we already build them when building python packages - doCheck = false; - }); - }; - }; + python = python3; buildbot-pkg = self.callPackage ./pkg.nix { }; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/master.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/master.nix index 915453cdcc..965bb2e936 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -156,7 +156,7 @@ buildPythonApplication rec { ''; passthru = { - inherit withPlugins; + inherit withPlugins python; updateScript = ./update.sh; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { tests = { diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix index 42aa1e5ab7..792e71dd7f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix index cbd3fbcc02..3f3cbad388 100644 --- a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "coursier"; - version = "2.1.13"; + version = "2.1.14"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - hash = "sha256-AGHpJaKhu9/rzWPfNWzJPdp/jpQOm28BGAcXuwyNNxE="; + hash = "sha256-yAWU0ruaNAlYTPujPOjmoXgH0iVmYnZeIqn3+fN2P60="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/crd2pulumi/default.nix b/third_party/nixpkgs/pkgs/development/tools/crd2pulumi/default.nix index 66ab82d175..0dca4f1388 100644 --- a/third_party/nixpkgs/pkgs/development/tools/crd2pulumi/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/database/sqlc/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlc/default.nix deleted file mode 100644 index 4ec22b7dfc..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix index c68e1e00fc..23208b1414 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix index 8e274ee1b5..2397da1f26 100644 --- a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.115.0"; + version = "1.116.0"; vendorHash = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-Q/1AkP+KWomloe/kVtR0TUDfOf9CVldDqeLFYsBisc4="; + sha256 = "sha256-yUgOHkQfsl1FgkOQirbEKzyrPcjs/k2H0P3jx3LHaiU="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/common.nix b/third_party/nixpkgs/pkgs/development/tools/electron/common.nix index e98e93a0a1..15675c7d87 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/common.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/common.nix @@ -180,6 +180,8 @@ in ((chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { enable_dangling_raw_ptr_feature_flag = false; clang_unsafe_buffers_paths = ""; enterprise_cloud_content_analysis = false; + } // lib.optionalAttrs (lib.versionAtLeast info.version "33") { + content_enable_legacy_ipc = true; } // { # other diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/info.json b/third_party/nixpkgs/pkgs/development/tools/electron/info.json index 2cd3361e03..046de00cf3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/info.json +++ b/third_party/nixpkgs/pkgs/development/tools/electron/info.json @@ -2797,5 +2797,958 @@ "modules": "128", "node": "20.18.0", "version": "32.2.1" + }, + "33": { + "chrome": "130.0.6723.44", + "chromium": { + "deps": { + "gn": { + "hash": "sha256-iNXRq3Mr8+wmY1SR4sV7yd2fDiIZ94eReelwFI0UhGU=", + "rev": "20806f79c6b4ba295274e3a589d85db41a02fdaa", + "url": "https://gn.googlesource.com/gn", + "version": "2024-09-09" + } + }, + "version": "130.0.6723.44" + }, + "chromium_npm_hash": "sha256-4w5m/bTMygidlb4TZHMx1Obp784DLxMwrfe1Uvyyfp8=", + "deps": { + "src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-zCyzVI6qbI1qTT0QBpVxLgNF5+L/Ym8WF6175/hv9k0=", + "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", + "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-XK22S9WwNN4zQZ5teiQ1sZA5m/8rArwq3jCgM6H9KQY=", + "rev": "052e29447b43b18da32fff653b9d58ef79fbc836", + "url": "https://chromium.googlesource.com/website.git" + }, + "src/electron": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-8Y6jzjaLseSR4JPurofSG8Bs0m7wJucn4cwIc+z89sM=", + "owner": "electron", + "repo": "electron", + "rev": "v33.0.0" + }, + "src/media/cdm/api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", + "rev": "eb21edc44e8e5a82095037be80c8b15c51624293", + "url": "https://chromium.googlesource.com/chromium/cdm.git" + }, + "src/net/third_party/quiche/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-NJKJ5cc+wEcmCIFYXWQX4x9BZblbS+wqj+25CcUiPZM=", + "rev": "9808dac40e034f09d7af53d3d79589a02e39c211", + "url": "https://quiche.googlesource.com/quiche.git" + }, + "src/testing/libfuzzer/fuzzers/wasm_corpus": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qWsGQNUptbz0jYvUuxP7woNf5QQrfn9k3uvr82Yk0QM=", + "rev": "f650ff816f2ef227f61ea2e9f222aa69708ab367", + "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.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-B/xH9kMuOcExMyp5wtk/CeJtUogmnwmMpfaTDpE3pio=", + "rev": "3cabe8c25ad30b0761ee74bc4d9f455cb5ba84c7", + "url": "https://chromium.googlesource.com/angle/angle.git" + }, + "src/third_party/angle/third_party/VK-GL-CTS/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yPQG/Ddat9H4XZq6Zu5S3VzcZeMhLBcM//KI/3Kxaxg=", + "rev": "1df39e522f4aa358012180fd4cf876af68aff78d", + "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-PMB49+zW9ewlS9ym+xi0xYQYLN0j5Urx6yBXWd8FjjI=", + "rev": "6ea6ec78f9e4998d0a7a5677b2aec08f0ac858f8", + "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git" + }, + "src/third_party/beto-core/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-QPFGjtu/I0r4+dTQ2eSlWIEYwJ43B3yW0q4QtVFTVGY=", + "rev": "89563fec14c756482afa08b016eeba9087c8d1e3", + "url": "https://beto-core.googlesource.com/beto-core.git" + }, + "src/third_party/boringssl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-on+VonYXZ710oqgaK/OKa9Huq2mSXp8SJcj9CciHsf8=", + "rev": "58f3bc83230d2958bb9710bc910972c4f5d382dc", + "url": "https://boringssl.googlesource.com/boringssl.git" + }, + "src/third_party/breakpad/breakpad": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kTkwRfaqw5ZCHEvu2YPZ+1vCfekHkY5pY3m9snDN64g=", + "rev": "6b0c5b7ee1988a14a4af94564e8ae8bba8a94374", + "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-IHubCuEBE9W0wRudOmjUoaOvT66JuVTzEBUOTvdnXqQ=", + "rev": "296226a4a0067c8cffeb8831fb87526a8035f3cc", + "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-DR5rJdnDKunS/PHtVK1n4zk0MmK54LhlawZW74711LY=", + "rev": "6aa57f2c6b49402b55ec607c17bd7ee8946970b0", + "url": "https://chromium.googlesource.com/chromium-variations.git" + }, + "src/third_party/clang-format/script": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-whD8isX2ZhLrFzdxHhFP1S/sZDRgyrzLFaVd7OEFqYo=", + "rev": "3c0acd2d4e73dd911309d9e970ba09d58bf23a62", + "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-UKy9TIiO/UJ5w+qLRlMd085CX2qtdVH2W3rtxB5r6MY=", + "rev": "ca678952a9a8eaa6de112d154e8e104b22f9ab3f", + "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" + }, + "src/third_party/crabbyavif/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9ooMkYOHRYbV2kdxu8VWUNgBeBsrN4kWUb8cZJwZfiU=", + "rev": "adfb834d76c6a064f28bb3a694689fc14a42425e", + "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git" + }, + "src/third_party/crc32c/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-KBraGaO5LmmPP+p8RuDogGldbTWdNDK+WzF4Q09keuE=", + "rev": "d3d60ac6e0f16780bcfcc825385e1d338801a558", + "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git" + }, + "src/third_party/cros-components/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gEhAwW6u8VgBRFmAddRBlosbf/a9lhRLgs70Dvh1zos=", + "rev": "08a6ca6559c8d07c79fb5576a44e016e3126c221", + "url": "https://chromium.googlesource.com/external/google3/cros_components.git" + }, + "src/third_party/cros_system_api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9rM9m6VRX7B+h9JiICN5O9rBYdQEHNlCUnQMuaTy/1s=", + "rev": "2f88f9c4581a9c854604fa23516de8c9c13b227b", + "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git" + }, + "src/third_party/crossbench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-7IuhXuxXD3xBkgazg3B9GZknlNv8Xi0eTHkeQv63ayk=", + "rev": "2b812597dd143dbdc560ff2f28d5f8d3adc700d4", + "url": "https://chromium.googlesource.com/crossbench.git" + }, + "src/third_party/dav1d/libdav1d": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qJSUt8gMFB+IhOnEAw3t6nj1y7XUY91pLQBF8CeYtas=", + "rev": "6b3c489a2ee2c030f351f21987c27611b4cbe725", + "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" + }, + "src/third_party/dawn": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-jc08+1u7+znDkzlQ7vDh85J+iAaEL3Av42SeOtKw0hU=", + "rev": "b1d26bc8d238d4759b5e62aaaa1f62048f92e254", + "url": "https://dawn.googlesource.com/dawn.git" + }, + "src/third_party/dawn/third_party/dxc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-CrR08tw9e+4U+fa6E9xoP/4puPNHEjLrxtSju8psLlk=", + "rev": "05334a70d3e5355fc86c94bb4e3cfe1c31a65999", + "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-E1zXIDiw87badrLOZTvV+Wh9NZHu51nb70ZK9vlAlqE=", + "rev": "b35641f4a3c62aa86a0b3c983d163bc0fe36026d", + "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-heIL8hhaVr0uRi2lD+7RFltggVFW48ZY9Tdl0yVRdac=", + "rev": "a5065e398d2430c83e17ef9cbad6eae31d1efa8f", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts" + }, + "src/third_party/dawn/third_party/webgpu-headers": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-J3PcwYoO79HqrACFgk77BZLTCi7oi5k2J6v3wlcFVD4=", + "rev": "8049c324dc7b3c09dc96ea04cb02860f272c8686", + "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers" + }, + "src/third_party/depot_tools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-C8U5BFLBCorwHvfKvh1xmAzOaDcBAbe3GhwJebENZD4=", + "rev": "22df6f8e622dc3e8df8dc8b5d3e3503b169af78e", + "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" + }, + "src/third_party/devtools-frontend/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GUpeszdPsCfN+RSg6vRTyfxwD0/TEtWmBEIcIUwYhBg=", + "rev": "88446977cb017f143f1ff6963d384b05a4414f54", + "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/domato/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-fYxoA0fxKe9U23j+Jp0MWj4m7RfsRpM0XjF6/yOhX1I=", + "rev": "053714bccbda79cf76dac3fee48ab2b27f21925e", + "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git" + }, + "src/third_party/eigen3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-U4SMReXTFZg7YGyefI6MXIB66nt5OiANMH0HUyr/xIc=", + "rev": "134b526d6110061469168e7e0511822a8e30bcaf", + "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" + }, + "src/third_party/electron_node": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-gm0mJNq6RVWfSsy7vxz44zz0OKjoH50APKOkOnI+Is8=", + "owner": "nodejs", + "repo": "node", + "rev": "v20.18.0" + }, + "src/third_party/emoji-segmenter/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-sI6UgXTWxXJajB2h2LH3caf7cqRbBshD5GoLocrUivk=", + "rev": "6b8f235b72deba7d6ef113631129b274c14941ef", + "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-Iwu9+i/0vsPyu6pOWFxjNNblVxMl6bTPW5eWyaju4Mg=", + "rev": "624da0f593bb8d7e146b9f42b06d8e6c80d032a3", + "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/fast_float/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0eVovauN7SnO3nSIWBRWAJ4dR7q5beZrIGUZ18M2pao=", + "rev": "3e57d8dcfb0a04b5a8a26b486b54490a2e9b310f", + "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git" + }, + "src/third_party/ffmpeg": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-HnpWlSfXxa951UkFgL/2zKoaBeveuVkTZz/iqYXjkH8=", + "rev": "91903c28af60a732a051c343b496e1188eec9b05", + "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-tbc45o0MbMvK5XqRUJt5Eg8BU6+TJqlmwFgQhHq6wRM=", + "rev": "8db59321d9f02cdffa30126654059c7d02f70c32", + "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-w5Zd4yvGoMQ0BmDGa2b9gK/+7f+UaZDRYqEdMGH/zKg=", + "rev": "83af801b552111e37d9466a887e1783a0fb5f196", + "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" + }, + "src/third_party/fuzztest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-g+iJrywURQfdYpco26VN+OlhZkVcFzmAK18C7W7/WLU=", + "rev": "a29e31cb00ec9b123dec5a0c6b8d4bc12c2480c8", + "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/glslang/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6lVjQb8FOyGmRGEcNDzL55s/9bcDY3jIz4Xm3BK3GoI=", + "rev": "dc1012140e015d43711514d1294ac6f626890a40", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" + }, + "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-jccFUondvjWgCBC3oCLUXqtLV07pkEq8IEZ+FLu1MrE=", + "rev": "0953a17a4281fc26831da647ad3fcd5e21e6473b", + "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-iR49rfGDKxPObCff1/30hYHpP5FpZ28ROgMZhNk9eFY=", + "rev": "1da053e87f0487382404656edca98b85fe51f2fd", + "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" + }, + "src/third_party/highway/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-PXsXIqWB4NNiFhanRjMIFSWYuW/IRuQo8mMPUBEentY=", + "rev": "8295336dd70f1201d42c22ab5b0861de38cf8fbf", + "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-YlX+PaPhvYh9JzHT9WtS1beUK+cQrHGVUl+IBbv7GeQ=", + "rev": "9408c6fd4a39e6fef0e1c4077602e1c83b15f3fb", + "url": "https://chromium.googlesource.com/chromium/deps/icu.git" + }, + "src/third_party/instrumented_libs": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kHKGADAgzlaeckXFbpU1GhJK+zkiRd9XvdtPF6qrQFY=", + "rev": "bb6dbcf2df7a9beb34c3773ef4df161800e3aed9", + "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.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-y3awFXL8ih2UhEqWj8JRgkhzSxfQciLztb020JHJ350=", + "rev": "23e35d792b9154f922b8b575b12596a4d8664c65", + "url": "https://chromium.googlesource.com/external/leveldb.git" + }, + "src/third_party/libFuzzer/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xQXfRIcQmAVP0k2mT7Blv1wBxL6wDaWTbIPGcTiMZRo=", + "rev": "487e79376394754705984c5de7c4ce7f82f2bd7c", + "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-uFUIodoC9qpLycwtWRgc0iqaqcUsvVmwAAQGHKolWto=", + "rev": "d5265b173616ce62de231cd1b1eae853ad03641e", + "url": "https://aomedia.googlesource.com/aom.git" + }, + "src/third_party/libavif/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2GKqPgWs1TD0nPW7VoSo8dz3ugPsZhcy2K1V35XflSk=", + "rev": "c2177c3316a49505dcd592ba21073f7abc25cd37", + "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git" + }, + "src/third_party/libavifinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-61OPjdMCIbHvWncmBzNw6sqlHcuc1kyqm9k1j4UTcZ0=", + "rev": "8d8b58a3f517ef8d1794baa28ca6ae7d19f65514", + "url": "https://aomedia.googlesource.com/libavifinfo.git" + }, + "src/third_party/libc++/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hKlmY2Bn1f6w0Gmx/Le/LwWk/Gf6hzXqR5C+/w+0CNA=", + "rev": "50ab693ecb611942ce4440d8c9ed707ee65ed5e8", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" + }, + "src/third_party/libc++abi/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GtK8z2jn4es3uuxpAgm5AoQvUjvhAunAyUwm3HEqLVA=", + "rev": "29b2e9a0f48688da116692cb04758393053d269c", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" + }, + "src/third_party/libdrm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-woSYEDUfcEBpYOYnli13wLMt754A7KnUbmTEcFQdFGw=", + "rev": "ad78bb591d02162d3b90890aa4d0a238b2a37cde", + "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git" + }, + "src/third_party/libgav1/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+ss9S5t+yoHzqbtX68+5OyyUbJVecYLwp+C3EXfAziE=", + "rev": "a2f139e9123bdb5edf7707ac6f1b73b3aa5038dd", + "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-qgHXAjCDFxQ+QqJ8pSmI1NUvHvKKTi4MkIe1I/+hUAI=", + "rev": "927aabfcd26897abb9776ecf2a6c38ea5bb52ab6", + "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-4qEZ9MD97MoqCUlZtbEhIKy+fDO1iIWqyrBsKwkjXTg=", + "rev": "000edd791434c8738455f10e0dd6b268a4852c0b", + "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-5xsrVVSu9b+78GEKeLGNpo7ySxrJ2SeuuKghN6NHlSU=", + "rev": "dc70138c3e68e2f946585f134e20815851e26263", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" + }, + "src/third_party/libvpx/source/libvpx": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-fXEPPgUdTsvzbLc8mp7v0MWw/9FfOooIIKjRshvYi2o=", + "rev": "fbf63dff1f528d44f24bd662abb89fd01a4a1c25", + "url": "https://chromium.googlesource.com/webm/libvpx.git" + }, + "src/third_party/libwebm/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Mn3snC2g4BDKBJsS6cxT3BZL7LZknOWg77+60Nr4Hy0=", + "rev": "26d9f667170dc75e8d759a997bb61c64dec42dda", + "url": "https://chromium.googlesource.com/webm/libwebm.git" + }, + "src/third_party/libwebp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xuRpEwOnaLGZmrPvfUn3DSoJANd94CG+JXcN7Mdmk5I=", + "rev": "845d5476a866141ba35ac133f856fa62f0b7445f", + "url": "https://chromium.googlesource.com/webm/libwebp.git" + }, + "src/third_party/libyuv": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-tQ7eCY1udoGHRoFr83obQ994IMfxqaH68StvXJ6obZ8=", + "rev": "4620f1705822fd6ab99939f43ce63099bd3d9ae0", + "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-RZsdeT1gkbrOuHvngs+Iavl9YE27jLx4AXXYOvSXZoI=", + "rev": "3c8737f92d765407e4ff6c87b8758ba99ede40ed", + "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-S7dS2IZwt4p4ZrF6K7E5HnwKuI3owU2I7vwtu95uTkE=", + "rev": "478e5ab3eca30e600006d5a0a08b176fd34d3bd1", + "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264" + }, + "src/third_party/openscreen/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-y2XOZ3CmGdI0S/DLnOwAhm0kGTf/ayJ6OwPVlQCQqBw=", + "rev": "b720e33d337c68353e5d80a72491fb438f27d93a", + "url": "https://chromium.googlesource.com/openscreen" + }, + "src/third_party/openscreen/src/buildtools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-suuxUL//BfAMmG8os8ChI7ic9EjGTi7y5kjxiAyrEQc=", + "rev": "4e0e9c73a0f26735f034f09a9cab2a5c0178536b", + "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-znfeKj2ttFWalFPeP9o8NPYLHD+pWAKuWVudX59MhLw=", + "rev": "2b675cf15ab4b68bf1ed4e0511ba2479e11f1605", + "url": "https://pdfium.googlesource.com/pdfium.git" + }, + "src/third_party/perfetto": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ej8yXGOlmqwnWBbKR99qtIn3MvImaqV5ResVp95zdcM=", + "rev": "9170899ab284db894f14439e561f02f83a04d88e", + "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-rGg6lgLkmbYo+a9CdaXz9ZUyrqJ1rxLcjLJeBEOPAlE=", + "rev": "560c60d342a76076f0557a3946924c6478470044", + "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-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=", + "rev": "6dcd83d60f7944926bfd308cc13979fc53dd69ca", + "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" + }, + "src/third_party/ruy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4NVvqUZn2BdwTxJINTHwPeRqbGXZrWdcd7jv1Y+eoKY=", + "rev": "c08ec529fc91722bde519628d9449258082eb847", + "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-u/K96HEBcx1sge4wSf3m4xDkZEoFaxekHafgmC4rjVQ=", + "rev": "3c64459d5df2fa9794b277f0959ed8a92552bf4c", + "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/spirv-cross/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=", + "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" + }, + "src/third_party/spirv-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-o1yRTvP7a+XVwendTKBJKNnelVGWLD0gH258GGeUDhQ=", + "rev": "2a9b6f951c7d6b04b6c21fe1bf3f475b68b84801", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" + }, + "src/third_party/spirv-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-13y7Z6wMeAmV2dgMepgQPB+c+Pjc2O3C2G0kdlBVsNE=", + "rev": "37d2fcb485bf3fcadb18ef90aab6f283dcc4be72", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" + }, + "src/third_party/sqlite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ltl3OTk/wZPSj3yYthNlKd3mBxef6l5uW6UYTwebNek=", + "rev": "567495a62a62dc013888500526e82837d727fe01", + "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-U29q1G3gnJdoucdLGZEbwpkGpDE4C2lv2b5WqpUf2Ho=", + "rev": "2afc8c97882a5c66abf5f26670ae420d2e30adc3", + "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-HtvrZur/vifocB/TKLDkzTLjFbGee4xGUhRLShozo9M=", + "rev": "d29299c16ec49623af1294900dba53fc8864f0bb", + "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-U8iB5HlLHzpeBJjd9XODWONDy7GTfNbM2kjGBIAhabU=", + "rev": "c045c2192ab45a144b419033dffe6190be5d8c93", + "url": "https://chromium.googlesource.com/vulkan-deps" + }, + "src/third_party/vulkan-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-8q6uu3v7j7poTMkn0oxj+RewIqhjCOuBz/QG/oFnWBI=", + "rev": "c6391a7b8cd57e79ce6b6c832c8e3043c4d9967b", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" + }, + "src/third_party/vulkan-loader/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-dA9yc8nv8HDF8WA7bSReqI2JtUU41/Xl4J/CQlq0nuU=", + "rev": "1108bba6c97174d172d45470a7470a3d6a564647", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader" + }, + "src/third_party/vulkan-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-eEJ9S1/fF5WMT+fRq+ZTzRfb+gxDA8drK8uwPVrFoNc=", + "rev": "4c63e845962ff3b197855f3ae4907a47d0863f5a", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" + }, + "src/third_party/vulkan-utility-libraries/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4jK6OQT5Za46HixUe1kOay2NlTYtf9OHkbZrZ0y6pdI=", + "rev": "ea5774a13e3017b6d5d79af6fba9f0d72ca5c61a", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries" + }, + "src/third_party/vulkan-validation-layers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-vwd7n30odVW/Q39lIiVuhyWhnm20giEHlzP14ONXyuw=", + "rev": "ef846ac0883cde5e69ced0e7d7af59fe92f34e25", + "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-o/adWEXYSqWib6KoK7XMCWbojapcS4O/CEPxv7iFCw8=", + "rev": "7d5a3a8b494ae44cd9651f9505e88a250082765e", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git" + }, + "src/third_party/wayland/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oK0Z8xO2ILuySGZS0m37ZF0MOyle2l8AXb0/6wai0/w=", + "rev": "a156431ea66fe67d69c9fbba8a8ad34dabbab81c", + "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-Yn0e1bpvtD4mGdZaRiBytc+upLulYVyHJqXJiTWEfmA=", + "rev": "1b6371436a0a60e6b9a4ae2a40a8eba198e3af02", + "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git" + }, + "src/third_party/webgpu-cts/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3ruYKYHOkqlJcrjl4xvQV+OtULbgNUvXGBfrd5WTGyY=", + "rev": "2f55512456a725e77f3baac3d951de5c6c5e28a3", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git" + }, + "src/third_party/webrtc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4URlxWupNm67GeUGLJe3Dz1IONIq1mCjG5Lf4csKFKo=", + "rev": "28b793b4dd275bf2b901b87e01c0ee8d4f5732fc", + "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-VBrBNjoF3hsRXpBfXP2g9xOujVsmm7AkV6wE4ZwW2ts=", + "rev": "c4a28daf28c98300da9d9b5213c53f762908825e", + "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" + }, + "src/third_party/zstd/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-/IUfh0De9m7ACrisqKlpxZsb+asoAWGXCaK6L+s24Q8=", + "rev": "20707e3718ee14250fb8a44b3bf023ea36bd88df", + "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-D2txyy9f/dNIL0b2qL0YM9/DMUfO9jkWiWZZFNyP2ys=", + "rev": "4c685866b13f6ec453f327f0499379672e5b1751", + "url": "https://chromium.googlesource.com/v8/v8.git" + } + }, + "electron_yarn_hash": "0x3hk02diq4ss2405m44r4nb144h213vqr5hr4gmy04p6drk76qv", + "modules": "130", + "node": "20.18.0", + "version": "33.0.0" } } diff --git a/third_party/nixpkgs/pkgs/development/tools/extism-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/extism-cli/default.nix index 5923c9d58d..36bdd4557d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/extism-cli/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/faas-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/faas-cli/default.nix index d9cd2d0cbb..f730b150e5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/faas-cli/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/gauge/default.nix b/third_party/nixpkgs/pkgs/development/tools/gauge/default.nix index 7a46966e90..88b740fb6c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gauge/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/dotnet/data.json b/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/dotnet/data.json index 19d228a955..3e3aac11ed 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gauge/plugins/dotnet/data.json +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/gemstash/Gemfile.lock b/third_party/nixpkgs/pkgs/development/tools/gemstash/Gemfile.lock index eed8dffc62..e091a27c0f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gemstash/Gemfile.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/gemstash/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/gemstash/gemset.nix index ba5b0b9178..8d626cd103 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gemstash/gemset.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/go-minimock/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-minimock/default.nix index 55601dd570..8238d97a59 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-minimock/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/gqlgenc/default.nix b/third_party/nixpkgs/pkgs/development/tools/gqlgenc/default.nix index ef0fd7c3c8..e737adb026 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gqlgenc/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix b/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix index d2d74ab52e..75baa0d446 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/headache/default.nix b/third_party/nixpkgs/pkgs/development/tools/headache/default.nix index b5f5e55f3f..93077f3110 100644 --- a/third_party/nixpkgs/pkgs/development/tools/headache/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/ineffassign/default.nix b/third_party/nixpkgs/pkgs/development/tools/ineffassign/default.nix deleted file mode 100644 index 0febc4db51..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/infisical/default.nix b/third_party/nixpkgs/pkgs/development/tools/infisical/default.nix index 1de803fb65..b7e7c349f0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/infisical/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/infisical/hashes.json b/third_party/nixpkgs/pkgs/development/tools/infisical/hashes.json index c83a5aea7b..7346d8e18b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/infisical/hashes.json +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/k6/default.nix b/third_party/nixpkgs/pkgs/development/tools/k6/default.nix index 291c28c0bf..48ea4c103f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/k6/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/k6/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { $out/bin/k6 version | grep ${version} > /dev/null ''; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd k6 \ --bash <($out/bin/k6 completion bash) \ --fish <($out/bin/k6 completion fish) \ diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/crystalline/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/crystalline/default.nix index 6ffb002ca7..3f59e57bdb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/crystalline/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/language-servers/metals/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/metals/default.nix index 708d62d2ec..3247018038 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/metals/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/neocmakelsp/default.nix index dc841414cf..bdc780817d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/neocmakelsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/neocmakelsp/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.8.4"; + version = "0.8.12"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-DPKCAWIDw3ykYp2Cuwt9CcWHgdL7aoW5z2CjVFxizhg="; + hash = "sha256-5j1nNPdTZFPmda+2ZNYh9uM1qNCsK6gqUOXZwKJ6ckU="; }; - cargoHash = "sha256-wYh5JNT7HJnY6PLFCPm21LNFHsffFq53FTCRkUuHxWY="; + cargoHash = "sha256-5ZI4heLlhPaNsNJlD9dYlvzTjoWNdHJGGmU6ugUZqds="; meta = with lib; { description = "CMake lsp based on tower-lsp and treesitter"; diff --git a/third_party/nixpkgs/pkgs/development/tools/lurk/default.nix b/third_party/nixpkgs/pkgs/development/tools/lurk/default.nix index 0f6f109899..3f72762eec 100644 --- a/third_party/nixpkgs/pkgs/development/tools/lurk/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/complexity/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/complexity/default.nix index 6e70fbcfcd..ce4cf1de1f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/complexity/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/complexity/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { meta = { description = "C code complexity measurement tool"; - longDescription = - '' GNU Complexity is a tool designed for analyzing the complexity of C - program functions. It is very similar to the McCabe scoring, but - addresses several issues not considered in that scoring scheme. - ''; + longDescription = '' + GNU Complexity is a tool designed for analyzing the complexity of C + program functions. It is very similar to the McCabe scoring, but + addresses several issues not considered in that scoring scheme. + ''; license = lib.licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cppi/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cppi/default.nix index 8aa0afd701..13d4595798 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/cppi/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/cppi/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { description = "C preprocessor directive indenter"; mainProgram = "cppi"; - longDescription = - '' GNU cppi indents C preprocessor directives to reflect their nesting - and ensure that there is exactly one space character between each #if, - #elif, #define directive and the following token. The number of - spaces between the `#' and the following directive must correspond - to the level of nesting of that directive. - ''; + longDescription = '' + GNU cppi indents C preprocessor directives to reflect their nesting + and ensure that there is exactly one space character between each #if, + #elif, #define directive and the following token. The number of + spaces between the `#' and the following directive must correspond + to the level of nesting of that directive. + ''; license = lib.licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/go-md2man/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/go-md2man/default.nix index ee8b8d38b5..b66584b90a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/go-md2man/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix index 8b0026fdf4..051bc6d852 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/nagelfar/default.nix b/third_party/nixpkgs/pkgs/development/tools/nagelfar/default.nix index a40861e098..3e379875c4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/nagelfar/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/pnpm/fetch-deps/default.nix b/third_party/nixpkgs/pkgs/development/tools/pnpm/fetch-deps/default.nix index d891600644..971f1656ba 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pnpm/fetch-deps/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pnpm/fetch-deps/default.nix @@ -15,8 +15,9 @@ { hash ? "", pname, - pnpmWorkspace ? "", + pnpmWorkspaces ? [ ], prePnpmInstall ? "", + pnpmInstallFlags ? [ ], ... }@args: let @@ -32,8 +33,14 @@ outputHash = ""; outputHashAlgo = "sha256"; }; - installFlags = lib.optionalString (pnpmWorkspace != "") "--filter=${pnpmWorkspace}"; + + filterFlags = lib.map (package: "--filter=${package}") pnpmWorkspaces; in + # pnpmWorkspace was deprecated, so throw if it's used. + assert (lib.throwIf (args ? pnpmWorkspace) + "pnpm.fetchDeps: `pnpmWorkspace` is no longer supported, please migrate to `pnpmWorkspaces`." + ) true; + stdenvNoCC.mkDerivation ( finalAttrs: ( @@ -49,7 +56,7 @@ yq ]; - impureEnvVars = lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "NIX_NPM_REGISTRY" ]; installPhase = '' runHook preInstall @@ -73,7 +80,9 @@ pnpm install \ --force \ --ignore-scripts \ - ${installFlags} \ + ${lib.escapeShellArgs filterFlags} \ + ${lib.escapeShellArgs pnpmInstallFlags} \ + --registry="$NIX_NPM_REGISTRY" \ --frozen-lockfile runHook postInstall diff --git a/third_party/nixpkgs/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh b/third_party/nixpkgs/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh index e82a62f910..a47e3184e9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh +++ b/third_party/nixpkgs/pkgs/development/tools/pnpm/fetch-deps/pnpm-config-hook.sh @@ -22,11 +22,19 @@ pnpmConfigHook() { pnpm config set store-dir "$STORE_PATH" - echo "Installing dependencies" - if [[ -n "$pnpmWorkspace" ]]; then - pnpmInstallFlags+=("--filter=$pnpmWorkspace") + echo "'pnpmWorkspace' is deprecated, please migrate to 'pnpmWorkspaces'." + exit 2 fi + + echo "Installing dependencies" + if [[ -n "$pnpmWorkspaces" ]]; then + local IFS=" " + for ws in $pnpmWorkspaces; do + pnpmInstallFlags+=("--filter=$ws") + done + fi + runHook prePnpmInstall pnpm install \ diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go-grpc/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go-grpc/default.nix index 34d5f22d82..863b82f3f7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go-grpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go-grpc/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { description = "Go language implementation of gRPC. HTTP/2 based RPC"; mainProgram = "protoc-gen-go-grpc"; license = licenses.asl20; - maintainers = [ maintainers.raboof ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/refurb/default.nix b/third_party/nixpkgs/pkgs/development/tools/refurb/default.nix index 83c0e04b18..275039b601 100644 --- a/third_party/nixpkgs/pkgs/development/tools/refurb/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix index 67c5ca0bc0..ab41565e01 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.25.9"; + version = "0.25.11"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "sha256-ZevtYJ1ibSs3an3m1KJNTTquz1w6UfTiFgd1mNHFHWE="; + sha256 = "sha256-suKnbCCJWKCDVGEmpddTphUfvuebBeiV+N/B6BIid88="; }; - cargoHash = "sha256-QHhfHm2fDFR5BpSnw1wzr3dfCWDTzWNDDdRtj2qOoKE="; + cargoHash = "sha256-U6pznzHE9yURptV+7rC63vIdD1HxRD+Vg9vemHk7G+Q="; preCheck = '' export HOME=$(mktemp -d) diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix index cbdd2a90b5..22152eed30 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix index fa6a057802..162860caae 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.21.3"; + version = "0.22.0"; src = fetchFromGitHub { owner = "cargo-generate"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-1F/865UgdqwfpITFhXCuL7CmducL7w0lVDyfui9UzjU="; + sha256 = "sha256-oiXv6MbQpmWFi2cTN3a1Zx7Bjr0Y+f6/O+0FQNidbBg="; }; - cargoHash = "sha256-szPO1V09EThpo2N03Ll+ZJUpvjp2b+/C/sviOzFfG+k="; + cargoHash = "sha256-8yLGxydU7jjoG13I+h7qjtabcCxzjnEiE8tAbH56pp4="; nativeBuildInputs = [ pkg-config ]; @@ -44,6 +44,11 @@ rustPlatform.buildRustPackage rec { # - should_canonicalize: the test assumes that it will be called from the /Users// folder on darwin variant. checkFlags = [ "--skip=favorites::favorites_default_to_git_if_not_defined" + "--skip=git_instead_of::should_read_the_instead_of_config_and_rewrite_an_git_at_url_to_https" + "--skip=git_instead_of::should_read_the_instead_of_config_and_rewrite_an_ssh_url_to_https" + "--skip=git_over_ssh::it_should_retrieve_the_private_key_from_ssh_agent" + "--skip=git_over_ssh::it_should_support_a_public_repo" + "--skip=git_over_ssh::it_should_use_a_ssh_key_provided_by_identity_argument" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=git::utils::should_canonicalize" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix index f85d1459c8..923867851b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix index 2db732560d..ec0f9331df 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix index c14591c650..a702e2ed84 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/default.nix index 80af89869c..049ef9faf0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-show-asm"; - version = "0.2.39"; + version = "0.2.41"; src = fetchCrate { inherit pname version; - hash = "sha256-fGUx2SOgs5IF7KTr36fHktykrFkxqLWp4CWVGOZ+MeM="; + hash = "sha256-U9i/xp9WxMYf4GMsZB7qYOpuuuEw4mWZp+ZEyguGtQQ="; }; - cargoHash = "sha256-iCHf4/bqICZ0bTeFFeVopU0Yl8VbxRd+Cr4WucuptVk="; + cargoHash = "sha256-eUaEpex9x9bdqPJ4p5QvkWKaxs3ih4Gb9+4deGBZgXU="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix index a41e2616ba..16ef0f6ea5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix index 1033476eb9..91e7fea0fa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "8.5.2"; + version = "8.5.3"; src = fetchFromGitHub { owner = "watchexec"; repo = pname; rev = "v${version}"; - hash = "sha256-Vf6BFr8MphaUJoHMtksbbVQb+jha7jowhktQCVFxlxQ="; + hash = "sha256-agwK20MkvnhqSVAWMy3HLkUJbraINn12i6VAg8mTzBk="; }; - cargoHash = "sha256-skUG1B6TCFEXeQSRwA6vWjXmNifk5bTR4+JESw7CZMo="; + cargoHash = "sha256-oqGc5haN8Jyi0eQf8egrRXWxi0RGVdIFhpGKgmFB8DI="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation Cocoa ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix b/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix index 29c1c2de45..5ecf6c10a4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/snazy/default.nix b/third_party/nixpkgs/pkgs/development/tools/snazy/default.nix index a5fee4c38c..0eb2b588f2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/snazy/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/subxt/default.nix b/third_party/nixpkgs/pkgs/development/tools/subxt/default.nix index 73907cac37..40fbd86b59 100644 --- a/third_party/nixpkgs/pkgs/development/tools/subxt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/subxt/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "subxt"; - version = "0.37.0"; + version = "0.37.1"; src = fetchFromGitHub { owner = "paritytech"; repo = "subxt"; rev = "v${version}"; - hash = "sha256-GD4P+SXl9hyv0CxOximOMz+Gzi85kPahsiz0wHRqSWk="; + hash = "sha256-lCDjqvdjiQktyFAp3KuFHehwapd3BiLxMSLsNK+wDDo="; }; - cargoHash = "sha256-luKtu9g+NtlwRhC1icpIxkBvP3GtggpKoj7Sx4anLAM="; + cargoHash = "sha256-RmeV2EYHGbMMAeerQkHcYav+RIVY68Tj66zjcFgjUfQ="; # Only build the command line client cargoBuildFlags = [ "--bin" "subxt" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/supabase-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/supabase-cli/default.nix index 5f8d017326..5366355042 100644 --- a/third_party/nixpkgs/pkgs/development/tools/supabase-cli/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/tailwindcss/default.nix b/third_party/nixpkgs/pkgs/development/tools/tailwindcss/default.nix index d06878f0fa..14e859c9c5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/tailwindcss/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix b/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix index 4a3e61fb90..a2de21fd7a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/web/cog/default.nix b/third_party/nixpkgs/pkgs/development/web/cog/default.nix index 7de90857c0..3519430177 100644 --- a/third_party/nixpkgs/pkgs/development/web/cog/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/cog/default.nix @@ -67,6 +67,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Small single “window” launcher for the WebKit WPE port"; + homepage = "https://github.com/Igalia/cog"; + mainProgram = "cog"; license = licenses.mit; maintainers = [ maintainers.matthewbauer ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/web/kcgi/default.nix b/third_party/nixpkgs/pkgs/development/web/kcgi/default.nix index 7732ce9f48..0b2f7438e6 100644 --- a/third_party/nixpkgs/pkgs/development/web/kcgi/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/kcgi/default.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { rev = "VERSION_${underscoreVersion}"; sha256 = "0ha6r7bcgf6pcn5gbd2sl7835givhda1jql49c232f1iair1yqyp"; }; - patchPhase = ''substituteInPlace configure \ - --replace /usr/local / + patchPhase = '' + substituteInPlace configure \ + --replace /usr/local / ''; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v22.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v22.nix index dc4f10b745..6a71b0056b 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v22.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/eboard/default.nix b/third_party/nixpkgs/pkgs/games/eboard/default.nix deleted file mode 100644 index 0250208fd4..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/eboard/eboard.patch b/third_party/nixpkgs/pkgs/games/eboard/eboard.patch deleted file mode 100644 index f80c1b2f78..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/kde/third-party/karousel/default.nix b/third_party/nixpkgs/pkgs/kde/third-party/karousel/default.nix index ebaf37cfa3..d197dbcf5a 100644 --- a/third_party/nixpkgs/pkgs/kde/third-party/karousel/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/kde/third-party/krohnkite/default.nix b/third_party/nixpkgs/pkgs/kde/third-party/krohnkite/default.nix index d9c85dd224..b4a2d2b649 100644 --- a/third_party/nixpkgs/pkgs/kde/third-party/krohnkite/default.nix +++ b/third_party/nixpkgs/pkgs/kde/third-party/krohnkite/default.nix @@ -9,16 +9,16 @@ }: buildNpmPackage rec { pname = "krohnkite"; - version = "0.9.8.2"; + version = "0.9.8.3"; src = fetchFromGitHub { owner = "anametologin"; repo = "krohnkite"; rev = "refs/tags/${version}"; - hash = "sha256-chADfJ1zaufnwi4jHbEN1Oec3XFNw0YsZxLFhnY3T9w="; + hash = "sha256-PiGpYOKvBpwkPfDWHlOhq7dwyBYzfzfJVURiEC1a78g="; }; - npmDepsHash = "sha256-3yE2gyyVkLn/dPDG9zDdkHAEb4/hqTJdyMXE5Y6Z5pM="; + npmDepsHash = "sha256-IUGRxDCn/aEebCgDPElEPKOxfoYmLoFHVROkTJpNISY="; dontWrapQtApps = true; diff --git a/third_party/nixpkgs/pkgs/kde/third-party/krohnkite/package-lock.json b/third_party/nixpkgs/pkgs/kde/third-party/krohnkite/package-lock.json index 91884ce5f4..936c0ffedd 100644 --- a/third_party/nixpkgs/pkgs/kde/third-party/krohnkite/package-lock.json +++ b/third_party/nixpkgs/pkgs/kde/third-party/krohnkite/package-lock.json @@ -1,12 +1,12 @@ { "name": "krohnkite", - "version": "0.9.7", + "version": "0.9.8.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "krohnkite", - "version": "0.9.7", + "version": "0.9.8.3", "license": "MIT", "devDependencies": { "mocha": "^10.4.0", @@ -14,11 +14,10 @@ } }, "node_modules/ansi-colors": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", - "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } @@ -28,7 +27,6 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -38,7 +36,6 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, - "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -54,7 +51,6 @@ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, - "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -67,22 +63,19 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true, - "license": "Python-2.0" + "dev": true }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/binary-extensions": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" }, @@ -95,7 +88,6 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, - "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -105,7 +97,6 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, - "license": "MIT", "dependencies": { "fill-range": "^7.1.1" }, @@ -117,15 +108,13 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", - "dev": true, - "license": "ISC" + "dev": true }, "node_modules/camelcase": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -138,7 +127,6 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -155,7 +143,6 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, - "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -164,11 +151,16 @@ } }, "node_modules/chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", "dev": true, - "license": "MIT", + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -181,9 +173,6 @@ "engines": { "node": ">= 8.10.0" }, - "funding": { - "url": "https://paulmillr.com/funding/" - }, "optionalDependencies": { "fsevents": "~2.3.2" } @@ -193,7 +182,6 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, - "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", @@ -205,7 +193,6 @@ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, - "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -217,17 +204,15 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/debug": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, - "license": "MIT", "dependencies": { - "ms": "^2.1.3" + "ms": "2.1.2" }, "engines": { "node": ">=6.0" @@ -238,12 +223,17 @@ } } }, + "node_modules/debug/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, "node_modules/decamelize": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -252,11 +242,10 @@ } }, "node_modules/diff": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", - "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", + "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", "dev": true, - "license": "BSD-3-Clause", "engines": { "node": ">=0.3.1" } @@ -265,15 +254,13 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/escalade": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", - "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } @@ -283,7 +270,6 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -296,7 +282,6 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, - "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -309,7 +294,6 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, - "license": "MIT", "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -326,7 +310,6 @@ "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", "dev": true, - "license": "BSD-3-Clause", "bin": { "flat": "cli.js" } @@ -335,30 +318,13 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true, - "license": "ISC" - }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } + "dev": true }, "node_modules/get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true, - "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" } @@ -369,7 +335,6 @@ "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, - "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -389,7 +354,6 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, - "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -402,7 +366,6 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -412,7 +375,6 @@ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dev": true, - "license": "MIT", "bin": { "he": "bin/he" } @@ -423,7 +385,6 @@ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", "dev": true, - "license": "ISC", "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -433,15 +394,13 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true, - "license": "ISC" + "dev": true }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, - "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" }, @@ -454,7 +413,6 @@ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -464,7 +422,6 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -474,7 +431,6 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, - "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -487,7 +443,6 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -497,7 +452,6 @@ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -507,7 +461,6 @@ "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -520,7 +473,6 @@ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, - "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -533,7 +485,6 @@ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, - "license": "MIT", "dependencies": { "p-locate": "^5.0.0" }, @@ -549,7 +500,6 @@ "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", "dev": true, - "license": "MIT", "dependencies": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" @@ -562,11 +512,10 @@ } }, "node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", + "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==", "dev": true, - "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -575,32 +524,31 @@ } }, "node_modules/mocha": { - "version": "10.7.3", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.3.tgz", - "integrity": "sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.4.0.tgz", + "integrity": "sha512-eqhGB8JKapEYcC4ytX/xrzKforgEc3j1pGlAXVy3eRwrtAy5/nIfT1SvgGzfN0XZZxeLq0aQWkOUAmqIJiv+bA==", "dev": true, - "license": "MIT", "dependencies": { - "ansi-colors": "^4.1.3", - "browser-stdout": "^1.3.1", - "chokidar": "^3.5.3", - "debug": "^4.3.5", - "diff": "^5.2.0", - "escape-string-regexp": "^4.0.0", - "find-up": "^5.0.0", - "glob": "^8.1.0", - "he": "^1.2.0", - "js-yaml": "^4.1.0", - "log-symbols": "^4.1.0", - "minimatch": "^5.1.6", - "ms": "^2.1.3", - "serialize-javascript": "^6.0.2", - "strip-json-comments": "^3.1.1", - "supports-color": "^8.1.1", - "workerpool": "^6.5.1", - "yargs": "^16.2.0", - "yargs-parser": "^20.2.9", - "yargs-unparser": "^2.0.0" + "ansi-colors": "4.1.1", + "browser-stdout": "1.3.1", + "chokidar": "3.5.3", + "debug": "4.3.4", + "diff": "5.0.0", + "escape-string-regexp": "4.0.0", + "find-up": "5.0.0", + "glob": "8.1.0", + "he": "1.2.0", + "js-yaml": "4.1.0", + "log-symbols": "4.1.0", + "minimatch": "5.0.1", + "ms": "2.1.3", + "serialize-javascript": "6.0.0", + "strip-json-comments": "3.1.1", + "supports-color": "8.1.1", + "workerpool": "6.2.1", + "yargs": "16.2.0", + "yargs-parser": "20.2.4", + "yargs-unparser": "2.0.0" }, "bin": { "_mocha": "bin/_mocha", @@ -614,15 +562,13 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT" + "dev": true }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -632,7 +578,6 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "dev": true, - "license": "ISC", "dependencies": { "wrappy": "1" } @@ -642,7 +587,6 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, - "license": "MIT", "dependencies": { "yocto-queue": "^0.1.0" }, @@ -658,7 +602,6 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, - "license": "MIT", "dependencies": { "p-limit": "^3.0.2" }, @@ -674,7 +617,6 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } @@ -684,7 +626,6 @@ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, - "license": "MIT", "engines": { "node": ">=8.6" }, @@ -697,7 +638,6 @@ "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "dev": true, - "license": "MIT", "dependencies": { "safe-buffer": "^5.1.0" } @@ -707,7 +647,6 @@ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, - "license": "MIT", "dependencies": { "picomatch": "^2.2.1" }, @@ -720,7 +659,6 @@ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -743,15 +681,13 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "license": "MIT" + ] }, "node_modules/serialize-javascript": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", - "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", + "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "randombytes": "^2.1.0" } @@ -761,7 +697,6 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, - "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -776,7 +711,6 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, - "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -789,7 +723,6 @@ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" }, @@ -802,7 +735,6 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, - "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -818,7 +750,6 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, - "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -827,11 +758,10 @@ } }, "node_modules/typescript": { - "version": "5.6.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", - "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", + "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", "dev": true, - "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -841,18 +771,16 @@ } }, "node_modules/workerpool": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", - "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", - "dev": true, - "license": "Apache-2.0" + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz", + "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==", + "dev": true }, "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -869,15 +797,13 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true, - "license": "ISC" + "dev": true }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true, - "license": "ISC", "engines": { "node": ">=10" } @@ -887,7 +813,6 @@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, - "license": "MIT", "dependencies": { "cliui": "^7.0.2", "escalade": "^3.1.1", @@ -902,11 +827,10 @@ } }, "node_modules/yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", + "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", "dev": true, - "license": "ISC", "engines": { "node": ">=10" } @@ -916,7 +840,6 @@ "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", "dev": true, - "license": "MIT", "dependencies": { "camelcase": "^6.0.0", "decamelize": "^4.0.0", @@ -932,7 +855,6 @@ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, diff --git a/third_party/nixpkgs/pkgs/misc/cups/default.nix b/third_party/nixpkgs/pkgs/misc/cups/default.nix index 4c9d2de108..085ecdbed8 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/misc/drivers/hplip/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/hplip/default.nix index fa3c2aad09..cba838569f 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/hplip/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/misc/uboot/default.nix b/third_party/nixpkgs/pkgs/misc/uboot/default.nix index 1983157df1..24d37b78c5 100644 --- a/third_party/nixpkgs/pkgs/misc/uboot/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libc.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libc.nix index 895b82ed53..db49e28ec7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libc.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/libc.nix @@ -1,11 +1,13 @@ { lib, + stdenvNoLibc, symlinkJoin, libcMinimal, librthread, libm, librpcsvc, libutil, + rtld, version, }: @@ -27,13 +29,16 @@ symlinkJoin rec { (lib.getLib p) (lib.getMan p) ]) - [ - libcMinimal - libm - librthread - librpcsvc - libutil - ]; + ( + [ + libcMinimal + libm + librthread + librpcsvc + libutil + ] + ++ (lib.optional (!stdenvNoLibc.hostPlatform.isStatic) rtld) + ); postBuild = '' rm -r "$out/nix-support" diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/openbsdSetupHook/setup-hook.sh b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/openbsdSetupHook/setup-hook.sh index e06dbda37c..dbd016fcb5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/openbsdSetupHook/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/openbsdSetupHook/setup-hook.sh @@ -1,6 +1,11 @@ addOpenBSDMakeFlags() { prependToVar makeFlags "INCSDIR=${!outputDev}/include" prependToVar makeFlags "MANDIR=${!outputMan}/share/man" + # Variables are used to declare dependencies, but we handle them with cc-wrapper + prependToVar makeFlags "CRTBEGIN=" + prependToVar makeFlags "CRTEND=" + prependToVar makeFlags "LIBCRT0=" + prependToVar makeFlags "LIBC=" } fixOpenBSDInstallDirs() { diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/rtld/ldso-fix-makefile.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/rtld/ldso-fix-makefile.patch new file mode 100644 index 0000000000..b6155539e8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/rtld/ldso-fix-makefile.patch @@ -0,0 +1,57 @@ +diff --git a/libexec/ld.so/Makefile b/libexec/ld.so/Makefile +index 7f8f6ef2961..469c34bb6de 100644 +--- a/libexec/ld.so/Makefile ++++ b/libexec/ld.so/Makefile +@@ -1,6 +1,5 @@ + # $OpenBSD: Makefile,v 1.88 2024/04/05 13:51:47 deraadt Exp $ + +-SUBDIR=ldconfig ldd + MAN= ld.so.1 + + .include +@@ -70,21 +69,15 @@ ELF_LDFLAGS+=--shared -Bsymbolic --no-undefined + + .ifdef RELATIVE_RELOC + CHECK_LDSO=c() { \ +- ! readelf -Wr $$1 | \ ++ ! $(READELF) -Wr $$1 | \ + egrep -qv '^($$|[ R])| (${RELATIVE_RELOC}) '; \ + }; c + .endif + +-test_prog= test-$(PROG) +-CLEANFILES+= test-$(PROG) + candidate= $(PROG).test + CLEANFILES+= ${candidate} + +-$(test_prog): +- printf '#include \n#include \nint main(int argc, char **argv){ pthread_attr_t attr; printf("%%s: ", argv[0]); pthread_attr_init(&attr); printf("%%s!\\n", argv[1] ? argv[1] : "foo"); }\n' | \ +- $(CC) -P -x c - -Wl,-dynamic-linker,./$(candidate) -o $@ -lpthread +- +-$(PROG): $(test_prog) ${VERSION_SCRIPT} $(OBJS) ${LD_SCRIPT} ++$(PROG): ${VERSION_SCRIPT} $(OBJS) ${LD_SCRIPT} + .if defined(SYSPATCH_PATH) + $(LD) -e _dl_start $(ELF_LDFLAGS) -o $(candidate) \ + `readelf -Ws ${SYSPATCH_PATH}/usr/libexec/${.TARGET} | \ +@@ -96,9 +89,6 @@ $(PROG): $(test_prog) ${VERSION_SCRIPT} $(OBJS) ${LD_SCRIPT} + .endif + .ifdef CHECK_LDSO + ${CHECK_LDSO} $(candidate) +-.endif +-.ifndef CROSSDIR +- ulimit -c 0; [ "`${.OBJDIR}/$(test_prog) ok`" = "${.OBJDIR}/$(test_prog): ok!" ] + .endif + cp $(candidate) $@ + .endif +@@ -113,10 +103,4 @@ CLEANFILES+= ld.so.a + all: ld.so.a + + ld.so.a: ${OBJS} ${.CURDIR}/Symbols.map ${test_prog} ${LD_SCRIPT} +- ar cqD $@ $? +- +-afterinstall: ld.so.a +- install -d -o root -g wheel -m 755 \ +- ${DESTDIR}/usr/share/relink/usr/libexec +- install -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \ +- ld.so.a ${DESTDIR}/usr/share/relink/usr/libexec/ld.so.a ++ $(AR) cqD $@ $? diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/rtld/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/rtld/package.nix new file mode 100644 index 0000000000..58fd1fd8eb --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/openbsd/pkgs/rtld/package.nix @@ -0,0 +1,31 @@ +{ + lib, + mkDerivation, +}: + +mkDerivation { + path = "libexec/ld.so"; + extraPaths = [ + "lib/libc/string" + "lib/csu/os-note-elf.h" + ]; + patches = [ + ./ldso-fix-makefile.patch + ]; + + libcMinimal = true; + + NIX_CFLAGS_COMPILE = "-Wno-error"; + + # DESTDIR is overridden in bsdSetupHook, just fixup afterwards + postInstall = '' + mv $out/bin $out/libexec + ''; + + outputs = [ + "out" + "man" + ]; + + meta.platforms = lib.platforms.openbsd; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/xcode/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/xcode/default.nix index 1aa1a56936..dc097bfc95 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/xcode/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/xcode/default.nix @@ -83,9 +83,11 @@ 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 = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "12.3")}"; }) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/corefreq/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/corefreq/default.nix new file mode 100644 index 0000000000..59da0e0770 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/cpuid/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/cpuid/default.nix index d74d25398f..e656212991 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/cpuid/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 8eed47235f..312d008cf5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index 9ba5319882..54a9753b5f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index bdb0520f6a..f409fe00df 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -39,16 +39,6 @@ "sha256": "094z3wfcxqx2rbi072i5frshpy6rdvk39aahwm9nc07vc8sxxn4b", "version": "6.1.112" }, - "6.10": { - "patch": { - "extra": "-hardened1", - "name": "linux-hardened-v6.10.12-hardened1.patch", - "sha256": "07z35f4nqj9vgj2ynq7spgckb770a0w0906m7l28i1x0kch2kr3j", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.10.12-hardened1/linux-hardened-v6.10.12-hardened1.patch" - }, - "sha256": "1kvkwgnq5gsdqarrdg32qjrbq1dggxp1x2yy2zpsjsaq5y2mhj2j", - "version": "6.10.12" - }, "6.6": { "patch": { "extra": "-hardened1", diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json index 7642444804..98391c4d04 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json @@ -23,10 +23,6 @@ "version": "6.6.58", "hash": "sha256:1nwrd017l5m4w12yrcf31y3g0l9xqm5b0fzcqdgan3ypi3jq3pz7" }, - "6.10": { - "version": "6.10.14", - "hash": "sha256:0gj2z9ax1qv59n2mld0pg2svwi28lbq92ql98vy7crynd2ybrram" - }, "6.11": { "version": "6.11.5", "hash": "sha256:01rafnqal2v96dzkabz0irymq4sc9ja00ggyv1xn7yzjnyrqa527" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix index 17598d74e5..551fb58ed4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/patches.nix @@ -66,7 +66,7 @@ netfilter-typo-fix = { name = "netfilter-typo-fix"; patch = fetchpatch { - url = "https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/patch/?id=306ed1728e8438caed30332e1ab46b28c25fe3d8"; + url = "https://lore.kernel.org/netdev/20241021094536.81487-3-pablo@netfilter.org/raw"; hash = "sha256-ZGc1xAIjf+MlV02jhIWZ4jHC742+z/WpN7RenqpU7e4="; }; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index a369ced84c..93cb922f0b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -7,12 +7,12 @@ let # kernel config in the xanmod version commit variants = { lts = { - version = "6.6.57"; - hash = "sha256-M12AgmaxfiBaKrZkONk7wNIJznbBhe0k1fNPIzA3ZI0="; + version = "6.6.58"; + hash = "sha256-PjF3PIGCHWGIGHupu+vkdiyrL4h4KG2X5WmQUlz8Zww="; }; main = { - version = "6.11.4"; - hash = "sha256-wBNC3V69CbWxdNckaHCRmm0GUe5EhH//SoDvDEq48ic="; + version = "6.11.5"; + hash = "sha256-G4u0LQtIeJ0dNAmjNH0OKihmbkivYVbrbXDB9vPw2xI="; }; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix index afca9bb2a4..f4eda83e6f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -5,16 +5,16 @@ let variants = { # ./update-zen.py zen zen = { - version = "6.11.2"; #zen + version = "6.11.5"; #zen suffix = "zen1"; #zen - sha256 = "1pwhdx8dcih0q3xj2hndd9vmz1xclrp4dw9yk0p1hi03mb634s40"; #zen + sha256 = "1w342k54ns6rwkk13l9f7h0qzikn6hbnb2ydxyqalrmll8n2g237"; #zen isLqx = false; }; # ./update-zen.py lqx lqx = { - version = "6.11.2"; #lqx + version = "6.11.5"; #lqx suffix = "lqx1"; #lqx - sha256 = "0q5zdzb26azshn1n8fc5zy5n2sa7sz3q4khkjivafz6pyli1wfl8"; #lqx + sha256 = "0ql7nw6sph4ai44n66c7l06aj4ibhdy45415yzgibin1jg9rqa6d"; #lqx isLqx = true; }; }; @@ -83,8 +83,6 @@ let HZ = freeform "1000"; HZ_1000 = yes; - # Alternative zpool for zswap - Z3FOLD = yes; } // lib.optionalAttrs (isLqx) { # Google's BBRv3 TCP congestion Control TCP_CONG_BBR = yes; @@ -101,7 +99,6 @@ let # Swap storage is compressed with LZ4 using zswap ZSWAP_COMPRESSOR_DEFAULT_LZ4 = lib.mkOptionDefault yes; ZSWAP_COMPRESSOR_DEFAULT_ZSTD = lib.mkDefault no; - ZSWAP_ZPOOL_DEFAULT_Z3FOLD = yes; # Fix error: unused option: XXX. CFS_BANDWIDTH = lib.mkForce (option no); diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nsncd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nsncd/default.nix index f235fa0646..43f19cf6f7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nsncd/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix index ee5aa5e8ea..56adc98c92 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -39,12 +39,12 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; production = generic { - version = "550.120"; - sha256_64bit = "sha256-gBkoJ0dTzM52JwmOoHjMNwcN2uBN46oIRZHAX8cDVpc="; - sha256_aarch64 = "sha256-dzTEUuSIWKEuAMhsL9QkR7CCHpm6m9ZwtGSpSKqwJdc="; - openSha256 = "sha256-O3OrGGDR+xrpfyPVQ04aM3eGI6aWuZfRzmaPjMfnGIg="; - settingsSha256 = "sha256-fPfIPwpIijoUpNlAUt9C8EeXR5In633qnlelL+btGbU="; - persistencedSha256 = "sha256-ztEemWt0VR+cQbxDmMnAbEVfThdvASHni4SJ0dTZ2T4="; + version = "550.127.05"; + sha256_64bit = "sha256-04TzT10qiWvXU20962ptlz2AlKOtSFocLuO/UZIIauk="; + sha256_aarch64 = "sha256-3wsGqJvDf8io4qFSqbpafeHHBjbasK5i/W+U6TeEeBY="; + openSha256 = "sha256-r0zlWPIuc6suaAk39pzu/tp0M++kY2qF8jklKePhZQQ="; + settingsSha256 = "sha256-cUSOTsueqkqYq3Z4/KEnLpTJAryML4Tk7jco/ONsvyg="; + persistencedSha256 = "sha256-8nowXrL6CRB3/YcoG1iWeD4OCYbsYKOOPE374qaa4sY="; }; latest = selectHighestVersion production (generic { @@ -58,22 +58,22 @@ rec { }); beta = selectHighestVersion latest (generic { - version = "560.31.02"; - sha256_64bit = "sha256-0cwgejoFsefl2M6jdWZC+CKc58CqOXDjSi4saVPNKY0="; - sha256_aarch64 = "sha256-m7da+/Uc2+BOYj6mGON75h03hKlIWItHORc5+UvXBQc="; - openSha256 = "sha256-X5UzbIkILvo0QZlsTl9PisosgPj/XRmuuMH+cDohdZQ="; - settingsSha256 = "sha256-A3SzGAW4vR2uxT1Cv+Pn+Sbm9lLF5a/DGzlnPhxVvmE="; - persistencedSha256 = "sha256-BDtdpH5f9/PutG3Pv9G4ekqHafPm3xgDYdTcQumyMtg="; + version = "565.57.01"; + sha256_64bit = "sha256-buvpTlheOF6IBPWnQVLfQUiHv4GcwhvZW3Ks0PsYLHo="; + sha256_aarch64 = "sha256-aDVc3sNTG4O3y+vKW87mw+i9AqXCY29GVqEIUlsvYfE="; + openSha256 = "sha256-/tM3n9huz1MTE6KKtTCBglBMBGGL/GOHi5ZSUag4zXA="; + settingsSha256 = "sha256-H7uEe34LdmUFcMcS6bz7sbpYhg9zPCb/5AmZZFTx1QA="; + persistencedSha256 = "sha256-hdszsACWNqkCh8G4VBNitDT85gk9gJe1BlQ8LdrYIkg="; }); # 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/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix index c6adc9c55f..8f92764f5e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/update.sh b/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/update.sh index fad989127a..b1000fbd96 100755 --- a/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/update.sh +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/rewritefs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rewritefs/default.nix index 0626fc0a91..fc3915c66a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rewritefs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rewritefs/default.nix @@ -22,8 +22,7 @@ stdenv.mkDerivation { preConfigure = "substituteInPlace Makefile --replace /usr/local $out"; meta = with lib; { - description = ''A FUSE filesystem intended to be used - like Apache mod_rewrite''; + description = "A FUSE filesystem intended to be used like Apache mod_rewrite"; homepage = "https://github.com/sloonz/rewritefs"; license = licenses.gpl2Only; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/scx/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/scx/default.nix new file mode 100644 index 0000000000..766d4ab4c6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/scx/default.nix @@ -0,0 +1,74 @@ +{ + lib, + callPackage, + pkg-config, + rustPlatform, + llvmPackages, + elfutils, + zlib, + fetchFromGitHub, +}: +let + versionInfo = lib.importJSON ./version.json; + 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 // { + 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; } + { csheds = import ./scx_csheds.nix; } + ]; +in +(lib.mapAttrs (name: scheduler: callPackage scheduler { inherit mkScxScheduler; }) schedulers) +// { + inherit mkScxScheduler; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_bpfland/Cargo.lock b/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_bpfland/Cargo.lock new file mode 100644 index 0000000000..8ff68f351b --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_bpfland/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_bpfland/default.nix new file mode 100644 index 0000000000..2a5a86f7a3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_bpfland/default.nix @@ -0,0 +1,38 @@ +{ + stdenv, + lib, + mkScxScheduler, +}: + +mkScxScheduler "rust" rec { + 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/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_csheds.nix b/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_csheds.nix new file mode 100644 index 0000000000..5d5826b820 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_csheds.nix @@ -0,0 +1,106 @@ +{ + 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" rec { + 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" = false; + "openrc" = false; + "libbpf_a" = false; + # not for nix + "libalpm" = false; + }) + (lib.mapAttrsToList lib.mesonBool { + # needed libs are already fetched as FOD + "offline" = true; + # rust 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_pair, scx_qmap, scx_simple, scx_userland. + ''; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_lavd/Cargo.lock b/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_lavd/Cargo.lock new file mode 100644 index 0000000000..154449b6d2 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_lavd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_lavd/default.nix new file mode 100644 index 0000000000..21fcc2a79a --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_lavd/default.nix @@ -0,0 +1,37 @@ +{ + stdenv, + lib, + mkScxScheduler, +}: + +mkScxScheduler "rust" rec { + 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/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_layered/Cargo.lock b/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_layered/Cargo.lock new file mode 100644 index 0000000000..81dd90a77f --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_layered/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_layered/default.nix new file mode 100644 index 0000000000..9f47b6462c --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_layered/default.nix @@ -0,0 +1,36 @@ +{ + stdenv, + lib, + mkScxScheduler, +}: + +mkScxScheduler "rust" rec { + 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/third_party/nixpkgs/pkgs/by-name/gr/granian/Cargo.lock b/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_rlfifo/Cargo.lock similarity index 51% rename from third_party/nixpkgs/pkgs/by-name/gr/granian/Cargo.lock rename to third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_rlfifo/Cargo.lock index f6a3c5cd67..997b1943b5 100644 --- a/third_party/nixpkgs/pkgs/by-name/gr/granian/Cargo.lock +++ b/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_rlfifo/Cargo.lock @@ -3,82 +3,110 @@ version = 3 [[package]] -name = "addr2line" -version = "0.22.0" +name = "ahash" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ - "gimli", + "cfg-if", + "once_cell", + "version_check", + "zerocopy", ] [[package]] -name = "adler" -version = "1.0.2" +name = "aho-corasick" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] [[package]] -name = "aes" -version = "0.8.4" +name = "anstream" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", + "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" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[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" +name = "bindgen" +version = "0.69.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", + "bitflags", + "cexpr", + "clang-sys", + "itertools", + "lazy_static", + "lazycell", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn", + "which", ] -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - [[package]] name = "bitflags" version = "2.6.0" @@ -86,53 +114,88 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] -name = "block-buffer" -version = "0.10.4" +name = "bitvec" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ - "generic-array", + "funty", + "radium", + "serde", + "tap", + "wyz", ] [[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" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "camino" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" dependencies = [ - "generic-array", + "serde", ] [[package]] -name = "byteorder" -version = "1.5.0" +name = "cargo-platform" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -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" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" dependencies = [ - "cipher", + "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.15" +version = "1.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +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" @@ -140,28 +203,108 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "cipher" -version = "0.4.4" +name = "cfg_aliases" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ - "crypto-common", - "inout", + "glob", + "libc", + "libloading", ] [[package]] -name = "const-oid" -version = "0.9.6" +name = "clap" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +dependencies = [ + "clap_builder", + "clap_derive", +] [[package]] -name = "cpufeatures" -version = "0.2.13" +name = "clap_builder" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ - "libc", + "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]] @@ -173,6 +316,34 @@ 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" @@ -180,40 +351,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] -name = "crypto-common" -version = "0.1.6" +name = "ctrlc" +version = "3.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" dependencies = [ - "generic-array", - "typenum", + "nix", + "windows-sys 0.59.0", ] [[package]] -name = "data-encoding" -version = "2.6.0" +name = "deranged" +version = "0.3.11" 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" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" 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", + "powerfmt", ] [[package]] @@ -222,6 +375,12 @@ 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" @@ -229,180 +388,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] -name = "fnv" -version = "1.0.7" +name = "errno" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "futures" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", + "libc", + "windows-sys 0.52.0", ] [[package]] -name = "futures-channel" -version = "0.3.30" +name = "fastrand" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] -name = "futures-core" -version = "0.3.30" +name = "filetime" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "wasi", + "libredox", + "windows-sys 0.59.0", ] [[package]] -name = "gimli" -version = "0.29.0" +name = "funty" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[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", -] - -[[package]] -name = "h2" -version = "0.4.6" +name = "glob" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] +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" @@ -417,126 +455,41 @@ 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 = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "digest", -] - -[[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" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" -dependencies = [ - "bytes", - "futures-util", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "httparse" -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 = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" -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", + "windows-sys 0.52.0", ] [[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]] -name = "indoc" -version = "2.0.5" +name = "is_terminal_polyfill" +version = "1.70.1" 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", -] +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" -version = "0.13.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] @@ -548,31 +501,100 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] -name = "libc" -version = "0.2.158" +name = "js-sys" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "0cb94a0ffd3f3ee755c20f7d8752f45cac88605a4dcf808abcff72873296ec7b" +dependencies = [ + "wasm-bindgen", +] [[package]] -name = "libmimalloc-sys" -version = "0.1.39" +name = "lazy_static" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44" +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", - "libc", + "nix", + "pkg-config", ] [[package]] -name = "lock_api" -version = "0.4.12" +name = "libc" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" + +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ - "autocfg", - "scopeguard", + "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" @@ -586,273 +608,191 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] -name = "memoffset" -version = "0.9.1" +name = "memmap2" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +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 = "mimalloc" -version = "0.1.43" +name = "num_cpus" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633" -dependencies = [ - "libmimalloc-sys", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ "hermit-abi", "libc", - "wasi", - "windows-sys", ] [[package]] -name = "object" -version = "0.36.4" +name = "num_threads" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ - "memchr", + "libc", ] [[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 = "parking_lot" -version = "0.12.3" +name = "ordered-float" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +checksum = "44d501f1a72f71d3c063a6bbc8f7271fa73aa09fe5d6283b6571e2ed176a2537" dependencies = [ - "lock_api", - "parking_lot_core", + "num-traits", ] [[package]] -name = "parking_lot_core" -version = "0.9.10" +name = "paste" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets", -] +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] -name = "pbkdf2" -version = "0.12.2" +name = "pkg-config" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" -dependencies = [ - "digest", - "hmac", -] +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] -name = "pem" -version = "3.0.4" +name = "plain" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" -dependencies = [ - "base64", - "serde", -] +checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] -name = "percent-encoding" -version = "2.3.1" +name = "portable-atomic" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] -name = "pin-project" -version = "1.1.5" +name = "powerfmt" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] -name = "pin-project-internal" -version = "1.1.5" +name = "prettyplease" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "quote", "syn", ] -[[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 = "pkcs5" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e847e2c91a18bfa887dd028ec33f2fe6f25db77db3619024764914affe8b69a6" -dependencies = [ - "aes", - "cbc", - "der", - "pbkdf2", - "scrypt", - "sha2", - "spki", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -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", -] - [[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", ] [[package]] -name = "pyo3" -version = "0.22.2" +name = "quanta" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433" +checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" dependencies = [ - "anyhow", - "cfg-if", - "indoc", + "crossbeam-utils", "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", + "raw-cpuid", + "wasi", + "web-sys", + "winapi", ] [[package]] @@ -865,146 +805,205 @@ dependencies = [ ] [[package]] -name = "rand" -version = "0.8.5" +name = "radium" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "radix_trie" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" dependencies = [ - "libc", - "rand_chacha", - "rand_core", + "endian-type", + "nibble_vec", ] [[package]] -name = "rand_chacha" -version = "0.3.1" +name = "raw-cpuid" +version = "11.2.0" 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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0" dependencies = [ "bitflags", ] [[package]] -name = "ring" -version = "0.17.8" +name = "redox_syscall" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ - "cc", - "cfg-if", - "getrandom", + "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", - "spin", - "untrusted", - "windows-sys", + "linux-raw-sys", + "windows-sys 0.52.0", ] [[package]] -name = "rustc-demangle" -version = "0.1.24" +name = "rustversion" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] -name = "rustls" -version = "0.22.4" +name = "ryu" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +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", - "ring", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", + "proc-macro2", + "quote", + "serde", + "serde_json", + "syn", ] [[package]] -name = "rustls-pemfile" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +name = "scx_utils" +version = "1.0.5" dependencies = [ - "base64", - "rustls-pki-types", + "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 = "rustls-pki-types" -version = "1.7.0" +name = "semver" +version = "1.0.23" 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" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" 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", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "scrypt" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" -dependencies = [ - "pbkdf2", - "salsa20", - "sha2", + "serde", ] [[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", @@ -1012,25 +1011,15 @@ dependencies = [ ] [[package]] -name = "sha1" -version = "0.10.6" +name = "serde_json" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", + "itoa", + "memchr", + "ryu", + "serde", ] [[package]] @@ -1040,22 +1029,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] -name = "signal-hook-registry" -version = "1.4.2" +name = "sketches-ddsketch" +version = "0.2.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", -] +checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c" [[package]] name = "smallvec" @@ -1064,42 +1041,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] -name = "socket2" -version = "0.5.7" +name = "sscanf" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "a147d3cf7e723671ed11355b5b008c8019195f7fc902e213f5557d931e9f839d" dependencies = [ - "libc", - "windows-sys", + "const_format", + "lazy_static", + "regex", + "sscanf_macro", ] [[package]] -name = "spin" -version = "0.9.8" +name = "sscanf_macro" +version = "0.4.2" 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" +checksum = "af3a37bdf8e90e77cc60f74473edf28d922ae2eacdd595e67724ccd2381774cc" dependencies = [ - "base64ct", - "der", + "convert_case", + "proc-macro2", + "quote", + "regex-syntax 0.6.29", + "strsim 0.10.0", + "syn", + "unicode-width", ] [[package]] -name = "subtle" -version = "2.6.1" +name = "strsim" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +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.77" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -1107,25 +1091,49 @@ dependencies = [ ] [[package]] -name = "target-lexicon" -version = "0.12.16" +name = "tap" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +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.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", @@ -1133,180 +1141,87 @@ dependencies = [ ] [[package]] -name = "tikv-jemalloc-sys" -version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" +name = "time" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ - "cc", + "deranged", + "itoa", "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", ] [[package]] -name = "tikv-jemallocator" -version = "0.6.0" +name = "time-core" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ - "libc", - "tikv-jemalloc-sys", + "num-conv", + "time-core", ] -[[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", -] - -[[package]] -name = "tokio" -version = "1.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys", -] - -[[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", -] - -[[package]] -name = "tokio-rustls" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" -dependencies = [ - "rustls", - "rustls-pki-types", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite", -] - -[[package]] -name = "tokio-util" -version = "0.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[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" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] -name = "unindent" -version = "0.2.3" +name = "unicode-segmentation" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] -name = "untrusted" -version = "0.9.0" +name = "unicode-width" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] -name = "utf-8" -version = "0.7.6" +name = "unicode-xid" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +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" @@ -1314,12 +1229,140 @@ 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" @@ -1329,6 +1372,15 @@ 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" @@ -1393,13 +1445,32 @@ 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 = [ - "byteorder", "zerocopy-derive", ] @@ -1413,9 +1484,3 @@ dependencies = [ "quote", "syn", ] - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_rlfifo/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_rlfifo/default.nix new file mode 100644 index 0000000000..c5b737f011 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_rlfifo/default.nix @@ -0,0 +1,36 @@ +{ + stdenv, + lib, + mkScxScheduler, +}: + +mkScxScheduler "rust" rec { + 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 a production ready scheduler. + ''; + mainProgram = "scx_rlfifo"; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_rustland/Cargo.lock b/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_rustland/Cargo.lock new file mode 100644 index 0000000000..7f37b49262 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_rustland/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_rustland/default.nix new file mode 100644 index 0000000000..801d270f6f --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/scx/scx_rustland/default.nix @@ -0,0 +1,38 @@ +{ + stdenv, + lib, + mkScxScheduler, +}: + +mkScxScheduler "rust" rec { + 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/third_party/nixpkgs/pkgs/os-specific/linux/scx/update.sh b/third_party/nixpkgs/pkgs/os-specific/linux/scx/update.sh new file mode 100755 index 0000000000..b48849257a --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/scx/update.sh @@ -0,0 +1,51 @@ +#! /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 + +srcJson="$(realpath "./pkgs/os-specific/linux/scx/version.json")" +srcFolder="$(dirname "$srcJson")" + +localVer=$(jq -r .version <$srcJson) +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" \ + "$srcJson" | sponge $srcJson + +rm -f Cargo.toml Cargo.lock + +pushd scheds/rust +for scheduler in bpfland lavd layered rlfifo rustland; do + pushd "scx_$scheduler" + + cargo generate-lockfile + cp Cargo.lock "$srcFolder/scx_$scheduler/Cargo.lock" + + popd +done diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/scx/version.json b/third_party/nixpkgs/pkgs/os-specific/linux/scx/version.json new file mode 100644 index 0000000000..99148b7e3c --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix index 2a5112e9fd..ea37545672 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/zenergy/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zenergy/default.nix new file mode 100644 index 0000000000..cfdb63d2a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zenergy/default.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + kernel, + kmod, +}: + +let + kernelDirectory = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; +in +stdenv.mkDerivation { + pname = "zenergy"; + version = "0-unstable-2024-10-10"; + + src = fetchFromGitHub { + owner = "BoukeHaarsma23"; + repo = "zenergy"; + rev = "7c4e83d5e2f887f4c31edaf92e5f94e9448e9764"; + hash = "sha256-5fYelEr4IYnuXrly15IcyicFrF0tYjs7OBqIhUYQXZ0="; + }; + + nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; + + hardeningDisable = [ + "format" + "pic" + ]; + + makeFlags = kernel.makeFlags ++ [ "KDIR=${kernelDirectory}" ]; + + installTargets = [ "modules_install" ]; + + preBuild = '' + substituteInPlace Makefile --replace-fail "PWD modules_install" "PWD INSTALL_MOD_PATH=$out modules_install" + ''; + + meta = with lib; { + description = "Based on AMD_ENERGY driver, but with some jiffies added so non-root users can read it safely."; + homepage = "https://github.com/BoukeHaarsma23/zenergy"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ wizardlink ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/coturn/default.nix b/third_party/nixpkgs/pkgs/servers/coturn/default.nix index 061ea52073..4014d56606 100644 --- a/third_party/nixpkgs/pkgs/servers/coturn/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/coturn/dont-call-setgroups-unconditionally.patch b/third_party/nixpkgs/pkgs/servers/coturn/dont-call-setgroups-unconditionally.patch new file mode 100644 index 0000000000..6b7780cbee --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/dict/dictd-db-collector.nix b/third_party/nixpkgs/pkgs/servers/dict/dictd-db-collector.nix index 793cbf66a4..83844f9a5a 100644 --- a/third_party/nixpkgs/pkgs/servers/dict/dictd-db-collector.nix +++ b/third_party/nixpkgs/pkgs/servers/dict/dictd-db-collector.nix @@ -13,7 +13,7 @@ let link_arguments = map - (x: '' "${x.filename}" '') + (x: ''"${x.filename}" '') dictlist; databases = lib.concatStrings (map (x: diff --git a/third_party/nixpkgs/pkgs/servers/dict/dictd-wordnet.nix b/third_party/nixpkgs/pkgs/servers/dict/dictd-wordnet.nix index d9f3c7a99c..c07aa42935 100644 --- a/third_party/nixpkgs/pkgs/servers/dict/dictd-wordnet.nix +++ b/third_party/nixpkgs/pkgs/servers/dict/dictd-wordnet.nix @@ -24,10 +24,11 @@ stdenv.mkDerivation rec { meta = { description = "dictd-compatible version of WordNet"; - longDescription = - '' WordNet® is a large lexical database of English. This package makes - the wordnet data available to dictd and by extension for lookup with - the dict command. ''; + longDescription = '' + WordNet® is a large lexical database of English. This package makes + the wordnet data available to dictd and by extension for lookup with + the dict command. + ''; homepage = "https://wordnet.princeton.edu/"; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 8fe00f2433..c6a2441274 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/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; [ ]; @@ -4958,7 +4958,8 @@ xmltodict ]; "zeversolar" = ps: with ps; [ - ]; # missing inputs: zeversolar + zeversolar + ]; "zha" = ps: with ps; [ aiohasupervisor pillow @@ -5878,6 +5879,7 @@ "zamg" "zeroconf" "zerproc" + "zeversolar" "zha" "zodiac" "zone" diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix index 73924b838e..fc4479ed70 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix index 52ee2d92ec..4db100a94f 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "wills106"; domain = "solax_modbus"; - version = "2024.10.3"; + version = "2024.10.4"; src = fetchFromGitHub { owner = "wills106"; repo = "homeassistant-solax-modbus"; rev = "refs/tags/${version}"; - hash = "sha256-6XLXCD7ItTGCRN9XQUetZfZBuMbFEmho6IOyFs4m0ek="; + hash = "sha256-EeFDUxZ7/W5Ng+d56mOCeRntga0uU55OQsaPWzM/bcY="; }; dependencies = [ pymodbus ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix index 4dba1f70bd..cd6ac2080d 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix index edd4f6ad79..6ab36c0e63 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/default.nix @@ -5,18 +5,18 @@ buildNpmPackage rec { pname = "universal-remote-card"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-h7U39dpgEsTboYjfpWxcdP3BkXNB2dQNuSiTCD7zPR0="; + hash = "sha256-2bDVeqp6g5tkzdZqbHpTjsVlCTjwLK7ZSOFPtso1LKM="; }; patches = [ ./dont-call-git.patch ]; - npmDepsHash = "sha256-X4PuMvQ/ZmyUafLE7ADBPIKIB8ul5M1P23gOQEikTAg="; + npmDepsHash = "sha256-84IO1JT/mrU2w5IqPNB31ai19QbMmwOGurK8n6wO4Hg="; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 94b9758dcc..c39617fc84 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/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 { @@ -174,15 +164,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"; @@ -323,6 +304,7 @@ let doCheck = false; # Tests changed a lot for > 3 }); + # pinned for sigstore tuf = super.tuf.overridePythonAttrs rec { version = "2.1.0"; src = fetchFromGitHub { @@ -408,7 +390,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"; @@ -426,13 +408,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/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix index 70c92b8bce..bb9cc204bf 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix index 25f33e9fb3..efd82a902f 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix index 07fc9a00b9..4f1ae7204f 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix b/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix index 1b33d907af..11825118ce 100644 --- a/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix @@ -16,20 +16,20 @@ buildGoModule rec { pname = "evcc"; - version = "0.130.13"; + version = "0.131.2"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-cqw+4/GwdBy8XpAF/ViI5UxaaS17hryJSCw5kMLin4k="; + hash = "sha256-Ag+FIsItAY+C250qfMmCbQF46I0QFB07vUsqHqRsHDw="; }; - vendorHash = "sha256-WP7ao54/PMLI+jAaZQgj1otCHEPHZd1A3oqb0DTgx1c="; + vendorHash = "sha256-hPCTAK4u79r9EoHkv6g1QvkRDZ95hXzyiiQpRD+0aLQ="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-pec5hsPrvHHTg++NaLb7vL1YIU1e57o8EVxp9OMhm58="; + hash = "sha256-4PBlN2pbr7dzZNQzh/P0kBlsg6ut2XPwsfFB132hWO0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix index f68d6b880d..3a29bd72b4 100644 --- a/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix +++ b/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix @@ -11,6 +11,7 @@ , expat , fdk_aac , ffmpeg-headless +, ffmpeg_6-headless , geoip , libbsd , libiconv @@ -506,8 +507,8 @@ let self = { name = "njs"; src = fetchhg { url = "https://hg.nginx.org/njs"; - rev = "0.8.1"; - sha256 = "sha256-bFHrcA1ROMwYf+s0EWOXzkru6wvfRLvjvN8BV/r2tMc="; + rev = "0.8.4"; + sha256 = "sha256-SooPFx4WNEezPD+W/wmMLY+FdkGRoojLNUFbhn3Riyg="; name = "nginx-njs"; }; @@ -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/third_party/nixpkgs/pkgs/servers/http/router/default.nix b/third_party/nixpkgs/pkgs/servers/http/router/default.nix index c5a2f7d33c..40eac67fdb 100644 --- a/third_party/nixpkgs/pkgs/servers/http/router/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/http/tomcat/default.nix b/third_party/nixpkgs/pkgs/servers/http/tomcat/default.nix index e917a9558c..12a242a4ed 100644 --- a/third_party/nixpkgs/pkgs/servers/http/tomcat/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/http/webhook/default.nix b/third_party/nixpkgs/pkgs/servers/http/webhook/default.nix index d4ee36713e..2b61d877f0 100644 --- a/third_party/nixpkgs/pkgs/servers/http/webhook/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/keycloak/default.nix b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix index 2bf5cc37a4..e89feea01c 100644 --- a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/limesurvey/default.nix b/third_party/nixpkgs/pkgs/servers/limesurvey/default.nix index 9f7db0b916..ecffaa1fe2 100644 --- a/third_party/nixpkgs/pkgs/servers/limesurvey/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/mail/mailpit/source.nix b/third_party/nixpkgs/pkgs/servers/mail/mailpit/source.nix index cf45c132f6..f6b15cb7f6 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailpit/source.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/matrix-conduit/Cargo.lock b/third_party/nixpkgs/pkgs/servers/matrix-conduit/Cargo.lock index 9e47fc4f2b..9a98f2a53e 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-conduit/Cargo.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix index 4e3ddb37db..9f0af06125 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index d2b4fc16d4..af9673228d 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/monitoring/librenms/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/librenms/default.nix index 34ab4c1760..2697fea5d0 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/librenms/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix index 987ec3f541..3e4e945aca 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix @@ -10,14 +10,14 @@ }: buildGoModule rec { - version = "3.2.0"; + version = "3.2.1"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-dche8MbVSlwKMD/znOCj80FNf5KZmEuI3uodrFLrmjM="; + hash = "sha256-PhvXuRWpOA+5sPiTSDEwpZ8KEfV/UHM2W6RnG9z9Sp0="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix index c31f28dbfd..9ad31b8efa 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/nagios-plugins/check_ssl_cert/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/monitoring/nagios-plugins/check_uptime/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/nagios-plugins/check_uptime/default.nix index 7f6913794d..dc707f2f37 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/nagios-plugins/check_uptime/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix index 0a421e95b9..0e13f54bf5 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/monitoring/plugins/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/plugins/default.nix index ae0db59d0b..0993dceb93 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/plugins/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , pkg-config , runCommand @@ -43,30 +42,15 @@ let in stdenv.mkDerivation rec { pname = "monitoring-plugins"; - version = "2.3.5"; + version = "2.4.0"; src = fetchFromGitHub { owner = "monitoring-plugins"; repo = "monitoring-plugins"; rev = "v${version}"; - sha256 = "sha256-J9fzlxIpujoG7diSRscFhmEV9HpBOxFTJSmGGFjAzcM="; + hash = "sha256-T37t0shhC+8k7CN/hIOxsskuuCi0LwQui8xyRTC+pjQ="; }; - patches = [ - # fix build (makefile cannot produce -lcrypto) - # remove on next release - (fetchpatch { - url = "https://github.com/monitoring-plugins/monitoring-plugins/commit/bad156676894a2755c8b76519a11cdd2037e5cd6.patch"; - hash = "sha256-aI/sX04KXe968SwdS8ZamNtgdNbHtho5cDsDaA+cjZY="; - }) - # fix check_smtp with --starttls https://github.com/monitoring-plugins/monitoring-plugins/pull/1952 - # remove on next release - (fetchpatch { - url = "https://github.com/monitoring-plugins/monitoring-plugins/commit/2eea6bb2a04bbfb169bac5f0f7c319f998e8ab87.patch"; - hash = "sha256-CyVD340+zOxuxRRPmtowD3DFFRB1Q7+AANzul9HqwBI="; - }) - ]; - # TODO: Awful hack. Grrr... # Anyway the check that configure performs to figure out the ping # syntax is totally impure, because it runs an actual ping to @@ -76,9 +60,6 @@ stdenv.mkDerivation rec { # --with-ping-command needs to be done here instead of in # configureFlags due to the spaces in the argument postPatch = '' - substituteInPlace po/Makefile.in.in \ - --replace /bin/sh ${runtimeShell} - sed -i configure.ac \ -e 's|^DEFAULT_PATH=.*|DEFAULT_PATH=\"${binPath}\"|' @@ -116,7 +97,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Official monitoring plugins for Nagios/Icinga/Sensu and others"; homepage = "https://www.monitoring-plugins.org"; - license = licenses.gpl3Only; + license = licenses.gpl3Plus; maintainers = with maintainers; [ thoughtpolice relrod ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 4740676224..6a5c9e0ae8 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix b/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix index 53a5601c51..422c3e885a 100644 --- a/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/owntracks-recorder/default.nix b/third_party/nixpkgs/pkgs/servers/owntracks-recorder/default.nix index 98c97f833b..46460f912b 100644 --- a/third_party/nixpkgs/pkgs/servers/owntracks-recorder/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/pies/default.nix b/third_party/nixpkgs/pkgs/servers/pies/default.nix index 115bf78be9..4bea37d9c7 100644 --- a/third_party/nixpkgs/pkgs/servers/pies/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pies/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = { description = "Program invocation and execution supervisor"; - longDescription = - '' The name Pies (pronounced "p-yes") stands for Program Invocation and + longDescription = '' + The name Pies (pronounced "p-yes") stands for Program Invocation and Execution Supervisor. This utility starts and controls execution of external programs, called components. Each component is a stand-alone program, which is executed in the foreground. Upon diff --git a/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix b/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix index 37b72c4538..5704232a14 100644 --- a/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/search/meilisearch/Cargo.lock b/third_party/nixpkgs/pkgs/servers/search/meilisearch/Cargo.lock index e6cf59d4ca..9fdf0cb2da 100644 --- a/third_party/nixpkgs/pkgs/servers/search/meilisearch/Cargo.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/search/meilisearch/default.nix b/third_party/nixpkgs/pkgs/servers/search/meilisearch/default.nix index a7e8c7f8cb..e87fe1f9b6 100644 --- a/third_party/nixpkgs/pkgs/servers/search/meilisearch/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/simple-http-server/default.nix b/third_party/nixpkgs/pkgs/servers/simple-http-server/default.nix index cb4fe13000..fe84eaf3a2 100644 --- a/third_party/nixpkgs/pkgs/servers/simple-http-server/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/spicedb/default.nix b/third_party/nixpkgs/pkgs/servers/spicedb/default.nix index 530ada2bb5..78b73b1585 100644 --- a/third_party/nixpkgs/pkgs/servers/spicedb/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/pgpool/default.nix b/third_party/nixpkgs/pkgs/servers/sql/pgpool/default.nix index b4f5724bcf..21105ea723 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/pgpool/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/17.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/17.nix new file mode 100644 index 0000000000..5d8d8cd693 --- /dev/null +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix index 3040e8074b..8eb2018865 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/age.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/age.nix index b80d1c203b..695a0093c2 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/age.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/citus.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/citus.nix index 28d6139f0a..b4c08b4cea 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/citus.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/lantern.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/lantern.nix index 9a3e01d535..f742d56f70 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/lantern.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/lantern.nix @@ -2,27 +2,33 @@ , stdenv , cmake , fetchFromGitHub +, openssl , postgresql , postgresqlTestHook }: 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 = stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index 42d055a029..74bf0b8eda 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix index 02c6e6435a..3dea36f7e7 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix index 010f8f819d..57bf1b62e1 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix index afc5b9fe65..8983acb315 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hint_plan.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_ivm.nix index 46c01251d5..fcae540d13 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_ivm.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix index 6637c98c95..4aeec3e31f 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_safeupdate.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_similarity.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_similarity.nix index a066933105..8bcb8777c5 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_similarity.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix index d91b0fb1c1..a5bd1ed1c3 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_squeeze.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix index 2a11417c90..b210db9104 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgaudit.nix index f4c03d611f..1079a13b2d 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgaudit.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 0ba7fa0938..3a7c9e237f 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix index e8b3af416c..117319e606 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plr.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plr.nix index 05d22c19a8..b30b59b86d 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plr.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8/default.nix index e0dbc19e35..2c375babd4 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix index 565f3fdaf6..728f3b348c 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/smlar.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/smlar.nix index 12fdd79cc8..4188c3b9c9 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/smlar.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/tds_fdw.nix index 4a192cda9a..2dbf344fc6 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/tds_fdw.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix index bd2d2d3b74..60e14e9228 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix index 0776fcb446..ab414a400d 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/generic.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/generic.nix index 07cff1a1ad..4054d8adde 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/generic.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/generic.nix @@ -5,7 +5,7 @@ let { stdenv, lib, fetchurl, fetchpatch, makeWrapper , glibc, zlib, readline, openssl, icu, lz4, zstd, systemdLibs, libossp_uuid , pkg-config, libxml2, tzdata, libkrb5, substituteAll, darwin - , linux-pam + , linux-pam, bison, flex, perl, docbook_xml_dtd_45, docbook-xsl-nons, libxslt , removeReferencesTo, writeShellApplication @@ -117,7 +117,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; @@ -153,7 +154,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) @@ -166,7 +168,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 { @@ -182,7 +184,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) diff --git a/third_party/nixpkgs/pkgs/servers/unfs3/default.nix b/third_party/nixpkgs/pkgs/servers/unfs3/default.nix index afd1ac1497..448f7a2ca8 100644 --- a/third_party/nixpkgs/pkgs/servers/unfs3/default.nix +++ b/third_party/nixpkgs/pkgs/servers/unfs3/default.nix @@ -30,12 +30,12 @@ stdenv.mkDerivation rec { meta = { description = "User-space NFSv3 file system server"; - longDescription = - '' UNFS3 is a user-space implementation of the NFSv3 server - specification. It provides a daemon for the MOUNT and NFS - protocols, which are used by NFS clients for accessing files on the - server. - ''; + longDescription = '' + UNFS3 is a user-space implementation of the NFSv3 server + specification. It provides a daemon for the MOUNT and NFS + protocols, which are used by NFS clients for accessing files on the + server. + ''; # The old http://unfs3.sourceforge.net/ has a # http-equiv="refresh" pointing here, so we can assume that diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/action_mailer_ca_cert.patch b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/action_mailer_ca_cert.patch index d6a4ff8f2a..05204c540d 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/action_mailer_ca_cert.patch +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/default.nix index 6fb6aa9223..1f702d1350 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/mail_receiver/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/mail_receiver/default.nix index d5fbb4fb39..b44f5eb113 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/mail_receiver/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix index ff7df0dfc7..289ed1b659 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix index ba20e3a9a0..9dc50e51db 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix index 235f5f7177..00f447b49c 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix index 701b5479ce..e5413340c1 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix index bb21a6bdb4..38c9507e1d 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix index eb4e2861ed..7da74adeda 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock index 87fbcc8f72..46511cf34d 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix index c47454aad4..b7f3d24727 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix index 73552eb610..bed6505c5f 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix index 90fd6927ac..58433a887e 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix index e397bf16c1..ac8d308b1f 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile index 54a39883d0..3d802617c3 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock index e7939eadbb..69a3881cca 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/Gemfile.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix index 29812ea63b..d6af6a0847 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/gemset.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/gemset.nix index b6f3158174..9e889f9884 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/gemset.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix index 656acb2a9b..52bbc5ca2d 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix index 150cf2216c..3403667cc1 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix index c44d542094..0e24578d36 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix index f479e16cfd..554cce44ae 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix index 2a5b3ff7f5..a75392526c 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile index bae9d8b985..4aa1e31553 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index 4437a2d368..361daa0c70 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 16474c3367..b6f82fc701 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/unicorn_logging_and_timeout.patch b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/unicorn_logging_and_timeout.patch index d85e4bf986..897cad1b66 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/unicorn_logging_and_timeout.patch +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/discourse/update.py b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/update.py index 972054904b..65e97ec5b2 100755 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/update.py +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/netbox/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/netbox/default.nix index 1459ee2392..d494d128e5 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/netbox/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix index 34296541fd..6d5be6e402 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/webdav/default.nix b/third_party/nixpkgs/pkgs/servers/webdav/default.nix index c1c72db242..312ae18246 100644 --- a/third_party/nixpkgs/pkgs/servers/webdav/default.nix +++ b/third_party/nixpkgs/pkgs/servers/webdav/default.nix @@ -2,22 +2,27 @@ buildGo123Module rec { pname = "webdav"; - version = "5.3.0"; + version = "5.4.2"; src = fetchFromGitHub { owner = "hacdias"; repo = "webdav"; rev = "v${version}"; - sha256 = "sha256-F7ehl7Q/66ah6/N06U8Ld3bUjuF5tpJlNS/aWEorQaI="; + sha256 = "sha256-a1XAlmEW8gNTgVZiJ200CP/wvbwvyv4Lc3L6KP/4Mik="; }; - vendorHash = "sha256-FvTDqGr3B05osuJvLj7J04JMeamZc/X6YeLY24ej7Ak="; + vendorHash = "sha256-d8WauJ1i429dr79iHgrbFRZCmx+W6OobSINy8aNGG6w="; + + __darwinAllowLocalNetworking = true; meta = with lib; { description = "Simple WebDAV server"; homepage = "https://github.com/hacdias/webdav"; license = licenses.mit; - maintainers = with maintainers; [ pmy ]; + maintainers = with maintainers; [ + pmy + pbsds + ]; mainProgram = "webdav"; }; } diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/net.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/net.nix index 755285e550..681b486667 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/net.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/shells/powershell/default.nix b/third_party/nixpkgs/pkgs/shells/powershell/default.nix index a29bb9c990..d9b74cf564 100644 --- a/third_party/nixpkgs/pkgs/shells/powershell/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/shells/rush/default.nix b/third_party/nixpkgs/pkgs/shells/rush/default.nix index 7b60617897..122a16680e 100644 --- a/third_party/nixpkgs/pkgs/shells/rush/default.nix +++ b/third_party/nixpkgs/pkgs/shells/rush/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { broken = stdenv.hostPlatform.isDarwin; description = "Restricted User Shell"; - longDescription = - '' GNU Rush is a Restricted User Shell, designed for sites + longDescription = '' + GNU Rush is a Restricted User Shell, designed for sites providing limited remote access to their resources, such as svn or git repositories, scp, or the like. Using a sophisticated configuration file, Rush gives you complete diff --git a/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix index b09fb37002..2fe86fa4a7 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/shells/zsh/zsh-abbr/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-abbr/default.nix index 5294d7831a..c9e0e9de85 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-abbr/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/shells/zsh/zsh-system-clipboard/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-system-clipboard/default.nix index 10853b4dc0..3cfe47e77f 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-system-clipboard/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/test/build-environment-info/default.nix b/third_party/nixpkgs/pkgs/test/build-environment-info/default.nix new file mode 100644 index 0000000000..f0c71d8d1e --- /dev/null +++ b/third_party/nixpkgs/pkgs/test/build-environment-info/default.nix @@ -0,0 +1,11 @@ +{ runCommand }: + +# 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" { } '' + ulimit -a + + # Always fail so that this job can easily be restarted. + exit 1 +'' diff --git a/third_party/nixpkgs/pkgs/test/default.nix b/third_party/nixpkgs/pkgs/test/default.nix index e300672ddc..c87a4a1522 100644 --- a/third_party/nixpkgs/pkgs/test/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix b/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix index b53e3d6f8a..3c07a5e775 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/admin/gimme-aws-creds/default.nix b/third_party/nixpkgs/pkgs/tools/admin/gimme-aws-creds/default.nix index 49a7f60e33..69db86d459 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/gimme-aws-creds/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix index 4e574e407e..f2e5433022 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/admin/ssh-import-id/default.nix b/third_party/nixpkgs/pkgs/tools/admin/ssh-import-id/default.nix deleted file mode 100644 index e4202033b9..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix index 18988edc8f..6f1fa3ff29 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/admin/swapspace/default.nix b/third_party/nixpkgs/pkgs/tools/admin/swapspace/default.nix index fa379e6a2d..c7c453f05b 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/swapspace/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/archivers/xarchive/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/xarchive/default.nix deleted file mode 100644 index 193e319caf..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/audio/whisper-ctranslate2/default.nix b/third_party/nixpkgs/pkgs/tools/audio/whisper-ctranslate2/default.nix index b442e25fb2..389d6f0daf 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/whisper-ctranslate2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/whisper-ctranslate2/default.nix @@ -1,28 +1,28 @@ -{ lib -, python3 -, fetchFromGitHub -, nix-update-script +{ + lib, + python3, + python3Packages, + fetchFromGitHub, + nix-update-script, }: let pname = "whisper-ctranslate2"; - version = "0.4.5"; + version = "0.4.6"; in -python3.pkgs.buildPythonApplication { +python3Packages.buildPythonApplication { inherit pname version; pyproject = true; - disabled = python3.pythonOlder "3.6"; - src = fetchFromGitHub { owner = "Softcatala"; repo = "whisper-ctranslate2"; - rev = version; - hash = "sha256-hnotnEpw+5hVWVKknZHqiBSeDWy9XEjL3ojQD2ZXbAM="; + rev = "refs/tags/${version}"; + hash = "sha256-sIkZIzSGqPbjg9BMkcciGFr024Pd8ohXl/NdbsxhjH0="; }; - build-system = [ python3.pkgs.setuptools ]; + build-system = [ python3Packages.setuptools ]; - dependencies = with python3.pkgs; [ + dependencies = with python3Packages; [ ctranslate2 faster-whisper numpy @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication { tqdm ]; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python3Packages; [ nose2 ]; @@ -44,12 +44,12 @@ python3.pkgs.buildPythonApplication { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Whisper command line client compatible with original OpenAI client based on CTranslate2"; homepage = "https://github.com/Softcatala/whisper-ctranslate2"; changelog = "https://github.com/Softcatala/whisper-ctranslate2/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ happysalada ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ happysalada ]; mainProgram = "whisper-ctranslate2"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix b/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix index 70922a0f32..c356f17cb4 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix @@ -83,16 +83,18 @@ multiStdenv.mkDerivation (finalAttrs: { }; # Unpack subproject sources - postUnpack = ''( - cd "$sourceRoot/subprojects" - cp -R --no-preserve=mode,ownership ${asio} asio - cp -R --no-preserve=mode,ownership ${bitsery} bitsery - cp -R --no-preserve=mode,ownership ${clap} clap - cp -R --no-preserve=mode,ownership ${function2} function2 - cp -R --no-preserve=mode,ownership ${ghc_filesystem} ghc_filesystem - cp -R --no-preserve=mode,ownership ${tomlplusplus} tomlplusplus - cp -R --no-preserve=mode,ownership ${vst3} vst3 - )''; + postUnpack = '' + ( + cd "$sourceRoot/subprojects" + cp -R --no-preserve=mode,ownership ${asio} asio + cp -R --no-preserve=mode,ownership ${bitsery} bitsery + cp -R --no-preserve=mode,ownership ${clap} clap + cp -R --no-preserve=mode,ownership ${function2} function2 + cp -R --no-preserve=mode,ownership ${ghc_filesystem} ghc_filesystem + cp -R --no-preserve=mode,ownership ${tomlplusplus} tomlplusplus + cp -R --no-preserve=mode,ownership ${vst3} vst3 + ) + ''; patches = [ # Hard code bitbridge & runtime dependencies diff --git a/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix b/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix index 11498abb45..bf3c93ab51 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix index 4cf618826b..0926461974 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt ]; - installPhase = - '' mkdir -p "$out/bin" - cp -v httpfs2 "$out/bin" + installPhase = '' + mkdir -p "$out/bin" + cp -v httpfs2 "$out/bin" - mkdir -p "$out/share/man/man1" - cp -v *.1 "$out/share/man/man1" - ''; + mkdir -p "$out/share/man/man1" + cp -v *.1 "$out/share/man/man1" + ''; meta = { description = "FUSE-based HTTP filesystem for Linux"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix index a4173de6cb..ddc27c1029 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tar2ext4"; - version = "0.12.7"; + version = "0.12.8"; src = fetchFromGitHub { owner = "microsoft"; repo = "hcsshim"; rev = "v${version}"; - sha256 = "sha256-ObNBeHmQ4VqnZdUbKxLxuXeRw2jVPQxroO2HK4Wp8tg="; + sha256 = "sha256-20+y7wFV3HxkrS1qHNq2neIc826HU5AXzuqqS7Ll2gg="; }; sourceRoot = "${src.name}/cmd/tar2ext4"; diff --git a/third_party/nixpkgs/pkgs/tools/games/minecraft/mcaselector/default.nix b/third_party/nixpkgs/pkgs/tools/games/minecraft/mcaselector/default.nix index 610a46526a..cdec4e1392 100644 --- a/third_party/nixpkgs/pkgs/tools/games/minecraft/mcaselector/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/minecraft/mcaselector/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "mcaselector"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { url = "https://github.com/Querz/mcaselector/releases/download/${finalAttrs.version}/mcaselector-${finalAttrs.version}.jar"; - hash = "sha256-4czkp7+akZEPvnYLMFGrqrhBYafDVxDo1iQZYwvaARE="; + hash = "sha256-3Kq3vkBiz3A5tUSLNqDHNpognF2Q9HhU8WXwdRVxfSE="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/goverlay/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/goverlay/default.nix index 01e6b80efa..f4c827d334 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/goverlay/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix deleted file mode 100644 index 433c11d956..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/graphics/mangohud/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/mangohud/default.nix index 483be77920..391234ae19 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/mangohud/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/mangohud/default.nix @@ -107,15 +107,17 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "doc" "man" ]; # Unpack subproject sources - postUnpack = ''( - cd "$sourceRoot/subprojects" - ${lib.optionalString finalAttrs.finalPackage.doCheck '' - cp -R --no-preserve=mode,ownership ${cmocka.src} cmocka - ''} - cp -R --no-preserve=mode,ownership ${implot.src} implot-${implot.version} - cp -R --no-preserve=mode,ownership ${imgui.src} imgui-${imgui.version} - cp -R --no-preserve=mode,ownership ${vulkan-headers.src} Vulkan-Headers-${vulkan-headers.version} - )''; + postUnpack = '' + ( + cd "$sourceRoot/subprojects" + ${lib.optionalString finalAttrs.finalPackage.doCheck '' + cp -R --no-preserve=mode,ownership ${cmocka.src} cmocka + ''} + cp -R --no-preserve=mode,ownership ${implot.src} implot-${implot.version} + cp -R --no-preserve=mode,ownership ${imgui.src} imgui-${imgui.version} + cp -R --no-preserve=mode,ownership ${vulkan-headers.src} Vulkan-Headers-${vulkan-headers.version} + ) + ''; patches = [ # Add @libraryPath@ template variable to fix loading the preload diff --git a/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix index 8426fbcc20..107b36e551 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/graphics/plotutils/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/plotutils/default.nix index 29b4c4b35f..da1aeb806e 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/plotutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/plotutils/default.nix @@ -37,21 +37,21 @@ stdenv.mkDerivation rec { meta = { description = "Powerful C/C++ library for exporting 2D vector graphics"; - longDescription = - '' The GNU plotutils package contains software for both programmers and - technical users. Its centerpiece is libplot, a powerful C/C++ - function library for exporting 2-D vector graphics in many file - formats, both vector and raster. It can also do vector graphics - animations. + longDescription = '' + The GNU plotutils package contains software for both programmers and + technical users. Its centerpiece is libplot, a powerful C/C++ + function library for exporting 2-D vector graphics in many file + formats, both vector and raster. It can also do vector graphics + animations. - libplot is device-independent in the sense that its API (application - programming interface) does not depend on the type of graphics file - to be exported. + libplot is device-independent in the sense that its API (application + programming interface) does not depend on the type of graphics file + to be exported. - Besides libplot, the package contains command-line programs for - plotting scientific data. Many of them use libplot to export - graphics. - ''; + Besides libplot, the package contains command-line programs for + plotting scientific data. Many of them use libplot to export + graphics. + ''; homepage = "https://www.gnu.org/software/plotutils/"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/povray/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/povray/default.nix index 71a8fbdd7f..2f3a644898 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/povray/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/povray/default.nix @@ -46,14 +46,15 @@ stdenv.mkDerivation (finalAttrs: { # the installPhase wants to put files into $HOME. I let it put the files # to $TMPDIR, so they don't get into the $out - postPatch = '' cd unix - ./prebuild.sh - cd .. - sed -i -e 's/^povconfuser.*/povconfuser=$(TMPDIR)\/povray/' Makefile.{am,in} - sed -i -e 's/^povuser.*/povuser=$(TMPDIR)\/.povray/' Makefile.{am,in} - sed -i -e 's/^povowner.*/povowner=nobody/' Makefile.{am,in} - sed -i -e 's/^povgroup.*/povgroup=nogroup/' Makefile.{am,in} - ''; + postPatch = '' + cd unix + ./prebuild.sh + cd .. + sed -i -e 's/^povconfuser.*/povconfuser=$(TMPDIR)\/povray/' Makefile.{am,in} + sed -i -e 's/^povuser.*/povuser=$(TMPDIR)\/.povray/' Makefile.{am,in} + sed -i -e 's/^povowner.*/povowner=nobody/' Makefile.{am,in} + sed -i -e 's/^povgroup.*/povgroup=nogroup/' Makefile.{am,in} + ''; configureFlags = [ "COMPILED_BY=NixOS" diff --git a/third_party/nixpkgs/pkgs/tools/graphics/xcur2png/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/xcur2png/default.nix index 6419752cac..768207cf67 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/xcur2png/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix deleted file mode 100644 index e58db09f70..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/default.nix index bb466e38ba..d8439d6c14 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/libinput-gestures/default.nix +++ b/third_party/nixpkgs/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 = "ref/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/third_party/nixpkgs/pkgs/tools/misc/arch-install-scripts/default.nix b/third_party/nixpkgs/pkgs/tools/misc/arch-install-scripts/default.nix index a872683092..307b298a7e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/arch-install-scripts/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/bepasty/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bepasty/default.nix index 8e9b0ce6e0..8e67cbab61 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bepasty/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/colorpicker/default.nix b/third_party/nixpkgs/pkgs/tools/misc/colorpicker/default.nix deleted file mode 100644 index 8b45da1762..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/cyberchef/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cyberchef/default.nix index 11fc25bd9d..2d29f582ff 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cyberchef/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cyberchef/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "cyberchef"; - version = "10.19.2"; + version = "10.19.4"; src = fetchzip { url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip"; - sha256 = "sha256-+ICoJnW92IOi/QDwJXRNxP9tN99hNfH6BwLKJvzZFF4="; + sha256 = "sha256-eOMo7kdxC5HfmMrKUhGZU3vnBXibO2Fz1ftIS9RAbjY="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index 1dc01c72fa..fc85e55b66 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix index f070b028f6..70df226929 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -21,14 +21,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.10.0"; + version = "2024.10.2"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-EdxCq/123OJm63NBfGnt5pfqdUXPti+NmbSVRu/gwqc="; + hash = "sha256-WEsFgmwH6OGkAn1c0h/HBhBJr2329YHSKMZzjEDTKNg="; }; build-systems = with python.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/grub/default.nix b/third_party/nixpkgs/pkgs/tools/misc/grub/default.nix index 67bb98474c..b599845679 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grub/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grub/default.nix @@ -97,8 +97,8 @@ stdenv.mkDerivation rec { separateDebugInfo = !xenSupport; - preConfigure = - '' for i in "tests/util/"*.in + preConfigure = '' + for i in "tests/util/"*.in do sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g' done @@ -184,17 +184,17 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GNU GRUB, the Grand Unified Boot Loader"; - longDescription = - '' GNU GRUB is a Multiboot boot loader. It was derived from GRUB, GRand - Unified Bootloader, which was originally designed and implemented by - Erich Stefan Boleyn. + longDescription = '' + GNU GRUB is a Multiboot boot loader. It was derived from GRUB, GRand + Unified Bootloader, which was originally designed and implemented by + Erich Stefan Boleyn. - Briefly, the boot loader is the first software program that runs when a - computer starts. It is responsible for loading and transferring - control to the operating system kernel software (such as the Hurd or - the Linux). The kernel, in turn, initializes the rest of the - operating system (e.g., GNU). - ''; + Briefly, the boot loader is the first software program that runs when a + computer starts. It is responsible for loading and transferring + control to the operating system kernel software (such as the Hurd or + the Linux). The kernel, in turn, initializes the rest of the + operating system (e.g., GNU). + ''; homepage = "https://www.gnu.org/software/grub/"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/default.nix b/third_party/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/default.nix index b6883e5708..20c54ec2cb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/default.nix @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PvGrub image for use for booting PV Xen guests"; - longDescription = - '' This package provides a PvGrub image for booting Para-Virtualized (PV) + longDescription = '' + This package provides a PvGrub image for booting Para-Virtualized (PV) Xen guests ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/instaloader/default.nix b/third_party/nixpkgs/pkgs/tools/misc/instaloader/default.nix index 2ab8395eca..f1201a2d50 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/instaloader/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix index e3b06b2f76..77cb107fa0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix @@ -7,17 +7,17 @@ buildGo123Module rec { pname = "jfrog-cli"; - version = "2.70.0"; + version = "2.71.0"; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-ddwGmXb616kDNNNTNUykiEWX/2ihUpgetZ/va943RiQ="; + hash = "sha256-hblOe6YMlfWBVvWD5MKEKvAB55jUx98OMeqFDdgVrmM="; }; proxyVendor = true; - vendorHash = "sha256-1xUCQF2UDHAmzibixv9pR6G2gvXxIStCyBuz608UpIQ="; + vendorHash = "sha256-px+eXSIOe3v4iNBibXAtcFMROrHq6YYJIHbCC7nhNS4="; postPatch = '' # Patch out broken test cleanup. diff --git a/third_party/nixpkgs/pkgs/tools/misc/mpremote/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mpremote/default.nix index b55efaa3b0..1765b864dc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mpremote/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/mutagen-compose/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mutagen-compose/default.nix index 33358017f2..ad6e236f04 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mutagen-compose/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix index a2a0b255d0..219f7b81c5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.109.0"; + version = "0.110.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - hash = "sha256-ROAapCGIRD5kdA3k1LjSxdfICLRgBcQORe6wW1bszNI="; + hash = "sha256-bDtP7EFKus0NJpLccbD+HlzEusc+KAbKWmS/KGthtwY="; }; # proxy vendor to avoid hash mismatches between linux and macOS proxyVendor = true; - vendorHash = "sha256-4MRXwp428d9oJPHrgOaGCaIFpRAIOpL/AYc/fLPAVBk="; + vendorHash = "sha256-pDDEqtXu167b+J1+k7rC1BE5/ehxzG0ZAkhxqmJpHsg="; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcontribcol"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix b/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix index 00e8b333a4..a5c49ca7c0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix @@ -32,23 +32,23 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Shell tool for executing jobs in parallel"; - longDescription = - '' GNU Parallel is a shell tool for executing jobs in parallel. A job - is typically a single command or a small script that has to be run - for each of the lines in the input. The typical input is a list of - files, a list of hosts, a list of users, or a list of tables. + longDescription = '' + GNU Parallel is a shell tool for executing jobs in parallel. A job + is typically a single command or a small script that has to be run + for each of the lines in the input. The typical input is a list of + files, a list of hosts, a list of users, or a list of tables. - If you use xargs today you will find GNU Parallel very easy to use. - If you write loops in shell, you will find GNU Parallel may be able - to replace most of the loops and make them run faster by running - jobs in parallel. If you use ppss or pexec you will find GNU - Parallel will often make the command easier to read. + If you use xargs today you will find GNU Parallel very easy to use. + If you write loops in shell, you will find GNU Parallel may be able + to replace most of the loops and make them run faster by running + jobs in parallel. If you use ppss or pexec you will find GNU + Parallel will often make the command easier to read. - GNU Parallel makes sure output from the commands is the same output - as you would get had you run the commands sequentially. This makes - it possible to use output from GNU Parallel as input for other - programs. - ''; + GNU Parallel makes sure output from the commands is the same output + as you would get had you run the commands sequentially. This makes + it possible to use output from GNU Parallel as input for other + programs. + ''; homepage = "https://www.gnu.org/software/parallel/"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pferd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pferd/default.nix index 260ba3de56..df6465ff85 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pferd/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix b/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix index e952fa6f25..68487255d9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix @@ -41,27 +41,27 @@ stdenv.mkDerivation rec { description = "Window manager that multiplexes a physical terminal"; license = licenses.gpl3Plus; - longDescription = - '' GNU Screen is a full-screen window manager that multiplexes a physical - terminal between several processes, typically interactive shells. - Each virtual terminal provides the functions of the DEC VT100 - terminal and, in addition, several control functions from the ANSI - X3.64 (ISO 6429) and ISO 2022 standards (e.g., insert/delete line - and support for multiple character sets). There is a scrollback - history buffer for each virtual terminal and a copy-and-paste - mechanism that allows the user to move text regions between windows. - When screen is called, it creates a single window with a shell in it - (or the specified command) and then gets out of your way so that you - can use the program as you normally would. Then, at any time, you - can create new (full-screen) windows with other programs in them - (including more shells), kill the current window, view a list of the - active windows, turn output logging on and off, copy text between - windows, view the scrollback history, switch between windows, etc. - All windows run their programs completely independent of each other. - Programs continue to run when their window is currently not visible - and even when the whole screen session is detached from the users - terminal. - ''; + longDescription = '' + GNU Screen is a full-screen window manager that multiplexes a physical + terminal between several processes, typically interactive shells. + Each virtual terminal provides the functions of the DEC VT100 + terminal and, in addition, several control functions from the ANSI + X3.64 (ISO 6429) and ISO 2022 standards (e.g., insert/delete line + and support for multiple character sets). There is a scrollback + history buffer for each virtual terminal and a copy-and-paste + mechanism that allows the user to move text regions between windows. + When screen is called, it creates a single window with a shell in it + (or the specified command) and then gets out of your way so that you + can use the program as you normally would. Then, at any time, you + can create new (full-screen) windows with other programs in them + (including more shells), kill the current window, view a list of the + active windows, turn output logging on and off, copy text between + windows, view the scrollback history, switch between windows, etc. + All windows run their programs completely independent of each other. + Programs continue to run when their window is currently not visible + and even when the whole screen session is detached from the users + terminal. + ''; platforms = platforms.unix; maintainers = [ ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix b/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix index 587d07eaf5..66fac2661a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/statserial/default.nix b/third_party/nixpkgs/pkgs/tools/misc/statserial/default.nix index 86736a8638..129cf9ad50 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/statserial/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/statserial/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { description = "Display serial port modem status lines"; license = licenses.gpl2Plus; - longDescription = - '' Statserial displays a table of the signals on a standard 9-pin or + longDescription = '' + Statserial displays a table of the signals on a standard 9-pin or 25-pin serial port, and indicates the status of the handshaking lines. It can be useful for debugging problems with serial ports or modems. - ''; + ''; platforms = platforms.unix; maintainers = with maintainers; [ rps ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix b/third_party/nixpkgs/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix index 33c09ba83e..8b6703ac35 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix b/third_party/nixpkgs/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix index d09191633c..12cda347fc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix index e0a0cfe980..c39b98f162 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/tailspin/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tailspin/default.nix index 25aba0ebb9..51e0c19590 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tailspin/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/tmux-sessionizer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmux-sessionizer/default.nix index e60ef9fb4c..2d2deb07db 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmux-sessionizer/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/uucp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/uucp/default.nix index 325ad13555..35bc7a2721 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/uucp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/uucp/default.nix @@ -36,12 +36,12 @@ stdenv.mkDerivation (finalAttrs: { description = "Unix-unix cp over serial line, also includes cu program"; mainProgram = "uucp"; - longDescription = - '' Taylor UUCP is a free implementation of UUCP and is the standard - UUCP used on the GNU system. If you don't know what UUCP is chances - are, nowadays, that you won't need it. If you do need it, you've - just found one of the finest UUCP implementations available. - ''; + longDescription = '' + Taylor UUCP is a free implementation of UUCP and is the standard + UUCP used on the GNU system. If you don't know what UUCP is chances + are, nowadays, that you won't need it. If you do need it, you've + just found one of the finest UUCP implementations available. + ''; homepage = "https://www.gnu.org/software/uucp/uucp.html"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/vector/Cargo.lock b/third_party/nixpkgs/pkgs/tools/misc/vector/Cargo.lock index d7a5d84312..015e4f8be0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vector/Cargo.lock +++ b/third_party/nixpkgs/pkgs/tools/misc/vector/Cargo.lock @@ -248,9 +248,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 = "apache-avro" @@ -381,9 +381,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.12" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +checksum = "998282f8f49ccd6116b0ed8a4de0fbd3151697920e7c7533416d6e25e76434a7" dependencies = [ "brotli", "flate2", @@ -404,7 +404,7 @@ dependencies = [ "async-lock 2.8.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", + "fastrand 2.1.1", "futures-lite", "slab", ] @@ -459,12 +459,12 @@ dependencies = [ "async-stream", "async-trait", "base64 0.22.1", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "fnv", "futures-util", "http 1.1.0", - "indexmap 2.5.0", + "indexmap 2.6.0", "mime", "multer", "num-traits", @@ -487,11 +487,11 @@ dependencies = [ "Inflector", "async-graphql-parser", "darling 0.20.8", - "proc-macro-crate 3.1.0", - "proc-macro2 1.0.86", + "proc-macro-crate 3.2.0", + "proc-macro2 1.0.87", "quote 1.0.37", "strum 0.26.2", - "syn 2.0.75", + "syn 2.0.79", "thiserror", ] @@ -513,8 +513,8 @@ version = "7.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69117c43c01d81a69890a9f5dd6235f2f027ca8d1ec62d6d3c5e01ca0edb4f2b" dependencies = [ - "bytes 1.7.1", - "indexmap 2.5.0", + "bytes 1.7.2", + "indexmap 2.6.0", "serde", "serde_json", ] @@ -565,7 +565,7 @@ dependencies = [ "futures-lite", "parking", "polling 3.3.0", - "rustix 0.38.31", + "rustix 0.38.37", "slab", "tracing 0.1.40", "waker-fn", @@ -599,8 +599,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbc1f1a75fd07f0f517322d103211f12d757658e91676def9a2e688774656c60" dependencies = [ "base64 0.21.7", - "bytes 1.7.1", - "futures 0.3.30", + "bytes 1.7.2", + "futures 0.3.31", "http 0.2.9", "memchr", "nkeys 0.3.2", @@ -650,7 +650,7 @@ dependencies = [ "cfg-if", "event-listener 3.0.1", "futures-lite", - "rustix 0.38.31", + "rustix 0.38.37", "windows-sys 0.48.0", ] @@ -672,9 +672,9 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -689,7 +689,7 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix 0.38.31", + "rustix 0.38.37", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -697,9 +697,9 @@ dependencies = [ [[package]] name = "async-stream" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" dependencies = [ "async-stream-impl", "futures-core", @@ -708,13 +708,13 @@ dependencies = [ [[package]] name = "async-stream-impl" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -725,13 +725,13 @@ checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" [[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 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -765,8 +765,8 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", - "fastrand 2.0.1", + "bytes 1.7.2", + "fastrand 2.1.1", "hex", "http 0.2.9", "hyper 0.14.28", @@ -798,7 +798,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.9", "http-body 0.4.5", "pin-project-lite", @@ -820,7 +820,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "fastrand 2.0.1", + "fastrand 2.1.1", "http 0.2.9", "percent-encoding", "tracing 0.1.40", @@ -866,8 +866,8 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", - "fastrand 2.0.1", + "bytes 1.7.2", + "fastrand 2.1.1", "http 0.2.9", "regex", "tracing 0.1.40", @@ -889,7 +889,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.9", "regex", "tracing 0.1.40", @@ -911,7 +911,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.9", "regex", "tracing 0.1.40", @@ -933,7 +933,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.9", "regex", "tracing 0.1.40", @@ -959,7 +959,7 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.9", "http-body 0.4.5", "once_cell", @@ -985,8 +985,8 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", - "fastrand 2.0.1", + "bytes 1.7.2", + "fastrand 2.1.1", "http 0.2.9", "regex", "tracing 0.1.40", @@ -1031,7 +1031,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.9", "regex", "tracing 0.1.40", @@ -1053,7 +1053,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.9", "regex", "tracing 0.1.40", @@ -1075,7 +1075,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.9", "regex", "tracing 0.1.40", @@ -1106,16 +1106,16 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.2.3" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5df1b0fa6be58efe9d4ccc257df0a53b89cd8909e86591a13ca54817c87517be" +checksum = "cc8db6904450bafe7473c6ca9123f88cc11089e41a025408f992db4e22d3be68" dependencies = [ "aws-credential-types", "aws-smithy-eventstream", "aws-smithy-http", "aws-smithy-runtime-api", "aws-smithy-types", - "bytes 1.7.1", + "bytes 1.7.2", "form_urlencoded", "hex", "hmac", @@ -1147,7 +1147,7 @@ checksum = "c5a373ec01aede3dd066ec018c1bc4e8f5dd11b2c11c59c8eef1a5c68101f397" dependencies = [ "aws-smithy-http", "aws-smithy-types", - "bytes 1.7.1", + "bytes 1.7.2", "crc32c", "crc32fast", "hex", @@ -1162,25 +1162,25 @@ dependencies = [ [[package]] name = "aws-smithy-eventstream" -version = "0.60.4" +version = "0.60.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6363078f927f612b970edf9d1903ef5cef9a64d1e8423525ebb1f0a1633c858" +checksum = "cef7d0a272725f87e51ba2bf89f8c21e4df61b9e49ae1ac367a6d69916ef7c90" dependencies = [ "aws-smithy-types", - "bytes 1.7.1", + "bytes 1.7.2", "crc32fast", ] [[package]] name = "aws-smithy-http" -version = "0.60.10" +version = "0.60.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01dbcb6e2588fd64cfb6d7529661b06466419e4c54ed1c62d6510d2d0350a728" +checksum = "5c8bc3e8fdc6b8d07d976e301c02fe553f72a39b7a9fea820e023268467d7ab6" dependencies = [ "aws-smithy-eventstream", "aws-smithy-runtime-api", "aws-smithy-types", - "bytes 1.7.1", + "bytes 1.7.2", "bytes-utils", "futures-core", "http 0.2.9", @@ -1213,16 +1213,16 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1ce695746394772e7000b39fe073095db6d45a862d0767dd5ad0ac0d7f8eb87" +checksum = "a065c0fe6fdbdf9f11817eb68582b2ab4aff9e9c39e986ae48f7ec576c6322db" dependencies = [ "aws-smithy-async", "aws-smithy-http", "aws-smithy-runtime-api", "aws-smithy-types", - "bytes 1.7.1", - "fastrand 2.0.1", + "bytes 1.7.2", + "fastrand 2.1.1", "h2 0.3.26", "http 0.2.9", "http-body 0.4.5", @@ -1246,7 +1246,7 @@ checksum = "e086682a53d3aa241192aa110fa8dfce98f2f5ac2ead0de84d41582c7e8fdb96" dependencies = [ "aws-smithy-async", "aws-smithy-types", - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.9", "http 1.1.0", "pin-project-lite", @@ -1257,13 +1257,14 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.4" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "273dcdfd762fae3e1650b8024624e7cd50e484e37abdab73a7a706188ad34543" +checksum = "147100a7bea70fa20ef224a6bad700358305f5dc0f84649c53769761395b355b" dependencies = [ "base64-simd", - "bytes 1.7.1", + "bytes 1.7.2", "bytes-utils", + "futures-core", "http 0.2.9", "http 1.1.0", "http-body 0.4.5", @@ -1276,6 +1277,8 @@ dependencies = [ "ryu", "serde", "time", + "tokio", + "tokio-util", ] [[package]] @@ -1297,7 +1300,7 @@ dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", "aws-smithy-types", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "tracing 0.1.40", ] @@ -1308,9 +1311,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.3.4", "bitflags 1.3.2", - "bytes 1.7.1", + "bytes 1.7.2", "futures-util", "http 0.2.9", "http-body 0.4.5", @@ -1323,13 +1326,40 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper", + "sync_wrapper 0.1.2", "tokio", "tower", "tower-layer", "tower-service", ] +[[package]] +name = "axum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +dependencies = [ + "async-trait", + "axum-core 0.4.5", + "bytes 1.7.2", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper 1.0.1", + "tower", + "tower-layer", + "tower-service", +] + [[package]] name = "axum-core" version = "0.3.4" @@ -1337,7 +1367,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" dependencies = [ "async-trait", - "bytes 1.7.1", + "bytes 1.7.2", "futures-util", "http 0.2.9", "http-body 0.4.5", @@ -1347,6 +1377,26 @@ dependencies = [ "tower-service", ] +[[package]] +name = "axum-core" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" +dependencies = [ + "async-trait", + "bytes 1.7.2", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 1.0.1", + "tower-layer", + "tower-service", +] + [[package]] name = "azure_core" version = "0.17.0" @@ -1355,9 +1405,9 @@ checksum = "4ccd63c07d1fbfb3d4543d7ea800941bf5a30db1911b9b9e4db3b2c4210a434f" dependencies = [ "async-trait", "base64 0.21.7", - "bytes 1.7.1", + "bytes 1.7.2", "dyn-clone", - "futures 0.3.30", + "futures 0.3.31", "getrandom 0.2.15", "http-types", "log", @@ -1366,7 +1416,7 @@ dependencies = [ "quick-xml", "rand 0.8.5", "reqwest 0.11.26", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "serde", "serde_json", "time", @@ -1383,7 +1433,7 @@ dependencies = [ "async-lock 3.4.0", "async-trait", "azure_core", - "futures 0.3.30", + "futures 0.3.31", "log", "oauth2", "pin-project", @@ -1404,8 +1454,8 @@ dependencies = [ "RustyXML", "async-trait", "azure_core", - "bytes 1.7.1", - "futures 0.3.30", + "bytes 1.7.2", + "futures 0.3.31", "hmac", "log", "serde", @@ -1426,8 +1476,8 @@ dependencies = [ "RustyXML", "azure_core", "azure_storage", - "bytes 1.7.1", - "futures 0.3.30", + "bytes 1.7.2", + "futures 0.3.31", "log", "serde", "serde_derive", @@ -1567,7 +1617,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afb15541e888071f64592c0b4364fdff21b7cb0a247f984296699351963a8721" dependencies = [ "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -1609,7 +1659,7 @@ dependencies = [ "async-channel", "async-lock 2.8.0", "async-task", - "fastrand 2.0.1", + "fastrand 2.1.1", "futures-io", "futures-lite", "piper", @@ -1633,7 +1683,7 @@ checksum = "0aed08d3adb6ebe0eff737115056652670ae290f177759aac19c30456135f94c" dependencies = [ "base64 0.22.1", "bollard-stubs", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "futures-core", "futures-util", @@ -1641,7 +1691,7 @@ dependencies = [ "home", "http 1.1.0", "http-body-util", - "hyper 1.2.0", + "hyper 1.4.1", "hyper-named-pipe", "hyper-rustls 0.26.0", "hyper-util", @@ -1674,7 +1724,7 @@ dependencies = [ "chrono", "serde", "serde_repr", - "serde_with 3.9.0", + "serde_with 3.11.0", ] [[package]] @@ -1695,17 +1745,17 @@ checksum = "f404657a7ea7b5249e36808dff544bc88a28f26e0ac40009f674b7a009d14be3" dependencies = [ "once_cell", "proc-macro-crate 2.0.0", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", "syn_derive", ] [[package]] name = "brotli" -version = "6.0.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" +checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1761,7 +1811,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", - "regex-automata 0.4.4", + "regex-automata 0.4.8", "serde", ] @@ -1788,7 +1838,7 @@ version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] @@ -1817,9 +1867,9 @@ dependencies = [ [[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" dependencies = [ "serde", ] @@ -1830,7 +1880,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e47d3a8076e283f3acd27400535992edb3ba4b5bb72f8891ad8fbe7932a7d4b9" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "either", ] @@ -1841,13 +1891,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] -name = "cargo_toml" -version = "0.20.4" +name = "cargo-lock" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad639525b1c67b6a298f378417b060fbc04618bea559482a8484381cce27d965" +checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72" dependencies = [ + "semver 1.0.23", "serde", - "toml", + "toml 0.7.8", + "url", ] [[package]] @@ -1968,9 +2020,9 @@ dependencies = [ [[package]] name = "chrono-tz" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb" +checksum = "cd6dd8046d00723a59a2f8c5f295c515b9bb9a331ee4f8f3d4dd49e428acd3b6" dependencies = [ "chrono", "chrono-tz-build", @@ -1980,12 +2032,11 @@ dependencies = [ [[package]] name = "chrono-tz-build" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1" +checksum = "e94fea34d77a245229e7746bd2beb786cd2a896f306ff491fb8cecb3074b10a7" dependencies = [ "parse-zoneinfo", - "phf", "phf_codegen", ] @@ -2022,19 +2073,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d18b093eba54c9aaa1e3784d4361eb2ba944cf7d0a932a830132238f483e8d8" -[[package]] -name = "cidr-utils" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2315f7119b7146d6a883de6acd63ddf96071b5f79d9d98d2adaa84d749f6abf1" -dependencies = [ - "debug-helper", - "num-bigint", - "num-traits", - "once_cell", - "regex", -] - [[package]] name = "cidr-utils" version = "0.6.1" @@ -2059,9 +2097,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.16" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -2069,9 +2107,9 @@ dependencies = [ [[package]] name = "clap-verbosity-flag" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63d19864d6b68464c59f7162c9914a0b569ddc2926b4a2d71afe62a9738eff53" +checksum = "e099138e1807662ff75e2cebe4ae2287add879245574489f9b1588eb5e5564ed" dependencies = [ "clap", "log", @@ -2079,9 +2117,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstream", "anstyle", @@ -2092,23 +2130,23 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.24" +version = "4.5.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7db6eca8c205649e8d3ccd05aa5042b1800a784e56bc7c43524fde8abbfa9b" +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 0.5.0", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -2140,17 +2178,16 @@ name = "codecs" version = "0.1.0" dependencies = [ "apache-avro", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "csv-core", "derivative", "dyn-clone", - "futures 0.3.30", + "futures 0.3.31", "indoc", "influxdb-line-protocol", "memchr", - "once_cell", - "ordered-float 4.2.2", + "ordered-float 4.3.0", "prost 0.12.6", "prost-reflect", "regex", @@ -2219,7 +2256,7 @@ version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-core", "memchr", "pin-project-lite", @@ -2229,9 +2266,9 @@ dependencies = [ [[package]] name = "community-id" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f6af96839c04974cf381e427792a99913ecf3f7bfb348f153dc8a8e5f9803ad" +checksum = "9c9e701443040497976ce85ba641ef0c4a6b319307b9d93718fc76bb77540bff" dependencies = [ "anyhow", "base64 0.21.7", @@ -2272,7 +2309,7 @@ dependencies = [ "directories", "serde", "thiserror", - "toml", + "toml 0.8.19", ] [[package]] @@ -2290,22 +2327,22 @@ dependencies = [ [[package]] name = "console-api" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a257c22cd7e487dd4a13d413beabc512c5052f0bc048db0da6a84c3d8a6142fd" +checksum = "86ed14aa9c9f927213c6e4f3ef75faaad3406134efe84ba2cb7983431d5f0931" dependencies = [ "futures-core", - "prost 0.12.6", - "prost-types 0.12.6", - "tonic", + "prost 0.13.3", + "prost-types 0.13.3", + "tonic 0.12.3", "tracing-core 0.1.32", ] [[package]] name = "console-subscriber" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c4cc54bae66f7d9188996404abdf7fdfa23034ef8e43478c8810828abad758" +checksum = "e2e3a111a37f3333946ebf9da370ba5c5577b18eb342ec683eb488dd21980302" dependencies = [ "console-api", "crossbeam-channel", @@ -2313,14 +2350,15 @@ dependencies = [ "futures-task", "hdrhistogram", "humantime", - "prost 0.12.6", - "prost-types 0.12.6", + "hyper-util", + "prost 0.13.3", + "prost-types 0.13.3", "serde", "serde_json", "thread_local", "tokio", "tokio-stream", - "tonic", + "tonic 0.12.3", "tracing 0.1.40", "tracing-core 0.1.32", "tracing-subscriber", @@ -2414,7 +2452,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8f48d60e5b4d2c53d5c2b1d8a58c849a70ae5e5509b08a48d047e3b65714a74" dependencies = [ - "rustc_version 0.4.0", + "rustc_version 0.4.1", ] [[package]] @@ -2437,7 +2475,7 @@ dependencies = [ "ciborium", "clap", "criterion-plot", - "futures 0.3.30", + "futures 0.3.31", "is-terminal", "itertools 0.10.5", "num-traits", @@ -2521,7 +2559,6 @@ checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ "bitflags 2.4.1", "crossterm_winapi", - "futures-core", "libc", "mio 0.8.11", "parking_lot", @@ -2530,6 +2567,23 @@ dependencies = [ "winapi", ] +[[package]] +name = "crossterm" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" +dependencies = [ + "bitflags 2.4.1", + "crossterm_winapi", + "futures-core", + "mio 1.0.1", + "parking_lot", + "rustix 0.38.37", + "signal-hook", + "signal-hook-mio", + "winapi", +] + [[package]] name = "crossterm_winapi" version = "0.9.1" @@ -2639,7 +2693,7 @@ dependencies = [ "curve25519-dalek-derive", "digest", "fiat-crypto", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "subtle", "zeroize", ] @@ -2650,9 +2704,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -2683,7 +2737,7 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "strsim 0.10.0", "syn 1.0.109", @@ -2697,10 +2751,10 @@ checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "strsim 0.10.0", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -2722,7 +2776,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core 0.20.8", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -2746,9 +2800,9 @@ dependencies = [ [[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", @@ -2772,9 +2826,9 @@ checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" [[package]] name = "databend-client" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a2fc159e8f2059610799425725cd4c3d3e27e472892107693c1fd80ba47e61" +checksum = "88ca151573bc75cb433d69083e7c4b33287044506de785901b1670cf1d8cd4a2" dependencies = [ "async-trait", "log", @@ -2815,12 +2869,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63dfa964fe2a66f3fde91fc70b267fe193d822c7e603e2a675a49a7f46ad3f49" -[[package]] -name = "debug-helper" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" - [[package]] name = "der" version = "0.7.8" @@ -2848,7 +2896,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] @@ -2859,9 +2907,9 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -2880,9 +2928,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" dependencies = [ "darling 0.20.8", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -2892,7 +2940,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -2902,9 +2950,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case 0.4.0", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "syn 1.0.109", ] @@ -3022,7 +3070,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7eefe29e8dd614abbee51a1616654cab123c4c56850ab83f5b7f1e1f9977bf7c" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-util", "moka", "octseq", @@ -3177,7 +3225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] @@ -3189,9 +3237,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -3201,9 +3249,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" dependencies = [ "once_cell", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -3221,9 +3269,9 @@ version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -3385,6 +3433,17 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +[[package]] +name = "fancy-regex" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" +dependencies = [ + "bit-set", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", +] + [[package]] name = "fastrand" version = "1.9.0" @@ -3396,9 +3455,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "ff" @@ -3421,15 +3480,15 @@ name = "file-source" version = "0.1.0" dependencies = [ "bstr 1.10.0", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "crc", "criterion", - "dashmap 6.0.1", + "dashmap 6.1.0", "flate2", - "futures 0.3.30", + "futures 0.3.31", "glob", - "indexmap 2.5.0", + "indexmap 2.6.0", "libc", "quickcheck", "scan_fmt", @@ -3477,9 +3536,9 @@ checksum = "d52a7e408202050813e6f1d9addadcaafef3dca7530c7ddfb005d4081cce6779" [[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", @@ -3517,6 +3576,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" @@ -3574,9 +3639,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -3589,9 +3654,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", @@ -3599,15 +3664,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", @@ -3616,9 +3681,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" @@ -3637,38 +3702,38 @@ 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 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "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" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +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 0.1.31", "futures-channel", @@ -3751,7 +3816,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d351469a584f3b3565e2e740d4da60839bddc4320dadd7d61da8bdd77ffb373b" dependencies = [ "arc-swap", - "futures 0.3.30", + "futures 0.3.31", "log", "reqwest 0.11.26", "serde", @@ -3771,7 +3836,7 @@ checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" dependencies = [ "cfg-if", "dashmap 5.5.3", - "futures 0.3.30", + "futures 0.3.31", "futures-timer", "no-std-compat", "nonzero_ext", @@ -3822,7 +3887,7 @@ dependencies = [ "graphql-parser", "heck 0.4.1", "lazy_static", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "serde", "serde_json", @@ -3836,7 +3901,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83febfa838f898cfa73dfaa7a8eb69ff3409021ac06ee94cfb3d622f6eeb1a97" dependencies = [ "graphql_client_codegen", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "syn 1.0.109", ] @@ -3850,7 +3915,7 @@ dependencies = [ "serde_json", "strum 0.25.0", "strum_macros 0.25.3", - "tonic", + "tonic 0.11.0", "tonic-build 0.11.0", ] @@ -3862,7 +3927,7 @@ dependencies = [ "dashmap 5.5.3", "derive_builder", "enum_dispatch", - "futures 0.3.30", + "futures 0.3.31", "futures-util", "greptime-proto", "parking_lot", @@ -3871,7 +3936,7 @@ dependencies = [ "snafu 0.7.5", "tokio", "tokio-stream", - "tonic", + "tonic 0.11.0", "tonic-build 0.9.2", "tower", ] @@ -3903,13 +3968,13 @@ version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "fnv", "futures-core", "futures-sink", "futures-util", "http 0.2.9", - "indexmap 2.5.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -3923,12 +3988,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ "atomic-waker", - "bytes 1.7.1", + "bytes 1.7.2", "fnv", "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.5.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -3972,7 +4037,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", +] + +[[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]] @@ -3996,7 +4071,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ "base64 0.21.7", - "bytes 1.7.1", + "bytes 1.7.2", "headers-core", "http 0.2.9", "httpdate", @@ -4063,7 +4138,7 @@ version = "0.1.0-rc.1" source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#4925b53083587ccd695c4149836cc42e0e5e76fb" dependencies = [ "cfg-if", - "futures 0.3.30", + "futures 0.3.31", "glob", "heim-common", "heim-runtime", @@ -4143,7 +4218,7 @@ name = "heim-runtime" version = "0.1.0-rc.1" source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#4925b53083587ccd695c4149836cc42e0e5e76fb" dependencies = [ - "futures 0.3.30", + "futures 0.3.31", "futures-timer", "once_cell", "smol", @@ -4240,7 +4315,7 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "fnv", "itoa", ] @@ -4251,7 +4326,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "fnv", "itoa", ] @@ -4262,7 +4337,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "http 0.2.9", "pin-project-lite", ] @@ -4273,7 +4348,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "http 1.1.0", ] @@ -4283,7 +4358,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-util", "http 1.1.0", "http-body 1.0.0", @@ -4350,7 +4425,7 @@ version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-channel", "futures-core", "futures-util", @@ -4370,11 +4445,11 @@ dependencies = [ [[package]] name = "hyper" -version = "1.2.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-channel", "futures-util", "h2 0.4.6", @@ -4396,7 +4471,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73b7d8abf35697b81a825e386fc151e0d503e8cb5fcb93cc8669c376dfd6f278" dependencies = [ "hex", - "hyper 1.2.0", + "hyper 1.4.1", "hyper-util", "pin-project-lite", "tokio", @@ -4428,8 +4503,8 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" dependencies = [ - "bytes 1.7.1", - "futures 0.3.30", + "bytes 1.7.2", + "futures 0.3.31", "headers", "http 0.2.9", "hyper 0.14.28", @@ -4463,7 +4538,7 @@ checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" dependencies = [ "futures-util", "http 1.1.0", - "hyper 1.2.0", + "hyper 1.4.1", "hyper-util", "log", "rustls 0.22.4", @@ -4486,13 +4561,26 @@ dependencies = [ "tokio-io-timeout", ] +[[package]] +name = "hyper-timeout" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" +dependencies = [ + "hyper 1.4.1", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + [[package]] name = "hyper-tls" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "hyper 0.14.28", "native-tls", "tokio", @@ -4501,20 +4589,19 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-channel", "futures-util", "http 1.1.0", "http-body 1.0.0", - "hyper 1.2.0", + "hyper 1.4.1", "pin-project-lite", "socket2 0.5.7", "tokio", - "tower", "tower-service", "tracing 0.1.40", ] @@ -4527,7 +4614,7 @@ checksum = "acf569d43fa9848e510358c07b80f4adf34084ddc28c6a4a651ee8474c070dcc" dependencies = [ "hex", "http-body-util", - "hyper 1.2.0", + "hyper 1.4.1", "hyper-util", "pin-project-lite", "tokio", @@ -4617,12 +4704,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 0.14.5", + "hashbrown 0.15.0", "serde", ] @@ -4664,7 +4751,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22fa7ee6be451ea0b1912b962c91c8380835e97cf1584a77e18264e908448dcb" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "log", "nom", "smallvec", @@ -4750,9 +4837,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" dependencies = [ "serde", ] @@ -4773,15 +4860,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.31", + "rustix 0.38.37", "windows-sys 0.48.0", ] [[package]] name = "is_ci" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb" +checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" [[package]] name = "itertools" @@ -4893,7 +4980,7 @@ name = "k8s-e2e-tests" version = "0.1.0" dependencies = [ "env_logger 0.11.5", - "futures 0.3.30", + "futures 0.3.31", "indoc", "k8s-openapi 0.16.0", "k8s-test-framework", @@ -4912,7 +4999,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d9455388f4977de4d0934efa9f7d36296295537d774574113a20f6082de03da" dependencies = [ "base64 0.13.1", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "serde", "serde-value", @@ -4926,7 +5013,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd990069640f9db34b3b0f7a1afc62a05ffaa3be9b66aa3c313f58346df7f788" dependencies = [ "base64 0.21.7", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "http 0.2.9", "percent-encoding", @@ -5004,16 +5091,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "544339f1665488243f79080441cacb09c997746fd763342303e66eebb9d3ba13" dependencies = [ "base64 0.20.0", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "dirs-next", "either", - "futures 0.3.30", + "futures 0.3.31", "http 0.2.9", "http-body 0.4.5", "hyper 0.14.28", "hyper-openssl", - "hyper-timeout", + "hyper-timeout 0.4.1", "jsonpath_lib", "k8s-openapi 0.18.0", "kube-core", @@ -5059,7 +5146,7 @@ dependencies = [ "async-trait", "backoff", "derivative", - "futures 0.3.30", + "futures 0.3.31", "json-patch", "k8s-openapi 0.18.0", "kube-client", @@ -5108,7 +5195,7 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "108dc8f5dabad92c65a03523055577d847f5dcc00f3e7d3a68bc4d48e01d8fe1" dependencies = [ - "regex-automata 0.4.4", + "regex-automata 0.4.8", ] [[package]] @@ -5144,9 +5231,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 = "libflate" @@ -5213,9 +5300,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "listenfd" @@ -5260,7 +5347,7 @@ checksum = "879777f0cc6f3646a044de60e4ab98c75617e3f9580f7a2032e6ad7ea0cd3054" name = "loki-logproto" version = "0.1.0" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "prost 0.12.6", "prost-build 0.12.6", @@ -5270,11 +5357,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.14.5", + "hashbrown 0.15.0", ] [[package]] @@ -5416,9 +5503,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", ] @@ -5452,9 +5539,9 @@ dependencies = [ [[package]] name = "metrics" -version = "0.22.3" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2be3cbd384d4e955b231c895ce10685e3d8260c5ccffae898c96c723b0772835" +checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261" dependencies = [ "ahash 0.8.11", "portable-atomic", @@ -5462,11 +5549,11 @@ dependencies = [ [[package]] name = "metrics-tracing-context" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb791d015f8947acf5a7f62bd28d00f289bb7ea98cfbe3ffec1d061eee12df12" +checksum = "62a6a1f7141f1d9bc7a886b87536bbfc97752e08b369e1e0453a9acfab5f5da4" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "itoa", "lockfree-object-pool", "metrics", @@ -5479,18 +5566,18 @@ dependencies = [ [[package]] name = "metrics-util" -version = "0.16.3" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b07a5eb561b8cbc16be2d216faf7757f9baf3bfb94dbb0fae3df8387a5bb47f" +checksum = "4259040465c955f9f2f1a4a8a16dc46726169bca0f88e8fb2dbeced487c3e828" dependencies = [ "aho-corasick", "crossbeam-epoch", "crossbeam-utils", "hashbrown 0.14.5", - "indexmap 2.5.0", + "indexmap 2.6.0", "metrics", "num_cpus", - "ordered-float 4.2.2", + "ordered-float 4.3.0", "quanta", "radix_trie", "sketches-ddsketch", @@ -5556,6 +5643,7 @@ checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ "hermit-abi", "libc", + "log", "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] @@ -5596,10 +5684,10 @@ dependencies = [ "itertools 0.12.1", "once_cell", "proc-macro-error", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "regex", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -5624,7 +5712,7 @@ dependencies = [ "once_cell", "parking_lot", "quanta", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "smallvec", "tagptr", "thiserror", @@ -5685,7 +5773,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a15d522be0a9c3e46fd2632e272d178f56387bdb5c9fbb3a36c649062e9b5219" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "encoding_rs", "futures-util", "http 1.1.0", @@ -5742,7 +5830,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ebbe97acce52d06aebed4cd4a87c0941f4b2519b59b82b4feb5bd0ce003dfd" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "itertools 0.13.0", "ndarray", "noisy_float", @@ -5827,9 +5915,9 @@ dependencies = [ [[package]] name = "nkeys" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2de02c883c178998da8d0c9816a88ef7ef5c58314dd1585c97a4a5679f3ab337" +checksum = "9f49e787f4c61cbd0f9320b31cc26e58719f6aa5068e34697dd3aea361412fe3" dependencies = [ "data-encoding", "ed25519", @@ -5842,11 +5930,11 @@ dependencies = [ [[package]] name = "no-proxy" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b41e7479dc3678ea792431e04bafd62a31879035f4a5fa707602df062f58c77" +checksum = "6d688d11967f7f52e273fb8f8f07ecb094254fed630e22a0cab60cc98047a5db" dependencies = [ - "cidr-utils 0.5.11", + "cidr-utils", "serde", ] @@ -6066,7 +6154,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] @@ -6078,9 +6166,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -6089,10 +6177,10 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.1.0", - "proc-macro2 1.0.86", + "proc-macro-crate 3.2.0", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -6154,7 +6242,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ed2eaec452d98ccc1c615dd843fd039d9445f2fb4da114ee7e6af5fcb68be98" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "serde", "smallvec", ] @@ -6170,9 +6258,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 = "onig" @@ -6218,10 +6306,10 @@ dependencies = [ "async-trait", "backon", "base64 0.21.7", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "flagset", - "futures 0.3.30", + "futures 0.3.31", "getrandom 0.2.15", "http 0.2.9", "log", @@ -6261,7 +6349,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_plain", - "serde_with 3.9.0", + "serde_with 3.11.0", "sha2", "subtle", "thiserror", @@ -6289,9 +6377,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -6326,13 +6414,13 @@ dependencies = [ name = "opentelemetry-proto" version = "0.1.0" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "hex", - "ordered-float 4.2.2", + "ordered-float 4.3.0", "prost 0.12.6", "prost-build 0.12.6", - "tonic", + "tonic 0.11.0", "tonic-build 0.11.0", "vector-core", "vector-lookup", @@ -6356,9 +6444,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "4.2.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a91171844676f8c7990ce64959210cd2eaef32c2612c50f9fae9f8aaa6065a6" +checksum = "44d501f1a72f71d3c063a6bbc8f7271fa73aa09fe5d6283b6571e2ed176a2537" dependencies = [ "num-traits", ] @@ -6403,11 +6491,12 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[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" dependencies = [ - "supports-color", + "supports-color 2.1.0", + "supports-color 3.0.1", ] [[package]] @@ -6571,9 +6660,9 @@ checksum = "1381c29a877c6d34b8c176e734f35d7f7f5b3adaefe940cb4d1bb7af94678e2e" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -6594,7 +6683,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.5.0", + "indexmap 2.6.0", ] [[package]] @@ -6646,22 +6735,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 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -6695,7 +6784,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand 2.1.1", "futures-io", ] @@ -6785,7 +6874,7 @@ dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.31", + "rustix 0.38.37", "tracing 0.1.40", "windows-sys 0.48.0", ] @@ -6829,7 +6918,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1de0ea6504e07ca78355a6fb88ad0f36cafe9e696cbc6717f16a207f3a60be72" dependencies = [ - "futures 0.3.30", + "futures 0.3.31", "openssl", "tokio", "tokio-openssl", @@ -6844,7 +6933,7 @@ checksum = "acda0ebdebc28befa84bee35e651e4c5f09073d668c7aed4cf7e23c3cda84b23" dependencies = [ "base64 0.22.1", "byteorder", - "bytes 1.7.1", + "bytes 1.7.2", "fallible-iterator", "hmac", "md-5", @@ -6856,11 +6945,11 @@ dependencies = [ [[package]] name = "postgres-types" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02048d9e032fb3cc3413bbf7b83a15d84a5d419778e2628751896d856498eee9" +checksum = "f66ea23a2d0e5734297357705193335e0a957696f34bed2f2faefacb2fec336f" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "fallible-iterator", "postgres-protocol", @@ -6929,7 +7018,7 @@ version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "syn 1.0.109", ] @@ -6939,8 +7028,8 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ - "proc-macro2 1.0.86", - "syn 2.0.75", + "proc-macro2 1.0.87", + "syn 2.0.79", ] [[package]] @@ -6987,11 +7076,11 @@ dependencies = [ [[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 0.22.20", ] [[package]] @@ -7001,7 +7090,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", "version_check", @@ -7013,7 +7102,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "version_check", ] @@ -7041,9 +7130,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", ] @@ -7052,7 +7141,7 @@ dependencies = [ name = "prometheus-parser" version = "0.1.0" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "nom", "num_enum 0.7.3", "prost 0.12.6", @@ -7076,7 +7165,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax 0.8.2", + "regex-syntax 0.8.5", "rusty-fork", "tempfile", "unarray", @@ -7088,7 +7177,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cf16337405ca084e9c78985114633b6827711d22b9e6ef6c6c0d665eb3f0b6e" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] @@ -7099,7 +7188,7 @@ version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "prost-derive 0.11.9", ] @@ -7109,18 +7198,18 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "prost-derive 0.12.6", ] [[package]] name = "prost" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" +checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" dependencies = [ - "bytes 1.7.1", - "prost-derive 0.13.1", + "bytes 1.7.2", + "prost-derive 0.13.3", ] [[package]] @@ -7129,7 +7218,7 @@ version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "heck 0.4.1", "itertools 0.10.5", "lazy_static", @@ -7151,7 +7240,7 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "heck 0.5.0", "itertools 0.12.1", "log", @@ -7162,7 +7251,7 @@ dependencies = [ "prost 0.12.6", "prost-types 0.12.6", "regex", - "syn 2.0.75", + "syn 2.0.79", "tempfile", ] @@ -7174,7 +7263,7 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools 0.10.5", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] @@ -7187,34 +7276,34 @@ checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", "itertools 0.12.1", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] name = "prost-derive" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" +checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" dependencies = [ "anyhow", "itertools 0.13.0", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] name = "prost-reflect" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55a6a9143ae25c25fa7b6a48d6cc08b10785372060009c25140a4e7c340e95af" +checksum = "4b7535b02f0e5efe3e1dbfcb428be152226ed0c66cad9541f2274c8ba8d4cd40" dependencies = [ "base64 0.22.1", "once_cell", - "prost 0.13.1", - "prost-types 0.13.1", + "prost 0.13.3", + "prost-types 0.13.3", "serde", "serde-value", ] @@ -7239,11 +7328,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" +checksum = "4759aa0d3a6232fb8dbdb97b61de2c20047c68aca932c7ed76da9d788508d670" dependencies = [ - "prost 0.13.1", + "prost 0.13.3", ] [[package]] @@ -7276,7 +7365,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] @@ -7299,12 +7388,12 @@ checksum = "d7f3541ff84e39da334979ac4bf171e0f277f4f782603aeae65bf5795dc7275a" dependencies = [ "async-trait", "bit-vec", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "crc", "data-url", "flate2", - "futures 0.3.30", + "futures 0.3.31", "futures-io", "futures-timer", "log", @@ -7384,7 +7473,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] @@ -7404,7 +7493,7 @@ version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", ] [[package]] @@ -7528,7 +7617,7 @@ dependencies = [ "bitflags 2.4.1", "cassowary", "compact_str", - "crossterm", + "crossterm 0.27.0", "itertools 0.13.0", "lru", "paste", @@ -7635,9 +7724,9 @@ checksum = "c580d9cbbe1d1b479e8d67cf9daf6a62c957e6846048408b80b43ac3f6af84cd" dependencies = [ "arc-swap", "async-trait", - "bytes 1.7.1", + "bytes 1.7.2", "combine 4.6.6", - "futures 0.3.30", + "futures 0.3.31", "futures-util", "itoa", "native-tls", @@ -7691,14 +7780,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.4", - "regex-syntax 0.8.2", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -7712,13 +7801,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.4" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.5", ] [[package]] @@ -7741,15 +7830,15 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "relative-path" -version = "1.9.0" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c707298afce11da2efef2f600116fa93ffa7a032b5d7b628aa17711ec81383ca" +checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" [[package]] name = "rend" @@ -7767,7 +7856,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2" dependencies = [ "base64 0.21.7", - "bytes 1.7.1", + "bytes 1.7.2", "encoding_rs", "futures-core", "futures-util", @@ -7790,7 +7879,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tokio-native-tls", @@ -7813,13 +7902,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ "base64 0.22.1", - "bytes 1.7.1", + "bytes 1.7.2", "futures-core", "futures-util", "http 1.1.0", "http-body 1.0.0", "http-body-util", - "hyper 1.2.0", + "hyper 1.4.1", "hyper-rustls 0.26.0", "hyper-util", "ipnet", @@ -7836,7 +7925,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 0.1.2", "tokio", "tokio-rustls 0.25.0", "tokio-util", @@ -7892,7 +7981,7 @@ checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" dependencies = [ "bitvec", "bytecheck", - "bytes 1.7.1", + "bytes 1.7.2", "hashbrown 0.12.3", "ptr_meta", "rend", @@ -7908,7 +7997,7 @@ version = "0.7.45" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] @@ -7991,31 +8080,31 @@ dependencies = [ [[package]] name = "rstest" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b423f0e62bdd61734b67cd21ff50871dfaeb9cc74f869dcd6af974fbcb19936" +checksum = "0a2c585be59b6b5dd66a9d2084aa1d8bd52fbdb806eafdeffb52791147862035" dependencies = [ - "futures 0.3.30", + "futures 0.3.31", "futures-timer", "rstest_macros", - "rustc_version 0.4.0", + "rustc_version 0.4.1", ] [[package]] name = "rstest_macros" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e1711e7d14f74b12a58411c542185ef7fb7f2e7f8ee6e2940a883628522b42" +checksum = "825ea780781b15345a146be27eaefb05085e337e869bff01b4306a4fd4a9ad5a" dependencies = [ "cfg-if", "glob", - "proc-macro-crate 3.1.0", - "proc-macro2 1.0.86", + "proc-macro-crate 3.2.0", + "proc-macro2 1.0.87", "quote 1.0.37", "regex", "relative-path", - "rustc_version 0.4.0", - "syn 2.0.75", + "rustc_version 0.4.1", + "syn 2.0.79", "unicode-ident", ] @@ -8025,7 +8114,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1568e15fab2d546f940ed3a21f48bbbd1c494c90c99c4481339364a497f94a9" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "flume 0.11.0", "futures-util", "log", @@ -8045,7 +8134,7 @@ checksum = "06676aec5ccb8fc1da723cc8c0f9a46549f21ebb8753d3915c6c41db1e7f1dc4" dependencies = [ "arrayvec", "borsh", - "bytes 1.7.1", + "bytes 1.7.2", "num-traits", "rand 0.8.5", "rkyv", @@ -8076,9 +8165,9 @@ dependencies = [ [[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 1.0.23", ] @@ -8109,14 +8198,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.12", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] @@ -8302,11 +8391,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]] @@ -8410,9 +8499,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[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", ] @@ -8423,7 +8512,7 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93b4e415d6bff989e5e48649ca9b8b4d4997cb069a0c90a84bfd38c7df5e3968" dependencies = [ - "toml", + "toml 0.8.19", ] [[package]] @@ -8458,13 +8547,13 @@ dependencies = [ [[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 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -8473,18 +8562,18 @@ version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "itoa", "memchr", "ryu", @@ -8536,9 +8625,9 @@ version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -8574,19 +8663,19 @@ 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.5.0", + "indexmap 2.6.0", "serde", "serde_derive", "serde_json", - "serde_with_macros 3.9.0", + "serde_with_macros 3.11.0", "time", ] @@ -8597,21 +8686,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ "darling 0.13.4", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] [[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 0.20.8", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -8632,7 +8721,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "itoa", "ryu", "serde", @@ -8713,12 +8802,13 @@ 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 0.8.11", + "mio 1.0.1", "signal-hook", ] @@ -8771,9 +8861,9 @@ dependencies = [ [[package]] name = "similar-asserts" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e041bb827d1bfca18f213411d51b665309f1afb37a04a5d1464530e13779fc0f" +checksum = "cfe85670573cd6f0fa97940f26e7e6601213c3b0555246c24234131f88c5709e" dependencies = [ "console", "similar", @@ -8876,7 +8966,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] @@ -8888,9 +8978,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "080c44971436b1af15d6f61ddd8b543995cf63ab8e677d46b00cc06f4ef267a0" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -8960,7 +9050,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ff9eaf853dec4c8802325d8b6d3dffa86cc707fd7a1a4cdbf416e13b061787a" dependencies = [ "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -9053,10 +9143,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "rustversion", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -9066,10 +9156,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ "heck 0.5.0", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "rustversion", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -9088,6 +9178,15 @@ dependencies = [ "is_ci", ] +[[package]] +name = "supports-color" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8775305acf21c96926c900ad056abeef436701108518cf890020387236ac5a77" +dependencies = [ + "is_ci", +] + [[package]] name = "syn" version = "0.15.44" @@ -9105,18 +9204,18 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.75" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "unicode-ident", ] @@ -9128,9 +9227,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -9139,6 +9238,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + [[package]] name = "syslog" version = "6.1.1" @@ -9214,20 +9319,20 @@ dependencies = [ [[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 = "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.0.1", + "fastrand 2.1.1", "once_cell", - "rustix 0.38.31", + "rustix 0.38.37", "windows-sys 0.59.0", ] @@ -9253,12 +9358,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.31", - "windows-sys 0.48.0", + "rustix 0.38.37", + "windows-sys 0.59.0", ] [[package]] @@ -9281,22 +9386,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 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -9404,7 +9509,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", - "bytes 1.7.1", + "bytes 1.7.2", "libc", "mio 1.0.1", "parking_lot", @@ -9443,9 +9548,9 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -9460,11 +9565,10 @@ dependencies = [ [[package]] name = "tokio-openssl" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ffab79df67727f6acf57f1ff743091873c24c579b1e2ce4d8f53e47ded4d63d" +checksum = "59df6849caa43bb7567f9a36f863c447d95a11d5903c9cc334ba32576a27eadd" dependencies = [ - "futures-util", "openssl", "openssl-sys", "tokio", @@ -9472,13 +9576,13 @@ dependencies = [ [[package]] name = "tokio-postgres" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03adcf0147e203b6032c0b2d30be1415ba03bc348901f3ff1cc0df6a733e60c3" +checksum = "3b5d3742945bc7d7f210693b0c58ae542c6fd47b17adbbda0885f3dcb34a6bdb" dependencies = [ "async-trait", "byteorder", - "bytes 1.7.1", + "bytes 1.7.2", "fallible-iterator", "futures-channel", "futures-util", @@ -9530,9 +9634,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", @@ -9547,7 +9651,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7" dependencies = [ "async-stream", - "bytes 1.7.1", + "bytes 1.7.2", "futures-core", "tokio", "tokio-stream", @@ -9583,7 +9687,7 @@ name = "tokio-util" version = "0.7.11" source = "git+https://github.com/vectordotdev/tokio?branch=tokio-util-0.7.11-framed-read-continue-on-error#156dcaacdfa53f530a39eb91b1ceb731a9908986" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-core", "futures-io", "futures-sink", @@ -9592,6 +9696,18 @@ dependencies = [ "tokio", ] +[[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.19" @@ -9619,7 +9735,9 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", + "serde", + "serde_spanned", "toml_datetime", "winnow 0.5.18", ] @@ -9630,18 +9748,7 @@ version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.5.0", - "toml_datetime", - "winnow 0.5.18", -] - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "toml_datetime", "winnow 0.5.18", ] @@ -9652,7 +9759,7 @@ version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", @@ -9667,15 +9774,15 @@ checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" dependencies = [ "async-stream", "async-trait", - "axum", + "axum 0.6.20", "base64 0.21.7", - "bytes 1.7.1", + "bytes 1.7.2", "flate2", "h2 0.3.26", "http 0.2.9", "http-body 0.4.5", "hyper 0.14.28", - "hyper-timeout", + "hyper-timeout 0.4.1", "percent-encoding", "pin-project", "prost 0.12.6", @@ -9692,6 +9799,36 @@ dependencies = [ "zstd 0.12.4", ] +[[package]] +name = "tonic" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" +dependencies = [ + "async-stream", + "async-trait", + "axum 0.7.5", + "base64 0.22.1", + "bytes 1.7.2", + "h2 0.4.6", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.4.1", + "hyper-timeout 0.5.1", + "hyper-util", + "percent-encoding", + "pin-project", + "prost 0.13.3", + "socket2 0.5.7", + "tokio", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing 0.1.40", +] + [[package]] name = "tonic-build" version = "0.9.2" @@ -9699,7 +9836,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" dependencies = [ "prettyplease 0.1.25", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "prost-build 0.11.9", "quote 1.0.37", "syn 1.0.109", @@ -9712,10 +9849,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" dependencies = [ "prettyplease 0.2.15", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "prost-build 0.12.6", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -9747,7 +9884,7 @@ dependencies = [ "async-compression", "base64 0.21.7", "bitflags 2.4.1", - "bytes 1.7.1", + "bytes 1.7.2", "futures-core", "futures-util", "http 0.2.9", @@ -9816,9 +9953,9 @@ version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -9856,7 +9993,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "futures 0.3.30", + "futures 0.3.31", "futures-task", "pin-project", "tracing 0.1.40", @@ -9876,7 +10013,7 @@ name = "tracing-limit" version = "0.1.0" dependencies = [ "criterion", - "dashmap 6.0.1", + "dashmap 6.1.0", "mock_instant", "tracing 0.1.40", "tracing-core 0.1.32", @@ -9929,7 +10066,7 @@ name = "tracing-tower" version = "0.1.0" source = "git+https://github.com/tokio-rs/tracing?rev=e0642d949891546a3bb7e47080365ee7274f05cd#e0642d949891546a3bb7e47080365ee7274f05cd" dependencies = [ - "futures 0.3.30", + "futures 0.3.31", "tower-service", "tracing 0.2.0", "tracing-futures 0.3.0", @@ -10008,7 +10145,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ "byteorder", - "bytes 1.7.1", + "bytes 1.7.2", "data-encoding", "http 0.2.9", "httparse", @@ -10027,7 +10164,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" dependencies = [ "byteorder", - "bytes 1.7.1", + "bytes 1.7.2", "data-encoding", "http 1.1.0", "httparse", @@ -10055,7 +10192,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "syn 1.0.109", ] @@ -10075,9 +10212,9 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -10105,9 +10242,9 @@ version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70b20a22c42c8f1cd23ce5e34f165d4d37038f5b663ad20fb6adbdf029172483" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] @@ -10162,9 +10299,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[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" @@ -10325,13 +10462,12 @@ dependencies = [ "dunce", "glob", "hex", - "indexmap 2.5.0", + "indexmap 2.6.0", "indicatif", "itertools 0.13.0", "log", - "once_cell", "os_info", - "owo-colors 4.0.0", + "owo-colors 4.1.0", "paste", "regex", "reqwest 0.11.26", @@ -10340,12 +10476,12 @@ dependencies = [ "serde_yaml 0.9.34+deprecated", "sha2", "tempfile", - "toml", + "toml 0.8.19", ] [[package]] name = "vector" -version = "0.41.1" +version = "0.42.0" dependencies = [ "apache-avro", "approx", @@ -10377,7 +10513,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "axum", + "axum 0.6.20", "azure_core", "azure_identity", "azure_storage", @@ -10385,16 +10521,16 @@ dependencies = [ "base64 0.22.1", "bloomy", "bollard", - "bytes 1.7.1", + "bytes 1.7.2", "bytesize", "chrono", "chrono-tz", - "cidr-utils 0.6.1", + "cidr-utils", "clap", "colored", "console-subscriber", "criterion", - "crossterm", + "crossterm 0.28.1", "csv", "databend-client", "derivative", @@ -10406,7 +10542,7 @@ dependencies = [ "exitcode", "fakedata", "flate2", - "futures 0.3.30", + "futures 0.3.31", "futures-util", "glob", "goauth", @@ -10427,7 +10563,7 @@ dependencies = [ "hyper 0.14.28", "hyper-openssl", "hyper-proxy", - "indexmap 2.5.0", + "indexmap 2.6.0", "indoc", "infer 0.16.0", "inventory", @@ -10448,17 +10584,16 @@ dependencies = [ "mlua", "mongodb", "nix 0.26.2", - "nkeys 0.4.3", + "nkeys 0.4.4", "nom", "notify", "num-format", "number_prefix", - "once_cell", "opendal", "openssl", "openssl-probe", "openssl-src", - "ordered-float 4.2.2", + "ordered-float 4.3.0", "paste", "percent-encoding", "pin-project", @@ -10490,7 +10625,7 @@ dependencies = [ "serde-toml-merge", "serde_bytes", "serde_json", - "serde_with 3.9.0", + "serde_with 3.11.0", "serde_yaml 0.9.34+deprecated", "similar-asserts", "smallvec", @@ -10511,8 +10646,8 @@ dependencies = [ "tokio-test", "tokio-tungstenite 0.20.1", "tokio-util", - "toml", - "tonic", + "toml 0.8.19", + "tonic 0.11.0", "tonic-build 0.11.0", "tower", "tower-http", @@ -10542,7 +10677,7 @@ dependencies = [ "anyhow", "chrono", "clap", - "futures 0.3.30", + "futures 0.3.31", "graphql_client", "indoc", "reqwest 0.11.26", @@ -10563,7 +10698,7 @@ dependencies = [ "async-stream", "async-trait", "bytecheck", - "bytes 1.7.1", + "bytes 1.7.2", "clap", "crc32fast", "criterion", @@ -10571,14 +10706,13 @@ dependencies = [ "crossbeam-utils", "derivative", "fslock", - "futures 0.3.30", + "futures 0.3.31", "hdrhistogram", "memmap2", "metrics", "metrics-tracing-context", "metrics-util", "num-traits", - "once_cell", "paste", "pin-project", "proptest", @@ -10606,16 +10740,16 @@ name = "vector-common" version = "0.1.0" dependencies = [ "async-stream", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "chrono-tz", "crossbeam-utils", "derivative", - "futures 0.3.30", - "indexmap 2.5.0", + "futures 0.3.31", + "indexmap 2.6.0", "metrics", "nom", - "ordered-float 4.2.2", + "ordered-float 4.3.0", "paste", "pin-project", "quickcheck", @@ -10643,15 +10777,15 @@ dependencies = [ "chrono-tz", "encoding_rs", "http 0.2.9", - "indexmap 2.5.0", + "indexmap 2.6.0", "inventory", "no-proxy", "num-traits", "serde", "serde_json", - "serde_with 3.9.0", + "serde_with 3.11.0", "snafu 0.7.5", - "toml", + "toml 0.8.19", "tracing 0.1.40", "url", "vector-config-common", @@ -10666,12 +10800,11 @@ version = "0.1.0" dependencies = [ "convert_case 0.6.0", "darling 0.20.8", - "once_cell", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "serde", "serde_json", - "syn 2.0.75", + "syn 2.0.79", "tracing 0.1.40", ] @@ -10680,11 +10813,11 @@ name = "vector-config-macros" version = "0.1.0" dependencies = [ "darling 0.20.8", - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", "serde", "serde_derive_internals", - "syn 2.0.75", + "syn 2.0.79", "vector-config", "vector-config-common", ] @@ -10697,7 +10830,7 @@ dependencies = [ "async-trait", "base64 0.22.1", "bitmask-enum", - "bytes 1.7.1", + "bytes 1.7.2", "chrono", "chrono-tz", "criterion", @@ -10709,12 +10842,12 @@ dependencies = [ "enumflags2", "env-test-util", "float_eq", - "futures 0.3.30", + "futures 0.3.31", "futures-util", "headers", "http 0.2.9", "hyper-proxy", - "indexmap 2.5.0", + "indexmap 2.6.0", "ipnet", "metrics", "metrics-tracing-context", @@ -10724,9 +10857,8 @@ dependencies = [ "ndarray-stats", "no-proxy", "noisy_float", - "once_cell", "openssl", - "ordered-float 4.2.2", + "ordered-float 4.3.0", "parking_lot", "pin-project", "proptest", @@ -10744,7 +10876,7 @@ dependencies = [ "security-framework", "serde", "serde_json", - "serde_with 3.9.0", + "serde_with 3.11.0", "serde_yaml 0.9.34+deprecated", "similar-asserts", "smallvec", @@ -10755,8 +10887,8 @@ dependencies = [ "tokio-stream", "tokio-test", "tokio-util", - "toml", - "tonic", + "toml 0.8.19", + "tonic 0.11.0", "tracing 0.1.40", "tracing-core 0.1.32", "tracing-subscriber", @@ -10809,7 +10941,7 @@ name = "vector-stream" version = "0.1.0" dependencies = [ "async-stream", - "futures 0.3.30", + "futures 0.3.31", "futures-util", "pin-project", "proptest", @@ -10831,7 +10963,7 @@ dependencies = [ "async-graphql", "chrono", "colored", - "futures 0.3.30", + "futures 0.3.31", "futures-util", "glob", "portpicker", @@ -10890,7 +11022,7 @@ dependencies = [ name = "vector-vrl-web-playground" version = "0.1.0" dependencies = [ - "cargo_toml", + "cargo-lock", "enrichment", "getrandom 0.2.15", "gloo-utils", @@ -10915,9 +11047,9 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "vrl" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78418b391bfef6a37127f5d7283a46b2a23e19b676640841fcf334e40740d919" +checksum = "5c22ec61cbd43e563df185521f9a2fb2f42f6ab96604a574c82f6564049fb431" dependencies = [ "aes", "ansi_term", @@ -10925,7 +11057,7 @@ dependencies = [ "base16", "base62", "base64 0.22.1", - "bytes 1.7.1", + "bytes 1.7.2", "cbc", "cfb-mode", "cfg-if", @@ -10933,7 +11065,7 @@ dependencies = [ "charset", "chrono", "chrono-tz", - "cidr-utils 0.6.1", + "cidr-utils", "clap", "codespan-reporting", "community-id", @@ -10947,6 +11079,7 @@ dependencies = [ "domain", "dyn-clone", "exitcode", + "fancy-regex", "flate2", "grok", "hex", @@ -10954,7 +11087,7 @@ dependencies = [ "hostname 0.4.0", "iana-time-zone", "idna 0.5.0", - "indexmap 2.5.0", + "indexmap 2.6.0", "indoc", "influxdb-line-protocol", "itertools 0.13.0", @@ -10966,7 +11099,7 @@ dependencies = [ "ofb", "once_cell", "onig", - "ordered-float 4.2.2", + "ordered-float 4.3.0", "paste", "peeking_take_while", "percent-encoding", @@ -10974,7 +11107,7 @@ dependencies = [ "pest_derive", "prettydiff", "prettytable-rs", - "prost 0.13.1", + "prost 0.13.3", "prost-reflect", "psl", "psl-types", @@ -11031,7 +11164,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", ] @@ -11075,7 +11208,7 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c" dependencies = [ - "bytes 1.7.1", + "bytes 1.7.2", "futures-channel", "futures-util", "headers", @@ -11117,9 +11250,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", @@ -11128,16 +11261,16 @@ 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 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", "wasm-bindgen-shared", ] @@ -11155,9 +11288,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 1.0.37", "wasm-bindgen-macro-support", @@ -11165,22 +11298,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 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", "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-streams" @@ -11246,7 +11379,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.31", + "rustix 0.38.37", ] [[package]] @@ -11258,7 +11391,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.31", + "rustix 0.38.37", "windows-sys 0.48.0", ] @@ -11600,18 +11733,18 @@ dependencies = [ [[package]] name = "wiremock" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a59f8ae78a4737fb724f20106fb35ccb7cfe61ff335665d3042b3aa98e34717" +checksum = "7fff469918e7ca034884c7fd8f93fe27bacb7fcb599fd879df6c7b429a29b646" dependencies = [ "assert-json-diff", "async-trait", - "base64 0.21.7", + "base64 0.22.1", "deadpool", - "futures 0.3.30", + "futures 0.3.31", "http 1.1.0", "http-body-util", - "hyper 1.2.0", + "hyper 1.4.1", "hyper-util", "log", "once_cell", @@ -11671,16 +11804,16 @@ version = "0.7.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" dependencies = [ - "proc-macro2 1.0.86", + "proc-macro2 1.0.87", "quote 1.0.37", - "syn 2.0.75", + "syn 2.0.79", ] [[package]] name = "zeroize" -version = "1.6.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zstd" diff --git a/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix index e93603d044..19b25edf65 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix @@ -20,35 +20,13 @@ 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, }: let pname = "vector"; - version = "0.41.1"; + version = "0.42.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -57,7 +35,7 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - hash = "sha256-E6AVjxwXMDonqsAMcCpaZBEPCi9bVXUygG4PUOLh+ck="; + hash = "sha256-0DEEgaQf4/NIbmRQyTdEuj4bPTLX8gjAhv4r48wfNZs="; }; cargoLock = { @@ -101,7 +79,7 @@ rustPlatform.buildRustPackage { # Rust 1.80.0 introduced the unexepcted_cfgs lint, which requires crates to allowlist custom cfg options that they inspect. # Upstream is working on fixing this in https://github.com/vectordotdev/vector/pull/20949, but silencing the lint lets us build again until then. # TODO remove when upgrading Vector - RUSTFLAGS = "--allow unexpected_cfgs"; + RUSTFLAGS = "--allow dependency_on_unit_never_type_fallback --allow dead_code"; # Without this, we get SIGSEGV failure RUST_MIN_STACK = 33554432; @@ -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/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix index cddabd79db..33f866dd56 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/watchexec/default.nix b/third_party/nixpkgs/pkgs/tools/misc/watchexec/default.nix index 0d04a21219..a073ef9473 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/watchexec/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix b/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix index e069d0c8d8..2097787f48 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/argus-clients/default.nix b/third_party/nixpkgs/pkgs/tools/networking/argus-clients/default.nix index 8198b21e90..a7c56226af 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/argus-clients/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/argus-clients/default.nix @@ -25,16 +25,18 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Clients for ARGUS"; - longDescription = ''Clients for Audit Record Generation and - Utilization System (ARGUS). The Argus Project is focused on developing all - aspects of large scale network situtational awareness derived from - network activity audit. Argus, itself, is next-generation network - flow technology, processing packets, either on the wire or in - captures, into advanced network flow data. The data, its models, - formats, and attributes are designed to support Network - Operations, Performance and Security Management. If you need to - know what is going on in your network, right now or historically, - you will find Argus a useful tool. ''; + longDescription = '' + Clients for Audit Record Generation and + Utilization System (ARGUS). The Argus Project is focused on developing all + aspects of large scale network situtational awareness derived from + network activity audit. Argus, itself, is next-generation network + flow technology, processing packets, either on the wire or in + captures, into advanced network flow data. The data, its models, + formats, and attributes are designed to support Network + Operations, Performance and Security Management. If you need to + know what is going on in your network, right now or historically, + you will find Argus a useful tool. + ''; homepage = "http://qosient.com/argus"; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/argus/default.nix b/third_party/nixpkgs/pkgs/tools/networking/argus/default.nix index bbb9d22014..72f87e359c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/argus/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/argus/default.nix @@ -29,15 +29,17 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Audit Record Generation and Utilization System for networks"; - longDescription = ''The Argus Project is focused on developing all - aspects of large scale network situtational awareness derived from - network activity audit. Argus, itself, is next-generation network - flow technology, processing packets, either on the wire or in - captures, into advanced network flow data. The data, its models, - formats, and attributes are designed to support Network - Operations, Performance and Security Management. If you need to - know what is going on in your network, right now or historically, - you will find Argus a useful tool. ''; + longDescription = '' + The Argus Project is focused on developing all + aspects of large scale network situtational awareness derived from + network activity audit. Argus, itself, is next-generation network + flow technology, processing packets, either on the wire or in + captures, into advanced network flow data. The data, its models, + formats, and attributes are designed to support Network + Operations, Performance and Security Management. If you need to + know what is going on in your network, right now or historically, + you will find Argus a useful tool. + ''; homepage = "http://qosient.com/argus"; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix index 43ed2dc16c..96672515e4 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix b/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix index 0880780eb6..0f2930f8fa 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix @@ -9,20 +9,20 @@ }: let - version = "2024.8.4"; + version = "2024.8.5"; product = if proEdition then { productName = "pro"; productDesktop = "Burp Suite Professional Edition"; - hash = "sha256-JWG0iNnQJgMqNsMSZIzFCmss6JhvZ9r7lFHuX46+3Mg="; + hash = "sha256-bG1+U16qRNnHHhjloUIMxBH7/zKRo0b3tEX1ebsClL4="; } else { productName = "community"; productDesktop = "Burp Suite Community Edition"; - hash = "sha256-a+TozSXpwyBlxPztASb4fqGZGn8Asg2/GxKzhIpEuyE="; + hash = "sha256-rUDG2L/MC6vX58If7rLHKd73hyV2lSdO1ZZu9tDaznM="; }; src = fetchurl { @@ -70,7 +70,7 @@ buildFHSEnv { jython libcanberra-gtk3 libdrm - libudev0-shim + udev libxkbcommon mesa nspr diff --git a/third_party/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix b/third_party/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix index e9c89657f8..43da147e06 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -103,8 +103,8 @@ in buildGoModule rec { cp -R $src/pkg/status/templates $out/share/datadog-agent wrapProgram "$out/bin/agent" \ - --set PYTHONPATH "$out/${python.sitePackages}"'' + lib.optionalString withSystemd '' \ - --prefix LD_LIBRARY_PATH : '' + lib.makeLibraryPath [ (lib.getLib systemd) rtloader ]; + --set PYTHONPATH "$out/${python.sitePackages}"'' + + lib.optionalString withSystemd " --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ (lib.getLib systemd) rtloader ]}"; passthru.tests.version = testers.testVersion { package = datadog-agent; @@ -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/third_party/nixpkgs/pkgs/tools/networking/dnsmonster/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsmonster/default.nix index 0b32a8c908..782bd85185 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsmonster/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/fakeroute/default.nix b/third_party/nixpkgs/pkgs/tools/networking/fakeroute/default.nix index 533f21e0f5..797a347bb4 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/fakeroute/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/fakeroute/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.3"; src = fetchurl { - url = "https://maxwell.ydns.eu/git/rnhmjoj/fakeroute/releases/download/v${version}/fakeroute-${version}.tar.gz"; + url = "https://maxwell.eurofusion.eu/git/rnhmjoj/fakeroute/releases/download/v${version}/fakeroute-${version}.tar.gz"; hash = "sha256-DoXGJm8vOlAD6ZuvVAt6bkgfahc8WgyYIXCrgqzfiWg="; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = '' Make your machine appears to be anywhere on the internet in a traceroute ''; - homepage = "https://maxwell.ydns.eu/git/rnhmjoj/fakeroute"; + homepage = "https://maxwell.eurofusion.eu/git/rnhmjoj/fakeroute"; license = licenses.bsd3; platforms = platforms.linux; mainProgram = "fakeroute"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/flvstreamer/default.nix b/third_party/nixpkgs/pkgs/tools/networking/flvstreamer/default.nix index 2829b3967f..64915135dd 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/flvstreamer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/flvstreamer/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "Command-line RTMP client"; - longDescription = - '' flvstreamer is an open source command-line RTMP client intended to + longDescription = '' + flvstreamer is an open source command-line RTMP client intended to stream audio or video content from all types of flash or rtmp servers. ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/gvproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gvproxy/default.nix index 742c24659d..5520ee7a05 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gvproxy/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/hblock/default.nix b/third_party/nixpkgs/pkgs/tools/networking/hblock/default.nix index 0aa3a75208..329dadedba 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/hblock/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix index 2504ca0ff1..260ce8a79b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/inetutils/default.nix b/third_party/nixpkgs/pkgs/tools/networking/inetutils/default.nix index 6aedb474c6..a8638df391 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/inetutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/inetutils/default.nix @@ -76,12 +76,12 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Collection of common network programs"; - longDescription = - '' The GNU network utilities suite provides the - following tools: ftp(d), hostname, ifconfig, inetd, logger, ping, rcp, - rexec(d), rlogin(d), rsh(d), syslogd, talk(d), telnet(d), tftp(d), - traceroute, uucpd, and whois. - ''; + longDescription = '' + The GNU network utilities suite provides the + following tools: ftp(d), hostname, ifconfig, inetd, logger, ping, rcp, + rexec(d), rlogin(d), rsh(d), syslogd, talk(d), telnet(d), tftp(d), + traceroute, uucpd, and whois. + ''; homepage = "https://www.gnu.org/software/inetutils/"; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix b/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix index c56cea33ab..8484185404 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/libreswan/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "libreswan"; - version = "5.0"; + version = "5.1"; src = fetchurl { url = "https://download.libreswan.org/${pname}-${version}.tar.gz"; - hash = "sha256-ELwK3JC56YGjDf77p9r/IAhB7LmRD51nHxN//BQUKGo="; + hash = "sha256-HO6dQSyJeZ64v3EUUA1cFOAUPpVGBWFj7r45YOf0Y3w="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/lldpd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/lldpd/default.nix index d9f9ae45ad..e627b12d73 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/lldpd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/lldpd/default.nix @@ -1,5 +1,13 @@ -{ stdenv, lib, fetchurl, pkg-config, removeReferencesTo -, libevent, readline, net-snmp, openssl +{ stdenv +, Foundation +, fetchurl +, lib +, libevent +, net-snmp +, openssl +, pkg-config +, readline +, removeReferencesTo }: stdenv.mkDerivation rec { @@ -16,10 +24,16 @@ stdenv.mkDerivation rec { "--enable-pie" "--with-snmp" "--with-systemdsystemunitdir=\${out}/lib/systemd/system" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "--with-launchddaemonsdir=no" + "--with-privsep-chroot=/var/empty" + "--with-privsep-group=nogroup" + "--with-privsep-user=nobody" ]; nativeBuildInputs = [ pkg-config removeReferencesTo ]; - buildInputs = [ libevent readline net-snmp openssl ]; + buildInputs = [ libevent readline net-snmp openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; enableParallelBuilding = true; @@ -34,6 +48,6 @@ stdenv.mkDerivation rec { homepage = "https://lldpd.github.io/"; license = licenses.isc; maintainers = with maintainers; [ fpletz ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/moodle-dl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/moodle-dl/default.nix index d0a70efec7..132b9bcedd 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/moodle-dl/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix index f58851df6a..b698978b2f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/networkmanager/dmenu/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/dmenu/default.nix index 78a0414807..a2724ed73c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/dmenu/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/nqptp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nqptp/default.nix index 26aec48778..e045c3fe42 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nqptp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nqptp/default.nix @@ -18,8 +18,9 @@ stdenv.mkDerivation rec { }; patches = [ - # this patch should be removed when > 1.2.4 + # these patches should be removed when > 1.2.4 ./remove-setcap.patch + ./systemd-service-capability.patch ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -28,6 +29,11 @@ stdenv.mkDerivation rec { ignoredVersions = ".*(-dev|d0)"; }; + postInstall = '' + mkdir -p $out/lib/systemd/system + cp nqptp.service $out/lib/systemd/system + ''; + meta = { homepage = "https://github.com/mikebrady/nqptp"; description = "Daemon and companion application to Shairport Sync that monitors timing data from any PTP clocks"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/nqptp/systemd-service-capability.patch b/third_party/nixpkgs/pkgs/tools/networking/nqptp/systemd-service-capability.patch new file mode 100644 index 0000000000..e06a52fe1c --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/nqptp/systemd-service-capability.patch @@ -0,0 +1,12 @@ +diff --git a/nqptp.service.in b/nqptp.service.in +index 6f1eb0c..53e6a2e 100644 +--- a/nqptp.service.in ++++ b/nqptp.service.in +@@ -8,6 +8,7 @@ Before=shairport-sync.service + ExecStart=@prefix@/bin/nqptp + User=nqptp + Group=nqptp ++AmbientCapabilities=CAP_NET_BIND_SERVICE + + [Install] + WantedBy=multi-user.target diff --git a/third_party/nixpkgs/pkgs/tools/networking/obfs4/default.nix b/third_party/nixpkgs/pkgs/tools/networking/obfs4/default.nix index b2317ef44c..a0b69e54c6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/obfs4/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/ockam/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ockam/default.nix index 30b774b8f7..2eaf4dafd2 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ockam/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ockam/default.nix @@ -13,7 +13,7 @@ let pname = "ockam"; - version = "0.134.0"; + version = "0.138.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -22,10 +22,10 @@ rustPlatform.buildRustPackage { owner = "build-trust"; repo = pname; rev = "ockam_v${version}"; - hash = "sha256-6HZI0Gsxn3GmklHl9zJ6yY73FlqcLiyMAqJg8BBmzqg="; + hash = "sha256-AY0i7qXA7JXfIEY0htmL+/yn71xAuh7WowXOs2fD6n8="; }; - cargoHash = "sha256-VZt7tDewvz7eGpAKzD8pYOnH/3BtH6cULp6uX7CPxX8="; + cargoHash = "sha256-gAl2es8UFVFv40sMY++SiDGjCMdL0XDN4PeSV7VlGmQ="; nativeBuildInputs = [ git pkg-config ]; buildInputs = [ openssl dbus ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/octodns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/octodns/default.nix index 42c8acf561..da33abb567 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/octodns/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/rosenpass/default.nix b/third_party/nixpkgs/pkgs/tools/networking/rosenpass/default.nix index 476514d7b8..254a6b3aa8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/rosenpass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/rosenpass/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nixosTests , rustPlatform -, hostPlatform +, stdenv , installShellFiles , cmake , libsodium @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { # nix defaults to building for aarch64 _without_ the armv8-a # crypto extensions, but liboqs depends on these - preBuild = lib.optionalString hostPlatform.isAarch64 '' + preBuild = lib.optionalString stdenv.hostPlatform.isAarch64 '' NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -march=armv8-a+crypto" ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix index 18c7ca632d..07aec23d20 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/ssldump/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ssldump/default.nix index ad39514f0e..c0b38eec4a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ssldump/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/subfinder/default.nix b/third_party/nixpkgs/pkgs/tools/networking/subfinder/default.nix index 1b4bb71f4a..f973d7fae5 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/subfinder/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/veilid/Cargo.lock b/third_party/nixpkgs/pkgs/tools/networking/veilid/Cargo.lock index 15b2927104..a622b39e55 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/veilid/Cargo.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/veilid/default.nix b/third_party/nixpkgs/pkgs/tools/networking/veilid/default.nix index 9f74fd4291..35e4166c85 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/veilid/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/wget/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wget/default.nix index 0bfdf8affc..efbf5c8c61 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wget/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wget/default.nix @@ -75,12 +75,12 @@ stdenv.mkDerivation rec { description = "Tool for retrieving files using HTTP, HTTPS, and FTP"; homepage = "https://www.gnu.org/software/wget/"; license = licenses.gpl3Plus; - longDescription = - '' GNU Wget is a free software package for retrieving files using HTTP, - HTTPS and FTP, the most widely-used Internet protocols. It is a - non-interactive commandline tool, so it may easily be called from - scripts, cron jobs, terminals without X-Windows support, etc. - ''; + longDescription = '' + GNU Wget is a free software package for retrieving files using HTTP, + HTTPS and FTP, the most widely-used Internet protocols. It is a + non-interactive commandline tool, so it may easily be called from + scripts, cron jobs, terminals without X-Windows support, etc. + ''; mainProgram = "wget"; maintainers = with maintainers; [ fpletz ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/tools/networking/xh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/xh/default.nix index 2ab8be19c4..679a162a54 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/xh/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/xrootd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/xrootd/default.nix deleted file mode 100644 index 60da8d7e6e..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/xrootd/test-runner.nix b/third_party/nixpkgs/pkgs/tools/networking/xrootd/test-runner.nix deleted file mode 100644 index b878febc7b..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/package-management/morph/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/morph/default.nix index b5f6535c96..7dc6d9f8df 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/morph/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/morph/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "morph"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "dbcdk"; repo = "morph"; rev = "v${version}"; - hash = "sha256-0CHmjqPxBgALGZYjfJFLoLBnoI0U7oZ8WyCtu1bkzZg="; + hash = "sha256-IqWtVklzSq334cGgLx/13l329g391oDW50MZWyO6l08="; }; - vendorHash = "sha256-KV+djwUYNfD7NqmYkanRVeKj2lAGfMjJhCUSRiC4/yM="; + vendorHash = "sha256-zQlMtbXgrH83zrcIoOuFhb2tYCeQ1pz4UQUvRIsLMCE="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/pdm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/pdm/default.nix index f1af411fa5..a7b7f26f17 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/pdm/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/dnsrecon/default.nix b/third_party/nixpkgs/pkgs/tools/security/dnsrecon/default.nix index 3c7b66fcbf..458fe5789f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/dnsrecon/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/ghidra/extensions.nix b/third_party/nixpkgs/pkgs/tools/security/ghidra/extensions.nix index 60070a316a..a94d6d290e 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ghidra/extensions.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ghidra/extensions.nix @@ -13,12 +13,14 @@ lib.makeScope newScope (self: { findcrypt = self.callPackage ./extensions/findcrypt { }; - ghidraninja-ghidra-scripts = self.callPackage ./extensions/ghidraninja-ghidra-scripts { }; - ghidra-delinker-extension = self.callPackage ./extensions/ghidra-delinker-extension { inherit ghidra; }; + ghidra-golanganalyzerextension = self.callPackage ./extensions/ghidra-golanganalyzerextension { }; + + ghidraninja-ghidra-scripts = self.callPackage ./extensions/ghidraninja-ghidra-scripts { }; + gnudisassembler = self.callPackage ./extensions/gnudisassembler { inherit ghidra; }; lightkeeper = self.callPackage ./extensions/lightkeeper { }; diff --git a/third_party/nixpkgs/pkgs/tools/security/ghidra/extensions/ghidra-golanganalyzerextension/default.nix b/third_party/nixpkgs/pkgs/tools/security/ghidra/extensions/ghidra-golanganalyzerextension/default.nix new file mode 100644 index 0000000000..34baf6c971 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/ghidra/extensions/ghidra-golanganalyzerextension/default.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchFromGitHub, + buildGhidraExtension, +}: +buildGhidraExtension rec { + pname = "Ghidra-GolangAnalyzerExtension"; + version = "1.2.4"; + + src = fetchFromGitHub { + owner = "mooncat-greenpy"; + repo = "Ghidra_GolangAnalyzerExtension"; + rev = version; + hash = "sha256-uxozIJ+BLcP1vBnLOCZD9ueY10hd37fON/Miii3zabo="; + }; + + meta = { + description = "Facilitates the analysis of Golang binaries using Ghidra"; + homepage = "https://github.com/mooncat-greenpy/Ghidra_GolangAnalyzerExtension"; + downloadPage = "https://github.com/mooncat-greenpy/Ghidra_GolangAnalyzerExtension/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ivyfanchiang ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix b/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix index dafad76dd8..fa17828c30 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/gowitness/default.nix b/third_party/nixpkgs/pkgs/tools/security/gowitness/default.nix index 57a82168bd..1719a6f272 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gowitness/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/grap/default.nix b/third_party/nixpkgs/pkgs/tools/security/grap/default.nix deleted file mode 100644 index 7f8d931fbb..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/ifdnfc/default.nix b/third_party/nixpkgs/pkgs/tools/security/ifdnfc/default.nix index ddc4808586..341e87173b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ifdnfc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ifdnfc/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation { meta = with lib; { description = "PC/SC IFD Handler based on libnfc"; mainProgram = "ifdnfc-activate"; - longDescription = - '' libnfc Interface Plugin to be used in services.pcscd.plugins. + longDescription = '' + libnfc Interface Plugin to be used in services.pcscd.plugins. It provides support for all readers which are not supported by ccid but by libnfc. For activating your reader you need to run diff --git a/third_party/nixpkgs/pkgs/tools/security/ipscan/default.nix b/third_party/nixpkgs/pkgs/tools/security/ipscan/default.nix index 149cd32221..be0ecf0b1d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ipscan/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/kubernetes-polaris/default.nix b/third_party/nixpkgs/pkgs/tools/security/kubernetes-polaris/default.nix index ecda1966fc..87ae92cd9e 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kubernetes-polaris/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kubernetes-polaris/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubernetes-polaris"; - version = "9.4.1"; + version = "9.5.0"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "polaris"; rev = version; - sha256 = "sha256-CVc/ZMF/3HBDPjny81Pj26eSnBuTRjXgkso34kZSex4="; + sha256 = "sha256-6dbp9gdobgL6afu+mzsqVBFQKT8lgxhKiEhQXN4Z5UY="; }; vendorHash = "sha256-X0GPKR6l1v5312hOmelrcqp4KT3LwsGkvKoqUfEM0uU="; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile index b4c9001f3d..f14aae04e7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.32" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.33" diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index 2d705c9f86..0cab46fc0f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: a13f85c09fbf85c2f5f713b5b9a32b6200cc910d - ref: refs/tags/6.4.32 + revision: 1939065b94ee3c2033e720b753c5a6bd70e09c07 + ref: refs/tags/6.4.33 specs: - metasploit-framework (6.4.32) + metasploit-framework (6.4.33) aarch64 abbrev actionpack (~> 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/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix index 71b6556b10..074b6b8cef 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix index a2367cc4b7..7f748cbe47 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix b/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix index 083d605e58..6f9eb684c2 100644 --- a/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.3.4"; + version = "3.3.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; rev = "refs/tags/v${version}"; - hash = "sha256-wY7OninwYrFuP681Xffsv25XnOw8xWp3QAvrpTibnvk="; + hash = "sha256-L8HOuPENnyM56ac1dqJRCYzqN9wRnGt4RoF8BZji0Z0="; }; - vendorHash = "sha256-V/L6trRaCfV1qLKw1MsRWIh+RwAcoafvSW8zgA41maQ="; + vendorHash = "sha256-ZGFzZ/WpiVChtvMJQH3lR4k2it1KF0QwrMQchQz5XYw="; proxyVendor = true; # hash mismatch between Linux and Darwin subPackages = [ "cmd/nuclei/" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/pius/default.nix b/third_party/nixpkgs/pkgs/tools/security/pius/default.nix index 4fedf054a3..39c129b6b4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pius/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pius/default.nix @@ -26,12 +26,12 @@ python3Packages.buildPythonApplication { description = "PGP Individual UID Signer (PIUS), quickly and easily sign UIDs on a set of PGP keys"; - longDescription = - '' This software will allow you to quickly and easily sign each UID on - a set of PGP keys. It is designed to take the pain out of the - sign-all-the-keys part of PGP Keysigning Party while adding security - to the process. - ''; + longDescription = '' + This software will allow you to quickly and easily sign each UID on + a set of PGP keys. It is designed to take the pain out of the + sign-all-the-keys part of PGP Keysigning Party while adding security + to the process. + ''; license = lib.licenses.gpl2Only; diff --git a/third_party/nixpkgs/pkgs/tools/security/qdigidoc/default.nix b/third_party/nixpkgs/pkgs/tools/security/qdigidoc/default.nix index 844e3d0771..b23f3abdc4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/qdigidoc/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/tor/default.nix b/third_party/nixpkgs/pkgs/tools/security/tor/default.nix index 164526a8e1..62cd7cfa7f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tor/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix b/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix index b6be05ef21..3d4824d771 100644 --- a/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.82.11"; + version = "3.82.13"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-hi7uGVPA9QW22DdfTCui7AMORGgoWH1ogevJqRYM6LQ="; + hash = "sha256-QAo6BvkqG0EklyKLRMExNv+AZZeuTELYY0FdP8LDbZs="; }; - vendorHash = "sha256-Ld+TYH2iCreDhueNmu8S5mcyDyWDXMVEwfW9TdVQ9aY="; + vendorHash = "sha256-P/Kt/ZLdjiULcRIXRVfUT9nkDGpl46VHRkeqt0mwaWc="; proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/tools/security/trustymail/default.nix b/third_party/nixpkgs/pkgs/tools/security/trustymail/default.nix index 8c54cbf050..f032691e34 100644 --- a/third_party/nixpkgs/pkgs/tools/security/trustymail/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/trustymail/default.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { dnspython docopt publicsuffixlist - pydns + py3dns pyspf requests ] diff --git a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix index 7bfc0c29a4..571dfcc8d5 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/xortool/default.nix b/third_party/nixpkgs/pkgs/tools/security/xortool/default.nix deleted file mode 100644 index 1e8b6aee5d..0000000000 --- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix b/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix index b93dde182c..9f3a24665d 100644 --- a/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/btop/default.nix b/third_party/nixpkgs/pkgs/tools/system/btop/default.nix index 0f67b4111a..f49f77f6e2 100644 --- a/third_party/nixpkgs/pkgs/tools/system/btop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/btop/default.nix @@ -56,7 +56,10 @@ stdenv.mkDerivation rec { changelog = "https://github.com/aristocratos/btop/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ rmcgibbo ]; + maintainers = with maintainers; [ + khaneliman + rmcgibbo + ]; mainProgram = "btop"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/ddrescue/default.nix b/third_party/nixpkgs/pkgs/tools/system/ddrescue/default.nix index 2b5e7e7bd3..2e90558d38 100644 --- a/third_party/nixpkgs/pkgs/tools/system/ddrescue/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/ddrescue/default.nix @@ -19,28 +19,28 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GNU ddrescue, a data recovery tool"; - longDescription = - '' GNU ddrescue is a data recovery tool. It copies data from one file - or block device (hard disc, cdrom, etc) to another, trying hard to - rescue data in case of read errors. + longDescription = '' + GNU ddrescue is a data recovery tool. It copies data from one file + or block device (hard disc, cdrom, etc) to another, trying hard to + rescue data in case of read errors. - The basic operation of ddrescue is fully automatic. That is, you - don't have to wait for an error, stop the program, read the log, run - it in reverse mode, etc. + The basic operation of ddrescue is fully automatic. That is, you + don't have to wait for an error, stop the program, read the log, run + it in reverse mode, etc. - If you use the logfile feature of ddrescue, the data is rescued very - efficiently (only the needed blocks are read). Also you can - interrupt the rescue at any time and resume it later at the same - point. + If you use the logfile feature of ddrescue, the data is rescued very + efficiently (only the needed blocks are read). Also you can + interrupt the rescue at any time and resume it later at the same + point. - Automatic merging of backups: If you have two or more damaged copies - of a file, cdrom, etc, and run ddrescue on all of them, one at a - time, with the same output file, you will probably obtain a complete - and error-free file. This is so because the probability of having - damaged areas at the same places on different input files is very - low. Using the logfile, only the needed blocks are read from the - second and successive copies. - ''; + Automatic merging of backups: If you have two or more damaged copies + of a file, cdrom, etc, and run ddrescue on all of them, one at a + time, with the same output file, you will probably obtain a complete + and error-free file. This is so because the probability of having + damaged areas at the same places on different input files is very + low. Using the logfile, only the needed blocks are read from the + second and successive copies. + ''; homepage = "https://www.gnu.org/software/ddrescue/ddrescue.html"; diff --git a/third_party/nixpkgs/pkgs/tools/system/dool/default.nix b/third_party/nixpkgs/pkgs/tools/system/dool/default.nix index 4a958d6216..b7ff128131 100644 --- a/third_party/nixpkgs/pkgs/tools/system/dool/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/fakeroot/default.nix b/third_party/nixpkgs/pkgs/tools/system/fakeroot/default.nix index 518d54898d..3e805834bd 100644 --- a/third_party/nixpkgs/pkgs/tools/system/fakeroot/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/freeipmi/default.nix b/third_party/nixpkgs/pkgs/tools/system/freeipmi/default.nix index 9fe830aa4d..4c3a0db590 100644 --- a/third_party/nixpkgs/pkgs/tools/system/freeipmi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/freeipmi/default.nix @@ -21,19 +21,19 @@ stdenv.mkDerivation rec { meta = { description = "Implementation of the Intelligent Platform Management Interface"; - longDescription = - '' GNU FreeIPMI provides in-band and out-of-band IPMI software based on - the IPMI v1.5/2.0 specification. The IPMI specification defines a - set of interfaces for platform management and is implemented by a - number vendors for system management. The features of IPMI that - most users will be interested in are sensor monitoring, system event - monitoring, power control, and serial-over-LAN (SOL). The FreeIPMI - tools and libraries listed below should provide users with the - ability to access and utilize these and many other features. A - number of useful features for large HPC or cluster environments have - also been implemented into FreeIPMI. See the README or FAQ for more - info. - ''; + longDescription = '' + GNU FreeIPMI provides in-band and out-of-band IPMI software based on + the IPMI v1.5/2.0 specification. The IPMI specification defines a + set of interfaces for platform management and is implemented by a + number vendors for system management. The features of IPMI that + most users will be interested in are sensor monitoring, system event + monitoring, power control, and serial-over-LAN (SOL). The FreeIPMI + tools and libraries listed below should provide users with the + ability to access and utilize these and many other features. A + number of useful features for large HPC or cluster environments have + also been implemented into FreeIPMI. See the README or FAQ for more + info. + ''; homepage = "https://www.gnu.org/software/freeipmi/"; downloadPage = "https://www.gnu.org/software/freeipmi/download.html"; diff --git a/third_party/nixpkgs/pkgs/tools/system/gopsuinfo/default.nix b/third_party/nixpkgs/pkgs/tools/system/gopsuinfo/default.nix index 1deeeee172..fcb84cfde8 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gopsuinfo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gopsuinfo/default.nix @@ -29,7 +29,7 @@ buildGoModule rec { ''; # Install icons - postInstall = '' make install DESTDIR=$out ''; + postInstall = ''make install DESTDIR=$out''; meta = with lib; { description = "Gopsutil-based command to display system usage info"; diff --git a/third_party/nixpkgs/pkgs/tools/system/htop/default.nix b/third_party/nixpkgs/pkgs/tools/system/htop/default.nix index c0a689c4c6..e9e1b2db67 100644 --- a/third_party/nixpkgs/pkgs/tools/system/htop/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/safecopy/default.nix b/third_party/nixpkgs/pkgs/tools/system/safecopy/default.nix index 2bf4547777..c38b76aeb2 100644 --- a/third_party/nixpkgs/pkgs/tools/system/safecopy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/safecopy/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { meta = { description = "Data recovery tool for damaged hardware"; - longDescription = - '' Safecopy is a data recovery tool which tries to extract as much data as possible from a - problematic (i.e. damaged sectors) source - like floppy drives, hard disk partitions, CDs, - tape devices, etc, where other tools like dd would fail due to I/O errors. + longDescription = '' + Safecopy is a data recovery tool which tries to extract as much data as possible from a + problematic (i.e. damaged sectors) source - like floppy drives, hard disk partitions, CDs, + tape devices, etc, where other tools like dd would fail due to I/O errors. - Safecopy includes a low level IO layer to read CDROM disks in raw mode, and issue device - resets and other helpful low level operations on a number of other device classes. - ''; + Safecopy includes a low level IO layer to read CDROM disks in raw mode, and issue device + resets and other helpful low level operations on a number of other device classes. + ''; homepage = "https://safecopy.sourceforge.net"; diff --git a/third_party/nixpkgs/pkgs/tools/text/asciigraph/default.nix b/third_party/nixpkgs/pkgs/tools/text/asciigraph/default.nix index 46166d8c63..1b88b5041f 100644 --- a/third_party/nixpkgs/pkgs/tools/text/asciigraph/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/autocorrect/Cargo.lock b/third_party/nixpkgs/pkgs/tools/text/autocorrect/Cargo.lock index 07a2ac13a9..db77e85f88 100644 --- a/third_party/nixpkgs/pkgs/tools/text/autocorrect/Cargo.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/autocorrect/default.nix b/third_party/nixpkgs/pkgs/tools/text/autocorrect/default.nix index c752c9cf11..457bdf9243 100644 --- a/third_party/nixpkgs/pkgs/tools/text/autocorrect/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix b/third_party/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix index 14f33ae0c5..88fe8b8c3a 100644 --- a/third_party/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/difftastic/Cargo.lock b/third_party/nixpkgs/pkgs/tools/text/difftastic/Cargo.lock index 2620b6b099..3fb38da330 100644 --- a/third_party/nixpkgs/pkgs/tools/text/difftastic/Cargo.lock +++ b/third_party/nixpkgs/pkgs/tools/text/difftastic/Cargo.lock @@ -91,9 +91,12 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "cc" -version = "1.1.5" +version = "1.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052" +checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -211,7 +214,7 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "difftastic" -version = "0.60.0" +version = "0.61.0" dependencies = [ "assert_cmd", "bumpalo", @@ -852,6 +855,12 @@ dependencies = [ "serde", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook" version = "0.3.17" @@ -983,9 +992,9 @@ dependencies = [ [[package]] name = "tree_magic_mini" -version = "3.1.4" +version = "3.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ee137597cdb361b55a4746983e4ac1b35ab6024396a419944ad473bb915265" +checksum = "469a727cac55b41448315cc10427c069c618ac59bb6a4480283fcd811749bdc2" dependencies = [ "fnv", "home", diff --git a/third_party/nixpkgs/pkgs/tools/text/difftastic/default.nix b/third_party/nixpkgs/pkgs/tools/text/difftastic/default.nix index e8e333cc65..d34b83c46c 100644 --- a/third_party/nixpkgs/pkgs/tools/text/difftastic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/difftastic/default.nix @@ -17,13 +17,13 @@ let in rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.60.0"; + version = "0.61.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - hash = "sha256-eIHwmSCAY9Fn9Du7DJxZyGqJ3SUEyZ6VEtwxphGnSHw="; + hash = "sha256-hhkcujMuirBTIwUP3RMZ+F76T1TLcjMqa5l328xrwRg="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/tools/text/enscript/default.nix b/third_party/nixpkgs/pkgs/tools/text/enscript/default.nix index e5aeb75ca6..e0bf73af04 100644 --- a/third_party/nixpkgs/pkgs/tools/text/enscript/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/enscript/default.nix @@ -31,16 +31,16 @@ stdenv.mkDerivation rec { meta = { description = "Converter from ASCII to PostScript, HTML, or RTF"; - longDescription = - '' GNU Enscript converts ASCII files to PostScript, HTML, or RTF and - stores generated output to a file or sends it directly to the - printer. It includes features for `pretty-printing' - (language-sensitive code highlighting) in several programming - languages. + longDescription = '' + GNU Enscript converts ASCII files to PostScript, HTML, or RTF and + stores generated output to a file or sends it directly to the + printer. It includes features for `pretty-printing' + (language-sensitive code highlighting) in several programming + languages. - Enscript can be easily extended to handle different output media and - it has many options that can be used to customize printouts. - ''; + Enscript can be easily extended to handle different output media and + it has many options that can be used to customize printouts. + ''; license = lib.licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/tools/text/gnupatch/default.nix b/third_party/nixpkgs/pkgs/tools/text/gnupatch/default.nix index 19d8652396..fee1a0eed8 100644 --- a/third_party/nixpkgs/pkgs/tools/text/gnupatch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/gnupatch/default.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { description = "GNU Patch, a program to apply differences to files"; mainProgram = "patch"; - longDescription = - '' GNU Patch takes a patch file containing a difference listing - produced by the diff program and applies those differences to one or - more original files, producing patched versions. - ''; + longDescription = '' + GNU Patch takes a patch file containing a difference listing + produced by the diff program and applies those differences to one or + more original files, producing patched versions. + ''; homepage = "https://savannah.gnu.org/projects/patch"; diff --git a/third_party/nixpkgs/pkgs/tools/text/opencc/default.nix b/third_party/nixpkgs/pkgs/tools/text/opencc/default.nix index a6e833de76..54360185cd 100644 --- a/third_party/nixpkgs/pkgs/tools/text/opencc/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/ripgrep-all/default.nix b/third_party/nixpkgs/pkgs/tools/text/ripgrep-all/default.nix index d65c399d5c..a44316517d 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ripgrep-all/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ripgrep-all/default.nix @@ -39,6 +39,9 @@ in rustPlatform.buildRustPackage rec { }; }; + # override debug=true set in Cargo.toml upstream + RUSTFLAGS = "-C debuginfo=none"; + nativeBuildInputs = [ makeWrapper poppler_utils ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/text/sgml/linuxdoc-tools/default.nix b/third_party/nixpkgs/pkgs/tools/text/sgml/linuxdoc-tools/default.nix index 58d3ace63c..18356356cd 100644 --- a/third_party/nixpkgs/pkgs/tools/text/sgml/linuxdoc-tools/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix index 1384d02194..ef38bbda1a 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock index da7c2fccb1..203407169b 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix index ac3fb75898..415b5baaa8 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock index 96da0d8178..0a8b2fae43 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/Gemfile.lock +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix index 9ae8ea567f..b192ced536 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoctor/gemset.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix index d5b529b755..5477be8743 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/lowdown/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix index acb4a20314..39859d6f55 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/video/go2rtc/default.nix b/third_party/nixpkgs/pkgs/tools/video/go2rtc/default.nix index 39be2d4036..b81010bda2 100644 --- a/third_party/nixpkgs/pkgs/tools/video/go2rtc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/go2rtc/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go2rtc"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "AlexxIT"; repo = "go2rtc"; rev = "refs/tags/v${version}"; - hash = "sha256-LK2+hNgP9EhnAL9QKzvfn0+pYjuJJDB7l1fd57jeCWw="; + hash = "sha256-avak2cc8KDmlTrQutzULuvkWxSgdv3rMI7+G3+jNcdI="; }; - vendorHash = "sha256-mUdUMZf3KhJyE0iv2yvWtkHa+pyXcv2RTZY+JtBLrSQ="; + vendorHash = "sha256-N8aJmxNQ/p2ddJG9DuIVVjcgzEC6TzD0sz992h3q0RU="; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix index b2927b7c50..0700c7e95d 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix @@ -32,15 +32,15 @@ let in buildGoModule rec { pname = "distrobuilder"; - version = "3.0"; + version = "3.1"; - vendorHash = "sha256-pFrEkZnrcx0d3oM1klQrNHH+MiLvO4V1uFQdE0kXUqM="; + vendorHash = "sha256-3oHLvOdHbOdaL2FTo+a5HmayNi/i3zoAsU/du9h1N30="; src = fetchFromGitHub { owner = "lxc"; repo = "distrobuilder"; rev = "refs/tags/distrobuilder-${version}"; - sha256 = "sha256-JfME9VaqaQnrhnzhSLGUy9uU+tki1hXdnwqBUD/5XH0="; + sha256 = "sha256-cIzIoLQmg1kgI1QRAmFh/ca88PJBW2yIY92BKHKwTMk="; fetchSubmodules = false; }; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/nixos-generator.patch b/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/nixos-generator.patch index 3c0d726e61..7379274fa0 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/nixos-generator.patch +++ b/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/nixos-generator.patch @@ -1,8 +1,8 @@ diff --git a/distrobuilder/lxc.generator b/distrobuilder/lxc.generator -index 0ad81d1..21ddb39 100644 +index dc5b506..0265da8 100644 --- a/distrobuilder/lxc.generator +++ b/distrobuilder/lxc.generator -@@ -25,16 +25,6 @@ is_incus_vm() { +@@ -21,16 +21,6 @@ is_incus_vm() { [ -e /dev/virtio-ports/org.linuxcontainers.incus ] } @@ -19,8 +19,8 @@ index 0ad81d1..21ddb39 100644 ## Fix functions # fix_ro_paths avoids udevd issues with /sys and /proc being writable fix_ro_paths() { -@@ -45,35 +35,6 @@ BindReadOnlyPaths=/sys /proc - EOF +@@ -42,38 +32,6 @@ fix_ro_paths() { + EOF } -# fix_nm_link_state forces the network interface to a DOWN state ahead of NetworkManager starting up @@ -35,19 +35,22 @@ index 0ad81d1..21ddb39 100644 - return 0 - fi - cat <<-EOF > /run/systemd/system/network-device-down.service --[Unit] --Description=Turn off network device --Before=NetworkManager.service --Before=systemd-networkd.service --[Service] --# do not turn off if there is a default route to 169.254.0.1, i.e. the device is a routed nic --ExecCondition=/bin/sh -c '! /usr/bin/grep -qs 00000000.0100FEA9 /proc/net/route' --ExecStart=-${ip_path} link set $1 down --Type=oneshot --RemainAfterExit=true --[Install] --WantedBy=default.target --EOF +- # This file was created by distrobuilder +- [Unit] +- Description=Turn off network device +- Before=NetworkManager.service +- Before=systemd-networkd.service +- +- [Service] +- # do not turn off if there is a default route to 169.254.0.1, i.e. the device is a routed nic +- ExecCondition=/bin/sh -c '! /usr/bin/grep -qs 00000000.0100FEA9 /proc/net/route' +- ExecStart=-${ip_path} link set $1 down +- Type=oneshot +- RemainAfterExit=true +- +- [Install] +- WantedBy=default.target +- EOF - mkdir -p /run/systemd/system/default.target.wants - ln -sf /run/systemd/system/network-device-down.service /run/systemd/system/default.target.wants/network-device-down.service -} @@ -55,7 +58,7 @@ index 0ad81d1..21ddb39 100644 # fix_systemd_override_unit generates a unit specific override fix_systemd_override_unit() { dropin_dir="/run/systemd/${1}.d" -@@ -112,16 +73,7 @@ fix_systemd_mask() { +@@ -113,16 +71,7 @@ fix_systemd_mask() { # fix_systemd_udev_trigger overrides the systemd-udev-trigger.service to match the latest version # of the file which uses "ExecStart=-" instead of "ExecStart=". fix_systemd_udev_trigger() { @@ -73,8 +76,8 @@ index 0ad81d1..21ddb39 100644 mkdir -p /run/systemd/system/systemd-udev-trigger.service.d cat <<-EOF > /run/systemd/system/systemd-udev-trigger.service.d/zzz-lxc-override.conf -@@ -132,37 +84,13 @@ ExecStart=-${cmd} trigger --type=devices --action=add - EOF +@@ -134,38 +83,13 @@ fix_systemd_udev_trigger() { + EOF } -# fix_systemd_sysctl overrides the systemd-sysctl.service to use "ExecStart=-" instead of "ExecStart=". @@ -83,15 +86,16 @@ index 0ad81d1..21ddb39 100644 - ! [ -e "${cmd}" ] && cmd=/lib/systemd/systemd-sysctl - mkdir -p /run/systemd/system/systemd-sysctl.service.d - cat <<-EOF > /run/systemd/system/systemd-sysctl.service.d/zzz-lxc-override.conf --[Service] --ExecStart= --ExecStart=-${cmd} --EOF +- # This file was created by distrobuilder +- [Service] +- ExecStart= +- ExecStart=-${cmd} +- EOF -} - ## Main logic -# Nothing to do in Incus VM but deployed in case it is later converted to a container --is_incus_vm || is_lxd_vm && exit 0 +-is_incus_vm && exit 0 # Exit immediately if not an Incus/LXC container is_lxc_container || exit 0 @@ -105,14 +109,14 @@ index 0ad81d1..21ddb39 100644 -for path in /usr/lib/systemd/systemd /lib/systemd/systemd; do - [ -x "${path}" ] || continue - -- systemd_version="$("${path}" --version | head -n1 | cut -d' ' -f2)" +- systemd_version="$("${path}" --version | head -n1 | cut -d' ' -f2 | cut -d'~' -f1)" - break -done +systemd_version="$(systemd --version | head -n1 | cut -d' ' -f2)" # Determine distro name and release ID="" -@@ -192,7 +120,6 @@ fi +@@ -196,7 +120,6 @@ fi # Ignore failures on some units. fix_systemd_udev_trigger @@ -120,8 +124,8 @@ index 0ad81d1..21ddb39 100644 # Mask some units. fix_systemd_mask dev-hugepages.mount -@@ -222,11 +149,6 @@ ACTION=="add|change|move", ENV{ID_NET_DRIVER}=="veth", ENV{INTERFACE}=="eth[0-9] - EOF +@@ -226,11 +149,6 @@ if [ -d /etc/udev ]; then + EOF fi -# Workarounds for NetworkManager in containers diff --git a/third_party/nixpkgs/pkgs/tools/wayland/swayrbar/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/swayrbar/default.nix index db0095a973..caf81c055b 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/swayrbar/default.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/top-level/ada-packages.nix b/third_party/nixpkgs/pkgs/top-level/ada-packages.nix index 2d3d0c4dc3..ad29103deb 100644 --- a/third_party/nixpkgs/pkgs/top-level/ada-packages.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 339c3095d4..57039b5d7f 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/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 @@ -152,6 +155,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 +181,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 +208,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 +225,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 +291,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 +315,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 @@ -393,6 +401,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 @@ -474,6 +483,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 @@ -498,6 +508,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; @@ -511,6 +522,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 ### @@ -564,6 +576,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.mouspad' 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 @@ -761,6 +774,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 @@ -770,6 +784,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 @@ -826,6 +842,7 @@ mapAliases { o = orbiton; # Added 2023-04-09 oathToolkit = oath-toolkit; # Added 2022-04-04 oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2024-10-17 + oil = lib.warn "Oil has been replaced with the faster native C++ version and renamed to 'oils-for-unix'. See also https://github.com/oils-for-unix/oils/wiki/Oils-Deployments" oils-for-unix; # Added 2024-10-22 onevpl-intel-gpu = lib.warn "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04 opencv2 = throw "opencv2 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20 opencv3 = throw "opencv3 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20 @@ -878,6 +895,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 @@ -978,6 +996,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 ### @@ -1083,7 +1102,10 @@ mapAliases { steamArch = throw "`steamPackages.steamArch` has been removed as it's no longer applicable"; steam = lib.warn "`steamPackages.steam` has been moved to top level as `steam-unwrapped`" steam-unwrapped; steam-fhsenv = lib.warn "`steamPackages.steam-fhsenv` has been moved to top level as `steam`" steam; + steam-fhsenv-small = lib.warn "`steamPackages.steam-fhsenv-small` has been moved to top level as `steam`; there is no longer a -small variant" steam; steam-fhsenv-without-steam = lib.warn "`steamPackages.steam-fhsenv-without-steam` has been moved to top level as `steam-fhsenv-without-steam`" steam-fhsenv-without-steam; + steam-runtime = throw "`steamPackages.steam-runtime` has been removed, as it's no longer supported or necessary"; + steam-runtime-wrapped = throw "`steamPackages.steam-runtime-wrapped` has been removed, as it's no longer supported or necessary"; steamcmd = lib.warn "`steamPackages.steamcmd` has been moved to top level as `steamcmd`" steamcmd; }; steam-small = steam; # Added 2024-09-12 @@ -1112,7 +1134,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 @@ -1129,7 +1160,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 @@ -1207,6 +1240,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' @@ -1233,6 +1267,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 @@ -1258,6 +1293,7 @@ mapAliases { yacc = throw "'yacc' has been renamed to/replaced by 'bison'"; # Converted to throw 2024-10-17 yafaray-core = libyafaray; # Added 2022-09-23 yi = throw "'yi' has been removed, as it was broken and unmaintained"; # added 2024-05-09 + youtrack_2022_3 = throw "'youtrack_2022_3' has been removed as it was deprecated. Please update to the 'youtrack' package."; # Added 2024-10-17 yrd = throw "'yrd' has been removed, as it was broken and unmaintained"; # added 2024-05-27 ### Z ### diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index d763bf23ad..78432a806e 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -468,6 +468,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 { }; @@ -496,8 +501,6 @@ with pkgs; colorpanes = callPackage ../tools/misc/colorpanes { }; - colorpicker = callPackage ../tools/misc/colorpicker { }; - colorstorm = callPackage ../applications/misc/colorstorm { }; comedilib = callPackage ../development/libraries/comedilib { }; @@ -532,8 +535,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 { }; @@ -626,8 +627,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 { }; @@ -1429,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"; }; @@ -2038,11 +2035,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; }; @@ -3846,8 +3838,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 { }; @@ -4169,8 +4159,6 @@ with pkgs; btrbk = callPackage ../tools/backup/btrbk { }; - buildpack = callPackage ../development/tools/buildpack { }; - bonk = callPackage ../tools/misc/bonk { }; bottom-rs = callPackage ../tools/misc/bottom-rs { }; @@ -4201,12 +4189,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; }; @@ -4809,7 +4791,7 @@ with pkgs; element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_31; + electron = electron_32; }; element-desktop-wayland = writeScriptBin "element-desktop" '' #!/bin/sh @@ -5222,6 +5204,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 { }); @@ -5881,10 +5867,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 { }; @@ -6480,18 +6462,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; }; @@ -6984,10 +6955,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 { @@ -7406,7 +7373,7 @@ with pkgs; extundelete = callPackage ../tools/filesystems/extundelete { }; - expect = callPackage ../tools/misc/expect { }; + expect = tclPackages.expect; expected-lite = callPackage ../development/libraries/expected-lite { }; @@ -7438,12 +7405,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 { }; @@ -7545,8 +7506,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 { }; @@ -8066,8 +8025,6 @@ with pkgs; gopro = callPackage ../tools/video/gopro { }; - goreleaser = callPackage ../tools/misc/goreleaser { }; - goreplay = callPackage ../tools/networking/goreplay { }; gost = callPackage ../tools/networking/gost { }; @@ -8170,11 +8127,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 { }; @@ -8512,8 +8464,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; @@ -9165,7 +9115,9 @@ with pkgs; lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; - lldpd = callPackage ../tools/networking/lldpd { }; + lldpd = callPackage ../tools/networking/lldpd { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; llm = with python3Packages; toPythonApplication llm; @@ -9579,8 +9531,6 @@ with pkgs; ldns = callPackage ../development/libraries/ldns { }; - leafpad = callPackage ../applications/editors/leafpad { }; - leanblueprint = with python3Packages; toPythonApplication leanblueprint; leanify = callPackage ../tools/misc/leanify { }; @@ -9611,8 +9561,6 @@ with pkgs; libcork = callPackage ../development/libraries/libcork { }; - libconfig = callPackage ../development/libraries/libconfig { }; - libcmis = callPackage ../development/libraries/libcmis { }; libee = callPackage ../development/libraries/libee { }; @@ -10274,8 +10222,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 { }; @@ -10382,8 +10332,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 { }; @@ -11471,10 +11419,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; @@ -11678,8 +11622,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 { }; @@ -11875,8 +11817,6 @@ with pkgs; rpPPPoE = callPackage ../tools/networking/rp-pppoe { }; - rpiboot = callPackage ../development/misc/rpiboot { }; - rpm = callPackage ../tools/package-management/rpm { python = python3; lua = lua5_4; @@ -13643,8 +13583,6 @@ with pkgs; buildGoModule = buildGo123Module; }; - xarchive = callPackage ../tools/archivers/xarchive { }; - xarchiver = callPackage ../tools/archivers/xarchiver { }; xbanish = callPackage ../tools/X11/xbanish { }; @@ -14062,10 +14000,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 { }; @@ -14445,21 +14379,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 { }; @@ -14506,14 +14439,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; @@ -14776,6 +14708,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) @@ -15376,11 +15309,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 { }; @@ -16631,7 +16567,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 { }; @@ -16719,7 +16658,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; }; @@ -16862,10 +16801,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 { }; @@ -16946,10 +16881,10 @@ with pkgs; electron_30 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_30 then electron-source.electron_30 else 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 = electron_33-bin; - electron = electron_32; - electron-bin = electron_32-bin; - electron-chromedriver = electron-chromedriver_32; + electron_33 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_33 then electron-source.electron_33 else electron_33-bin; + electron = electron_33; + electron-bin = electron_33-bin; + electron-chromedriver = electron-chromedriver_33; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -17689,10 +17624,10 @@ with pkgs; 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_6 = wrapGradle gradle_6-unwrapped null; + 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. @@ -17893,8 +17828,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 { }; @@ -18385,7 +18318,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; }; @@ -18437,8 +18370,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 { }; @@ -18558,8 +18489,6 @@ with pkgs; time-ghc-modules = callPackage ../development/tools/time-ghc-modules { }; - tflint = callPackage ../development/tools/analysis/tflint { }; - tflint-plugins = recurseIntoAttrs ( callPackage ../development/tools/analysis/tflint-plugins { } ); @@ -19002,8 +18931,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 { }; @@ -19856,7 +19783,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; }; @@ -20275,13 +20201,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 { }; @@ -21027,10 +20948,6 @@ with pkgs; libhugetlbfs = callPackage ../development/libraries/libhugetlbfs { }; - libhv = callPackage ../development/libraries/libhv { - inherit (darwin.apple_sdk.frameworks) Security; - }; - libhwy = callPackage ../development/libraries/libhwy { }; libHX = callPackage ../development/libraries/libHX { }; @@ -23224,14 +23141,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 { }; @@ -23280,16 +23189,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 { }; @@ -23302,8 +23207,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 { }; @@ -23459,8 +23362,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 { }; @@ -24199,8 +24100,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 { }; @@ -24372,8 +24271,6 @@ with pkgs; ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; - janus-gateway = callPackage ../servers/janus-gateway { }; - janusgraph = callPackage ../servers/nosql/janusgraph { }; jboss = callPackage ../servers/http/jboss { }; @@ -24817,7 +24714,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 { }; @@ -24880,12 +24777,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; @@ -24895,12 +24794,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 { }; @@ -24913,7 +24814,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 { }; @@ -24964,7 +24864,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 { }; @@ -25169,7 +25068,10 @@ with pkgs; inherit (callPackages ../servers/http/tomcat { }) tomcat9 - tomcat10; + tomcat10 + tomcat11; + + tomcat = tomcat11; tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { }; @@ -25625,6 +25527,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 { }; @@ -25968,9 +25871,11 @@ with pkgs; fetchurl = import ../build-support/fetchurl/boot.nix { inherit (stdenv.buildPlatform) system; }; - checkMeta = callPackage ../stdenv/generic/check-meta.nix { }; + checkMeta = callPackage ../stdenv/generic/check-meta.nix { inherit (stdenv) hostPlatform; }; }); - minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix { }; + minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix { + inherit (stdenv) hostPlatform; + }; make-minimal-bootstrap-sources = callPackage ../os-specific/linux/minimal-bootstrap/stage0-posix/make-bootstrap-sources.nix { inherit (stdenv) hostPlatform; }; @@ -26326,8 +26231,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 { }; @@ -27324,8 +27229,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 { }; @@ -27940,6 +27843,7 @@ with pkgs; inherit (qt6Packages.callPackage ../applications/office/activitywatch { }) aw-qt + aw-notify aw-server-rust aw-watcher-afk aw-watcher-window; @@ -28319,8 +28223,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; @@ -28406,8 +28308,6 @@ with pkgs; catt = callPackage ../applications/video/catt { }; - cava = callPackage ../applications/audio/cava { }; - cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { }; cbatticon = callPackage ../applications/misc/cbatticon { }; @@ -28678,7 +28578,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; @@ -28880,8 +28780,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 { }; @@ -28990,8 +28888,6 @@ with pkgs; kerbrute = callPackage ../tools/security/kerbrute { }; - komikku = callPackage ../applications/graphics/komikku { }; - kvmtool = callPackage ../applications/virtualization/kvmtool { }; exrtools = callPackage ../applications/graphics/exrtools { }; @@ -29695,8 +29591,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 { }; @@ -29882,8 +29776,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; @@ -30236,7 +30128,7 @@ with pkgs; jaeles = callPackage ../tools/security/jaeles { }; - jalv = callPackage ../applications/audio/jalv { }; + jalv-qt = jalv.override { useQt = true; }; jameica = callPackage ../applications/office/jameica { inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -30360,7 +30252,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; @@ -30441,8 +30333,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 { }; @@ -31331,6 +31221,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 { @@ -32075,8 +31967,6 @@ with pkgs; inherit (__splicedPackages.libsForQt5) qtbase qtwebengine wrapQtAppsHook qtwayland; }; - qxw = callPackage ../applications/editors/qxw { }; - rakarrack = callPackage ../applications/audio/rakarrack { fltk = fltk13; }; @@ -32246,8 +32136,6 @@ with pkgs; sc-im = callPackage ../applications/misc/sc-im { }; - scite = callPackage ../applications/editors/scite { }; - scli = callPackage ../applications/misc/scli { }; scribus_1_5 = libsForQt5.callPackage ../applications/office/scribus/default.nix { }; @@ -33313,6 +33201,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 { }; @@ -33376,7 +33268,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 { }; @@ -33683,8 +33575,6 @@ with pkgs; xrestop = callPackage ../tools/X11/xrestop { }; - xrgears = callPackage ../applications/graphics/xrgears { }; - xsd = callPackage ../development/libraries/xsd { stdenv = gcc9Stdenv; }; @@ -33919,8 +33809,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 { }; @@ -33955,8 +33843,6 @@ with pkgs; erigon = callPackage ../applications/blockchains/erigon { }; - exodus = callPackage ../applications/blockchains/exodus { }; - faraday = callPackage ../applications/blockchains/faraday { }; fulcrum = libsForQt5.callPackage ../applications/blockchains/fulcrum { }; @@ -34508,8 +34394,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation AudioUnit AudioToolbox; }; - eboard = callPackage ../games/eboard { }; - ecwolf = callPackage ../games/ecwolf { }; egoboo = callPackage ../games/egoboo { }; @@ -36253,7 +36137,9 @@ with pkgs; }; cvc4 = callPackage ../applications/science/logic/cvc4 { }; - cvc5 = callPackage ../applications/science/logic/cvc5 { }; + cvc5 = callPackage ../applications/science/logic/cvc5 { + cadical = pkgs.cadical.override { version = "2.0.0"; }; + }; drat-trim = callPackage ../applications/science/logic/drat-trim { }; @@ -36554,8 +36440,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 { @@ -36696,8 +36580,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 { @@ -37086,14 +36968,10 @@ with pkgs; gummi = callPackage ../applications/misc/gummi { }; - gummy = callPackage ../tools/misc/gummy { }; - hashpump = callPackage ../tools/misc/hashpump { }; hck = callPackage ../tools/text/hck { }; - helm = callPackage ../applications/audio/helm { }; - helmfile = callPackage ../applications/networking/cluster/helmfile { }; helmfile-wrapped = callPackage ../applications/networking/cluster/helmfile { @@ -37108,8 +36986,6 @@ with pkgs; hplipWithPlugin = hplip.override { withPlugin = true; }; - hyfetch = callPackage ../tools/misc/hyfetch { }; - hyperfine = callPackage ../tools/misc/hyperfine { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -37599,8 +37475,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 { @@ -38121,8 +37995,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 { }; diff --git a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix index 7b6dd161bd..cfc8bcd289 100644 --- a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix @@ -99,13 +99,17 @@ 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 {}; diff --git a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix b/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix index 919e027026..e0fa5d7078 100644 --- a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix @@ -197,7 +197,8 @@ impure-cmds // appleSourcePackages // chooseLibs // { 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; CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { diff --git a/third_party/nixpkgs/pkgs/top-level/emscripten-packages.nix b/third_party/nixpkgs/pkgs/top-level/emscripten-packages.nix index af4f2fa7f1..083c944aa3 100644 --- a/third_party/nixpkgs/pkgs/top-level/emscripten-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/emscripten-packages.nix @@ -66,10 +66,9 @@ rec { echo "Compiling a custom test" set -x emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 xmllint.o \ - ./.libs/'' - + pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isDarwin "libxml2.dylib " - + pkgs.lib.optionalString (!pkgs.stdenv.hostPlatform.isDarwin) "libxml2.a " - + '' `pkg-config zlib --cflags` `pkg-config zlib --libs` -o ./xmllint.test.js \ + ./.libs/${ + if pkgs.stdenv.hostPlatform.isDarwin then "libxml2.dylib" else "libxml2.a" + } `pkg-config zlib --cflags` `pkg-config zlib --libs` -o ./xmllint.test.js \ --embed-file ./test/xmlid/id_err1.xml echo "Using node to execute the test which basically outputs an error on stderr which we grep for" diff --git a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix index 3418a7925c..8d6d9b4d0d 100644 --- a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix +++ b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix @@ -54,7 +54,7 @@ let broken = kernel.meta.broken; }; }; - kernelPatches = kernel.kernelPatches ++ [ + kernelPatches = lib.filter ({ name ? null, ... }: name != "netfilter-typo-fix") kernel.kernelPatches ++ [ kernelPatches.hardened.${kernel.meta.branch} ]; isHardened = true; @@ -187,14 +187,6 @@ in { ]; }; - linux_6_10 = callPackage ../os-specific/linux/kernel/mainline.nix { - branch = "6.10"; - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - linux_6_11 = callPackage ../os-specific/linux/kernel/mainline.nix { branch = "6.11"; kernelPatches = [ @@ -288,6 +280,7 @@ in { linux_6_7 = throw "linux 6.7 was removed because it has reached its end of life upstream"; linux_6_8 = throw "linux 6.8 was removed because it has reached its end of life upstream"; linux_6_9 = throw "linux 6.9 was removed because it has reached its end of life upstream"; + linux_6_10 = throw "linux 6.10 was removed because it has reached its end of life upstream"; linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; @@ -298,6 +291,7 @@ in { linux_6_7_hardened = throw "linux 6.7 was removed because it has reached its end of life upstream"; linux_6_8_hardened = throw "linux 6.8 was removed because it has reached its end of life upstream"; linux_6_9_hardened = throw "linux 6.9 was removed because it has reached its end of life upstream"; + linux_6_10_hardened = throw "linux 6.9 was removed because it has reached its end of life upstream"; })); /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a @@ -413,6 +407,8 @@ in { new-lg4ff = callPackage ../os-specific/linux/new-lg4ff { }; + zenergy = callPackage ../os-specific/linux/zenergy { }; + nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; nvidiaPackages = dontRecurseIntoAttrs (lib.makeExtensible (_: callPackage ../os-specific/linux/nvidia-x11 { })); @@ -532,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 { }; @@ -627,7 +625,6 @@ in { linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); - linux_6_10 = recurseIntoAttrs (packagesFor kernels.linux_6_10); linux_6_11 = recurseIntoAttrs (packagesFor kernels.linux_6_11); } // lib.optionalAttrs config.allowAliases { linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; # Added 2023-10-11 @@ -637,6 +634,7 @@ in { linux_6_7 = throw "linux 6.7 was removed because it reached its end of life upstream"; # Added 2024-04-04 linux_6_8 = throw "linux 6.8 was removed because it reached its end of life upstream"; # Added 2024-08-02 linux_6_9 = throw "linux 6.9 was removed because it reached its end of life upstream"; # Added 2024-08-02 + linux_6_10 = throw "linux 6.10 was removed because it reached its end of life upstream"; # Added 2024-10-23 }; rtPackages = { diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index ef556b0f52..2f0ce25589 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index f1d40ccc83..5d3e386cf5 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/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"; @@ -15711,6 +15710,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"; @@ -19100,6 +19114,8 @@ with self; { }; }; + NetRemctl = callPackage ../development/perl-modules/NetRemctl { }; + NetServer = buildPerlPackage { pname = "Net-Server"; version = "2.014"; @@ -19213,7 +19229,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 ]; @@ -22105,6 +22153,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"; @@ -24089,9 +24152,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 ]; @@ -25039,6 +25102,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/third_party/nixpkgs/pkgs/top-level/php-packages.nix b/third_party/nixpkgs/pkgs/top-level/php-packages.nix index 0e4fc0b6ec..74e290052b 100644 --- a/third_party/nixpkgs/pkgs/top-level/php-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/php-packages.nix @@ -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="; }) ]; @@ -634,10 +639,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="; }) ]; @@ -672,10 +680,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="; }) ]; @@ -722,10 +733,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="; }) ]; @@ -757,10 +771,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="; }) ]; diff --git a/third_party/nixpkgs/pkgs/top-level/pkg-config/pkg-config-data.json b/third_party/nixpkgs/pkgs/top-level/pkg-config/pkg-config-data.json index 96561fc7b7..4c2286a47e 100644 --- a/third_party/nixpkgs/pkgs/top-level/pkg-config/pkg-config-data.json +++ b/third_party/nixpkgs/pkgs/top-level/pkg-config/pkg-config-data.json @@ -824,7 +824,7 @@ }, "wayland-scanner": { "attrPath": [ - "wayland" + "wayland-scanner" ] }, "wayland-server": { diff --git a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix index 316400d960..fe6df345dd 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix +++ b/third_party/nixpkgs/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 @@ -438,6 +439,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/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index fc2904ec43..7325142059 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -1476,6 +1476,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 { }; @@ -1753,6 +1755,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 { }; @@ -2434,8 +2438,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 { }; @@ -3336,6 +3338,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 { }; @@ -3366,6 +3370,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 { }; @@ -3406,6 +3412,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 { }; @@ -3524,6 +3532,8 @@ self: super: with self; { djangorestframework-guardian2 = callPackage ../development/python-modules/djangorestframework-guardian2 { }; + djangorestframework-jsonp = callPackage ../development/python-modules/djangorestframework-jsonp { }; + djangorestframework-recursive = callPackage ../development/python-modules/djangorestframework-recursive { }; djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { }; @@ -3566,6 +3576,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 { }; @@ -3610,6 +3622,10 @@ 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 { }; dm-env = callPackage ../development/python-modules/dm-env { }; @@ -6847,6 +6863,8 @@ self: super: with self; { kubernetes = callPackage ../development/python-modules/kubernetes { }; + kubernetes-asyncio = callPackage ../development/python-modules/kubernetes-asyncio { }; + kurbopy = callPackage ../development/python-modules/kurbopy { }; l18n = callPackage ../development/python-modules/l18n { }; @@ -8879,6 +8897,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 { }; @@ -9131,6 +9151,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 { }; @@ -9356,6 +9378,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 { }; @@ -9510,6 +9534,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 { }; @@ -9568,9 +9594,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 { }; @@ -9872,6 +9896,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 { }; @@ -10270,6 +10296,8 @@ self: super: with self; { pyloadapi = callPackage ../development/python-modules/pyloadapi { }; + pylsl = callPackage ../development/python-modules/pylsl { }; + pyngo = callPackage ../development/python-modules/pyngo { }; pyngrok = callPackage ../development/python-modules/pyngrok { }; @@ -10364,6 +10392,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 { }; @@ -11218,7 +11248,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 { }; @@ -13537,6 +13567,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 { }; @@ -13579,6 +13613,8 @@ self: super: with self; { reproject = callPackage ../development/python-modules/reproject { }; + reprint = callPackage ../development/python-modules/reprint { }; + reprshed = callPackage ../development/python-modules/reprshed { }; reptor = callPackage ../development/python-modules/reptor { }; @@ -13665,6 +13701,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 { }; @@ -13905,6 +13943,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 { }; @@ -15083,8 +15125,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 { }; @@ -15113,6 +15159,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 { }; @@ -15758,6 +15806,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 @@ -17204,6 +17254,8 @@ self: super: with self; { verboselogs = callPackage ../development/python-modules/verboselogs { }; + verilogae = callPackage ../development/python-modules/verilogae { }; + verlib2 = callPackage ../development/python-modules/verlib2 { }; versioneer = callPackage ../development/python-modules/versioneer { }; @@ -17574,6 +17626,8 @@ self: super: with self; { wordfreq = callPackage ../development/python-modules/wordfreq { }; + world-bank-data = callPackage ../development/python-modules/world-bank-data { }; + worldengine = callPackage ../development/python-modules/worldengine { }; wrapio = callPackage ../development/python-modules/wrapio { }; @@ -17921,6 +17975,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/third_party/nixpkgs/pkgs/top-level/release-unfree-redistributable.nix b/third_party/nixpkgs/pkgs/top-level/release-unfree-redistributable.nix new file mode 100644 index 0000000000..96384e9fb0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/top-level/release-unfree-redistributable.nix @@ -0,0 +1,122 @@ +/* + Nixpkgs unfree+redistributable packages. + + NOTE: This file is used by the sister nix-community project. + + The official Hydra instance only builds and provides binary caches for free + packages (as in OSI-approved). + + Some unfree packages such as MongoDB, ZeroTier, ... take a while to be + built. While their license is not free, they allow redistribution of + build artefacts. + + The sister project nix-community will build and distribute those packages + for a subset of the channels to . + + See also: + + * + * + + Test for example like this: + + $ hydra-eval-jobs pkgs/top-level/release-unfree-redistributable.nix -I . +*/ + +{ + # The platforms for which we build Nixpkgs. + supportedSystems ? [ + "x86_64-linux" + "aarch64-linux" + ], + # Attributes passed to nixpkgs. + nixpkgsArgs ? { + config = { + allowAliases = false; + allowUnfree = true; + cudaSupport = true; + inHydra = true; + }; + }, + # We only build the full package set on infrequently releasing channels. + full ? false, +}: + +let + release-lib = import ./release-lib.nix { + inherit supportedSystems nixpkgsArgs; + }; + + inherit (release-lib) + lib + mapTestOn + pkgs + ; + + # similar to release-lib.packagePlatforms, but also includes some condition for which package to pick + packagesWith = + prefix: cond: + lib.mapAttrs ( + name: value: + let + attrPath = if prefix == "" then name else "${prefix}.${name}"; + res = builtins.tryEval ( + if lib.isDerivation value then + lib.optionals (cond attrPath value) ( + # logic copied from release-lib packagePlatforms + value.meta.hydraPlatforms + or (lib.subtractLists (value.meta.badPlatforms or [ ]) (value.meta.platforms or [ "x86_64-linux" ])) + ) + else if + value.recurseForDerivations or false + || value.recurseForRelease or false + || value.__recurseIntoDerivationForReleaseJobs or false + then + # Recurse + packagesWith attrPath cond value + else + [ ] + ); + in + lib.optionals res.success res.value + ); + + # Unfree is any license not OSI-approved. + isUnfree = pkg: lib.lists.any (l: !(l.free or true)) (lib.lists.toList (pkg.meta.license or [ ])); + + # Whenever the license allows re-distribution of the binaries + isRedistributable = + pkg: lib.lists.any (l: l.redistributable or false) (lib.lists.toList (pkg.meta.license or [ ])); + + isSource = + pkg: !lib.lists.any (x: !(x.isSource)) (lib.lists.toList (pkg.meta.sourceProvenance or [ ])); + + isNotLinuxKernel = + attrPath: !(lib.hasPrefix "linuxKernel" attrPath || lib.hasPrefix "linuxPackages" attrPath); + + # This is handled by release-cuda.nix + isNotCudaPackage = attrPath: !(lib.hasPrefix "cuda" attrPath); + + canSubstituteSrc = + pkg: + # requireFile don't allow using substituters and are therefor skipped + pkg.src.allowSubstitutes or true; + + cond = + attrPath: pkg: + (isUnfree pkg) + && (isRedistributable pkg) + && (isSource pkg) + && (canSubstituteSrc pkg) + && ( + full + || + # We only build these heavy packages on releases + ((isNotCudaPackage attrPath) && (isNotLinuxKernel attrPath)) + ); + + packages = packagesWith "" cond pkgs; + + jobs = mapTestOn packages; +in +jobs diff --git a/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix b/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix index 05a7be580b..6c33cde390 100644 --- a/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix +++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/top-level/splice.nix b/third_party/nixpkgs/pkgs/top-level/splice.nix index c477d79779..66e624985d 100644 --- a/third_party/nixpkgs/pkgs/top-level/splice.nix +++ b/third_party/nixpkgs/pkgs/top-level/splice.nix @@ -119,7 +119,6 @@ let pkgsTargetTarget buildPackages pkgs targetPackages ; - inherit (pkgs.stdenv) buildPlatform targetPlatform hostPlatform; }; splicedPackagesWithXorg = splicedPackages // builtins.removeAttrs splicedPackages.xorg [ diff --git a/third_party/nixpkgs/pkgs/top-level/tcl-packages.nix b/third_party/nixpkgs/pkgs/top-level/tcl-packages.nix new file mode 100644 index 0000000000..6be1844b4c --- /dev/null +++ b/third_party/nixpkgs/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; }; + }; + }) +)